refactor: . move QueryLayout to a separate file

Author: ilandikov

src/Layout/QueryLayout.ts

@@ -0,0 +1,36 @@
+import { generateHiddenClassForTaskList } from './LayoutHelpers';
+import { QueryLayoutOptions } from './QueryLayoutOptions';
+
+export class QueryLayout {
+    protected queryLayoutOptions: QueryLayoutOptions;
+
+    constructor(queryLayoutOptions?: QueryLayoutOptions) {
+        if (queryLayoutOptions) {
+            this.queryLayoutOptions = queryLayoutOptions;
+        } else {
+            this.queryLayoutOptions = new QueryLayoutOptions();
+        }
+    }
+
+    public applyQueryLayoutOptions() {
+        const taskListHiddenClasses: string[] = [];
+        const componentsToGenerateClassesOnly: [boolean, string][] = [
+            // The following components are handled in QueryRenderer.ts and thus are not part of the same flow that
+            // hides TaskLayoutComponent items. However, we still want to have 'tasks-layout-hide' items for them
+            // (see https://github.com/obsidian-tasks-group/obsidian-tasks/issues/1866).
+            // This can benefit from some refactoring, i.e. render these components in a similar flow rather than
+            // separately.
+            [this.queryLayoutOptions.hideUrgency, 'urgency'],
+            [this.queryLayoutOptions.hideBacklinks, 'backlinks'],
+            [this.queryLayoutOptions.hideEditButton, 'edit-button'],
+            [this.queryLayoutOptions.hidePostponeButton, 'postpone-button'],
+        ];
+        for (const [hide, component] of componentsToGenerateClassesOnly) {
+            generateHiddenClassForTaskList(taskListHiddenClasses, hide, component);
+        }
+
+        if (this.queryLayoutOptions.shortMode) taskListHiddenClasses.push('tasks-layout-short-mode');
+
+        return taskListHiddenClasses;
+    }
+}

src/Layout/TaskLayout.ts

@@ -1,5 +1,4 @@
 import { generateHiddenClassForTaskList } from './LayoutHelpers';
-import { QueryLayoutOptions } from './QueryLayoutOptions';
 import { TaskLayoutOptions } from './TaskLayoutOptions';
 
 export type TaskLayoutComponent =
@@ -34,40 +33,6 @@ export const taskLayoutComponents: TaskLayoutComponent[] = [
     'blockLink',
 ];
 
-export class QueryLayout {
-    protected queryLayoutOptions: QueryLayoutOptions;
-
-    constructor(queryLayoutOptions?: QueryLayoutOptions) {
-        if (queryLayoutOptions) {
-            this.queryLayoutOptions = queryLayoutOptions;
-        } else {
-            this.queryLayoutOptions = new QueryLayoutOptions();
-        }
-    }
-
-    public applyQueryLayoutOptions() {
-        const taskListHiddenClasses: string[] = [];
-        const componentsToGenerateClassesOnly: [boolean, string][] = [
-            // The following components are handled in QueryRenderer.ts and thus are not part of the same flow that
-            // hides TaskLayoutComponent items. However, we still want to have 'tasks-layout-hide' items for them
-            // (see https://github.com/obsidian-tasks-group/obsidian-tasks/issues/1866).
-            // This can benefit from some refactoring, i.e. render these components in a similar flow rather than
-            // separately.
-            [this.queryLayoutOptions.hideUrgency, 'urgency'],
-            [this.queryLayoutOptions.hideBacklinks, 'backlinks'],
-            [this.queryLayoutOptions.hideEditButton, 'edit-button'],
-            [this.queryLayoutOptions.hidePostponeButton, 'postpone-button'],
-        ];
-        for (const [hide, component] of componentsToGenerateClassesOnly) {
-            generateHiddenClassForTaskList(taskListHiddenClasses, hide, component);
-        }
-
-        if (this.queryLayoutOptions.shortMode) taskListHiddenClasses.push('tasks-layout-short-mode');
-
-        return taskListHiddenClasses;
-    }
-}
-
 /**
  * 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/Renderer/QueryRenderer.ts

@@ -2,6 +2,7 @@ import type { EventRef, MarkdownPostProcessorContext } from 'obsidian';
 import { App, Keymap, MarkdownRenderChild, MarkdownRenderer, TFile } from 'obsidian';
 import { GlobalFilter } from '../Config/GlobalFilter';
 import { GlobalQuery } from '../Config/GlobalQuery';
+import { QueryLayout } from '../Layout/QueryLayout';
 import { DateFallback } from '../Task/DateFallback';
 
 import type { IQuery } from '../IQuery';
@@ -11,7 +12,7 @@ import type { QueryResult } from '../Query/QueryResult';
 import type { TaskGroups } from '../Query/Group/TaskGroups';
 import { postponeButtonTitle, shouldShowPostponeButton } from '../Scripting/Postponer';
 import type { Task } from '../Task/Task';
-import { QueryLayout, TaskLayout } from '../Layout/TaskLayout';
+import { TaskLayout } from '../Layout/TaskLayout';
 import { PostponeMenu } from '../ui/Menus/PostponeMenu';
 import type TasksPlugin from '../main';
 import { TaskModal } from '../Obsidian/TaskModal';

tests/Layout/TaskLayout.test.ts

@@ -2,9 +2,10 @@
  * @jest-environment jsdom
  */
 
+import { QueryLayout } from '../../src/Layout/QueryLayout';
 import { TaskLayoutOptions } from '../../src/Layout/TaskLayoutOptions';
 import { QueryLayoutOptions } from '../../src/Layout/QueryLayoutOptions';
-import { QueryLayout, TaskLayout } from '../../src/Layout/TaskLayout';
+import { TaskLayout } from '../../src/Layout/TaskLayout';
 
 describe('TaskLayout tests', () => {
     it('should generate expected CSS classes for default layout', () => {