@agentshouse/mdruntime 0.1.0-cefbc8bb8a1c0 → 0.1.0-cf1e7fdb9c600

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,56 @@ 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');
-        const base = markdownBase(value.file.base);
+        const base = markdownBase(value.file.base, `${path} file.base`);
         parts.file = base === undefined ? { blob: value.file.blob } : { blob: value.file.blob, base };
     }
     return parts;
@@ -318,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) {
@@ -342,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)
@@ -386,12 +398,13 @@ export function moveTarget(move) {
     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');
-    }
+    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) {
@@ -433,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) {

package/dist/rows.d.ts

@@ -1,13 +1,5 @@
+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 keys: string;
-    readonly places: string;
-    readonly item: number;
-    readonly kind: ValueKind;
-    readonly value: string | number | null;
-    readonly size: number | null;
-};
 type LinkKind = 'field' | 'section' | 'body';
 type HeldLink = {
     readonly kind: LinkKind;
@@ -32,15 +24,7 @@ export declare function roomOfKey(key: string): string;
 export declare function pathOfKey(key: string): string;
 export declare function markdownPath(path: string): boolean;
 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 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,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"}
+{"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) {
@@ -19,155 +19,14 @@ export function markdownPath(path) {
 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);
-}
-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, 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;
-    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 bodyOf(targets) {
+    return targets.map((target) => ({ kind: 'body', keys: '', places: '', target, field: '' }));
 }
-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;
-    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, { ...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);
-        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 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: '' });
-    }
-    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: [],
-        links: [],
-    };
-    for (const [name, value] of Object.entries(document.fields)) {
-        const segment = escapePointer(name);
-        walk(reading, value, {
-            keys: `/${segment}`,
-            done: '',
-            head: '',
-            tail: '',
-            exact: `/${segment}`,
-        });
-    }
-    const links = reading.links;
-    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))
@@ -176,20 +35,14 @@ function typedRows(path, content, document, composition) {
             links.push({ kind: 'section', keys: '', places: '', target: reached, field: '' });
         }
     }
-    return { values: reading.values, links: [...links, ...bodyTargets(path, content)] };
+    return { values, links: [...links, ...body] };
 }
