refactor: . Move to src/Obsidian/ most top-level files that integrate with Obsidian

claremacrae · claremacrae · commit 672aae96e9ee · 2024-01-21T23:36:16.000Z
QueryRenderer.ts not yet moved, as I'm unsure where the other
Layout and/or Renderer will go.
diff --git a/src/Api/createTaskLineModalHelper.ts b/src/Api/createTaskLineModalHelper.ts
@@ -1,7 +1,7 @@
 import type { App } from 'obsidian';
 import type { Task } from '../Task/Task';
 import { taskFromLine } from '../Commands/CreateOrEditTaskParser';
-import { TaskModal } from '../TaskModal';
+import { TaskModal } from '../Obsidian/TaskModal';
 import type { ITaskModal, taskModalFactory } from './createTaskLineModal';
 
 /**
diff --git a/src/Commands/CreateOrEdit.ts b/src/Commands/CreateOrEdit.ts
@@ -1,5 +1,5 @@
 import { App, Editor, MarkdownView, View } from 'obsidian';
-import { TaskModal } from '../TaskModal';
+import { TaskModal } from '../Obsidian/TaskModal';
 import type { Task } from '../Task/Task';
 import { DateFallback } from '../DateFallback';
 import { taskFromLine } from './CreateOrEditTaskParser';
diff --git a/src/Obsidian/Cache.ts b/src/Obsidian/Cache.ts
@@ -3,14 +3,13 @@ import type { CachedMetadata, EventRef } from 'obsidian';
 import type { HeadingCache, ListItemCache, SectionCache } from 'obsidian';
 import { Mutex } from 'async-mutex';
 
-import { Task } from './Task/Task';
+import { Task } from '../Task/Task';
+import { DateFallback } from '../DateFallback';
+import { getSettings } from '../Config/Settings';
+import { Lazy } from '../lib/Lazy';
+import { TaskLocation } from '../Task/TaskLocation';
+import { logging } from '../lib/logging';
 import type { TasksEvents } from './TasksEvents';
-import { DateFallback } from './DateFallback';
-import { getSettings } from './Config/Settings';
-import { Lazy } from './lib/Lazy';
-import { TaskLocation } from './Task/TaskLocation';
-// import { logging } from './lib/logging';
-import { logging } from './lib/logging';
 
 export enum State {
     Cold = 'Cold',
diff --git a/src/Obsidian/File.ts b/src/Obsidian/File.ts
@@ -1,9 +1,9 @@
 import { type ListItemCache, MetadataCache, Notice, TFile, Vault, Workspace } from 'obsidian';
-import { GlobalFilter } from './Config/GlobalFilter';
-import { type MockListItemCache, type MockTask, saveMockDataForTesting } from './lib/MockDataCreator';
-import type { Task } from './Task/Task';
-import { logging } from './lib/logging';
-import { logEndOfTaskEdit, logStartOfTaskEdit } from './lib/LogTasksHelper';
+import { GlobalFilter } from '../Config/GlobalFilter';
+import { type MockListItemCache, type MockTask, saveMockDataForTesting } from '../lib/MockDataCreator';
+import type { Task } from '../Task/Task';
+import { logging } from '../lib/logging';
+import { logEndOfTaskEdit, logStartOfTaskEdit } from '../lib/LogTasksHelper';
 
 let metadataCache: MetadataCache | undefined;
 let vault: Vault | undefined;
diff --git a/src/Obsidian/InlineRenderer.ts b/src/Obsidian/InlineRenderer.ts
@@ -1,11 +1,11 @@
 import type { MarkdownPostProcessorContext, Plugin } from 'obsidian';
 import { MarkdownRenderChild } from 'obsidian';
-import { GlobalFilter } from './Config/GlobalFilter';
-import { TaskLayoutOptions } from './Layout/TaskLayoutOptions';
-import { QueryLayoutOptions } from './QueryLayoutOptions';
-import { Task } from './Task/Task';
-import { TaskLineRenderer } from './TaskLineRenderer';
-import { TaskLocation } from './Task/TaskLocation';
+import { GlobalFilter } from '../Config/GlobalFilter';
+import { TaskLayoutOptions } from '../Layout/TaskLayoutOptions';
+import { QueryLayoutOptions } from '../QueryLayoutOptions';
+import { Task } from '../Task/Task';
+import { TaskLineRenderer } from '../TaskLineRenderer';
+import { TaskLocation } from '../Task/TaskLocation';
 
 export class InlineRenderer {
     constructor({ plugin }: { plugin: Plugin }) {
diff --git a/src/Obsidian/LivePreviewExtension.ts b/src/Obsidian/LivePreviewExtension.ts
@@ -2,8 +2,8 @@ import { EditorView, ViewPlugin } from '@codemirror/view';
 import type { PluginValue } from '@codemirror/view';
 import { Notice } from 'obsidian';
 
-import { Task } from './Task/Task';
-import { TaskLocation } from './Task/TaskLocation';
+import { Task } from '../Task/Task';
+import { TaskLocation } from '../Task/TaskLocation';
 
 export const newLivePreviewExtension = () => {
     return ViewPlugin.fromClass(LivePreviewExtension);
diff --git a/src/Obsidian/TaskModal.ts b/src/Obsidian/TaskModal.ts
@@ -1,8 +1,8 @@
 import { App, Modal } from 'obsidian';
-import EditTask from './ui/EditTask.svelte';
-import type { Task } from './Task/Task';
-import { StatusRegistry } from './Statuses/StatusRegistry';
-import { Status } from './Statuses/Status';
+import EditTask from '../ui/EditTask.svelte';
+import type { Task } from '../Task/Task';
+import { StatusRegistry } from '../Statuses/StatusRegistry';
+import { Status } from '../Statuses/Status';
 
 export class TaskModal extends Modal {
     public readonly task: Task;
diff --git a/src/Obsidian/TasksEvents.ts b/src/Obsidian/TasksEvents.ts
@@ -1,8 +1,8 @@
 import type { EventRef, Events as ObsidianEvents } from 'obsidian';
 
+import type { Task } from '../Task/Task';
+import { logging } from '../lib/logging';
 import type { State } from './Cache';
-import type { Task } from './Task/Task';
-import { logging } from './lib/logging';
 
 enum Event {
     CacheUpdate = 'obsidian-tasks-plugin:cache-update',
diff --git a/src/QueryRenderer.ts b/src/QueryRenderer.ts
@@ -1,10 +1,8 @@
 import type { EventRef, MarkdownPostProcessorContext } from 'obsidian';
 import { App, Keymap, MarkdownRenderChild, MarkdownRenderer, TFile } from 'obsidian';
-import { State } from './Cache';
 import { GlobalFilter } from './Config/GlobalFilter';
 import { GlobalQuery } from './Config/GlobalQuery';
 import { DateFallback } from './DateFallback';
-import { getTaskLineAndFile, replaceTaskWithTasks } from './File';
 
 import type { IQuery } from './IQuery';
 import { explainResults, getQueryForQueryRenderer } from './lib/QueryRendererHelper';
@@ -15,10 +13,12 @@ import { postponeButtonTitle, shouldShowPostponeButton } from './Scripting/Postp
 import type { Task } from './Task/Task';
 import { TaskLayout } from './TaskLayout';
 import { TaskLineRenderer } from './TaskLineRenderer';
-import { TaskModal } from './TaskModal';
-import type { TasksEvents } from './TasksEvents';
 import { PostponeMenu } from './ui/Menus/PostponeMenu';
 import type TasksPlugin from './main';
+import { TaskModal } from './Obsidian/TaskModal';
+import type { TasksEvents } from './Obsidian/TasksEvents';
+import { getTaskLineAndFile, replaceTaskWithTasks } from './Obsidian/File';
+import { State } from './Obsidian/Cache';
 
 export class QueryRenderer {
     private readonly app: App;
diff --git a/src/TaskLineRenderer.ts b/src/TaskLineRenderer.ts
@@ -2,7 +2,7 @@ import type { Moment } from 'moment';
 import { Component, MarkdownRenderer } from 'obsidian';
 import { GlobalFilter } from './Config/GlobalFilter';
 import { TASK_FORMATS, getSettings } from './Config/Settings';
-import { replaceTaskWithTasks } from './File';
+import { replaceTaskWithTasks } from './Obsidian/File';
 import type { TaskLayoutOptions } from './Layout/TaskLayoutOptions';
 import type { QueryLayoutOptions } from './QueryLayoutOptions';
 import type { Task } from './Task/Task';
diff --git a/src/main.ts b/src/main.ts
@@ -1,12 +1,12 @@
 import { Plugin } from 'obsidian';
 
-import { Cache } from './Cache';
+import { Cache } from './Obsidian/Cache';
 import { Commands } from './Commands';
 import { GlobalQuery } from './Config/GlobalQuery';
-import { TasksEvents } from './TasksEvents';
-import { initializeFile } from './File';
-import { InlineRenderer } from './InlineRenderer';
-import { newLivePreviewExtension } from './LivePreviewExtension';
+import { TasksEvents } from './Obsidian/TasksEvents';
+import { initializeFile } from './Obsidian/File';
+import { InlineRenderer } from './Obsidian/InlineRenderer';
+import { newLivePreviewExtension } from './Obsidian/LivePreviewExtension';
 import { QueryRenderer } from './QueryRenderer';
 import { getSettings, updateSettings } from './Config/Settings';
 import { SettingsTab } from './Config/SettingsTab';
diff --git a/src/ui/EditTask.svelte b/src/ui/EditTask.svelte
@@ -10,7 +10,7 @@
     import { TasksDate } from '../Scripting/TasksDate';
     import { computePosition, flip, offset, shift, size } from "@floating-ui/dom";
     import { addDependencyToParent, ensureTaskHasId, generateUniqueId, removeDependency } from "../Task/TaskDependency";
-    import { replaceTaskWithTasks } from "../File";
+    import { replaceTaskWithTasks } from "../Obsidian/File";
 
     // These exported variables are passed in as props by TaskModal.onOpen():
     export let task: Task;
diff --git a/src/ui/Menus/TaskEditingMenu.ts b/src/ui/Menus/TaskEditingMenu.ts
@@ -1,6 +1,6 @@
 import { Menu, type MenuItem } from 'obsidian';
 import type { Task } from '../../Task/Task';
-import { replaceTaskWithTasks } from '../../File';
+import { replaceTaskWithTasks } from '../../Obsidian/File';
 import type { TaskEditingInstruction } from '../EditInstructions/TaskEditingInstruction';
 
 /**
diff --git a/tests/File.test.ts b/tests/File.test.ts
@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs';
 import { verify } from 'approvals/lib/Providers/Jest/JestApprovals';
-import { findLineNumberOfTaskToToggle } from '../src/File';
+import { findLineNumberOfTaskToToggle } from '../src/Obsidian/File';
 import type { MockTogglingDataForTesting } from '../src/lib/MockDataCreator';
 
 /**
