refactor: . move TaskLayoutComponent & taskLayoutComponents to TaskLayoutOptions.ts

Author: ilandikov

src/Layout/TaskLayout.ts

@@ -1,38 +1,6 @@
 import { generateHiddenClassForTaskList } from './LayoutHelpers';
 import { TaskLayoutOptions } from './TaskLayoutOptions';
 
-export type TaskLayoutComponent =
-    // NEW_TASK_FIELD_EDIT_REQUIRED
-    | 'description'
-    | 'priority'
-    | 'recurrenceRule'
-    | 'createdDate'
-    | 'startDate'
-    | 'scheduledDate'
-    | 'dueDate'
-    | 'doneDate'
-    | 'cancelledDate'
-    | 'blockedBy'
-    | 'id'
-    | 'blockLink';
-
-// The order here determines the order that task fields are rendered and written to markdown.
-export const taskLayoutComponents: TaskLayoutComponent[] = [
-    // NEW_TASK_FIELD_EDIT_REQUIRED
-    'description',
-    'id',
-    'blockedBy',
-    'priority',
-    'recurrenceRule',
-    'createdDate',
-    'startDate',
-    'scheduledDate',
-    'dueDate',
-    'cancelledDate',
-    'doneDate',
-    'blockLink',
-];
-
 /**
  * This represents the desired layout of tasks when they are rendered in a given configuration.
  * The layout is used when flattening the task to a string and when rendering queries, and can be

src/Layout/TaskLayoutOptions.ts

@@ -1,4 +1,34 @@
-import { type TaskLayoutComponent, taskLayoutComponents } from './TaskLayout';
+export type TaskLayoutComponent =
+    // NEW_TASK_FIELD_EDIT_REQUIRED
+    | 'description'
+    | 'priority'
+    | 'recurrenceRule'
+    | 'createdDate'
+    | 'startDate'
+    | 'scheduledDate'
+    | 'dueDate'
+    | 'doneDate'
+    | 'cancelledDate'
+    | 'blockedBy'
+    | 'id'
+    | 'blockLink';
+
+// The order here determines the order that task fields are rendered and written to markdown.
+export const taskLayoutComponents: TaskLayoutComponent[] = [
+    // NEW_TASK_FIELD_EDIT_REQUIRED
+    'description',
+    'id',
+    'blockedBy',
+    'priority',
+    'recurrenceRule',
+    'createdDate',
+    'startDate',
+    'scheduledDate',
+    'dueDate',
+    'cancelledDate',
+    'doneDate',
+    'blockLink',
+];
 
 /**
  * Various rendering options of tasks in a query.

src/Renderer/TaskFieldRenderer.ts

@@ -1,5 +1,6 @@
 import type { Moment } from 'moment';
-import type { TaskLayoutComponent } from '../Layout/TaskLayout';
+
+import type { TaskLayoutComponent } from '../Layout/TaskLayoutOptions';
 import { PriorityTools } from '../lib/PriorityTools';
 import type { Task } from '../Task/Task';
 

src/Renderer/TaskLineRenderer.ts

@@ -3,11 +3,10 @@ import { Component, MarkdownRenderer } from 'obsidian';
 import { GlobalFilter } from '../Config/GlobalFilter';
 import { TASK_FORMATS, getSettings } from '../Config/Settings';
 import { replaceTaskWithTasks } from '../Obsidian/File';
-import type { TaskLayoutOptions } from '../Layout/TaskLayoutOptions';
+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 type { TaskLayoutComponent } from '../Layout/TaskLayout';
 import { StatusMenu } from '../ui/Menus/StatusMenu';
 import { StatusRegistry } from '../Statuses/StatusRegistry';
 import { TaskFieldRenderer } from './TaskFieldRenderer';

src/TaskSerializer/DataviewTaskSerializer.ts

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

src/TaskSerializer/DefaultTaskSerializer.ts

@@ -1,6 +1,5 @@
 import type { Moment } from 'moment';
-import { TaskLayoutOptions } from '../Layout/TaskLayoutOptions';
-import type { TaskLayoutComponent } from '../Layout/TaskLayout';
+import { type TaskLayoutComponent, TaskLayoutOptions } from '../Layout/TaskLayoutOptions';
 import { Recurrence } from '../Task/Recurrence';
 import { Priority, Task, TaskRegularExpressions } from '../Task/Task';
 import type { TaskDetails, TaskSerializer } from '.';

tests/Renderer/TaskLineRenderer.test.ts

@@ -5,12 +5,11 @@ import moment from 'moment';
 import { DebugSettings } from '../../src/Config/DebugSettings';
 import { GlobalFilter } from '../../src/Config/GlobalFilter';
 import { resetSettings, updateSettings } from '../../src/Config/Settings';
-import { TaskLayoutOptions } from '../../src/Layout/TaskLayoutOptions';
+import { type TaskLayoutComponent, TaskLayoutOptions, taskLayoutComponents } from '../../src/Layout/TaskLayoutOptions';
 import { DateParser } from '../../src/Query/DateParser';
 import { QueryLayoutOptions } from '../../src/Layout/QueryLayoutOptions';
 import type { Task } from '../../src/Task/Task';
 import { TaskRegularExpressions } from '../../src/Task/Task';
-import { type TaskLayoutComponent, taskLayoutComponents } from '../../src/Layout/TaskLayout';
 import type { TextRenderer } from '../../src/Renderer/TaskLineRenderer';
 import { TaskLineRenderer } from '../../src/Renderer/TaskLineRenderer';
 import { fromLine } from '../TestingTools/TestHelpers';