@markuplint/rules 2.4.3 → 3.0.0-alpha.1

package/lib/permitted-contents/recursive-branch.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recursiveBranch = void 0;
+const matches_selector_1 = require("./matches-selector");
+const order_1 = require("./order");
+const utils_1 = require("./utils");
+function recursiveBranch(model, nodes, specs, options, depth) {
+    if (!(0, utils_1.isModel)(model)) {
+        return (0, order_1.order)(model, nodes, specs, options, depth + 1);
+    }
+    if (typeof model === 'string') {
+        return (0, matches_selector_1.matchesSelector)(model, nodes[0], specs, options, depth);
+    }
+    const collection = new utils_1.Collection(nodes);
+    let lastUnmatched = null;
+    for (const query of model) {
+        const result = (0, matches_selector_1.matchesSelector)(query, collection.unmatched[0], specs, options, depth);
+        collection.addMatched(result.matched);
+        if (result.type === 'MATCHED' || result.type === 'MATCHED_ZERO') {
+            return {
+                type: result.type,
+                matched: collection.matched,
+                unmatched: collection.unmatched,
+                zeroMatch: result.zeroMatch,
+                query: result.query,
+                hint: result.hint,
+            };
+        }
+        lastUnmatched = {
+            type: result.type,
+            matched: collection.matched,
+            unmatched: collection.unmatched,
+            zeroMatch: result.zeroMatch,
+            query: result.query,
+            hint: result.hint,
+        };
+    }
+    if (!lastUnmatched) {
+        throw new Error('Unreachable code');
+    }
+    return lastUnmatched;
+}
+exports.recursiveBranch = recursiveBranch;

package/lib/permitted-contents/represent-transparent-nodes.d.ts

@@ -0,0 +1,6 @@
+import type { ChildNode, Options, Result, Specs } from './types';
+export declare const transparentMode: Map<import("packages/@markuplint/ml-core/lib/ml-dom/node/child-node").MLChildNode<import("./types").TagRule[], Options>, true>;
+export declare function representTransparentNodes(nodes: ChildNode[], specs: Specs, options: Options): {
+    nodes: ChildNode[];
+    errors: Result[];
+};

package/lib/permitted-contents/represent-transparent-nodes.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.representTransparentNodes = exports.transparentMode = void 0;
+const ml_spec_1 = require("@markuplint/ml-spec");
+const order_1 = require("./order");
+const utils_1 = require("./utils");
+exports.transparentMode = new Map();
+function representTransparentNodes(nodes, specs, options) {
+    var _a;
+    const result = [];
+    const errors = [];
+    const parent = (_a = nodes[0]) === null || _a === void 0 ? void 0 : _a.parentElement;
+    if (parent) {
+        const { errors: parentErrors } = representTransparentNodes([parent], specs, options);
+        errors.push(...parentErrors);
+        // if (!Array.isArray(parentRes)) {
+        // 	return parentRes;
+        // }
+    }
+    for (const node of nodes) {
+        if (!node.is(node.ELEMENT_NODE)) {
+            result.push(node);
+            continue;
+        }
+        const models = (0, ml_spec_1.getContentModel)(node, specs.specs);
+        if (models == null || typeof models === 'boolean') {
+            result.push(node);
+            continue;
+        }
+        const noTransparentModels = models.filter(m => !(0, utils_1.isTransparent)(m));
+        if (noTransparentModels.length === models.length) {
+            result.push(node);
+            continue;
+        }
+        const collection = new utils_1.Collection((0, utils_1.getChildNodesWithoutWhitespaces)(node));
+        let unmatched;
+        if (noTransparentModels.length) {
+            const result = (0, order_1.order)(noTransparentModels, collection.unmatched, specs, options, Infinity);
+            unmatched = result.unmatched;
+        }
+        else {
+            unmatched = collection.unmatched;
+        }
+        const transparent = models.find(m => (0, utils_1.isTransparent)(m));
+        if (!transparent || !(0, utils_1.isTransparent)(transparent)) {
+            throw new Error('Unreachable code');
+        }
+        for (const _child of unmatched) {
+            const child = _child;
+            if (exports.transparentMode.has(child)) {
+                continue;
+            }
+            exports.transparentMode.set(child, true);
+            if (child.is(child.ELEMENT_NODE)) {
+                const transparentCondMatched = (0, utils_1.matches)(transparent.transparent, child, specs);
+                if (!transparentCondMatched.matched) {
+                    errors.push({
+                        type: 'TRANSPARENT_MODEL_DISALLOWS',
+                        matched: [],
+                        unmatched: [node],
+                        zeroMatch: false,
+                        query: transparent.transparent,
+                        hint: {
+                            not: transparentCondMatched.not,
+                            transparent: node,
+                        },
+                    });
+                    continue;
+                }
+            }
+            result.push(child);
+        }
+    }
+    return {
+        nodes: result,
+        errors,
+    };
+}
+exports.representTransparentNodes = representTransparentNodes;

