@agentshouse/mdruntime 0.1.0-c2c52158b7381 → 0.1.0-c2e8a6f99866d

package/dist/overlay.js

@@ -1,5 +1,5 @@
 import { apply, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
-import { differences, drafted, entriesIn, patching, settling } from './shared.js';
+import { drafted, entriesIn, settling } from './shared.js';
 import { ROW_WEIGHT } from './turn.js';
 export function* acceptedBinaries(files) {
     for (const [path, file] of entriesIn(files))
@@ -237,153 +237,3 @@ export function* overlaying(base, queue, unapplied) {
         changes: yield* settling(staged.changes),
     };
 }
-function* pathsOf(batch) {
-    const paths = new Set();
-    for (const change of batch.changes) {
-        paths.add(change.path);
-        if (change.kind === 'move')
-            paths.add(change.to);
-        yield ROW_WEIGHT;
-    }
-    return paths;
-}
-export function* sameText(left, right) {
-    return ((yield* differences(left.documents, right.documents)).size === 0 &&
-        (yield* differences(left.binaries, right.binaries, sameBinary)).size === 0);
-}
-export function* changedPaths(left, right) {
-    return new Set([
-        ...(yield* differences(left.documents, right.documents)),
-        ...(yield* differences(left.revisions, right.revisions)),
-        ...(yield* differences(left.fileIds, right.fileIds)),
-        ...(yield* differences(left.changes, right.changes, sameChange)),
-        ...(yield* differences(left.binaries, right.binaries, sameBinary)),
-    ]);
-}
-function* sameItems(left, right) {
-    if (left.length !== right.length)
-        return false;
-    for (let index = 0; index < left.length; index += 1) {
-        const item = JSON.stringify(left[index]);
-        if (item !== JSON.stringify(right[index]))
-            return false;
-        yield ROW_WEIGHT + item.length;
-    }
-    return true;
-}
-function* sameBatch(left, right) {
-    if (left === right)
-        return true;
-    const { changes, preconditions, ...rest } = left;
-    const { changes: others, preconditions: priors, ...held } = right;
-    return (JSON.stringify(rest) === JSON.stringify(held) &&
-        (yield* sameItems(changes, others)) &&
-        (yield* sameItems(preconditions, priors)));
-}
-function* replayHeads(base, batch) {
-    const heads = {
-        revisions: drafted(base.revisions),
-        fileIds: drafted(base.fileIds),
-        changes: drafted(base.changes),
-    };
-    for (const change of batch.changes) {
-        if (change.kind === 'remove') {
-            delete heads.revisions[change.path];
-            delete heads.fileIds[change.path];
-            delete heads.changes[change.path];
-        }
-        else if (change.kind === 'create') {
-            delete heads.fileIds[change.path];
-            delete heads.changes[change.path];
-        }
-        else if (change.kind === 'replace' ||
-            change.kind === 'field' ||
-            change.kind === 'section' ||
-            change.kind === 'preamble') {
-            delete heads.revisions[change.path];
-        }
-        else if (change.kind === 'binary') {
-            delete heads.revisions[change.path];
-            delete heads.changes[change.path];
-        }
-        else if (change.kind === 'move') {
-            moveHead(heads, change.path, change.to);
-        }
-        else if (change.kind === 'arrival') {
-            delete heads.revisions[change.path];
-            delete heads.fileIds[change.path];
-            delete heads.changes[change.path];
-            arrive(heads, change);
-        }
-        yield ROW_WEIGHT;
-    }
-    return {
-        revisions: yield* settling(heads.revisions),
-        fileIds: yield* settling(heads.fileIds),
-        changes: yield* settling(heads.changes),
-    };
-}
-function* repatched(held, paths, value) {
-    const set = [];
-    const removed = [];
-    for (const path of paths) {
-        const found = value(path);
-        if (found === undefined)
-            removed.push(path);
-        else
-            set.push([path, found]);
-        yield ROW_WEIGHT;
-    }
-    return yield* patching(held, set, removed);
-}
-export function* overlayChanged(base, batch, previousBase, previousBatch, previousVisible) {
-    const same = yield* sameBatch(batch, previousBatch);
-    if (same && (yield* sameText(base, previousBase))) {
-        return {
-            documents: previousVisible.documents,
-            binaries: previousVisible.binaries,
-            ...(yield* replayHeads(base, batch)),
-        };
-    }
-    const affected = new Set(yield* changedPaths(base, previousBase));
-    const touched = yield* pathsOf(batch);
-    let replayed = !same;
-    if (replayed)
-        for (const path of yield* pathsOf(previousBatch))
-            affected.add(path);
-    for (const path of touched) {
-        if (affected.has(path))
-            replayed = true;
-        yield ROW_WEIGHT;
-    }
-    const restricted = {
-        documents: {},
-        revisions: {},
-        fileIds: {},
-        changes: {},
-        binaries: {},
-    };
-    for (const path of replayed ? touched : []) {
-        affected.add(path);
-        if (base.documents[path] !== undefined)
-            restricted.documents[path] = base.documents[path];
-        if (base.revisions[path] !== undefined)
-            restricted.revisions[path] = base.revisions[path];
-        if (base.fileIds[path] !== undefined)
-            restricted.fileIds[path] = base.fileIds[path];
-        if (base.changes[path] !== undefined)
-            restricted.changes[path] = base.changes[path];
-        if (base.binaries[path] !== undefined)
-            restricted.binaries[path] = base.binaries[path];
-        yield ROW_WEIGHT;
-    }
-    const staged = replayed ? yield* overlaying(restricted, [batch]) : base;
-    const from = (path) => (touched.has(path) ? staged : base);
-    return {
-        documents: yield* repatched(previousVisible.documents, affected, (path) => from(path).documents[path]),
-        revisions: yield* repatched(previousVisible.revisions, affected, (path) => from(path).revisions[path]),
-        fileIds: yield* repatched(previousVisible.fileIds, affected, (path) => from(path).fileIds[path]),
-        changes: yield* repatched(previousVisible.changes, affected, (path) => from(path).changes[path]),
-        binaries: yield* repatched(previousVisible.binaries, affected, (path) => from(path).binaries[path]),
-    };
-}

package/dist/reach.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"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"}

