@agentshouse/mdruntime 0.1.0-cfbf80d8d4644 → 0.1.0-cfcbb238a5fa0

package/dist/room-draft.js

@@ -1,19 +1,20 @@
-import { apply, parse, serialize } from '@agentshouse/mdmodel';
+import { apply, equalValue, frontmatterValue, parse, serialize } from '@agentshouse/mdmodel';
+import { runtimeError } from './failure.js';
+import { hexDigest } from './file.js';
+import { binaryLocalId } from './identity.js';
 import { normalize } from './paths.js';
+export function returnedBy(kind) {
+    return { kind, code: kind, fields: {}, retryable: false };
+}
+export function staleWrite(current) {
+    return { outcome: 'stale', code: 'stale', retryable: false, current };
+}
 function malformed() {
-    throw new Error('room-draft-malformed');
+    throw runtimeError('room-draft-malformed');
 }
 function plain(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
-function frontmatterValue(value) {
-    if (Array.isArray(value))
-        return value.every(frontmatterValue);
-    return (value === null ||
-        typeof value === 'string' ||
-        typeof value === 'boolean' ||
-        (typeof value === 'number' && Number.isFinite(value)));
-}
 function text(value) {
     return typeof value === 'string' ? value : malformed();
 }
@@ -61,6 +62,7 @@ const PART_NAMES = new Set([
     'creation',
     'move',
     'removal',
+    'file',
 ]);
 export function readParts(value) {
     if (!plain(value) || Object.keys(value).some((name) => !PART_NAMES.has(name)))
@@ -96,6 +98,13 @@ export function readParts(value) {
         const base = markdownBase(value.removal.base);
         parts.removal = base === undefined ? {} : { base };
     }
+    if (value.file !== undefined) {
+        if (!plain(value.file) || !(value.file.blob instanceof Blob))
+            malformed();
+        if (Object.keys(value).length > 1)
+            throw runtimeError('room-draft-file-exclusive');
+        parts.file = { blob: value.file.blob };
+    }
     return parts;
 }
 function named(record) {
@@ -108,7 +117,7 @@ function kept(prior, base) {
     if (prior !== undefined)
         return prior.base;
     if (base === undefined)
-        throw new Error('room-draft-base-missing');
+        throw runtimeError('room-draft-base-missing');
     return base;
 }
 function editsText(parts) {
@@ -116,9 +125,32 @@ function editsText(parts) {
         named(parts.fields).length > 0 ||
         named(parts.sections).length > 0);
 }
-export function held(current, parts) {
+export function held(current, parts, file) {
     if (parts.markdown !== undefined && editsText(parts)) {
-        throw new Error('room-draft-markdown-exclusive');
+        throw runtimeError('room-draft-markdown-exclusive');
+    }
+    if (file !== undefined) {
+        if (current !== undefined && current.file === undefined) {
+            throw runtimeError('room-draft-file-exclusive');
+        }
+        return { file: { ...file, base: current?.file === undefined ? file.base : current.file.base } };
+    }
+    if (current?.file !== undefined) {
+        if (editsText(parts) ||
+            parts.markdown !== undefined ||
+            parts.creation !== undefined ||
+            (parts.move === undefined && parts.removal === undefined)) {
+            throw runtimeError('room-draft-file-exclusive');
+        }
+        return {
+            file: current.file,
+            ...(parts.move === undefined
+                ? {}
+                : { move: { to: parts.move.to, base: kept(current.move, parts.move.base) } }),
+            ...(parts.removal === undefined
+                ? {}
+                : { removal: { base: kept(current.removal, parts.removal.base) } }),
+        };
     }
     const next = {};
     const fields = named(parts.fields);
@@ -156,17 +188,9 @@ export function held(current, parts) {
         next.removal = { base: kept(current?.removal, parts.removal.base) };
     }
     if (Object.keys(next).length === 0)
-        throw new Error('room-draft-empty');
+        throw runtimeError('room-draft-empty');
     return next;
 }
-export function equalValue(left, right) {
-    if (left === right)
-        return true;
-    return (Array.isArray(left) &&
-        Array.isArray(right) &&
-        left.length === right.length &&
-        left.every((item, index) => equalValue(item, right[index])));
-}
 function sameField(left, right) {
     if (left === null || right === null)
         return left === right;
@@ -174,7 +198,7 @@ function sameField(left, right) {
 }
 export function underneath(parts, path, visible) {
     const markdown = visible?.documents[path] ?? null;
-    const document = visible?.collection.documents[path];
+    const document = visible?.collection.document(path);
     const report = {};
     const fields = {};
     for (const [name, part] of named(parts.fields)) {
@@ -207,8 +231,28 @@ export function underneath(parts, path, visible) {
         report.move = markdown;
     if (parts.removal !== undefined && markdown !== parts.removal.base)
         report.removal = markdown;
+    if (parts.file !== undefined) {
+        const file = binaryBase(visible, path);
+        if (file !== parts.file.base || markdown !== null)
+            report.file = file;
+    }
     return report;
 }
+const UNTYPED_MEDIA_TYPE = 'application/octet-stream';
+export async function heldFile(blob, base) {
+    const bytes = await blob.arrayBuffer();
+    return {
+        blob,
+        localId: binaryLocalId(),
+        byteLength: bytes.byteLength,
+        mediaType: blob.type === '' ? UNTYPED_MEDIA_TYPE : blob.type,
+        sha256: hexDigest(await crypto.subtle.digest('SHA-256', bytes)),
+        base,
+    };
+}
+export function binaryBase(visible, path) {
+    return visible?.binaries[path] === undefined ? null : (visible.revisions[path] ?? null);
+}
 export function changedParts(path, report) {
     return [
         ...(report.creation === undefined ? [] : [{ path, part: 'creation' }]),
@@ -218,6 +262,7 @@ export function changedParts(path, report) {
         ...(report.markdown === undefined ? [] : [{ path, part: 'markdown' }]),
         ...(report.move === undefined ? [] : [{ path, part: 'move' }]),
         ...(report.removal === undefined ? [] : [{ path, part: 'removal' }]),
+        ...(report.file === undefined ? [] : [{ path, part: 'file' }]),
     ];
 }
 function joined(existing, returned) {
@@ -243,7 +288,7 @@ function frontmatterOf(fields) {
     }
     return serialize(document);
 }
-function concatenated(markdown, parts) {
+export function partsAfter(markdown, parts) {
     const fields = named(parts.fields);
     const pieces = [
         ...(fields.length === 0 ? [] : [frontmatterOf(fields)]),
@@ -274,18 +319,21 @@ export function returnedInto(existing, returned) {
         delete next.fields;
         delete next.sections;
         delete next.preamble;
-        const value = concatenated(whole.value, existing.markdown === undefined ? existing : returned);
+        const value = partsAfter(whole.value, existing.markdown === undefined ? existing : returned);
         next.markdown = { value, base: whole.base };
     }
     const creation = existing.creation ?? returned.creation;
     const move = existing.move ?? returned.move;
     const removal = existing.removal ?? returned.removal;
+    const file = existing.file ?? returned.file;
     if (creation !== undefined)
         next.creation = creation;
     if (move !== undefined)
         next.move = move;
     if (removal !== undefined)
         next.removal = removal;
+    if (file !== undefined)
+        next.file = file;
     return next;
 }
 export function moveTarget(move) {
@@ -321,9 +369,70 @@ export function changesOf(path, parts) {
     if (parts.markdown !== undefined) {
         changes.push({ kind: 'replace', path, content: parts.markdown.value });
     }
+    if (parts.file !== undefined && parts.removal === undefined) {
+        const { base, ...file } = parts.file;
+        const at = parts.move === undefined ? path : moveTarget(parts.move);
+        if (base !== null && at !== path)
+            changes.push({ kind: 'move', path, to: at });
+        changes.push({ kind: 'binary', path: at, ...file });
+        if (base === null && at !== path)
+            bases.push({ kind: 'absent', path: at });
+        return { changes, bases };
+    }
+    if (parts.file?.base === null)
+        return { changes, bases };
     if (parts.move !== undefined)
         changes.push({ kind: 'move', path, to: moveTarget(parts.move) });
     if (parts.removal !== undefined)
         changes.push({ kind: 'remove', path });
     return { changes, bases };
 }
+function rebased(before, after) {
+    return before === undefined ? after : { ...after, base: before.base };
+}
+function rebasedAll(before, after) {
+    return {
+        ...before,
+        ...Object.fromEntries(Object.entries(after).map(([name, part]) => [name, rebased(before?.[name], part)])),
+    };
+}
+export function joinedDraft(carried, saved) {
+    const draft = saved.find((item) => item.path === carried.path);
+    if (draft === undefined)
+        return carried;
+    const held = carried.parts;
+    const next = draft.parts;
+    return {
+        path: carried.path,
+        parts: {
+            ...held,
+            ...next,
+            ...(next.fields === undefined ? {} : { fields: rebasedAll(held.fields, next.fields) }),
+            ...(next.sections === undefined
+                ? {}
+                : { sections: rebasedAll(held.sections, next.sections) }),
+            ...(next.preamble === undefined ? {} : { preamble: rebased(held.preamble, next.preamble) }),
+            ...(next.markdown === undefined ? {} : { markdown: rebased(held.markdown, next.markdown) }),
+        },
+    };
+}
+export function withdrawnDrafts(drafts, changes) {
+    return drafts.flatMap((draft) => {
+        const file = draft.parts.file;
+        const at = draft.parts.move?.to ?? draft.path;
+        const change = changes.find((item) => (item.kind === 'move' || item.kind === 'remove') && item.path === at);
+        if (file === undefined || change === undefined)
+            return [draft];
+        if (change.kind === 'move') {
+            return [
+                {
+                    path: draft.path,
+                    parts: change.to === draft.path ? { file } : { file, move: { to: change.to, base: null } },
+                },
+            ];
+        }
+        return file.base === null
+            ? []
+            : [{ path: draft.path, parts: { file, removal: { base: null } } }];
+    });
+}

package/dist/rows.d.ts

@@ -1,5 +1,6 @@
-import { type Document } from '@agentshouse/mdmodel';
+import { type Frontmatter } from '@agentshouse/mdmodel';
 import type { HeadChange } from './adapter.js';
+import type { BinaryFileRecord } from './binary.js';
 import { type Composition } from './collection.js';
 type Fields = Readonly<Record<string, unknown>>;
 export type DocumentRow = {
@@ -10,19 +11,12 @@ export type DocumentRow = {
     type: string | null;
     fields: Fields;
     values: Fields;
-    sizes: Readonly<Record<string, number>>;
+    reached: Readonly<Record<string, readonly unknown[]>>;
     directories: readonly string[];
-    body: string;
+    text: string | null;
     change: HeadChange | null;
-};
-export type BodyRow = {
-    key: string;
-    kind: 'body';
-    room: string;
-    path: string;
-    preamble: string;
-    sections: Readonly<Record<string, string>>;
-    markdown: string;
+    fileId: string | null;
+    binary: BinaryFileRecord | null;
 };
 export type ReferenceRow = {
     key: string;
@@ -31,11 +25,14 @@ export type ReferenceRow = {
     source: string;
     target: string;
     field: string;
+    forms: readonly string[];
     path: string;
     type: string;
 };
-export type Row = DocumentRow | BodyRow | ReferenceRow;
+export type Row = DocumentRow | ReferenceRow;
 export declare function documentKey(room: string, path: string): string;
-export declare function rowsOf(room: string, path: string, document: Document | null, composition: Composition, change: HeadChange | null): readonly Row[];
+export declare function roomOfKey(key: string): string;
+export declare function markdownPath(path: string): boolean;
+export declare function rowsOf(room: string, path: string, document: Frontmatter | null, composition: Composition, change: HeadChange | null, fileId: string | null, binary: BinaryFileRecord | null): readonly Row[];
 export {};
 //# sourceMappingURL=rows.d.ts.map

package/dist/rows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rows.d.ts","sourceRoot":"","sources":["../src/rows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9D,KAAK,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACxC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG,WAAW,GAAG,OAAO,GAAG,YAAY,CAAC;AAMvD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAiBD,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,GAAG,IAAI,EACzB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,UAAU,GAAG,IAAI,GACxB,SAAS,GAAG,EAAE,CAsEhB"}
+{"version":3,"file":"rows.d.ts","sourceRoot":"","sources":["../src/rows.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9D,KAAK,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC,CAAC;IACtD,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG,WAAW,GAAG,YAAY,CAAC;AAM7C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAmFD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,WAAW,GAAG,IAAI,EAC5B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAC9B,SAAS,GAAG,EAAE,CAiEhB"}

package/dist/rows.js

@@ -1,30 +1,79 @@
-import { target } from '@agentshouse/mdmodel';
+import { ARRAY_INDEX, escapePointer, references, target, } from '@agentshouse/mdmodel';
 import { governing } from './collection.js';
-import { definitionOf, referenceField } from './model.js';
+import { definitionOf } from './model.js';
 function keyOf(...parts) {
     return `${parts.join('\u0000')}\u0000`;
 }
 export function documentKey(room, path) {
     return keyOf('d', room, path);
 }
-function targetOf(path, value) {
-    return typeof value === 'string' ? target(path, value) : null;
+export function roomOfKey(key) {
+    return key.split('\u0000')[1];
 }
-function resolved(path, value) {
-    if (value === null)
-        return null;
-    if (!Array.isArray(value))
-        return targetOf(path, value) ?? undefined;
-    return value.map((item) => targetOf(path, item)).filter((item) => item !== null);
+function plainObject(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function compared(reading, exact, value) {
+    if (!reading.references.has(exact))
+        return value;
+    return (typeof value === 'string' ? target(reading.path, value) : null) ?? undefined;
+}
+function record(reading, node, forms, exact) {
+    const value = Array.isArray(node)
+        ? node.map((item, index) => compared(reading, `${exact}/${index}`, item))
+        : compared(reading, exact, node);
+    for (const form of forms) {
+        if (form.pending)
+            continue;
+        (reading.reached[form.text] ??= []).push(value);
+        if (!form.through && value !== undefined && !plainObject(value)) {
+            reading.values[form.text] = value;
+        }
+    }
+    if (Array.isArray(node) || plainObject(node) || !reading.references.has(exact))
+        return;
+    const found = compared(reading, exact, node);
+    if (typeof found !== 'string')
+        return;
+    const field = forms
+        .map((form) => form.text)
+        .reduce((left, right) => (right.length < left.length ? right : left));
+    const known = reading.targets.get(`${field}\u0000${found}`);
+    const kept = known ?? { field, target: found, forms: new Set() };
+    for (const form of forms)
+        kept.forms.add(form.text);
+    reading.targets.set(`${field}\u0000${found}`, kept);
+}
+function walk(reading, node, forms, exact) {
+    record(reading, node, forms, exact);
+    if (Array.isArray(node)) {
+        node.forEach((item, index) => walk(reading, item, forms.flatMap((form) => [
+            ...(form.pending
+                ? []
+                : [{ text: `${form.text}/${index}`, through: form.through, pending: false }]),
+            { text: form.text, through: true, pending: true },
+        ]), `${exact}/${index}`));
+        return;
+    }
+    if (!plainObject(node))
+        return;
+    for (const [key, value] of Object.entries(node)) {
+        const segment = escapePointer(key);
+        walk(reading, value, forms.flatMap((form) => form.pending && ARRAY_INDEX.test(key)
+            ? []
+            : [{ text: `${form.text}/${segment}`, through: form.through, pending: false }]), `${exact}/${segment}`);
+    }
 }
 function directoriesOf(path) {
     const parts = path.split('/').slice(0, -1);
     return ['', ...parts.map((_, index) => parts.slice(0, index + 1).join('/'))];
 }
-export function rowsOf(room, path, document, composition, change) {
+export function markdownPath(path) {
+    return path.endsWith('.md');
+}
+export function rowsOf(room, path, document, composition, change, fileId, binary) {
     const key = documentKey(room, path);
-    const body = keyOf('b', room, path);
-    if (document === null || !path.endsWith('.md')) {
+    if (document === null || !markdownPath(path)) {
         return [
             {
                 key,
@@ -34,41 +83,29 @@ export function rowsOf(room, path, document, composition, change) {
                 type: null,
                 fields: {},
                 values: {},
-                sizes: {},
+                reached: {},
                 directories: directoriesOf(path),
-                body,
+                text: null,
                 change,
+                fileId,
+                binary,
             },
         ];
     }
     const type = document.type ?? 'any';
     const definition = definitionOf(governing(composition, path), document.type);
-    const values = {};
-    const sizes = {};
-    const references = [];
+    const reading = {
+        path,
+        references: new Set(definition === undefined ? [] : references(document, definition).map((one) => one.pointer)),
+        values: {},
+        reached: {},
+        targets: new Map(),
+    };
     for (const [name, value] of Object.entries(document.fields)) {
-        const reference = referenceField(definition?.fields[name]);
-        const compared = reference ? resolved(path, value) : value;
-        if (compared !== undefined)
-            values[name] = compared;
-        if (Array.isArray(value))
-            sizes[name] = value.length;
-        if (!reference)
-            continue;
-        const targets = [compared].flat().filter((found) => typeof found === 'string');
-        for (const found of new Set(targets)) {
-            references.push({
-                key: keyOf('r', room, path, name, found),
-                kind: 'reference',
-                room,
-                source: key,
-                target: documentKey(room, found),
-                field: name,
-                path,
-                type,
-            });
-        }
+        const segment = escapePointer(name);
+        walk(reading, value, [{ text: `/${segment}`, through: false, pending: false }], `/${segment}`);
     }
+    const { values, reached } = reading;
     return [
         {
             key,
@@ -78,20 +115,23 @@ export function rowsOf(room, path, document, composition, change) {
             type,
             fields: document.fields,
             values,
-            sizes,
+            reached,
             directories: directoriesOf(path),
-            body,
+            text: document.content,
             change,
+            fileId,
+            binary,
         },
-        {
-            key: body,
-            kind: 'body',
+        ...[...reading.targets.values()].map(({ field, target: found, forms }) => ({
+            key: keyOf('r', room, path, field, found),
+            kind: 'reference',
             room,
+            source: key,
+            target: documentKey(room, found),
+            field,
+            forms: [...forms].sort(),
             path,
-            preamble: document.preamble,
-            sections: document.sections,
-            markdown: document.content,
-        },
-        ...references,
+            type,
+        })),
     ];
 }

package/dist/save.d.ts

@@ -4,13 +4,15 @@ import { type Composition } from './collection.js';
 import type { VisibleLayer } from './replica.js';
 import type { ChangedPart } from './room-draft.js';
 export type SaveRefusal = {
-    rule: string;
+    code: string;
+    retryable: boolean;
     file?: string;
     location?: string;
     referrers?: readonly string[];
     parts?: readonly ChangedPart[];
 };
 export type SaveInput = {
+    local: boolean;
     composition: Composition;
     baseRoomVersion: string;
     operations: import('./adapter.js').OperationScopes;
@@ -20,7 +22,13 @@ export type SaveInput = {
     handle: string;
     changes: readonly Change[];
     bases: readonly Precondition[];
+    queued?: ReadonlySet<string>;
     writtenBy?: WrittenBy;
+    clean?: {
+        text: Readonly<Record<string, string>>;
+        binaries: Readonly<Record<string, unknown>>;
+        composition: Composition;
+    };
 };
 export type BatchResult = {
     kind: 'batch';
@@ -30,5 +38,27 @@ export type BatchResult = {
     refusal: SaveRefusal;
 };
 export declare function providerRewritten(batch: ChangeBatch, visible: VisibleLayer): ChangeBatch;
+export type Requeued = {
+    kind: 'requeued';
+    queue: readonly ChangeBatch[];
+    changes: readonly Change[];
+    queued: ReadonlySet<string>;
+    withdrawn: ReadonlyMap<string, ChangeBatch | null>;
+    owners: ReadonlySet<string>;
+} | {
+    kind: 'refused';
+    refusal: SaveRefusal;
+};
+export type Joining = {
+    kind: 'joined';
+    batch: ChangeBatch;
+    queue: readonly ChangeBatch[];
+} | {
+    kind: 'refused';
+    refusal: SaveRefusal;
+};
+export declare function requeued(queue: readonly ChangeBatch[], changes: readonly Change[], visible: VisibleLayer, changeable: (batch: ChangeBatch) => boolean, state: (queue: readonly ChangeBatch[]) => VisibleLayer): Requeued;
+export declare function joined(queue: readonly ChangeBatch[], owner: ChangeBatch, extra: ChangeBatch): Joining;
+export declare function limitedIn(queue: readonly ChangeBatch[], batch: ChangeBatch, limits: readonly ProviderLimit[], state: (queue: readonly ChangeBatch[]) => VisibleLayer): SaveRefusal | null;
 export declare function buildBatch(input: SaveInput): BatchResult;
 //# sourceMappingURL=save.d.ts.map

package/dist/save.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../src/save.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,SAAS,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAKL,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9B,KAAK,CAAC,EAAE,SAAS,WAAW,EAAE,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,OAAO,cAAc,EAAE,eAAe,CAAC;IACnD,kBAAkB,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,cAAc,EAAE,SAAS,aAAa,EAAE,CAAC;IACzC,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AA+K9C,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,GAAG,WAAW,CAOxF;AAuQD,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAyFxD"}
+{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../src/save.ts"],"names":[],"mappings":"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"}