import normalisation

src/apps/cli/adapters/NodeConversionAdapter.ts

@@ -1,7 +1,7 @@
 import type { UXFileInfoStub, UXFolderInfo } from "@lib/common/types";
 import type { IConversionAdapter } from "@lib/serviceModules/adapters";
 import type { NodeFile, NodeFolder } from "./NodeTypes";
-import { path } from "../node-compat";
+import { path } from "@/apps/cli/node-compat";
 
 /**
  * Conversion adapter implementation for Node.js

src/apps/cli/adapters/NodeFileSystemAdapter.ts

@@ -6,7 +6,7 @@ import { NodeConversionAdapter } from "./NodeConversionAdapter";
 import { NodeStorageAdapter } from "./NodeStorageAdapter";
 import { NodeVaultAdapter } from "./NodeVaultAdapter";
 import type { NodeFile, NodeFolder, NodeStat } from "./NodeTypes";
-import { fsPromises as fs, path } from "../node-compat";
+import { fsPromises as fs, path } from "@/apps/cli/node-compat";
 
 /**
  * Complete file system adapter implementation for Node.js

src/apps/cli/adapters/NodePathAdapter.ts

@@ -1,7 +1,7 @@
 import type { FilePath } from "@lib/common/types";
 import type { IPathAdapter } from "@lib/serviceModules/adapters";
 import type { NodeFile } from "./NodeTypes";
-import { path } from "../node-compat";
+import { path } from "@/apps/cli/node-compat";
 
 /**
  * Path adapter implementation for Node.js

src/apps/cli/adapters/NodeStorageAdapter.ts

@@ -1,7 +1,7 @@
 import type { UXDataWriteOptions } from "@lib/common/types";
 import type { IStorageAdapter } from "@lib/serviceModules/adapters";
 import type { NodeStat } from "./NodeTypes";
-import { fsPromises as fs, path } from "../node-compat";
+import { fsPromises as fs, path } from "@/apps/cli/node-compat";
 
 /**
  * Storage adapter implementation for Node.js

src/apps/cli/adapters/NodeVaultAdapter.ts

@@ -1,7 +1,7 @@
 import type { UXDataWriteOptions } from "@lib/common/types";
 import type { IVaultAdapter } from "@lib/serviceModules/adapters";
 import type { NodeFile, NodeFolder } from "./NodeTypes";
-import { fsPromises as fs, path } from "../node-compat";
+import { fsPromises as fs, path } from "@/apps/cli/node-compat";
 
 /**
  * Vault adapter implementation for Node.js

src/apps/cli/commands/runCommand.ts

@@ -17,7 +17,7 @@ import { collectPeers, openP2PHost, parseTimeoutSeconds, syncWithPeer } from "./
 import { performFullScan } from "@lib/serviceFeatures/offlineScanner";
 import { UnresolvedErrorManager } from "@lib/services/base/UnresolvedErrorManager";
 import { compatGlobal } from "@lib/common/coreEnvFunctions.ts";
-import { fsPromises as fs, path } from "../node-compat";
+import { fsPromises as fs, path } from "@/apps/cli/node-compat";
 
 function redactConnectionString(uri: string): string {
     return uri.replace(/\/\/([^@/]+)@/u, "//***@");

src/apps/cli/commands/utils.ts

@@ -1,4 +1,4 @@
-import { path, readline } from "../node-compat";
+import { path, readline } from "@/apps/cli/node-compat";
 
 export function toArrayBuffer(data: Buffer): ArrayBuffer {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion -- required in environments where Buffer.buffer is ArrayBufferLike

src/apps/cli/managers/CLIStorageEventManagerAdapter.ts

@@ -13,7 +13,7 @@ import type { FileEventItemSentinel } from "@lib/managers/StorageEventManager";
 import type { NodeFile, NodeFolder } from "@/apps/cli/adapters/NodeTypes";
 import { watch as chokidarWatch, type FSWatcher } from "chokidar";
 import type { IgnoreRules } from "@/apps/cli/serviceModules/IgnoreRules";
-import { fsPromises as fs, path, type Stats } from "../node-compat";
+import { fsPromises as fs, path, type Stats } from "@/apps/cli/node-compat";
 
 /**
  * CLI-specific type guard adapter

src/apps/cli/serviceModules/IgnoreRules.ts

@@ -1,5 +1,5 @@
 import { minimatch } from "minimatch";
-import { fsPromises as fs, path } from "../node-compat";
+import { fsPromises as fs, path } from "@/apps/cli/node-compat";
 
 /**
  * Loads and evaluates ignore rules from `.livesync/ignore` inside the vault.

src/apps/cli/services/NodeKeyValueDBService.ts

@@ -7,7 +7,7 @@ import type { InjectableDatabaseEventService } from "@lib/services/implements/in
 import type { IVaultService } from "@lib/services/base/IService";
 import type { SimpleStore } from "octagonal-wheels/databases/SimpleStoreBase";
 import { createInstanceLogFunction } from "@lib/services/lib/logUtils";
-import { fs as nodeFs, path as nodePath } from "../node-compat";
+import { fs as nodeFs, path as nodePath } from "@/apps/cli/node-compat";
 
 const NODE_KV_TYPED_KEY = "__nodeKvType";
 const NODE_KV_VALUES_KEY = "values";

src/apps/cli/services/NodeLocalStorage.ts

@@ -1,4 +1,4 @@
-import { fs as nodeFs, path as nodePath } from "../node-compat";
+import { fs as nodeFs, path as nodePath } from "@/apps/cli/node-compat";
 
 type LocalStorageShape = {
     getItem(key: string): string | null;

src/apps/cli/services/NodeServiceHub.ts

@@ -24,7 +24,7 @@ import { NodeKeyValueDBService } from "./NodeKeyValueDBService";
 import { NodeSettingService } from "./NodeSettingService";
 import { DatabaseService } from "@lib/services/base/DatabaseService";
 import type { ObsidianLiveSyncSettings } from "@lib/common/types";
-import { path as nodePath } from "../node-compat";
+import { path as nodePath } from "@/apps/cli/node-compat";
 
 export class NodeServiceContext extends ServiceContext {
     databasePath: string;

src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts

@@ -17,7 +17,7 @@ import { arrayToChunkedArray } from "octagonal-wheels/collection";
 import { EVENT_ANALYSE_DB_USAGE, EVENT_REQUEST_PERFORM_GC_V3, eventHub } from "@/common/events";
 import type { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
 import { delay } from "@lib/common/utils";
-import { isNotFoundError } from "@/lib/src/common/utils.doc";
+import { isNotFoundError } from "@lib/common/utils.doc";
 // import { _requestToCouchDB } from "@/common/utils";
 const DB_KEY_SEQ = "gc-seq";
 const DB_KEY_CHUNK_SET = "chunk-set";

src/modules/features/SettingDialogue/PaneSetup.ts

@@ -14,7 +14,7 @@ import { visibleOnly } from "./SettingPane.ts";
 import { DEFAULT_SETTINGS } from "@lib/common/types.ts";
 import { request } from "@/deps.ts";
 import { SetupManager, UserMode } from "@/modules/features/SetupManager.ts";
-import { LiveSyncError } from "@/lib/src/common/LSError.ts";
+import { LiveSyncError } from "@lib/common/LSError.ts";
 export function paneSetup(
     this: ObsidianLiveSyncSettingTab,
     paneEl: HTMLElement,