@markuplint/ml-core 4.13.3 → 5.0.0-alpha.0

package/lib/ml-dom/node/element.d.ts

@@ -3,11 +3,10 @@ import type { MLNamedNodeMap } from './named-node-map.js';
 import type { MLNode } from './node.js';
 import type { MLText } from './text.js';
 import type { ElementNodeType, PretenderContext } from './types.js';
-import type { ElementType, MLASTElement, NamespaceURI } from '@markuplint/ml-ast';
+import type { ElementType, MLASTBlockBehavior, MLASTElement, NamespaceURI } from '@markuplint/ml-ast';
 import type { PlainData, Pretender, RegexSelector, RuleConfigValue, RuleInfo } from '@markuplint/ml-config';
 import type { ARIAVersion } from '@markuplint/ml-spec';
 import type { SelectorMatches } from '@markuplint/selector';
-import { MLToken } from '../token/token.js';
 import { MLAttr } from './attr.js';
 import { MLDomTokenList } from './dom-token-list.js';
 import { MLElementCloseTag } from './element-close-tag.js';
@@ -57,9 +56,9 @@ export declare class MLElement<T extends RuleConfigValue, O extends PlainData =
      */
     pretenderContext: PretenderContext<MLElement<T, O>, T, O> | null;
     /**
-     * The self-closing solidus token (`/`), or null if the element is not self-closing.
+     * Block behavior associated with this element, if any.
      */
-    readonly selfClosingSolidus: MLToken | null;
+    readonly blockBehavior: MLASTBlockBehavior | null;
     /**
      * The tag close character string (e.g., `>` or `/>` or `%>`).
      */
@@ -1836,12 +1835,25 @@ export declare class MLElement<T extends RuleConfigValue, O extends PlainData =
      */
     focus(options?: FocusOptions): void;
     /**
-     * Computes the accessible name of this element according to the
-     * Accessible Name and Description Computation algorithm.
+     * Returns the accessible name of this element, with per-element memoization.
+     *
+     * On the first call for a given ARIA version the full AccName Computation
+     * algorithm runs (tree walk, `aria-labelledby` resolution, `<label>` lookup,
+     * etc.) and the result is stored in {@link #accessibleNameCache}.
+     * Subsequent calls for the same version return the cached value in O(1).
+     *
+     * **All callers that need the accessible name of an MLElement should use
+     * this method** rather than importing `getAccname()` directly, so that
+     * every consumer benefits from the shared cache. This includes the
+     * `:aria(has name)` selector in `@markuplint/selector`, which uses
+     * duck-typing to detect and call this method.
+     *
+     * Added as part of the fix for {@link https://github.com/markuplint/markuplint/issues/2179 | #2179}
+     * to eliminate redundant AccName computation across rules.
      *
      * @implements `@markuplint/ml-core` API: `MLElement`
      * @param version - The ARIA specification version to use for computation
-     * @returns The computed accessible name string
+     * @returns The computed accessible name string (may be empty)
      */
     getAccessibleName(version: ARIAVersion): string;
     /**

package/lib/ml-dom/node/element.js

@@ -1,21 +1,8 @@
 /* global StylePropertyMap, StylePropertyMapReadOnly */
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _MLElement_attributes, _MLElement_fixedNodeName, _MLElement_getChildElementsAndTextNodeWithoutWhitespacesCache, _MLElement_localName, _MLElement_normalizedAttrs, _MLElement_normalizedString;
 import { resolveNamespace } from '@markuplint/ml-spec';
 import { matchSelector } from '@markuplint/selector';
 import { getAccname } from '../helper/accname.js';
 import { after, before, nextElementSibling, previousElementSibling, remove, replaceWith, } from '../manipulations/child-node-methods.js';
-import { MLToken } from '../token/token.js';
 import { MLAttr } from './attr.js';
 import { MLDomTokenList } from './dom-token-list.js';
 import { MLElementCloseTag } from './element-close-tag.js';