-function read(path, content) {
+function readOf(path, declared, document) {
     const folder = folderOf(path);
     const unread = { fields: null, folder, type: null };
-    if (content === null) {
-        return { described: { ...unread, declared: null, queried: true }, document: null };
-    }
-    const parsed = parseFrontmatter(content, path);
-    const declared = parsed.ok ? (parsed.frontmatter.type ?? 'any') : null;
-    if (!markdownPath(path) || !parsed.ok) {
+    if (!markdownPath(path) || document === null) {
         return { described: { ...unread, declared, queried: !markdownPath(path) }, document: null };
     }
-    const document = parsed.frontmatter;
     return {
         described: {
             type: document.type ?? 'any',
@@ -201,14 +54,33 @@ function read(path, content) {
         document,
     };
 }
-export function described(path, content) {
-    return read(path, content).described;
+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, composition) {
-    const { described: columns, document } = read(path, content);
+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) };
+        return { ...columns, ...typedRows(path, content, document, composition, body) };
     }
-    const links = content === null || markdownPath(path) ? [] : bodyTargets(path, content);
-    return { ...columns, values: [], links };
+    return { ...columns, values: [], links: markdownPath(path) ? [] : body };
 }

package/dist/search.d.ts

@@ -1,73 +1,22 @@
-import type { ProviderRefusal } from './adapter.js';
-import { type CoveredRoom, type Filter, type PendingRoom } from './query.js';
-import type { Open } from './open.js';
-export type DocumentPart = Open<'fields' | 'sections' | 'preamble' | 'path'>;
+import type { ProviderRefusal, SearchHit } from './adapter.js';
+import type { Failure, Offline } from './outcome.js';
 export type SearchRequest = {
     text: string;
-    documents?: Filter;
-    collection?: true;
-    conversations?: readonly string[];
-    limit?: number;
-    after?: string;
-    total?: true;
+    rooms?: readonly string[];
 };
-export type MessagePart = Open<'text'>;
-export type Snippet<Part extends string> = {
-    part: Part;
-    text: string;
-    at: readonly [number, number];
-};
-export type DocumentHit = {
-    room: string;
-    path: string;
-    type: string;
-    score: number;
-    matches: Readonly<Record<string, readonly DocumentPart[]>>;
-    snippet?: Snippet<DocumentPart>;
-};
-export type MessageHit = {
-    conversation: string;
-    identity: string;
-    score: number;
-    matches: Readonly<Record<string, readonly MessagePart[]>>;
-    snippet?: Snippet<MessagePart>;
-};
-export type SearchCoverage = {
-    rooms: readonly CoveredRoom[];
-    conversations: readonly string[];
-    overlay: readonly string[];
+export type { SearchHit } from './adapter.js';
+export type SearchFound = {
+    kind: 'found';
+    documents: readonly SearchHit[];
 };
-export type SearchHits = {
-    documents: readonly DocumentHit[];
-    messages: readonly MessageHit[];
-};
-export type SearchWindow = SearchHits & {
-    next?: string;
-    total?: {
-        documents: number;
-        messages: number;
-    };
-};
-export type SearchPending = SearchHits & {
-    pending: readonly PendingRoom[];
-    coverage: SearchCoverage;
-};
-export type SearchUndeclared = ProviderRefusal & {
+export type SearchResult = SearchFound | Offline | (ProviderRefusal & {
+    kind: 'rejected';
+}) | (ProviderRefusal & {
     kind: 'undeclared';
-};
-export type SearchResult = (SearchWindow & {
-    coverage: SearchCoverage;
-}) | SearchPending | SearchUndeclared;
-export declare function undeclaredSearch(): SearchUndeclared;
-export type HitCursor = readonly [number, string, string] | readonly [] | null;
+}) | Failure;
 export type SearchPlan = {
     text: string;
-    documents: unknown;
-    collection: boolean;
-    conversations: readonly string[] | null;
-    limit: number | null;
-    after: readonly [HitCursor, HitCursor] | null;
-    total: boolean;
+    rooms: readonly string[] | null;
 };
 export declare function searchPlanOf(input: unknown): SearchPlan;
 //# sourceMappingURL=search.d.ts.map

package/dist/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAExE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,SAAS,SAAS,EAAE,CAAA;CAAE,CAAC;AAE7E,MAAM,MAAM,YAAY,GACpB,WAAW,GACX,OAAO,GACP,CAAC,eAAe,GAAG;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,GACxC,CAAC,eAAe,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC,GAC1C,OAAO,CAAC;AAEZ,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAA;CAAE,CAAC;AAE3E,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAYvD"}

package/dist/search.js

@@ -1,57 +1,14 @@
-import { flag, invalid, known, limitOf, plain, } from './query.js';
-import { decodedCursor } from './windows.js';
-export function undeclaredSearch() {
-    return {
-        kind: 'undeclared',
-        code: 'search-undeclared',
-        fields: { name: 'local_search' },
-        retryable: false,
-    };
-}
-function hitCursor(input) {
-    if (input === null)
-        return null;
-    if (!Array.isArray(input))
-        return undefined;
-    if (input.length === 0)
-        return [];
-    const [score, first, second] = input;
-    return input.length === 3 &&
-        typeof score === 'number' &&
-        typeof first === 'string' &&
-        typeof second === 'string'
-        ? [score, first, second]
-        : undefined;
-}
-function searchAfter(input) {
-    if (input === undefined)
-        return null;
-    const decoded = typeof input === 'string' ? decodedCursor(input) : null;
-    const documents = decoded?.length === 2 ? hitCursor(decoded[0]) : undefined;
-    const messages = decoded?.length === 2 ? hitCursor(decoded[1]) : undefined;
-    if (documents === undefined || messages === undefined) {
-        invalid('after', 'expects the next an earlier search returned');
-    }
-    return [documents, messages];
-}
+import { invalid, known, plain } from '@agentshouse/mdmodel';
 export function searchPlanOf(input) {
     if (!plain(input))
         invalid('search', 'expects a search object');
-    known(input, ['text', 'documents', 'collection', 'conversations', 'limit', 'after', 'total'], '');
-    if (typeof input.text !== 'string')
-        invalid('text', 'expects text');
-    const conversations = input.conversations;
-    if (conversations !== undefined &&
-        (!Array.isArray(conversations) || conversations.some((named) => typeof named !== 'string'))) {
-        invalid('conversations', 'expects a list of conversations');
+    known(input, ['text', 'rooms'], '');
+    if (typeof input.text !== 'string' || input.text.trim() === '')
+        invalid('text', 'expects words');
+    const rooms = input.rooms;
+    if (rooms !== undefined &&
+        (!Array.isArray(rooms) || rooms.some((named) => typeof named !== 'string'))) {
+        invalid('rooms', 'expects a list of Rooms');
     }
-    return {
-        text: input.text,
-        documents: input.documents,
-        collection: flag(input.collection, 'collection'),
-        conversations: conversations ?? null,
-        limit: limitOf(input.limit),
-        after: searchAfter(input.after),
-        total: flag(input.total, 'total'),
-    };
+    return { text: input.text, rooms: rooms ?? null };
 }

package/dist/shared.d.ts

@@ -1,6 +1,5 @@
 export type Paths<V> = Readonly<Record<string, V>>;
 export declare function entriesIn<V>(map: Paths<V>): Generator<readonly [string, V]>;
-export declare function keysIn(...maps: readonly Paths<unknown>[]): Generator<number, Set<string>, void>;
 export declare function sortedKeys(map: Paths<unknown>): Generator<number, readonly string[], void>;
 export declare function sorting(keys: Iterable<string>): Generator<number, readonly string[], void>;
 export declare function sharing<V>(map: Paths<V>): Generator<number, Paths<V>, void>;