package/dist/reach.js

@@ -1,14 +1,12 @@
 import { unheldView } from './conversation.js';
 import { modelTypes, NO_MODEL } from './model.js';
-import { applied, observing } from './observation.js';
+import { changeOf, digestApplied, digestOf, observing, } from './observation.js';
 import { runtimeError } from './failure.js';
 import { absentReference, failure, lockedRoom, ROOM_LOCKED, undeclared, UNREADABLE, } from './outcome.js';
 import { beneath } from './paths.js';
-import { reconciled } from './read-side.js';
 import { moveTarget, readParts, staleWrite, } from './room-draft.js';
 import { documentKey } from './rows.js';
 import { undeclaredSearch } from './search.js';
-import { after, stepped } from './turn.js';
 const UNHELD_TYPES = { collection: modelTypes(NO_MODEL), typedSelection: null };
 function unconversed(name) {
     return () => Promise.resolve(undeclared(name));
@@ -206,47 +204,29 @@ export function narrowed(runtime, given, told) {
                 const locked = unlocking(plan.rooms);
                 if (locked !== null) {
                     const answer = { result: locked, keys: [] };
-                    const same = held !== null &&
-                        'pending' in held.result &&
-                        JSON.stringify(held.result) === JSON.stringify(locked);
-                    if (!same)
+                    if (held === null || changeOf(held, answer) !== null)
                         deliver(answer);
-                    held = answer;
+                    held = digestOf(answer);
                     return () => { };
                 }
                 let first = true;
                 let open = true;
-                let order = undefined;
                 const heard = (message) => {
                     if (!first) {
-                        held = applied(held, message);
+                        held = digestApplied(held, message);
                         deliver(message);
                         return;
                     }
                     first = false;
-                    if (held === null) {
-                        held = message;
-                        deliver(message);
-                        return;
-                    }
-                    return after(stepped(reconciled(held, message)), (next) => {
-                        if (!open || next === null)
-                            return;
-                        held = next.keyed;
-                        deliver(next.message);
-                    });
+                    const change = held === null ? message : changeOf(held, message);
+                    held = digestOf(message);
+                    if (change !== null)
+                        deliver(change);
                 };
                 const current = { ...plan, reach: planReach(reach), locked: runtime.lockedRooms() };
                 const stop = runtime.watchPlan(current, (message) => {
-                    const queued = after(order, () => (open ? heard(message) : undefined));
-                    if (queued instanceof Promise) {
-                        const ended = queued.catch(() => { });
-                        order = ended;
-                        void ended.then(() => {
-                            if (order === ended)
-                                order = undefined;
-                        });
-                    }
+                    if (open)
+                        heard(message);
                 });
                 return () => {
                     open = false;
@@ -310,7 +290,7 @@ export function narrowed(runtime, given, told) {
                 throw unreached(room);
             if (runtime.locked(room))
                 return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
-            const held = roomDrafts.map(({ path }) => md.roomDraft.read(room, path)?.parts.move);
+            const held = (await Promise.all(roomDrafts.map(({ path }) => md.roomDraft.read(room, path)))).map((draft) => draft?.parts.move);
             const outside = roomDrafts.find(({ path }, at) => !covers(reach, room, path) || !moves(reach, room, held[at]));
             if (outside !== undefined) {
                 return { outcome: 'refused', code: 'stale', retryable: false, file: outside.path };
@@ -373,19 +353,19 @@ export function narrowed(runtime, given, told) {
                 return bytes;
             },
         },
-        reached: (room, roomVersion, path) => (path === undefined ? wholly(reach, room) : covers(reach, room, path)) &&
+        reached: async (room, roomVersion, path) => (path === undefined ? wholly(reach, room) : covers(reach, room, path)) &&
             !runtime.locked(room) &&
-            md.reached(room, roomVersion, path),
+            (await md.reached(room, roomVersion, path)),
         log: () => (reach === null ? md.log() : ''),
         cleanUp: () => (reach === null ? md.cleanUp() : Promise.reject(deviceUnreached())),
         roomDraft: {
             list: () => md.roomDraft.list().then((drafts) => unlocked(draftsWithin(reach, drafts))),
-            read(room, path) {
+            async read(room, path) {
                 if (!covers(reach, room, path))
                     return null;
                 if (runtime.locked(room))
                     throw lockedError(room);
-                return shownDraft(reach, md.roomDraft.read(room, path));
+                return shownDraft(reach, await md.roomDraft.read(room, path));
             },
             async write(room, path, revision, parts) {
                 const move = readParts(parts).move;

package/dist/reads.js

@@ -5,7 +5,7 @@ function declaredAs(declaration) {
     return declared;
 }
 function sameHeld(one, other) {
-    return one?.documents === other?.documents && one?.revisions === other?.revisions;
+    return one === other;
 }
 function failed(answer) {
     return answer?.kind === 'transport-uncertainty';

package/dist/refresh.d.ts

@@ -1,24 +1,21 @@
 import type { AdapterFailure, Authorization, RetryableRefusal } from './adapter.js';
 import type { Reads, Remodel } from './bootstrap.js';
-import { type ConfirmedLayer } from './replica.js';
-import type { ReplicaRecord } from './store.js';
-import { type Refused, type Unconfirmed } from './transfer.js';
+import type { ReplicaRecord } from './replica.js';
+import type { RefreshedPage } from './store.js';
+import type { HeldEntry } from './tables.js';
+import { type Unconfirmed } from './transfer.js';
 export type Advancement = {
     kind: 'still-current';
 } | {
     kind: 'advanced';
     record: ReplicaRecord;
+    changed: ReadonlySet<string>;
 } | {
     kind: 'beyond-horizon';
 } | RetryableRefusal | Unconfirmed | AdapterFailure;
-export type RefreshOutcome = {
-    kind: 'still-current';
-} | {
-    kind: 'advanced';
-    confirmed: ConfirmedLayer;
-} | {
-    kind: 'beyond-horizon';
-} | RetryableRefusal | Unconfirmed | Refused | AdapterFailure;
-export declare function advancement(adapter: Reads, authorization: Authorization, held: ReplicaRecord, remodel: Remodel, continuing: () => boolean): Promise<Advancement>;
-export declare function refreshRoom(adapter: Reads, authorization: Authorization, confirmed: ConfirmedLayer, remodel: Remodel, continuing: () => boolean): Promise<RefreshOutcome>;
+export type Refreshing = {
+    prior(paths: readonly string[]): Promise<ReadonlyMap<string, HeldEntry>>;
+    stage(page: RefreshedPage): Promise<boolean>;
+};
+export declare function advancement(adapter: Reads, authorization: Authorization, held: ReplicaRecord, remodel: Remodel, continuing: () => boolean, staging: Refreshing): Promise<Advancement>;
 //# sourceMappingURL=refresh.d.ts.map

package/dist/refresh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAe,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEjG,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,cAAc,CAAC;AAEnB,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,OAAO,GACP,cAAc,CAAC;AAEnB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,WAAW,CAAC,CAgGtB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,cAAc,CAAC,CAKzB"}
+{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAe,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACjG,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,GACzE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,cAAc,CAAC;AAEnB,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACzE,KAAK,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AAkEF,wBAAsB,WAAW,CAC/B,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,EACzB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,WAAW,CAAC,CA+CtB"}

package/dist/refresh.js

@@ -1,9 +1,65 @@
-import { acceptedBinaries } from './overlay.js';
-import { readStaged } from './replica.js';
-import { drafted, entriesIn, settling } from './shared.js';
-import { ROW_WEIGHT, stepped } from './turn.js';
 import { unconfirmed } from './transfer.js';
-export async function advancement(adapter, authorization, held, remodel, continuing) {
+async function pageOf(page, roomVersion, staging) {
+    const removed = new Set(page.removals);
+    const documents = Object.keys(page.documents).filter((path) => !removed.has(path));
+    const binaries = Object.keys(page.binaryFiles).filter((path) => !removed.has(path));
+    const written = new Set([...documents, ...binaries]);
+    const others = [
+        ...new Set([
+            ...Object.keys(page.revisions),
+            ...Object.keys(page.fileIds ?? {}),
+            ...Object.keys(page.changes),
+        ]),
+    ].filter((path) => !written.has(path) && !removed.has(path));
+    const asked = [
+        ...documents.filter((path) => page.revisions[path] === undefined),
+        ...binaries.filter((path) => page.revisions[path] === undefined),
+        ...others,
+    ];
+    const prior = asked.length === 0 ? new Map() : await staging.prior(asked);
+    const entries = [];
+    for (const path of documents) {
+        entries.push({
+            path,
+            content: page.documents[path],
+            binary: null,
+            revision: page.revisions[path] ?? prior.get(path)?.revision ?? null,
+            fileId: page.fileIds?.[path] ?? null,
+            change: page.changes[path] ?? null,
+            written: roomVersion,
+        });
+    }
+    for (const path of binaries) {
+        entries.push({
+            path,
+            content: null,
+            binary: { state: 'accepted', ...page.binaryFiles[path] },
+            revision: page.revisions[path] ?? prior.get(path)?.revision ?? null,
+            fileId: page.fileIds?.[path] ?? null,
+            change: page.changes[path] ?? null,
+            written: null,
+        });
+    }
+    for (const path of others) {
+        const held = prior.get(path);
+        if (held === undefined)
+            continue;
+        const { type: _type, ...kept } = held;
+        entries.push({
+            ...kept,
+            revision: page.revisions[path] ?? held.revision,
+            fileId: page.fileIds?.[path] ?? held.fileId,
+            change: page.changes[path] ?? held.change,
+        });
+    }
+    return {
+        entries,
+        removals: page.removals,
+        folders: page.folders ?? [],
+        folderRemovals: page.folderRemovals ?? [],
+    };
+}
+export async function advancement(adapter, authorization, held, remodel, continuing, staging) {
     const locator = held.locator;
     const fromRoomVersion = held.roomVersion;
     const first = await adapter.refresh(authorization, {
@@ -18,58 +74,17 @@ export async function advancement(adapter, authorization, held, remodel, continu
         collection: held.model,
         selection: held.selectionModel,
     });
-    const documents = drafted(held.documents);
-    const revisions = drafted(held.revisions);
-    const fileIds = drafted(held.fileIds);
-    const changes = drafted(held.changes);
-    const written = drafted(held.written);
-    const binaries = drafted(held.binaries);
-    const stage = function* (page) {
-        for (const [path] of entriesIn(page.documents)) {
-            delete binaries[path];
-            delete fileIds[path];
-            delete changes[path];
-            written[path] = roomVersion;
-            yield ROW_WEIGHT;
-        }
-        for (const [path] of entriesIn(page.binaryFiles)) {
-            delete documents[path];
-            delete fileIds[path];
-            delete changes[path];
-            delete written[path];
-            yield ROW_WEIGHT;
-        }
-        for (const [path, content] of entriesIn(page.documents)) {
-            documents[path] = content;
-            yield ROW_WEIGHT + content.length;
-        }
-        for (const [path, binary] of acceptedBinaries(page.binaryFiles)) {
-            binaries[path] = binary;
-            yield ROW_WEIGHT;
-        }
-        for (const [path, revision] of entriesIn(page.revisions)) {
-            revisions[path] = revision;
-            yield ROW_WEIGHT;
-        }
-        for (const [path, fileId] of entriesIn(page.fileIds ?? {})) {
-            fileIds[path] = fileId;
-            yield ROW_WEIGHT;
-        }
-        for (const [path, change] of entriesIn(page.changes)) {
-            changes[path] = change;
-            yield ROW_WEIGHT;
-        }
-        for (const path of page.removals) {
-            delete documents[path];
-            delete revisions[path];
-            delete fileIds[path];
-            delete changes[path];
-            delete written[path];
-            delete binaries[path];
-            yield ROW_WEIGHT;
-        }
+    const changed = new Set();
+    const staged = async (page) => {
+        const read = await pageOf(page, roomVersion, staging);
+        for (const { path } of read.entries)
+            changed.add(path);
+        for (const path of read.removals)
+            changed.add(path);
+        return staging.stage(read);
     };
-    await stepped(stage(first));
+    if (!(await staged(first)))
+        return unconfirmed;
     let pageToken = first.pageToken;
     while (pageToken !== undefined) {
         if (!continuing())
@@ -86,7 +101,8 @@ export async function advancement(adapter, authorization, held, remodel, continu
             return page;
         if (page.roomVersion !== roomVersion)
             return unconfirmed;
-        await stepped(stage(page));
+        if (!(await staged(page)))
+            return unconfirmed;
         pageToken = page.pageToken;
     }
     return {
@@ -96,19 +112,7 @@ export async function advancement(adapter, authorization, held, remodel, continu
             model: models.collection,
             selectionModel: models.selection,
             roomVersion,
-            documents: await stepped(settling(documents)),
-            binaries: await stepped(settling(binaries)),
-            revisions: await stepped(settling(revisions)),
-            fileIds: await stepped(settling(fileIds)),
-            changes: await stepped(settling(changes)),
-            written: await stepped(settling(written)),
         },
+        changed,
     };
 }
-export async function refreshRoom(adapter, authorization, confirmed, remodel, continuing) {
-    const advanced = await advancement(adapter, authorization, confirmed.record, remodel, continuing);
-    if (advanced.kind !== 'advanced')
-        return advanced;
-    const staged = await readStaged(advanced.record, confirmed);
-    return staged.kind === 'staged' ? { kind: 'advanced', confirmed: staged.confirmed } : staged;
-}

package/dist/replica.d.ts

@@ -1,51 +1,68 @@
-import { type ChangeBatch } from './change.js';
+import type { MutationResult, OperationScopes, ReplicaAdmission, TypedSelection } from './adapter.js';
+import { type ChangeBatch, type Precondition } from './change.js';
 import { type Collection, type Composition } from './collection.js';
+import type { ModelState } from './model.js';
 import { type Layer } from './overlay.js';
-import type { MutationResult } from './adapter.js';
-import type { ReplicaRecord } from './store.js';
-import type { Refused } from './transfer.js';
-import { type Later } from './turn.js';
-export type ConfirmedLayer = {
-    record: ReplicaRecord;
-    collection: Collection;
+import type { HeldEntry, OverlayEntry, StoredEntry } from './tables.js';
+export type ReplicaRecord = {
+    readonly locator: string;
+    readonly name: string;
+    readonly handle: string;
+    readonly operations: OperationScopes;
+    readonly replica: ReplicaAdmission;
+    readonly model: ModelState;
+    readonly typedSelection: TypedSelection | null;
+    readonly selectionModel: ModelState;
+    readonly providerOwnedPaths: readonly string[];
+    readonly roomVersion: string;
+    readonly transfer: string;
+    readonly key: number;
+};
+export type HeldReplica = {
+    readonly record: ReplicaRecord;
+    readonly queue: readonly ChangeBatch[];
+    readonly overlaid: ReadonlySet<string>;
+    readonly count: number;
+    readonly confirmed: number;
 };
 export type VisibleLayer = Layer & {
-    collection: Collection;
+    readonly collection: Collection;
 };
-export type Staged = {
-    kind: 'staged';
-    confirmed: ConfirmedLayer;
-} | Refused;
-export type Replica = {
-    confirmed: ConfirmedLayer;
-    queue: readonly ChangeBatch[];
-    visible: VisibleLayer;
-    replay: readonly ReplayStep[];
+export type Slice = Layer & {
+    readonly written: Readonly<Record<string, string>>;
+    readonly held: ReadonlySet<string>;
 };
-type ReplayStep = {
-    id: string;
-    before: Layer;
-    after: Layer;
-    effective: ChangeBatch;
-    collection?: Collection;
+export declare function compositionOf(record: Pick<ReplicaRecord, 'model' | 'typedSelection' | 'selectionModel'>): Composition;
+export declare function sameMembership(record: Pick<ReplicaRecord, 'typedSelection'>, other: Pick<ReplicaRecord, 'typedSelection'>): boolean;
+export declare function storedRecord(record: ReplicaRecord): string;
+export declare function slicing(entries: readonly HeldEntry[], paths: Iterable<string>): Generator<number, Slice, void>;
+export declare function entryAt(layer: Layer & {
+    readonly written?: Readonly<Record<string, string>>;
+}, path: string): StoredEntry | null;
+export declare function slicingWith(slice: Slice, set: readonly StoredEntry[], removed: readonly string[]): Generator<number, Slice, void>;
+export declare function touchedBy(queue: readonly ChangeBatch[]): Set<string>;
+export declare function movedBy(queue: readonly ChangeBatch[], locator: string): Set<string>;
+export type Replayed = {
+    readonly visible: VisibleLayer;
+    readonly touched: ReadonlySet<string>;
 };
-export declare function compositionOf(record: ReplicaRecord): Composition;
-export declare function confirmedOf(record: ReplicaRecord, previous?: ConfirmedLayer): Later<ConfirmedLayer>;
-export declare function sameMembership(record: ReplicaRecord, other: ReplicaRecord): boolean;
-export declare function readStaged(staged: ReplicaRecord, previous?: ConfirmedLayer): Later<Staged>;
-export declare function readReclassified(record: ReplicaRecord, previous: ConfirmedLayer): Later<Staged | {
-    kind: 'deferred';
-}>;
-type Accepted = Extract<MutationResult, {
-    kind: 'accepted';
-}>;
-export declare function applyReturned(confirmed: ConfirmedLayer, submitted: ChangeBatch, accepted: Accepted, roomVersion: string, writtenAt: string): Later<Staged>;
-export declare function replicating(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], previous?: Replica): Generator<number, Replica, void>;
-export declare function landed(batch: ChangeBatch, confirmed: ConfirmedLayer, current?: Readonly<Record<string, string>>): boolean;
+export declare function replaying(confirmed: Slice, queue: readonly ChangeBatch[], locator: string, composition: Composition): Generator<number, Replayed, void>;
+export declare function overlayOf(visible: Layer, touched: Iterable<string>): Generator<number, OverlayEntry[], void>;
+export declare function holds(layer: Layer, preconditions: readonly Precondition[]): boolean;
+export declare function landed(batch: ChangeBatch, confirmed: Layer, current?: Readonly<Record<string, string>>): boolean;
 export type Standing = {
     readonly withdrawn: readonly ChangeBatch[];
     readonly kept: readonly ChangeBatch[];
 };
-export declare function standing(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, local: boolean): Generator<number, Standing, void>;
+export declare function standing(confirmed: Slice, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, local: boolean, locator: string, composition: Composition): Generator<number, Standing, void>;
+type Accepted = Extract<MutationResult, {
+    kind: 'accepted';
+}>;
+export type Returned = {
+    readonly set: readonly StoredEntry[];
+    readonly removed: readonly string[];
+};
+export declare function returnedPaths(submitted: ChangeBatch, accepted: Accepted): Set<string>;
+export declare function returning(confirmed: Slice, submitted: ChangeBatch, accepted: Accepted, writtenAt: string): Generator<number, Returned, void>;
 export {};
 //# sourceMappingURL=replica.d.ts.map

package/dist/replica.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"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"}