@agentshouse/mdruntime 0.1.0-ca7c26c6bc27e → 0.1.0-ca9afacd5aebd

package/dist/replica.d.ts

@@ -1,8 +1,7 @@
 import { type ChangeBatch } from './change.js';
 import { type Collection, type Composition } from './collection.js';
 import { type Layer } from './overlay.js';
-import { type Rewriting } from './save.js';
-import type { RoomAttachment } from './adapter.js';
+import type { MutationResult } from './adapter.js';
 import type { ReplicaRecord } from './store.js';
 import type { Refused } from './transfer.js';
 export type ConfirmedLayer = {
@@ -30,15 +29,18 @@ type ReplayStep = {
     collection?: Collection;
 };
 export declare function compositionOf(record: ReplicaRecord): Composition;
-export declare function readConfirmed(record: ReplicaRecord, previous?: ConfirmedLayer): Staged;
+export declare function confirmedOf(record: ReplicaRecord, previous?: ConfirmedLayer): ConfirmedLayer;
 export declare function sameMembership(record: ReplicaRecord, other: ReplicaRecord): boolean;
 export declare function readStaged(record: ReplicaRecord, previous?: ConfirmedLayer): Staged;
 export declare function readReclassified(record: ReplicaRecord, previous: ConfirmedLayer): Staged | {
     kind: 'deferred';
 };
-export declare function applyReturned(confirmed: ConfirmedLayer, documents: Readonly<Record<string, string>>, revisions: Readonly<Record<string, string>>, removals: readonly string[], attachments: readonly RoomAttachment[] | undefined, roomVersion: string, writtenAt: string): Staged;
-export declare function replicaOf(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], rewriting: Rewriting, previous?: Replica): Replica;
-export declare function landed(batch: ChangeBatch, confirmed: ConfirmedLayer): boolean;
-export declare function withdrawals(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, rewriting: Rewriting): readonly ChangeBatch[];
+type Accepted = Extract<MutationResult, {
+    kind: 'accepted';
+}>;
+export declare function applyReturned(confirmed: ConfirmedLayer, submitted: ChangeBatch, accepted: Accepted, roomVersion: string, writtenAt: string): Staged;
+export declare function replicaOf(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], previous?: Replica): Replica;
+export declare function landed(batch: ChangeBatch, confirmed: ConfirmedLayer, current?: Readonly<Record<string, string>>): boolean;
+export declare function withdrawals(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, local: boolean): readonly ChangeBatch[];
 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":"AACA,OAAO,EAA0B,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAC;AAC1F,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAA0C,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AAClF,OAAO,EAAqB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG;IACjC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAAG,OAAO,CAAC;AAE7E,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,cAAc,CAAC;IAC1B,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IAC9B,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,WAAW,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAQhE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CAWtF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAKnF;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CAkBnF;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,cAAc,GACvB,MAAM,GAAG;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAM/B;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC3C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC3C,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,WAAW,EAAE,SAAS,cAAc,EAAE,GAAG,SAAS,EAClD,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,MAAM,CAmCR;AAsDD,wBAAgB,SAAS,CACvB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,SAAS,EAAE,SAAS,EACpB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CA4CT;AAkFD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO,CAa7E;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,EAC7C,SAAS,EAAE,SAAS,GACnB,SAAS,WAAW,EAAE,CAoBxB"}
