(chore): fix import paths

src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts

@@ -1,16 +1,9 @@
 import { Logger, LOG_LEVEL_NOTICE } from "octagonal-wheels/common/logger";
 import { extractObject } from "octagonal-wheels/object";
-import {
-    TweakValuesShouldMatchedTemplate,
-    TweakValuesTemplate,
-    IncompatibleChanges,
-    confName,
-    type TweakValues,
-    type ObsidianLiveSyncSettings,
-    type RemoteDBSettings,
-    IncompatibleChangesInSpecificPattern,
-    CompatibleButLossyChanges,
-} from "@lib/common/types.ts";
+import type { TweakValues } from "@lib/common/models/tweak.definition";
+import { TweakValuesShouldMatchedTemplate, TweakValuesTemplate, IncompatibleChanges, IncompatibleChangesInSpecificPattern, CompatibleButLossyChanges } from "@lib/common/models/tweak.definition";
+import { confName } from "@lib/common/models/shared.definition.configNames";
+import type { ObsidianLiveSyncSettings, RemoteDBSettings } from "@lib/common/models/setting.type";
 import { escapeMarkdownValue } from "@lib/common/utils.ts";
 import { AbstractModule } from "@/modules/AbstractModule.ts";
 import { $msg } from "@lib/common/i18n.ts";

src/modules/coreObsidian/storageLib/utilObsidian.ts

@@ -1,18 +1,12 @@
 // Obsidian to LiveSync Utils
 
 import { TFile, type TAbstractFile, type TFolder } from "@/deps.ts";
-import { ICHeader } from "@/common/types.ts";
+import { ICHeader } from "@lib/common/models/fileaccess.const";
 import { addPrefix, isPlainText } from "@lib/string_and_binary/path.ts";
 import { LOG_LEVEL_VERBOSE, Logger } from "octagonal-wheels/common/logger";
 import { createBlob } from "@lib/common/utils.ts";
-import type {
-    FilePath,
-    FilePathWithPrefix,
-    UXFileInfo,
-    UXFileInfoStub,
-    UXFolderInfo,
-    UXInternalFileInfoStub,
-} from "@lib/common/types.ts";
+import type { FilePath, FilePathWithPrefix } from "@lib/common/models/db.type";
+import type { UXFileInfo, UXFileInfoStub, UXFolderInfo, UXInternalFileInfoStub } from "@lib/common/models/fileaccess.type";
 import type { LiveSyncCore } from "@/main.ts";
 import type { FileAccessObsidian } from "@/serviceModules/FileAccessObsidian.ts";
 

src/modules/essential/ModuleMigration.ts

@@ -11,7 +11,7 @@ import { AbstractModule } from "@/modules/AbstractModule.ts";
 import { $msg } from "@lib/common/i18n.ts";
 import { performDoctorConsultation, RebuildOptions } from "@lib/common/configForDoc.ts";
 import { isValidPath } from "@/common/utils.ts";
-import { isMetaEntry } from "@lib/common/types.ts";
+import { isMetaEntry } from "@lib/common/models/db.definition";
 import { isDeletedEntry, isDocContentSame, isLoadedEntry, readAsBlob } from "@lib/common/utils.ts";
 import { countCompromisedChunks } from "@lib/pouchdb/negotiation.ts";
 import type { LiveSyncCore } from "@/main.ts";

src/modules/essentialObsidian/ModuleObsidianEvents.ts

