@refrakt-md/runes 0.38.0 → 0.40.0

package/dist/registers-pipeline.js.map

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

package/dist/schema-row.d.ts

@@ -42,6 +42,11 @@ export interface ResolvedSchemaRow {
     type?: string;
     /** The attribute a multi-row table selects on, if any. */
     by?: string;
+    /**
+     * The field-bag entry a content-dependent table selects on, if any. The row
+     * described is the fallback; the content can select another.
+     */
+    byField?: string;
     /** The attribute value this row was selected for, if any. */
     selectedFor?: string;
     /** Every property mapping, parent and nested. */

package/dist/schema-row.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-row.d.ts","sourceRoot":"","sources":["../src/schema-row.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,EAAE,WAAW,EAAwB,MAAM,uBAAuB,CAAC;AAE/E;;;;;;;;;;;;;GAaG;AAEH,mDAAmD;AACnD,MAAM,WAAW,iBAAiB;IACjC,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,iCAAiC;IACjC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,WAAW,CAAC;IACxC,mDAAmD;IACnD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;;OASG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,2DAA2D;AAC3D,MAAM,WAAW,iBAAiB;IACjC,mCAAmC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,6DAA6D;IAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iDAAiD;IACjD,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,gEAAgE;IAChE,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClE,+BAA+B;IAC/B,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClE,yDAAyD;IACzD,KAAK,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,qDAAqD;AACrD,wBAAgB,QAAQ,CAAC,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,WAAW,GAAG,SAAS,CAE3E;AAmBD,yEAAyE;AACzE,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,WAAW,EAClB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACjC,iBAAiB,CAsCnB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,EAAE,CAI/E;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GACtD,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAOnC"}
+{"version":3,"file":"schema-row.d.ts","sourceRoot":"","sources":["../src/schema-row.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,EAAE,WAAW,EAAwB,MAAM,uBAAuB,CAAC;AAE/E;;;;;;;;;;;;;GAaG;AAEH,mDAAmD;AACnD,MAAM,WAAW,iBAAiB;IACjC,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,iCAAiC;IACjC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,WAAW,CAAC;IACxC,mDAAmD;IACnD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;;OASG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,2DAA2D;AAC3D,MAAM,WAAW,iBAAiB;IACjC,mCAAmC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iDAAiD;IACjD,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,gEAAgE;IAChE,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClE,+BAA+B;IAC/B,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClE,yDAAyD;IACzD,KAAK,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,qDAAqD;AACrD,wBAAgB,QAAQ,CAAC,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,WAAW,GAAG,SAAS,CAE3E;AAmBD,yEAAyE;AACzE,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,WAAW,EAClB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACjC,iBAAiB,CAuCnB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,EAAE,CAI/E;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GACtD,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAOnC"}

package/dist/schema-row.js

@@ -42,6 +42,7 @@ export function describeSchemaRow(table, attrs = {}) {
     return {
         type: row.type,
         by: table.by,
+        ...(table.byField !== undefined ? { byField: table.byField } : {}),
         selectedFor: selected,
         properties,
         entities,

package/dist/schema-row.js.map

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

package/dist/tags/data.d.ts

@@ -6,8 +6,8 @@
  * Like `snippet`, `data` is implemented as an **AST preprocessor**: every
  * `{% data %}` tag is resolved (read through the SPEC-113 `ProjectFiles` seam,
  * adapted, projected, typed) and replaced with a `table` AST node before the
- * schema-driven transform runs (see `corePipelineHooks.preprocess` in
- * `../config.ts`). By the time the transform reaches the AST, no `data` tags
+ * schema-driven transform runs — its `preprocess` hook, `preprocessDataTag` in
+ * `../data-pipeline.ts`, dispatched by the tree-order walk (SPEC-141). By the time the transform reaches the AST, no `data` tags
  * remain — so this schema's `transform` is **unreachable in normal operation**.
  *
  * The schema still exists for tooling: `refrakt inspect data`, the contracts

package/dist/tags/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/tags/data.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,IAAI,mCA+Gf,CAAC"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/tags/data.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,IAAI,mCAgHf,CAAC"}

package/dist/tags/data.js

@@ -1,4 +1,5 @@
 import { createContentModelSchema } from '../lib/index.js';
+import { preprocessDataTag } from '../data-pipeline.js';
 /**
  * The `data` rune — ingest an external tabular source (CSV/TSV/JSON/NDJSON) and
  * emit a Markdoc `table` node that `chart` and `datatable` consume unchanged
@@ -7,8 +8,8 @@ import { createContentModelSchema } from '../lib/index.js';
  * Like `snippet`, `data` is implemented as an **AST preprocessor**: every
  * `{% data %}` tag is resolved (read through the SPEC-113 `ProjectFiles` seam,
  * adapted, projected, typed) and replaced with a `table` AST node before the
- * schema-driven transform runs (see `corePipelineHooks.preprocess` in
- * `../config.ts`). By the time the transform reaches the AST, no `data` tags
+ * schema-driven transform runs — its `preprocess` hook, `preprocessDataTag` in
+ * `../data-pipeline.ts`, dispatched by the tree-order walk (SPEC-141). By the time the transform reaches the AST, no `data` tags
  * remain — so this schema's `transform` is **unreachable in normal operation**.
  *
  * The schema still exists for tooling: `refrakt inspect data`, the contracts
@@ -98,11 +99,12 @@ export const data = createContentModelSchema({
     // row with `$row` bound, in place of the `<table>` the bodyless form emits.
     // With `headers` set it is instead one `---`-delimited table *row* (WORK-550).
     // The content model stays empty because the body never reaches the transform
-    // — `preprocessData` binds and splices it at parse time — but it must be
+    // — the `preprocess` hook binds and splices it at parse time — but it must be
     // *allowed* here or Markdoc rejects the tag before the preprocessor sees it.
     contentModel: { type: 'sequence', fields: [] },
+    preprocess: preprocessDataTag,
     transform(_resolved, _attrs) {
-        // Unreachable in normal operation — corePipelineHooks.preprocess replaces
+        // Unreachable in normal operation — the `preprocess` hook replaces
         // `data` tags with `table` nodes before the transform runs.
         //
         // For a *content* author there is exactly one way to get here, and it is

package/dist/tags/data.js.map

@@ -1 +1 @@
-{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/tags/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAE3D;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,wBAAwB,CAAC;IAC5C,UAAU,EAAE;QACX,QAAQ;QACR,GAAG,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,oEAAoE;SACjF;QACD,MAAM,EAAE;YACP,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC;YACzC,WAAW,EAAE,0EAA0E;SACvF;QACD,aAAa;QACb,SAAS,EAAE;YACV,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,yCAAyC;SACtD;QACD,MAAM,EAAE;YACP,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,KAAK;YACf,WAAW,EACV,sFAAsF;SACvF;QACD,wEAAwE;QACxE,IAAI,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,2EAA2E;SACxF;QACD,MAAM,EAAE;YACP,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC;YACvC,WAAW,EACV,wFAAwF;SACzF;QACD,YAAY,EAAE;YACb,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,qEAAqE;SAClF;QACD,qBAAqB;QACrB,OAAO,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,yEAAyE;SACtF;QACD,KAAK,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,sDAAsD;SACnE;QACD,IAAI,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,8CAA8C;SAC3D;QACD,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE;QAChF,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,sCAAsC,EAAE;QAC9F,2EAA2E;QAC3E,OAAO,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EACV,6OAA6O;SAC9O;QACD,iBAAiB;QACjB,OAAO,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,wEAAwE;SACrF;QACD,IAAI,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,kDAAkD;SAC/D;KACD;IACD,4EAA4E;IAC5E,4EAA4E;IAC5E,+EAA+E;IAC/E,6EAA6E;IAC7E,yEAAyE;IACzE,6EAA6E;IAC7E,YAAY,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE;IAC9C,SAAS,CAAC,SAAS,EAAE,MAAM;QAC1B,0EAA0E;QAC1E,4DAA4D;QAC5D,EAAE;QACF,yEAAyE;QACzE,qEAAqE;QACrE,qEAAqE;QACrE,wEAAwE;QACxE,yEAAyE;QACzE,uEAAuE;QACvE,MAAM,IAAI,KAAK,CACd,wDAAwD;YACvD,2EAA2E;YAC3E,+EAA+E;YAC/E,iFAAiF;YACjF,6EAA6E;YAC7E,+EAA+E;YAC/E,oDAAoD;YACpD,gFAAgF;YAChF,2EAA2E;YAC3E,+BAA+B,CAChC,CAAC;IACH,CAAC;CACD,CAAC,CAAC"}
+{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/tags/data.ts"],"names":[],"mappings":"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"}

package/dist/tags/figure.d.ts

@@ -4,10 +4,16 @@ export declare const figureSections: {
 };
 export declare const figureFrameTarget: "self";
 export declare const figureSchema: {
-    readonly type: "ImageObject";
-    readonly properties: {
-        readonly image: "contentUrl";
-        readonly caption: "caption";
+    readonly byField: "body";
+    readonly rows: {
+        readonly mixed: {};
+    };
+    readonly fallback: {
+        readonly type: "ImageObject";
+        readonly properties: {
+            readonly image: "contentUrl";
+            readonly caption: "caption";
+        };
     };
 };
 export declare const figure: Markdoc.Schema;

package/dist/tags/figure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"figure.d.ts","sourceRoot":"","sources":["../../src/tags/figure.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAgBvC,eAAO,MAAM,cAAc;;CAAsC,CAAC;AAClE,eAAO,MAAM,iBAAiB,EAAG,MAAe,CAAC;AAOjD,eAAO,MAAM,YAAY;;;;;;CAGf,CAAC;AAEX,eAAO,MAAM,MAAM,gBAwEjB,CAAC"}
+{"version":3,"file":"figure.d.ts","sourceRoot":"","sources":["../../src/tags/figure.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAgBvC,eAAO,MAAM,cAAc;;CAAsC,CAAC;AAClE,eAAO,MAAM,iBAAiB,EAAG,MAAe,CAAC;AAiBjD,eAAO,MAAM,YAAY;;;;;;;;;;;;CAOf,CAAC;AAEX,eAAO,MAAM,MAAM,gBAsGjB,CAAC"}

package/dist/tags/figure.js

@@ -14,9 +14,23 @@ export const figureFrameTarget = 'self';
 // `<figcaption>` its text. The image is the node WORK-561 gave a name to —
 // before that, the schema reached it only as an anonymous `imgs[0]`, and a
 // reordering of the transform would have silently repointed `contentUrl`.
+//
+// BUG-028 — a figure is a general captioned container, so `ImageObject` holds
+// only while the media slot is the figure's whole body. The transform records
+// `body: 'mixed'` when anything else is there; that row asserts nothing. No
+// type at all, rather than a more general one: the figure's caption describes
+// the image *and* the code beside it, and `ImageObject` with that caption is a
+// wrong claim, while the alternatives (`CreativeWork`, `SoftwareSourceCode`)
+// would describe a code block nobody marked up as a work. The properties go with
+// the type: stamping `caption` with no `typeof` here would hand it to whatever
+// typed ancestor the page has.
 export const figureSchema = {
-    type: 'ImageObject',
-    properties: { image: 'contentUrl', caption: 'caption' },
+    byField: 'body',
+    rows: { mixed: {} },
+    fallback: {
+        type: 'ImageObject',
+        properties: { image: 'contentUrl', caption: 'caption' },
+    },
 };
 export const figure = createContentModelSchema({
     schema: figureSchema,
@@ -43,30 +57,60 @@ export const figure = createContentModelSchema({
     },
     contentModel: bodyOnly(),
     transform(resolved, attrs, config) {
-        const children = renderNodes(resolved.body, config);
-        // Media is an <img> or a scheme-resolved <svg> (placeholder:/icon:) — both
-        // count as the figure's image (SPEC-106).
-        const imgs = children
-            .flatten()
-            .toArray()
-            .filter((n) => isMediaNode(n));
-        // For caption fallback, skip paragraphs that only contain a media node
-        const textParagraphs = children
-            .tag('p')
-            .toArray()
-            .filter((p) => {
-            const kids = (p.children || []).filter((c) => Markdoc.Tag.isTag(c));
-            return !(kids.length === 1 && isMediaNode(kids[0]));
-        });
+        const children = renderNodes(resolved.body, config).toArray();
+        // BUG-028 — every body child is kept, in body order. Media — an <img>, a
+        // <video>, or a scheme-resolved <svg> (SPEC-106) — standing on its own,
+        // or in a paragraph holding nothing else, is the figure's media slot and
+        // is emitted unwrapped, as it always was. Anything else is emitted as
+        // written: before this, all of it was resolved and then dropped.
+        const mediaOnly = (p) => {
+            if (!Markdoc.Tag.isTag(p) || p.name !== 'p')
+                return undefined;
+            const kids = p.children ?? [];
+            const media = kids.filter((c) => isMediaNode(c));
+            const rest = kids.filter((c) => !isMediaNode(c) && !(typeof c === 'string' && c.trim() === ''));
+            return media.length > 0 && rest.length === 0 ? media : undefined;
+        };
+        const holdsMedia = (n) => isMediaNode(n) || (Markdoc.Tag.isTag(n) && (n.children ?? []).some(holdsMedia));
+        // Caption fallback: the first paragraph with no media in it.
         const captionContent = attrs.caption || undefined;
+        const captionParagraph = captionContent
+            ? undefined
+            : children.find((n) => Markdoc.Tag.isTag(n) && n.name === 'p' && !holdsMedia(n));
         const captionTag = captionContent
             ? new Tag('figcaption', {}, [captionContent])
-            : textParagraphs.length > 0
-                ? new Tag('figcaption', {}, [textParagraphs[0]])
+            : captionParagraph
+                ? new Tag('figcaption', {}, [captionParagraph])
                 : undefined;
+        const imgs = [];
+        const body = [];
+        let mixed = false;
+        for (const node of children) {
+            if (node === captionParagraph)
+                continue;
+            if (isMediaNode(node)) {
+                imgs.push(node);
+                body.push(node);
+                continue;
+            }
+            const media = mediaOnly(node);
+            if (media) {
+                imgs.push(...media);
+                body.push(...media);
+                continue;
+            }
+            if (typeof node === 'string' && node.trim() === '')
+                continue;
+            body.push(node);
+            mixed = true;
+        }
         const sizeMeta = attrs.size ? new Tag('meta', { content: attrs.size }) : undefined;
         const alignMeta = attrs.align ? new Tag('meta', { content: attrs.align }) : undefined;
-        const childNodes = [...imgs];
+        // A content fact, not a type: the schema table decides what it means.
+        const bodyMeta = mixed ? new Tag('meta', { content: 'mixed' }) : undefined;
+        const childNodes = [...body];
+        if (bodyMeta)
+            childNodes.push(bodyMeta);
         if (captionTag)
             childNodes.push(captionTag);
         return createComponentRenderable({
@@ -75,6 +119,7 @@ export const figure = createContentModelSchema({
             properties: {
                 size: sizeMeta,
                 align: alignMeta,
+                body: bodyMeta,
             },
             refs: {
                 caption: captionTag,

package/dist/tags/figure.js.map

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

package/dist/tags/include.d.ts

@@ -1,24 +1,68 @@
+/**
+ * Include's preprocess hook (SPEC-129).
+ *
+ * Replaces an `{% include %}` tag with the referenced partial's AST, cloned and
+ * with the tag's `variables` substituted. The preprocess walk then descends
+ * into the pasted nodes (SPEC-141), so a `data` or `snippet` inside the file is
+ * resolved exactly as if it had been typed there — the case `{% partial %}`
+ * cannot serve, because Markdoc expands partials during the transform.
+ *
+ * Three properties are load-bearing:
+ *
+ * - **Splice, never wrap.** One include produces N nodes and they land as
+ *   direct siblings. A container to keep the replacement 1:1 breaks
+ *   composition invisibly: measured in SPEC-127, `{% section %}` and
+ *   `{% grid %}` consume their children, so wrapped content vanishes with no
+ *   error. Same constraint, same reason, as the `data` per-row body.
+ *
+ * - **Always clone.** The partial ASTs are parsed once per build and shared by
+ *   every page that references them. The other preprocessors mutate the tree in
+ *   place, so pasting the shared nodes would let one page's `data` resolution
+ *   leak into the next page's copy.
+ *
+ * - **Substitute, don't scope.** `partial` binds variables into a
+ *   transform-time scope, which is precisely what a preprocessor attribute
+ *   cannot read. `include` rewrites `Variable` nodes in the cloned AST at paste
+ *   time — the same thing `bindRow` does for `$row` — so a binding reaches
+ *   `{% data where=$q %}`. Variables the include does not bind are left alone
+ *   and resolve at transform against the page's own variables.
+ *
+ * Failures render a visible error callout and record a build error rather than
+ * throwing, matching `data`: one bad include does not take out the build, and
+ * the failure is on the page where the author will see it.
+ */
+import Markdoc from '@markdoc/markdoc';
+/**
+ * How deep includes may nest.
+ *
+ * A cycle is caught by name before this ever fires — the stack check below is
+ * the real guard. This bounds the other shape: a chain of distinct files deep
+ * enough that it is a mistake rather than a structure anyone meant to author.
+ */
+export declare const MAX_INCLUDE_DEPTH = 16;
 /**
  * The `include` rune — paste a file's AST into the page during **preprocess**
  * (SPEC-129).
  *
  * `{% partial %}` is Markdoc's, and Markdoc expands it during
  * `Markdoc.transform`. refrakt's preprocessors — `data` (SPEC-103) and
- * `snippet` (SPEC-062) — walk the *page's* AST before that, so a preprocessor
- * rune inside a partial is never in the tree when they run and survives to its
- * own throwing transform. `include` closes that gap: it splices the file's
- * parsed AST into the page ahead of every other preprocess step, so the pasted
- * content is preprocessed exactly as if it had been typed there.
+ * `snippet` (SPEC-062) — resolve the *page's* AST before that, so a
+ * preprocessor rune inside a partial is never in the tree when they run and
+ * survives to its own throwing transform. `include` closes that gap: it splices
+ * the file's parsed AST into the page during preprocess, and the walk descends
+ * into it, so the pasted content is preprocessed exactly as if it had been
+ * typed there.
  *
  * Both runes read the same `_partials/` directory and the same `namespace:file`
  * roots — a file's *location* should not depend on its *contents*, so only the
  * call site differs. `partial` stays the documented default; reach for
  * `include` when the file contains `data` or `snippet`.
  *
- * Like `snippet` and `data`, this is an **AST preprocessor**, so the schema's
+ * Like `snippet` and `data`, this is an **AST preprocessor** — its `preprocess`
+ * hook is the code above — so the schema's
  * `transform` is unreachable in normal operation. It exists for tooling
  * (`refrakt inspect include`, contracts, attribute validation, the rune
  * catalog) and throws a message pointing at the wiring if it ever runs.
  */
-export declare const include: import("@markdoc/markdoc").Schema;
+export declare const include: Markdoc.Schema;
 //# sourceMappingURL=include.d.ts.map

package/dist/tags/include.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"include.d.ts","sourceRoot":"","sources":["../../src/tags/include.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,OAAO,mCAyBlB,CAAC"}
+{"version":3,"file":"include.d.ts","sourceRoot":"","sources":["../../src/tags/include.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAQvC;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAiMpC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,OAAO,gBA0BlB,CAAC"}

package/dist/tags/include.js

@@ -1,22 +1,230 @@
+/**
+ * Include's preprocess hook (SPEC-129).
+ *
+ * Replaces an `{% include %}` tag with the referenced partial's AST, cloned and
+ * with the tag's `variables` substituted. The preprocess walk then descends
+ * into the pasted nodes (SPEC-141), so a `data` or `snippet` inside the file is
+ * resolved exactly as if it had been typed there — the case `{% partial %}`
+ * cannot serve, because Markdoc expands partials during the transform.
+ *
+ * Three properties are load-bearing:
+ *
+ * - **Splice, never wrap.** One include produces N nodes and they land as
+ *   direct siblings. A container to keep the replacement 1:1 breaks
+ *   composition invisibly: measured in SPEC-127, `{% section %}` and
+ *   `{% grid %}` consume their children, so wrapped content vanishes with no
+ *   error. Same constraint, same reason, as the `data` per-row body.
+ *
+ * - **Always clone.** The partial ASTs are parsed once per build and shared by
+ *   every page that references them. The other preprocessors mutate the tree in
+ *   place, so pasting the shared nodes would let one page's `data` resolution
+ *   leak into the next page's copy.
+ *
+ * - **Substitute, don't scope.** `partial` binds variables into a
+ *   transform-time scope, which is precisely what a preprocessor attribute
+ *   cannot read. `include` rewrites `Variable` nodes in the cloned AST at paste
+ *   time — the same thing `bindRow` does for `$row` — so a binding reaches
+ *   `{% data where=$q %}`. Variables the include does not bind are left alone
+ *   and resolve at transform against the page's own variables.
+ *
+ * Failures render a visible error callout and record a build error rather than
+ * throwing, matching `data`: one bad include does not take out the build, and
+ * the failure is on the page where the author will see it.
+ */
+import Markdoc from '@markdoc/markdoc';
 import { createContentModelSchema } from '../lib/index.js';
+import { emitErrorNode } from '../data-emit.js';
+const { Ast } = Markdoc;
+/**
+ * How deep includes may nest.
+ *
+ * A cycle is caught by name before this ever fires — the stack check below is
+ * the real guard. This bounds the other shape: a chain of distinct files deep
+ * enough that it is a mistake rather than a structure anyone meant to author.
+ */
+export const MAX_INCLUDE_DEPTH = 16;
+/**
+ * Preprocess: splice the `{% include %}` tag away. No-op when no partials are
+ * available (a tree-mode build with none wired), matching how snippet and data
+ * no-op without a sandbox — the tag then falls through to its schema transform,
+ * which names the wiring.
+ */
+function preprocessInclude(tag, page, ctx) {
+    const partials = ctx.partials;
+    if (!partials)
+        return;
+    return resolveInclude(tag, page, ctx, partials, []);
+}
+/**
+ * Include's own nested expansion (SPEC-141 D3). The preprocess walk descends
+ * into every replacement, but the cycle stack is per-chain state it should not
+ * carry, so the includes inside a pasted file are expanded here, under a stack
+ * that names the chain. `resolveInclude` therefore leaves no `include` tag
+ * behind, and the walk's descent finds none to expand a second time.
+ */
+function walkAndReplaceIncludes(node, page, ctx, partials, stack) {
+    if (!node.children)
+        return;
+    for (let i = 0; i < node.children.length; i++) {
+        const child = node.children[i];
+        if (child.type === 'tag' && child.tag === 'include') {
+            const replacement = resolveInclude(child, page, ctx, partials, stack);
+            node.children.splice(i, 1, ...replacement);
+            // Skip the pasted nodes: nested includes inside them were already
+            // expanded by `resolveInclude`, under the cycle stack that names the
+            // chain. Re-walking here would expand them a second time with an empty
+            // stack, which is exactly how a cycle becomes an infinite paste.
+            i += replacement.length - 1;
+            continue;
+        }
+        walkAndReplaceIncludes(child, page, ctx, partials, stack);
+    }
+}
+function fail(ctx, page, message) {
+    ctx.error(`include: ${message}`, page.url);
+    return [emitErrorNode(`include error: ${message}`)];
+}
+function resolveInclude(tag, page, ctx, partials, stack) {
+    const file = resolveValue(tag.attributes?.file, ctx.variables);
+    if (typeof file !== 'string' || file.length === 0) {
+        return fail(ctx, page, 'the `file` attribute is required (an unresolvable variable reference resolves to empty)');
+    }
+    if (stack.includes(file)) {
+        return fail(ctx, page, `cycle — ${[...stack, file].join(' → ')}`);
+    }
+    if (stack.length >= MAX_INCLUDE_DEPTH) {
+        return fail(ctx, page, `nested more than ${MAX_INCLUDE_DEPTH} deep — ${[...stack, file].join(' → ')}`);
+    }
+    const source = partials[file];
+    if (!source || typeof source !== 'object') {
+        const known = Object.keys(partials).sort();
+        const available = known.length > 0
+            ? ` Available: ${known.join(', ')}.`
+            : ' No partials are registered for this site.';
+        return fail(ctx, page, `"${file}" was not found in \`_partials/\` or any registered file root.${available}`);
+    }
+    const bindings = resolveVariables(tag.attributes?.variables, ctx.variables);
+    const pasted = source.children ?? [];
+    const children = pasted.map((child) => cloneWithBindings(child, bindings));
+    // Expand nested includes inside what was just pasted, under a stack carrying
+    // this file — so a cycle is reported by name instead of overflowing.
+    if (children.length > 0) {
+        const container = new Ast.Node('document', {}, children);
+        walkAndReplaceIncludes(container, page, ctx, partials, [...stack, file]);
+        return container.children;
+    }
+    return children;
+}
+/**
+ * Clone a node, substituting bound variables.
+ *
+ * `$q` reaches the AST as a `Variable` in a node's *attributes* — on a tag
+ * (`where=$q`) and equally on a `text` node, where `{% $q %}` becomes
+ * `content: Variable(['q'])`. One rule covers both, exactly as `bindRow` does.
+ */
+function cloneWithBindings(node, bindings) {
+    const attributes = {};
+    for (const [key, value] of Object.entries(node.attributes ?? {})) {
+        attributes[key] = substitute(value, bindings);
+    }
+    const children = (node.children ?? []).map((child) => cloneWithBindings(child, bindings));
+    const copy = new Ast.Node(node.type, attributes, children, node.tag);
+    // The constructor takes four fields; everything else Markdoc's parser sets
+    // has to be carried across by hand. `inline` decides whether a node renders
+    // inline, and `annotations` carries `{% .class #id %}` shorthand — dropping
+    // either changes the output silently.
+    if (node.lines)
+        copy.lines = node.lines;
+    if (node.location)
+        copy.location = node.location;
+    copy.inline = node.inline;
+    if (node.annotations?.length)
+        copy.annotations = node.annotations;
+    if (node.slots && Object.keys(node.slots).length > 0) {
+        copy.slots = Object.fromEntries(Object.entries(node.slots).map(([k, v]) => [k, cloneWithBindings(v, bindings)]));
+    }
+    return copy;
+}
+/**
+ * Replace a `Variable` node whose root segment the include binds.
+ *
+ * Unbound variables pass through untouched rather than resolving to empty: the
+ * pasted AST is page content now, so `$page.slug` and friends still resolve at
+ * transform against the page's own variables. That is a capability `partial`
+ * does not have — its scope *replaces* the variable surface.
+ */
+function substitute(value, bindings) {
+    if (!value || typeof value !== 'object')
+        return value;
+    const node = value;
+    if (node.$$mdtype === 'Variable' && Array.isArray(node.path) && node.path.length > 0) {
+        const [root, ...rest] = node.path;
+        if (!(root in bindings))
+            return value;
+        let current = bindings[root];
+        for (const segment of rest) {
+            if (current === null || current === undefined)
+                return '';
+            current = current[segment];
+        }
+        return current === null || current === undefined ? '' : current;
+    }
+    return value;
+}
+/** The include's own `variables={...}`, with any page-variable references in
+ *  its values resolved before they are substituted into the pasted AST. */
+function resolveVariables(raw, pageVariables) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw))
+        return {};
+    const out = {};
+    for (const [key, value] of Object.entries(raw)) {
+        out[key] = resolveValue(value, pageVariables);
+    }
+    return out;
+}
+/** Resolve an attribute value against the page's variables — literals pass
+ *  through, `Variable` nodes are looked up. Mirrors snippet's and data's
+ *  resolvers; anything else (a `Function` node) resolves to empty — the same
+ *  silent-empty behaviour BUG-010 tracks for `data`'s `where`. */
+function resolveValue(value, variables) {
+    if (value === undefined || value === null)
+        return '';
+    if (typeof value !== 'object')
+        return value;
+    const node = value;
+    if (node.$$mdtype === 'Variable' && Array.isArray(node.path)) {
+        let current = variables;
+        for (const segment of node.path) {
+            if (current === null || current === undefined)
+                return '';
+            current = current[segment];
+        }
+        return current === null || current === undefined ? '' : current;
+    }
+    if (node.$$mdtype === undefined)
+        return value;
+    return '';
+}
 /**
  * The `include` rune — paste a file's AST into the page during **preprocess**
  * (SPEC-129).
  *
  * `{% partial %}` is Markdoc's, and Markdoc expands it during
  * `Markdoc.transform`. refrakt's preprocessors — `data` (SPEC-103) and
- * `snippet` (SPEC-062) — walk the *page's* AST before that, so a preprocessor
- * rune inside a partial is never in the tree when they run and survives to its
- * own throwing transform. `include` closes that gap: it splices the file's
- * parsed AST into the page ahead of every other preprocess step, so the pasted
- * content is preprocessed exactly as if it had been typed there.
+ * `snippet` (SPEC-062) — resolve the *page's* AST before that, so a
+ * preprocessor rune inside a partial is never in the tree when they run and
+ * survives to its own throwing transform. `include` closes that gap: it splices
+ * the file's parsed AST into the page during preprocess, and the walk descends
+ * into it, so the pasted content is preprocessed exactly as if it had been
+ * typed there.
  *
  * Both runes read the same `_partials/` directory and the same `namespace:file`
  * roots — a file's *location* should not depend on its *contents*, so only the
  * call site differs. `partial` stays the documented default; reach for
  * `include` when the file contains `data` or `snippet`.
  *
- * Like `snippet` and `data`, this is an **AST preprocessor**, so the schema's
+ * Like `snippet` and `data`, this is an **AST preprocessor** — its `preprocess`
+ * hook is the code above — so the schema's
  * `transform` is unreachable in normal operation. It exists for tooling
  * (`refrakt inspect include`, contracts, attribute validation, the rune
  * catalog) and throws a message pointing at the wiring if it ever runs.
@@ -35,8 +243,9 @@ export const include = createContentModelSchema({
         },
     },
     contentModel: { type: 'sequence', fields: [] },
+    preprocess: preprocessInclude,
     transform(_resolved, _attrs) {
-        // Unreachable in normal operation — corePipelineHooks.preprocess splices
+        // Unreachable in normal operation — the `preprocess` hook above splices
         // `include` tags away before the transform runs.
         throw new Error('{% include %} reached the transform phase unresolved — its preprocess hook was not ' +
             'wired through. Ensure the content pipeline runs registered `preprocess` hooks before ' +