package/lib/permitted-contents/start.d.ts

@@ -0,0 +1,12 @@
+import type { ContentModelResult, Element, Options, Specs } from './types';
+import type { ContentModel } from '@markuplint/ml-spec';
+/**
+ * Check start
+ *
+ * @param contents
+ * @param el
+ * @param specs
+ * @param options
+ * @returns
+ */
+export declare function start(contents: ContentModel['contents'], el: Element, specs: Specs, options: Options): ContentModelResult[];

package/lib/permitted-contents/start.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.start = void 0;
+const order_1 = require("./order");
+const represent_transparent_nodes_1 = require("./represent-transparent-nodes");
+const utils_1 = require("./utils");
+/**
+ * Check start
+ *
+ * @param contents
+ * @param el
+ * @param specs
+ * @param options
+ * @returns
+ */
+function start(contents, el, specs, options) {
+    var _a;
+    if (contents === false) {
+        if (el.childNodes.length) {
+            return [
+                {
+                    type: 'VOID_ELEMENT',
+                    scope: el,
+                    query: ':not(*)',
+                    hint: {},
+                },
+            ];
+        }
+        return [
+            {
+                type: 'MATCHED',
+                scope: el,
+                query: '*',
+                hint: {},
+            },
+        ];
+    }
+    if (contents === true) {
+        // Allows all elements
+        return [
+            {
+                type: 'MATCHED',
+                scope: el,
+                query: '*',
+                hint: {},
+            },
+        ];
+    }
+    const { nodes, errors } = (0, represent_transparent_nodes_1.representTransparentNodes)((0, utils_1.getChildNodesWithoutWhitespaces)(el), specs, options);
+    const result = (0, order_1.order)(contents, nodes, specs, options, 0);
+    return [
+        {
+            type: result.type,
+            scope: result.type === 'MISSING_NODE_REQUIRED' || result.type === 'MISSING_NODE_ONE_OR_MORE'
+                ? el
+                : (_a = result.unmatched[0]) !== null && _a !== void 0 ? _a : el,
+            query: result.query,
+            hint: result.hint,
+        },
+        ...errors.map(error => {
+            var _a;
+            return ({
+                type: error.type,
+                scope: (_a = error.unmatched[0]) !== null && _a !== void 0 ? _a : el,
+                query: error.query,
+                hint: error.hint,
+            });
+        }),
+    ];
+}
+exports.start = start;

package/lib/permitted-contents/transparent.d.ts

@@ -0,0 +1,2 @@
+import type { ChildNode, Options, Result, Specs } from './types';
+export declare function transparent(nodes: ChildNode[], specs: Specs, options: Options, depth: number): Result;

package/lib/permitted-contents/transparent.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transparent = void 0;
+const count_pattern_1 = require("./count-pattern");
+const debug_1 = require("./debug");
+const utils_1 = require("./utils");
+const transparentLog = debug_1.cmLog.extend('transparent');
+function transparent(nodes, specs, options, depth) {
+    var _a;
+    if (nodes.length === 0 || ((_a = nodes[0].parentElement) === null || _a === void 0 ? void 0 : _a.parentElement)) {
+        transparentLog('Skipped');
+        return {
+            type: nodes.length === 0 ? 'MATCHED_ZERO' : 'MATCHED',
+            matched: nodes.slice(),
+            unmatched: [],
+            zeroMatch: nodes.length === 0,
+            query: 'transparent',
+            hint: {},
+        };
+    }
+    transparentLog('Transparent model element is component root');
+    const collection = new utils_1.Collection(nodes);
+    const result = (0, count_pattern_1.countPattern)({ zeroOrMore: ':model(flow)' }, collection.unmatched, specs, options, depth);
+    collection.addMatched(result.matched);
+    return {
+        type: result.type,
+        matched: collection.matched,
+        unmatched: collection.unmatched,
+        zeroMatch: result.zeroMatch,
+        query: result.query,
+        hint: result.hint,
+    };
+}
+exports.transparent = transparent;

