@asciidoctor/core 4.0.0-alpha.4 → 4.0.0-alpha.6

package/build/browser/index.js

@@ -1,4 +1,4 @@
-var version = "4.0.0-alpha.4";
+var version = "4.0.0-alpha.6";
 const packageJson = {
 	version: version};
 
@@ -4079,7 +4079,7 @@ class AbstractBlock extends AbstractNode {
       if (anyContext || contextSelector !== 'section') {
         // optimisation
         // NOTE dlist items can be null
-        for (const b of this.blocks.flat()) {
+        for (const b of this.blocks.flat(Infinity)) {
           if (b) b.#findByInternal(selector, result, filter);
         }
       }
@@ -8921,6 +8921,25 @@ class Cell extends AbstractBlock {
     if (cell._innerDocSetup) {
       const { lines, parentDoc, parentDoctitle, options } = cell._innerDocSetup;
       cell._innerDocSetup = null;
+      // If the first line may be a preprocessor directive (include, ifdef…), expand it using a
+      // temporary PreprocessorReader — matching the Ruby behaviour in table.rb.
+      if (lines.length > 0 && lines[0].includes('::')) {
+        const firstLine = lines[0];
+        const tmpReader = new PreprocessorReader(
+          parentDoc,
+          [firstLine],
+          options.cursor
+        );
+        const preprocessedLines = await tmpReader.readLines();
+        if (
+          !(
+            preprocessedLines.length === 1 && preprocessedLines[0] === firstLine
+          )
+        ) {
+          lines.shift();
+          if (preprocessedLines.length > 0) lines.unshift(...preprocessedLines);
+        }
+      }
       const innerDoc = await parentDoc.constructor.create(lines, options);
       if (parentDoctitle) parentDoc.attributes.doctitle = parentDoctitle;
       cell._innerDocument = innerDoc;
@@ -11012,8 +11031,8 @@ class Parser {
           const admStyle = attributes.style ?? blockContext;
           attributes.name = admStyle.toLowerCase();
           attributes.textlabel =
-            (attributes.caption && delete attributes.caption) ??
-            docAttrs[`${attributes.name}-caption`];
+            attributes.caption ?? docAttrs[`${attributes.name}-caption`];
+          delete attributes.caption;
           block = await Parser.buildBlock(
             blockContext,
             'compound',
@@ -16022,8 +16041,8 @@ class Document extends AbstractBlock {
       if ((this.doctype = attrs.doctype = parentDoctype) !== DEFAULT_DOCTYPE) {
         this._updateDoctypeAttributes(DEFAULT_DOCTYPE);
       }
-      // Set up reader only — parsing is deferred to Document.create() / doc.parse().
-      this.reader = new PreprocessorReader(this, data, options.cursor);
+      // Nested documents use a plain Reader (no include/conditional processing), matching Ruby behaviour.
+      this.reader = new Reader(data, options.cursor, { document: this });
       if (this.sourcemap) this.sourceLocation = this.reader.cursor;
     } else {
       this.backend = null;

package/build/node/index.cjs

@@ -5,7 +5,7 @@ const node_fs = require('node:fs');
 const path = require('node:path');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
-var version = "4.0.0-alpha.4";
+var version = "4.0.0-alpha.6";
 const packageJson = {
 	version: version};
 
@@ -4086,7 +4086,7 @@ class AbstractBlock extends AbstractNode {
       if (anyContext || contextSelector !== 'section') {
         // optimisation
         // NOTE dlist items can be null
-        for (const b of this.blocks.flat()) {
+        for (const b of this.blocks.flat(Infinity)) {
           if (b) b.#findByInternal(selector, result, filter);
         }
       }
@@ -8928,6 +8928,25 @@ class Cell extends AbstractBlock {
     if (cell._innerDocSetup) {
       const { lines, parentDoc, parentDoctitle, options } = cell._innerDocSetup;
       cell._innerDocSetup = null;
+      // If the first line may be a preprocessor directive (include, ifdef…), expand it using a
+      // temporary PreprocessorReader — matching the Ruby behaviour in table.rb.
+      if (lines.length > 0 && lines[0].includes('::')) {
+        const firstLine = lines[0];
+        const tmpReader = new PreprocessorReader(
+          parentDoc,
+          [firstLine],
+          options.cursor
+        );
+        const preprocessedLines = await tmpReader.readLines();
+        if (
+          !(
+            preprocessedLines.length === 1 && preprocessedLines[0] === firstLine
+          )
+        ) {
+          lines.shift();
+          if (preprocessedLines.length > 0) lines.unshift(...preprocessedLines);
+        }
+      }
       const innerDoc = await parentDoc.constructor.create(lines, options);
       if (parentDoctitle) parentDoc.attributes.doctitle = parentDoctitle;
       cell._innerDocument = innerDoc;
@@ -11019,8 +11038,8 @@ class Parser {
           const admStyle = attributes.style ?? blockContext;
           attributes.name = admStyle.toLowerCase();
           attributes.textlabel =
-            (attributes.caption && delete attributes.caption) ??
-            docAttrs[`${attributes.name}-caption`];
+            attributes.caption ?? docAttrs[`${attributes.name}-caption`];
+          delete attributes.caption;
           block = await Parser.buildBlock(
             blockContext,
             'compound',
@@ -16029,8 +16048,8 @@ class Document extends AbstractBlock {
       if ((this.doctype = attrs.doctype = parentDoctype) !== DEFAULT_DOCTYPE) {
         this._updateDoctypeAttributes(DEFAULT_DOCTYPE);
       }
-      // Set up reader only — parsing is deferred to Document.create() / doc.parse().
-      this.reader = new PreprocessorReader(this, data, options.cursor);
+      // Nested documents use a plain Reader (no include/conditional processing), matching Ruby behaviour.
+      this.reader = new Reader(data, options.cursor, { document: this });
       if (this.sourcemap) this.sourceLocation = this.reader.cursor;
     } else {
       this.backend = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asciidoctor/core",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Asciidoctor.js: AsciiDoc in JavaScript powered by Asciidoctor",
   "type": "module",
   "main": "build/node/index.cjs",
@@ -20,7 +20,7 @@
     }
   },
   "engines": {
-    "node": ">=24"
+    "node": ">=20"
   },
   "scripts": {
     "build": "npm run build:data && rollup -c && npm run build:types",
@@ -66,16 +66,16 @@
   },
   "homepage": "https://github.com/asciidoctor/asciidoctor.js",
   "volta": {
-    "node": "24.15.0"
+    "node": "24.16.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.13",
     "typedoc": "^0.28.4",
     "@rollup/plugin-json": "^6.1.0",
     "@types/node": "^25.6.0",
-    "@vitest/browser": "^4.1.4",
-    "@vitest/browser-playwright": "^4.1.4",
-    "@vitest/ui": "^4.1.4",
+    "@vitest/browser": "^4.1.7",
+    "@vitest/browser-playwright": "^4.1.7",
+    "@vitest/ui": "^4.1.7",
     "@xmldom/xmldom": "^0.9.9",
     "dot": "^1.1.3",
     "ejs": "^5.0.2",
@@ -83,7 +83,7 @@
     "linkedom": "^0.18.12",
     "node-html-parser": "^7.1.0",
     "nunjucks": "^3.2.4",
-    "playwright": "^1.59.1",
+    "playwright": "^1.60.0",
     "pug": "^3.0.4",
     "rollup": "^4.60.2",
     "typescript": "^6.0.3",

package/src/abstract_block.js

@@ -626,7 +626,7 @@ export class AbstractBlock extends AbstractNode {
       if (anyContext || contextSelector !== 'section') {
         // optimisation
         // NOTE dlist items can be null
-        for (const b of this.blocks.flat()) {
+        for (const b of this.blocks.flat(Infinity)) {
           if (b) b.#findByInternal(selector, result, filter)
         }
       }

package/src/document.js

@@ -34,7 +34,7 @@ import { XmlSanitizeRx, AttributeEntryPassMacroRx } from './rx.js'
 import { LF } from './constants.js'
 import { applyLogging } from './logging.js'
 import { SyntaxHighlighter, DefaultFactoryProxy } from './syntax_highlighter.js'
-import { PreprocessorReader, Cursor } from './reader.js'
+import { Reader, PreprocessorReader, Cursor } from './reader.js'
 import { Parser } from './parser.js'
 import { Extensions, Registry } from './extensions.js'
 
@@ -483,8 +483,8 @@ export class Document extends AbstractBlock {
       if ((this.doctype = attrs.doctype = parentDoctype) !== DEFAULT_DOCTYPE) {
         this._updateDoctypeAttributes(DEFAULT_DOCTYPE)
       }
-      // Set up reader only — parsing is deferred to Document.create() / doc.parse().
-      this.reader = new PreprocessorReader(this, data, options.cursor)
+      // Nested documents use a plain Reader (no include/conditional processing), matching Ruby behaviour.
+      this.reader = new Reader(data, options.cursor, { document: this })
       if (this.sourcemap) this.sourceLocation = this.reader.cursor
     } else {
       this.backend = null

package/src/parser.js

@@ -1284,8 +1284,8 @@ export class Parser {
           const admStyle = attributes.style ?? blockContext
           attributes.name = admStyle.toLowerCase()
           attributes.textlabel =
-            (attributes.caption && delete attributes.caption) ??
-            docAttrs[`${attributes.name}-caption`]
+            attributes.caption ?? docAttrs[`${attributes.name}-caption`]
+          delete attributes.caption
           block = await Parser.buildBlock(
             blockContext,
             'compound',

package/src/table.js

@@ -14,6 +14,7 @@ import { Inline } from './inline.js'
 import { applyLogging } from './logging.js'
 import { LF, ATTR_REF_HEAD, BASIC_SUBS, NORMAL_SUBS } from './constants.js'
 import { BlankLineRx, LeadingInlineAnchorRx } from './rx.js'
+import { PreprocessorReader } from './reader.js'
 
 /**
  * Truncate a float to `precision` decimal places (like Ruby's Float#truncate).
@@ -474,6 +475,25 @@ class Cell extends AbstractBlock {
     if (cell._innerDocSetup) {
       const { lines, parentDoc, parentDoctitle, options } = cell._innerDocSetup
       cell._innerDocSetup = null
+      // If the first line may be a preprocessor directive (include, ifdef…), expand it using a
+      // temporary PreprocessorReader — matching the Ruby behaviour in table.rb.
+      if (lines.length > 0 && lines[0].includes('::')) {
+        const firstLine = lines[0]
+        const tmpReader = new PreprocessorReader(
+          parentDoc,
+          [firstLine],
+          options.cursor
+        )
+        const preprocessedLines = await tmpReader.readLines()
+        if (
+          !(
+            preprocessedLines.length === 1 && preprocessedLines[0] === firstLine
+          )
+        ) {
+          lines.shift()
+          if (preprocessedLines.length > 0) lines.unshift(...preprocessedLines)
+        }
+      }
       const innerDoc = await parentDoc.constructor.create(lines, options)
       if (parentDoctitle) parentDoc.attributes.doctitle = parentDoctitle
       cell._innerDocument = innerDoc

package/types/document.d.ts

@@ -489,7 +489,7 @@ export namespace Document {
 import { Footnote } from './footnote.js';
 import { AttributeEntry } from './attribute_entry.js';
 import { AbstractBlock } from './abstract_block.js';
-import type { Reader } from './reader.js';
+import { Reader } from './reader.js';
 import { Section } from './section.js';
 import { Inline } from './inline.js';
 export { Footnote, AttributeEntry };

package/types/index.d.cts

@@ -27,14 +27,14 @@ export function load(input: string | string[] | Buffer, options?: any): Promise<
  * @returns {Promise<Document>} - the parsed Document
  */
 export function loadFile(filename: string, options?: any): Promise<Document>;
-export type ProcessorDslInterface = import("./extensions.js").ProcessorDslInterface;
-export type DocumentProcessorDslInterface = import("./extensions.js").DocumentProcessorDslInterface;
-export type SyntaxProcessorDslInterface = import("./extensions.js").SyntaxProcessorDslInterface;
-export type IncludeProcessorDslInterface = import("./extensions.js").IncludeProcessorDslInterface;
-export type DocinfoProcessorDslInterface = import("./extensions.js").DocinfoProcessorDslInterface;
-export type BlockProcessorDslInterface = import("./extensions.js").BlockProcessorDslInterface;
-export type MacroProcessorDslInterface = import("./extensions.js").MacroProcessorDslInterface;
-export type InlineMacroProcessorDslInterface = import("./extensions.js").InlineMacroProcessorDslInterface;
+export type { ProcessorDslInterface } from './extensions.js';
+export type { DocumentProcessorDslInterface } from './extensions.js';
+export type { SyntaxProcessorDslInterface } from './extensions.js';
+export type { IncludeProcessorDslInterface } from './extensions.js';
+export type { DocinfoProcessorDslInterface } from './extensions.js';
+export type { BlockProcessorDslInterface } from './extensions.js';
+export type { MacroProcessorDslInterface } from './extensions.js';
+export type { InlineMacroProcessorDslInterface } from './extensions.js';
 import { Document } from './document.js';
 import { convert } from './convert.js';
 import { convertFile } from './convert.js';

package/types/index.d.ts

@@ -26,14 +26,14 @@ export function load(input: string | string[] | Buffer, options?: any): Promise<
  * @returns {Promise<Document>} - the parsed Document
  */
 export function loadFile(filename: string, options?: any): Promise<Document>;
-export type ProcessorDslInterface = import("./extensions.js").ProcessorDslInterface;
-export type DocumentProcessorDslInterface = import("./extensions.js").DocumentProcessorDslInterface;
-export type SyntaxProcessorDslInterface = import("./extensions.js").SyntaxProcessorDslInterface;
-export type IncludeProcessorDslInterface = import("./extensions.js").IncludeProcessorDslInterface;
-export type DocinfoProcessorDslInterface = import("./extensions.js").DocinfoProcessorDslInterface;
-export type BlockProcessorDslInterface = import("./extensions.js").BlockProcessorDslInterface;
-export type MacroProcessorDslInterface = import("./extensions.js").MacroProcessorDslInterface;
-export type InlineMacroProcessorDslInterface = import("./extensions.js").InlineMacroProcessorDslInterface;
+export type { ProcessorDslInterface } from './extensions.js';
+export type { DocumentProcessorDslInterface } from './extensions.js';
+export type { SyntaxProcessorDslInterface } from './extensions.js';
+export type { IncludeProcessorDslInterface } from './extensions.js';
+export type { DocinfoProcessorDslInterface } from './extensions.js';
+export type { BlockProcessorDslInterface } from './extensions.js';
+export type { MacroProcessorDslInterface } from './extensions.js';
+export type { InlineMacroProcessorDslInterface } from './extensions.js';
 import { Document } from './document.js';
 import { convert } from './convert.js';
 import { convertFile } from './convert.js';