@@ -4,7 +4,7 @@ import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/log
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
 import { type TFile } from "@/deps.ts";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { type FilePathWithPrefix } from "@lib/common/types.ts";
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
 import { reactive, reactiveSource, type ReactiveSource } from "octagonal-wheels/dataobject/reactive";
 import {
     collectingChunks,

src/modules/essentialObsidian/ModuleObsidianMenu.ts

@@ -1,6 +1,6 @@
 import { type Editor, type MarkdownFileInfo, type MarkdownView } from "@/deps.ts";
 import { addIcon } from "@/deps.ts";
-import { type FilePathWithPrefix } from "@lib/common/types.ts";
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
 import { $msg } from "@lib/common/i18n.ts";
 import type { LiveSyncCore } from "@/main.ts";
 import { AbstractModule } from "@/modules/AbstractModule.ts";

src/modules/extras/ModuleDev.ts

@@ -6,7 +6,7 @@ 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/common/types.ts";
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
 import type { LiveSyncCore } from "@/main.ts";
 export class ModuleDev extends AbstractObsidianModule {
     _everyOnloadStart(): Promise<boolean> {

src/modules/features/DocumentHistory/DocumentHistoryModal.ts

@@ -2,14 +2,8 @@ import { TFile, Modal, App, DIFF_DELETE, DIFF_EQUAL, DIFF_INSERT, diff_match_pat
 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,
-    type LoadedEntry,
-    LOG_LEVEL_INFO,
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_VERBOSE,
-} from "@lib/common/types.ts";
+import type { DocumentID, FilePathWithPrefix, LoadedEntry } from "@lib/common/models/db.type";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
 import { Logger } from "@lib/common/logger.ts";
 import { isErrorOfMissingDoc } from "@lib/pouchdb/utils_couchdb.ts";
 import { fireAndForget, getDocData, readContent } from "@lib/common/utils.ts";

src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts

@@ -1,6 +1,7 @@
 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/common/types.ts";
+import { CANCELLED, LEAVE_TO_SUBSEQUENT } from "@lib/common/models/shared.const.symbols";
+import type { diff_result } from "@lib/common/models/diff.definition";
 import { delay } from "@lib/common/utils.ts";
 import { eventHub } from "@/common/events.ts";
 import { globalSlipBoard } from "@lib/bureau/bureau.ts";

src/modules/features/ModuleInteractiveConflictResolver.ts

@@ -1,14 +1,7 @@
-import {
-    CANCELLED,
-    LEAVE_TO_SUBSEQUENT,
-    LOG_LEVEL_INFO,
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_VERBOSE,
-    MISSING_OR_ERROR,
-    type DocumentID,
-    type FilePathWithPrefix,
-    type diff_result,
-} from "@lib/common/types.ts";
+import { CANCELLED, LEAVE_TO_SUBSEQUENT, MISSING_OR_ERROR } from "@lib/common/models/shared.const.symbols";
+import type { DocumentID, FilePathWithPrefix } from "@lib/common/models/db.type";
+import type { diff_result } from "@lib/common/models/diff.definition";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
 import { ConflictResolveModal } from "./InteractiveConflictResolving/ConflictResolveModal.ts";
 import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { displayRev } from "@/common/utils.ts";

src/modules/features/ModuleLog.ts

@@ -1,12 +1,8 @@
 import { computed, reactive, reactiveSource, type ReactiveValue } from "octagonal-wheels/dataobject/reactive";
-import {
-    LOG_LEVEL_DEBUG,
-    LOG_LEVEL_INFO,
-    LOG_LEVEL_VERBOSE,
-    PREFIXMD_LOGFILE,
-    type DatabaseConnectingStatus,
-    type LOG_LEVEL,
-} from "@lib/common/types.ts";
+import { PREFIXMD_LOGFILE } from "@lib/common/models/redflag.const";
+import type { DatabaseConnectingStatus } from "@lib/common/models/shared.definition";
+import { LOG_LEVEL_DEBUG, LOG_LEVEL_INFO, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
+import type { LOG_LEVEL } from "@lib/common/logger";
 import { cancelTask, scheduleTask } from "octagonal-wheels/concurrency/task";
 import { fireAndForget, isDirty, throttle } from "@lib/common/utils.ts";
 import {

src/modules/features/ModuleObsidianDocumentHistory.ts

@@ -1,7 +1,7 @@
 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/common/types.ts";
+import type { FilePathWithPrefix, LoadedEntry, DocumentID } from "@lib/common/models/db.type";
 import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { DocumentHistoryModal } from "./DocumentHistory/DocumentHistoryModal.ts";
 import { fireAndForget } from "octagonal-wheels/promises";

src/modules/features/SettingDialogue/LiveSyncSetting.ts

@@ -8,7 +8,8 @@ import {
     type ValueComponent,
 } from "@/deps.ts";
 import { unique } from "octagonal-wheels/collection";
-import { LEVEL_ADVANCED, LEVEL_POWER_USER, statusDisplay, type ConfigurationItem } from "@lib/common/types.ts";
+import type { ConfigurationItem } from "@lib/common/models/shared.definition.configNames";
+import { LEVEL_ADVANCED, LEVEL_POWER_USER, statusDisplay } from "@lib/common/models/shared.definition.configNames";
 import { createStub, type ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import {
     type AllSettingItemKey,

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts

@@ -1,18 +1,10 @@
 import { App, PluginSettingTab } from "@/deps.ts";
-import {
-    type ObsidianLiveSyncSettings,
-    type RemoteDBSettings,
-    LOG_LEVEL_NOTICE,
-    FLAGMD_REDFLAG2_HR,
-    FLAGMD_REDFLAG3_HR,
-    REMOTE_COUCHDB,
-    REMOTE_MINIO,
-    type ConfigLevel,
-    LEVEL_POWER_USER,
-    LEVEL_ADVANCED,
-    LEVEL_EDGE_CASE,
-    REMOTE_P2P,
-} from "@lib/common/types.ts";
+import type { ObsidianLiveSyncSettings, RemoteDBSettings } from "@lib/common/models/setting.type";
+import { FLAGMD_REDFLAG2_HR, FLAGMD_REDFLAG3_HR } from "@lib/common/models/redflag.const";
+import { REMOTE_COUCHDB, REMOTE_MINIO, REMOTE_P2P } from "@lib/common/models/setting.const";
+import type { ConfigLevel } from "@lib/common/models/shared.definition.configNames";
+import { LEVEL_POWER_USER, LEVEL_ADVANCED, LEVEL_EDGE_CASE } from "@lib/common/models/shared.definition.configNames";
+import { LOG_LEVEL_NOTICE } from "@lib/common/logger";
 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";

src/modules/features/SettingDialogue/PaneAdvanced.ts

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

src/modules/features/SettingDialogue/PaneHatch.ts

@@ -1,12 +1,5 @@
-import {
-    type FilePathWithPrefix,
-    type DocumentID,
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_VERBOSE,
-    type LoadedEntry,
-    type MetaEntry,
-    type FilePath,
-} from "@lib/common/types.ts";
+import type { FilePathWithPrefix, DocumentID, LoadedEntry, MetaEntry, FilePath } from "@lib/common/models/db.type";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
 import { createBlob, getFileRegExp, isDocContentSame, readAsBlob } from "@lib/common/utils.ts";
 import { Logger } from "@lib/common/logger.ts";
 import { addPrefix, shouldBeIgnored, stripAllPrefixes } from "@lib/string_and_binary/path.ts";
@@ -20,7 +13,7 @@ import {
     EVENT_REQUEST_RUN_FIX_INCOMPLETE,
     eventHub,
 } from "@/common/events.ts";
-import { ICHeader, ICXHeader, PSCHeader } from "@/common/types.ts";
+import { ICHeader, ICXHeader, PSCHeader } from "@lib/common/models/fileaccess.const";
 import { HiddenFileSync } from "@/features/HiddenFileSync/CmdHiddenFileSync.ts";
 import { EVENT_REQUEST_SHOW_HISTORY } from "@/common/obsidianEvents.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";

src/modules/features/SettingDialogue/PaneMaintenance.ts

@@ -1,6 +1,6 @@
 import { EVENT_REQUEST_PERFORM_GC_V3, eventHub } from "@/common/events.ts";
 import { LOG_LEVEL_NOTICE, Logger } from "@lib/common/logger.ts";
-import { FlagFilesHumanReadable, FLAGMD_REDFLAG } from "@lib/common/types.ts";
+import { FlagFilesHumanReadable, FLAGMD_REDFLAG } from "@lib/common/models/redflag.const";
 import { fireAndForget } from "@lib/common/utils.ts";
 import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";

src/modules/features/SettingDialogue/PanePatches.ts

@@ -1,17 +1,14 @@
-import {
-    E2EEAlgorithmNames,
-    E2EEAlgorithms,
-    type HashAlgorithm,
-    LOG_LEVEL_NOTICE,
-    SuffixDatabaseName,
-} from "@lib/common/types.ts";
+import { E2EEAlgorithmNames, E2EEAlgorithms } from "@lib/common/models/setting.const";
+import type { HashAlgorithm } from "@lib/common/models/setting.type";
+import { SuffixDatabaseName } from "@lib/common/models/shared.const";
+import { LOG_LEVEL_NOTICE } from "@lib/common/logger";
 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/pouchdb/pouchdb-browser";
-import { ExtraSuffixIndexedDB } from "@lib/common/types.ts";
+import { ExtraSuffixIndexedDB } from "@lib/common/models/shared.const";
 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/common/types.ts";
+import type { ConfigPassphraseStore } from "@lib/common/models/setting.type";
 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

@@ -1,12 +1,7 @@
-import {
-    REMOTE_COUCHDB,
-    REMOTE_MINIO,
-    REMOTE_P2P,
-    DEFAULT_SETTINGS,
-    LOG_LEVEL_NOTICE,
-    type ObsidianLiveSyncSettings,
-    LOG_LEVEL_VERBOSE,
-} from "@lib/common/types.ts";
+import { REMOTE_COUCHDB, REMOTE_MINIO, REMOTE_P2P } from "@lib/common/models/setting.const";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
 import { Menu, ButtonComponent } from "@/deps.ts";
 import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
@@ -22,7 +17,7 @@ import {
     getCouchDBConfigSummary,
     getE2EEConfigSummary,
 } from "./settingUtils.ts";
-import { SETTING_KEY_P2P_DEVICE_NAME } from "@lib/common/types.ts";
+import { SETTING_KEY_P2P_DEVICE_NAME } from "@lib/common/models/shared.const";
 import { SetupManager, UserMode } from "@/modules/features/SetupManager.ts";
 import { OnDialogSettingsDefault, type AllSettings } from "./settingConstants.ts";
 import { activateRemoteConfiguration } from "@lib/serviceFeatures/remoteConfig.ts";

src/modules/features/SettingDialogue/PaneSelector.ts

@@ -1,4 +1,5 @@
-import { LEVEL_ADVANCED, type CustomRegExpSource } from "@lib/common/types.ts";
+import { LEVEL_ADVANCED } from "@lib/common/models/shared.definition.configNames";
+import type { CustomRegExpSource } from "@lib/common/models/shared.type.util";
 import { constructCustomRegExpList, splitCustomRegExpList } from "@lib/common/utils.ts";
 import MultipleRegExpControl from "./MultipleRegExpControl.svelte";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";

src/modules/features/SettingDialogue/PaneSetup.ts

@@ -11,7 +11,7 @@ import {
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { visibleOnly } from "./SettingPane.ts";
-import { DEFAULT_SETTINGS } from "@lib/common/types.ts";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
 import { request } from "@/deps.ts";
 import { SetupManager, UserMode } from "@/modules/features/SetupManager.ts";
 export function paneSetup(

src/modules/features/SettingDialogue/PaneSyncSettings.ts

@@ -1,4 +1,7 @@
-import { type ObsidianLiveSyncSettings, LOG_LEVEL_NOTICE, REMOTE_COUCHDB, LEVEL_ADVANCED } from "@lib/common/types.ts";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
+import { REMOTE_COUCHDB } from "@lib/common/models/setting.const";
+import { LEVEL_ADVANCED } from "@lib/common/models/shared.definition.configNames";
+import { LOG_LEVEL_NOTICE } from "@lib/common/logger";
 import { Logger } from "@lib/common/logger.ts";
 import { $msg } from "@lib/common/i18n.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";

src/modules/features/SettingDialogue/remoteConfigBuffer.ts

@@ -1,6 +1,5 @@
 import { pickBucketSyncSettings, pickCouchDBSyncSettings, pickP2PSyncSettings } from "@lib/common/utils.ts";
-import type { ObsidianLiveSyncSettings } from "@lib/common/types.ts";
-
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 // Keep the setting dialogue buffer aligned with the current core settings before persisting other dirty keys.
 // This also clears stale dirty values left from editing a different remote type before switching active remotes.
 export function syncActivatedRemoteSettings(

src/modules/features/SetupManager.ts

@@ -1,16 +1,7 @@
-import {
-    type BucketSyncSetting,
-    type CouchDBConnection,
-    type EncryptionSettings,
-    type ObsidianLiveSyncSettings,
-    type P2PSyncSetting,
-    DEFAULT_SETTINGS,
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_VERBOSE,
-    REMOTE_COUCHDB,
-    REMOTE_MINIO,
-    REMOTE_P2P,
-} from "@lib/common/types.ts";
+import type { BucketSyncSetting, CouchDBConnection, EncryptionSettings, ObsidianLiveSyncSettings, P2PSyncSetting } from "@lib/common/models/setting.type";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import { REMOTE_COUCHDB, REMOTE_MINIO, REMOTE_P2P } from "@lib/common/models/setting.const";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
 import { isObjectDifferent } from "@lib/common/utils.ts";
 import Intro from "./SetupWizard/dialogs/Intro.svelte";
 import SelectMethodNewUser from "./SetupWizard/dialogs/SelectMethodNewUser.svelte";

src/modules/main/ModuleLiveSyncMain.ts

@@ -1,5 +1,7 @@
 import { fireAndForget } from "octagonal-wheels/promises";
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, VER, type ObsidianLiveSyncSettings } from "@lib/common/types.ts";
+import { VER } from "@lib/common/models/shared.const.behabiour";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
 import {
     EVENT_LAYOUT_READY,
     EVENT_PLUGIN_LOADED,