@agentshouse/mdruntime 0.1.0-ce131cb435f8b → 0.1.0-ce41fec66d91b

package/dist/room-draft.js

@@ -1,6 +1,6 @@
-import { apply, equalValue, frontmatterValue, parse, serialize } from '@agentshouse/mdmodel';
+import { apply, equalValue, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
 import { runtimeError } from './failure.js';
-import { hexDigest } from './file.js';
+import { sha256 } from './digest.js';
 import { binaryLocalId } from './identity.js';
 import { normalize } from './paths.js';
 export function returnedBy(kind) {
@@ -90,7 +90,12 @@ export function readParts(value) {
         if (!plain(value.move))
             malformed();
         const base = markdownBase(value.move.base);
-        parts.move = { to: text(value.move.to), ...(base === undefined ? {} : { base }) };
+        const room = optionalText(value.move.room);
+        parts.move = {
+            to: text(value.move.to),
+            ...(room === undefined ? {} : { room }),
+            ...(base === undefined ? {} : { base }),
+        };
     }
     if (value.removal !== undefined) {
         if (!plain(value.removal))
@@ -103,7 +108,8 @@ export function readParts(value) {
             malformed();
         if (Object.keys(value).length > 1)
             throw runtimeError('room-draft-file-exclusive');
-        parts.file = { blob: value.file.blob };
+        const base = markdownBase(value.file.base);
+        parts.file = base === undefined ? { blob: value.file.blob } : { blob: value.file.blob, base };
     }
     return parts;
 }
@@ -120,11 +126,51 @@ 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);
 }
+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');
@@ -144,9 +190,7 @@ export function held(current, parts, file) {
         }
         return {
             file: current.file,
-            ...(parts.move === undefined
-                ? {}
-                : { move: { to: parts.move.to, base: kept(current.move, parts.move.base) } }),
+            ...(parts.move === undefined ? {} : { move: movePart(current.move, parts.move) }),
             ...(parts.removal === undefined
                 ? {}
                 : { removal: { base: kept(current.removal, parts.removal.base) } }),
@@ -181,9 +225,8 @@ export function held(current, parts, file) {
     }
     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) };
     }
@@ -240,29 +283,32 @@ export function underneath(parts, path, visible) {
 }
 const UNTYPED_MEDIA_TYPE = 'application/octet-stream';
 export async function heldFile(blob, base) {
-    const bytes = await blob.arrayBuffer();
     return {
-        blob,
         localId: binaryLocalId(),
-        byteLength: bytes.byteLength,
+        ...(blob instanceof File ? { name: blob.name } : {}),
+        byteLength: blob.size,
         mediaType: blob.type === '' ? UNTYPED_MEDIA_TYPE : blob.type,
-        sha256: hexDigest(await crypto.subtle.digest('SHA-256', bytes)),
+        sha256: await sha256(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) {
@@ -279,14 +325,13 @@ 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);
+    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();
 }
 export function partsAfter(markdown, parts) {
     const fields = named(parts.fields);
@@ -340,6 +385,35 @@ 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) }));
+    if (read.some(({ path }, at) => path === '' ||
+        normalize(path) !== path ||
+        read.findIndex((one) => one.path === path) !== at)) {
+        throw runtimeError('room-draft-malformed');
+    }
+    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 = [];
@@ -370,12 +444,12 @@ export function changesOf(path, parts) {
         changes.push({ kind: 'replace', path, content: parts.markdown.value });
     }
     if (parts.file !== undefined && parts.removal === undefined) {
-        const { base, ...file } = parts.file;
+        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 && at !== path)
+        if (base === null)
             bases.push({ kind: 'absent', path: at });
         return { changes, bases };
     }

package/dist/rows.d.ts

@@ -1,39 +1,46 @@
-import { type Frontmatter } from '@agentshouse/mdmodel';
-import type { HeadChange } from './adapter.js';
-import type { BinaryFileRecord } from './binary.js';
 import { type Composition } from './collection.js';
