@asciidoctor/core 4.0.0-alpha.1 → 4.0.0-alpha.2

package/build/browser/index.js

@@ -1,4 +1,4 @@
-var version = "4.0.0-alpha.1";
+var version = "4.0.0-alpha.2";
 const packageJson = {
 	version: version};
 
@@ -3743,7 +3743,7 @@ class AbstractBlock extends AbstractNode {
    * - `'reject'` → skip the node and its children
    * - `'stop'` → include the node (if it matched) and stop the entire traversal
    *
-   * @param {Object} [selector={}] - Selector criteria object.
+   * @param {Object|Function} [selector={}] - Selector criteria object, or a filter callback when called as `findBy(callback)`.
    * @param {Function|null} [filter=null] - Per-node filter callback.
    * @returns {AbstractBlock[]} array of matching block-level nodes.
    *
@@ -3758,6 +3758,9 @@ class AbstractBlock extends AbstractNode {
    *
    * @example <caption>All image blocks including those inside AsciiDoc table cells</caption>
    * const images = doc.findBy({ context: 'image', traverseDocuments: true })
+   *
+   * @example <caption>Filter-only shorthand (no selector)</caption>
+   * const verbatim = doc.findBy((b) => b.contentModel === ContentModel.VERBATIM)
    */
   findBy(selector = {}, filter = null) {
     const result = [];
@@ -3766,8 +3769,13 @@ class AbstractBlock extends AbstractNode {
       selector && typeof selector === 'object' && !Array.isArray(selector)
         ? selector
         : {};
-    // Normalise: filter must be a function; ignore string/non-function values (mirrors core API).
-    const normFilter = typeof filter === 'function' ? filter : null;
+    // Normalise: support findBy(callback) shorthand — selector is the filter when it's a function.
+    const normFilter =
+      typeof filter === 'function'
+        ? filter
+        : typeof selector === 'function'
+          ? selector
+          : null;
     try {
       this.#findByInternal(normSelector, result, normFilter);
     } catch (e) {
@@ -20967,10 +20975,7 @@ ${await node.content()}
         img =
           (await this.readSvgContents(node, target)) ||
           `<span class="alt">${node.getAlt()}</span>`;
-      } else if (
-        node.hasOption('interactive') &&
-        node.document.safe >= SafeMode.SERVER
-      ) {
+      } else if (node.hasOption('interactive')) {
         const fallback = node.hasAttribute('fallback')
           ? `<img src="${await node.imageUri(node.getAttribute('fallback'))}" alt="${this._encodeAttrValue(node.getAlt())}"${widthAttr}${heightAttr}${slash}>`
           : `<span class="alt">${node.getAlt()}</span>`;
@@ -21811,10 +21816,7 @@ Your browser does not support the video tag.
           img =
             (await this.readSvgContents(node, target)) ||
             `<span class="alt">${node.getAlt()}</span>`;
-        } else if (
-          node.hasOption('interactive') &&
-          node.document.safe >= SafeMode.SERVER
-        ) {
+        } else if (node.hasOption('interactive')) {
           const fallback = node.hasAttribute('fallback')
             ? `<img src="${await node.imageUri(node.getAttribute('fallback'))}" alt="${this._encodeAttrValue(node.getAlt())}"${attrs}${this._voidSlash}>`
             : `<span class="alt">${node.getAlt()}</span>`;

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.1";
+var version = "4.0.0-alpha.2";
 const packageJson = {
 	version: version};
 
@@ -3750,7 +3750,7 @@ class AbstractBlock extends AbstractNode {
    * - `'reject'` → skip the node and its children
    * - `'stop'` → include the node (if it matched) and stop the entire traversal
    *
-   * @param {Object} [selector={}] - Selector criteria object.
+   * @param {Object|Function} [selector={}] - Selector criteria object, or a filter callback when called as `findBy(callback)`.
    * @param {Function|null} [filter=null] - Per-node filter callback.
    * @returns {AbstractBlock[]} array of matching block-level nodes.
    *
@@ -3765,6 +3765,9 @@ class AbstractBlock extends AbstractNode {
    *
    * @example <caption>All image blocks including those inside AsciiDoc table cells</caption>
    * const images = doc.findBy({ context: 'image', traverseDocuments: true })
+   *
+   * @example <caption>Filter-only shorthand (no selector)</caption>
+   * const verbatim = doc.findBy((b) => b.contentModel === ContentModel.VERBATIM)
    */
   findBy(selector = {}, filter = null) {
     const result = [];
@@ -3773,8 +3776,13 @@ class AbstractBlock extends AbstractNode {
       selector && typeof selector === 'object' && !Array.isArray(selector)
         ? selector
         : {};
-    // Normalise: filter must be a function; ignore string/non-function values (mirrors core API).
-    const normFilter = typeof filter === 'function' ? filter : null;
+    // Normalise: support findBy(callback) shorthand — selector is the filter when it's a function.
+    const normFilter =
+      typeof filter === 'function'
+        ? filter
+        : typeof selector === 'function'
+          ? selector
+          : null;
     try {
       this.#findByInternal(normSelector, result, normFilter);
     } catch (e) {
@@ -21038,10 +21046,7 @@ ${await node.content()}
         img =
           (await this.readSvgContents(node, target)) ||
           `<span class="alt">${node.getAlt()}</span>`;
-      } else if (
-        node.hasOption('interactive') &&
-        node.document.safe >= SafeMode.SERVER
-      ) {
+      } else if (node.hasOption('interactive')) {
         const fallback = node.hasAttribute('fallback')
           ? `<img src="${await node.imageUri(node.getAttribute('fallback'))}" alt="${this._encodeAttrValue(node.getAlt())}"${widthAttr}${heightAttr}${slash}>`
           : `<span class="alt">${node.getAlt()}</span>`;
@@ -21882,10 +21887,7 @@ Your browser does not support the video tag.
           img =
             (await this.readSvgContents(node, target)) ||
             `<span class="alt">${node.getAlt()}</span>`;
-        } else if (
-          node.hasOption('interactive') &&
-          node.document.safe >= SafeMode.SERVER
-        ) {
+        } else if (node.hasOption('interactive')) {
           const fallback = node.hasAttribute('fallback')
             ? `<img src="${await node.imageUri(node.getAttribute('fallback'))}" alt="${this._encodeAttrValue(node.getAlt())}"${attrs}${this._voidSlash}>`
             : `<span class="alt">${node.getAlt()}</span>`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asciidoctor/core",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.2",
   "description": "Asciidoctor.js: AsciiDoc in JavaScript powered by Asciidoctor",
   "type": "module",
   "main": "build/node/index.cjs",
@@ -9,9 +9,14 @@
   "exports": {
     ".": {
       "browser": "./build/browser/index.js",
-      "require": "./build/node/index.cjs",
-      "import": "./src/index.js",
-      "types": "./types/index.d.ts"
+      "require": {
+        "types": "./types/index.d.cts",
+        "default": "./build/node/index.cjs"
+      },
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./src/index.js"
+      }
     }
   },
   "engines": {

package/src/abstract_block.js

@@ -502,7 +502,7 @@ export class AbstractBlock extends AbstractNode {
    * - `'reject'` → skip the node and its children
    * - `'stop'` → include the node (if it matched) and stop the entire traversal
    *
-   * @param {Object} [selector={}] - Selector criteria object.
+   * @param {Object|Function} [selector={}] - Selector criteria object, or a filter callback when called as `findBy(callback)`.
    * @param {Function|null} [filter=null] - Per-node filter callback.
    * @returns {AbstractBlock[]} array of matching block-level nodes.
    *
@@ -517,6 +517,9 @@ export class AbstractBlock extends AbstractNode {
    *
    * @example <caption>All image blocks including those inside AsciiDoc table cells</caption>
    * const images = doc.findBy({ context: 'image', traverseDocuments: true })
+   *
+   * @example <caption>Filter-only shorthand (no selector)</caption>
+   * const verbatim = doc.findBy((b) => b.contentModel === ContentModel.VERBATIM)
    */
   findBy(selector = {}, filter = null) {
     const result = []
@@ -525,8 +528,13 @@ export class AbstractBlock extends AbstractNode {
       selector && typeof selector === 'object' && !Array.isArray(selector)
         ? selector
         : {}
-    // Normalise: filter must be a function; ignore string/non-function values (mirrors core API).
-    const normFilter = typeof filter === 'function' ? filter : null
+    // Normalise: support findBy(callback) shorthand — selector is the filter when it's a function.
+    const normFilter =
+      typeof filter === 'function'
+        ? filter
+        : typeof selector === 'function'
+          ? selector
+          : null
     try {
       this.#findByInternal(normSelector, result, normFilter)
     } catch (e) {

package/src/converter/html5.js

@@ -840,10 +840,7 @@ ${await node.content()}
         img =
           (await this.readSvgContents(node, target)) ||
           `<span class="alt">${node.getAlt()}</span>`
-      } else if (
-        node.hasOption('interactive') &&
-        node.document.safe >= SafeMode.SERVER
-      ) {
+      } else if (node.hasOption('interactive')) {
         const fallback = node.hasAttribute('fallback')
           ? `<img src="${await node.imageUri(node.getAttribute('fallback'))}" alt="${this._encodeAttrValue(node.getAlt())}"${widthAttr}${heightAttr}${slash}>`
           : `<span class="alt">${node.getAlt()}</span>`
@@ -1684,10 +1681,7 @@ Your browser does not support the video tag.
           img =
             (await this.readSvgContents(node, target)) ||
             `<span class="alt">${node.getAlt()}</span>`
-        } else if (
-          node.hasOption('interactive') &&
-          node.document.safe >= SafeMode.SERVER
-        ) {
+        } else if (node.hasOption('interactive')) {
           const fallback = node.hasAttribute('fallback')
             ? `<img src="${await node.imageUri(node.getAttribute('fallback'))}" alt="${this._encodeAttrValue(node.getAlt())}"${attrs}${this._voidSlash}>`
             : `<span class="alt">${node.getAlt()}</span>`

package/types/abstract_block.d.ts

@@ -201,7 +201,7 @@ export abstract class AbstractBlock<TContent extends string | any[] = string> ex
      * - `'reject'` → skip the node and its children
      * - `'stop'` → include the node (if it matched) and stop the entire traversal
      *
-     * @param {Object} [selector={}] - Selector criteria object.
+     * @param {Object|Function} [selector={}] - Selector criteria object, or a filter callback when called as `findBy(callback)`.
      * @param {Function|null} [filter=null] - Per-node filter callback.
      * @returns {AbstractBlock[]} array of matching block-level nodes.
      *
@@ -216,8 +216,11 @@ export abstract class AbstractBlock<TContent extends string | any[] = string> ex
      *
      * @example <caption>All image blocks including those inside AsciiDoc table cells</caption>
      * const images = doc.findBy({ context: 'image', traverseDocuments: true })
+     *
+     * @example <caption>Filter-only shorthand (no selector)</caption>
+     * const verbatim = doc.findBy((b) => b.contentModel === ContentModel.VERBATIM)
      */
-    findBy(selector?: any, filter?: Function | null): AbstractBlock[];
+    findBy(selector?: any | Function, filter?: Function | null): AbstractBlock[];
     /** Alias for {@link findBy}. */
     query(selector?: {}, filter?: any): AbstractBlock<string>[];
     /**

package/types/index.d.cts

@@ -0,0 +1,75 @@
+/// <reference types="node" />
+/**
+ * Get the version of Asciidoctor.js.
+ *
+ * @returns {string} - the version of Asciidoctor.js
+ */
+export function getVersion(): string;
+/**
+ * Get Asciidoctor core version number.
+ *
+ * @returns {string} - the version of Asciidoctor core (Ruby)
+ */
+export function getCoreVersion(): string;
+/**
+ * Parse the AsciiDoc source input into a Document.
+ *
+ * @param {string|string[]|Buffer} input - the AsciiDoc source as a String, String Array, or Buffer
+ * @param {Object} [options={}] - a plain object of options to control processing
+ * @returns {Promise<Document>} - the parsed Document
+ */
+export function load(input: string | string[] | Buffer, options?: any): Promise<Document>;
+/**
+ * Parse the contents of the AsciiDoc source file into a Document.
+ *
+ * @param {string} filename - the path to the AsciiDoc source file
+ * @param {Object} [options={}] - a plain object of options to control processing
+ * @returns {Promise<Document>} - the parsed Document
+ */
+export function loadFile(filename: string, options?: any): Promise<Document>;
+import { Document } from './document.js';
+import { convert } from './convert.js';
+import { convertFile } from './convert.js';
+import { DocumentTitle } from './document.js';
+import { Author } from './document.js';
+import { Footnote } from './document.js';
+import { ImageReference } from './document.js';
+import { RevisionInfo } from './document.js';
+import { Logger } from './logging.js';
+import { AbstractNode } from './abstract_node.js';
+import { AbstractBlock } from './abstract_block.js';
+import { Inline } from './inline.js';
+import { Block } from './block.js';
+import { List } from './list.js';
+import { ListItem } from './list.js';
+import { Section } from './section.js';
+import { Reader } from './reader.js';
+import { SyntaxHighlighterBase } from './syntax_highlighter.js';
+import { LoggerManager } from './logging.js';
+import { MemoryLogger } from './logging.js';
+import { NullLogger } from './logging.js';
+import { SafeMode } from './constants.js';
+import { ContentModel } from './constants.js';
+import { Timings } from './timings.js';
+import { Registry } from './extensions.js';
+import { Processor } from './extensions.js';
+import { ProcessorExtension } from './extensions.js';
+import { Preprocessor } from './extensions.js';
+import { TreeProcessor } from './extensions.js';
+import { Postprocessor } from './extensions.js';
+import { IncludeProcessor } from './extensions.js';
+import { DocinfoProcessor } from './extensions.js';
+import { BlockProcessor } from './extensions.js';
+import { InlineMacroProcessor } from './extensions.js';
+import { BlockMacroProcessor } from './extensions.js';
+import { Extensions } from './extensions.js';
+import { Cursor } from './reader.js';
+import { Converter } from './converter.js';
+import { ConverterBase } from './converter.js';
+import { CustomFactory } from './converter.js';
+import { DefaultFactory as DefaultConverterFactory } from './converter.js';
+import { deriveBackendTraits } from './converter.js';
+import { DefaultFactory as DefaultSyntaxHighlighterFactory } from './syntax_highlighter.js';
+import Html5Converter from './converter/html5.js';
+import { SyntaxHighlighter } from './syntax_highlighter.js';
+export { convert, convertFile, Document, DocumentTitle, Author, Footnote, ImageReference, RevisionInfo, Logger, AbstractNode, AbstractBlock, Inline, Block, List, ListItem, Section, Reader, SyntaxHighlighterBase, LoggerManager, MemoryLogger, NullLogger, SafeMode, ContentModel, Timings, Registry, Processor, ProcessorExtension, Preprocessor, TreeProcessor, Postprocessor, IncludeProcessor, DocinfoProcessor, BlockProcessor, InlineMacroProcessor, BlockMacroProcessor, Extensions, Cursor, Converter as ConverterFactory, ConverterBase, CustomFactory as ConverterCustomFactory, DefaultConverterFactory, deriveBackendTraits, DefaultSyntaxHighlighterFactory, Html5Converter, SyntaxHighlighter };