package/lib/permitted-contents/types.d.ts

@@ -0,0 +1,45 @@
+import type { Element as _Element } from '@markuplint/ml-core';
+import type { ContentModel, MLMLSpec } from '@markuplint/ml-spec';
+export declare type Element = _Element<TagRule[], Options>;
+export declare type ChildNode = Element['childNodes'][0];
+export declare type Specs = {
+    cites: MLMLSpec['cites'];
+    def: MLMLSpec['def'];
+    specs: {
+        name: string;
+        contentModel: {
+            contents: MLMLSpec['specs'][0]['contentModel']['contents'];
+        };
+    }[];
+};
+export declare type ContentModelResult = {
+    type: MatchedReason | UnmatchedReason;
+    scope: ChildNode;
+    query: Result['query'];
+    hint: Result['hint'];
+};
+export declare type Result<T extends string = MatchedReason> = {
+    type: MatchedReason | UnmatchedReason | T;
+    matched: ChildNode[];
+    unmatched: ChildNode[];
+    zeroMatch: boolean;
+    query: string;
+    hint: {
+        max?: number;
+        not?: ChildNode;
+        transparent?: Element;
+    };
+};
+export declare type MatchedReason = 'MATCHED' | 'MATCHED_ZERO';
+export declare type UnmatchedReason = 'VOID_ELEMENT' | 'UNEXPECTED_EXTRA_NODE' | 'TRANSPARENT_MODEL_DISALLOWS' | MissingNodeReason;
+export declare type MissingNodeReason = 'MISSING_NODE_REQUIRED' | 'MISSING_NODE_ONE_OR_MORE';
+export declare type TransparentModel = {
+    el: Element;
+    additionalCondition: string;
+};
+export declare type TagRule = {
+    tag: string;
+} & ContentModel;
+export declare type Options = {
+    ignoreHasMutableChildren: boolean;
+};

package/lib/permitted-contents/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/permitted-contents/utils.d.ts

@@ -0,0 +1,32 @@
+import type { ChildNode, Element, Specs } from './types';
+import type { PermittedContentPattern, PermittedContentChoice, PermittedContentOneOrMore, PermittedContentOptional, PermittedContentRequire, PermittedContentTransparent, PermittedContentZeroOrMore, Model } from '@markuplint/ml-spec';
+export declare function getChildNodesWithoutWhitespaces(el: Element): ChildNode[];
+export declare function isModel(model: Model | PermittedContentPattern[]): model is Model;
+export declare function matches(selector: string, node: ChildNode, specs: Specs): {
+    matched: boolean;
+    not?: undefined;
+} | {
+    matched: boolean;
+    not: import("packages/@markuplint/ml-core/lib/ml-dom/node/child-node").MLChildNode<import("./types").TagRule[], import("./types").Options> | undefined;
+};
+export declare function isRequire(content: PermittedContentPattern): content is PermittedContentRequire;
+export declare function isOptional(content: PermittedContentPattern): content is PermittedContentOptional;
+export declare function isOneOrMore(content: PermittedContentPattern): content is PermittedContentOneOrMore;
+export declare function isZeroOrMore(content: PermittedContentPattern): content is PermittedContentZeroOrMore;
+export declare function isChoice(content: PermittedContentPattern): content is PermittedContentChoice;
+export declare function isTransparent(content: PermittedContentPattern): content is PermittedContentTransparent;
+export declare class Collection {
+    #private;
+    constructor(origin: readonly ChildNode[]);
+    get matched(): import("packages/@markuplint/ml-core/lib/ml-dom/node/child-node").MLChildNode<import("./types").TagRule[], import("./types").Options>[];
+    get matchedCount(): number;
+    get nodes(): import("packages/@markuplint/ml-core/lib/ml-dom/node/child-node").MLChildNode<import("./types").TagRule[], import("./types").Options>[];
+    get unmatched(): import("packages/@markuplint/ml-core/lib/ml-dom/node/child-node").MLChildNode<import("./types").TagRule[], import("./types").Options>[];
+    addMatched(nodes: ChildNode[]): boolean;
+    back(): void;
+    lock(): void;
+    max(max: number): void;
+    toString(highlightExtraNodes?: boolean): string;
+}
+export declare class UnsupportedError extends Error {
+}

package/lib/permitted-contents/utils.js

