refactor: . Move PresetsMap type to Presets.ts

This reduces some dependence on Settings.ts

Author: claremacrae

src/Config/PresetsSettingsUI.ts

@@ -2,7 +2,8 @@ import { Setting, TextAreaComponent } from 'obsidian';
 import type TasksPlugin from '../main';
 import type { TasksEvents } from '../Obsidian/TasksEvents';
 import { PresetsSettingsService, type RenamesInProgress } from '../Query/Presets/PresetsSettingsService';
-import { type PresetsMap, type Settings, getSettings, updateSettings } from './Settings';
+import type { PresetsMap } from '../Query/Presets/Presets';
+import { type Settings, getSettings, updateSettings } from './Settings';
 
 type RefreshViewCallback = () => void;
 

src/Config/Settings.ts

@@ -12,6 +12,7 @@ import type { SuggestionBuilder } from '../Suggestor';
 import type { LogOptions } from '../lib/logging';
 import { DataviewTaskSerializer } from '../TaskSerializer/DataviewTaskSerializer';
 import { i18n } from '../i18n/i18n';
+import type { PresetsMap } from '../Query/Presets/Presets';
 import { DebugSettings } from './DebugSettings';
 import { StatusSettings } from './StatusSettings';
 import { Feature } from './Feature';
@@ -59,7 +60,6 @@ export const TASK_FORMATS = {
 } as const;
 
 export type TASK_FORMATS = typeof TASK_FORMATS; // For convenience to make some typing easier
-export type PresetsMap = Record<string, string>;
 
 export interface Settings {
     presets: PresetsMap;

src/Query/Presets/Presets.ts

@@ -1,4 +1,4 @@
-import type { PresetsMap } from '../../Config/Settings';
+export type PresetsMap = Record<string, string>;
 
 function summariseInstruction(instructions: string) {
     let result = instructions;

src/Query/Presets/PresetsSettingsService.ts

@@ -1,5 +1,5 @@
 import { renameKeyInRecordPreservingOrder } from '../../lib/RecordHelpers';
-import type { PresetsMap } from '../../Config/Settings';
+import type { PresetsMap } from './Presets';
 
 /**
  * Represents a map of preset keys and their current values

src/Scripting/QueryContext.ts

@@ -1,5 +1,6 @@
-import { type PresetsMap, getSettings } from '../Config/Settings';
+import { getSettings } from '../Config/Settings';
 import type { Task } from '../Task/Task';
+import type { PresetsMap } from '../Query/Presets/Presets';
 import type { TasksFile } from './TasksFile';
 
 /**

tests/Query/Presets/Presets.test.ts

@@ -3,10 +3,11 @@
  */
 
 import moment from 'moment';
-import { type PresetsMap, getSettings, resetSettings, updateSettings } from '../../../src/Config/Settings';
+import { getSettings, resetSettings, updateSettings } from '../../../src/Config/Settings';
 import { Query } from '../../../src/Query/Query';
 import { TasksFile } from '../../../src/Scripting/TasksFile';
 import type { Statement } from '../../../src/Query/Statement';
+import type { PresetsMap } from '../../../src/Query/Presets/Presets';
 
 window.moment = moment;
 

tests/Query/Presets/PresetsSettingsService.test.ts

@@ -3,7 +3,7 @@ import {
     RenameResult,
     type RenamesInProgress,
 } from '../../../src/Query/Presets/PresetsSettingsService';
-import type { PresetsMap } from '../../../src/Config/Settings';
+import type { PresetsMap } from '../../../src/Query/Presets/Presets';
 
 function expectToBeValid(result: RenameResult) {
     expect(result.isValid).toBe(true);