@agentshouse/mdruntime 0.1.0-cd3486bd400ed → 0.1.0-cd35ccee27a19

package/dist/observation.js

@@ -1,19 +1,36 @@
 export function rowsOf(result) {
-    return 'groups' in result ? result.groups : result.documents;
+    if ('groups' in result)
+        return result.groups;
+    return 'documents' in result ? result.documents : [];
 }
-export function applied(keyed, change) {
-    const rows = rowsOf(keyed.result);
+export function whole(message) {
+    return 'result' in message;
+}
+export function applied(keyed, message) {
+    if (whole(message))
+        return message;
+    const result = keyed.result;
+    if ('pending' in result)
+        return keyed;
+    const rows = rowsOf(result);
     const byKey = new Map(keyed.keys.map((key, index) => [key, rows[index]]));
-    for (const key of change.removed)
+    for (const key of message.removed)
         byKey.delete(key);
-    for (const [key, row] of change.changed)
+    for (const [key, row] of message.changed)
         byKey.set(key, row);
-    const keys = change.order ?? keyed.keys.filter((key) => byKey.has(key));
-    const next = keys.map((key) => byKey.get(key));
+    const keys = message.order ?? keyed.keys.filter((key) => byKey.has(key));
+    const kept = keys.map((key) => byKey.get(key));
+    const coverage = message.coverage ?? result.coverage;
+    const next = message.next === undefined ? result.next : (message.next ?? undefined);
+    const total = message.total ?? result.total;
+    const window = {
+        ...(next === undefined ? {} : { next }),
+        ...(total === undefined ? {} : { total }),
+    };
     return {
-        result: 'groups' in keyed.result
-            ? { groups: next }
-            : { documents: next },
+        result: 'groups' in result
+            ? { groups: kept, coverage, ...window }
+            : { documents: kept, coverage, ...window },
         keys,
     };
 }
@@ -27,11 +44,11 @@ function keyedResult(first) {
         },
     };
 }