@@ -0,0 +1,184 @@
+"use strict";
+var _Collection_locked, _Collection_matched, _Collection_nodes, _Collection_origin;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnsupportedError = exports.Collection = exports.isTransparent = exports.isChoice = exports.isZeroOrMore = exports.isOneOrMore = exports.isOptional = exports.isRequire = exports.matches = exports.isModel = exports.getChildNodesWithoutWhitespaces = void 0;
+const tslib_1 = require("tslib");
+const selector_1 = require("@markuplint/selector");
+const ansi_colors_1 = require("ansi-colors");
+const represent_transparent_nodes_1 = require("./represent-transparent-nodes");
+const getChildNodesWithoutWhitespacesCaches = new Map();
+function getChildNodesWithoutWhitespaces(el) {
+    let nodes = getChildNodesWithoutWhitespacesCaches.get(el);
+    if (nodes) {
+        return nodes;
+    }
+    nodes = Array.from(el.childNodes).filter(node => {
+        return !(node.is(node.TEXT_NODE) && node.isWhitespace());
+    });
+    getChildNodesWithoutWhitespacesCaches.set(el, nodes);
+    return nodes;
+}
+exports.getChildNodesWithoutWhitespaces = getChildNodesWithoutWhitespaces;
+function isModel(model) {
+    if (typeof model === 'string') {
+        return true;
+    }
+    let modelMode = false;
+    for (const m of model) {
+        if (typeof m === 'string') {
+            modelMode = true;
+            continue;
+        }
+        if (modelMode) {
+            throw new TypeError(`Invalid schema: ${JSON.stringify(model)}`);
+        }
+    }
+    return modelMode;
+}
+exports.isModel = isModel;
+function matches(selector, node, specs) {
+    const selectorResult = (0, selector_1.createSelector)(selector, specs).search(node);
+    const matched = selectorResult.filter((r) => r.matched);
+    if (matched.length) {
+        return {
+            matched: true,
+        };
+    }
+    const not = selectorResult
+        .map(r => { var _a; return (r.matched ? [] : (_a = r.not) !== null && _a !== void 0 ? _a : []); })
+        .flat()
+        .map(descendants)
+        .flat()
+        .shift();
+    return {
+        matched: false,
+        not,
+    };
+}
+exports.matches = matches;
+function descendants(selectorResult) {
+    let nodes = selectorResult.nodes.slice();
+    while (selectorResult.has.length) {
+        for (const dep of selectorResult.has) {
+            if (!dep.has.length) {
+                nodes = dep.nodes;
+                continue;
+            }
+            selectorResult = dep;
+            continue;
+        }
+        break;
+    }
+    return nodes;
+}
+function isRequire(content) {
+    return 'require' in content;
+}
+exports.isRequire = isRequire;
+function isOptional(content) {
+    return 'optional' in content;
+}
+exports.isOptional = isOptional;
+function isOneOrMore(content) {
+    return 'oneOrMore' in content;
+}
+exports.isOneOrMore = isOneOrMore;
+function isZeroOrMore(content) {
+    return 'zeroOrMore' in content;
+}
+exports.isZeroOrMore = isZeroOrMore;
+function isChoice(content) {
+    return 'choice' in content;
+}
+exports.isChoice = isChoice;
+function isTransparent(content) {
+    return 'transparent' in content;
+}
+exports.isTransparent = isTransparent;
+class Collection {
+    constructor(origin) {
+        _Collection_locked.set(this, new Set());
+        _Collection_matched.set(this, new Set());
+        _Collection_nodes.set(this, void 0);
+        _Collection_origin.set(this, void 0);
+        tslib_1.__classPrivateFieldSet(this, _Collection_origin, origin.slice(), "f");
+        tslib_1.__classPrivateFieldSet(this, _Collection_nodes, new Set(tslib_1.__classPrivateFieldGet(this, _Collection_origin, "f")), "f");
+    }
+    get matched() {
+        return Array.from(tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f"));
+    }
+    get matchedCount() {
+        return tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f").size;
+    }
+    get nodes() {
+        return tslib_1.__classPrivateFieldGet(this, _Collection_origin, "f").slice();
+    }
+    get unmatched() {
+        return Array.from(tslib_1.__classPrivateFieldGet(this, _Collection_nodes, "f")).filter(n => !tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f").has(n));
+    }
+    addMatched(nodes) {
+        const i = tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f").size;
+        for (const node of nodes) {
+            if (!tslib_1.__classPrivateFieldGet(this, _Collection_nodes, "f").has(node)) {
+                throw new ReferenceError(`External Node: ${node.nodeName}`);
+            }
+            tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f").add(node);
+        }
+        return i < tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f").size;
+    }
+    back() {
+        tslib_1.__classPrivateFieldSet(this, _Collection_matched, new Set(tslib_1.__classPrivateFieldGet(this, _Collection_locked, "f")), "f");
+    }
+    lock() {
+        tslib_1.__classPrivateFieldSet(this, _Collection_locked, new Set(tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f")), "f");
+    }
+    max(max) {
+        const sliced = Array.from(tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f")).slice(max);
+        sliced.forEach(n => tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f").delete(n));
+    }
+    toString(highlightExtraNodes = false) {
+        const out = [];
+        for (const n of tslib_1.__classPrivateFieldGet(this, _Collection_origin, "f")) {
+            const raw = n.is(n.TEXT_NODE) ? `:text(${n.raw.replace(/\n/g, '\\n')})` : n.raw;
+            if (tslib_1.__classPrivateFieldGet(this, _Collection_locked, "f").has(n)) {
+                if (represent_transparent_nodes_1.transparentMode.has(n)) {
+                    out.push(ansi_colors_1.bgBlue.bold(raw));
+                }
+                else {
+                    out.push(ansi_colors_1.bgGreen.bold(raw));
+                }
+                continue;
+            }
+            if (tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f").has(n)) {
+                if (represent_transparent_nodes_1.transparentMode.has(n)) {
+                    out.push(ansi_colors_1.blue.bold(raw));
+                }
+                else {
+                    out.push(ansi_colors_1.green.bold(raw));
+                }
+                continue;
+            }
+            if (highlightExtraNodes) {
+                if (represent_transparent_nodes_1.transparentMode.has(n)) {
+                    out.push(ansi_colors_1.bgMagenta.bold(raw));
+                }
+                else {
+                    out.push(ansi_colors_1.bgRed.bold(raw));
+                }
+                continue;
+            }
+            if (represent_transparent_nodes_1.transparentMode.has(n)) {
+                out.push((0, ansi_colors_1.cyan)(raw));
+            }
+            else {
+                out.push(raw);
+            }
+        }
+        return `[ ${out.join(', ')} ]`;
+    }
+}
+exports.Collection = Collection;
+_Collection_locked = new WeakMap(), _Collection_matched = new WeakMap(), _Collection_nodes = new WeakMap(), _Collection_origin = new WeakMap();
+class UnsupportedError extends Error {
+}
+exports.UnsupportedError = UnsupportedError;

package/lib/require-accessible-name/index.d.ts

@@ -1,2 +1,6 @@
-declare const _default: import("@markuplint/ml-core").RuleSeed<boolean, null>;
+import type { ARIAVersion } from '@markuplint/ml-spec';
+declare type Option = {
+    ariaVersion: ARIAVersion;
+};
+declare const _default: import("@markuplint/ml-core").RuleSeed<boolean, Option>;
 export default _default;

package/lib/require-accessible-name/index.js

@@ -3,20 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ml_core_1 = require("@markuplint/ml-core");
 const helpers_1 = require("../helpers");
 exports.default = (0, ml_core_1.createRule)({
+    defaultOptions: {
+        ariaVersion: '1.2',
+    },
     async verify({ document, report, t }) {
         await document.walkOn('Element', el => {
+            var _a;
+            if (((_a = el.pretenderContext) === null || _a === void 0 ? void 0 : _a.type) === 'pretender') {
+                return;
+            }
             if ((0, helpers_1.accnameMayBeMutable)(el, document)) {
                 return;
             }
-            const role = (0, helpers_1.getComputedRole)(document.specs, el);
-            if (!role) {
+            const computed = (0, ml_core_1.getComputedRole)(document.specs, el, el.rule.option.ariaVersion);
+            if (!computed.role) {
                 return;
             }
-            const roleSpec = (0, helpers_1.getRoleSpec)(document.specs, role.name);
+            const roleSpec = (0, ml_core_1.getRoleSpec)(document.specs, computed.role.name, el.namespaceURI, el.rule.option.ariaVersion);
             if (!roleSpec || !roleSpec.accessibleNameRequired) {
                 return;
             }
-            const hasAccessibleName = !!el.getAccessibleName().trim();
+            const hasAccessibleName = !!el.getAccessibleName(el.rule.option.ariaVersion).trim();
             if (!hasAccessibleName) {
                 report({ scope: el, message: t('Require {0}', 'accessible name') });
             }

package/lib/required-attr/index.js

@@ -5,15 +5,14 @@ const helpers_1 = require("../helpers");
 exports.default = (0, ml_core_1.createRule)({
     defaultValue: [],
     async verify({ document, report, t }) {
-        await document.walkOn('Element', node => {
-            var _a;
-            if (node.hasSpreadAttr) {
+        await document.walkOn('Element', el => {
+            if (el.hasSpreadAttr) {
                 return;
             }
-            const customRequiredAttrs = typeof node.rule.value === 'string' ? [node.rule.value] : node.rule.value;
-            const attrSpec = (0, ml_core_1.getAttrSpecs)(node.nameWithNS, document.specs);
+            const customRequiredAttrs = typeof el.rule.value === 'string' ? [el.rule.value] : el.rule.value;
+            const attrSpec = (0, ml_core_1.getAttrSpecs)(el, document.specs);
             const attributeSpecs = {};
-            if (attrSpec && !node.isCustomElement) {
+            if (attrSpec && el.elementType === 'html') {
                 for (const spec of attrSpec) {
                     if (spec.required || spec.requiredEither || spec.condition) {
                         attributeSpecs[spec.name] = {
@@ -45,46 +44,38 @@ exports.default = (0, ml_core_1.createRule)({
                 };
             }
             for (const spec of Object.values(attributeSpecs)) {
-                const didntHave = !node.hasAttribute(spec.name);
+                const didntHave = !el.hasAttribute(spec.name);
                 let invalid = false;
                 if (spec.requiredEither) {
                     const candidate = [...spec.requiredEither, spec.name];
-                    invalid = !candidate.some(attrName => node.hasAttribute(attrName));
+                    invalid = !candidate.some(attrName => el.hasAttribute(attrName));
                 }
                 else if (spec.required === true) {
-                    invalid = (0, helpers_1.attrMatches)(node, spec.condition) && didntHave;
+                    invalid = (0, helpers_1.attrMatches)(el, spec.condition) && didntHave;
                 }
                 else if (spec.required) {
-                    if ('ancestor' in spec.required && spec.required.ancestor) {
-                        const ancestorList = Array.isArray(spec.required.ancestor)
-                            ? spec.required.ancestor
-                            : [spec.required.ancestor];
-                        const ancestors = ancestorList
-                            .join(',')
-                            .split(',')
-                            .map(a => a.trim());
-                        invalid = ancestors.some(a => node.closest(a)) && didntHave;
-                    }
+                    const selector = Array.isArray(spec.required) ? spec.required.join(',') : spec.required;
+                    invalid = el.matches(selector) && didntHave;
                 }
                 if (invalid) {
-                    const message = t('{0} expects {1}', t('the "{0*}" {1}', node.nodeName, 'element'), t('the "{0*}" {1}', spec.name, 'attribute'));
+                    const message = t('{0} expects {1}', t('the "{0*}" {1}', el.localName, 'element'), t('the "{0*}" {1}', spec.name, 'attribute'));
                     report({
-                        scope: node,
+                        scope: el,
                         message,
                     });
                 }
-                const value = node.getAttribute(spec.name);
+                const value = el.getAttribute(spec.name);
                 if (spec.values.length && value) {
                     const matched = spec.values.some(pattern => (0, helpers_1.match)(value, pattern));
                     if (!matched) {
                         const expects = spec.values.length === 1 ? t(spec.values) : t('either {0}', t(spec.values));
                         const message = t('{0} expects {1}', t('the "{0*}" {1}', spec.name, 'attribute'), expects);
-                        const attrToken = node.getAttributeToken(spec.name);
-                        const valueToken = ((_a = attrToken[0]) === null || _a === void 0 ? void 0 : _a.attrType) === 'html-attr' ? attrToken[0].valueNode : null;
+                        const attrToken = el.getAttributeToken(spec.name);
+                        const valueToken = attrToken[0].valueNode;
                         const token = valueToken || attrToken[0];
                         report({
                             scope: {
-                                rule: node.rule,
+                                rule: el.rule,
                                 raw: token.raw,
                                 startCol: token.startCol,
                                 startLine: token.startLine,

package/lib/required-element/index.d.ts

@@ -1,5 +1,5 @@
 declare type Options = {
-    ignoreHasMutableContents?: boolean;
+    ignoreHasMutableContents: boolean;
 };
 declare const _default: import("@markuplint/ml-core").RuleSeed<string[], Options>;
 export default _default;