@agentshouse/mdmodel 0.1.0-c2987f5d89720 → 0.1.0-c4fe1bc82bc55

package/dist/condition.js

@@ -1,9 +1,14 @@
+import { ARRAY_INDEX, escapePointer, fieldFacts, itemFacts, memberFacts, pointerSegments, } from './definition.js';
 import { target } from './paths.js';
-import { isRecord } from './yaml.js';
+import { isRecord, plain } from './yaml.js';
 export const WRITE_DOORS = ['browser', 'agent', 'client'];
+const PROSE = { kind: 'prose' };
+const NULL = { kind: 'null' };
+const UNREADABLE = { kind: 'unreadable' };
+const UNREAD = { present: undefined, values: [undefined], items: [undefined] };
+const NO_ITEM = { present: false, values: [], items: [] };
 const DATE = /^\d{4}-\d{2}-\d{2}$/u;
 const DATE_TIME = /^(\d{4})-(\d{2})-(\d{2})[Tt](\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?(?:[Zz]|([+-])(\d{2}):(\d{2}))$/u;
-const ARRAY_INDEX = /^(?:0|[1-9][0-9]*)$/u;
 export function factKind(facts) {
     if (facts.reference !== undefined)
         return 'reference';
@@ -21,9 +26,6 @@ export function factKind(facts) {
         return 'time';
     return 'string';
 }
-function referenced(model, facts) {
-    return (facts.reference ?? []).some((to) => Object.hasOwn(model.types, to) && model.types[to].memberDocument);
-}
 function fits(kind, facts, value) {
     if (!scalar(value))
         return false;
@@ -41,81 +43,156 @@ function fits(kind, facts, value) {
         return instant(value) !== undefined;
     return true;
 }
-function fitted(kind, facts, value, path, resolve) {
-    if (!fits(kind, facts, value))
-        return undefined;
+function factOf(value, declared, place) {
+    if (value === null)
+        return NULL;
+    if (Array.isArray(value)) {
+        if (declared?.type !== undefined && declared.type !== 'array')
+            return UNREADABLE;
+        return {
+            kind: 'list',
+            items: value.map((item, index) => factOf(item, declared === undefined ? undefined : itemFacts(declared, index), place)),
+        };
+    }
+    if (plain(value)) {
+        if (declared?.type !== undefined && declared.type !== 'object')
+            return UNREADABLE;
+        const fields = Object.create(null);
+        for (const [key, held] of Object.entries(value))
+            fields[key] = factOf(held, declared === undefined ? undefined : memberFacts(declared, key), place);
+        return { kind: 'object', fields };
+    }
+    if (declared?.type === 'array' || declared?.type === 'object')
+        return UNREADABLE;
+    const kind = declared === undefined || declared.prose ? null : factKind(declared);
+    if (kind === null)
+        return PROSE;
+    if (!fits(kind, declared, value))
+        return UNREADABLE;
     if (kind !== 'reference')
-        return { value };
-    const reached = target(path, value);
-    return reached === null ? undefined : resolve(reached);
+        return { kind, value };
+    const reached = target(place.path, value);
+    const resolved = reached === null ? undefined : place.resolve(reached);
+    if (resolved === undefined)
+        return UNREADABLE;
+    return resolved.member === undefined
+        ? { kind, value: resolved.id }
+        : { kind, value: resolved.id, member: resolved.member };
 }
 export function facts(document, at, model, resolve) {
     const type = document.type ?? null;
     const definition = type !== null && Object.hasOwn(model.types, type) ? model.types[type] : null;
-    const fields = {};
-    const members = {};
-    const prose = Object.keys(document.sections).map((heading) => `/sections/${heading}`);
-    const unreadable = [];
-    for (const [name, declared] of Object.entries(definition === null ? {} : definition.fields)) {
-        const value = document.fields[name];
-        if (value === undefined || value === null)
-            continue;
-        const list = declared.type === 'array';
-        const facts = list ? declared.items : declared;
-        const kind = facts === undefined || facts.prose ? null : factKind(facts);
-        if (kind === null) {
-            prose.push(`/fields/${name}`);
-            continue;
-        }
-        const items = list ? value : [value];
-        const held = Array.isArray(items)
-            ? items.map((item) => fitted(kind, facts, item, at.path, resolve))
-            : [undefined];
-        if (held.some((item) => item === undefined)) {
-            unreadable.push(`/fields/${name}`);
-            if (referenced(model, facts))
-                unreadable.push(`/members/${name}`);
-            continue;
-        }
-        const values = held.map((item) => ('id' in item ? item.id : item.value));
-        fields[name] = { kind, value: list ? values : values[0] };
-        if (!referenced(model, facts))
-            continue;
-        const bound = held.flatMap((item) => 'member' in item && item.member !== undefined ? [item.member] : []);
-        if (list)
-            members[name] = bound;
-        else if (bound[0] !== undefined)
-            members[name] = bound[0];
+    const fields = Object.create(null);
+    const place = { path: at.path, resolve };
+    for (const [name, value] of Object.entries(document.fields)) {
+        const declared = definition === null ? undefined : fieldFacts(definition, name);
+        if (declared !== undefined)
+            fields[name] = factOf(value, declared, place);
     }
     return {
         id: at.id,
         path: `/${at.path}`,
         type,
         fields,
-        members,
-        prose: prose.sort(),
-        unreadable: unreadable.sort(),
+        sections: Object.keys(document.sections).sort(),
+    };
+}
+function rootOf(facts, prefix) {
+    return { pointer: prefix, fact: { kind: 'object', fields: facts.fields } };
+}
+export function prosePaths(facts) {
+    const paths = facts.sections.map((heading) => `/sections/${heading}`);
+    const visit = ({ pointer, fact }) => {
+        if (fact.kind === 'prose')
+            paths.push(pointer);
+        if (fact.kind === 'list')
+            fact.items.forEach((item, index) => visit({ pointer: `${pointer}/${index}`, fact: item }));
+        if (fact.kind === 'object')
+            for (const [key, held] of Object.entries(fact.fields))
+                visit({ pointer: `${pointer}/${escapePointer(key)}`, fact: held });
+    };
+    visit(rootOf(facts, '/fields'));
+    return paths.sort();
+}
+function walked(start, pointer) {
+    let reached = [start];
+    let several = false;
+    let missing = false;
+    const each = (from, next) => from.flatMap((one) => {
+        const found = next(one);
+        if (found === null)
+            missing = true;
+        return found ?? [];
+    });
+    for (const token of pointerSegments(pointer)) {
+        const step = ({ pointer: at, fact }) => {
+            if (fact.kind === 'unreadable')
+                return [{ pointer: at, fact }];
+            if (fact.kind === 'object')
+                return Object.hasOwn(fact.fields, token)
+                    ? [{ pointer: `${at}/${escapePointer(token)}`, fact: fact.fields[token] }]
+                    : null;
+            if (fact.kind !== 'list')
+                return null;
+            if (ARRAY_INDEX.test(token)) {
+                const item = fact.items[Number(token)];
+                return item === undefined ? null : [{ pointer: `${at}/${token}`, fact: item }];
+            }
+            several = true;
+            return each(fact.items.map((item, index) => ({ pointer: `${at}/${index}`, fact: item })), step);
+        };
+        reached = each(reached, step);
+    }
+    return { reached, several, missing };
+}
+function expand(fact) {
+    return fact.kind === 'list' ? fact.items.flatMap(expand) : [fact];
+}
+function fieldHeld(fact) {
+    if (fact.kind === 'unreadable')
+        return undefined;
+    if (fact.kind === 'null')
+        return { kind: 'null' };
+    return 'value' in fact ? { kind: fact.kind, value: fact.value } : { kind: 'prose' };
+}
+function memberHeld(fact) {
+    if (fact.kind === 'unreadable')
+        return undefined;
+    return fact.kind === 'reference' && fact.member !== undefined
+        ? { kind: 'member', value: fact.member }
+        : null;
+}
+function single(held) {
+    return { present: true, values: [held], items: null };
+}
+function documentRead({ reached, several, missing }, held) {
+    if (reached.length === 0)
+        return missing ? undefined : NO_ITEM;
+    const facts = reached.map(({ fact }) => fact);
+    const kept = (all) => all.map(held).filter((value) => value !== null);
+    const unknown = missing ? [undefined] : [];
+    const values = kept(facts.filter((fact) => fact.kind !== 'list'));
+    const listed = several || facts.some((fact) => fact.kind === 'list');
+    const present = facts.some((fact) => fact.kind === 'list') || values.some(Boolean);
+    return {
+        present: present ? true : values.length > 0 ? undefined : false,
+        values: [...values, ...unknown],
+        items: listed ? [...kept(facts.flatMap(expand)), ...unknown] : null,
     };
 }
 function readDocument(facts, path) {
     if (path === '/path')
-        return { kind: 'path', value: facts.path };
+        return single({ kind: 'path', value: facts.path });
     if (path === '/type')
-        return facts.type === null ? undefined : { kind: 'string', value: facts.type };
-    if (facts.unreadable.includes(path))
-        return { kind: 'unreadable' };
-    if (facts.prose.includes(path))
-        return { kind: 'present' };
-    if (path.startsWith('/fields/')) {
-        const name = path.slice('/fields/'.length);
-        return Object.hasOwn(facts.fields, name) ? facts.fields[name] : undefined;
-    }
-    if (path.startsWith('/members/')) {
-        const name = path.slice('/members/'.length);
-        return Object.hasOwn(facts.members, name)
-            ? { kind: 'member', value: facts.members[name] }
+        return facts.type === null ? undefined : single({ kind: 'string', value: facts.type });
+    if (path.startsWith('/sections/'))
+        return facts.sections.includes(path.slice('/sections/'.length))
+            ? single({ kind: 'prose' })
             : undefined;
-    }
+    if (path.startsWith('/fields/'))
+        return documentRead(walked(rootOf(facts, '/fields'), path.slice('/fields'.length)), fieldHeld);
+    if (path.startsWith('/members/'))
+        return documentRead(walked(rootOf(facts, '/members'), path.slice('/members'.length)), memberHeld);
     return undefined;
 }
 function readActor(actor, path) {
@@ -126,13 +203,7 @@ function readActor(actor, path) {
             : path === '/door'
                 ? actor.door
                 : undefined;
-    return value === undefined ? undefined : { kind: 'actor', value };
-}
-function plain(value) {
-    if (!isRecord(value))
-        return false;
-    const prototype = Object.getPrototypeOf(value);
-    return prototype === Object.prototype || prototype === null;
+    return value === undefined ? undefined : single({ kind: 'actor', value });
 }
 export function dated(value) {
     return (typeof value === 'string' && DATE.test(value) && instant(`${value}T00:00:00Z`) !== undefined);
@@ -187,8 +258,6 @@ function scalar(value) {
         (typeof value === 'number' && Number.isFinite(value)));
 }
 function jsonHeld(value) {
-    if (value === undefined)
-        return undefined;
     if (typeof value === 'string')
         return {
             kind: dated(value) ? 'date' : instant(value) === undefined ? 'string' : 'time',
@@ -196,26 +265,31 @@ function jsonHeld(value) {
         };
     if (typeof value === 'boolean')
         return { kind: 'boolean', value };
+    return { kind: 'number', value };
+}
+function jsonRead(value) {
+    if (value === undefined)
+        return undefined;
     if (scalar(value))
-        return { kind: 'number', value };
-    if (Array.isArray(value))
-        return { kind: 'list', value: value.filter(scalar) };
-    return { kind: 'present' };
+        return single(jsonHeld(value));
+    if (!Array.isArray(value))
+        return single({ kind: 'prose' });
+    return { present: true, values: [], items: value.filter(scalar).map(jsonHeld), loose: true };
 }
 function readItem(item, path) {
     if (path.startsWith('/json/')) {
         if (item.json === null)
-            return { kind: 'unreadable' };
-        return jsonHeld(pointed(item.json.value, path.slice('/json'.length)));
+            return UNREAD;
+        return jsonRead(pointed(item.json.value, path.slice('/json'.length)));
     }
     if (path.startsWith('/headers/')) {
         const name = path.slice('/headers/'.length);
         return Object.hasOwn(item.headers, name)
-            ? { kind: 'string', value: item.headers[name] }
+            ? single({ kind: 'string', value: item.headers[name] })
             : undefined;
     }
     if (path === '/has_attachment')
-        return { kind: 'boolean', value: item.has_attachment };
+        return single({ kind: 'boolean', value: item.has_attachment });
     const value = path === '/delivery'
         ? item.delivery
         : path === '/source'
@@ -227,13 +301,13 @@ function readItem(item, path) {
                     : path === '/author'
                         ? item.author
                         : null;
-    return value === null ? undefined : { kind: 'string', value };
+    return value === null ? undefined : single({ kind: 'string', value });
 }
 function wanted(value, owner) {
     return isRecord(value) && value.owner === true ? owner : value;
 }
 function equal(held, value, owner) {
-    if (held.kind === 'present' || Array.isArray(held.value))
+    if (!('value' in held))
         return undefined;
     const expected = wanted(value, owner);
     if (typeof expected !== typeof held.value)
@@ -248,7 +322,7 @@ function sign(left, right) {
     return left < right ? -1 : left > right ? 1 : 0;
 }
 function ordered(held, value, compare) {
-    if (held.kind === 'present' || Array.isArray(held.value))
+    if (!('value' in held))
         return undefined;
     if (held.kind === 'number') {
         if (typeof value !== 'number' || typeof held.value !== 'number')
@@ -278,29 +352,13 @@ function allOf(truths) {
         return false;
     return truths.some((truth) => truth === undefined) ? undefined : true;
 }
-function leaf(test, held, owner) {
-    if (held?.kind === 'unreadable')
-        return undefined;
-    if ('exists' in test)
-        return (held !== undefined) === test.exists;
-    if (held === undefined)
-        return undefined;
+function compared(test, held, owner) {
     if ('eq' in test)
         return equal(held, test.eq, owner);
     if ('in' in test)
         return anyOf(test.in.map((value) => equal(held, value, owner)));
-    if ('contains' in test) {
-        if (held.kind === 'present' || !Array.isArray(held.value))
-            return undefined;
-        const expected = wanted(test.contains, owner);
-        if (held.value.some((item) => item === expected))
-            return true;
-        if (held.kind === 'list')
-            return false;
-        return held.value.every((item) => typeof item === typeof expected) ? false : undefined;
-    }
     if ('prefix' in test) {
-        if (held.kind === 'present' || typeof held.value !== 'string')
+        if (!('value' in held) || typeof held.value !== 'string')
             return undefined;
         if (held.kind === 'number' || held.kind === 'reference' || held.kind === 'member')
             return undefined;
@@ -314,6 +372,23 @@ function leaf(test, held, owner) {
         return ordered(held, test.lt, (sign) => sign < 0);
     return ordered(held, test.lte, (sign) => sign <= 0);
 }
+function leaf(test, read, owner) {
+    if ('exists' in test) {
+        const present = read === undefined ? false : read.present;
+        return present === undefined ? undefined : present === test.exists;
+    }
+    if (read === undefined)
+        return undefined;
+    if ('contains' in test) {
+        if (read.items === null)
+            return undefined;
+        const truths = read.items.map((item) => item === undefined ? undefined : equal(item, test.contains, owner));
+        return read.loose === true && !truths.includes(true) ? false : anyOf(truths);
+    }
+    if (read.values.length === 0)
+        return read === NO_ITEM ? false : undefined;
+    return anyOf(read.values.map((value) => (value === undefined ? undefined : compared(test, value, owner))));
+}
 function evaluated(test, read, owner) {
     if ('all' in test)
         return allOf(test.all.map((part) => evaluated(part, read, owner)));
@@ -342,24 +417,46 @@ function matched(condition, test, document, owner) {
         return false;
     return test === undefined || holds(test, document, owner) === true;
 }
-function sameFact(left, right) {
-    return JSON.stringify(left) === JSON.stringify(right);
+function reachedAt(document, field) {
+    if (document === null)
+        return [];
+    if (field.startsWith('/sections/'))
+        return document.sections.includes(field.slice('/sections/'.length))
+            ? [{ pointer: field, fact: PROSE }]
+            : [];
+    if (!field.startsWith('/fields/'))
+        return [];
+    return walked(rootOf(document, '/fields'), field.slice('/fields'.length)).reached;
+}
+function valueOf(fact) {
+    if (fact.kind === 'list')
+        return { kind: fact.kind, items: fact.items.map(valueOf) };
+    if (fact.kind === 'object')
+        return {
+            kind: fact.kind,
+            fields: Object.keys(fact.fields)
+                .sort()
+                .map((key) => [key, valueOf(fact.fields[key])]),
+        };
+    return 'value' in fact ? { kind: fact.kind, value: fact.value } : fact;
+}
+function signature(reached) {
+    return JSON.stringify(reached.map(({ fact }) => valueOf(fact)));
 }
 function among(values, document, field, owner) {
     return holds({ path: field, in: values }, document, owner) === true;
 }
 function fieldChanged(condition, event, owner) {
     const { field, from, to } = condition;
-    if (from === undefined && to === undefined && event.changed.includes(field))
+    const before = reachedAt(event.before, field);
+    const after = reachedAt(event.after, field);
+    const pointers = [field, ...[...before, ...after].map(({ pointer }) => pointer)];
+    const prose = event.changed.some((changed) => pointers.some((pointer) => changed === pointer || changed.startsWith(`${pointer}/`)));
+    if (from === undefined && to === undefined && prose)
         return true;
-    if (!field.startsWith('/fields/'))
-        return false;
-    const name = field.slice('/fields/'.length);
-    const before = event.before?.fields[name];
-    const after = event.after?.fields[name];
-    if (before === undefined && after === undefined)
+    if (before.length === 0 && after.length === 0)
         return false;
-    if (event.before !== null && event.after !== null && sameFact(before, after))
+    if (event.before !== null && event.after !== null && signature(before) === signature(after))
         return false;
     if (from === 'new'
         ? event.before !== null

package/dist/definition.d.ts

@@ -6,6 +6,7 @@ export type ValueFacts = {
     readonly values?: readonly unknown[];
     readonly reference?: readonly string[];
     readonly prose: boolean;
+    readonly conditional?: true;
     readonly prefix?: readonly ValueFacts[];
     readonly items?: ValueFacts;
     readonly properties?: Readonly<Record<string, ValueFacts>>;
@@ -53,5 +54,13 @@ export declare function refTarget(reference: string, defs: Readonly<Record<strin
 export declare function valueFacts(node: unknown, defs: Readonly<Record<string, unknown>>): ValueFacts;
 export declare function itemFacts(facts: ValueFacts, index: number): ValueFacts | undefined;
 export declare function memberFacts(facts: ValueFacts, key: string): ValueFacts | undefined;
+export type PointerFacts = {
+    readonly facts: ValueFacts;
+    readonly through: boolean;
+    readonly conditional: boolean;
+};
+export declare function crossedFacts(facts: ValueFacts): ValueFacts[];
+export declare function fieldFacts(definition: Definition, key: string): ValueFacts | undefined;
+export declare function pointerFacts(definition: Definition, pointer: string): PointerFacts | undefined;
 export declare function readSchema(text: string): VerifiedModel | Failure;
 //# sourceMappingURL=definition.d.ts.map

package/dist/definition.d.ts.map

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

package/dist/definition.js

@@ -306,7 +306,8 @@ function propertiesOf(held, defs, ancestry) {
             variants[name] = Object.hasOwn(variants, name) ? joined(variants[name], facts) : facts;
         }
     }
-    Object.assign(properties, variants);
+    for (const [name, facts] of Object.entries(variants))
+        properties[name] = { ...facts, conditional: true };
     return Object.keys(properties).length === 0 ? undefined : properties;
 }
 function factsOf(nodes, defs, ancestry) {
@@ -369,6 +370,54 @@ export function memberFacts(facts, key) {
     const pattern = facts.patterns?.find((one) => new RegExp(one.pattern, 'u').test(key));
     return pattern === undefined ? facts.additional : pattern.facts;
 }
+export function crossedFacts(facts) {
+    if (facts.type !== 'array')
+        return [facts];
+    return [...(facts.prefix ?? []), ...(facts.items === undefined ? [] : [facts.items])].flatMap(crossedFacts);
+}
+export function fieldFacts(definition, key) {
+    if (Object.hasOwn(definition.fields, key))
+        return definition.fields[key];
+    if (Object.hasOwn(HOUSE_KEYS, key))
+        return undefined;
+    return memberFacts(definition.frontmatter, key);
+}
+function stepped({ facts, through, conditional }, token) {
+    if (facts.type === 'array' && ARRAY_INDEX.test(token)) {
+        const item = itemFacts(facts, Number(token));
+        return item === undefined ? [] : [{ facts: item, through, conditional }];
+    }
+    return crossedFacts(facts).flatMap((crossed) => {
+        const member = memberFacts(crossed, token);
+        return member === undefined
+            ? []
+            : [
+                {
+                    facts: member,
+                    through: through || facts.type === 'array',
+                    conditional: conditional || member.conditional === true,
+                },
+            ];
+    });
+}
+export function pointerFacts(definition, pointer) {
+    const [field, ...rest] = pointerSegments(pointer);
+    const declared = field === undefined ? undefined : fieldFacts(definition, field);
+    if (declared === undefined)
+        return undefined;
+    let reached = [
+        { facts: declared, through: false, conditional: declared.conditional === true },
+    ];
+    for (const token of rest)
+        reached = reached.flatMap((held) => stepped(held, token));
+    if (reached.length === 0)
+        return undefined;
+    return reached.reduce((kept, held) => ({
+        facts: joined(kept.facts, held.facts),
+        through: kept.through || held.through,
+        conditional: kept.conditional || held.conditional,
+    }));
+}
 function reachedDefs(value, defs, reached) {
     if (Array.isArray(value)) {
         for (const item of value)

package/dist/document.d.ts

@@ -1,16 +1,12 @@
 import { type Definition } from './definition.js';
-import type { ApplyResult, Change, Document, Link, ParseResult, Refusal } from './types.js';
+import type { ApplyResult, BodyResult, Change, Document, Link, ParseResult } from './types.js';
 import { type YamlMap } from './yaml.js';
 export declare function parse(content: string, file?: string): ParseResult;
 export declare function relativize(document: Document, file: string, handle: string, definition?: Definition): ApplyResult;
-export declare function relativizeBody(body: string, file: string, handle: string): {
-    readonly outcome: 'applied';
-    readonly body: string;
-} | {
-    readonly outcome: 'refuse';
-    readonly refusal: Refusal;
-};
+export declare function relativizeBody(body: string, file: string, handle: string): BodyResult;
+export declare function relinkBody(body: string, file: string, moves: ReadonlyMap<string, string>): BodyResult;
 export declare function links(document: Document, file: string): readonly Link[];
+export declare function bodyLinks(body: string, file: string): readonly Link[];
 export declare function apply(document: Document, change: Change): ApplyResult;
 export declare function serialize(document: Document): string;
 export declare function frontmatter(document: Document): YamlMap | null;

package/dist/document.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAMhF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5F,OAAO,EAYL,KAAK,OAAO,EAEb,MAAM,WAAW,CAAC;AAwCnB,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,WAAW,CAkD7D;AA2KD,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,GACtB,WAAW,CAYb;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAEZ;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACtD;IAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAO5D;AAED,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAWvE;AAED,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAerE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAEpD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAE9D"}
+{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAMhF,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,WAAW,EAEZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAaL,KAAK,OAAO,EAEb,MAAM,WAAW,CAAC;AAwCnB,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,WAAW,CAkD7D;AA8KD,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,GACtB,WAAW,CAYb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAOrF;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,UAAU,CAeZ;AAeD,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAEvE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAErE;AAED,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAOrE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAEpD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAE9D"}

package/dist/document.js

@@ -4,7 +4,7 @@ import { relative, retarget, SHELL_ROOMS, shellTarget, target } from './paths.js
 import { references } from './references.js';
 import { headingSpans, sectionsRecord } from './sections.js';
 import { refusal } from './refuse.js';
-import { bodyStartAfterYaml, bodyStartOf, equalValue, extractFrontmatter, jsValue, lineEnding, mapEntry, parseYamlMapping, serializeJs, serializeKey, YamlError, } from './yaml.js';
+import { bodyStartAfterYaml, bodyStartOf, equalValue, extractFrontmatter, frontmatterValue, jsValue, lineEnding, mapEntry, parseYamlMapping, serializeJs, serializeKey, YamlError, } from './yaml.js';
 const internals = new WeakMap();
 function refuse(file, rule, location) {
     return location === undefined ? refusal(file, rule) : refusal(file, rule, { location });
@@ -78,6 +78,9 @@ function applyField(document, name, value, prior) {
     if (!equalValue(document.fields[name], prior)) {
         return { outcome: 'stale', document };
     }
+    if (!frontmatterValue(value)) {
+        return { outcome: 'refuse', refusal: refuse('', 'frontmatter-fence', name) };
+    }
     let nextContent;
     const existing = mapEntry(internal.root, name);
     if (existing !== undefined) {
@@ -253,10 +256,27 @@ export function relativizeBody(body, file, handle) {
         return { outcome: 'refuse', refusal: refuse(file, 'unresolved-link', elsewhere.href) };
     return { outcome: 'applied', body: relinkedBody };
 }
-export function links(document, file) {
+export function relinkBody(body, file, moves) {
+    let rewritten = '';
+    let cursor = 0;
+    for (const match of hrefOccurrences(body)) {
+        const from = target(file, match.href);
+        const to = from === null ? undefined : moves.get(from);
+        if (to === undefined)
+            continue;
+        const written = retarget(match.href, relative(file, to));
+        const text = destinationText(written, match.bracketed);
+        if (text === null)
+            return { outcome: 'refuse', refusal: refuse(file, 'unwritable-link', written) };
+        rewritten += body.slice(cursor, match.start) + text;
+        cursor = match.end;
+    }
+    return { outcome: 'applied', body: rewritten + body.slice(cursor) };
+}
+function linksIn(text, file) {
     const found = [];
     const seen = new Set();
-    for (const occurrence of hrefOccurrences(document.content.slice(bodyStartOf(document.content)))) {
+    for (const occurrence of hrefOccurrences(text)) {
         if (seen.has(occurrence.href))
             continue;
         const resolved = target(file, occurrence.href);
@@ -267,6 +287,12 @@ export function links(document, file) {
     }
     return found;
 }
+export function links(document, file) {
+    return linksIn(document.content.slice(bodyStartOf(document.content)), file);
+}
+export function bodyLinks(body, file) {
+    return linksIn(body, file);
+}
 export function apply(document, change) {
     if (change.kind === 'link')
         return applyLink(document, change.href, change.to);
@@ -274,17 +300,9 @@ export function apply(document, change) {
         return applyReference(document, change.pointer, change.value, change.prior);
     if (change.kind === 'preamble')
         return applyPreamble(document, change.value, change.prior);
-    try {
-        if (change.kind === 'field')
-            return applyField(document, change.name, change.value, change.prior);
-        return applySection(document, change.name, change.value, change.prior);
-    }
-    catch (error) {
-        if (error instanceof YamlError) {
-            return { outcome: 'refuse', refusal: refuse('', 'frontmatter-fence', change.name) };
-        }
-        throw error;
-    }
+    if (change.kind === 'field')
+        return applyField(document, change.name, change.value, change.prior);
+    return applySection(document, change.name, change.value, change.prior);
 }
 export function serialize(document) {
     return document.content;