-type Fields = Readonly<Record<string, unknown>>;
-export type DocumentRow = {
-    key: string;
-    kind: 'document';
-    room: string;
-    path: string;
-    type: string | null;
-    fields: Fields;
-    values: Fields;
-    reached: Readonly<Record<string, readonly unknown[]>>;
-    directories: readonly string[];
-    folder: string;
-    text: string | null;
-    change: HeadChange | null;
-    fileId: string | null;
-    binary: BinaryFileRecord | null;
+export type ValueKind = 'string' | 'number' | 'boolean' | 'null' | 'array' | 'object' | 'undefined';
+type HeldValue = {
+    readonly keys: string;
+    readonly places: string;
+    readonly item: number;
+    readonly kind: ValueKind;
+    readonly value: string | number | null;
+    readonly size: number | null;
 };
-export type ReferenceRow = {
-    key: string;
-    kind: 'reference';
-    room: string;
-    source: string;
-    target: string;
-    field: string;
-    forms: readonly string[];
-    path: string;
-    type: string;
+type LinkKind = 'field' | 'section' | 'body';
+type HeldLink = {
+    readonly kind: LinkKind;
+    readonly keys: string;
+    readonly places: string;
+    readonly target: string;
+    readonly field: string;
+};
+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[];
 };
-export type Row = DocumentRow | ReferenceRow;
 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 rowsOf(room: string, path: string, document: Frontmatter | null, composition: Composition, change: HeadChange | null, fileId: string | null, binary: BinaryFileRecord | null): readonly Row[];
+export declare function folderOf(path: string): string;
+export type Reach = 'exact' | 'value' | 'link';
+export type Placed = {
+    readonly keys: string;
+    readonly places: string;
+    readonly glob: boolean;
+};
+export declare function placedOf(pointer: string, reach: Reach): Placed;
+export declare function kindOf(value: unknown): ValueKind;
+export declare function described(path: string, content: string | null): Described;
+export declare function derived(path: string, content: string | 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":"AAAA,OAAO,EAKL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9D,KAAK,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC,CAAC;IACtD,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG,WAAW,GAAG,YAAY,CAAC;AAM7C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAuFD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,WAAW,GAAG,IAAI,EAC5B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAC9B,SAAS,GAAG,EAAE,CAmEhB"}
+{"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,MAAM,EAAE,MAAM,CAAC;IACxB,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;CAC9B,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,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;AAWD,MAAM,MAAM,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,MAAM,MAAM,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhG,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAuB9D;AAwBD,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAMhD;AAiJD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAEzE;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAO/F"}

package/dist/rows.js

@@ -1,4 +1,4 @@
-import { ARRAY_INDEX, escapePointer, references, target, } from '@agentshouse/mdmodel';
+import { ARRAY_INDEX, bodyAfterFrontmatter, bodyLinks, escapePointer, parseFrontmatter, references, sectionReferences, target, } from '@agentshouse/mdmodel';
 import { governing } from './collection.js';
 import { definitionOf } from './model.js';
 function keyOf(...parts) {
@@ -10,6 +10,50 @@ export function documentKey(room, path) {
 export function roomOfKey(key) {
     return key.split('\u0000')[1];
 }
+export function pathOfKey(key) {
+    return key.split('\u0000')[2];
+}
+export function markdownPath(path) {
+    return path.endsWith('.md');
+}
+export function folderOf(path) {
+    return path.slice(0, Math.max(path.lastIndexOf('/'), 0));
+}
+export function placedOf(pointer, reach) {
+    const [first = '', ...rest] = pointer.split('/').slice(1);
+    const keys = [first];
+    const gaps = [[]];
+    for (const segment of rest) {
+        if (ARRAY_INDEX.test(segment)) {
+            gaps.at(-1).push(segment);
+            continue;
+        }
+        keys.push(segment);
+        gaps.push([]);
+    }
+    const places = gaps
+        .map((gap, at) => {
+        const open = at < gaps.length - 1 ? reach !== 'exact' : reach === 'link';
+        return `/${gap.map((number) => `[.:]${number}`).join('')}.${open ? '*' : ''}`;
+    })
+        .join('');
+    return {
+        keys: keys.map((key) => `/${key}`).join(''),
+        places,
+        glob: /[[*]/u.test(places),
+    };
+}
+function placesOf({ done, head, tail }) {
+    return `${done}/${head}${tail}.`;
+}
+function throughOf(keys, places) {
+    const gaps = places.split('/').slice(1);
+    return keys
+        .split('/')
+        .slice(1)
+        .map((key, at) => `/${key}${gaps[at].replace(/\.\d*/gu, '').replaceAll(':', '/')}`)
+        .join('');
+}
 function plainObject(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -18,125 +62,153 @@ function compared(reading, exact, value) {
         return value;
     return (typeof value === 'string' ? target(reading.path, value) : null) ?? undefined;
 }
-function record(reading, node, forms, exact) {
-    const value = Array.isArray(node)
-        ? node.map((item, index) => compared(reading, `${exact}/${index}`, item))
-        : compared(reading, exact, node);
-    for (const form of forms) {
-        if (form.pending)
-            continue;
-        (reading.reached[form.text] ??= []).push(value);
-        if (!form.through && value !== undefined && !plainObject(value)) {
-            reading.values[form.text] = value;
-        }
-    }
-    if (Array.isArray(node) || plainObject(node) || !reading.references.has(exact))
+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, keys, places, value) {
+    reading.values.push({
+        keys,
+        places,
+        item: -1,
+        kind: kindOf(value),
+        value: scalarOf(value),
+        size: Array.isArray(value) ? value.length : null,
+    });
+    if (!Array.isArray(value))
         return;
-    const found = compared(reading, exact, node);
-    if (typeof found !== 'string')
+    value.forEach((item, index) => {
+        const itemKind = kindOf(item);
+        reading.values.push({
+            keys,
+            places,
+            item: index,
+            kind: itemKind,
+            value: itemKind === 'array' ? null : scalarOf(item),
+            size: null,
+        });
+    });
+}
+function record(reading, node, at) {
+    const value = Array.isArray(node)
+        ? node.map((item, index) => compared(reading, `${at.exact}/${index}`, item))
+        : compared(reading, at.exact, node);
+    const places = placesOf(at);
+    held(reading, at.keys, places, value);
+    if (typeof value !== 'string' || !reading.references.has(at.exact))
         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);
+    reading.links.push({
+        kind: 'field',
+        keys: at.keys,
+        places,
+        target: value,
+        field: throughOf(at.keys, places),
+    });
+}
+function walk(reading, node, at) {
+    record(reading, node, at);
     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}`));
+        node.forEach((item, index) => walk(reading, item, { ...at, tail: `${at.tail}.${index}`, exact: `${at.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}`);
+        const exact = `${at.exact}/${segment}`;
+        walk(reading, value, ARRAY_INDEX.test(segment)
+            ? { ...at, head: `${at.head}${at.tail.replaceAll('.', ':')}:${segment}`, tail: '', exact }
+            : { keys: `${at.keys}/${segment}`, done: placesOf(at), head: '', tail: '', exact });
     }
 }
-function folderOf(path) {
-    return path.slice(0, Math.max(path.lastIndexOf('/'), 0));
-}
-function directoriesOf(path) {
-    const parts = path.split('/').slice(0, -1);
-    return ['', ...parts.map((_, index) => parts.slice(0, index + 1).join('/'))];
-}
-export function markdownPath(path) {
-    return path.endsWith('.md');
-}
-export function rowsOf(room, path, document, composition, change, fileId, binary) {
-    const key = documentKey(room, path);
-    if (document === null || !markdownPath(path)) {
-        return [
-            {
-                key,
-                kind: 'document',
-                room,
-                path,
-                type: null,
-                fields: {},
-                values: {},
-                reached: {},
-                directories: directoriesOf(path),
-                folder: folderOf(path),
-                text: null,
-                change,
-                fileId,
-                binary,
-            },
-        ];
+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', keys: '', places: '', target: reached, field: '' });
     }
-    const type = document.type ?? 'any';
+    return found;
+}
+function typedRows(path, content, document, composition) {
     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: {},
-        targets: new Map(),
+        values: [],
+        links: [],
     };
     for (const [name, value] of Object.entries(document.fields)) {
         const segment = escapePointer(name);
-        walk(reading, value, [{ text: `/${segment}`, through: false, pending: false }], `/${segment}`);
+        walk(reading, value, {
+            keys: `/${segment}`,
+            done: '',
+            head: '',
+            tail: '',
+            exact: `/${segment}`,
+        });
+    }
+    const links = reading.links;
+    if (definition !== undefined) {
+        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', keys: '', places: '', target: reached, field: '' });
+        }
+    }
+    return { values: reading.values, links: [...links, ...bodyTargets(path, content)] };
+}
+function read(path, content) {
+    const folder = folderOf(path);
+    const unread = { fields: null, folder, type: null };
+    if (content === null) {
+        return { described: { ...unread, declared: null, queried: true }, document: null };
     }
-    const { values, reached } = reading;
-    return [
-        {
-            key,
-            kind: 'document',
-            room,
-            path,
-            type,
-            fields: document.fields,
-            values,
-            reached,
-            directories: directoriesOf(path),
-            folder: folderOf(path),
-            text: document.content,
-            change,
-            fileId,
-            binary,
+    const parsed = parseFrontmatter(content, path);
+    const declared = parsed.ok ? (parsed.frontmatter.type ?? 'any') : null;
+    if (!markdownPath(path) || !parsed.ok) {
+        return { described: { ...unread, declared, queried: !markdownPath(path) }, document: null };
+    }
+    const document = parsed.frontmatter;
+    return {
+        described: {
+            type: document.type ?? 'any',
+            declared,
+            queried: true,
+            folder,
+            fields: JSON.stringify(document.fields),
         },
-        ...[...reading.targets.values()].map(({ field, target: found, forms }) => ({
-            key: keyOf('r', room, path, field, found),
-            kind: 'reference',
-            room,
-            source: key,
-            target: documentKey(room, found),
-            field,
-            forms: [...forms].sort(),
-            path,
-            type,
-        })),
-    ];
+        document,
+    };
+}
+export function described(path, content) {
+    return read(path, content).described;
+}
+export function derived(path, content, composition) {
+    const { described: columns, document } = read(path, content);
+    if (document !== null) {
+        return { ...columns, ...typedRows(path, content, document, composition) };
+    }
+    const links = content === null || markdownPath(path) ? [] : bodyTargets(path, content);
+    return { ...columns, values: [], links };
 }