@@ -34,6 +21,91 @@ const HTML_NAMESPACE = 'http://www.w3.org/1999/xhtml';
  * @template O - The rule options type
  */
 export class MLElement extends MLParentNode {
+    #attributes;
+    /**
+     * The closing tag for this element, or null if the element is self-closing or void.
+     */
+    closeTag;
+    /**
+     * Element type
+     *
+     * - `html`: From native HTML Standard
+     * - `web-component`: As the Web Component according to HTML Standard
+     * - `authored`:  Authored element (JSX Element etc.) through the view framework or the template engine.
+     */
+    elementType;
+    #fixedNodeName;
+    #getChildElementsAndTextNodeWithoutWhitespacesCache = null;
+    /**
+     * Whether this element belongs to a non-HTML namespace (e.g., SVG or MathML).
+     */
+    isForeignElement;
+    /**
+     * Whether this element was implicitly created (e.g., an omitted `<body>` tag in HTML).
+     */
+    isOmitted;
+    #localName;
+    /**
+     * The namespace URI of this element (e.g., `http://www.w3.org/1999/xhtml` for HTML elements).
+     */
+    namespaceURI;
+    /**
+     * Memoization cache for the accessible name computation, keyed by ARIA version.
+     *
+     * ## Why this cache exists
+     *
+     * Multiple rules and the `:aria(has name)` selector evaluate the accessible name
+     * of every element during a single lint pass. Without caching, the same
+     * expensive tree-walking algorithm (AccName Computation 1.2) runs repeatedly
+     * for the same element — once per consumer. Benchmarks on a 500-element page
+     * show **14,626 total calls** of which **11,573 (79%) are cache hits**,
+     * eliminating redundant computation.
+     *
+     * ## Why memoization is safe
+     *
+     * The MLDOM is **immutable** once constructed — no attributes or child nodes
+     * change during a lint pass. Therefore the accessible name for a given ARIA
+     * version is deterministic and will never become stale. No invalidation
+     * logic is needed. The cache is garbage-collected together with the
+     * MLElement instance when the document is released.
+     *
+     * ## Consumers that benefit
+     *
+     * - `require-accessible-name` rule (direct call)
+     * - `wai-aria` rule via `:aria(has name)` selector
+     * - `neighbor-popovers` rule
+     * - `landmark-roles` rule
+     * - `MLDocument.getAccessibilityProp()` (accessibility tree builder)
+     *
+     * Introduced to resolve {@link https://github.com/markuplint/markuplint/issues/2179 | #2179}
+     * (AccName performance bottleneck).
+     *
+     * @see {@link getAccessibleName} — the public method that reads/writes this cache
+     */
+    #accessibleNameCache = new Map();
+    #normalizedAttrs = new Map();
+    #normalizedString = null;
+    ontouchcancel;
+    ontouchend;
+    ontouchmove;
+    ontouchstart;
+    /**
+     * The pretender context if this element is participating in pretender behavior,
+     * or null if it is not a pretender or pretended element.
+     */
+    pretenderContext = null;
+    /**
+     * Block behavior associated with this element, if any.
+     */
+    blockBehavior;
+    /**
+     * The tag close character string (e.g., `>` or `/>` or `%>`).
+     */
+    tagCloseChar;
+    /**
+     * The tag open character string (e.g., `<` or `<%`).
+     */
+    tagOpenChar;
     /**
      * Creates a new MLElement instance from an AST element node.
      *
@@ -44,29 +116,18 @@ export class MLElement extends MLParentNode {
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     document) {
         super(astNode, document, astNode.isFragment);
-        _MLElement_attributes.set(this, void 0);
-        _MLElement_fixedNodeName.set(this, void 0);
-        _MLElement_getChildElementsAndTextNodeWithoutWhitespacesCache.set(this, null);
-        _MLElement_localName.set(this, void 0);
-        _MLElement_normalizedAttrs.set(this, new Map());
-        _MLElement_normalizedString.set(this, null);
-        /**
-         * The pretender context if this element is participating in pretender behavior,
-         * or null if it is not a pretender or pretended element.
-         */
-        this.pretenderContext = null;
-        __classPrivateFieldSet(this, _MLElement_attributes, astNode.attributes.map(attr => new MLAttr(attr, this)), "f");
-        this.selfClosingSolidus = astNode.selfClosingSolidus ? new MLToken(astNode.selfClosingSolidus) : null;
+        this.#attributes = astNode.attributes.map(attr => new MLAttr(attr, this));
         this.closeTag = astNode.pairNode ? new MLElementCloseTag(astNode.pairNode, document, this) : null;
         const ns = resolveNamespace(astNode.nodeName, astNode.namespace);
-        this.namespaceURI = ns.namespaceURI;
+        this.namespaceURI = astNode.namespace;
         this.elementType = astNode.elementType;
-        __classPrivateFieldSet(this, _MLElement_localName, ns.localName, "f");
+        this.#localName = ns.localName;
         this.isForeignElement = this.namespaceURI !== HTML_NAMESPACE;
-        __classPrivateFieldSet(this, _MLElement_fixedNodeName, astNode.nodeName, "f");
+        this.#fixedNodeName = astNode.nodeName;
         this.isOmitted = astNode.isGhost;
         this.tagOpenChar = astNode.tagOpenChar;
         this.tagCloseChar = astNode.tagCloseChar;
+        this.blockBehavior = astNode.blockBehavior;
     }
     /**
      * **IT THROWS AN ERROR WHEN CALLING THIS.**
@@ -622,9 +683,9 @@ export class MLElement extends MLParentNode {
      * @see https://dom.spec.whatwg.org/#dom-element-attributes
      */
     get attributes() {
-        const origin = this.pretenderContext?.type === 'pretender' ? __classPrivateFieldGet(this.pretenderContext.as, _MLElement_attributes, "f") : __classPrivateFieldGet(this, _MLElement_attributes, "f");
-        if (__classPrivateFieldGet(this, _MLElement_normalizedAttrs, "f").has(origin)) {
-            return __classPrivateFieldGet(this, _MLElement_normalizedAttrs, "f").get(origin);
+        const origin = this.pretenderContext?.type === 'pretender' ? this.pretenderContext.as.#attributes : this.#attributes;
+        if (this.#normalizedAttrs.has(origin)) {
+            return this.#normalizedAttrs.get(origin);
         }
         const names = new Set();
         const attrs = [];
@@ -640,7 +701,7 @@ export class MLElement extends MLParentNode {
             attrs.push(attr);
         }
         const map = toNamedNodeMap(attrs);
-        __classPrivateFieldGet(this, _MLElement_normalizedAttrs, "f").set(origin, map);
+        this.#normalizedAttrs.set(origin, map);
         return map;
     }
     /**
@@ -796,13 +857,13 @@ export class MLElement extends MLParentNode {
      * @implements `@markuplint/ml-core` API: `MLElement`
      */
     get fixedNodeName() {
-        return __classPrivateFieldGet(this, _MLElement_fixedNodeName, "f");
+        return this.#fixedNodeName;
     }
     /**
      * Whether this element has any spread attributes (e.g., `{...props}` in JSX).
      */
     get hasSpreadAttr() {
-        return __classPrivateFieldGet(this, _MLElement_attributes, "f").some(attr => attr.localName === '#spread');
+        return this.#attributes.some(attr => attr.localName === '#spread');
     }
     /**
      * **IT THROWS AN ERROR WHEN CALLING THIS.**
@@ -902,12 +963,12 @@ export class MLElement extends MLParentNode {
             return this.pretenderContext.as.localName;
         }
         if (this.isForeignElement || this.elementType !== 'html') {
-            return __classPrivateFieldGet(this, _MLElement_localName, "f");
+            return this.#localName;
         }
         if (this.ownerMLDocument.tagNameCaseSensitive) {
-            return __classPrivateFieldGet(this, _MLElement_localName, "f");
+            return this.#localName;
         }
-        return __classPrivateFieldGet(this, _MLElement_localName, "f").toLowerCase();
+        return this.#localName.toLowerCase();
     }
     /**
      * The element immediately following the specified one in its parent's children list.
@@ -2331,7 +2392,7 @@ export class MLElement extends MLParentNode {
      * @param name - The new node name to set
      */
     fixNodeName(name) {
-        __classPrivateFieldSet(this, _MLElement_fixedNodeName, name, "f");
+        this.#fixedNodeName = name;
     }
     /**
      * **IT THROWS AN ERROR WHEN CALLING THIS.**
@@ -2346,15 +2407,34 @@ export class MLElement extends MLParentNode {
         throw new UnexpectedCallError('Not supported "focus" method');
     }
     /**
-     * Computes the accessible name of this element according to the
-     * Accessible Name and Description Computation algorithm.
+     * Returns the accessible name of this element, with per-element memoization.
+     *
+     * On the first call for a given ARIA version the full AccName Computation
+     * algorithm runs (tree walk, `aria-labelledby` resolution, `<label>` lookup,
+     * etc.) and the result is stored in {@link #accessibleNameCache}.
+     * Subsequent calls for the same version return the cached value in O(1).
+     *
+     * **All callers that need the accessible name of an MLElement should use
+     * this method** rather than importing `getAccname()` directly, so that
+     * every consumer benefits from the shared cache. This includes the
+     * `:aria(has name)` selector in `@markuplint/selector`, which uses
+     * duck-typing to detect and call this method.
+     *
+     * Added as part of the fix for {@link https://github.com/markuplint/markuplint/issues/2179 | #2179}
+     * to eliminate redundant AccName computation across rules.
      *
      * @implements `@markuplint/ml-core` API: `MLElement`
      * @param version - The ARIA specification version to use for computation
-     * @returns The computed accessible name string
+     * @returns The computed accessible name string (may be empty)
      */
     getAccessibleName(version) {
-        return getAccname(this, version);
+        const cached = this.#accessibleNameCache.get(version);
+        if (cached != null) {
+            return cached;
+        }
+        const name = getAccname(this, version);
+        this.#accessibleNameCache.set(version, name);
+        return name;
     }
     /**
      * **IT THROWS AN ERROR WHEN CALLING THIS.**
@@ -2423,7 +2503,7 @@ export class MLElement extends MLParentNode {
      * @returns The attribute value, or null if the attribute is not found
      */
     getAttributePretended(attrName) {
-        for (const attr of __classPrivateFieldGet(this, _MLElement_attributes, "f")) {
+        for (const attr of this.#attributes) {
             if (attr.name.toLowerCase() === attrName.toLowerCase()) {
                 return attr.value;
             }
@@ -2456,7 +2536,7 @@ export class MLElement extends MLParentNode {
      * @returns A frozen array of all attribute tokens
      */
     getAttributeTokens() {
-        return Object.freeze(this.pretenderContext?.type === 'pretender' ? __classPrivateFieldGet(this.pretenderContext.as, _MLElement_attributes, "f") : __classPrivateFieldGet(this, _MLElement_attributes, "f"));
+        return Object.freeze(this.pretenderContext?.type === 'pretender' ? this.pretenderContext.as.#attributes : this.#attributes);
     }
     /**
      * **IT THROWS AN ERROR WHEN CALLING THIS.**
@@ -2476,8 +2556,8 @@ export class MLElement extends MLParentNode {
      * @returns An array of child elements and non-whitespace text nodes
      */
     getChildElementsAndTextNodeWithoutWhitespaces() {
-        if (__classPrivateFieldGet(this, _MLElement_getChildElementsAndTextNodeWithoutWhitespacesCache, "f")) {
-            return __classPrivateFieldGet(this, _MLElement_getChildElementsAndTextNodeWithoutWhitespacesCache, "f");
+        if (this.#getChildElementsAndTextNodeWithoutWhitespacesCache) {
+            return this.#getChildElementsAndTextNodeWithoutWhitespacesCache;
         }
         const filteredNodes = [];
         for (const node of this.childNodes) {
@@ -2494,7 +2574,7 @@ export class MLElement extends MLParentNode {
                 filteredNodes.push(node);
             }
         }
-        __classPrivateFieldSet(this, _MLElement_getChildElementsAndTextNodeWithoutWhitespacesCache, filteredNodes, "f");
+        this.#getChildElementsAndTextNodeWithoutWhitespacesCache = filteredNodes;
         return filteredNodes;
     }
     /**
@@ -2616,7 +2696,7 @@ export class MLElement extends MLParentNode {
     hasMutableChildren(attr = false) {
         for (const child of this.getPureChildNodes()) {
             if (child.is(child.MARKUPLINT_PREPROCESSOR_BLOCK)) {
-                if (child.conditionalType) {
+                if (child.blockBehavior) {
                     continue;
                 }
                 return true;
@@ -2787,7 +2867,7 @@ export class MLElement extends MLParentNode {
             return;
         }
         let nodeName;
-        let namespace = 'html';
+        let namespace = 'http://www.w3.org/1999/xhtml';
         const attributes = [];
         let aria;
         if (typeof pretenderElement === 'string') {
@@ -2795,7 +2875,7 @@ export class MLElement extends MLParentNode {
         }
         else {
             nodeName = pretenderElement.element;
-            namespace = pretenderElement.namespace ?? namespace;
+            namespace = pretenderElement.namespace === 'svg' ? 'http://www.w3.org/2000/svg' : namespace;
             if (pretenderElement.inheritAttrs) {
                 attributes.push(...this._astToken.attributes);
             }
@@ -3077,8 +3157,8 @@ export class MLElement extends MLParentNode {
      * @returns The normalized HTML string of this element
      */
     toNormalizeString() {
-        if (__classPrivateFieldGet(this, _MLElement_normalizedString, "f")) {
-            return __classPrivateFieldGet(this, _MLElement_normalizedString, "f");
+        if (this.#normalizedString) {
+            return this.#normalizedString;
         }
         const children = this.getChildElementsAndTextNodeWithoutWhitespaces();
         const attrs = this.attributes.map(attr => attr.toNormalizeString());
@@ -3092,7 +3172,7 @@ export class MLElement extends MLParentNode {
         });
         const endTag = `</${this.nodeName}>`;
         const normalizedString = `${startTag}${childNodes.join('')}${endTag}`;
-        __classPrivateFieldSet(this, _MLElement_normalizedString, normalizedString, "f");
+        this.#normalizedString = normalizedString;
         return normalizedString;
     }
     /**
@@ -3174,4 +3254,3 @@ export class MLElement extends MLParentNode {
         throw new UnexpectedCallError('Not supported "webkitMatchesSelector" method');
     }
 }
-_MLElement_attributes = new WeakMap(), _MLElement_fixedNodeName = new WeakMap(), _MLElement_getChildElementsAndTextNodeWithoutWhitespacesCache = new WeakMap(), _MLElement_localName = new WeakMap(), _MLElement_normalizedAttrs = new WeakMap(), _MLElement_normalizedString = new WeakMap();

package/lib/ml-dom/node/node-store.js

@@ -1,29 +1,21 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _NodeStore_store;
 import { TargetParserError } from '@markuplint/parser-utils';
 import { log } from '../../debug.js';
 const nodeStoreLog = log.extend('node-store');
 const nodeStoreError = nodeStoreLog.extend('error');
 class NodeStore {
-    constructor() {
-        _NodeStore_store.set(this, new Map());
-    }
+    #store = new Map();
     getNode(astNode) {
         // console.log(`Get: ${astNode.uuid} -> ${astNode.raw.trim()}(${astNode.type})`);
-        const node = __classPrivateFieldGet(this, _NodeStore_store, "f").get(astNode.uuid);
+        const node = this.#store.get(astNode.uuid);
         if (!node) {
             nodeStoreError('Ref ID: %s (%s: "%s")', astNode.uuid, astNode.nodeName, astNode.raw);
-            nodeStoreError('Map: %O', [...__classPrivateFieldGet(this, _NodeStore_store, "f").entries()].map(([id, node]) => ({
+            nodeStoreError('Map: %O', [...this.#store.entries()].map(([id, node]) => ({
                 id,
                 name: node.nodeName,
             })));
             throw new TargetParserError('Broke mapping nodes.', {
-                line: astNode.startLine,
-                col: astNode.startCol,
+                line: astNode.line,
+                col: astNode.col,
                 raw: astNode.raw,
                 nodeName: astNode.nodeName,
             });
@@ -41,10 +33,9 @@ class NodeStore {
             nodeStoreError('Invalid node: %O', node);
         }
         nodeStoreLog('Mapped: %s (%s: "%s")', astNode.uuid, astNode.nodeName, astNode.raw.replaceAll('\n', '⏎').replaceAll('\t', '→'));
-        __classPrivateFieldGet(this, _NodeStore_store, "f").set(astNode.uuid, node);
+        this.#store.set(astNode.uuid, node);
     }
 }
-_NodeStore_store = new WeakMap();
 /**
  * `NodeStore` Singleton
  */

package/lib/ml-dom/node/node.d.ts

@@ -136,6 +136,8 @@ export declare abstract class MLNode<T extends RuleConfigValue, O extends PlainD
     get baseURI(): string;
     /**
      * The list of child nodes that contains `Element`, `Text`, and `Comment`.
+     * Fragment nodes and preprocessor blocks with `each` or `end` block behavior
+     * are transparent — their child nodes are flattened into this list.
      *
      * @readonly
      * @implements DOM API: `Node`
@@ -376,7 +378,7 @@ export declare abstract class MLNode<T extends RuleConfigValue, O extends PlainD
     /**
      * Returns an array of NodeLists representing the conditional child nodes of the current node.
      * Conditional child nodes are nodes that are nested within
-     * **preprocessor blocks** such as `if`, `each`, or `switch`.
+     * **preprocessor blocks** such as `if` or `switch`.
      * Each NodeList represents a branch of conditional child nodes.
      *
      * Note: NodeList doesn't include whitespace nodes.