+{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAC;AACnG,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAA2D,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AAEnG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG;IACjC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAAG,OAAO,CAAC;AAE7E,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,cAAc,CAAC;IAC1B,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IAC9B,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,WAAW,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAQhE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,cAAc,CAK5F;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAKnF;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CA2BnF;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,cAAc,GACvB,MAAM,GAAG;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAW/B;AAiCD,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAAC;AAE9D,wBAAgB,aAAa,CAC3B,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,MAAM,CA+BR;AAgDD,wBAAgB,SAAS,CACvB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CA8BT;AA0ED,wBAAgB,MAAM,CACpB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,cAAc,EACzB,OAAO,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM,GAC7C,OAAO,CAiBT;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,EAC7C,KAAK,EAAE,OAAO,GACb,SAAS,WAAW,EAAE,CA2BxB"}

package/dist/replica.js

@@ -1,10 +1,8 @@
-import { parse } from '@agentshouse/mdmodel';
-import { immutable } from './change.js';
-import { parseCollection, readCollection, validateCollection, } from './collection.js';
+import { equalValue, parse } from '@agentshouse/mdmodel';
+import { immutable, landing } from './change.js';
+import { collectionOf, unreadable, validateCollection, } from './collection.js';
 import { overlay, overlayChanged, sameLayerText } from './overlay.js';
 import { providerRewritten } from './save.js';
-import { equalValue } from './room-draft.js';
-import { declaredAttachments } from './attachment.js';
 export function compositionOf(record) {
     return {
         model: record.model,
@@ -13,40 +11,77 @@ export function compositionOf(record) {
             : { roots: record.typedSelection.roots, model: record.selectionModel },
     };
 }
-export function readConfirmed(record, previous) {
-    const read = readCollection(record.documents, compositionOf(record), previous === undefined
-        ? undefined
-        : { text: previous.record.documents, collection: previous.collection });
-    return read.kind === 'read'
-        ? { kind: 'staged', confirmed: { record, collection: read.collection } }
-        : read;
+export function confirmedOf(record, previous) {
+    return {
+        record,
+        collection: collectionOf(record.documents, compositionOf(record), previous?.collection),
+    };
 }
 export function sameMembership(record, other) {
     return (JSON.stringify(record.typedSelection?.roots ?? null) ===
         JSON.stringify(other.typedSelection?.roots ?? null));
 }
 export function readStaged(record, previous) {
-    if ((record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable') &&
-        (previous === undefined ||
-            !sameLayerText(record, previous.record) ||
-            record.model !== previous.record.model ||
-            record.selectionModel !== previous.record.selectionModel)) {
-        const verdict = validateCollection(record.documents, record.binaryTargets, compositionOf(record));
+    const textChanged = previous === undefined || !sameLayerText(record, previous.record);
+    const modeled = record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable';
+    if (modeled &&
+        (textChanged ||
+            record.model !== previous?.record.model ||
+            record.selectionModel !== previous?.record.selectionModel)) {
+        const verdict = validateCollection(record.documents, Object.keys(record.binaries), compositionOf(record));
         if (verdict.verdict === 'refuse' && verdict.rule !== 'model-unavailable') {
             return { kind: 'refused', refusal: verdict };
         }
+        if (verdict.verdict === 'refuse') {
+            const refused = unreadable(record.documents, previous?.record.documents);
+            if (refused !== null)
+                return refused;
+        }
     }
-    return readConfirmed(record, previous);
+    else if (textChanged) {
+        const refused = unreadable(record.documents, previous?.record.documents);
+        if (refused !== null)
+            return refused;
+    }
+    return { kind: 'staged', confirmed: confirmedOf(record, previous) };
 }
 export function readReclassified(record, previous) {
-    const verdict = validateCollection(record.documents, record.binaryTargets, compositionOf(record));
+    const verdict = validateCollection(record.documents, Object.keys(record.binaries), compositionOf(record));
     if (verdict.verdict !== 'refuse')
-        return readConfirmed(record, previous);
+        return { kind: 'staged', confirmed: confirmedOf(record, previous) };
     return verdict.rule === 'model-unavailable'
         ? { kind: 'deferred' }
         : { kind: 'refused', refusal: verdict };
 }
-export function applyReturned(confirmed, documents, revisions, removals, attachments, roomVersion, writtenAt) {
+function returnedBinaries(held, submitted, accepted) {
+    const binaries = { ...held };
+    for (const change of submitted.changes) {
+        if (change.kind !== 'move')
+            continue;
+        const moved = binaries[change.path];
+        if (moved === undefined || accepted.revisions[change.to] === undefined)
+            continue;
+        binaries[change.to] = moved;
+        delete binaries[change.path];
+    }
+    for (const [path, fileRef] of Object.entries(accepted.fileRefs ?? {})) {
+        const written = submitted.changes.find((change, index) => change.kind === 'binary' && landing(submitted.changes, index, change.path) === path);
+        if (written === undefined)
+            continue;
+        binaries[path] = {
+            state: 'accepted',
+            fileRef,
+            byteLength: written.byteLength,
+            mediaType: written.mediaType,
+            sha256: written.sha256,
+        };
+    }
+    for (const path of accepted.removals)
+        delete binaries[path];
+    return binaries;
+}
+export function applyReturned(confirmed, submitted, accepted, roomVersion, writtenAt) {
+    const { documents, revisions, changes, removals } = accepted;
     const nextDocuments = { ...confirmed.record.documents, ...documents };
     const nextRevisions = { ...confirmed.record.revisions, ...revisions };
     const nextChanges = { ...confirmed.record.changes };
@@ -54,17 +89,16 @@ export function applyReturned(confirmed, documents, revisions, removals, attachm
         ...confirmed.record.written,
         ...Object.fromEntries(Object.keys(documents).map((path) => [path, writtenAt])),
     };
-    const binaryTargets = new Set(confirmed.record.binaryTargets);
     for (const [path, revision] of Object.entries(revisions)) {
         if (confirmed.record.revisions[path] !== revision)
             delete nextChanges[path];
     }
+    Object.assign(nextChanges, changes);
     for (const path of removals) {
         delete nextDocuments[path];
         delete nextRevisions[path];
         delete nextChanges[path];
         delete nextWritten[path];
-        binaryTargets.delete(path);
     }
     return readStaged({
         ...confirmed.record,
@@ -73,10 +107,7 @@ export function applyReturned(confirmed, documents, revisions, removals, attachm
         revisions: nextRevisions,
         changes: nextChanges,
         written: nextWritten,
-        binaryTargets: [...binaryTargets].sort(),
-        attachments: attachments === undefined
-            ? confirmed.record.attachments
-            : declaredAttachments([attachments]),
+        binaries: returnedBinaries(confirmed.record.binaries, submitted, accepted),
     }, confirmed);
 }
 function predicted(confirmed, batches, previous) {
@@ -97,9 +128,7 @@ function predicted(confirmed, batches, previous) {
         const collection = hasMove
             ? reuseRewrite
                 ? old.collection
-                : parseCollection(before.documents, composition, old?.collection === undefined
-                    ? { text: confirmed.record.documents, collection: confirmed.collection }
-                    : { text: old.before.documents, collection: old.collection })
+                : collectionOf(before.documents, composition, old?.collection ?? confirmed.collection)
             : undefined;
         const effective = collection === undefined
             ? batch
@@ -120,7 +149,7 @@ function predicted(confirmed, batches, previous) {
     }
     return { layer, replay };
 }
-export function replicaOf(confirmed, queue, rewriting, previous) {
+export function replicaOf(confirmed, queue, previous) {
     const batches = Object.freeze(queue.map(immutable));
     if (batches.length === 0) {
         return {
@@ -128,7 +157,7 @@ export function replicaOf(confirmed, queue, rewriting, previous) {
             queue: batches,
             visible: {
                 documents: confirmed.record.documents,
-                binaryTargets: confirmed.record.binaryTargets,
+                binaries: confirmed.record.binaries,
                 revisions: confirmed.record.revisions,
                 changes: confirmed.record.changes,
                 collection: confirmed.collection,
@@ -136,26 +165,19 @@ export function replicaOf(confirmed, queue, rewriting, previous) {
             replay: [],
         };
     }
-    const predictedState = rewriting === 'provider' ? predicted(confirmed, batches, previous) : null;
-    const layer = rewriting === 'provider'
-        ? predictedState.layer
-        : previous === undefined
-            ? overlay(confirmed.record, batches)
-            : overlayChanged(confirmed.record, batches, previous.confirmed.record, previous.queue, previous.visible);
+    const { layer, replay } = predicted(confirmed, batches, previous);
     return {
         confirmed,
         queue: batches,
-        replay: predictedState?.replay ?? [],
+        replay,
         visible: {
             ...layer,
-            collection: parseCollection(layer.documents, compositionOf(confirmed.record), previous === undefined
-                ? undefined
-                : { text: previous.visible.documents, collection: previous.visible.collection }),
+            collection: collectionOf(layer.documents, compositionOf(confirmed.record), previous?.visible.collection ?? confirmed.collection),
         },
     };
 }
 function present(layer, path) {
-    return layer.documents[path] !== undefined || layer.binaryTargets.includes(path);
+    return layer.documents[path] !== undefined || layer.binaries[path] !== undefined;
 }
 function holds(layer, preconditions) {
     const parsed = new Map();
@@ -176,6 +198,8 @@ function holds(layer, preconditions) {
         if (precondition.kind === 'revision') {
             return present(layer, path) && layer.revisions[path] === precondition.revision;
         }
+        if (precondition.kind === 'content')
+            return layer.documents[path] === precondition.content;
         const document = documentAt(path);
         if (document === null)
             return false;
@@ -220,36 +244,30 @@ function effects(change) {
             { kind: 'present', path: change.to },
         ];
     }
+    if (change.kind === 'binary')
+        return [{ kind: 'present', path }];
     return [{ kind: 'absent', path }];
 }
-function after(changes, index, path) {
-    let at = path;
-    for (const change of changes.slice(index + 1)) {
-        if (change.path !== at)
-            continue;
-        if (change.kind === 'remove')
-            return null;
-        if (change.kind === 'move')
-            at = change.to;
-    }
-    return at;
-}
-export function landed(batch, confirmed) {
-    const layer = confirmed.record;
+export function landed(batch, confirmed, current = {}) {
+    const layer = { ...confirmed.record, documents: { ...confirmed.record.documents, ...current } };
     return batch.changes.every((change, index) => {
         if (change.kind === 'replace' || (change.kind === 'create' && 'content' in change)) {
-            const at = after(batch.changes, index, change.path);
+            const at = landing(batch.changes, index, change.path);
             return at === null || layer.documents[at] === change.content;
         }
+        if (change.kind === 'binary') {
+            const at = landing(batch.changes, index, change.path);
+            return at === null || layer.binaries[at]?.sha256 === change.sha256;
+        }
         return effects(change).every((effect) => {
             if (effect.kind === 'absent')
                 return holds(layer, [effect]);
-            const at = after(batch.changes, index, effect.path);
+            const at = landing(batch.changes, index, effect.path);
             return at === null || holds(layer, [{ ...effect, path: at }]);
         });
     });
 }
-export function withdrawals(confirmed, queue, withdrawable, rewriting) {
+export function withdrawals(confirmed, queue, withdrawable, local) {
     if (!queue.some(withdrawable))
         return [];
     const composition = compositionOf(confirmed.record);
@@ -260,13 +278,21 @@ export function withdrawals(confirmed, queue, withdrawable, rewriting) {
             withdrawn.push(batch);
             continue;
         }
-        const effective = rewriting === 'provider' && batch.changes.some((change) => change.kind === 'move')
+        const effective = batch.changes.some((change) => change.kind === 'move')
             ? providerRewritten(batch, {
                 ...layer,
-                collection: parseCollection(layer.documents, composition),
+                collection: collectionOf(layer.documents, composition),
             })
             : batch;
-        layer = overlay(layer, [effective]);
+        let unapplied = false;
+        const next = overlay(layer, [effective], () => {
+            unapplied = true;
+        });
+        if (local && unapplied) {
+            withdrawn.push(batch);
+            continue;
+        }
+        layer = next;
     }
     return withdrawn;
 }

package/dist/room-draft.d.ts

@@ -1,4 +1,5 @@
 import type { ProviderRefusal } from './adapter.js';
+import type { Open } from './open.js';
 import type { Change, Precondition } from './change.js';
 import type { VisibleLayer } from './replica.js';
 export type FieldValue = {
@@ -36,6 +37,17 @@ export type RoomDraftParts = {
     readonly removal?: {
         readonly base?: string | null;
     };
+    readonly file?: {
+        readonly blob: Blob;
+    };
+};
+export type HeldFile = {
+    readonly blob: Blob;
+    readonly localId: string;
+    readonly byteLength: number;
+    readonly mediaType: string;
+    readonly sha256: string;
+    readonly base: string | null;
 };
 type HeldParts = {
     readonly fields?: Readonly<Record<string, {
@@ -62,6 +74,7 @@ type HeldParts = {
     readonly removal?: {
         readonly base: string | null;
     };
+    readonly file?: HeldFile;
 };
 type ChangedUnderneath = {
     readonly fields?: Readonly<Record<string, FieldValue>>;
@@ -71,14 +84,12 @@ type ChangedUnderneath = {
     readonly creation?: string;
     readonly move?: string | null;
     readonly removal?: string | null;
+    readonly file?: string | null;
 };
-export type ReturnReason = (ProviderRefusal & {
-    readonly kind: 'conflicted' | 'rejected';
-}) | {
-    readonly kind: 'expired';
-} | {
-    readonly kind: 'withdrawn';
+export type ReturnReason = ProviderRefusal & {
+    readonly kind: 'conflicted' | 'rejected' | 'expired' | 'withdrawn';
 };
+export declare function returnedBy(kind: 'expired' | 'withdrawn'): ReturnReason;
 export type RoomDraft = {
     readonly room: string;
     readonly path: string;
@@ -92,11 +103,14 @@ export type RoomDraftWrite = {
     readonly roomDraft: RoomDraft | null;
 } | {
     readonly outcome: 'stale';
+    readonly code: string;
+    readonly retryable: boolean;
     readonly current: RoomDraft | null;
 };
+export declare function staleWrite(current: RoomDraft | null): RoomDraftWrite;
 export type ChangedPart = {
     readonly path: string;
-    readonly part: 'field' | 'section' | 'preamble' | 'markdown' | 'creation' | 'move' | 'removal';
+    readonly part: Open<'field' | 'section' | 'preamble' | 'markdown' | 'creation' | 'move' | 'removal' | 'file'>;
     readonly name?: string;
 };
 export type RoomDraftRecord = {
@@ -111,9 +125,10 @@ export type SavedDraft = {
     readonly parts: HeldParts;
 };
 export declare function readParts(value: unknown): RoomDraftParts;
-export declare function held(current: HeldParts | undefined, parts: RoomDraftParts): HeldParts;
-export declare function equalValue(left: unknown, right: unknown): boolean;
+export declare function held(current: HeldParts | undefined, parts: RoomDraftParts, file?: HeldFile): HeldParts;
 export declare function underneath(parts: HeldParts, path: string, visible: VisibleLayer | undefined): ChangedUnderneath;
+export declare function heldFile(blob: Blob, base: string | null): Promise<HeldFile>;
+export declare function binaryBase(visible: VisibleLayer | undefined, path: string): string | null;
 export declare function changedParts(path: string, report: ChangedUnderneath): readonly ChangedPart[];
 export declare function returnedInto(existing: HeldParts | undefined, returned: HeldParts): HeldParts;
 export declare function moveTarget(move: {
@@ -123,5 +138,7 @@ export declare function changesOf(path: string, parts: HeldParts): {
     changes: readonly Change[];
     bases: readonly Precondition[];
 };
+export declare function joinedDraft(carried: SavedDraft, saved: readonly SavedDraft[]): SavedDraft;
+export declare function withdrawnDrafts(drafts: readonly SavedDraft[], changes: readonly Change[]): readonly SavedDraft[];
 export {};
 //# sourceMappingURL=room-draft.d.ts.map

package/dist/room-draft.d.ts.map

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