refactor: . Move src/Query/Sort* to src/Query/Sort/

claremacrae · claremacrae · commit ccc31883ab4e · 2024-01-21T22:46:21.000Z
diff --git a/src/Query/Filter/DateField.ts b/src/Query/Filter/DateField.ts
@@ -3,7 +3,7 @@ import { DateRange } from '../DateRange';
 import type { Task } from '../../Task';
 import { DateParser } from '../DateParser';
 import { Explanation } from '../Explain/Explanation';
-import type { Comparator } from '../Sorter';
+import type { Comparator } from '../Sort/Sorter';
 import { compareByDate } from '../../lib/DateTools';
 import type { GrouperFunction } from '../Group/Grouper';
 import { TemplatingPluginTools } from '../../lib/TemplatingPluginTools';
diff --git a/src/Query/Filter/DescriptionField.ts b/src/Query/Filter/DescriptionField.ts
@@ -1,6 +1,6 @@
 import { GlobalFilter } from '../../Config/GlobalFilter';
 import type { Task } from '../../Task';
-import type { Comparator } from '../Sorter';
+import type { Comparator } from '../Sort/Sorter';
 import { TextField } from './TextField';
 
 /**
diff --git a/src/Query/Filter/Field.ts b/src/Query/Filter/Field.ts
@@ -1,5 +1,5 @@
-import { Sorter } from '../Sorter';
-import type { Comparator } from '../Sorter';
+import { Sorter } from '../Sort/Sorter';
+import type { Comparator } from '../Sort/Sorter';
 import * as RegExpTools from '../../lib/RegExpTools';
 import { Grouper } from '../Group/Grouper';
 import type { GrouperFunction } from '../Group/Grouper';
diff --git a/src/Query/Filter/FunctionField.ts b/src/Query/Filter/FunctionField.ts
@@ -5,7 +5,7 @@ import { Explanation } from '../Explain/Explanation';
 import { TaskExpression, parseAndEvaluateExpression } from '../../Scripting/TaskExpression';
 import type { QueryContext } from '../../Scripting/QueryContext';
 import type { SearchInfo } from '../SearchInfo';
-import { Sorter } from '../Sorter';
+import { Sorter } from '../Sort/Sorter';
 import { compareByDate } from '../../lib/DateTools';
 import { getValueType } from '../../lib/TypeDetection';
 import { Field } from './Field';
diff --git a/src/Query/Filter/PriorityField.ts b/src/Query/Filter/PriorityField.ts
@@ -1,6 +1,6 @@
 import { Priority, Task } from '../../Task';
 import { Explanation } from '../Explain/Explanation';
-import type { Comparator } from '../Sorter';
+import type { Comparator } from '../Sort/Sorter';
 import type { GrouperFunction } from '../Group/Grouper';
 import { Field } from './Field';
 import { Filter } from './Filter';
diff --git a/src/Query/Filter/RecurringField.ts b/src/Query/Filter/RecurringField.ts
@@ -1,6 +1,6 @@
 import type { Task } from '../../Task';
 import type { GrouperFunction } from '../Group/Grouper';
-import type { Comparator } from '../Sorter';
+import type { Comparator } from '../Sort/Sorter';
 import { FilterInstructionsBasedField } from './FilterInstructionsBasedField';
 
 export class RecurringField extends FilterInstructionsBasedField {
diff --git a/src/Query/Filter/StatusField.ts b/src/Query/Filter/StatusField.ts
@@ -1,5 +1,5 @@
 import type { Task } from '../../Task';
-import type { Comparator } from '../Sorter';
+import type { Comparator } from '../Sort/Sorter';
 import type { GrouperFunction } from '../Group/Grouper';
 import { FilterInstructionsBasedField } from './FilterInstructionsBasedField';
 
diff --git a/src/Query/Filter/StatusTypeField.ts b/src/Query/Filter/StatusTypeField.ts
@@ -1,7 +1,7 @@
 import type { Task } from '../../Task';
 import type { GrouperFunction } from '../Group/Grouper';
 import { StatusType } from '../../Statuses/StatusConfiguration';
-import type { Comparator } from '../Sorter';
+import type { Comparator } from '../Sort/Sorter';
 import { Explanation } from '../Explain/Explanation';
 import { Field } from './Field';
 import { Filter } from './Filter';
diff --git a/src/Query/Filter/TagsField.ts b/src/Query/Filter/TagsField.ts
@@ -1,6 +1,6 @@
 import type { Task } from '../../Task';
-import type { Comparator } from '../Sorter';
-import { Sorter } from '../Sorter';
+import type { Comparator } from '../Sort/Sorter';
+import { Sorter } from '../Sort/Sorter';
 import type { GrouperFunction } from '../Group/Grouper';
 import type { FilterOrErrorMessage } from './FilterOrErrorMessage';
 import { FilterInstructions } from './FilterInstructions';
diff --git a/src/Query/Filter/TextField.ts b/src/Query/Filter/TextField.ts
@@ -2,7 +2,7 @@ import type { Task } from '../../Task';
 import { SubstringMatcher } from '../Matchers/SubstringMatcher';
 import { RegexMatcher } from '../Matchers/RegexMatcher';
 import type { IStringMatcher } from '../Matchers/IStringMatcher';
-import type { Comparator } from '../Sorter';
+import type { Comparator } from '../Sort/Sorter';
 import type { GrouperFunction } from '../Group/Grouper';
 import { errorMessageForException } from '../../lib/ExceptionTools';
 import { Field } from './Field';
diff --git a/src/Query/Filter/UrgencyField.ts b/src/Query/Filter/UrgencyField.ts
@@ -1,4 +1,4 @@
-import type { Comparator } from '../Sorter';
+import type { Comparator } from '../Sort/Sorter';
 import type { Task } from '../../Task';
 import type { Grouper, GrouperFunction } from '../Group/Grouper';
 import { Field } from './Field';
diff --git a/src/Query/FilterParser.ts b/src/Query/FilterParser.ts
@@ -22,7 +22,7 @@ import { StatusTypeField } from './Filter/StatusTypeField';
 
 import { RecurrenceField } from './Filter/RecurrenceField';
 import type { FilterOrErrorMessage } from './Filter/FilterOrErrorMessage';
-import type { Sorter } from './Sorter';
+import type { Sorter } from './Sort/Sorter';
 import type { Grouper } from './Group/Grouper';
 import { FolderField } from './Filter/FolderField';
 import { RootField } from './Filter/RootField';
diff --git a/src/Query/Query.ts b/src/Query/Query.ts
@@ -7,8 +7,8 @@ import type { IQuery } from '../IQuery';
 import { getSettings } from '../Config/Settings';
 import { errorMessageForException } from '../lib/ExceptionTools';
 import { logging } from '../lib/logging';
-import { Sort } from './Sort';
-import type { Sorter } from './Sorter';
+import { Sort } from './Sort/Sort';
+import type { Sorter } from './Sort/Sorter';
 import { TaskGroups } from './Group/TaskGroups';
 import * as FilterParser from './FilterParser';
 import type { Grouper } from './Group/Grouper';
diff --git a/src/Query/Sort/Sort.ts b/src/Query/Sort/Sort.ts
@@ -1,11 +1,11 @@
-import type { Task } from '../Task';
+import type { Task } from '../../Task';
+import { StatusTypeField } from '../Filter/StatusTypeField';
+import { DueDateField } from '../Filter/DueDateField';
+import { PriorityField } from '../Filter/PriorityField';
+import { PathField } from '../Filter/PathField';
+import { UrgencyField } from '../Filter/UrgencyField';
+import type { SearchInfo } from '../SearchInfo';
 import type { Comparator, Sorter } from './Sorter';
-import { StatusTypeField } from './Filter/StatusTypeField';
-import { DueDateField } from './Filter/DueDateField';
-import { PriorityField } from './Filter/PriorityField';
-import { PathField } from './Filter/PathField';
-import { UrgencyField } from './Filter/UrgencyField';
-import type { SearchInfo } from './SearchInfo';
 
 type PlainComparator = (a: Task, b: Task) => number;
 
diff --git a/src/Query/Sort/Sorter.ts b/src/Query/Sort/Sorter.ts
@@ -1,5 +1,5 @@
-import type { Task } from '../Task';
-import type { SearchInfo } from './SearchInfo';
+import type { Task } from '../../Task';
+import type { SearchInfo } from '../SearchInfo';
 
 /**
  * A sorting function, that takes two Task objects and returns
diff --git a/tests/CustomMatchers/CustomMatchersForSorting.ts b/tests/CustomMatchers/CustomMatchersForSorting.ts
@@ -1,6 +1,6 @@
 import type moment from 'moment';
 import { DateParser } from '../../src/Query/DateParser';
-import type { Sorter } from '../../src/Query/Sorter';
+import type { Sorter } from '../../src/Query/Sort/Sorter';
 import type { Task } from '../../src/Task';
 import { compareByDate } from '../../src/lib/DateTools';
 import { SearchInfo } from '../../src/Query/SearchInfo';
diff --git a/tests/Query/Filter/Field.test.ts b/tests/Query/Filter/Field.test.ts
@@ -1,6 +1,6 @@
 import { Field } from '../../../src/Query/Filter/Field';
 import type { FilterOrErrorMessage } from '../../../src/Query/Filter/FilterOrErrorMessage';
-import type { Comparator } from '../../../src/Query/Sorter';
+import type { Comparator } from '../../../src/Query/Sort/Sorter';
 import type { Task } from '../../../src/Task';
 import { expectTaskComparesBefore } from '../../CustomMatchers/CustomMatchersForSorting';
 import { TaskBuilder } from '../../TestingTools/TaskBuilder';
diff --git a/tests/Scripting/ScriptingReference/VerifyFunctionFieldSamples.ts b/tests/Scripting/ScriptingReference/VerifyFunctionFieldSamples.ts
@@ -7,7 +7,7 @@ import { expandPlaceholders } from '../../../src/Scripting/ExpandPlaceholders';
 import { makeQueryContext } from '../../../src/Scripting/QueryContext';
 import { scan } from '../../../src/Query/Scanner';
 import { SearchInfo } from '../../../src/Query/SearchInfo';
-import { Sort } from '../../../src/Query/Sort';
+import { Sort } from '../../../src/Query/Sort/Sort';
 import { toLines } from '../../TestHelpers';
 
 /** For example, 'task.due' */
