@agentshouse/mdruntime 0.1.0-cb1f56e16291b → 0.1.0-cb3bb3b233fa1

package/dist/room-draft.js

@@ -1,13 +1,15 @@
-import { apply, equalValue, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { apply, create, documentValue, equalValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { definitionsAt, governing } from './collection.js';
 import { runtimeError } from './failure.js';
 import { sha256 } from './digest.js';
+import { declaredType } from './outcome.js';
 import { binaryLocalId } from './identity.js';
 import { normalize } from './paths.js';
-export function returnedBy(kind) {
-    return { kind, code: kind, fields: {}, retryable: false };
+export function returnedBy() {
+    return { kind: 'withdrawn', code: 'withdrawn', fields: {}, retryable: false };
 }
 export function staleWrite(current) {
-    return { outcome: 'stale', code: 'stale', retryable: false, current };
+    return { outcome: 'stale', current };
 }
 function malformed(at, needs) {
     throw runtimeError('room-draft-malformed', at === undefined ? 'room-draft-malformed' : `room-draft-malformed at ${at}: ${needs}`);
@@ -32,14 +34,14 @@ function entries(value, at, each) {
         read[name] = each(item, `${at}.${name}`);
     return read;
 }
-function frontmatter(item, at) {
-    return frontmatterValue(item) ? item : malformed(at, 'a frontmatter value');
+function documentValueAt(item, at) {
+    return documentValue(item) ? item : malformed(at, 'a document value');
 }
 function fieldValue(value, at) {
     if (value === null)
         return null;
-    if (!plain(value) || !Object.hasOwn(value, 'value') || !frontmatterValue(value.value)) {
-        malformed(at, '{ value } with a frontmatter value, or null where the document lacks it');
+    if (!plain(value) || !Object.hasOwn(value, 'value') || !documentValue(value.value)) {
+        malformed(at, '{ value } with a document value, or null where the document lacks it');
     }
     return { value: value.value };
 }
@@ -58,7 +60,7 @@ function creationOf(value, at) {
         malformed(`${at}.type`, 'a type name, or markdown in place of type, fields and sections');
     return {
         type: value.type,
-        fields: entries(value.fields, `${at}.fields`, frontmatter),
+        fields: entries(value.fields, `${at}.fields`, documentValueAt),
         sections: entries(value.sections, `${at}.sections`, text),
     };
 }
@@ -72,7 +74,7 @@ const PART_NAMES = [
     'removal',
     'file',
 ];
-const NAMED_PARTS = `a part named ${PART_NAMES.slice(0, -1).join(', ')} or ${PART_NAMES.at(-1)}`;
+const NAMED_PARTS = `a part named ${PART_NAMES.slice(0, -1).join(', ')} or ${PART_NAMES.slice(-1).join('')}`;
 export function readParts(value, path) {
     if (!plain(value))
         malformed(path, 'an object of parts');
@@ -82,8 +84,8 @@ export function readParts(value, path) {
     const parts = {};
     if (value.fields !== undefined) {
         parts.fields = entries(value.fields, `${path} fields`, (item, at) => {
-            if (!plain(item) || !Object.hasOwn(item, 'value') || !frontmatterValue(item.value)) {
-                malformed(at, '{ value, base } with a frontmatter value');
+            if (!plain(item) || !Object.hasOwn(item, 'value') || !documentValue(item.value)) {
+                malformed(at, '{ value, base } with a document value');
             }
             return item.base === undefined
                 ? { value: item.value }
@@ -255,8 +257,10 @@ export function underneath(parts, path, visible) {
     const markdown = visible?.documents[path] ?? null;
     const document = visible?.collection.document(path);
     const report = {};
+    const unread = document?.type !== undefined &&
+        governing(visible.collection.composition, path).status === 'unavailable';
     const fields = {};
-    for (const [name, part] of named(parts.fields)) {
+    for (const [name, part] of unread ? [] : named(parts.fields)) {
         const current = document !== undefined && Object.hasOwn(document.fields, name)
             ? { value: document.fields[name] }
             : null;
@@ -266,7 +270,7 @@ export function underneath(parts, path, visible) {
     if (Object.keys(fields).length > 0)
         report.fields = fields;
     const sections = {};
-    for (const [name, part] of named(parts.sections)) {
+    for (const [name, part] of unread ? [] : named(parts.sections)) {
         const current = document !== undefined && Object.hasOwn(document.sections, name)
             ? document.sections[name]
             : null;
@@ -276,8 +280,9 @@ export function underneath(parts, path, visible) {
     if (Object.keys(sections).length > 0)
         report.sections = sections;
     const preamble = document?.preamble ?? null;
-    if (parts.preamble !== undefined && preamble !== parts.preamble.base)
+    if (!unread && parts.preamble !== undefined && preamble !== parts.preamble.base) {
         report.preamble = preamble;
+    }
     if (parts.markdown !== undefined && markdown !== parts.markdown.base)
         report.markdown = markdown;
     if (parts.creation !== undefined && markdown !== null)
@@ -293,13 +298,12 @@ export function underneath(parts, path, visible) {
     }
     return report;
 }
-const UNTYPED_MEDIA_TYPE = 'application/octet-stream';
 export async function heldFile(blob, base) {
     return {
         localId: binaryLocalId(),
         ...(blob instanceof File ? { name: blob.name } : {}),
         byteLength: blob.size,
-        mediaType: blob.type === '' ? UNTYPED_MEDIA_TYPE : blob.type,
+        mediaType: declaredType(blob),
         sha256: await sha256(blob),
         base,
     };
@@ -323,6 +327,224 @@ export function changedParts(path, parts, visible) {
         ...(report.file === undefined || made ? [] : [{ path, part: 'file' }]),
     ];
 }
+function marksOf(fields, sections, rest) {
+    return {
+        ...(Object.keys(fields).length === 0 ? {} : { fields }),
+        ...(Object.keys(sections).length === 0 ? {} : { sections }),
+        ...(rest.preamble === undefined ? {} : { preamble: rest.preamble }),
+        ...(rest.markdown === undefined ? {} : { markdown: rest.markdown }),
+        ...(rest.file === undefined ? {} : { file: rest.file }),
+    };
+}
+export function marksOver(kept, under) {
+    return marksOf({ ...under.fields, ...kept.fields }, { ...under.sections, ...kept.sections }, {
+        preamble: kept.preamble ?? under.preamble,
+        markdown: kept.markdown ?? under.markdown,
+        file: kept.file ?? under.file,
+    });
+}
+export function heldMarks(marks, parts) {
+    const whole = parts.markdown !== undefined;
+    const heldIn = (record, part) => Object.fromEntries(named(record).filter(([name]) => whole || own(part, name) !== undefined));
+    return marksOf(heldIn(marks.fields, parts.fields), heldIn(marks.sections, parts.sections), {
+        preamble: whole || parts.preamble !== undefined ? marks.preamble : undefined,
+        markdown: whole ? marks.markdown : undefined,
+        file: parts.file === undefined ? undefined : marks.file,
+    });
+}
+function followedBy(first, then) {
+    const kept = first.replace(/(?:\r?\n)+$/u, '');
+    return kept.trim() === '' ? then : `${kept}\n\n${then.replace(/^(?:\r?\n)+/u, '')}`;
+}
+function bothSides(current, value) {
+    return lineEnded(current) === lineEnded(value) ? value : followedBy(current, value);
+}
+export function partsBetween(path, before, after) {
+    const changes = [];
+    for (const name of new Set([...Object.keys(before.fields), ...Object.keys(after.fields)])) {
+        const value = own(after.fields, name);
+        if (!equalValue(own(before.fields, name), value)) {
+            changes.push({ kind: 'field', path, name, value });
+        }
+    }
+    if (after.preamble !== before.preamble) {
+        changes.push({ kind: 'preamble', path, value: after.preamble });
+    }
+    for (const [name, value] of Object.entries(after.sections)) {
+        if (own(before.sections, name) !== value)
+            changes.push({ kind: 'section', path, name, value });
+    }
+    return changes;
+}
+export function applyParts(document, changes, definition) {
+    const parts = new Map();
+    for (const change of changes) {
+        if (change.kind === 'field')
+            parts.set(`field ${change.name}`, {
+                kind: 'field',
+                name: change.name,
+                value: change.value,
+                prior: own(document.fields, change.name),
+            });
+        if (change.kind === 'preamble')
+            parts.set('preamble', { kind: 'preamble', value: change.value, prior: document.preamble });
+        if (change.kind === 'section')
+            parts.set(`section ${change.name}`, {
+                kind: 'section',
+                name: change.name,
+                value: change.value,
+                prior: own(document.sections, change.name),
+            });
+    }
+    if (parts.size === 0)
+        return { outcome: 'applied', document };
+    return apply(document, [...parts.values()], definition);
+}
+function wholeJoined(part, current, path, composition, change) {
+    const definitions = definitionsAt(composition, path);
+    const read = (text) => {
+        const parsed = parse(text, path, definitions);
+        return parsed.ok ? parsed.document : undefined;
+    };
+    const base = read(part.base);
+    const mine = read(part.value);
+    const now = read(current);
+    if (base === undefined ||
+        mine === undefined ||
+        now === undefined ||
+        mine.type !== base.type ||
+        now.type !== base.type ||
+        Object.keys(base.sections).some((name) => !Object.hasOwn(mine.sections, name))) {
+        return null;
+    }
+    const definition = definitions(base.type);
+    const changes = partsBetween(path, base, mine);
+    const again = applyParts(base, changes, definition);
+    if (again.outcome !== 'applied' || serialize(again.document) !== part.value)
+        return null;
+    const fields = {};
+    const sections = {};
+    let preamble;
+    const over = [];
+    for (const one of changes) {
+        if (one.kind === 'field') {
+            const held = own(now.fields, one.name);
+            if (!equalValue(held, own(base.fields, one.name)) && !equalValue(held, one.value)) {
+                fields[one.name] = { current: held === undefined ? null : { value: held }, change };
+            }
+            over.push(one);
+            continue;
+        }
+        if (one.kind === 'preamble') {
+            const value = now.preamble === base.preamble ? one.value : bothSides(now.preamble, one.value);
+            if (value !== one.value)
+                preamble = { change };
+            over.push({ ...one, value });
+            continue;
+        }
+        const prior = own(base.sections, one.name);
+        const held = own(now.sections, one.name);
+        if (held === undefined && prior !== undefined)
+            return null;
+        const value = held === undefined || held === prior ? one.value : bothSides(held, one.value);
+        if (value !== one.value)
+            sections[one.name] = { change };
+        over.push({ ...one, value });
+    }
+    const joined = applyParts(now, over, definition);
+    if (joined.outcome !== 'applied')
+        return null;
+    return {
+        value: serialize(joined.document),
+        marks: marksOf(fields, sections, { preamble }),
+    };
+}
+export function joinedOver(parts, marks, path, visible) {
+    const report = underneath(parts, path, visible);
+    const change = visible.changes[path] ?? null;
+    const next = { ...parts };
+    const fields = {};
+    const sections = {};
+    const rest = {};
+    let rebased = false;
+    const text = (value, current, mark) => {
+        const joined = bothSides(current, value);
+        if (joined !== value)
+            mark();
+        return { value: joined, base: current };
+    };
+    const now = visible.collection.document(path);
+    if (now !== undefined) {
+        for (const [name, current] of named(report.fields)) {
+            const { value } = parts.fields[name];
+            next.fields = { ...next.fields, [name]: { value, base: current } };
+            if (!sameField(current, { value }))
+                fields[name] = { current, change };
+            rebased = true;
+        }
+        const removed = [];
+        for (const [name, current] of named(report.sections)) {
+            if (current === null) {
+                removed.push(name);
+                continue;
+            }
+            const joined = text(parts.sections[name].value, current, () => {
+                sections[name] = { change };
+            });
+            next.sections = { ...next.sections, [name]: joined };
+            rebased = true;
+        }
+        if (typeof report.preamble === 'string') {
+            next.preamble = text(parts.preamble.value, report.preamble, () => {
+                rest.preamble = { change };
+            });
+            rebased = true;
+        }
+        const whole = removed.length === 0
+            ? null
+            : applyParts(now, changesOf(path, next).changes, definitionsAt(visible.collection.composition, path)(now.type));
+        if (whole?.outcome === 'applied') {
+            delete next.fields;
+            delete next.sections;
+            delete next.preamble;
+            next.markdown = { value: serialize(whole.document), base: visible.documents[path] };
+            for (const name of removed)
+                sections[name] = { change };
+            rebased = true;
+        }
+    }
+    if (typeof report.markdown === 'string' && parts.markdown !== undefined) {
+        const current = report.markdown;
+        const whole = wholeJoined(parts.markdown, current, path, visible.collection.composition, change);
+        const value = whole?.value ?? bothSides(current, parts.markdown.value);
+        next.markdown = { value, base: current };
+        if (whole !== null) {
+            Object.assign(fields, whole.marks.fields);
+            Object.assign(sections, whole.marks.sections);
+            if (whole.marks.preamble !== undefined)
+                rest.preamble = whole.marks.preamble;
+        }
+        else if (value !== parts.markdown.value)
+            rest.markdown = { change };
+        rebased = true;
+    }
+    if (typeof report.move === 'string' && parts.move !== undefined) {
+        next.move = { ...parts.move, base: report.move };
+        rebased = true;
+    }
+    if (typeof report.removal === 'string' && parts.removal !== undefined) {
+        next.removal = { base: report.removal };
+        rebased = true;
+    }
+    if (typeof report.file === 'string' && parts.file !== undefined && parts.file.base !== null) {
+        next.file = { ...parts.file, base: report.file };
+        if (visible.binaries[path]?.sha256 !== parts.file.sha256) {
+            rest.file = { current: report.file, change };
+        }
+        rebased = true;
+    }
+    return rebased ? { parts: next, marks: marksOver(marksOf(fields, sections, rest), marks) } : null;
+}
 function joined(existing, returned) {
     const merged = { ...existing };
     for (const [name, part] of named(returned))
@@ -333,30 +555,42 @@ function joined(existing, returned) {
 export function lineEnded(text) {
     return text === '' || text.endsWith('\n') ? text : `${text}\n`;
 }
-function frontmatterOf(fields) {
-    const opened = parse('---\n---\n');
-    if (!opened.ok)
-        return malformed();
-    const next = apply(opened.document, fields.map(([name, part]) => ({
-        kind: 'field',
-        name,
-        value: part.value,
-        prior: undefined,
-    })));
-    return next.outcome === 'applied' ? serialize(next.document) : malformed();
+function written(start, changes, definition) {
+    const next = apply(start, changes, definition);
+    return next.outcome === 'applied' ? next.document : malformed();
+}
+function empty(definition) {
+    const parsed = parse('', '', definition);
+    return parsed.ok ? parsed.document : malformed();
 }
-export function partsAfter(markdown, parts) {
+export function partsAfter(markdown, parts, definitions) {
     const fields = named(parts.fields);
+    const sections = named(parts.sections);
+    if (fields.length === 0 && sections.length === 0 && parts.preamble === undefined)
+        return markdown;
+    const whole = parse(markdown, '', definitions);
+    const type = whole.ok ? whole.document.type : undefined;
+    const definition = definitions?.(type);
+    if (type !== undefined && definition === undefined)
+        return null;
+    const valued = fields.length === 0
+        ? empty(definition)
+        : written(create(type, definition), fields.map(([name, part]) => ({
+            kind: 'field',
+            name,
+            value: part.value,
+            prior: undefined,
+        })), definition);
+    const head = parts.preamble === undefined
+        ? valued
+        : written(valued, [{ kind: 'preamble', value: lineEnded(parts.preamble.value), prior: valued.preamble }], definition);
     const pieces = [
-        ...(fields.length === 0 ? [] : [frontmatterOf(fields)]),
-        ...(parts.preamble === undefined ? [] : [parts.preamble.value]),
-        ...named(parts.sections).map(([name, part]) => `## ${name}\n${part.value}`),
+        ...(fields.length === 0 && parts.preamble === undefined ? [] : [serialize(head)]),
+        ...sections.map(([name, part]) => serialize(written(empty(definition), [{ kind: 'section', name, value: lineEnded(part.value), prior: undefined }], definition))),
     ];
-    if (pieces.length === 0)
-        return markdown;
-    return `${lineEnded(markdown)}\n${pieces.map(lineEnded).join('')}`;
+    return followedBy(markdown, pieces.join(''));
 }
-export function returnedInto(existing, returned) {
+export function returnedInto(existing, returned, definitions) {
     if (existing === undefined)
         return returned;
     const next = { ...existing };
@@ -376,7 +610,9 @@ export function returnedInto(existing, returned) {
         delete next.fields;
         delete next.sections;
         delete next.preamble;
-        const value = partsAfter(whole.value, existing.markdown === undefined ? existing : returned);
+        const value = partsAfter(whole.value, existing.markdown === undefined ? existing : returned, definitions);
+        if (value === null)
+            return null;
         next.markdown = { value, base: whole.base };
     }
     const creation = existing.creation ?? returned.creation;
@@ -474,35 +710,6 @@ export function changesOf(path, parts) {
         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;

package/dist/room-drafts.d.ts

@@ -0,0 +1,24 @@
+import { type ChangeSet } from './change-set.js';
+import { type VisibleLayer } from './replica.js';
+import { type RoomDraft, type RoomDraftWrite } from './room-draft.js';
+import type { Runtime } from './runtime.js';
+import type { Store } from './store.js';
+export type RoomDraftSurface = {
+    list(): Promise<readonly RoomDraft[]>;
+    read(room: string, path: string): Promise<RoomDraft | null>;
+    write(room: string, path: string, revision: string | null, parts: unknown, next?: string): Promise<RoomDraftWrite>;
+    discard(room: string, path: string, revision: string): Promise<RoomDraftWrite>;
+};
+export type PresentationSurface = {
+    read(app: string): Promise<unknown>;
+    write(app: string, value: unknown): Promise<void>;
+    edit(app: string, members: Readonly<Record<string, unknown>>): Promise<void>;
+};
+export declare function visibleOf(store: Store, locator: string, paths: readonly string[]): Promise<VisibleLayer | undefined>;
+export declare function publishRoomDrafts({ store, socket }: Runtime, waitingOnly: boolean, touched?: ChangeSet['documents'] | null): Promise<void>;
+export declare function emitPresentation({ store, socket }: Runtime, app: string): Promise<void>;
+export declare function roomDraftSurface(runtime: Runtime): RoomDraftSurface;
+export declare function presentationSurface(runtime: Runtime): PresentationSurface;
+export declare function watchRoomDrafts({ store, socket }: Runtime, deliver: (value: unknown) => void): () => void;
+export declare function watchPresentation({ store, socket }: Runtime, app: string, deliver: (value: unknown) => void): () => void;
+//# sourceMappingURL=room-drafts.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"room-drafts.d.ts","sourceRoot":"","sources":["../src/room-drafts.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5D,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EASL,KAAK,SAAS,EAEd,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGxC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,IAAI,OAAO,CAAC,SAAS,SAAS,EAAE,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAC5D,KAAK,CACH,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAAC;IAC3B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CAChF,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9E,CAAC;AAMF,wBAAsB,SAAS,CAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,MAAM,EAAE,GACvB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AA2CD,wBAAgB,iBAAiB,CAC/B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,WAAW,EAAE,OAAO,EACpB,OAAO,GAAE,SAAS,CAAC,WAAW,CAAC,GAAG,IAAW,GAC5C,OAAO,CAAC,IAAI,CAAC,CAuBf;AAOD,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUvF;AAsDD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,CAkDnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,mBAAmB,CA8BzE;AAED,wBAAgB,eAAe,CAC7B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAChC,MAAM,IAAI,CAiBZ;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAChC,MAAM,IAAI,CASZ"}