diff --git a/src/common/utils.ts b/src/common/utils.ts index 2785d3e..def180c 100644 --- a/src/common/utils.ts +++ b/src/common/utils.ts @@ -35,7 +35,7 @@ import { promiseWithResolver, type PromiseWithResolvers } from "octagonal-wheels import { AuthorizationHeaderGenerator } from "../lib/src/replication/httplib.ts"; import type { KeyValueDatabase } from "../lib/src/interfaces/KeyValueDatabase.ts"; -export { scheduleTask, cancelTask, cancelAllTasks } from "../lib/src/concurrency/task.ts"; +export { scheduleTask, cancelTask, cancelAllTasks } from "octagonal-wheels/concurrency/task"; // For backward compatibility, using the path for determining id. // Only CouchDB unacceptable ID (that starts with an underscore) has been prefixed with "/". diff --git a/src/lib b/src/lib index c00f62f..9f69880 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit c00f62f060b7401350962f7c8307bd138a0c1713 +Subproject commit 9f69880ec27fb4019c274b943a6aefb8f2a1bf34 diff --git a/src/modules/coreObsidian/storageLib/SerializedFileAccess.ts b/src/modules/coreObsidian/storageLib/SerializedFileAccess.ts index 6b7e446..5e10e4a 100644 --- a/src/modules/coreObsidian/storageLib/SerializedFileAccess.ts +++ b/src/modules/coreObsidian/storageLib/SerializedFileAccess.ts @@ -1,5 +1,5 @@ import { type App, TFile, type DataWriteOptions, TFolder, TAbstractFile } from "../../../deps.ts"; -import { serialized } from "../../../lib/src/concurrency/lock.ts"; +import { serialized } from "octagonal-wheels/concurrency/lock"; import { Logger } from "../../../lib/src/common/logger.ts"; import { isPlainText } from "../../../lib/src/string_and_binary/path.ts"; import type { FilePath, HasSettings, UXFileInfoStub } from "../../../lib/src/common/types.ts"; diff --git a/src/modules/coreObsidian/storageLib/StorageEventManager.ts b/src/modules/coreObsidian/storageLib/StorageEventManager.ts index 7da0270..3d28ea5 100644 --- a/src/modules/coreObsidian/storageLib/StorageEventManager.ts +++ b/src/modules/coreObsidian/storageLib/StorageEventManager.ts @@ -14,14 +14,14 @@ import { } from "../../../lib/src/common/types.ts"; import { delay, fireAndForget, getFileRegExp } from "../../../lib/src/common/utils.ts"; import { type FileEventItem, type FileEventType } from "../../../common/types.ts"; -import { serialized, skipIfDuplicated } from "../../../lib/src/concurrency/lock.ts"; +import { serialized, skipIfDuplicated } from "octagonal-wheels/concurrency/lock"; import { finishAllWaitingForTimeout, finishWaitingForTimeout, isWaitingForTimeout, waitForTimeout, -} from "../../../lib/src/concurrency/task.ts"; -import { Semaphore } from "../../../lib/src/concurrency/semaphore.ts"; +} from "octagonal-wheels/concurrency/task"; +import { Semaphore } from "octagonal-wheels/concurrency/semaphore"; import type { LiveSyncCore } from "../../../main.ts"; import { InternalFileToUXFileInfoStub, TFileToUXFileInfoStub } from "./utilObsidian.ts"; import ObsidianLiveSyncPlugin from "../../../main.ts"; diff --git a/src/modules/extras/devUtil/testUtils.ts b/src/modules/extras/devUtil/testUtils.ts index 30a32ac..6d3e079 100644 --- a/src/modules/extras/devUtil/testUtils.ts +++ b/src/modules/extras/devUtil/testUtils.ts @@ -1,5 +1,5 @@ import { fireAndForget } from "../../../lib/src/common/utils.ts"; -import { serialized } from "../../../lib/src/concurrency/lock.ts"; +import { serialized } from "octagonal-wheels/concurrency/lock"; import type ObsidianLiveSyncPlugin from "../../../main.ts"; let plugin: ObsidianLiveSyncPlugin; diff --git a/src/modules/features/ModuleInteractiveConflictResolver.ts b/src/modules/features/ModuleInteractiveConflictResolver.ts index c8a86ba..deaef9d 100644 --- a/src/modules/features/ModuleInteractiveConflictResolver.ts +++ b/src/modules/features/ModuleInteractiveConflictResolver.ts @@ -13,7 +13,7 @@ import { ConflictResolveModal } from "./InteractiveConflictResolving/ConflictRes import { AbstractObsidianModule, type IObsidianModule } from "../AbstractObsidianModule.ts"; import { displayRev, getPath, getPathWithoutPrefix } from "../../common/utils.ts"; import { fireAndForget } from "octagonal-wheels/promises"; -import { serialized } from "../../lib/src/concurrency/lock.ts"; +import { serialized } from "octagonal-wheels/concurrency/lock"; export class ModuleInteractiveConflictResolver extends AbstractObsidianModule implements IObsidianModule { $everyOnloadStart(): Promise {