refactor: . Fix Task/Task.ts > lib/PriorityTools.ts cyclic dependency

Author: claremacrae

circular-deps.txt

@@ -1,4 +1,4 @@
-Processed 150 files (1s) (16 warnings)
+Processed 151 files (7.5s) (16 warnings)
 
 1) Config/Settings.ts > Suggestor/Suggestor.ts
 2) Task/Task.ts > Config/Settings.ts > Suggestor/Suggestor.ts
@@ -8,11 +8,10 @@ Processed 150 files (1s) (16 warnings)
 6) Task/Task.ts > Task/DateFallback.ts
 7) Task/Task.ts > Task/Urgency.ts
 8) Task/Task.ts > lib/LogTasksHelper.ts
-9) Task/Task.ts > lib/PriorityTools.ts
-10) Query/Query.ts > Query/Explain/Explainer.ts
-11) Query/FilterParser.ts > Query/Filter/BooleanField.ts
-12) Statuses/StatusRegistryReport.ts > Statuses/StatusSettingsReport.ts
-13) main.ts > Config/SettingsTab.ts
-14) Obsidian/Cache.ts > Obsidian/TasksEvents.ts
-15) main.ts > Renderer/QueryRenderer.ts
+9) Query/Query.ts > Query/Explain/Explainer.ts
+10) Query/FilterParser.ts > Query/Filter/BooleanField.ts
+11) Statuses/StatusRegistryReport.ts > Statuses/StatusSettingsReport.ts
+12) main.ts > Config/SettingsTab.ts
+13) Obsidian/Cache.ts > Obsidian/TasksEvents.ts
+14) main.ts > Renderer/QueryRenderer.ts
 

src/Commands/CreateOrEditTaskParser.ts

@@ -1,10 +1,11 @@
 import { Status } from '../Statuses/Status';
-import { Priority, Task, TaskRegularExpressions } from '../Task/Task';
+import { Task, TaskRegularExpressions } 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';
 
 function getDefaultCreatedDate() {
     const { setCreatedDate } = getSettings();

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/Task/Priority.ts

@@ -0,0 +1,19 @@
+/**
+ * When sorting, make sure low always comes after none. This way any tasks with low will be below any exiting
+ * tasks that have no priority which would be the default.
+ *
+ * Values can be converted to strings with:
+ * - {@link priorityNameUsingNone} in {@link PriorityTools}
+ * - {@link priorityNameUsingNormal} in {@link PriorityTools}
+ *
+ * @export
+ * @enum {number}
+ */
+export enum Priority {
+    Highest = '0',
+    High = '1',
+    Medium = '2',
+    None = '3',
+    Low = '4',
+    Lowest = '5',
+}

src/Task/Task.ts

@@ -14,26 +14,7 @@ import { DateFallback } from './DateFallback';
 import { Urgency } from './Urgency';
 import type { Recurrence } from './Recurrence';
 import type { TaskLocation } from './TaskLocation';
-
-/**
- * When sorting, make sure low always comes after none. This way any tasks with low will be below any exiting
- * tasks that have no priority which would be the default.
- *
- * Values can be converted to strings with:
- * - {@link priorityNameUsingNone} in {@link PriorityTools}
- * - {@link priorityNameUsingNormal} in {@link PriorityTools}
- *
- * @export
- * @enum {number}
- */
-export enum Priority {
-    Highest = '0',
-    High = '1',
-    Medium = '2',
-    None = '3',
-    Low = '4',
-    Lowest = '5',
-}
+import type { Priority } from './Priority';
 
 export class TaskRegularExpressions {
     public static readonly dateFormat = 'YYYY-MM-DD';

src/TaskSerializer/DataviewTaskSerializer.ts

@@ -1,6 +1,6 @@
 import type { TaskLayoutComponent } from '../Layout/TaskLayoutOptions';
 import type { Task } from '../Task/Task';
-import { Priority } from '../Task/Task';
+import { Priority } from '../Task/Priority';
 import { DefaultTaskSerializer } from './DefaultTaskSerializer';
 
 /**

src/TaskSerializer/DefaultTaskSerializer.ts

@@ -1,7 +1,8 @@
 import type { Moment } from 'moment';
 import { type TaskLayoutComponent, TaskLayoutOptions } from '../Layout/TaskLayoutOptions';
 import { Recurrence } from '../Task/Recurrence';
-import { Priority, Task, TaskRegularExpressions } from '../Task/Task';
+import { Task, TaskRegularExpressions } from '../Task/Task';
+import { Priority } from '../Task/Priority';
 import type { TaskDetails, TaskSerializer } from '.';
 
 /* Interface describing the symbols that {@link DefaultTaskSerializer}

src/lib/PriorityTools.ts

@@ -1,4 +1,4 @@
-import { Priority } from '../Task/Task';
+import { Priority } from '../Task/Priority';
 
 export class PriorityTools {
     /**

src/ui/EditInstructions/PriorityInstructions.ts

@@ -1,5 +1,6 @@
-import { Priority, Task } from '../../Task/Task';
+import { Task } from '../../Task/Task';
 import { PriorityTools } from '../../lib/PriorityTools';
+import { Priority } from '../../Task/Priority';
 import type { TaskEditingInstruction } from './TaskEditingInstruction';
 
 /**

src/ui/EditTask.svelte

@@ -5,13 +5,14 @@
     import { getSettings, TASK_FORMATS } from '../Config/Settings';
     import { GlobalFilter } from '../Config/GlobalFilter';
     import { Status } from '../Statuses/Status';
-    import { Priority, Task } from '../Task/Task';
+    import { Task } from '../Task/Task';
     import { doAutocomplete } from '../lib/DateAbbreviations';
     import { TasksDate } from '../Scripting/TasksDate';
     import { addDependencyToParent, ensureTaskHasId, generateUniqueId, removeDependency } from "../Task/TaskDependency";
     import { replaceTaskWithTasks } from "../Obsidian/File";
     import type { EditableTask } from "./EditableTask";
     import Dependency from "./Dependency.svelte";
+    import { Priority } from '../Task/Priority';
 
     // These exported variables are passed in as props by TaskModal.onOpen():
     export let task: Task;