-function whole(first) {
+function replaced(first) {
     return { value: first, next: (message) => message };
 }
 export function observed(first, stop, keyed) {
-    const reducer = keyed ? keyedResult(first) : whole(first);
+    const reducer = keyed ? keyedResult(first) : replaced(first);
     let value = reducer.value;
     let open = true;
     const listeners = new Set();
@@ -73,23 +90,107 @@ export function opened(watch, keyed) {
     return new Promise((resolve, reject) => {
         let handle;
         let stop = () => { };
-        try {
-            stop = watch((message) => {
-                if (handle !== undefined) {
-                    handle.receive(message);
-                    return;
-                }
-                handle = observed(message, () => stop(), keyed);
-                resolve(handle.observation);
-            });
-        }
-        catch (error) {
+        stop = watch((message) => {
+            if (handle !== undefined) {
+                handle.receive(message);
+                return;
+            }
+            handle = observed(message, () => stop(), keyed);
+            resolve(handle.observation);
+        }, (error) => {
+            if (handle !== undefined)
+                return;
+            stop();
             reject(error);
-        }
+        });
     });
 }
 export function observing(watch) {
-    return (topic, ...input) => opened((deliver) => watch(topic, input, (message) => {
+    return (topic, ...input) => opened((deliver, fail) => watch(topic, input, (message) => {
         deliver(structuredClone(message));
-    }), topic === 'query');
+    }, fail), topic === 'query');
+}
+export function hashed(text) {
+    let first = 0xdeadbeef;
+    let second = 0x41c6ce57;
+    for (let index = 0; index < text.length; index += 1) {
+        const code = text.charCodeAt(index);
+        first = Math.imul(first ^ code, 2654435761);
+        second = Math.imul(second ^ code, 1597334677);
+    }
+    first =
+        Math.imul(first ^ (first >>> 16), 2246822507) ^ Math.imul(second ^ (second >>> 13), 3266489909);
+    second =
+        Math.imul(second ^ (second >>> 16), 2246822507) ^ Math.imul(first ^ (first >>> 13), 3266489909);
+    return 4294967296 * (2097151 & second) + (first >>> 0);
+}
+function rowDigest(row) {
+    return hashed(JSON.stringify(row));
+}
+export function digestOf({ result, keys }) {
+    if ('pending' in result)
+        return { pending: JSON.stringify(result) };
+    const rows = rowsOf(result);
+    return {
+        keys,
+        rows: new Map(keys.map((key, index) => [key, rowDigest(rows[index])])),
+        coverage: JSON.stringify(result.coverage),
+        next: result.next,
+        total: result.total,
+    };
+}
+export function digestApplied(digest, message) {
+    if (whole(message) || 'pending' in digest)
+        return whole(message) ? digestOf(message) : digest;
+    const rows = new Map(digest.rows);
+    for (const key of message.removed)
+        rows.delete(key);
+    for (const [key, row] of message.changed)
+        rows.set(key, rowDigest(row));
+    return {
+        keys: message.order ?? digest.keys.filter((key) => rows.has(key)),
+        rows,
+        coverage: message.coverage === undefined ? digest.coverage : JSON.stringify(message.coverage),
+        next: message.next === undefined ? digest.next : (message.next ?? undefined),
+        total: message.total ?? digest.total,
+    };
+}
+export function changeOf(previous, next) {
+    const after = next.result;
+    if ('pending' in previous || 'pending' in after) {
+        return 'pending' in previous && 'pending' in after && previous.pending === JSON.stringify(after)
+            ? null
+            : next;
+    }
+    const later = rowsOf(after);
+    const present = new Set(next.keys);
+    const changed = [];
+    next.keys.forEach((key, index) => {
+        const row = later[index];
+        if (previous.rows.get(key) !== rowDigest(row))
+            changed.push([key, row]);
+    });
+    const removed = previous.keys.filter((key) => !present.has(key));
+    const kept = previous.keys.filter((key) => present.has(key));
+    const moved = kept.length !== next.keys.length || kept.some((key, index) => next.keys[index] !== key);
+    const coverage = JSON.stringify(after.coverage);
+    const covered = previous.coverage !== coverage;
+    const framing = reframed(previous, after);
+    if (changed.length === 0 && removed.length === 0 && !moved && !covered && framing === null) {
+        return null;
+    }
+    return {
+        changed,
+        removed,
+        order: moved ? next.keys : null,
+        ...(covered ? { coverage: after.coverage } : {}),
+        ...framing,
+    };
+}
+function reframed(before, after) {
+    const next = before.next === after.next ? {} : { next: after.next ?? null };
+    const total = before.total === after.total || after.total === undefined ? {} : { total: after.total };
+    return Object.keys(next).length === 0 && Object.keys(total).length === 0
+        ? null
+        : { ...next, ...total };
 }

package/dist/opened.d.ts

@@ -0,0 +1,22 @@
+import type { BinaryResult } from './adapter.js';
+import { type RuntimeDatabase } from './tables.js';
+export type OpenedName = {
+    readonly locator: string;
+    readonly path: string;
+    readonly revision: string;
+};
+export type KeptBinary = {
+    readonly kind: 'binary';
+    readonly file: string;
+    readonly byteLength: number;
+    readonly mediaType: string;
+};
+export type KeptResult = KeptBinary | Exclude<BinaryResult, {
+    kind: 'binary';
+}>;
+export type OpenedFiles = {
+    find(name: OpenedName): Promise<KeptBinary | null>;
+    fetch(name: OpenedName, read: () => Promise<BinaryResult>): Promise<KeptResult>;
+};
+export declare function openedFiles(database: RuntimeDatabase, lost: (locator: string) => boolean): OpenedFiles;
+//# sourceMappingURL=opened.d.ts.map

package/dist/opened.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"opened.d.ts","sourceRoot":"","sources":["../src/opened.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAErF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACjF,CAAC;AAsBF,wBAAgB,WAAW,CACzB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GACjC,WAAW,CAsFb"}

package/dist/opened.js

@@ -0,0 +1,107 @@
+import { digest } from './digest.js';
+import { binaryLocalId } from './identity.js';
+import { FILE_PART_BYTES } from './tables.js';
+const UNCERTAIN = { kind: 'transport-uncertainty' };
+function kept({ key, byteLength, mediaType }) {
+    return { kind: 'binary', file: key, byteLength, mediaType };
+}
+function taken(chunks, size) {
+    const part = new Uint8Array(size);
+    let at = 0;
+    while (at < size) {
+        const chunk = chunks[0];
+        const wanted = Math.min(chunk.length, size - at);
+        part.set(chunk.subarray(0, wanted), at);
+        at += wanted;
+        if (wanted === chunk.length)
+            chunks.shift();
+        else
+            chunks[0] = chunk.subarray(wanted);
+    }
+    return part;
+}
+export function openedFiles(database, lost) {
+    const fetching = new Map();
+    async function find(name) {
+        const held = await database.ask({ kind: 'opened.find', ...name });
+        return held === null ? null : kept(held);
+    }
+    async function written(name, { body, mediaType, sha256 }) {
+        const key = binaryLocalId();
+        const reader = body.getReader();
+        const hashed = digest();
+        const chunks = [];
+        let held = 0;
+        let size = 0;
+        let part = 0;
+        const write = async (bytes) => {
+            if (!(await database.ask({ kind: 'opened.part', key, part, bytes }))) {
+                throw new Error();
+            }
+            part += 1;
+        };
+        try {
+            if (lost(name.locator) ||
+                !(await database.ask({ kind: 'opened.begin', key, ...name, mediaType }))) {
+                throw new Error();
+            }
+            for (;;) {
+                const read = await reader.read();
+                if (read.done)
+                    break;
+                hashed.update(read.value);
+                size += read.value.length;
+                chunks.push(read.value);
+                held += read.value.length;
+                for (; held >= FILE_PART_BYTES; held -= FILE_PART_BYTES) {
+                    await write(taken(chunks, FILE_PART_BYTES));
+                }
+            }
+            if (held > 0)
+                await write(taken(chunks, held));
+            const received = hashed.hex();
+            if (sha256 !== undefined && sha256 !== received) {
+                throw new Error();
+            }
+            const whole = await database.ask({
+                kind: 'opened.keep',
+                key,
+                sha256: received,
+                byteLength: size,
+                parts: part,
+            });
+            return whole ? { kind: 'binary', file: key, byteLength: size, mediaType } : null;
+        }
+        catch {
+            await reader.cancel().catch(() => { });
+            await database.ask({ kind: 'opened.drop', key }).catch(() => null);
+            return null;
+        }
+    }
+    async function fetched(name, read) {
+        const held = await find(name);
+        if (held !== null)
+            return held;
+        const result = await read();
+        if (result.kind !== 'binary')
+            return result;
+        return (await written(name, result)) ?? UNCERTAIN;
+    }
+    return {
+        find,
+        fetch(name, read) {
+            const identity = `${name.locator}\u0000${name.path}\u0000${name.revision}`;
+            const held = fetching.get(identity);
+            if (held !== undefined)
+                return held;
+            const work = fetched(name, read);
+            fetching.set(identity, work);
+            const done = () => {
+                if (fetching.get(identity) === work)
+                    fetching.delete(identity);
+            };
+            work.then(done, done);
+            return work;
+        },
+    };
+}

package/dist/opening.d.ts

@@ -0,0 +1,4 @@
+import type { Runtime } from './runtime.js';
+import type { RuntimeStore } from './store.js';
+export declare function open(runtime: Runtime, opened: RuntimeStore): Promise<RuntimeStore>;
+//# sourceMappingURL=opening.d.ts.map

package/dist/opening.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"opening.d.ts","sourceRoot":"","sources":["../src/opening.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA2CxF"}

package/dist/opening.js

@@ -0,0 +1,59 @@
+import { conversationsOpened } from './conversation.js';
+import { detectStorageLoss, nextGeneration, refusedForSpace } from './durability.js';
+import { uncaught } from './failure.js';
+import { sweep } from './install.js';
+import { eraseFenced } from './lost.js';
+import { prepare } from './preparation.js';
+import { unpair } from './queue.js';
+import { emitRooms, emitStorageLoss, statusShown } from './shown.js';
+export async function open(runtime, opened) {
+    const { store, socket, journal, shell, conversations, build, usableWhenHeld } = runtime;
+    if (socket.closed())
+        throw new Error('runtime closed');
+    const interrupted = await opened.fences();
+    const kept = shell.generation;
+    const storedGeneration = await opened.generation();
+    const loss = detectStorageLoss(storedGeneration, kept);
+    const generation = nextGeneration(storedGeneration, kept);
+    if (generation !== storedGeneration)
+        await opened.rememberGeneration(generation);
+    if (generation !== kept)
+        await shell.keepGeneration(generation);
+    if (loss !== null) {
+        store.device.set({ storageLoss: loss });
+        emitStorageLoss(runtime);
+    }
+    const held = await opened.opened();
+    store.device.set({
+        heldWhenOpened: usableWhenHeld.length > 0 && (await opened.covering()).rooms.size > 0,
+    });
+    try {
+        await opened.demote();
+        await store.ask({ kind: 'read.builds', build });
+        for (const key of held.orphans)
+            await opened.release(key);
+    }
+    catch (error) {
+        if (!refusedForSpace(error))
+            throw error;
+    }
+    if (held.erasing || held.orphans.length > 0)
+        queueMicrotask(() => sweep(runtime));
+    await conversationsOpened(conversations, opened);
+    if (interrupted.length > 0) {
+        queueMicrotask(() => {
+            void eraseFenced(runtime, interrupted).catch((error) => {
+                journal.record('erasure failed');
+                uncaught(error);
+            });
+        });
+    }
+    statusShown(runtime);
+    prepare(runtime);
+    emitRooms(runtime);
+    void unpair(runtime).catch((error) => {
+        journal.record('unpair failed');
+        uncaught(error);
+    });
+    return opened;
+}

package/dist/outcome.d.ts

@@ -1,19 +1,73 @@
-import type { ActionResult, AdapterFailure, HistoryResult, ProviderRefusal, RoomVersionAt, ScopedRefusal } from './adapter.js';
+import type { ActionResult, AdapterFailure, AttachResult, BinaryLinkResult, HistoryResult, HistoryRevision, ProviderRefusal, RoomVersionAt, ScopedRefusal } from './adapter.js';
 import type { ChangeBatch } from './change.js';
+import type { KeptBinary, KeptResult } from './opened.js';
 type Refused<Kind extends string> = ProviderRefusal & {
     kind: Kind;
 };
 export type Failure = Refused<'transport-uncertainty'> | Refused<'revoked-authorization'> | (Refused<'room-not-readable'> & {
     locator: string;
+}) | (Refused<'room-locked'> & {
+    locator: string;
 }) | ScopedRefusal;
 export type CallResult = {
     kind: 'action';
     result: unknown;
     at?: RoomVersionAt;
-} | Refused<'rejected'> | Refused<'undeclared'> | Failure;
+} | (Refused<'rejected'> & {
+    reset?: string;
+}) | Refused<'undeclared'> | Failure;
 export type HistoryAnswer = Exclude<HistoryResult, {
     kind: Failure['kind'];
 }> | Failure;
+type BinaryRefusal = Refused<'rejected'> | Refused<'absent'> | Failure;
+export type BinaryAnswer = {
+    kind: 'binary';
+    stream: ReadableStream<Uint8Array>;
+    byteLength: number;
+    mediaType: string;
+} | BinaryRefusal;
+export type HeldBinaryAnswer = KeptBinary | BinaryRefusal;
+export type BinaryLinkAnswer = {
+    kind: 'link';
+    url: string;
+    name: string;
+    mediaType: string;
+} | Refused<'rejected'> | Refused<'absent'> | Failure;
+export type HeldShownAnswer = KeptBinary | BinaryLinkAnswer;
+export type ShownAnswer = BinaryAnswer | BinaryLinkAnswer;
+export type AttachAnswer = {
+    kind: 'attached';
+    path: string;
+} | Offline | Refused<'rejected'> | Failure;
+export type DownloadAnswer = {
+    kind: 'started';
+} | Refused<'rejected'> | Refused<'absent'> | Refused<'blocked'> | Failure;
+export type Resolution = {
+    readonly kind: 'document';
+    readonly room: string;
+    readonly path: string;
+} | {
+    readonly kind: 'deleted';
+    readonly room: string;
+    readonly path: string;
+    readonly revision: HistoryRevision;
+} | Refused<'unreadable'> | Refused<'absent'> | Failure;
+export declare const UNREADABLE: Refused<'unreadable'>;
+export declare const LOCKED_UNREADABLE: Refused<'unreadable'>;
+export declare const ABSENT_TARGET: Refused<'absent'>;
+export declare function absentBinary(path: string): Refused<'absent'>;
+export declare function binaryAnswer(result: KeptResult): HeldBinaryAnswer;
+export declare function binaryLinkAnswer(result: BinaryLinkResult, held?: string): BinaryLinkAnswer;
+export declare function attachAnswer(result: AttachResult): AttachAnswer;
+export declare const ROOM_LOCKED = "room-locked";
+export declare function lockedRoom(locator: string): Refused<'room-locked'> & {
+    locator: string;
+};
+export type Offline = {
+    readonly kind: 'offline';
+};
+export declare const OFFLINE: Offline;
+export declare function answeredResult(value: unknown): boolean;
 export declare const UNCERTAIN: Failure;
 export declare function undeclared(name: string): CallResult;
 export declare function failure(result: AdapterFailure): Failure;
@@ -29,9 +83,6 @@ export type QueueEntry = {
     readonly batch: ChangeBatch;
 } & (Submission | {
     readonly state: 'local';
-} | {
-    readonly state: 'accepted';
-    readonly roomVersion: string;
 });
 export {};
 //# sourceMappingURL=outcome.d.ts.map

package/dist/outcome.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../src/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,aAAa,EACb,eAAe,EACf,aAAa,EACb,aAAa,EACd,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,KAAK,OAAO,CAAC,IAAI,SAAS,MAAM,IAAI,eAAe,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,OAAO,GACf,OAAO,CAAC,uBAAuB,CAAC,GAChC,OAAO,CAAC,uBAAuB,CAAC,GAChC,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,GACpD,aAAa,CAAC;AAElB,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,EAAE,CAAC,EAAE,aAAa,CAAA;CAAE,GACvD,OAAO,CAAC,UAAU,CAAC,GACnB,OAAO,CAAC,YAAY,CAAC,GACrB,OAAO,CAAC;AAEZ,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC,GAAG,OAAO,CAAC;AAExF,eAAO,MAAM,SAAS,EAAE,OAKvB,CAAC;AAEF,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAEnD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAiBvD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAE7D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAIlE;AAED,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAA;CAAE,GAC3C;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GAAG,CACvD,UAAU,GACV;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAC3B;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAC/D,CAAC"}
+{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../src/outcome.ts"],"names":[],"mappings":"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"}

package/dist/outcome.js

@@ -1,3 +1,52 @@
+export const UNREADABLE = {
+    kind: 'unreadable',
+    code: 'room-not-readable',
+    fields: {},
+    retryable: false,
+};
+export const LOCKED_UNREADABLE = {
+    kind: 'unreadable',
+    code: 'room-locked',
+    fields: {},
+    retryable: true,
+};
+export const ABSENT_TARGET = {
+    kind: 'absent',
+    code: 'reference-absent',
+    fields: {},
+    retryable: false,
+};
+export function absentBinary(path) {
+    return { kind: 'absent', code: 'binary-file-absent', fields: { path }, retryable: false };
+}
+export function binaryAnswer(result) {
+    return result.kind === 'binary' || result.kind === 'rejected' ? result : failure(result);
+}
+const OCTET_STREAM = 'application/octet-stream';
+export function binaryLinkAnswer(result, held) {
+    if (result.kind === 'link') {
+        return {
+            kind: 'link',
+            url: result.url,
+            name: result.name,
+            mediaType: result.mediaType ?? held ?? OCTET_STREAM,
+        };
+    }
+    return result.kind === 'rejected' ? result : failure(result);
+}
+export function attachAnswer(result) {
+    if (result.kind === 'attached')
+        return { kind: 'attached', path: result.path };
+    return result.kind === 'rejected' ? result : failure(result);
+}
+export const ROOM_LOCKED = 'room-locked';
+export function lockedRoom(locator) {
+    return { kind: ROOM_LOCKED, locator, code: ROOM_LOCKED, fields: {}, retryable: true };
+}
+export const OFFLINE = { kind: 'offline' };
+export function answeredResult(value) {
+    return typeof value === 'object' && value !== null && !('pending' in value);
+}
 export const UNCERTAIN = {
     kind: 'transport-uncertainty',
     code: 'transport-uncertainty',

package/dist/overlay.d.ts

@@ -1,15 +1,27 @@
-import type { HeadChange } from './adapter.js';
+import type { BinaryFile, HeadChange } from './adapter.js';
+import { type Composition } from './collection.js';
 import type { ChangeBatch } from './change.js';
 export type Heads = {
     revisions: Readonly<Record<string, string>>;
+    fileIds: Readonly<Record<string, string>>;
+    created: Readonly<Record<string, string>>;
     changes: Readonly<Record<string, HeadChange>>;
 };
+export type HeldBinary = ({
+    readonly state: 'accepted';
+} & BinaryFile) | {
+    readonly state: 'pending';
+    readonly localId: string;
+    readonly byteLength: number;
+    readonly mediaType: string;
+    readonly sha256: string;
+};
 export type Layer = Heads & {
     documents: Readonly<Record<string, string>>;
-    binaryTargets: readonly string[];
+    binaries: Readonly<Record<string, HeldBinary>>;
 };
+export declare function acceptedBinaries(files: Readonly<Record<string, BinaryFile>>): Generator<readonly [string, HeldBinary]>;
+export declare function sameBinary(left: HeldBinary | undefined, right: HeldBinary | undefined): boolean;
 export declare function sameChange(left: HeadChange | undefined, right: HeadChange | undefined): boolean;
-export declare function overlay(base: Layer, queue: readonly ChangeBatch[], unapplied?: () => void): Layer;
-export declare function sameLayerText(left: Layer, right: Layer): boolean;
-export declare function overlayChanged(base: Layer, queue: readonly ChangeBatch[], previousBase: Layer, previousQueue: readonly ChangeBatch[], previousVisible: Layer): Layer;
+export declare function overlaying(base: Layer, queue: readonly ChangeBatch[], composition: Composition, unapplied?: () => void): Generator<number, Layer, void>;
 //# sourceMappingURL=overlay.d.ts.map

package/dist/overlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAU,WAAW,EAAgB,MAAM,aAAa,CAAC;AAErE,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG;IAC1B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQ/F;AAsJD,wBAAgB,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,KAAK,CAmBjG;AAQD,wBAAgB,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAQhE;AAmBD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,KAAK,EACnB,aAAa,EAAE,SAAS,WAAW,EAAE,EACrC,eAAe,EAAE,KAAK,GACrB,KAAK,CA4FP"}
+{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAU,WAAW,EAAgB,MAAM,aAAa,CAAC;AAIrE,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,CAAC;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG,UAAU,CAAC,GAC7C;IACE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG;IAC1B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAiB,gBAAgB,CAC/B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,GAC1C,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAE1C;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAW/F;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQ/F;AA+ND,wBAAiB,UAAU,CACzB,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,WAAW,EAAE,WAAW,EACxB,SAAS,CAAC,EAAE,MAAM,IAAI,GACrB,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAsChC"}