(chore): fix import paths

src/modules/AbstractObsidianModule.ts

@@ -1,6 +1,6 @@
-import { type Prettify } from "../lib/src/common/types";
-import type { LiveSyncCore } from "../main";
-import type ObsidianLiveSyncPlugin from "../main";
+import { type Prettify } from "@lib/common/types";
+import type { LiveSyncCore } from "@/main";
+import type ObsidianLiveSyncPlugin from "@/main";
 import { AbstractModule } from "./AbstractModule.ts";
 import type { ChainableExecuteFunction, OverridableFunctionsKeys } from "./ModuleTypes";
 

src/modules/ModuleTypes.ts

@@ -1,5 +1,5 @@
-import type { Prettify } from "../lib/src/common/types";
-import type { LiveSyncCore } from "../main";
+import type { Prettify } from "@lib/common/types";
+import type { LiveSyncCore } from "@/main";
 
 export type OverridableFunctionsKeys<T> = {
     [K in keyof T as K extends `$${string}` ? K : never]: T[K];

src/modules/core/ModulePeriodicProcess.ts

@@ -1,6 +1,6 @@
 import { PeriodicProcessor } from "@/common/PeriodicProcessor";
-import type { LiveSyncCore } from "../../main";
-import { AbstractModule } from "../AbstractModule";
+import type { LiveSyncCore } from "@/main";
+import { AbstractModule } from "@/modules/AbstractModule";
 
 export class ModulePeriodicProcess extends AbstractModule {
     periodicSyncProcessor = new PeriodicProcessor(this.core, async () => await this.services.replication.replicate());

src/modules/core/ModuleReplicator.ts

@@ -1,18 +1,18 @@
 import type PouchDB from "pouchdb-core";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { AbstractModule } from "../AbstractModule";
+import { AbstractModule } from "@/modules/AbstractModule";
 import { Logger, LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "octagonal-wheels/common/logger";
 import { skipIfDuplicated } from "octagonal-wheels/concurrency/lock";
 import { balanceChunkPurgedDBs } from "@lib/pouchdb/chunks";
 import { purgeUnreferencedChunks } from "@lib/pouchdb/chunks";
-import { LiveSyncCouchDBReplicator } from "../../lib/src/replication/couchdb/LiveSyncReplicator";
-import { type EntryDoc, type RemoteType } from "../../lib/src/common/types";
+import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
+import { type EntryDoc, type RemoteType } from "@lib/common/types";
 
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
-import { EVENT_FILE_SAVED, EVENT_SETTING_SAVED, eventHub } from "../../common/events";
+import { EVENT_FILE_SAVED, EVENT_SETTING_SAVED, eventHub } from "@/common/events";
 
-import { $msg } from "../../lib/src/common/i18n";
-import type { LiveSyncCore } from "../../main";
+import { $msg } from "@lib/common/i18n";
+import type { LiveSyncCore } from "@/main";
 import { ReplicateResultProcessor } from "./ReplicateResultProcessor";
 import { UnresolvedErrorManager } from "@lib/services/base/UnresolvedErrorManager";
 import { clearHandlers } from "@lib/replication/SyncParamsHandler";

src/modules/core/ModuleReplicatorCouchDB.ts

@@ -1,9 +1,9 @@
 import { fireAndForget } from "octagonal-wheels/promises";
-import { REMOTE_MINIO, REMOTE_P2P, type RemoteDBSettings } from "../../lib/src/common/types";
-import { LiveSyncCouchDBReplicator } from "../../lib/src/replication/couchdb/LiveSyncReplicator";
-import type { LiveSyncAbstractReplicator } from "../../lib/src/replication/LiveSyncAbstractReplicator";
-import { AbstractModule } from "../AbstractModule";
-import type { LiveSyncCore } from "../../main";
+import { REMOTE_MINIO, REMOTE_P2P, type RemoteDBSettings } from "@lib/common/types";
+import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
+import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator";
+import { AbstractModule } from "@/modules/AbstractModule";
+import type { LiveSyncCore } from "@/main";
 
 export class ModuleReplicatorCouchDB extends AbstractModule {
     _anyNewReplicator(settingOverride: Partial<RemoteDBSettings> = {}): Promise<LiveSyncAbstractReplicator | false> {

src/modules/core/ModuleReplicatorMinIO.ts

@@ -1,8 +1,8 @@
-import { REMOTE_MINIO, type RemoteDBSettings } from "../../lib/src/common/types";
-import { LiveSyncJournalReplicator } from "../../lib/src/replication/journal/LiveSyncJournalReplicator";
-import type { LiveSyncAbstractReplicator } from "../../lib/src/replication/LiveSyncAbstractReplicator";
-import type { LiveSyncCore } from "../../main";
-import { AbstractModule } from "../AbstractModule";
+import { REMOTE_MINIO, type RemoteDBSettings } from "@lib/common/types";
+import { LiveSyncJournalReplicator } from "@lib/replication/journal/LiveSyncJournalReplicator";
+import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator";
+import type { LiveSyncCore } from "@/main";
+import { AbstractModule } from "@/modules/AbstractModule";
 
 export class ModuleReplicatorMinIO extends AbstractModule {
     _anyNewReplicator(settingOverride: Partial<RemoteDBSettings> = {}): Promise<LiveSyncAbstractReplicator | false> {

src/modules/coreFeatures/ModuleConflictChecker.ts

@@ -1,9 +1,9 @@
-import { AbstractModule } from "../AbstractModule.ts";
-import { LOG_LEVEL_NOTICE, type FilePathWithPrefix } from "../../lib/src/common/types";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
+import { LOG_LEVEL_NOTICE, type FilePathWithPrefix } from "@lib/common/types";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
 import { sendValue } from "octagonal-wheels/messagepassing/signal";
-import type { InjectableServiceHub } from "../../lib/src/services/InjectableServices.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
+import type { LiveSyncCore } from "@/main.ts";
 
 export class ModuleConflictChecker extends AbstractModule {
     async _queueConflictCheckIfOpen(file: FilePathWithPrefix): Promise<void> {

src/modules/coreFeatures/ModuleConflictResolver.ts

@@ -1,5 +1,5 @@
 import { serialized } from "octagonal-wheels/concurrency/lock";
-import { AbstractModule } from "../AbstractModule.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import {
     AUTO_MERGED,
     CANCELLED,
@@ -10,15 +10,15 @@ import {
     NOT_CONFLICTED,
     type diff_check_result,
     type FilePathWithPrefix,
-} from "../../lib/src/common/types";
+} from "@lib/common/types";
 import { isCustomisationSyncMetadata, isPluginMetadata } from "@lib/common/typeUtils.ts";
 import { TARGET_IS_NEW } from "@lib/common/models/shared.const.symbols.ts";
 import { compareMTime, displayRev } from "@lib/common/utils.ts";
 import diff_match_patch from "diff-match-patch";
-import { stripAllPrefixes, isPlainText } from "../../lib/src/string_and_binary/path";
-import { eventHub } from "../../common/events.ts";
-import type { InjectableServiceHub } from "../../lib/src/services/InjectableServices.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import { stripAllPrefixes, isPlainText } from "@lib/string_and_binary/path";
+import { eventHub } from "@/common/events.ts";
+import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
+import type { LiveSyncCore } from "@/main.ts";
 
 declare global {
     interface LSEvents {

src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts

@@ -10,12 +10,12 @@ import {
     type RemoteDBSettings,
     IncompatibleChangesInSpecificPattern,
     CompatibleButLossyChanges,
-} from "../../lib/src/common/types.ts";
-import { escapeMarkdownValue } from "../../lib/src/common/utils.ts";
-import { AbstractModule } from "../AbstractModule.ts";
-import { $msg } from "../../lib/src/common/i18n.ts";
-import type { InjectableServiceHub } from "../../lib/src/services/InjectableServices.ts";
-import type { LiveSyncCore } from "../../main.ts";
+} from "@lib/common/types.ts";
+import { escapeMarkdownValue } from "@lib/common/utils.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
+import { $msg } from "@lib/common/i18n.ts";
+import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { REMOTE_P2P } from "@lib/common/models/setting.const.ts";
 
 function valueToString(value: unknown) {

src/modules/coreObsidian/UILib/dialogs.ts

@@ -1,6 +1,6 @@
 import { ButtonComponent } from "@/deps.ts";
-import { App, FuzzySuggestModal, MarkdownRenderer, Modal, Plugin, Setting } from "../../../deps.ts";
-import { EVENT_PLUGIN_UNLOADED, eventHub } from "../../../common/events.ts";
+import { App, FuzzySuggestModal, MarkdownRenderer, Modal, Plugin, Setting } from "@/deps.ts";
+import { EVENT_PLUGIN_UNLOADED, eventHub } from "@/common/events.ts";
 import { compatGlobal, type CompatIntervalHandle } from "@lib/common/coreEnvFunctions.ts";
 
 class AutoClosableModal extends Modal {

src/modules/coreObsidian/storageLib/utilObsidian.ts

@@ -1,10 +1,10 @@
 // Obsidian to LiveSync Utils
 
-import { TFile, type TAbstractFile, type TFolder } from "../../../deps.ts";
-import { ICHeader } from "../../../common/types.ts";
-import { addPrefix, isPlainText } from "../../../lib/src/string_and_binary/path.ts";
+import { TFile, type TAbstractFile, type TFolder } from "@/deps.ts";
+import { ICHeader } from "@/common/types.ts";
+import { addPrefix, isPlainText } from "@lib/string_and_binary/path.ts";
 import { LOG_LEVEL_VERBOSE, Logger } from "octagonal-wheels/common/logger";
-import { createBlob } from "../../../lib/src/common/utils.ts";
+import { createBlob } from "@lib/common/utils.ts";
 import type {
     FilePath,
     FilePathWithPrefix,
@@ -12,8 +12,8 @@ import type {
     UXFileInfoStub,
     UXFolderInfo,
     UXInternalFileInfoStub,
-} from "../../../lib/src/common/types.ts";
-import type { LiveSyncCore } from "../../../main.ts";
+} from "@lib/common/types.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import type { FileAccessObsidian } from "@/serviceModules/FileAccessObsidian.ts";
 
 export async function TFileToUXFileInfo(

src/modules/essential/ModuleBasicMenu.ts

@@ -1,7 +1,7 @@
 import type { LiveSyncCore } from "@/main";
 import { LOG_LEVEL_NOTICE } from "octagonal-wheels/common/logger";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { AbstractModule } from "../AbstractModule";
+import { AbstractModule } from "@/modules/AbstractModule";
 // Separated Module for basic menu commands, which are not related to obsidian specific features. It is expected to be used in other platforms with minimal changes.
 // However, it is odd that it has here at all; it really ought to be in each respective feature. It will likely be moved eventually. Until now, addCommand pointed to Obsidian's version.
 export class ModuleBasicMenu extends AbstractModule {

src/modules/essential/ModuleMigration.ts

@@ -1,4 +1,4 @@
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "../../lib/src/common/logger.ts";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "@lib/common/logger.ts";
 import {
     EVENT_REQUEST_OPEN_P2P,
     EVENT_REQUEST_OPEN_SETTING_WIZARD,
@@ -6,16 +6,16 @@ import {
     EVENT_REQUEST_RUN_DOCTOR,
     EVENT_REQUEST_RUN_FIX_INCOMPLETE,
     eventHub,
-} from "../../common/events.ts";
-import { AbstractModule } from "../AbstractModule.ts";
+} from "@/common/events.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import { $msg } from "@lib/common/i18n.ts";
-import { performDoctorConsultation, RebuildOptions } from "../../lib/src/common/configForDoc.ts";
-import { isValidPath } from "../../common/utils.ts";
-import { isMetaEntry } from "../../lib/src/common/types.ts";
-import { isDeletedEntry, isDocContentSame, isLoadedEntry, readAsBlob } from "../../lib/src/common/utils.ts";
-import { countCompromisedChunks } from "../../lib/src/pouchdb/negotiation.ts";
-import type { LiveSyncCore } from "../../main.ts";
-import { SetupManager } from "../features/SetupManager.ts";
+import { performDoctorConsultation, RebuildOptions } from "@lib/common/configForDoc.ts";
+import { isValidPath } from "@/common/utils.ts";
+import { isMetaEntry } from "@lib/common/types.ts";
+import { isDeletedEntry, isDocContentSame, isLoadedEntry, readAsBlob } from "@lib/common/utils.ts";
+import { countCompromisedChunks } from "@lib/pouchdb/negotiation.ts";
+import type { LiveSyncCore } from "@/main.ts";
+import { SetupManager } from "@/modules/features/SetupManager.ts";
 
 type ErrorInfo = {
     path: string;

src/modules/essentialObsidian/APILib/ObsHttpHandler.ts

@@ -8,7 +8,7 @@ import { HttpRequest, HttpResponse, type HttpHandlerOptions } from "@smithy/prot
 //@ts-ignore
 import { requestTimeout } from "@smithy/fetch-http-handler/dist-es/request-timeout";
 import { buildQueryString } from "@smithy/querystring-builder";
-import { requestUrl, type RequestUrlParam } from "../../../deps.ts";
+import { requestUrl, type RequestUrlParam } from "@/deps.ts";
 ////////////////////////////////////////////////////////////////////////////////
 // special handler using Obsidian requestUrl
 ////////////////////////////////////////////////////////////////////////////////

src/modules/essentialObsidian/ModuleObsidianEvents.ts

@@ -1,18 +1,18 @@
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
-import { EVENT_FILE_RENAMED, EVENT_LEAF_ACTIVE_CHANGED, eventHub } from "../../common/events.js";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
+import { EVENT_FILE_RENAMED, EVENT_LEAF_ACTIVE_CHANGED, eventHub } from "@/common/events.js";
 import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
-import { type TFile } from "../../deps.ts";
+import { type TFile } from "@/deps.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { type FilePathWithPrefix } from "../../lib/src/common/types.ts";
+import { type FilePathWithPrefix } from "@lib/common/types.ts";
 import { reactive, reactiveSource, type ReactiveSource } from "octagonal-wheels/dataobject/reactive";
 import {
     collectingChunks,
     pluginScanningCount,
     hiddenFilesEventCount,
     hiddenFilesProcessingCount,
-} from "../../lib/src/mock_and_interop/stores.ts";
-import type { LiveSyncCore } from "../../main.ts";
+} from "@lib/mock_and_interop/stores.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { compatGlobal } from "@lib/common/coreEnvFunctions.ts";
 
 export class ModuleObsidianEvents extends AbstractObsidianModule {

src/modules/essentialObsidian/ModuleObsidianMenu.ts

@@ -3,7 +3,7 @@ import { addIcon } from "@/deps.ts";
 import { type FilePathWithPrefix } from "@lib/common/types.ts";
 import { $msg } from "@lib/common/i18n.ts";
 import type { LiveSyncCore } from "@/main.ts";
-import { AbstractModule } from "../AbstractModule.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 // Obsidian specific menu commands.
 export class ModuleObsidianMenu extends AbstractModule {
     _everyOnloadStart(): Promise<boolean> {

src/modules/extras/ModuleDev.ts

@@ -1,13 +1,13 @@
 import { delay, fireAndForget } from "octagonal-wheels/promises";
-import { __onMissingTranslation } from "../../lib/src/common/i18n";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
+import { __onMissingTranslation } from "@lib/common/i18n";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
-import { eventHub } from "../../common/events";
+import { eventHub } from "@/common/events";
 import { enableTestFunction } from "./devUtil/testUtils.ts";
 import { TestPaneView, VIEW_TYPE_TEST } from "./devUtil/TestPaneView.ts";
 import { writable } from "svelte/store";
-import type { FilePathWithPrefix } from "../../lib/src/common/types.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import type { FilePathWithPrefix } from "@lib/common/types.ts";
+import type { LiveSyncCore } from "@/main.ts";
 export class ModuleDev extends AbstractObsidianModule {
     _everyOnloadStart(): Promise<boolean> {
         __onMissingTranslation(() => {});

src/modules/extras/devUtil/TestPane.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
     import { onMount } from "svelte";
-    import type ObsidianLiveSyncPlugin from "../../../main.ts";
+    import type ObsidianLiveSyncPlugin from "@/main.ts";
     import { perf_trench } from "./tests.ts";
-    import { MarkdownRenderer, Notice } from "../../../deps.ts";
-    import type { ModuleDev } from "../ModuleDev.ts";
+    import { MarkdownRenderer, Notice } from "@/deps.ts";
+    import type { ModuleDev } from "@/modules/extras/ModuleDev.ts";
     import { fireAndForget } from "octagonal-wheels/promises";
-    import { EVENT_LAYOUT_READY, eventHub } from "../../../common/events.ts";
+    import { EVENT_LAYOUT_READY, eventHub } from "@/common/events.ts";
     export let plugin: ObsidianLiveSyncPlugin;
     export let moduleDev: ModuleDev;
     $: core = plugin.core;

src/modules/extras/devUtil/TestPaneView.ts

@@ -1,7 +1,7 @@
 import { ItemView, WorkspaceLeaf } from "@/deps.ts";
 import TestPaneComponent from "./TestPane.svelte";
-import type ObsidianLiveSyncPlugin from "../../../main.ts";
-import type { ModuleDev } from "../ModuleDev.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
+import type { ModuleDev } from "@/modules/extras/ModuleDev.ts";
 export const VIEW_TYPE_TEST = "ols-pane-test";
 declare global {
     interface LSEvents {

src/modules/extras/devUtil/testUtils.ts

@@ -1,6 +1,6 @@
-import { fireAndForget } from "../../../lib/src/common/utils.ts";
+import { fireAndForget } from "@lib/common/utils.ts";
 import { serialized } from "octagonal-wheels/concurrency/lock";
-import type ObsidianLiveSyncPlugin from "../../../main.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
 
 let plugin: ObsidianLiveSyncPlugin;
 export function enableTestFunction(plugin_: ObsidianLiveSyncPlugin) {

src/modules/features/DocumentHistory/DocumentHistoryModal.ts

@@ -1,7 +1,7 @@
-import { TFile, Modal, App, DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "../../../deps.ts";
-import { getPathFromTFile, isValidPath } from "../../../common/utils.ts";
-import { decodeBinary, readString } from "../../../lib/src/string_and_binary/convert.ts";
-import ObsidianLiveSyncPlugin from "../../../main.ts";
+import { TFile, Modal, App, DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_patch } from "@/deps.ts";
+import { getPathFromTFile, isValidPath } from "@/common/utils.ts";
+import { decodeBinary, readString } from "@lib/string_and_binary/convert.ts";
+import ObsidianLiveSyncPlugin from "@/main.ts";
 import {
     type DocumentID,
     type FilePathWithPrefix,
@@ -9,11 +9,11 @@ import {
     LOG_LEVEL_INFO,
     LOG_LEVEL_NOTICE,
     LOG_LEVEL_VERBOSE,
-} from "../../../lib/src/common/types.ts";
-import { Logger } from "../../../lib/src/common/logger.ts";
-import { isErrorOfMissingDoc } from "../../../lib/src/pouchdb/utils_couchdb.ts";
-import { fireAndForget, getDocData, readContent } from "../../../lib/src/common/utils.ts";
-import { isPlainText, stripPrefix } from "../../../lib/src/string_and_binary/path.ts";
+} from "@lib/common/types.ts";
+import { Logger } from "@lib/common/logger.ts";
+import { isErrorOfMissingDoc } from "@lib/pouchdb/utils_couchdb.ts";
+import { fireAndForget, getDocData, readContent } from "@lib/common/utils.ts";
+import { isPlainText, stripPrefix } from "@lib/string_and_binary/path.ts";
 import { scheduleOnceIfDuplicated } from "octagonal-wheels/concurrency/lock";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
 import { compatGlobal } from "@lib/common/coreEnvFunctions.ts";

src/modules/features/GlobalHistory/GlobalHistory.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
-    import ObsidianLiveSyncPlugin from "../../../main.ts";
+    import ObsidianLiveSyncPlugin from "@/main.ts";
     import { onDestroy, onMount } from "svelte";
-    import type { AnyEntry, FilePathWithPrefix } from "../../../lib/src/common/types.ts";
-    import { getDocData, isAnyNote, isDocContentSame, readAsBlob } from "../../../lib/src/common/utils.ts";
-    import { diff_match_patch } from "../../../deps.ts";
-    import { DocumentHistoryModal } from "../DocumentHistory/DocumentHistoryModal.ts";
-    import { isPlainText, stripAllPrefixes } from "../../../lib/src/string_and_binary/path.ts";
+    import type { AnyEntry, FilePathWithPrefix } from "@lib/common/types.ts";
+    import { getDocData, isAnyNote, isDocContentSame, readAsBlob } from "@lib/common/utils.ts";
+    import { diff_match_patch } from "@/deps.ts";
+    import { DocumentHistoryModal } from "@/modules/features/DocumentHistory/DocumentHistoryModal.ts";
+    import { isPlainText, stripAllPrefixes } from "@lib/string_and_binary/path.ts";
     import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
     export let plugin: ObsidianLiveSyncPlugin;
     export let core: LiveSyncBaseCore;

src/modules/features/GlobalHistory/GlobalHistoryView.ts

@@ -1,7 +1,7 @@
-import { WorkspaceLeaf } from "../../../deps.ts";
+import { WorkspaceLeaf } from "@/deps.ts";
 import GlobalHistoryComponent from "./GlobalHistory.svelte";
-import type ObsidianLiveSyncPlugin from "../../../main.ts";
-import { SvelteItemView } from "../../../common/SvelteItemView.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
+import { SvelteItemView } from "@/common/SvelteItemView.ts";
 import { mount } from "svelte";
 
 export const VIEW_TYPE_GLOBAL_HISTORY = "global-history";

src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts

@@ -1,9 +1,9 @@
-import { App, Modal } from "../../../deps.ts";
+import { App, Modal } from "@/deps.ts";
 import { DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT } from "diff-match-patch";
-import { CANCELLED, LEAVE_TO_SUBSEQUENT, type diff_result } from "../../../lib/src/common/types.ts";
-import { delay } from "../../../lib/src/common/utils.ts";
-import { eventHub } from "../../../common/events.ts";
-import { globalSlipBoard } from "../../../lib/src/bureau/bureau.ts";
+import { CANCELLED, LEAVE_TO_SUBSEQUENT, type diff_result } from "@lib/common/types.ts";
+import { delay } from "@lib/common/utils.ts";
+import { eventHub } from "@/common/events.ts";
+import { globalSlipBoard } from "@lib/bureau/bureau.ts";
 
 export type MergeDialogResult = typeof CANCELLED | typeof LEAVE_TO_SUBSEQUENT | string;
 

src/modules/features/Log/LogPane.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
     import { onDestroy, onMount } from "svelte";
-    import { logMessages } from "../../../lib/src/mock_and_interop/stores";
+    import { logMessages } from "@lib/mock_and_interop/stores";
     import { reactive, type ReactiveInstance } from "octagonal-wheels/dataobject/reactive";
-    import { Logger } from "../../../lib/src/common/logger";
-    import { $msg as msg, currentLang as lang } from "../../../lib/src/common/i18n.ts";
+    import { Logger } from "@lib/common/logger";
+    import { $msg as msg, currentLang as lang } from "@lib/common/i18n.ts";
     import { compatGlobal } from "@lib/common/coreEnvFunctions.ts";
 
     let unsubscribe: () => void;

src/modules/features/Log/LogPaneView.ts

@@ -1,7 +1,7 @@
 import { WorkspaceLeaf } from "@/deps.ts";
 import LogPaneComponent from "./LogPane.svelte";
-import type ObsidianLiveSyncPlugin from "../../../main.ts";
-import { SvelteItemView } from "../../../common/SvelteItemView.ts";
+import type ObsidianLiveSyncPlugin from "@/main.ts";
+import { SvelteItemView } from "@/common/SvelteItemView.ts";
 import { $msg } from "@lib/common/i18n.ts";
 import { mount } from "svelte";
 export const VIEW_TYPE_LOG = "log-log";

src/modules/features/ModuleGlobalHistory.ts

@@ -1,4 +1,4 @@
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { VIEW_TYPE_GLOBAL_HISTORY, GlobalHistoryView } from "./GlobalHistory/GlobalHistoryView.ts";
 
 export class ModuleObsidianGlobalHistory extends AbstractObsidianModule {

src/modules/features/ModuleInteractiveConflictResolver.ts

@@ -8,13 +8,13 @@ import {
     type DocumentID,
     type FilePathWithPrefix,
     type diff_result,
-} from "../../lib/src/common/types.ts";
+} from "@lib/common/types.ts";
 import { ConflictResolveModal } from "./InteractiveConflictResolving/ConflictResolveModal.ts";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
-import { displayRev } from "../../common/utils.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
+import { displayRev } from "@/common/utils.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
 import { serialized } from "octagonal-wheels/concurrency/lock";
-import type { LiveSyncCore } from "../../main.ts";
+import type { LiveSyncCore } from "@/main.ts";
 
 export class ModuleInteractiveConflictResolver extends AbstractObsidianModule {
     _everyOnloadStart(): Promise<boolean> {

src/modules/features/ModuleLog.ts

@@ -6,9 +6,9 @@ import {
     PREFIXMD_LOGFILE,
     type DatabaseConnectingStatus,
     type LOG_LEVEL,
-} from "../../lib/src/common/types.ts";
+} from "@lib/common/types.ts";
 import { cancelTask, scheduleTask } from "octagonal-wheels/concurrency/task";
-import { fireAndForget, isDirty, throttle } from "../../lib/src/common/utils.ts";
+import { fireAndForget, isDirty, throttle } from "@lib/common/utils.ts";
 import {
     collectingChunks,
     pluginScanningCount,
@@ -16,22 +16,22 @@ import {
     hiddenFilesProcessingCount,
     type LogEntry,
     logMessages,
-} from "../../lib/src/mock_and_interop/stores.ts";
-import { eventHub } from "../../lib/src/hub/hub.ts";
+} from "@lib/mock_and_interop/stores.ts";
+import { eventHub } from "@lib/hub/hub.ts";
 import {
     EVENT_FILE_RENAMED,
     EVENT_LAYOUT_READY,
     EVENT_LEAF_ACTIVE_CHANGED,
     EVENT_ON_UNRESOLVED_ERROR,
-} from "../../common/events.ts";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
-import { addIcon, debounce, normalizePath, Notice, stringifyYaml, type WorkspaceLeaf } from "../../deps.ts";
+} from "@/common/events.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
+import { addIcon, debounce, normalizePath, Notice, stringifyYaml, type WorkspaceLeaf } from "@/deps.ts";
 import { LOG_LEVEL_NOTICE, setGlobalLogFunction } from "octagonal-wheels/common/logger";
 import { LogPaneView, VIEW_TYPE_LOG } from "./Log/LogPaneView.ts";
 import { serialized } from "octagonal-wheels/concurrency/lock";
 import { $msg } from "@lib/common/i18n.ts";
 import { P2PLogCollector } from "@/lib/src/replication/trystero/P2PLogCollector.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { LiveSyncError } from "@lib/common/LSError.ts";
 import { isValidPath } from "@/common/utils.ts";
 import {

src/modules/features/ModuleObsidianDocumentHistory.ts

@@ -1,8 +1,8 @@
 import { type TFile } from "@/deps.ts";
-import { eventHub } from "../../common/events.ts";
-import { EVENT_REQUEST_SHOW_HISTORY } from "../../common/obsidianEvents.ts";
-import type { FilePathWithPrefix, LoadedEntry, DocumentID } from "../../lib/src/common/types.ts";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
+import { eventHub } from "@/common/events.ts";
+import { EVENT_REQUEST_SHOW_HISTORY } from "@/common/obsidianEvents.ts";
+import type { FilePathWithPrefix, LoadedEntry, DocumentID } from "@lib/common/types.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { DocumentHistoryModal } from "./DocumentHistory/DocumentHistoryModal.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
 

src/modules/features/ModuleObsidianSettingAsMarkdown.ts

@@ -1,11 +1,11 @@
 // import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser";
 import { isObjectDifferent } from "octagonal-wheels/object";
-import { EVENT_SETTING_SAVED, eventHub } from "../../common/events";
+import { EVENT_SETTING_SAVED, eventHub } from "@/common/events";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { DEFAULT_SETTINGS, type FilePathWithPrefix, type ObsidianLiveSyncSettings } from "../../lib/src/common/types";
-import { parseYaml, stringifyYaml } from "../../deps";
+import { DEFAULT_SETTINGS, type FilePathWithPrefix, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { parseYaml, stringifyYaml } from "@/deps";
 import { LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger";
-import { AbstractModule } from "../AbstractModule.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import type { ServiceContext } from "@lib/services/base/ServiceBase.ts";
 import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
 import type { LiveSyncCore } from "@/main.ts";

src/modules/features/ModuleObsidianSettingTab.ts

@@ -1,7 +1,7 @@
 import { ObsidianLiveSyncSettingTab } from "./SettingDialogue/ObsidianLiveSyncSettingTab.ts";
-import { AbstractObsidianModule } from "../AbstractObsidianModule.ts";
+import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 // import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser";
-import { EVENT_REQUEST_OPEN_SETTING_WIZARD, EVENT_REQUEST_OPEN_SETTINGS, eventHub } from "../../common/events.ts";
+import { EVENT_REQUEST_OPEN_SETTING_WIZARD, EVENT_REQUEST_OPEN_SETTINGS, eventHub } from "@/common/events.ts";
 import type { LiveSyncCore } from "@/main.ts";
 
 export class ModuleObsidianSettingDialogue extends AbstractObsidianModule {

src/modules/features/SettingDialogue/MultipleRegExpControl.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-    import type { CustomRegExpSource } from "../../../lib/src/common/types";
-    import { isInvertedRegExp, isValidRegExp } from "../../../lib/src/common/utils";
+    import type { CustomRegExpSource } from "@lib/common/types";
+    import { isInvertedRegExp, isValidRegExp } from "@lib/common/utils";
 
     export let patterns = [] as CustomRegExpSource[];
     export let originals = [] as CustomRegExpSource[];

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts

@@ -1,4 +1,4 @@
-import { App, PluginSettingTab } from "../../../deps.ts";
+import { App, PluginSettingTab } from "@/deps.ts";
 import {
     type ObsidianLiveSyncSettings,
     type RemoteDBSettings,
@@ -12,15 +12,15 @@ import {
     LEVEL_ADVANCED,
     LEVEL_EDGE_CASE,
     REMOTE_P2P,
-} from "../../../lib/src/common/types.ts";
-import { delay, isObjectDifferent, sizeToHumanReadable } from "../../../lib/src/common/utils.ts";
-import { versionNumberString2Number } from "../../../lib/src/string_and_binary/convert.ts";
-import { Logger } from "../../../lib/src/common/logger.ts";
+} from "@lib/common/types.ts";
+import { delay, isObjectDifferent, sizeToHumanReadable } from "@lib/common/utils.ts";
+import { versionNumberString2Number } from "@lib/string_and_binary/convert.ts";
+import { Logger } from "@lib/common/logger.ts";
 import { checkSyncInfo } from "@lib/pouchdb/negotiation.ts";
 import { testCrypt } from "octagonal-wheels/encryption/encryption";
-import ObsidianLiveSyncPlugin from "../../../main.ts";
-import { scheduleTask } from "../../../common/utils.ts";
-import { LiveSyncCouchDBReplicator } from "../../../lib/src/replication/couchdb/LiveSyncReplicator.ts";
+import ObsidianLiveSyncPlugin from "@/main.ts";
+import { scheduleTask } from "@/common/utils.ts";
+import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator.ts";
 import {
     type AllSettingItemKey,
     type AllStringItemKey,
@@ -31,12 +31,12 @@ import {
     type OnDialogSettings,
     getConfName,
 } from "./settingConstants.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import { fireAndForget, yieldNextAnimationFrame } from "octagonal-wheels/promises";
-import { confirmWithMessage } from "../../coreObsidian/UILib/dialogs.ts";
-import { EVENT_REQUEST_RELOAD_SETTING_TAB, eventHub } from "../../../common/events.ts";
-import { JournalSyncMinio } from "../../../lib/src/replication/journal/objectstore/JournalSyncMinio.ts";
+import { confirmWithMessage } from "@/modules/coreObsidian/UILib/dialogs.ts";
+import { EVENT_REQUEST_RELOAD_SETTING_TAB, eventHub } from "@/common/events.ts";
+import { JournalSyncMinio } from "@lib/replication/journal/objectstore/JournalSyncMinio.ts";
 import { paneChangeLog } from "./PaneChangeLog.ts";
 import {
     enableOnly,

src/modules/features/SettingDialogue/PaneAdvanced.ts

@@ -1,4 +1,4 @@
-import { ChunkAlgorithmNames } from "../../../lib/src/common/types.ts";
+import { ChunkAlgorithmNames } from "@lib/common/types.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";

src/modules/features/SettingDialogue/PaneChangeLog.ts

@@ -1,6 +1,6 @@
-import { MarkdownRenderer } from "../../../deps.ts";
-import { versionNumberString2Number } from "../../../lib/src/string_and_binary/convert.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { MarkdownRenderer } from "@/deps.ts";
+import { versionNumberString2Number } from "@lib/string_and_binary/convert.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import { visibleOnly } from "./SettingPane.ts";

src/modules/features/SettingDialogue/PaneCustomisationSync.ts

@@ -1,5 +1,5 @@
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
-import { EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG, eventHub } from "../../../common/events.ts";
+import { EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG, eventHub } from "@/common/events.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { enableOnly, visibleOnly } from "./SettingPane.ts";

src/modules/features/SettingDialogue/PaneGeneral.ts

@@ -1,5 +1,5 @@
-import { $msg, $t } from "../../../lib/src/common/i18n.ts";
-import { SUPPORTED_I18N_LANGS, type I18N_LANGS } from "../../../lib/src/common/rosetta.ts";
+import { $msg, $t } from "@lib/common/i18n.ts";
+import { SUPPORTED_I18N_LANGS, type I18N_LANGS } from "@lib/common/rosetta.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";

src/modules/features/SettingDialogue/PaneMaintenance.ts

@@ -1,8 +1,8 @@
 import { EVENT_REQUEST_PERFORM_GC_V3, eventHub } from "@/common/events.ts";
-import { LOG_LEVEL_NOTICE, Logger } from "../../../lib/src/common/logger.ts";
-import { FlagFilesHumanReadable, FLAGMD_REDFLAG } from "../../../lib/src/common/types.ts";
-import { fireAndForget } from "../../../lib/src/common/utils.ts";
-import { LiveSyncCouchDBReplicator } from "../../../lib/src/replication/couchdb/LiveSyncReplicator.ts";
+import { LOG_LEVEL_NOTICE, Logger } from "@lib/common/logger.ts";
+import { FlagFilesHumanReadable, FLAGMD_REDFLAG } from "@lib/common/types.ts";
+import { fireAndForget } from "@lib/common/utils.ts";
+import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab";
 import { visibleOnly, type PageFunctions } from "./SettingPane";

src/modules/features/SettingDialogue/PanePatches.ts

@@ -4,14 +4,14 @@ import {
     type HashAlgorithm,
     LOG_LEVEL_NOTICE,
     SuffixDatabaseName,
-} from "../../../lib/src/common/types.ts";
-import { Logger } from "../../../lib/src/common/logger.ts";
+} from "@lib/common/types.ts";
+import { Logger } from "@lib/common/logger.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { visibleOnly } from "./SettingPane.ts";
-import { PouchDB } from "../../../lib/src/pouchdb/pouchdb-browser";
-import { ExtraSuffixIndexedDB } from "../../../lib/src/common/types.ts";
+import { PouchDB } from "@lib/pouchdb/pouchdb-browser";
+import { ExtraSuffixIndexedDB } from "@lib/common/types.ts";
 import { migrateDatabases } from "./settingUtils.ts";
 
 export function panePatches(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void {

src/modules/features/SettingDialogue/PanePowerUsers.ts

@@ -1,4 +1,4 @@
-import { type ConfigPassphraseStore } from "../../../lib/src/common/types.ts";
+import { type ConfigPassphraseStore } from "@lib/common/types.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";

src/modules/features/SettingDialogue/PaneRemoteConfig.ts

@@ -6,9 +6,9 @@ import {
     LOG_LEVEL_NOTICE,
     type ObsidianLiveSyncSettings,
     LOG_LEVEL_VERBOSE,
-} from "../../../lib/src/common/types.ts";
+} from "@lib/common/types.ts";
 import { Menu, ButtonComponent } from "@/deps.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
@@ -22,17 +22,17 @@ import {
     getCouchDBConfigSummary,
     getE2EEConfigSummary,
 } from "./settingUtils.ts";
-import { SETTING_KEY_P2P_DEVICE_NAME } from "../../../lib/src/common/types.ts";
-import { SetupManager, UserMode } from "../SetupManager.ts";
+import { SETTING_KEY_P2P_DEVICE_NAME } from "@lib/common/types.ts";
+import { SetupManager, UserMode } from "@/modules/features/SetupManager.ts";
 import { OnDialogSettingsDefault, type AllSettings } from "./settingConstants.ts";
-import { activateRemoteConfiguration } from "../../../lib/src/serviceFeatures/remoteConfig.ts";
-import { ConnectionStringParser } from "../../../lib/src/common/ConnectionString.ts";
-import type { RemoteConfigurationResult } from "../../../lib/src/common/ConnectionString.ts";
-import type { RemoteConfiguration } from "../../../lib/src/common/models/setting.type.ts";
-import SetupRemote from "../SetupWizard/dialogs/SetupRemote.svelte";
-import SetupRemoteCouchDB from "../SetupWizard/dialogs/SetupRemoteCouchDB.svelte";
-import SetupRemoteBucket from "../SetupWizard/dialogs/SetupRemoteBucket.svelte";
-import SetupRemoteP2P from "../SetupWizard/dialogs/SetupRemoteP2P.svelte";
+import { activateRemoteConfiguration } from "@lib/serviceFeatures/remoteConfig.ts";
+import { ConnectionStringParser } from "@lib/common/ConnectionString.ts";
+import type { RemoteConfigurationResult } from "@lib/common/ConnectionString.ts";
+import type { RemoteConfiguration } from "@lib/common/models/setting.type.ts";
+import SetupRemote from "@/modules/features/SetupWizard/dialogs/SetupRemote.svelte";
+import SetupRemoteCouchDB from "@/modules/features/SetupWizard/dialogs/SetupRemoteCouchDB.svelte";
+import SetupRemoteBucket from "@/modules/features/SetupWizard/dialogs/SetupRemoteBucket.svelte";
+import SetupRemoteP2P from "@/modules/features/SetupWizard/dialogs/SetupRemoteP2P.svelte";
 import { syncActivatedRemoteSettings } from "./remoteConfigBuffer.ts";
 
 function getSettingsFromEditingSettings(editingSettings: AllSettings): ObsidianLiveSyncSettings {

src/modules/features/SettingDialogue/PaneSelector.ts

@@ -1,5 +1,5 @@
-import { LEVEL_ADVANCED, type CustomRegExpSource } from "../../../lib/src/common/types.ts";
-import { constructCustomRegExpList, splitCustomRegExpList } from "../../../lib/src/common/utils.ts";
+import { LEVEL_ADVANCED, type CustomRegExpSource } from "@lib/common/types.ts";
+import { constructCustomRegExpList, splitCustomRegExpList } from "@lib/common/utils.ts";
 import MultipleRegExpControl from "./MultipleRegExpControl.svelte";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import { mount } from "svelte";

src/modules/features/SettingDialogue/PaneSetup.ts

@@ -1,5 +1,5 @@
-import { MarkdownRenderer } from "../../../deps.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { MarkdownRenderer } from "@/deps.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
 import {
@@ -7,13 +7,13 @@ import {
     EVENT_REQUEST_OPEN_SETUP_URI,
     EVENT_REQUEST_SHOW_SETUP_QR,
     eventHub,
-} from "../../../common/events.ts";
+} from "@/common/events.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { visibleOnly } from "./SettingPane.ts";
-import { DEFAULT_SETTINGS } from "../../../lib/src/common/types.ts";
+import { DEFAULT_SETTINGS } from "@lib/common/types.ts";
 import { request } from "@/deps.ts";
-import { SetupManager, UserMode } from "../SetupManager.ts";
+import { SetupManager, UserMode } from "@/modules/features/SetupManager.ts";
 export function paneSetup(
     this: ObsidianLiveSyncSettingTab,
     paneEl: HTMLElement,

src/modules/features/SettingDialogue/PaneSyncSettings.ts

@@ -1,13 +1,8 @@
-import {
-    type ObsidianLiveSyncSettings,
-    LOG_LEVEL_NOTICE,
-    REMOTE_COUCHDB,
-    LEVEL_ADVANCED,
-} from "../../../lib/src/common/types.ts";
-import { Logger } from "../../../lib/src/common/logger.ts";
-import { $msg } from "../../../lib/src/common/i18n.ts";
+import { type ObsidianLiveSyncSettings, LOG_LEVEL_NOTICE, REMOTE_COUCHDB, LEVEL_ADVANCED } from "@lib/common/types.ts";
+import { Logger } from "@lib/common/logger.ts";
+import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
-import { EVENT_REQUEST_COPY_SETUP_URI, eventHub } from "../../../common/events.ts";
+import { EVENT_REQUEST_COPY_SETUP_URI, eventHub } from "@/common/events.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { visibleOnly } from "./SettingPane.ts";

src/modules/features/SettingDialogue/SettingPane.ts

@@ -1,5 +1,5 @@
-import { $msg } from "../../../lib/src/common/i18n";
-import { LEVEL_ADVANCED, LEVEL_EDGE_CASE, LEVEL_POWER_USER, type ConfigLevel } from "../../../lib/src/common/types";
+import { $msg } from "@lib/common/i18n";
+import { LEVEL_ADVANCED, LEVEL_EDGE_CASE, LEVEL_POWER_USER, type ConfigLevel } from "@lib/common/types";
 import type { AllSettingItemKey, AllSettings } from "./settingConstants";
 
 export const combineOnUpdate = (func1: OnUpdateFunc, func2: OnUpdateFunc): OnUpdateFunc => {

src/modules/features/SettingDialogue/settingUtils.ts

@@ -1,16 +1,11 @@
 import { escapeStringToHTML } from "octagonal-wheels/string";
-import {
-    E2EEAlgorithmNames,
-    MILESTONE_DOCID,
-    NODEINFO_DOCID,
-    type ObsidianLiveSyncSettings,
-} from "../../../lib/src/common/types";
+import { E2EEAlgorithmNames, MILESTONE_DOCID, NODEINFO_DOCID, type ObsidianLiveSyncSettings } from "@lib/common/types";
 import {
     pickCouchDBSyncSettings,
     pickBucketSyncSettings,
     pickP2PSyncSettings,
     pickEncryptionSettings,
-} from "../../../lib/src/common/utils";
+} from "@lib/common/utils";
 import { getConfig, type AllSettingItemKey } from "./settingConstants";
 import { LOG_LEVEL_NOTICE, Logger } from "octagonal-wheels/common/logger";
 import { isNotFoundError } from "@lib/common/utils.doc.ts";

src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts

@@ -1,10 +1,10 @@
-import { requestToCouchDBWithCredentials } from "../../../common/utils";
-import { $msg } from "../../../lib/src/common/i18n";
-import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "../../../lib/src/common/logger";
-import type { ObsidianLiveSyncSettings } from "../../../lib/src/common/types";
-import { fireAndForget, parseHeaderValues } from "../../../lib/src/common/utils";
-import { isCloudantURI } from "../../../lib/src/pouchdb/utils_couchdb";
-import { generateCredentialObject } from "../../../lib/src/replication/httplib";
+import { requestToCouchDBWithCredentials } from "@/common/utils";
+import { $msg } from "@lib/common/i18n";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "@lib/common/logger";
+import type { ObsidianLiveSyncSettings } from "@lib/common/types";
+import { fireAndForget, parseHeaderValues } from "@lib/common/utils";
+import { isCloudantURI } from "@lib/pouchdb/utils_couchdb";
+import { generateCredentialObject } from "@lib/replication/httplib";
 
 export const checkConfig = async (
     checkResultDiv: HTMLDivElement | undefined,

src/modules/features/SetupManager.ts

@@ -26,7 +26,7 @@ import SetupRemoteBucket from "./SetupWizard/dialogs/SetupRemoteBucket.svelte";
 import SetupRemoteP2P from "./SetupWizard/dialogs/SetupRemoteP2P.svelte";
 import SetupRemoteE2EE from "./SetupWizard/dialogs/SetupRemoteE2EE.svelte";
 import { decodeSettingsFromQRCodeData } from "@lib/API/processSetting.ts";
-import { AbstractModule } from "../AbstractModule.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import { ConnectionStringParser } from "@lib/common/ConnectionString.ts";
 import type {
     OutroAskUserModeResultType,

src/modules/features/SetupWizard/dialogs/utilCheckCouchDB.ts

@@ -1,10 +1,10 @@
-import { requestToCouchDBWithCredentials } from "../../../../common/utils";
-import { $msg } from "../../../../lib/src/common/i18n";
-import { Logger } from "../../../../lib/src/common/logger";
-import type { ObsidianLiveSyncSettings } from "../../../../lib/src/common/types";
-import { parseHeaderValues } from "../../../../lib/src/common/utils";
-import { isCloudantURI } from "../../../../lib/src/pouchdb/utils_couchdb";
-import { generateCredentialObject } from "../../../../lib/src/replication/httplib";
+import { requestToCouchDBWithCredentials } from "@/common/utils";
+import { $msg } from "@lib/common/i18n";
+import { Logger } from "@lib/common/logger";
+import type { ObsidianLiveSyncSettings } from "@lib/common/types";
+import { parseHeaderValues } from "@lib/common/utils";
+import { isCloudantURI } from "@lib/pouchdb/utils_couchdb";
+import { generateCredentialObject } from "@lib/replication/httplib";
 export type ResultMessage = { message: string; classes: string[] };
 export type ResultErrorMessage = { message: string; result: "error"; classes: string[] };
 export type ResultOk = { message: string; result: "ok"; value?: unknown };

src/modules/main/ModuleLiveSyncMain.ts

@@ -1,17 +1,17 @@
 import { fireAndForget } from "octagonal-wheels/promises";
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, VER, type ObsidianLiveSyncSettings } from "../../lib/src/common/types.ts";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, VER, type ObsidianLiveSyncSettings } from "@lib/common/types.ts";
 import {
     EVENT_LAYOUT_READY,
     EVENT_PLUGIN_LOADED,
     EVENT_REQUEST_RELOAD_SETTING_TAB,
     EVENT_SETTING_SAVED,
     eventHub,
-} from "../../common/events.ts";
-import { $msg, setLang } from "../../lib/src/common/i18n.ts";
-import { versionNumberString2Number } from "../../lib/src/string_and_binary/convert.ts";
-import { AbstractModule } from "../AbstractModule.ts";
+} from "@/common/events.ts";
+import { $msg, setLang } from "@lib/common/i18n.ts";
+import { versionNumberString2Number } from "@lib/string_and_binary/convert.ts";
+import { AbstractModule } from "@/modules/AbstractModule.ts";
 import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub.ts";
-import type { LiveSyncCore } from "../../main.ts";
+import type { LiveSyncCore } from "@/main.ts";
 import { initialiseWorkerModule } from "@lib/worker/bgWorker.ts";
 import { manifestVersion, packageVersion } from "@lib/common/coreEnvVars.ts";
 import { compatGlobal } from "@lib/common/coreEnvFunctions.ts";

src/modules/services/ObsidianAPIService.ts

@@ -1,7 +1,7 @@
 import { InjectableAPIService } from "@lib/services/implements/injectable/InjectableAPIService";
 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
 import { Platform, type Command, type ViewCreator } from "obsidian";
-import { ObsHttpHandler } from "../essentialObsidian/APILib/ObsHttpHandler";
+import { ObsHttpHandler } from "@/modules/essentialObsidian/APILib/ObsHttpHandler";
 import { ObsidianConfirm } from "./ObsidianConfirm";
 import type { Confirm } from "@lib/interfaces/Confirm";
 import { requestUrl, type RequestUrlParam } from "@/deps";

src/modules/services/ObsidianConfirm.ts

@@ -9,7 +9,7 @@ import {
     confirmWithMessageWithWideButton,
     askSelectString,
     confirmWithMessage,
-} from "../coreObsidian/UILib/dialogs";
+} from "@/modules/coreObsidian/UILib/dialogs";
 
 export class ObsidianConfirm<T extends ObsidianServiceContext = ObsidianServiceContext> implements Confirm {
     private _context: T;