@agentshouse/mdruntime 0.1.0-cee9c8aa4cd86 → 0.1.0-cef5833f6c689

package/dist/room-draft.js

@@ -9,52 +9,60 @@ export function returnedBy(kind) {
 export function staleWrite(current) {
     return { outcome: 'stale', code: 'stale', retryable: false, 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 frontmatter(item, at) {
+    return frontmatterValue(item) ? item : malformed(at, 'a frontmatter value');
+}
+function fieldValue(value, at) {
     if (value === null)
         return null;
     if (!plain(value) || !Object.hasOwn(value, 'value') || !frontmatterValue(value.value)) {
-        malformed();
+        malformed(at, '{ value } with a frontmatter 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`, frontmatter),
+        sections: entries(value.sections, `${at}.sections`, text),
+    };
 }
-const PART_NAMES = new Set([
+const PART_NAMES = [
     'fields',
     'sections',
     'preamble',
@@ -63,52 +71,57 @@ const PART_NAMES = new Set([
     'move',
     'removal',
     'file',
-]);
-export function readParts(value) {
-    if (!plain(value) || Object.keys(value).some((name) => !PART_NAMES.has(name)))
-        malformed();
+];
+const NAMED_PARTS = `a part named ${PART_NAMES.slice(0, -1).join(', ')} or ${PART_NAMES.at(-1)}`;
+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) => {
+        parts.fields = entries(value.fields, `${path} fields`, (item, at) => {
             if (!plain(item) || !Object.hasOwn(item, 'value') || !frontmatterValue(item.value)) {
-                malformed();
+                malformed(at, '{ value, base } with a frontmatter 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);
-        const room = optionalText(value.move.room);
+            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),
+            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();
+            malformed(`${path} file`, '{ blob, base } with a Blob');
         if (Object.keys(value).length > 1)
             throw runtimeError('room-draft-file-exclusive');
-        parts.file = { blob: value.file.blob };
+        const base = markdownBase(value.file.base, `${path} file.base`);
+        parts.file = base === undefined ? { blob: value.file.blob } : { blob: value.file.blob, base };
     }
     return parts;
 }
@@ -137,6 +150,39 @@ function editsText(parts) {
         named(parts.fields).length > 0 ||
         named(parts.sections).length > 0);
 }
+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');
@@ -259,18 +305,22 @@ export async function heldFile(blob, base) {
     };
 }
 export function binaryBase(visible, path) {
-    return visible?.binaries[path] === undefined ? null : (visible.revisions[path] ?? null);
+    const binary = visible?.binaries[path];
+    if (binary === undefined)
+        return null;
+    return visible?.revisions[path] ?? (binary.state === 'pending' ? binary.localId : null);
 }
-export function changedParts(path, report) {
+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 ? [] : [{ path, part: 'file' }]),
+        ...(report.file === undefined || made ? [] : [{ path, part: 'file' }]),
     ];
 }
 function joined(existing, returned) {
@@ -280,7 +330,7 @@ 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) {
@@ -304,7 +354,7 @@ export function partsAfter(markdown, parts) {
     ];
     if (pieces.length === 0)
         return markdown;
-    return `${ended(markdown)}\n${pieces.map(ended).join('')}`;
+    return `${lineEnded(markdown)}\n${pieces.map(lineEnded).join('')}`;
 }
 export function returnedInto(existing, returned) {
     if (existing === undefined)
@@ -347,6 +397,36 @@ 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 = [];
@@ -366,11 +446,11 @@ 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) {
@@ -382,7 +462,7 @@ export function changesOf(path, parts) {
         if (base !== null && at !== path)
             changes.push({ kind: 'move', path, to: at });
         changes.push({ kind: 'binary', path: at, ...file });
-        if (base === null && at !== path)
+        if (base === null)
             bases.push({ kind: 'absent', path: at });
         return { changes, bases };
     }

package/dist/rows.d.ts

@@ -1,27 +1,21 @@
+import { type HeldValue, type Outline } from '@agentshouse/mdmodel';
 import { type Composition } from './collection.js';
-export type ValueKind = 'string' | 'number' | 'boolean' | 'null' | 'array' | 'object' | 'undefined';
-type HeldValue = {
-    readonly form: string;
-    readonly held: number;
-    readonly item: number;
-    readonly kind: ValueKind;
-    readonly value: string | number | null;
-    readonly size: number | null;
-    readonly single: boolean;
-};
 type LinkKind = 'field' | 'section' | 'body';
 type HeldLink = {
     readonly kind: LinkKind;
-    readonly form: string;
+    readonly keys: string;
+    readonly places: string;
     readonly target: string;
     readonly field: string;
 };
-export type Derived = {
+export type Described = {
     readonly type: string | null;
     readonly declared: string | null;
     readonly queried: boolean;
     readonly folder: string;
     readonly fields: string | null;
+};
+export type Derived = Described & {
     readonly values: readonly HeldValue[];
     readonly links: readonly HeldLink[];
 };
@@ -29,9 +23,8 @@ export declare function documentKey(room: string, path: string): string;
 export declare function roomOfKey(key: string): string;
 export declare function pathOfKey(key: string): string;
 export declare function markdownPath(path: string): boolean;
-export declare function settingsTextPath(path: string): boolean;
 export declare function folderOf(path: string): string;
-export declare function kindOf(value: unknown): ValueKind;
-export declare function derived(path: string, content: string | null, composition: Composition): Derived;
+export declare function described(path: string, content: string | null, outlined: Outline | null): Described;
+export declare function derived(path: string, content: string | null, outlined: Outline | null, composition: Composition): Derived;
 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":"AAWA,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9D,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpG,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,KAAK,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAE7C,KAAK,QAAQ,GAAG;IACd,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;CACrC,CAAC;AAMF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C;AAqBD,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAMhD;AA2ID,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAmB/F"}
+{"version":3,"file":"rows.d.ts","sourceRoot":"","sources":["../src/rows.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,OAAO,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9D,KAAK,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAE7C,KAAK,QAAQ,GAAG;IACd,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG;IAChC,QAAQ,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;CACrC,CAAC;AAMF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C;AA4ED,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,QAAQ,EAAE,OAAO,GAAG,IAAI,GACvB,SAAS,CAEX;AAED,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,QAAQ,EAAE,OAAO,GAAG,IAAI,EACxB,WAAW,EAAE,WAAW,GACvB,OAAO,CAOT"}

package/dist/rows.js

@@ -1,4 +1,4 @@
-import { ARRAY_INDEX, bodyAfterFrontmatter, bodyLinks, escapePointer, parseFrontmatter, references, sectionReferences, target, } from '@agentshouse/mdmodel';
+import { indexed, outline, sectionReferences, } from '@agentshouse/mdmodel';
 import { governing } from './collection.js';
 import { definitionOf } from './model.js';
 function keyOf(...parts) {
@@ -16,171 +16,71 @@ export function pathOfKey(key) {
 export function markdownPath(path) {
     return path.endsWith('.md');
 }
-export function settingsTextPath(path) {
-    return /^settings\/.+\.ya?ml$/u.test(path);
-}
 export function folderOf(path) {
     return path.slice(0, Math.max(path.lastIndexOf('/'), 0));
 }
-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;
-}
-export function kindOf(value) {
-    if (value === undefined)
-        return 'undefined';
-    if (value === null)
-        return 'null';
-    if (Array.isArray(value))
-        return 'array';
-    if (typeof value === 'object')
-        return 'object';
-    return typeof value;
-}
-function scalarOf(value) {
-    if (typeof value === 'string' || typeof value === 'number')
-        return value;
-    if (typeof value === 'boolean')
-        return value ? 1 : 0;
-    if (Array.isArray(value))
-        return JSON.stringify(value);
-    return null;
-}
-function held(reading, form, value, single) {
-    const at = reading.reached.get(form) ?? 0;
-    reading.reached.set(form, at + 1);
-    const kind = kindOf(value);
-    reading.values.push({
-        form,
-        held: at,
-        item: -1,
-        kind,
-        value: scalarOf(value),
-        size: Array.isArray(value) ? value.length : null,
-        single,
-    });
-    if (!Array.isArray(value))
-        return;
-    value.forEach((item, index) => {
-        const itemKind = kindOf(item);
-        reading.values.push({
-            form,
-            held: at,
-            item: index,
-            kind: itemKind,
-            value: itemKind === 'array' ? null : scalarOf(item),
-            size: null,
-            single: false,
-        });
-    });
-}
-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;
-        held(reading, form.text, value, !form.through && value !== undefined && !plainObject(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 bodyOf(targets) {
+    return targets.map((target) => ({ kind: 'body', keys: '', places: '', target, field: '' }));
 }
-function bodyTargets(path, content) {
-    const seen = new Set();
-    const found = [];
-    for (const { target: reached } of bodyLinks(bodyAfterFrontmatter(content), path)) {
-        if (seen.has(reached))
-            continue;
-        seen.add(reached);
-        found.push({ kind: 'body', form: '', target: reached, field: '' });
-    }
-    return found;
-}
-function typedRows(path, content, document, composition) {
+function typedRows(path, content, document, composition, body) {
     const definition = definitionOf(governing(composition, path), document.type);
-    const reading = {
-        path,
-        references: new Set(definition === undefined ? [] : references(document, definition).map((one) => one.pointer)),
-        values: [],
-        reached: new Map(),
-        targets: new Map(),
-    };
-    for (const [name, value] of Object.entries(document.fields)) {
-        const segment = escapePointer(name);
-        walk(reading, value, [{ text: `/${segment}`, through: false, pending: false }], `/${segment}`);
-    }
-    const links = [];
-    for (const { field, target: reached, forms } of reading.targets.values()) {
-        for (const form of [...forms].sort()) {
-            links.push({ kind: 'field', form, target: reached, field });
-        }
-    }
-    if (definition !== undefined) {
+    const { values, links: fields } = indexed(path, document.fields, definition);
+    const links = [...fields];
+    if (definition !== undefined && content !== null) {
         const sectioned = new Set();
         for (const { target: reached } of sectionReferences(path, content, definition)) {
             if (reached === null || sectioned.has(reached))
                 continue;
             sectioned.add(reached);
-            links.push({ kind: 'section', form: '', target: reached, field: '' });
+            links.push({ kind: 'section', keys: '', places: '', target: reached, field: '' });
         }
     }
-    return { values: reading.values, links: [...links, ...bodyTargets(path, content)] };
+    return { values, links: [...links, ...body] };
 }
-export function derived(path, content, composition) {
+function readOf(path, declared, document) {
     const folder = folderOf(path);
-    const unread = { values: [], links: [], fields: null, folder, type: null };
-    if (content === null)
-        return { ...unread, declared: null, queried: true };
-    const read = parseFrontmatter(content, path);
-    const declared = read.ok ? (read.frontmatter.type ?? 'any') : null;
-    if (!markdownPath(path)) {
-        return { ...unread, declared, queried: true, links: bodyTargets(path, content) };
+    const unread = { fields: null, folder, type: null };
+    if (!markdownPath(path) || document === null) {
+        return { described: { ...unread, declared, queried: !markdownPath(path) }, document: null };
     }
-    if (!read.ok)
-        return { ...unread, declared, queried: false };
-    const document = read.frontmatter;
     return {
-        type: document.type ?? 'any',
-        declared,
-        queried: true,
-        folder,
-        fields: JSON.stringify(document.fields),
-        ...typedRows(path, content, document, composition),
+        described: {
+            type: document.type ?? 'any',
+            declared,
+            queried: true,
+            folder,
+            fields: JSON.stringify(document.fields),
+        },
+        document,
     };
 }
+function read(path, content, outlined) {
+    const held = content === null ? outlined : outline(content, path);
+    if (held === null) {
+        return {
+            described: {
+                fields: null,
+                folder: folderOf(path),
+                type: null,
+                declared: null,
+                queried: true,
+            },
+            document: null,
+            links: [],
+        };
+    }
+    const type = held.type === null || held.type === 'any' ? undefined : held.type;
+    const document = held.fields === null ? null : { type, fields: held.fields };
+    return { ...readOf(path, held.type, document), links: held.links };
+}
+export function described(path, content, outlined) {
+    return read(path, content, outlined).described;
+}
+export function derived(path, content, outlined, composition) {
+    const { described: columns, document, links } = read(path, content, outlined);
+    const body = bodyOf(links);
+    if (document !== null) {
+        return { ...columns, ...typedRows(path, content, document, composition, body) };
+    }
+    return { ...columns, values: [], links: markdownPath(path) ? [] : body };
+}

package/dist/save.d.ts

@@ -21,6 +21,7 @@ export type SaveInput = {
     providerOwnedPaths: readonly string[];
     providerLimits: readonly ProviderLimit[];
     visible: VisibleLayer;
+    folders: ReadonlySet<string>;
     handle: string;
     changes: readonly Change[];
     bases: readonly Precondition[];
@@ -75,6 +76,7 @@ export type MoveSide = {
     operations: OperationScopes;
     providerOwnedPaths: readonly string[];
     visible: VisibleLayer;
+    folders: ReadonlySet<string>;
     queued: ReadonlySet<string>;
     unmodeled: boolean;
     validate: Validator;

package/dist/save.d.ts.map

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