diff --git a/packages/durable/src/sync/batch.ts b/packages/durable/src/sync/batch.ts index e15cd96a5..8d26272fb 100644 --- a/packages/durable/src/sync/batch.ts +++ b/packages/durable/src/sync/batch.ts @@ -1,4 +1,4 @@ -import type { ArchivePart, OutboxCommit } from "@earendil-works/chord/next"; +import type { ArchivePart, OutboxCommit } from "@earendil-works/chord"; import { decodeLogLines, encodeLogLine, LogFormatError } from "./lines.ts"; /** diff --git a/packages/durable/src/sync/client.ts b/packages/durable/src/sync/client.ts index f45eb0419..5e333a2cd 100644 --- a/packages/durable/src/sync/client.ts +++ b/packages/durable/src/sync/client.ts @@ -1,4 +1,3 @@ -import type { Context } from "@earendil-works/chord"; import { applyBatch, type Backend, @@ -7,7 +6,8 @@ import { type OutboxCommit, openStore, type Store, -} from "@earendil-works/chord/next"; +} from "@earendil-works/chord"; +import type { Context } from "@earendil-works/chord/context"; import { seqFromNumber } from "../ids.ts"; import type { CommitPublication, Seq } from "../types.ts"; import { decodeBatch, decodeSnapshot, encodeBatch, encodeSnapshot } from "./batch.ts"; diff --git a/packages/durable/src/sync/filesystem.ts b/packages/durable/src/sync/filesystem.ts index 5d8a8a411..24af2bbad 100644 --- a/packages/durable/src/sync/filesystem.ts +++ b/packages/durable/src/sync/filesystem.ts @@ -1,4 +1,4 @@ -import type { Context } from "@earendil-works/chord"; +import type { Context } from "@earendil-works/chord/context"; import type { FileError, FileSystem, Result } from "../env/index.ts"; import { seqFromNumber } from "../ids.ts"; import type { JsonObject, Seq } from "../types.ts"; diff --git a/packages/durable/src/sync/lines.ts b/packages/durable/src/sync/lines.ts index 8228c0201..93a5abb5a 100644 --- a/packages/durable/src/sync/lines.ts +++ b/packages/durable/src/sync/lines.ts @@ -1,4 +1,4 @@ -import type { OutboxCommit } from "@earendil-works/chord/next"; +import type { OutboxCommit } from "@earendil-works/chord"; /** * Version of the line envelope. It changes when the envelope changes; the writes inside carry the store outbox's own diff --git a/packages/durable/src/sync/remote.ts b/packages/durable/src/sync/remote.ts index a1b474d6f..d8e415e0e 100644 --- a/packages/durable/src/sync/remote.ts +++ b/packages/durable/src/sync/remote.ts @@ -1,4 +1,4 @@ -import type { Context } from "@earendil-works/chord"; +import type { Context } from "@earendil-works/chord/context"; import { seqFromNumber } from "../ids.ts"; import type { JsonObject, Seq } from "../types.ts"; diff --git a/packages/durable/src/sync/state.ts b/packages/durable/src/sync/state.ts index f80bf6021..b02ace9ca 100644 --- a/packages/durable/src/sync/state.ts +++ b/packages/durable/src/sync/state.ts @@ -1,4 +1,4 @@ -import type { Context } from "@earendil-works/chord"; +import type { Context } from "@earendil-works/chord/context"; import type { FileError, FileSystem, Result } from "../env/index.ts"; import type { Seq } from "../types.ts"; import type { SyncState, SyncStateStore } from "./client.ts"; diff --git a/packages/durable/test/sync-e2e.test.ts b/packages/durable/test/sync-e2e.test.ts index 8274b654c..1a8d953d5 100644 --- a/packages/durable/test/sync-e2e.test.ts +++ b/packages/durable/test/sync-e2e.test.ts @@ -4,7 +4,7 @@ import { mkdtemp, rename, rm } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import { openStore, type Store } from "@earendil-works/chord/next"; +import { openStore, type Store } from "@earendil-works/chord"; import { fauxAssistantMessage } from "@earendil-works/pi-ai"; import { afterEach, describe, expect, it } from "vitest"; import { NodeExecutionEnv } from "../src/env/node.ts"; diff --git a/packages/durable/test/sync-remote.test.ts b/packages/durable/test/sync-remote.test.ts index 10f5e1e06..c09fd9a37 100644 --- a/packages/durable/test/sync-remote.test.ts +++ b/packages/durable/test/sync-remote.test.ts @@ -3,9 +3,10 @@ import { mkdtemp, rm } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import type { Context, JsonValue } from "@earendil-works/chord"; +import { openStore, type Store } from "@earendil-works/chord"; +import type { Context } from "@earendil-works/chord/context"; import { BACKGROUND_CONTEXT } from "@earendil-works/chord/context"; -import { openStore, type Store } from "@earendil-works/chord/next"; +import type { JsonValue } from "@earendil-works/chord/json"; import { afterEach, describe, expect, it } from "vitest"; import { NodeExecutionEnv } from "../src/env/node.ts"; import { idFromNumber, seqFromNumber } from "../src/ids.ts"; diff --git a/packages/durable/test/sync-support.ts b/packages/durable/test/sync-support.ts index 48bc7423e..c7120a8bd 100644 --- a/packages/durable/test/sync-support.ts +++ b/packages/durable/test/sync-support.ts @@ -1,9 +1,9 @@ // A session's copy for the sync tests: a Chord store over a SQLite database with its outbox on, and Durable's storage // in it under one owner name. The store is what syncs; the storage is opened on it only while something commits. -import type { Context } from "@earendil-works/chord"; +import { type Backend, openStore, type Store, sqliteBackend } from "@earendil-works/chord"; +import type { Context } from "@earendil-works/chord/context"; import { BACKGROUND_CONTEXT } from "@earendil-works/chord/context"; -import { type Backend, openStore, type Store, sqliteBackend } from "@earendil-works/chord/next"; import { openNodeSqliteDatabase } from "@earendil-works/chord/sqlite/node"; import { StoreStorage } from "../src/storage/store/index.ts"; import { commitWrites } from "../src/testing/commit-writes.ts";