public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-06-11 08:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix imports

Browse Source
This commit is contained in:
vorotamoroz
2026-06-11 06:12:39 +01:00
parent c03fa5213f
commit 7e65e5dc68
22 changed files with 75 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/cli/adapters/NodeConversionAdapter.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import * as path from "path";
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 type { NodeFile, NodeFolder } from "./NodeTypes";
src/apps/cli/adapters/NodeFileSystemAdapter.ts
+2 -1
View File
@@ -1,6 +1,7 @@
import * as fs from "fs/promises";
import * as path from "path";
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 } from "@lib/serviceModules/adapters";
import { NodePathAdapter } from "./NodePathAdapter";
import { NodeTypeGuardAdapter } from "./NodeTypeGuardAdapter";
src/apps/cli/adapters/NodePathAdapter.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import * as path from "path";
import type { FilePath } from "@lib/common/types";
import type { FilePath } from "@lib/common/models/db.type";
import type { IPathAdapter } from "@lib/serviceModules/adapters";
import type { NodeFile } from "./NodeTypes";
src/apps/cli/adapters/NodeStorageAdapter.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import * as fs from "fs/promises";
import * as path from "path";
import type { UXDataWriteOptions } from "@lib/common/types";
import type { UXDataWriteOptions } from "@lib/common/models/fileaccess.type";
import type { IStorageAdapter } from "@lib/serviceModules/adapters";
import type { NodeStat } from "./NodeTypes";
src/apps/cli/adapters/NodeTypes.ts
+2 -2
View File
@@ -1,5 +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";
/**
* Node.js file representation
*/
src/apps/cli/adapters/NodeVaultAdapter.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import * as fs from "fs/promises";
import * as path from "path";
import type { UXDataWriteOptions } from "@lib/common/types";
import type { UXDataWriteOptions } from "@lib/common/models/fileaccess.type";
import type { IVaultAdapter } from "@lib/serviceModules/adapters";
import type { NodeFile, NodeFolder, NodeStat } from "./NodeTypes";
src/apps/cli/commands/p2p.ts
+3 -4
View File
@@ -1,8 +1,7 @@
import type { LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
import { P2P_DEFAULT_SETTINGS } from "@lib/common/types";
import type { ServiceContext } from "@lib/services/base/ServiceBase";
import { P2P_DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
import { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
import { addP2PEventHandlers } from "@lib/replication/trystero/addP2PEventHandlers";
import type { ServiceContext } from "@lib/services/base/ServiceBase";
import type { LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
type CLIP2PPeer = {
peerId: string;
name: string;
src/apps/cli/commands/runCommand.ts
+13 -16
View File
@@ -1,23 +1,20 @@
import { decodeSettingsFromSetupURI } from "@lib/API/processSetting";
import { ConnectionStringParser } from "@lib/common/ConnectionString";
import { MILESTONE_DOCID } from "@lib/common/models/db.const";
import type { FilePathWithPrefix } from "@lib/common/models/db.type";
import { REMOTE_COUCHDB, REMOTE_MINIO } 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 { configURIBase } from "@lib/common/models/shared.const";
import { performFullScan } from "@lib/serviceFeatures/offlineScanner";
import { activateRemoteConfiguration, createRemoteConfigurationId } from "@lib/serviceFeatures/remoteConfig";
import { UnresolvedErrorManager } from "@lib/services/base/UnresolvedErrorManager";
import { stripAllPrefixes } from "@lib/string_and_binary/path";
import * as fs from "fs/promises";
import * as path from "path";
import { decodeSettingsFromSetupURI } from "@lib/API/processSetting";
import { configURIBase } from "@lib/common/models/shared.const";
import {
DEFAULT_SETTINGS,
MILESTONE_DOCID,
type FilePathWithPrefix,
type ObsidianLiveSyncSettings,
REMOTE_COUCHDB,
REMOTE_MINIO,
} from "@lib/common/types";
import { ConnectionStringParser } from "@lib/common/ConnectionString";
import { activateRemoteConfiguration, createRemoteConfigurationId } from "@lib/serviceFeatures/remoteConfig";
import { stripAllPrefixes } from "@lib/string_and_binary/path";
import { collectPeers, openP2PHost, parseTimeoutSeconds, syncWithPeer } from "./p2p";
import type { CLICommandContext, CLIOptions } from "./types";
import { promptForPassphrase, readStdinAsUtf8, toArrayBuffer, toDatabaseRelativePath } from "./utils";
import { collectPeers, openP2PHost, parseTimeoutSeconds, syncWithPeer } from "./p2p";
import { performFullScan } from "@lib/serviceFeatures/offlineScanner";
import { UnresolvedErrorManager } from "@lib/services/base/UnresolvedErrorManager";
function redactConnectionString(uri: string): string {
return uri.replace(/\/\/([^@/]+)@/u, "//***@");
src/apps/cli/commands/runCommand.unit.spec.ts
+6 -5
View File
@@ -1,11 +1,12 @@
import * as path from "path";
import * as fs from "fs/promises";
import * as os from "os";
import * as processSetting from "@lib/API/processSetting";
import { ConnectionStringParser } from "@lib/common/ConnectionString";
import { REMOTE_COUCHDB, REMOTE_MINIO, REMOTE_P2P } from "@lib/common/models/setting.const";
import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
import { configURIBase } from "@lib/common/models/shared.const";
import { DEFAULT_SETTINGS, REMOTE_COUCHDB, REMOTE_MINIO, REMOTE_P2P } from "@lib/common/types";
import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
import * as fs from "fs/promises";
import * as os from "os";
import * as path from "path";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { runCommand } from "./runCommand";
import type { CLIOptions } from "./types";
import * as commandUtils from "./utils";
src/apps/cli/commands/types.ts
+2 -3
View File
@@ -1,7 +1,6 @@
import { LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
import { ServiceContext } from "@lib/services/base/ServiceBase";
import type { ObsidianLiveSyncSettings } from "@lib/common/types";
import { LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
export type CLICommand =
| "daemon"
| "sync"
src/apps/cli/main.ts
+4 -1
View File
@@ -9,7 +9,10 @@ import { NodeServiceContext, NodeServiceHub } from "./services/NodeServiceHub";
import { configureNodeLocalStorage, ensureGlobalNodeLocalStorage } from "./services/NodeLocalStorage";
import { LiveSyncBaseCore } from "../../LiveSyncBaseCore";
import { initialiseServiceModulesCLI } from "./serviceModules/CLIServiceModules";
import { DEFAULT_SETTINGS, LOG_LEVEL_VERBOSE, type LOG_LEVEL, type ObsidianLiveSyncSettings } from "@lib/common/types";
import { DEFAULT_SETTINGS } from "@lib/common/models/setting.const.defaults";
import type { LOG_LEVEL } from "@lib/common/logger";
import { LOG_LEVEL_VERBOSE } from "@lib/common/logger";
import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub";
import type { InjectableSettingService } from "@lib/services/implements/injectable/InjectableSettingService";
import {
src/apps/cli/managers/CLIStorageEventManagerAdapter.ts
+9 -9
View File
@@ -1,20 +1,20 @@
import type { FilePath, UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/types";
import type { FileEventItem } from "@lib/common/types";
import type { IStorageEventManagerAdapter } from "@lib/managers/adapters";
import type { FilePath } from "@lib/common/models/db.type";
import type { FileEventItem, UXFileInfoStub, UXInternalFileInfoStub } from "@lib/common/models/fileaccess.type";
import type {
IStorageEventTypeGuardAdapter,
IStorageEventPersistenceAdapter,
IStorageEventWatchAdapter,
IStorageEventStatusAdapter,
IStorageEventConverterAdapter,
IStorageEventManagerAdapter,
IStorageEventPersistenceAdapter,
IStorageEventStatusAdapter,
IStorageEventTypeGuardAdapter,
IStorageEventWatchAdapter,
IStorageEventWatchHandlers,
} from "@lib/managers/adapters";
import type { FileEventItemSentinel } from "@lib/managers/StorageEventManager";
import type { NodeFile, NodeFolder } from "../adapters/NodeTypes";
import { watch as chokidarWatch, type FSWatcher } from "chokidar";
import type { Stats } from "fs";
import * as fs from "fs/promises";
import * as path from "path";
import { watch as chokidarWatch, type FSWatcher } from "chokidar";
import type { NodeFile, NodeFolder } from "../adapters/NodeTypes";
import type { IgnoreRules } from "../serviceModules/IgnoreRules";
/**
src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import { describe, expect, it, vi, beforeEach } from "vitest";
import type { IStorageEventWatchHandlers } from "@lib/managers/adapters";
import { beforeEach, describe, expect, it, vi } from "vitest";
import type { NodeFile } from "../adapters/NodeTypes";
// ── chokidar mock ──────────────────────────────────────────────────────────────
src/apps/cli/managers/StorageEventManagerCLI.ts
+2 -2
View File
@@ -1,8 +1,8 @@
import { StorageEventManagerBase, type StorageEventManagerBaseDependencies } from "@lib/managers/StorageEventManager";
import { CLIStorageEventManagerAdapter } from "./CLIStorageEventManagerAdapter";
import type { IMinimumLiveSyncCommands, LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
import type { ServiceContext } from "@lib/services/base/ServiceBase";
import type { IMinimumLiveSyncCommands, LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
import type { IgnoreRules } from "../serviceModules/IgnoreRules";
import { CLIStorageEventManagerAdapter } from "./CLIStorageEventManagerAdapter";
// import type { IMinimumLiveSyncCommands } from "@lib/services/base/IService";
export class StorageEventManagerCLI extends StorageEventManagerBase<CLIStorageEventManagerAdapter> {
src/apps/cli/serviceModules/CLIServiceModules.ts
+10 -10
View File
@@ -1,15 +1,15 @@
import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub";
import { ServiceRebuilder } from "@lib/serviceModules/Rebuilder";
import { ServiceFileHandler } from "../../../serviceModules/FileHandler";
import { StorageAccessManager } from "@lib/managers/StorageProcessingManager";
import type { LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
import type { ServiceContext } from "@lib/services/base/ServiceBase";
import { FileAccessCLI } from "./FileAccessCLI";
import { ServiceFileAccessCLI } from "./ServiceFileAccessImpl";
import { ServiceDatabaseFileAccessCLI } from "./DatabaseFileAccess";
import { StorageEventManagerCLI } from "../managers/StorageEventManagerCLI";
import type { ServiceModules } from "@lib/interfaces/ServiceModule";
import { StorageAccessManager } from "@lib/managers/StorageProcessingManager";
import { ServiceRebuilder } from "@lib/serviceModules/Rebuilder";
import type { ServiceContext } from "@lib/services/base/ServiceBase";
import type { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub";
import type { LiveSyncBaseCore } from "../../../LiveSyncBaseCore";
import { ServiceFileHandler } from "../../../serviceModules/FileHandler";
import { StorageEventManagerCLI } from "../managers/StorageEventManagerCLI";
import { ServiceDatabaseFileAccessCLI } from "./DatabaseFileAccess";
import { FileAccessCLI } from "./FileAccessCLI";
import type { IgnoreRules } from "./IgnoreRules";
import { ServiceFileAccessCLI } from "./ServiceFileAccessImpl";
/**
* Initialize service modules for CLI version
src/apps/cli/serviceModules/DatabaseFileAccess.ts
+1 -1
View File
@@ -1,8 +1,8 @@
import type { DatabaseFileAccess } from "@lib/interfaces/DatabaseFileAccess";
import {
ServiceDatabaseFileAccessBase,
type ServiceDatabaseFileAccessDependencies,
} from "@lib/serviceModules/ServiceDatabaseFileAccessBase";
import type { DatabaseFileAccess } from "@lib/interfaces/DatabaseFileAccess";
/**
* CLI-specific implementation of ServiceDatabaseFileAccess
src/apps/cli/services/NodeKeyValueDBService.ts
+2 -3
View File
@@ -1,14 +1,13 @@
import { LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/logger";
import type { KeyValueDatabase } from "@lib/interfaces/KeyValueDatabase";
import type { IKeyValueDBService } from "@lib/services/base/IService";
import type { IKeyValueDBService, IVaultService } from "@lib/services/base/IService";
import { ServiceBase, type ServiceContext } from "@lib/services/base/ServiceBase";
import type { InjectableAppLifecycleService } from "@lib/services/implements/injectable/InjectableAppLifecycleService";
import type { InjectableDatabaseEventService } from "@lib/services/implements/injectable/InjectableDatabaseEventService";
import type { IVaultService } from "@lib/services/base/IService";
import type { SimpleStore } from "octagonal-wheels/databases/SimpleStoreBase";
import { createInstanceLogFunction } from "@lib/services/lib/logUtils";
import * as nodeFs from "node:fs";
import * as nodePath from "node:path";
import type { SimpleStore } from "octagonal-wheels/databases/SimpleStoreBase";
const NODE_KV_TYPED_KEY = "__nodeKvType";
const NODE_KV_VALUES_KEY = "values";
src/apps/cli/services/NodeServiceHub.ts
+8 -8
View File
@@ -1,10 +1,11 @@
import type { AppLifecycleService, AppLifecycleServiceDependencies } from "@lib/services/base/AppLifecycleService";
import { ControlService } from "@lib/services/base/ControlService";
import type { IControlService } from "@lib/services/base/IService";
import { ServiceContext } from "@lib/services/base/ServiceBase";
import * as nodePath from "node:path";
import { ConfigServiceBrowserCompat } from "@lib/services/implements/browser/ConfigServiceBrowserCompat";
import { SvelteDialogManagerBase, type ComponentHasResult } from "@lib/services/implements/base/SvelteDialog";
import { UIService } from "@lib/services/implements/base/UIService";
import { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub";
import { ConfigServiceBrowserCompat } from "@lib/services/implements/browser/ConfigServiceBrowserCompat";
import { HeadlessAPIService } from "@lib/services/implements/headless/HeadlessAPIService";
import { InjectableAppLifecycleService } from "@lib/services/implements/injectable/InjectableAppLifecycleService";
import { InjectableConflictService } from "@lib/services/implements/injectable/InjectableConflictService";
import { InjectableDatabaseEventService } from "@lib/services/implements/injectable/InjectableDatabaseEventService";
@@ -13,18 +14,17 @@ import { PathServiceCompat } from "@lib/services/implements/injectable/Injectabl
import { InjectableRemoteService } from "@lib/services/implements/injectable/InjectableRemoteService";
import { InjectableReplicationService } from "@lib/services/implements/injectable/InjectableReplicationService";
import { InjectableReplicatorService } from "@lib/services/implements/injectable/InjectableReplicatorService";
import { InjectableServiceHub } from "@lib/services/implements/injectable/InjectableServiceHub";
import { InjectableTestService } from "@lib/services/implements/injectable/InjectableTestService";
import { InjectableTweakValueService } from "@lib/services/implements/injectable/InjectableTweakValueService";
import { InjectableVaultServiceCompat } from "@lib/services/implements/injectable/InjectableVaultService";
import { ControlService } from "@lib/services/base/ControlService";
import type { IControlService } from "@lib/services/base/IService";
import { HeadlessAPIService } from "@lib/services/implements/headless/HeadlessAPIService";
import * as nodePath from "node:path";
// import { HeadlessDatabaseService } from "@lib/services/implements/headless/HeadlessDatabaseService";
import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
import { DatabaseService } from "@lib/services/base/DatabaseService";
import type { ServiceInstances } from "@lib/services/ServiceHub";
import { NodeKeyValueDBService } from "./NodeKeyValueDBService";
import { NodeSettingService } from "./NodeSettingService";
import { DatabaseService } from "@lib/services/base/DatabaseService";
import type { ObsidianLiveSyncSettings } from "@lib/common/types";
export class NodeServiceContext extends ServiceContext {
databasePath: string;
src/apps/cli/services/NodeSettingService.ts
+3 -3
View File
@@ -1,10 +1,10 @@
import { EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
import { EVENT_REQUEST_RELOAD_SETTING_TAB } from "@/common/events";
import type { ObsidianLiveSyncSettings } from "@lib/common/models/setting.type";
import { EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
import { eventHub } from "@lib/hub/hub";
import { handlers } from "@lib/services/lib/HandlerUtils";
import type { ObsidianLiveSyncSettings } from "@lib/common/types";
import type { ServiceContext } from "@lib/services/base/ServiceBase";
import { SettingService, type SettingServiceDependencies } from "@lib/services/base/SettingService";
import { handlers } from "@lib/services/lib/HandlerUtils";
import {
configureNodeLocalStorage,
deleteNodeLocalStorageItem,
src/lib
+1 -1
Submodule src/lib updated: ee45b07b7f...42397d0bdf
utilsdeno/refactor-import-utils.ts
+1
View File
@@ -11,6 +11,7 @@ if (isDryRun) {
);
}
// const project = new Project({ tsConfigFilePath: "../src/apps/cli/tsconfig.json" });
const project = new Project({ tsConfigFilePath: "../tsconfig.json" });
const importMap = new Map<string, string>();
utilsdeno/refactor-imports.ts
+1
View File
@@ -11,6 +11,7 @@ if (isDryRun) {
);
}
// const project = new Project({ tsConfigFilePath: "../src/apps/cli/tsconfig.json" });
const project = new Project({ tsConfigFilePath: "../tsconfig.json" });
const importMap = new Map<string, string>();