Merge pull request #2612 from obsidian-tasks-group/reduce-cyclic-deps

refactor: Reduce cyclic dependencies in src/

Author: claremacrae

.gitignore

@@ -21,7 +21,7 @@ yarn-error.log
 
 # Code analysis output files
 /circular-deps.png
-/circular-deps.txt
+#/circular-deps.txt
 
 # approval test files
 *.received.*

circular-deps.txt

@@ -0,0 +1,15 @@
+Processed 152 files (995ms) (16 warnings)
+
+1) Config/Settings.ts > Suggestor/Suggestor.ts
+2) Task/Task.ts > Config/Settings.ts > Suggestor/Suggestor.ts
+3) Task/Task.ts > Config/Settings.ts > Suggestor/Suggestor.ts > TaskSerializer/DefaultTaskSerializer.ts
+4) Task/Task.ts > Config/Settings.ts > TaskSerializer/DataviewTaskSerializer.ts
+5) Task/Task.ts > Task/DateFallback.ts
+6) Task/Task.ts > Task/Urgency.ts
+7) Task/Task.ts > lib/LogTasksHelper.ts
+8) Query/Query.ts > Query/Explain/Explainer.ts
+9) Query/FilterParser.ts > Query/Filter/BooleanField.ts
+10) main.ts > Config/SettingsTab.ts
+11) Obsidian/Cache.ts > Obsidian/TasksEvents.ts
+12) main.ts > Renderer/QueryRenderer.ts
+

src/Commands/CreateOrEditTaskParser.ts

@@ -1,10 +1,12 @@
 import { Status } from '../Statuses/Status';
-import { Priority, Task, TaskRegularExpressions } from '../Task/Task';
+import { Task } from '../Task/Task';
 import { DateFallback } from '../Task/DateFallback';
 import { StatusRegistry } from '../Statuses/StatusRegistry';
 import { TaskLocation } from '../Task/TaskLocation';
 import { getSettings } from '../Config/Settings';
 import { GlobalFilter } from '../Config/GlobalFilter';
+import { Priority } from '../Task/Priority';
+import { TaskRegularExpressions } from '../Task/TaskRegularExpressions';
 
 function getDefaultCreatedDate() {
     const { setCreatedDate } = getSettings();

src/Commands/ToggleDone.ts

@@ -1,8 +1,9 @@
 import { Editor, type EditorPosition, type MarkdownFileInfo, MarkdownView } from 'obsidian';
 import { StatusRegistry } from '../Statuses/StatusRegistry';
 
-import { Task, TaskRegularExpressions } from '../Task/Task';
+import { Task } from '../Task/Task';
 import { TaskLocation } from '../Task/TaskLocation';
+import { TaskRegularExpressions } from '../Task/TaskRegularExpressions';
 
 export const toggleDone = (checking: boolean, editor: Editor, view: MarkdownView | MarkdownFileInfo) => {
     if (checking) {

src/Query/Filter/PriorityField.ts

@@ -1,7 +1,8 @@
-import { Priority, Task } from '../../Task/Task';
+import type { Task } from '../../Task/Task';
 import { Explanation } from '../Explain/Explanation';
 import type { Comparator } from '../Sort/Sorter';
 import type { GrouperFunction } from '../Group/Grouper';
+import { Priority } from '../../Task/Priority';
 import { Field } from './Field';
 import { Filter } from './Filter';
 import { FilterOrErrorMessage } from './FilterOrErrorMessage';

src/Renderer/TaskLineRenderer.ts

@@ -6,9 +6,9 @@ import { replaceTaskWithTasks } from '../Obsidian/File';
 import type { TaskLayoutComponent, TaskLayoutOptions } from '../Layout/TaskLayoutOptions';
 import type { QueryLayoutOptions } from '../Layout/QueryLayoutOptions';
 import type { Task } from '../Task/Task';
-import * as taskModule from '../Task/Task';
 import { StatusMenu } from '../ui/Menus/StatusMenu';
 import { StatusRegistry } from '../Statuses/StatusRegistry';
+import { TaskRegularExpressions } from '../Task/TaskRegularExpressions';
 import { TaskFieldRenderer } from './TaskFieldRenderer';
 
 /**
@@ -309,7 +309,7 @@ export class TaskLineRenderer {
             }
 
             function toTooltipDate({ signifier, date }: { signifier: string; date: Moment }): string {
-                return `${signifier} ${date.format(taskModule.TaskRegularExpressions.dateFormat)} (${date.from(
+                return `${signifier} ${date.format(TaskRegularExpressions.dateFormat)} (${date.from(
                     window.moment().startOf('day'),
                 )})`;
             }

src/Scripting/TasksDate.ts

@@ -1,7 +1,7 @@
 import type { DurationInputArg2, Moment, unitOfTime } from 'moment';
 import { Notice } from 'obsidian';
-import { TaskRegularExpressions } from '../Task/Task';
 import { PropertyCategory } from '../lib/PropertyCategory';
+import { TaskRegularExpressions } from '../Task/TaskRegularExpressions';
 
 /**
  * TasksDate encapsulates a date, for simplifying the JavaScript expressions users need to

src/Statuses/StatusRegistryReport.ts

@@ -47,14 +47,3 @@ ${settingsTable}
 These are the settings actually used by Tasks.
 ${mermaidText}`;
 }
-
-export function getPrintableSymbol(symbol: string) {
-    // Do not put backticks around an empty symbol, as the two backticks are rendered
-    // by Obsidian as ordinary characters and the meaning is unclear.
-    // Better to just display nothing in this situation.
-    if (symbol === '') {
-        return symbol;
-    }
-    const result = symbol !== ' ' ? symbol : 'space';
-    return '`' + result + '`';
-}

src/Statuses/StatusSettingsReport.ts

@@ -1,14 +1,24 @@
 import { StatusSettings } from '../Config/StatusSettings';
 import { MarkdownTable } from '../lib/MarkdownTable';
 import type { StatusConfiguration } from './StatusConfiguration';
-import { getPrintableSymbol } from './StatusRegistryReport';
-import { Status } from './Status';
 import { StatusType } from './StatusConfiguration';
+import { Status } from './Status';
 
 function getFirstIndex(statusConfigurations: StatusConfiguration[], wantedSymbol: string) {
     return statusConfigurations.findIndex((s) => s.symbol === wantedSymbol);
 }
 
+export function getPrintableSymbol(symbol: string) {
+    // Do not put backticks around an empty symbol, as the two backticks are rendered
+    // by Obsidian as ordinary characters and the meaning is unclear.
+    // Better to just display nothing in this situation.
+    if (symbol === '') {
+        return symbol;
+    }
+    const result = symbol !== ' ' ? symbol : 'space';
+    return '`' + result + '`';
+}
+
 function checkIfConventionalType(status: StatusConfiguration, problems: string[]) {
     // Check if conventional type is being used:
     const conventionalType = Status.getTypeForUnknownSymbol(status.symbol);

src/Suggestor/Suggestor.ts

@@ -3,8 +3,9 @@ import { DateParser } from '../Query/DateParser';
 import { doAutocomplete } from '../lib/DateAbbreviations';
 import { Recurrence } from '../Task/Recurrence';
 import type { DefaultTaskSerializerSymbols } from '../TaskSerializer/DefaultTaskSerializer';
-import { Task, TaskRegularExpressions } from '../Task/Task';
+import { Task } from '../Task/Task';
 import { GlobalFilter } from '../Config/GlobalFilter';
+import { TaskRegularExpressions } from '../Task/TaskRegularExpressions';
 import type { SuggestInfo, SuggestionBuilder } from '.';
 
 /**