Merge pull request #3228 from obsidian-tasks-group/access-related-tasks

refactor: Add ListItem methods findClosestParentTask() and isTask()

Author: claremacrae

src/Renderer/QueryResultsRenderer.ts

@@ -28,23 +28,6 @@ export interface QueryRendererParameters {
     editTaskPencilClickHandler: EditButtonClickHandler;
 }
 
-/**
- * We want this function to be a method of ListItem but that causes a circular dependency
- * which makes the plugin fail to load in Obsidian.
- *
- * Note: the tests are in ListItem.test.ts
- *
- * @param listItem
- */
-export function findClosestParentTask(listItem: ListItem) {
-    // Try to find the closest parent that is a task
-    let closestParentTask = listItem.parent;
-    while (closestParentTask !== null && !(closestParentTask instanceof Task)) {
-        closestParentTask = closestParentTask.parent;
-    }
-    return closestParentTask;
-}
-
 export class QueryResultsRenderer {
     /**
      * The complete text in the instruction block, such as:
@@ -274,7 +257,7 @@ export class QueryResultsRenderer {
     }
 
     private willBeRenderedLater(listItem: ListItem, renderedListItems: Set<ListItem>, listItems: ListItem[]) {
-        const closestParentTask = findClosestParentTask(listItem);
+        const closestParentTask = listItem.findClosestParentTask();
         if (!closestParentTask) {
             return false;
         }
@@ -349,7 +332,7 @@ export class QueryResultsRenderer {
         await this.textRenderer(
             listItem.description,
             span,
-            findClosestParentTask(listItem)?.path ?? '',
+            listItem.findClosestParentTask()?.path ?? '',
             this.obsidianComponent,
         );
 

src/Task/ListItem.ts

@@ -1,4 +1,5 @@
 import { TaskRegularExpressions } from './TaskRegularExpressions';
+import type { Task } from './Task';
 
 export class ListItem {
     // The original line read from file.
@@ -46,6 +47,28 @@ export class ListItem {
         return this.parent === null;
     }
 
+    /**
+     * Find to find the closest parent that is a {@link Task}
+     */
+    public findClosestParentTask(): Task | null {
+        let closestParentTask = this.parent;
+
+        while (closestParentTask !== null) {
+            // Lazy load the Task class to avoid circular dependencies
+            const { Task } = require('./Task');
+            if (closestParentTask instanceof Task) {
+                return closestParentTask as Task;
+            }
+            closestParentTask = closestParentTask.parent;
+        }
+
+        return null;
+    }
+
+    get isTask() {
+        return false;
+    }
+
     /**
      * Compare all the fields in another ListItem, to detect any differences from this one.
      *

src/Task/Task.ts

@@ -492,6 +492,15 @@ export class Task extends ListItem {
         return recurrenceOnNextLine ? potentiallyPrunedTasks.reverse() : potentiallyPrunedTasks;
     }
 
+    /**
+     * Return whether this object is a {@link Task}.
+     *
+     * This is useful at run-time to discover whether a {@link ListItem} reference is in fact a {@link Task}.
+     */
+    get isTask() {
+        return true;
+    }
+
     /**
      * Return whether the task is considered done.
      * @returns true if the status type is {@link StatusType.DONE}, {@link StatusType.CANCELLED} or {@link StatusType.NON_TASK}, and false otherwise.

tests/Task/ListItem.test.ts

@@ -8,7 +8,6 @@ import { TaskLocation } from '../../src/Task/TaskLocation';
 import { ListItem } from '../../src/Task/ListItem';
 import { TaskBuilder } from '../TestingTools/TaskBuilder';
 import { fromLine } from '../TestingTools/TestHelpers';
-import { findClosestParentTask } from '../../src/Renderer/QueryResultsRenderer';
 import { createChildListItem } from './ListItemHelpers';
 
 window.moment = moment;
@@ -80,6 +79,11 @@ describe('list item tests', () => {
         expect(child.isRoot).toEqual(false);
     });
 
+    it('should not be a task', () => {
+        const listItem = new ListItem('- list item', null);
+        expect(listItem.isTask).toBe(false);
+    });
+
     it.each([
         ['- ', true],
         ['* ', true],
@@ -107,19 +111,19 @@ describe('related items', () => {
         const item = new ListItem('- item', null);
         const childOfItem = new ListItem('- child of item', item);
 
-        expect(findClosestParentTask(task)).toEqual(null);
-        expect(findClosestParentTask(item)).toEqual(null);
-        expect(findClosestParentTask(childOfItem)).toEqual(null);
+        expect(task.findClosestParentTask()).toEqual(null);
+        expect(item.findClosestParentTask()).toEqual(null);
+        expect(childOfItem.findClosestParentTask()).toEqual(null);
     });
 
     it('should find the closest parent task', () => {
         const parentTask = fromLine({ line: '- [ ] task' });
         const child = new ListItem('- item', parentTask);
         const grandChild = new ListItem('- item', child);
 
-        expect(findClosestParentTask(parentTask)).toEqual(null);
-        expect(findClosestParentTask(child)).toEqual(parentTask);
-        expect(findClosestParentTask(grandChild)).toEqual(parentTask);
+        expect(parentTask.findClosestParentTask()).toEqual(null);
+        expect(child.findClosestParentTask()).toEqual(parentTask);
+        expect(grandChild.findClosestParentTask()).toEqual(parentTask);
     });
 });
 

tests/Task/Task.test.ts

@@ -67,6 +67,13 @@ describe('immutability', () => {
     });
 });
 
+describe('list item-related tests', () => {
+    it('should be a task', () => {
+        const task = fromLine({ line: '- [ ] A Task' });
+        expect(task.isTask).toBe(true);
+    });
+});
+
 describe('parsing', () => {
     it('parses a task from a line starting with hyphen', () => {
         // Arrange