@agentshouse/mdmodel 0.1.0-alpha.9 → 0.1.0-c83456e1cebfb

package/dist/paths.d.ts

@@ -1,9 +1,6 @@
 export declare function dirname(path: string): string;
 export declare function join(base: string, relative: string): string;
 export declare function normalize(path: string): string | null;
-export declare function isTypesPath(path: string): boolean;
-export declare function typeNameFromPath(path: string): string;
-export declare function hrefSuffix(href: string): string;
 export declare function classifyHref(from: string, href: string): {
     kind: 'skip';
 } | {
@@ -12,4 +9,6 @@ export declare function classifyHref(from: string, href: string): {
 } | {
     kind: 'invalid';
 };
+export declare function target(from: string, href: string): string | null;
+export declare function retarget(href: string, to: string): string;
 //# sourceMappingURL=paths.d.ts.map

package/dist/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG5C;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAG3D;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYrD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI/C;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAUzE"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG5C;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAG3D;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYrD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAUzE;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGhE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAIzD"}

package/dist/paths.js

@@ -3,15 +3,18 @@ export function dirname(path) {
     return index === -1 ? '' : path.slice(0, index);
 }
 export function join(base, relative) {
-    if (base === '') return relative;
+    if (base === '')
+        return relative;
     return `${base}/${relative}`;
 }
 export function normalize(path) {
     const parts = [];
-    for (const part of path.split('/')){
-        if (part === '' || part === '.') continue;
+    for (const part of path.split('/')) {
+        if (part === '' || part === '.')
+            continue;
         if (part === '..') {
-            if (parts.length === 0) return null;
+            if (parts.length === 0)
+                return null;
             parts.pop();
             continue;
         }
@@ -19,41 +22,28 @@ export function normalize(path) {
     }
     return parts.join('/');
 }
-export function isTypesPath(path) {
-    return path === 'types' || path.startsWith('types/');
-}
-export function typeNameFromPath(path) {
-    const base = path.slice(path.lastIndexOf('/') + 1);
-    return base.endsWith('.md') ? base.slice(0, -3) : base;
-}
-export function hrefSuffix(href) {
-    const trimmed = href.trim();
-    const match = /[?#]/.exec(trimmed);
-    return match === null ? '' : trimmed.slice(match.index);
-}
 export function classifyHref(from, href) {
     const trimmed = href.trim();
-    if (trimmed === '' || trimmed.startsWith('#')) return {
-        kind: 'skip'
-    };
-    if (/^[a-zA-Z][a-zA-Z0-9+.-]*:/.test(trimmed)) return {
-        kind: 'skip'
-    };
-    if (trimmed.startsWith('/')) return {
-        kind: 'invalid'
-    };
+    if (trimmed === '' || trimmed.startsWith('#'))
+        return { kind: 'skip' };
+    if (/^[a-zA-Z][a-zA-Z0-9+.-]*:/.test(trimmed))
+        return { kind: 'skip' };
+    if (trimmed.startsWith('/'))
+        return { kind: 'invalid' };
     const bare = trimmed.replace(/[?#].*$/, '');
-    if (bare === '') return {
-        kind: 'skip'
-    };
+    if (bare === '')
+        return { kind: 'skip' };
     const resolved = normalize(join(dirname(from), bare));
-    if (resolved === null || resolved === '') return {
-        kind: 'invalid'
-    };
-    return {
-        kind: 'path',
-        path: resolved
-    };
+    if (resolved === null || resolved === '')
+        return { kind: 'invalid' };
+    return { kind: 'path', path: resolved };
+}
+export function target(from, href) {
+    const resolved = classifyHref(from, href);
+    return resolved.kind === 'path' ? resolved.path : null;
+}
+export function retarget(href, to) {
+    const trimmed = href.trim();
+    const match = /[?#]/.exec(trimmed);
+    return match === null ? to : to + trimmed.slice(match.index);
 }
-
-//# sourceMappingURL=paths.js.map

package/dist/profile.js

@@ -1,7 +1,5 @@
 export const MARKDOWN_SYNTAX_PROFILE = {
     name: 'GitHub Flavored Markdown',
     spec: '0.29',
-    url: 'https://github.github.com/gfm/'
+    url: 'https://github.github.com/gfm/',
 };
-
-//# sourceMappingURL=profile.js.map

package/dist/project.d.ts

@@ -1,3 +1,21 @@
-import type { Document, Projection, ProjectionContext } from './types.js';
+import type { Document, Extent, Projection, ProjectionContext, Refusal } from './types.js';
+export type Piece = Extent & {
+    readonly text: string;
+};
+export type Edit = Piece;
+export type Input = {
+    readonly values: readonly Piece[];
+    readonly ranges: readonly Extent[];
+    readonly edits: readonly Edit[];
+};
+export type InputResult = {
+    readonly ok: true;
+    readonly input: Input;
+} | {
+    readonly ok: false;
+    readonly refusal: Refusal;
+};
+export declare function rangeText(content: string, range: Extent, edits: readonly Edit[]): string;
+export declare function projectionInput(document: Document, file: string, context: ProjectionContext): InputResult;
 export declare function project(document: Document, file: string, context?: ProjectionContext): Projection;
 //# sourceMappingURL=project.d.ts.map

package/dist/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../src/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAgE1E,wBAAgB,OAAO,CACrB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,iBAA2C,GACnD,UAAU,CA2BZ"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../src/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG3F,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvD,MAAM,MAAM,IAAI,GAAG,KAAK,CAAC;AAEzB,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAC5C;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAmCtD,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,IAAI,EAAE,GAAG,MAAM,CASxF;AA8BD,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,GACzB,WAAW,CAyBb;AAED,wBAAgB,OAAO,CACrB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,iBAA2C,GACnD,UAAU,CAMZ"}

package/dist/project.js

@@ -1,122 +1,106 @@
-import { readDefinition } from './definition.js';
-import { parse } from './document.js';
+import { frontmatter } from './document.js';
 import { linkInventory } from './links.js';
-import { classifyHref } from './paths.js';
+import { target } from './paths.js';
 import { refusal } from './refuse.js';
 import { headingSpans } from './sections.js';
-import { bodyStartOf } from './yaml.js';
-function internalEdits(body, file, documentTargets) {
-    const inventory = linkInventory(body);
+import { bodyStartOf, mapEntry } from './yaml.js';
+function internalEdits(content, bodyStart, file, documentTargets) {
+    const inventory = linkInventory(content.slice(bodyStart));
     const internal = new Set();
     const edits = [];
-    for (const use of inventory.uses){
-        const resolved = classifyHref(file, use.destination.href);
-        if (resolved.kind !== 'path' || !documentTargets.has(resolved.path)) continue;
+    const uses = [...inventory.uses].sort((left, right) => left.end - left.start - (right.end - right.start));
+    for (const use of uses) {
+        const resolved = target(file, use.destination.href);
+        if (resolved === null || !documentTargets.has(resolved))
+            continue;
         internal.add(use.destination.start);
+        const label = { start: bodyStart + use.labelStart, end: bodyStart + use.labelEnd };
+        const inner = edits
+            .filter((edit) => edit.start >= label.start && edit.end <= label.end)
+            .sort((left, right) => left.start - right.start);
         edits.push({
-            start: use.start,
-            end: use.end,
-            text: body.slice(use.labelStart, use.labelEnd)
+            start: bodyStart + use.start,
+            end: bodyStart + use.end,
+            text: rangeText(content, label, inner),
         });
     }
-    for (const block of inventory.blocks){
-        if (!internal.has(block.destination.start)) continue;
-        edits.push({
-            start: block.start,
-            end: block.end,
-            text: ''
-        });
+    for (const block of inventory.blocks) {
+        if (!internal.has(block.destination.start))
+            continue;
+        edits.push({ start: bodyStart + block.start, end: bodyStart + block.end, text: '' });
     }
-    return edits.sort((left, right)=>left.start - right.start);
+    return edits.sort((left, right) => left.start - right.start);
 }
-function projected(body, spans, edits) {
+export function rangeText(content, range, edits) {
     let text = '';
-    for (const [from, to] of spans){
-        let cursor = from;
-        for (const edit of edits){
-            if (edit.start < cursor || edit.end > to) continue;
-            text += body.slice(cursor, edit.start) + edit.text;
-            cursor = edit.end;
-        }
-        text += body.slice(cursor, to);
+    let cursor = range.start;
+    for (const edit of edits) {
+        if (edit.start < cursor || edit.end > range.end)
+            continue;
+        text += content.slice(cursor, edit.start) + edit.text;
+        cursor = edit.end;
     }
-    return text;
+    return text + content.slice(cursor, range.end);
 }
 function structural(spec) {
     return spec.kind === 'list' && spec.of.kind !== 'text';
 }
-function freeText(definition, fields) {
-    let text = '';
-    for (const [name, spec] of Object.entries(definition.fields)){
-        const value = fields[name];
+function freeTextValues(definition, document) {
+    const root = frontmatter(document);
+    if (root === null)
+        return [];
+    const values = [];
+    for (const [name, spec] of Object.entries(definition.fields)) {
+        const entry = mapEntry(root, name);
+        if (entry === undefined)
+            continue;
+        const node = entry.value;
         if (spec.kind === 'text') {
-            if (typeof value === 'string') text += `${value}\n\n`;
+            if (node.kind === 'scalar' && typeof node.value === 'string') {
+                values.push({ start: node.start, end: node.end, text: `${node.value}\n\n` });
+            }
+            continue;
+        }
+        if (spec.kind !== 'list' || spec.of.kind !== 'text' || node.kind !== 'seq')
             continue;
+        for (const item of node.items) {
+            if (item.kind === 'scalar' && typeof item.value === 'string') {
+                values.push({ start: item.start, end: item.end, text: `${item.value}\n\n` });
+            }
         }
-        if (spec.kind !== 'list' || spec.of.kind !== 'text' || !Array.isArray(value)) continue;
-        for (const item of value)if (typeof item === 'string') text += `${item}\n\n`;
     }
-    return text;
+    return values;
 }
-export function project(document, file, context = {
-    documentTargets: []
-}) {
-    const bodyStart = bodyStartOf(document.content);
-    const body = document.content.slice(bodyStart);
-    const edits = internalEdits(body, file, new Set(context.documentTargets));
+export function projectionInput(document, file, context) {
+    const content = document.content;
+    const bodyStart = bodyStartOf(content);
+    const edits = internalEdits(content, bodyStart, file, new Set(context.documentTargets));
     const declared = document.type;
     if (declared === undefined || declared === 'any') {
         return {
             ok: true,
-            text: projected(body, [
-                [
-                    0,
-                    body.length
-                ]
-            ], edits)
+            input: { values: [], ranges: [{ start: bodyStart, end: content.length }], edits },
         };
     }
-    const source = context.definition;
-    if (source === undefined) {
-        return {
-            ok: false,
-            refusal: refusal(file, 'unknown-type', {
-                location: 'type'
-            })
-        };
+    const definition = context.definition;
+    if (definition === undefined) {
+        return { ok: false, refusal: refusal(file, 'unknown-type', { location: 'type' }) };
     }
-    const definitionFile = `types/${declared}.md`;
-    const parsed = parse(source, definitionFile);
-    if (!parsed.ok) return {
-        ok: false,
-        refusal: parsed.refusal
-    };
-    const definition = readDefinition(definitionFile, parsed.document);
-    if ('rule' in definition) return {
-        ok: false,
-        refusal: definition
-    };
-    const structure = new Set(Object.entries(definition.sections).flatMap(([name, spec])=>structural(spec) ? [
-            name
-        ] : []));
-    const headings = headingSpans(document.content, bodyStart);
-    const spans = [
-        [
-            0,
-            (headings[0]?.headingStart ?? document.content.length) - bodyStart
-        ]
-    ];
-    for (const heading of headings){
-        if (structure.has(heading.name)) continue;
-        spans.push([
-            heading.headingStart - bodyStart,
-            heading.bodyEnd - bodyStart
-        ]);
+    const structure = new Set(Object.entries(definition.sections).flatMap(([name, spec]) => (structural(spec) ? [name] : [])));
+    const headings = headingSpans(content, bodyStart);
+    const ranges = [{ start: bodyStart, end: headings[0]?.headingStart ?? content.length }];
+    for (const heading of headings) {
+        if (structure.has(heading.name))
+            continue;
+        ranges.push({ start: heading.headingStart, end: heading.bodyEnd });
     }
-    return {
-        ok: true,
-        text: freeText(definition, document.fields) + projected(body, spans, edits)
-    };
+    return { ok: true, input: { values: freeTextValues(definition, document), ranges, edits } };
+}
+export function project(document, file, context = { documentTargets: [] }) {
+    const result = projectionInput(document, file, context);
+    if (!result.ok)
+        return { ok: false, refusal: result.refusal };
+    const { values, ranges, edits } = result.input;
+    const prose = ranges.map((range) => rangeText(document.content, range, edits)).join('');
+    return { ok: true, text: values.map((value) => value.text).join('') + prose };
 }
-
-//# sourceMappingURL=project.js.map

package/dist/refuse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refuse.d.ts","sourceRoot":"","sources":["../src/refuse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GAC3D,OAAO,CAQT"}
+{"version":3,"file":"refuse.d.ts","sourceRoot":"","sources":["../src/refuse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GAC3D,OAAO,CAOT"}

package/dist/refuse.js

@@ -1,16 +1,8 @@
-import { VERSION } from './version.js';
 export function refusal(file, rule, extra) {
     return {
         file,
         rule,
-        version: VERSION,
-        ...extra?.location === undefined ? {} : {
-            location: extra.location
-        },
-        ...extra?.referrers === undefined ? {} : {
-            referrers: extra.referrers
-        }
+        ...(extra?.location === undefined ? {} : { location: extra.location }),
+        ...(extra?.referrers === undefined ? {} : { referrers: extra.referrers }),
     };
 }
-
-//# sourceMappingURL=refuse.js.map

package/dist/schema.d.ts

@@ -1,6 +1,7 @@
-import type { FieldSpec } from './definition.js';
+import type { FieldSpec, ScalarSpec } from './definition.js';
 export declare function validateFields(fields: Readonly<Record<string, FieldSpec>>, values: Readonly<Record<string, unknown>>): {
     field: string;
     rule: 'required-field' | 'field-enum' | 'field-kind';
 } | undefined;
+export declare function fitsKind(spec: ScalarSpec, text: string): boolean;
 //# sourceMappingURL=schema.d.ts.map

package/dist/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAc,MAAM,iBAAiB,CAAC;AAmB7D,wBAAgB,cAAc,CAC5B,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EAC3C,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,gBAAgB,GAAG,YAAY,GAAG,YAAY,CAAA;CAAE,GAAG,SAAS,CAUrF"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAoB7D,wBAAgB,cAAc,CAC5B,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EAC3C,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,gBAAgB,GAAG,YAAY,GAAG,YAAY,CAAA;CAAE,GAAG,SAAS,CAUrF;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAGhE"}

package/dist/schema.js

@@ -1,48 +1,37 @@
 import { Validator } from '@cfworker/json-schema';
+import { interpretPlain } from './yaml.js';
 function scalarSchema(spec) {
-    if (spec.kind === 'text' || spec.kind === 'string' || spec.kind === 'reference') return {
-        type: 'string'
-    };
-    if (spec.kind === 'number') return {
-        type: 'number'
-    };
-    if (spec.kind === 'date') return {
-        type: 'string',
-        format: 'date'
-    };
-    return {
-        type: 'string',
-        enum: [
-            ...spec.values
-        ]
-    };
+    if (spec.kind === 'text' || spec.kind === 'string' || spec.kind === 'reference')
+        return { type: 'string' };
+    if (spec.kind === 'number')
+        return { type: 'number' };
+    if (spec.kind === 'date')
+        return { type: 'string', format: 'date' };
+    return { type: 'string', enum: [...spec.values] };
 }
 function fieldSchema(spec) {
-    if (spec.kind === 'list') return {
-        type: 'array',
-        items: scalarSchema(spec.of)
-    };
+    if (spec.kind === 'list')
+        return { type: 'array', items: scalarSchema(spec.of) };
     return scalarSchema(spec);
 }
 function ruleFor(error) {
     return error.keyword === 'enum' ? 'field-enum' : 'field-kind';
 }
 export function validateFields(fields, values) {
-    for (const [name, spec] of Object.entries(fields)){
-        if (spec.required && values[name] === undefined) return {
-            field: name,
-            rule: 'required-field'
-        };
+    for (const [name, spec] of Object.entries(fields)) {
+        if (spec.required && values[name] === undefined)
+            return { field: name, rule: 'required-field' };
     }
-    for (const [name, spec] of Object.entries(fields)){
-        if (values[name] === undefined) continue;
+    for (const [name, spec] of Object.entries(fields)) {
+        if (values[name] === undefined)
+            continue;
         const result = new Validator(fieldSchema(spec), '2020-12', false).validate(values[name]);
-        if (!result.valid) return {
-            field: name,
-            rule: ruleFor(result.errors[0])
-        };
+        if (!result.valid)
+            return { field: name, rule: ruleFor(result.errors[0]) };
     }
     return undefined;
 }
-
-//# sourceMappingURL=schema.js.map
+export function fitsKind(spec, text) {
+    const value = spec.kind === 'number' ? interpretPlain(text) : text;
+    return new Validator(scalarSchema(spec), '2020-12', false).validate(value).valid;
+}

package/dist/sections.d.ts

@@ -1,3 +1,4 @@
+import type { Extent } from './types.js';
 export type SectionSpan = {
     readonly name: string;
     readonly headingStart: number;
@@ -6,5 +7,5 @@ export type SectionSpan = {
 };
 export declare function headingSpans(content: string, bodyStart: number): SectionSpan[];
 export declare function sectionsRecord(spans: readonly SectionSpan[], content: string): Record<string, string>;
-export declare function parseListSection(body: string): boolean;
+export declare function listItems(content: string, from: number, to: number): Extent[] | null;
 //# sourceMappingURL=sections.d.ts.map

package/dist/sections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sections.d.ts","sourceRoot":"","sources":["../src/sections.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;AAqBF,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAwB9E;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAOxB;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAiBtD"}
+{"version":3,"file":"sections.d.ts","sourceRoot":"","sources":["../src/sections.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;AAIF,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAc9E;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAOxB;AASD,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAoBpF"}

package/dist/sections.js

@@ -1,79 +1,57 @@
-const H2 = /^##(?!#)[ \t]+(.+?)[ \t]*#*[ \t]*$/;
+import { headingLines } from './blocks.js';
 const ITEM = /^([ \t]*)([-*+]|\d+[.)])[ \t]+/;
-function lineRange(content, from) {
-    const nl = content.indexOf('\n', from);
-    const end = nl === -1 ? content.length : nl;
-    let line = content.slice(from, end);
-    if (line.endsWith('\r')) line = line.slice(0, -1);
-    return {
-        line,
-        start: from,
-        next: nl === -1 ? content.length : nl + 1
-    };
-}
-function fenceMarker(line) {
-    let i = 0;
-    while(i < 3 && (line[i] === ' ' || line[i] === '\t'))i += 1;
-    if (line.startsWith('```', i)) return '```';
-    if (line.startsWith('~~~', i)) return '~~~';
-    return null;
-}
 export function headingSpans(content, bodyStart) {
     const found = [];
-    let i = bodyStart;
-    let fence = null;
-    while(i < content.length){
-        const { line, start, next } = lineRange(content, i);
-        const marker = fenceMarker(line);
-        if (fence !== null) {
-            if (marker === fence) fence = null;
-        } else if (marker !== null) {
-            fence = marker;
-        } else {
-            const match = H2.exec(line);
-            if (match !== null && match[1] !== undefined) {
-                const name = match[1].trim();
-                if (found.length > 0) found[found.length - 1] = {
-                    ...found[found.length - 1],
-                    bodyEnd: start
-                };
-                found.push({
-                    name,
-                    headingStart: start,
-                    bodyStart: next,
-                    bodyEnd: content.length
-                });
-            }
-        }
-        if (next === i) break;
-        i = next;
+    for (const heading of headingLines(content, bodyStart, content.length)) {
+        if (heading.level !== 2)
+            continue;
+        if (found.length > 0)
+            found[found.length - 1] = { ...found[found.length - 1], bodyEnd: heading.start };
+        found.push({
+            name: heading.name,
+            headingStart: heading.start,
+            bodyStart: heading.next,
+            bodyEnd: content.length,
+        });
     }
     return found;
 }
 export function sectionsRecord(spans, content) {
     const record = Object.create(null);
-    for (const span of spans){
-        if (record[span.name] === undefined) record[span.name] = content.slice(span.bodyStart, span.bodyEnd);
+    for (const span of spans) {
+        if (record[span.name] === undefined)
+            record[span.name] = content.slice(span.bodyStart, span.bodyEnd);
     }
     return record;
 }
-export function parseListSection(body) {
-    const lines = body.split(/\r?\n/);
-    while(lines.length > 0 && lines[0].trim() === '')lines.shift();
-    while(lines.length > 0 && lines[lines.length - 1].trim() === '')lines.pop();
-    if (lines.length === 0) return true;
-    const first = ITEM.exec(lines[0]);
-    if (first === null || first[1] === undefined) return false;
-    const indent = first[1].length;
-    for (const line of lines){
-        if (line.trim() === '') continue;
-        const match = ITEM.exec(line);
-        if (match !== null && match[1]?.length === indent) continue;
-        const leading = /^\s*/.exec(line)?.[0].length ?? 0;
-        if (leading > indent) continue;
-        return false;
+function trimmed(content, extent) {
+    let { start, end } = extent;
+    while (start < end && /\s/.test(content[start]))
+        start += 1;
+    while (end > start && /\s/.test(content[end - 1]))
+        end -= 1;
+    return { start, end };
+}
+export function listItems(content, from, to) {
+    const items = [];
+    let indent;
+    let start = from;
+    while (start < to) {
+        const newline = content.indexOf('\n', start);
+        const end = newline === -1 || newline >= to ? to : newline;
+        const line = content.slice(start, end);
+        start = end + 1;
+        if (line.trim() === '')
+            continue;
+        const item = ITEM.exec(line);
+        if (item !== null && (indent === undefined || item[1].length === indent)) {
+            indent = item[1].length;
+            items.push({ start: end - line.length + item[0].length, end });
+            continue;
+        }
+        if (indent === undefined || /^\s*/.exec(line)[0].length <= indent)
+            return null;
+        items[items.length - 1] = { start: items.at(-1).start, end };
     }
-    return true;
+    return items.map((item) => trimmed(content, item));
 }
-
-//# sourceMappingURL=sections.js.map