@agentshouse/mdruntime 0.1.0-cec6690d5712e → 0.1.0-cedd665dffa4c

package/dist/room-draft.js

@@ -1,58 +1,70 @@
-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() {
-    throw runtimeError('room-draft-malformed');
+function malformed(at, needs) {
+    throw runtimeError('room-draft-malformed', at === undefined ? 'room-draft-malformed' : `room-draft-malformed at ${at}: ${needs}`);
 }
 function plain(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
-function text(value) {
-    return typeof value === 'string' ? value : malformed();
+function text(value, at) {
+    return typeof value === 'string' ? value : malformed(at, 'text');
 }
-function optionalText(value) {
-    return value === undefined ? undefined : text(value);
+function optionalText(value, at) {
+    return value === undefined ? undefined : text(value, at);
 }
-function markdownBase(value) {
-    return value === null ? null : optionalText(value);
+function markdownBase(value, at) {
+    return value === null ? null : optionalText(value, at);
 }
-function entries(value, each) {
+function entries(value, at, each) {
     if (!plain(value))
-        malformed();
+        malformed(at, 'an object of named values');
     const read = {};
     for (const [name, item] of Object.entries(value))
-        read[name] = each(item);
+        read[name] = each(item, `${at}.${name}`);
     return read;
 }
-function fieldValue(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();
+    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 };
 }
-function textPart(value) {
+function textPart(value, at) {
     if (!plain(value))
-        malformed();
-    const base = optionalText(value.base);
-    return { value: text(value.value), ...(base === undefined ? {} : { base }) };
+        malformed(at, '{ value, base }');
+    const base = optionalText(value.base, `${at}.base`);
+    return { value: text(value.value, `${at}.value`), ...(base === undefined ? {} : { base }) };
 }
-function creationOf(value) {
+function creationOf(value, at) {
     if (!plain(value))
-        malformed();
+        malformed(at, '{ type, fields, sections }, or { markdown }');
     if (Object.hasOwn(value, 'markdown'))
-        return { markdown: text(value.markdown) };
-    const fields = entries(value.fields, (item) => (frontmatterValue(item) ? item : malformed()));
-    return { type: text(value.type), fields, sections: entries(value.sections, text) };
+        return { markdown: text(value.markdown, `${at}.markdown`) };
+    if (typeof value.type !== 'string')
+        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`, documentValueAt),
+        sections: entries(value.sections, `${at}.sections`, text),
+    };
 }
-const PART_NAMES = new Set([
+const PART_NAMES = [
     'fields',
     'sections',
     'preamble',
@@ -60,41 +72,59 @@ const PART_NAMES = new Set([
     'creation',
     'move',
     'removal',
-]);
-export function readParts(value) {
-    if (!plain(value) || Object.keys(value).some((name) => !PART_NAMES.has(name)))
-        malformed();
+    'file',
+];
+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');
+    const unknown = Object.keys(value).find((name) => !PART_NAMES.includes(name));
+    if (unknown !== undefined)
+        malformed(`${path} ${unknown}`, NAMED_PARTS);
     const parts = {};
     if (value.fields !== undefined) {
-        parts.fields = entries(value.fields, (item) => {
-            if (!plain(item) || !Object.hasOwn(item, 'value') || !frontmatterValue(item.value)) {
-                malformed();
+        parts.fields = entries(value.fields, `${path} fields`, (item, at) => {
+            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 }
-                : { value: item.value, base: fieldValue(item.base) };
+                : { value: item.value, base: fieldValue(item.base, `${at}.base`) };
         });
     }
     if (value.sections !== undefined)
-        parts.sections = entries(value.sections, textPart);
+        parts.sections = entries(value.sections, `${path} sections`, textPart);
     if (value.preamble !== undefined)
-        parts.preamble = textPart(value.preamble);
+        parts.preamble = textPart(value.preamble, `${path} preamble`);
     if (value.markdown !== undefined)
-        parts.markdown = textPart(value.markdown);
+        parts.markdown = textPart(value.markdown, `${path} markdown`);
     if (value.creation !== undefined)
-        parts.creation = creationOf(value.creation);
+        parts.creation = creationOf(value.creation, `${path} creation`);
     if (value.move !== undefined) {
         if (!plain(value.move))
-            malformed();
-        const base = markdownBase(value.move.base);
-        parts.move = { to: text(value.move.to), ...(base === undefined ? {} : { base }) };
+            malformed(`${path} move`, '{ to, room, base }');
+        const base = markdownBase(value.move.base, `${path} move.base`);
+        const room = optionalText(value.move.room, `${path} move.room`);
+        parts.move = {
+            to: text(value.move.to, `${path} move.to`),
+            ...(room === undefined ? {} : { room }),
+            ...(base === undefined ? {} : { base }),
+        };
     }
     if (value.removal !== undefined) {
         if (!plain(value.removal))
-            malformed();
-        const base = markdownBase(value.removal.base);
+            malformed(`${path} removal`, '{ base }');
+        const base = markdownBase(value.removal.base, `${path} removal.base`);
         parts.removal = base === undefined ? {} : { base };
     }
+    if (value.file !== undefined) {
+        if (!plain(value.file) || !(value.file.blob instanceof Blob))
+            malformed(`${path} file`, '{ blob, base } with a Blob');
+        if (Object.keys(value).length > 1)
+            throw runtimeError('room-draft-file-exclusive');
+        const base = markdownBase(value.file.base, `${path} file.base`);
+        parts.file = base === undefined ? { blob: value.file.blob } : { blob: value.file.blob, base };
+    }
     return parts;
 }
 function named(record) {
@@ -110,15 +140,76 @@ function kept(prior, base) {
         throw runtimeError('room-draft-base-missing');
     return base;
 }
+function movePart(current, move) {
+    return {
+        to: move.to,
+        ...(move.room === undefined ? {} : { room: move.room }),
+        base: kept(current, move.base),
+    };
+}
 function editsText(parts) {
     return (parts.preamble !== undefined ||
         named(parts.fields).length > 0 ||
         named(parts.sections).length > 0);
 }
-export function held(current, parts) {
+function partNames(parts) {
+    const names = [];
+    for (const [name, part] of Object.entries(parts)) {
+        if (name === 'preamble' || name === 'markdown')
+            names.push(name);
+        else if ((name === 'fields' || name === 'sections') && plain(part))
+            names.push(...Object.keys(part).map((one) => `${name}/${one}`));
+        else
+            return null;
+    }
+    return names.sort().join('\u0000');
+}
+function withBaseOf(prior, part) {
+    return plain(part) && plain(prior) && Object.hasOwn(prior, 'base')
+        ? { ...part, base: prior.base }
+        : part;
+}
+export function gatheredParts(earlier, later) {
+    if (!plain(earlier) || !plain(later))
+        return null;
+    const named = partNames(earlier);
+    if (named === null || named !== partNames(later))
+        return null;
+    return Object.fromEntries(Object.entries(later).map(([name, part]) => [
+        name,
+        name === 'fields' || name === 'sections'
+            ? Object.fromEntries(Object.entries(part).map(([one, value]) => [
+                one,
+                withBaseOf(earlier[name][one], value),
+            ]))
+            : withBaseOf(earlier[name], part),
+    ]));
+}
+export function held(current, parts, file) {
     if (parts.markdown !== undefined && editsText(parts)) {
         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: movePart(current.move, parts.move) }),
+            ...(parts.removal === undefined
+                ? {}
+                : { removal: { base: kept(current.removal, parts.removal.base) } }),
+        };
+    }
     const next = {};
     const fields = named(parts.fields);
     if (fields.length > 0) {
@@ -148,9 +239,8 @@ export function held(current, parts) {
     }
     if (parts.creation !== undefined)
         next.creation = parts.creation;
-    if (parts.move !== undefined) {
-        next.move = { to: parts.move.to, base: kept(current?.move, parts.move.base) };
-    }
+    if (parts.move !== undefined)
+        next.move = movePart(current?.move, parts.move);
     if (parts.removal !== undefined) {
         next.removal = { base: kept(current?.removal, parts.removal.base) };
     }
@@ -167,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;
@@ -178,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;
@@ -188,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)
@@ -198,19 +291,260 @@ 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;
 }
-export function changedParts(path, report) {
+export async function heldFile(blob, base) {
+    return {
+        localId: binaryLocalId(),
+        ...(blob instanceof File ? { name: blob.name } : {}),
+        byteLength: blob.size,
+        mediaType: declaredType(blob),
+        sha256: await sha256(blob),
+        base,
+    };
+}
+export function binaryBase(visible, path) {
+    const binary = visible?.binaries[path];
+    if (binary === undefined)
+        return null;
+    return visible?.revisions[path] ?? (binary.state === 'pending' ? binary.localId : null);
+}
+export function changedParts(path, parts, visible) {
+    const report = underneath(parts, path, visible);
+    const made = parts.file?.base === null;
     return [
-        ...(report.creation === undefined ? [] : [{ path, part: 'creation' }]),
         ...named(report.fields).map(([name]) => ({ path, part: 'field', name })),
         ...named(report.sections).map(([name]) => ({ path, part: 'section', name })),
         ...(report.preamble === undefined ? [] : [{ path, part: 'preamble' }]),
         ...(report.markdown === undefined ? [] : [{ path, part: 'markdown' }]),
         ...(report.move === undefined ? [] : [{ path, part: 'move' }]),
         ...(report.removal === undefined ? [] : [{ path, part: 'removal' }]),
+        ...(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))
@@ -218,34 +552,45 @@ function joined(existing, returned) {
             merged[name] = part;
     return Object.keys(merged).length === 0 ? undefined : merged;
 }
-function ended(text) {
+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();
-    let document = opened.document;
-    for (const [name, part] of fields) {
-        const next = apply(document, { kind: 'field', name, value: part.value, prior: undefined });
-        if (next.outcome !== 'applied')
-            return malformed();
-        document = next.document;
-    }
-    return serialize(document);
+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();
 }
-function concatenated(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 `${ended(markdown)}\n${pieces.map(ended).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 };
@@ -265,24 +610,59 @@ 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, definitions);
+        if (value === null)
+            return null;
         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) {
     const to = normalize(move.to);
     return to === null || to === '' ? move.to : to;
 }
+export function readSavedParts(named) {
+    const read = named.map(({ path, parts }) => ({ path, parts: readParts(parts, path) }));
+    read.forEach(({ path }, at) => {
+        if (path === '' || normalize(path) !== path)
+            malformed(path, 'a path inside the Room, such as notes/a.md');
+        if (read.findIndex((one) => one.path === path) !== at)
+            malformed(path, 'each path once in one save');
+    });
+    return read;
+}
+export function partsChanges(named) {
+    const changes = [];
+    const preconditions = [];
+    for (const { path, parts } of readSavedParts(named)) {
+        const parted = held(undefined, parts);
+        const made = changesOf(path, parted);
+        changes.push(...made.changes);
+        preconditions.push(...made.bases);
+        for (const change of made.changes) {
+            if (change.kind === 'create')
+                preconditions.push({ kind: 'absent', path });
+            if (change.kind === 'move')
+                preconditions.push({ kind: 'absent', path: change.to });
+        }
+        const revision = parted.markdown?.base ?? parted.move?.base ?? parted.removal?.base;
+        if (typeof revision === 'string')
+            preconditions.push({ kind: 'revision', path, revision });
+    }
+    return { changes, preconditions };
+}
 export function changesOf(path, parts) {
     const changes = [];
     const bases = [];
@@ -302,19 +682,51 @@ export function changesOf(path, parts) {
         bases.push({ kind: 'field', path, name, value: part.base?.value });
     }
     for (const [name, part] of named(parts.sections)) {
-        changes.push({ kind: 'section', path, name, value: part.value });
+        changes.push({ kind: 'section', path, name, value: lineEnded(part.value) });
         bases.push({ kind: 'section', path, name, value: part.base });
     }
     if (parts.preamble !== undefined) {
-        changes.push({ kind: 'preamble', path, value: parts.preamble.value });
+        changes.push({ kind: 'preamble', path, value: lineEnded(parts.preamble.value) });
         bases.push({ kind: 'preamble', path, value: parts.preamble.base });
     }
     if (parts.markdown !== undefined) {
         changes.push({ kind: 'replace', path, content: parts.markdown.value });
     }
+    if (parts.file !== undefined && parts.removal === undefined) {
+        const { base, name: _name, ...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)
+            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 };
 }
+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 } } }];
+    });
+}