fix imports

src/LiveSyncBaseCore.ts

@@ -1,7 +1,8 @@
 import { LOG_LEVEL_INFO } from "octagonal-wheels/common/logger";
 import type PouchDB from "pouchdb-core";
 import type { SimpleStore } from "octagonal-wheels/databases/SimpleStoreBase";
-import type { HasSettings, ObsidianLiveSyncSettings, EntryDoc } from "@lib/common/types";
+import type { HasSettings, ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
+import type { EntryDoc } from "@lib/common/models/db.definition";
 import { __$checkInstanceBinding } from "@lib/dev/checks";
 import type { Confirm } from "@lib/interfaces/Confirm";
 import type { DatabaseFileAccess } from "@lib/interfaces/DatabaseFileAccess";

src/common/obsidianEvents.ts

@@ -1,6 +1,5 @@
 import type { TFile } from "@/deps";
-import type { FilePathWithPrefix, LoadedEntry } from "@lib/common/types";
+import type { FilePathWithPrefix, LoadedEntry } from "@lib/common/models/db.type";
-
 export const EVENT_REQUEST_SHOW_HISTORY = "show-history";
 
 declare global {

src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts

@@ -1,15 +1,8 @@
 import { sizeToHumanReadable } from "octagonal-wheels/number";
-import {
+import type { DocumentID, EntryLeaf, FilePathWithPrefix, MetaEntry } from "@lib/common/models/db.type";
-    EntryTypes,
+import { EntryTypes } from "@lib/common/models/db.const";
-    LOG_LEVEL_INFO,
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
-    LOG_LEVEL_NOTICE,
+import type { EntryDoc } from "@lib/common/models/db.definition";
-    LOG_LEVEL_VERBOSE,
-    type DocumentID,
-    type EntryDoc,
-    type EntryLeaf,
-    type FilePathWithPrefix,
-    type MetaEntry,
-} from "@lib/common/types";
 import { getNoFromRev } from "@lib/pouchdb/LiveSyncLocalDB";
 import { LiveSyncCommands } from "@/features/LiveSyncCommands";
 import { serialized } from "octagonal-wheels/concurrency/lock_v2";

src/features/P2PSync/P2PReplicator/P2PReplicationUI.ts

@@ -1,6 +1,6 @@
 import { App } from "@/deps.ts";
 import { Logger } from "@lib/common/logger";
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@lib/common/types";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@lib/common/logger";
 import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
 import { P2POpenReplicationModal } from "./P2POpenReplicationModal";
 

src/managers/ObsidianStorageEventManagerAdapter.ts

@@ -1,6 +1,7 @@
 import { TFile, TFolder } from "@/deps";
-import type { FilePath, UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
-import type { FileEventItem } from "@lib/common/types";
+import type { UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/models/fileaccess.type";
+import type { FileEventItem } from "@lib/common/models/fileaccess.type";
 import type { IStorageEventManagerAdapter } from "@lib/managers/adapters";
 import type {
     IStorageEventTypeGuardAdapter,

src/managers/StorageEventManagerObsidian.ts

@@ -1,4 +1,4 @@
-import type { FilePath } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
 import type ObsidianLiveSyncPlugin from "@/main";
 import type { LiveSyncCore } from "@/main";
 import { StorageEventManagerBase, type StorageEventManagerBaseDependencies } from "@lib/managers/StorageEventManager";

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 {
+import { SYNCINFO_ID } from "@lib/common/models/db.const";
-    SYNCINFO_ID,
+import { VER } from "@lib/common/models/shared.const.behabiour";
-    VER,
+import type { AnyEntry, EntryLeaf, LoadedEntry, MetaEntry } from "@lib/common/models/db.type";
-    type AnyEntry,
+import type { EntryDoc } from "@lib/common/models/db.definition";
-    type EntryDoc,
-    type EntryLeaf,
-    type LoadedEntry,
-    type MetaEntry,
-} from "@lib/common/types";
 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 {
+import { AUTO_MERGED, CANCELLED, MISSING_OR_ERROR, NOT_CONFLICTED } from "@lib/common/models/shared.const.symbols";
-    AUTO_MERGED,
+import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
-    CANCELLED,
+import type { diff_check_result } from "@lib/common/models/diff.definition";
-    LOG_LEVEL_INFO,
+import type { FilePathWithPrefix } from "@lib/common/models/db.type";
-    LOG_LEVEL_NOTICE,
-    LOG_LEVEL_VERBOSE,
-    MISSING_OR_ERROR,
-    NOT_CONFLICTED,
-    type diff_check_result,
-    type FilePathWithPrefix,
-} 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 } 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 {

src/serviceFeatures/redFlag.unit.spec.ts

@@ -20,7 +20,7 @@ import {
     TweakValuesRecommendedTemplate,
     TweakValuesShouldMatchedTemplate,
     TweakValuesTemplate,
-} from "@lib/common/types";
+} from "@lib/common/models/tweak.definition";
 import {
     ExtraOnLocal,
     FullScanModes,

src/serviceFeatures/setupObsidian/setupProtocol.ts

@@ -1,4 +1,4 @@
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/types";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
 import type { LogFunction } from "@lib/services/lib/logUtils";
 import { createInstanceLogFunction } from "@lib/services/lib/logUtils";
 import type { SetupFeatureHost } from "@lib/serviceFeatures/setupObsidian/types";

src/serviceModules/FileSystemAdapters/ObsidianConversionAdapter.ts

@@ -1,4 +1,4 @@
-import type { UXFileInfoStub, UXFolderInfo } from "@lib/common/types";
+import type { UXFileInfoStub, UXFolderInfo } from "@lib/common/models/fileaccess.type";
 import type { IConversionAdapter } from "@lib/serviceModules/adapters";
 import { TFileToUXFileInfoStub, TFolderToUXFileInfoStub } from "@/modules/coreObsidian/storageLib/utilObsidian";
 import type { TFile, TFolder } from "obsidian";

src/serviceModules/FileSystemAdapters/ObsidianFileSystemAdapter.ts

@@ -1,4 +1,5 @@
-import type { FilePath, UXStat } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
+import type { UXStat } from "@lib/common/models/fileaccess.type";
 import type {
     IFileSystemAdapter,
     IPathAdapter,

src/serviceModules/FileSystemAdapters/ObsidianPathAdapter.ts

@@ -1,5 +1,5 @@
 import { type TAbstractFile, normalizePath } from "@/deps";
-import type { FilePath } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
 import type { IPathAdapter } from "@lib/serviceModules/adapters";
 
 /**

src/serviceModules/FileSystemAdapters/ObsidianStorageAdapter.ts

@@ -1,4 +1,4 @@
-import type { UXDataWriteOptions } from "@lib/common/types";
+import type { UXDataWriteOptions } from "@lib/common/models/fileaccess.type";
 import type { IStorageAdapter } from "@lib/serviceModules/adapters";
 import { toArrayBuffer } from "@lib/serviceModules/FileAccessBase";
 import type { Stat, App } from "obsidian";

src/serviceModules/FileSystemAdapters/ObsidianVaultAdapter.ts

@@ -1,4 +1,4 @@
-import type { UXDataWriteOptions } from "@lib/common/types";
+import type { UXDataWriteOptions } from "@lib/common/models/fileaccess.type";
 import type { IVaultAdapter } from "@lib/serviceModules/adapters";
 import { toArrayBuffer } from "@lib/serviceModules/FileAccessBase";
 import type { TFile, App, TFolder } from "obsidian";

test/harness/harness.ts

@@ -1,6 +1,7 @@
 import { App } from "@/deps.ts";
 import ObsidianLiveSyncPlugin from "@/main";
-import { DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { LOG_LEVEL_VERBOSE, setGlobalLogFunction } from "@lib/common/logger";
 import { SettingCache } from "./obsidian-mock";
 import { delay, fireAndForget, promiseWithResolvers } from "octagonal-wheels/promises";

test/lib/commands.ts

@@ -1,4 +1,4 @@
-import type { P2PSyncSetting } from "@lib/common/types";
+import type { P2PSyncSetting } from "@lib/common/models/setting.type";
 import { delay } from "octagonal-wheels/promises";
 import type { BrowserContext, Page } from "playwright";
 import type { Plugin } from "vitest/config";

test/suite/db_common.ts

@@ -1,7 +1,7 @@
 import { compareMTime } from "@lib/common/utils.database";
 import { EVEN } from "@/common/utils";
 import { TFile, type DataWriteOptions } from "@/deps";
-import type { FilePath } from "@lib/common/types";
+import type { FilePath } from "@lib/common/models/db.type";
 import { isDocContentSame, readContent } from "@lib/common/utils.database";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
 import { expect } from "vitest";

test/suite/onlylocaldb.test.ts

@@ -1,7 +1,9 @@
 import { beforeAll, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
 import { TFile } from "@/deps.ts";
-import { DEFAULT_SETTINGS, type FilePath, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import type { FilePath } from "@lib/common/models/db.type";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { isDocContentSame, readContent } from "@lib/common/utils.database";
 import { DummyFileSourceInisialised, generateBinaryFile, generateFile, init } from "../utils/dummyfile";
 

test/suite/sync.senario.basic.ts

@@ -3,8 +3,9 @@
 // and edge, resolving conflicts, etc. will be covered in separate test suites.
 import { afterAll, beforeAll, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type FilePath, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { RemoteTypes } from "@lib/common/models/setting.const";
-
+import type { FilePath } from "@lib/common/models/db.type";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import {
     DummyFileSourceInisialised,
     FILE_SIZE_BINS,

test/suite/sync.single.test.ts

@@ -2,13 +2,9 @@
 // This test suite only covers main functional cases of synchronisation. Event handling, error cases,
 // and edge, resolving conflicts, etc. will be covered in separate test suites.
 import { describe } from "vitest";
-import {
+import { PREFERRED_JOURNAL_SYNC, PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
-    PREFERRED_JOURNAL_SYNC,
+import { RemoteTypes } from "@lib/common/models/setting.const";
-    PREFERRED_SETTING_SELF_HOSTED,
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
-    RemoteTypes,
-    type ObsidianLiveSyncSettings,
-} from "@lib/common/types";
-
 import { defaultFileOption } from "./db_common";
 import { syncBasicCase } from "./sync.senario.basic.ts";
 import { settingBase } from "./variables.ts";

test/suite/sync.test.ts

@@ -2,13 +2,9 @@
 // This test suite only covers main functional cases of synchronisation. Event handling, error cases,
 // and edge, resolving conflicts, etc. will be covered in separate test suites.
 import { describe } from "vitest";
-import {
+import { PREFERRED_JOURNAL_SYNC, PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
-    PREFERRED_JOURNAL_SYNC,
+import { RemoteTypes } from "@lib/common/models/setting.const";
-    PREFERRED_SETTING_SELF_HOSTED,
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
-    RemoteTypes,
-    type ObsidianLiveSyncSettings,
-} from "@lib/common/types";
-
 import { defaultFileOption } from "./db_common";
 import { syncBasicCase } from "./sync.senario.basic.ts";
 import { settingBase } from "./variables.ts";

test/suite/sync_common.ts

@@ -1,7 +1,7 @@
 import { expect } from "vitest";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { RemoteTypes } from "@lib/common/models/setting.const";
-
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { delay, fireAndForget } from "@lib/common/utils";
 import { commands } from "vitest/browser";
 import { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";

test/suite/variables.ts

@@ -1,5 +1,8 @@
 import { DoctorRegulation } from "@lib/common/configForDoc";
-import { DEFAULT_SETTINGS, ChunkAlgorithms, AutoAccepting, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
+import { ChunkAlgorithms } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
+import { AutoAccepting } from "@lib/common/models/setting.type";
 export const env = (import.meta as any).env;
 export const settingBase = {
     ...DEFAULT_SETTINGS,

test/suitep2p/sync_common_p2p.ts

@@ -7,7 +7,8 @@
  */
 import { expect } from "vitest";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { RemoteTypes } from "@lib/common/models/setting.const";
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
 import { delay } from "@lib/common/utils";
 import { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
 import { waitTaskWithFollowups } from "../lib/util";

test/suitep2p/syncp2p.p2p-down.test.ts

@@ -9,13 +9,11 @@
  */
 import { afterAll, beforeAll, beforeEach, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import {
+import { PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
-    PREFERRED_SETTING_SELF_HOSTED,
+import { RemoteTypes } from "@lib/common/models/setting.const";
-    RemoteTypes,
+import type { FilePath } from "@lib/common/models/db.type";
-    type FilePath,
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
-    type ObsidianLiveSyncSettings,
+import { AutoAccepting } from "@lib/common/models/setting.type";
-    AutoAccepting,
-} from "@lib/common/types";
 import { DummyFileSourceInisialised, generateBinaryFile, generateFile } from "../utils/dummyfile";
 import { defaultFileOption, testFileRead } from "../suite/db_common";
 import { delay } from "@lib/common/utils";

test/suitep2p/syncp2p.p2p-up.test.ts

@@ -12,12 +12,10 @@
  */
 import { afterAll, beforeAll, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import {
+import { PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
-    PREFERRED_SETTING_SELF_HOSTED,
+import { RemoteTypes } from "@lib/common/models/setting.const";
-    RemoteTypes,
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
-    type ObsidianLiveSyncSettings,
+import { AutoAccepting } from "@lib/common/models/setting.type";
-    AutoAccepting,
-} from "@lib/common/types";
 import {
     DummyFileSourceInisialised,
     FILE_SIZE_BINS,

test/suitep2p/syncp2p.test.ts

@@ -2,13 +2,9 @@
 // This test suite only covers main functional cases of synchronisation. Event handling, error cases,
 // and edge, resolving conflicts, etc. will be covered in separate test suites.
 import { describe } from "vitest";
-import {
+import { PREFERRED_JOURNAL_SYNC, PREFERRED_SETTING_SELF_HOSTED } from "@lib/common/models/setting.const.preferred";
-    PREFERRED_JOURNAL_SYNC,
+import { RemoteTypes } from "@lib/common/models/setting.const";
-    PREFERRED_SETTING_SELF_HOSTED,
+import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
-    RemoteTypes,
-    type ObsidianLiveSyncSettings,
-} from "@lib/common/types";
-
 import { settingBase } from "../suite/variables.ts";
 import { defaultFileOption } from "../suite/db_common";
 import { syncBasicCase } from "../suite/sync.senario.basic.ts";

test/unit/dialog.test.ts

@@ -3,8 +3,9 @@ import { beforeAll, describe, expect, it } from "vitest";
 import { commands } from "vitest/browser";
 
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import { ChunkAlgorithms, DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@lib/common/types";
+import { ChunkAlgorithms } 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 { DummyFileSourceInisialised } from "../utils/dummyfile";
 
 import { page } from "vitest/browser";