fix imports

src/modules/AbstractModule.ts

@@ -1,5 +1,5 @@
 import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE, Logger } from "octagonal-wheels/common/logger";
-import type { AnyEntry, FilePathWithPrefix } from "@lib/common/types";
+import type { AnyEntry, FilePathWithPrefix } from "@lib/common/models/db.type";
 import type { IMinimumLiveSyncCommands, LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import { stripAllPrefixes } from "@lib/string_and_binary/path";
 import { createInstanceLogFunction } from "@lib/services/lib/logUtils";

src/modules/AbstractObsidianModule.ts

@@ -1,4 +1,4 @@
-import { type Prettify } from "@lib/common/types";
+import type { Prettify } from "@lib/common/models/shared.type.util";
 import type { LiveSyncCore } from "@/main";
 import type ObsidianLiveSyncPlugin from "@/main";
 import { AbstractModule } from "./AbstractModule.ts";

src/modules/ModuleTypes.ts

@@ -1,4 +1,4 @@
-import type { Prettify } from "@lib/common/types";
+import type { Prettify } from "@lib/common/models/shared.type.util";
 import type { LiveSyncCore } from "@/main";
 
 export type OverridableFunctionsKeys<T> = {

src/modules/core/ModuleReplicator.ts

@@ -6,8 +6,8 @@ import { skipIfDuplicated } from "octagonal-wheels/concurrency/lock";
 import { balanceChunkPurgedDBs } from "@lib/pouchdb/chunks";
 import { purgeUnreferencedChunks } from "@lib/pouchdb/chunks";
 import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
-import { type EntryDoc, type RemoteType } from "@lib/common/types";
-
+import type { EntryDoc } from "@lib/common/models/db.definition";
+import type { RemoteType } from "@lib/common/models/setting.type";
 import { scheduleTask } from "octagonal-wheels/concurrency/task";
 import { EVENT_FILE_SAVED, EVENT_SETTING_SAVED, eventHub } from "@/common/events";
 

src/modules/core/ModuleReplicatorCouchDB.ts

@@ -1,5 +1,6 @@
 import { fireAndForget } from "octagonal-wheels/promises";
-import { REMOTE_MINIO, REMOTE_P2P, type RemoteDBSettings } from "@lib/common/types";
+import { REMOTE_MINIO, REMOTE_P2P } from "@lib/common/models/setting.const";
+import type { RemoteDBSettings } from "@lib/common/models/setting.type";
 import { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
 import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator";
 import { AbstractModule } from "@/modules/AbstractModule";

src/modules/core/ModuleReplicatorMinIO.ts

@@ -1,4 +1,5 @@
-import { REMOTE_MINIO, type RemoteDBSettings } from "@lib/common/types";
+import { REMOTE_MINIO } from "@lib/common/models/setting.const";
+import type { RemoteDBSettings } from "@lib/common/models/setting.type";
 import { LiveSyncJournalReplicator } from "@lib/replication/journal/LiveSyncJournalReplicator";
 import type { LiveSyncAbstractReplicator } from "@lib/replication/LiveSyncAbstractReplicator";
 import type { LiveSyncCore } from "@/main";

src/modules/core/ReplicateResultProcessor.ts

@@ -1,12 +1,7 @@
-import {
-    SYNCINFO_ID,
-    VER,
-    type AnyEntry,
-    type EntryDoc,
-    type EntryLeaf,
-    type LoadedEntry,
-    type MetaEntry,
-} from "@lib/common/types";
+import { SYNCINFO_ID } from "@lib/common/models/db.const";
+import { VER } from "@lib/common/models/shared.const.behabiour";
+import type { AnyEntry, EntryLeaf, LoadedEntry, MetaEntry } from "@lib/common/models/db.type";
+import type { EntryDoc } from "@lib/common/models/db.definition";
 import type { ModuleReplicator } from "./ModuleReplicator";
 import { isChunk } from "@lib/common/typeUtils";
 import {

src/modules/coreFeatures/ModuleConflictChecker.ts

@@ -1,5 +1,6 @@
 import { AbstractModule } from "@/modules/AbstractModule.ts";
-import { LOG_LEVEL_NOTICE, type FilePathWithPrefix } from "@lib/common/types";
+import { LOG_LEVEL_NOTICE } from "@lib/common/logger";
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
 import { sendValue } from "octagonal-wheels/messagepassing/signal";
 import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";

src/modules/coreFeatures/ModuleConflictResolver.ts

@@ -1,16 +1,9 @@
 import { serialized } from "octagonal-wheels/concurrency/lock";
 import { AbstractModule } from "@/modules/AbstractModule.ts";
-import {
-    AUTO_MERGED,
-    CANCELLED,
-    LOG_LEVEL_INFO,
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_VERBOSE,
-    MISSING_OR_ERROR,
-    NOT_CONFLICTED,
-    type diff_check_result,
-    type FilePathWithPrefix,
-} from "@lib/common/types";
+import { AUTO_MERGED, CANCELLED, MISSING_OR_ERROR, NOT_CONFLICTED } from "@lib/common/models/shared.const.symbols";
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
+import type { diff_check_result } from "@lib/common/models/diff.definition";
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
 import { isCustomisationSyncMetadata, isPluginMetadata } from "@lib/common/typeUtils.ts";
 import { TARGET_IS_NEW } from "@lib/common/models/shared.const.symbols.ts";
 import { compareMTime } from "@lib/common/utils.database.ts";

src/modules/coreFeatures/ModuleResolveMismatchedTweaks.unit.spec.ts

@@ -1,5 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
-import { DEFAULT_SETTINGS, REMOTE_COUCHDB, type RemoteDBSettings, type TweakValues } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import { REMOTE_COUCHDB } from "@lib/common/models/setting.const";
+import type { RemoteDBSettings } from "@lib/common/models/setting.type";
+import type { TweakValues } from "@lib/common/models/tweak.definition";
 import { ModuleResolvingMismatchedTweaks } from "./ModuleResolveMismatchedTweaks";
 
 function createModule(settingsOverride: Partial<typeof DEFAULT_SETTINGS> = {}) {

src/modules/features/ModuleObsidianSettingAsMarkdown.ts

@@ -1,7 +1,9 @@
 import { isObjectDifferent } from "octagonal-wheels/object";
 import { EVENT_SETTING_SAVED, eventHub } from "@/common/events";
 import { fireAndForget } from "octagonal-wheels/promises";
-import { DEFAULT_SETTINGS, type FilePathWithPrefix, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 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 "@/modules/AbstractModule.ts";

src/modules/features/SettingDialogue/SettingPane.ts

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

src/modules/features/SettingDialogue/remoteConfigBuffer.unit.spec.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { DEFAULT_SETTINGS, REMOTE_COUCHDB, REMOTE_MINIO } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import { REMOTE_COUCHDB, REMOTE_MINIO } from "@lib/common/models/setting.const";
 import { syncActivatedRemoteSettings } from "./remoteConfigBuffer";
 
 describe("syncActivatedRemoteSettings", () => {

src/modules/features/SettingDialogue/settingUtils.ts

@@ -1,5 +1,7 @@
 import { escapeStringToHTML } from "octagonal-wheels/string";
-import { E2EEAlgorithmNames, MILESTONE_DOCID, NODEINFO_DOCID, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { E2EEAlgorithmNames } from "@lib/common/models/setting.const";
+import { MILESTONE_DOCID, NODEINFO_DOCID } from "@lib/common/models/db.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import {
     pickCouchDBSyncSettings,
     pickBucketSyncSettings,

src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts

@@ -1,7 +1,7 @@
 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 type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { parseHeaderValues } from "@lib/common/utils.misc";
 import { fireAndForget } from "@lib/common/utils";
 import { isCloudantURI } from "@lib/pouchdb/utils_couchdb";

src/modules/features/SetupManager.unit.spec.ts

@@ -1,5 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { DEFAULT_SETTINGS, REMOTE_COUCHDB, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import { REMOTE_COUCHDB } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { SettingService } from "@lib/services/base/SettingService";
 import { ServiceContext } from "@lib/services/base/ServiceBase";
 

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

@@ -1,7 +1,7 @@
 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 type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { parseHeaderValues } from "@lib/common/utils.misc";
 import { isCloudantURI } from "@lib/pouchdb/utils_couchdb";
 import { generateCredentialObject } from "@lib/replication/httplib";

src/modules/services/ObsidianPathService.ts

@@ -11,7 +11,9 @@ import {
     compareFileFreshness,
     isMarkedAsSameChanges,
 } from "@/common/utils";
-import type { UXFileInfo, AnyEntry, UXFileInfoStub, FilePathWithPrefix } from "@lib/common/types";
+import type { UXFileInfo, UXFileInfoStub } from "@lib/common/models/fileaccess.type";
+import type { AnyEntry, FilePathWithPrefix } from "@lib/common/models/db.type";
+
 export class ObsidianPathService extends PathService<ObsidianServiceContext> {
     override markChangesAreSame(
         old: UXFileInfo | AnyEntry | FilePathWithPrefix,

src/modules/services/ObsidianSettingService.ts

@@ -1,5 +1,5 @@
 import { compatGlobal } from "@lib/common/coreEnvFunctions";
-import { type ObsidianLiveSyncSettings } from "@lib/common/types";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { EVENT_REQUEST_RELOAD_SETTING_TAB, EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
 import { eventHub } from "@lib/hub/hub";
 import { SettingService, type SettingServiceDependencies } from "@lib/services/base/SettingService";

src/modules/services/ObsidianVaultService.ts

@@ -1,7 +1,7 @@
 import { getPathFromTFile, isValidPath } from "@/common/utils";
 import { InjectableVaultService } from "@lib/services/implements/injectable/InjectableVaultService";
 import type { ObsidianServiceContext } from "@lib/services/implements/obsidian/ObsidianServiceContext";
-import type { FilePath } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
 
 declare module "obsidian" {
     interface DataAdapter {