diff --git a/tests/Sort.test.ts b/tests/Sort.test.ts
@@ -6,14 +6,14 @@ import moment from 'moment';
 window.moment = moment;
 
 import { verify } from 'approvals/lib/Providers/Jest/JestApprovals';
-import type { Comparator } from '../src/Query/Sorter';
-import { Sorter } from '../src/Query/Sorter';
+import type { Comparator } from '../src/Query/Sort/Sorter';
+import { Sorter } from '../src/Query/Sort/Sorter';
 import { Task } from '../src/Task';
 import { StatusField } from '../src/Query/Filter/StatusField';
 import { DueDateField } from '../src/Query/Filter/DueDateField';
 import { PathField } from '../src/Query/Filter/PathField';
 import { SearchInfo } from '../src/Query/SearchInfo';
-import { Sort } from '../src/Query/Sort';
+import { Sort } from '../src/Query/Sort/Sort';
 import { StatusRegistry } from '../src/Statuses/StatusRegistry';
 import { StatusConfiguration, StatusType } from '../src/Statuses/StatusConfiguration';
 import { SampleTasks, fromLine, fromLines, toLines } from './TestHelpers';
diff --git a/tests/TestingTools/SortingTestHelpers.ts b/tests/TestingTools/SortingTestHelpers.ts
@@ -1,6 +1,6 @@
-import type { Sorter } from '../../src/Query/Sorter';
+import type { Sorter } from '../../src/Query/Sort/Sorter';
 import type { Task } from '../../src/Task';
-import { Sort } from '../../src/Query/Sort';
+import { Sort } from '../../src/Query/Sort/Sort';
 import { SearchInfo } from '../../src/Query/SearchInfo';
 
 export function sortBy(sorters: Sorter[], tasks: Task[]) {
