@markuplint/rules 2.4.2 → 3.0.0-alpha.66

package/lib/no-refer-to-non-existent-id/index.js

@@ -1,106 +1,100 @@
 "use strict";
 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 }) {
-        const { ariaAttrs } = (0, helpers_1.ariaSpec)(document.specs);
         const idList = new Set();
         let hasDynamicId = false;
-        await document.walkOn('Element', el => {
-            for (const attr of el.attributes) {
-                if (attr.getName().potential.toLowerCase() !== 'id') {
-                    continue;
-                }
-                if (attr.attrType === 'html-attr') {
-                    if (attr.isDynamicValue) {
-                        hasDynamicId = true;
-                    }
-                    idList.add(attr.getValue().potential);
-                }
-                else {
-                    if (attr.valueType !== 'code') {
-                        idList.add(attr.getValue().potential);
-                    }
-                }
+        await document.walkOn('Attr', attr => {
+            if (attr.name.toLowerCase() !== 'id') {
+                return;
+            }
+            if (attr.isDynamicValue) {
+                hasDynamicId = true;
+            }
+            if (attr.valueType !== 'code') {
+                idList.add(attr.value);
             }
         });
         if (hasDynamicId) {
             return;
         }
-        document.walkOn('Element', el => {
-            const attrSpec = (0, ml_core_1.getAttrSpecs)(el.nameWithNS, document.specs);
+        await document.walkOn('Attr', attr => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            const attrSpec = (0, ml_core_1.getAttrSpecs)(attr.ownerElement, document.specs);
             if (!attrSpec) {
                 return;
             }
-            for (const attr of el.attributes) {
-                if (attr.attrType !== 'html-attr' || attr.isDynamicValue) {
-                    continue;
+            if (attr.isDynamicValue) {
+                return;
+            }
+            const name = attr.name;
+            if (name.toLowerCase() === 'id') {
+                return;
+            }
+            const value = attr.value;
+            const spec = attrSpec.find(s => s.name === name);
+            if (spec) {
+                // DOMID and DOMID List do not become in the array type.
+                if (Array.isArray(spec.type)) {
+                    return;
                 }
-                const name = attr.getName().potential;
-                if (name.toLowerCase() === 'id') {
-                    continue;
+                if (spec.type === 'DOMID' && !idList.has(value)) {
+                    report({
+                        scope: attr,
+                        line: (_a = attr.valueNode) === null || _a === void 0 ? void 0 : _a.startLine,
+                        col: (_b = attr.valueNode) === null || _b === void 0 ? void 0 : _b.startCol,
+                        raw: (_c = attr.valueNode) === null || _c === void 0 ? void 0 : _c.raw,
+                        message: t('Missing {0}', t('"{0*}" ID', value)),
+                    });
                 }
-                const value = attr.getValue().potential;
-                const spec = attrSpec.find(s => s.name === name);
-                if (spec) {
-                    // DOMID and DOMID List do not become in the array type.
-                    if (Array.isArray(spec.type)) {
-                        continue;
-                    }
-                    if (spec.type === 'DOMID' && !idList.has(value)) {
-                        report({
-                            scope: el,
-                            line: attr.valueNode.startLine,
-                            col: attr.valueNode.startCol,
-                            raw: attr.valueNode.raw,
-                            message: t('Missing {0}', t('"{0*}" ID', value)),
-                        });
-                    }
-                    if (typeof spec.type !== 'string' && 'token' in spec.type && spec.type.token === 'DOMID') {
-                        const refs = value
-                            .split(spec.type.separator === 'space' ? /\s/ : ',')
-                            .map(id => id.trim())
-                            .filter(_ => _);
-                        for (const ref of refs) {
-                            if (!idList.has(ref)) {
-                                report({
-                                    scope: el,
-                                    line: attr.valueNode.startLine,
-                                    col: attr.valueNode.startCol,
-                                    raw: attr.valueNode.raw,
-                                    message: t('Missing {0}', t('"{0*}" ID', ref)),
-                                });
-                            }
+                if (typeof spec.type !== 'string' && 'token' in spec.type && spec.type.token === 'DOMID') {
+                    const refs = value
+                        .split(spec.type.separator === 'space' ? /\s/ : ',')
+                        .map(id => id.trim())
+                        .filter(_ => _);
+                    for (const ref of refs) {
+                        if (!idList.has(ref)) {
+                            report({
+                                scope: attr,
+                                line: (_d = attr.valueNode) === null || _d === void 0 ? void 0 : _d.startLine,
+                                col: (_e = attr.valueNode) === null || _e === void 0 ? void 0 : _e.startCol,
+                                raw: (_f = attr.valueNode) === null || _f === void 0 ? void 0 : _f.raw,
+                                message: t('Missing {0}', t('"{0*}" ID', ref)),
+                            });
                         }
                     }
                 }
-                const aria = ariaAttrs.find(aria => aria.name === name);
-                if (aria) {
-                    if (aria.value === 'ID reference' && !idList.has(value)) {
-                        report({
-                            scope: el,
-                            line: attr.valueNode.startLine,
-                            col: attr.valueNode.startCol,
-                            raw: attr.valueNode.raw,
-                            message: t('Missing {0}', t('"{0*}" ID', value)),
-                        });
-                    }
-                    else if (aria.value === 'ID reference list') {
-                        const refs = value
-                            .split(/\s/)
-                            .map(id => id.trim())
-                            .filter(_ => _);
-                        for (const ref of refs) {
-                            if (!idList.has(ref)) {
-                                report({
-                                    scope: el,
-                                    line: attr.valueNode.startLine,
-                                    col: attr.valueNode.startCol,
-                                    raw: attr.valueNode.raw,
-                                    message: t('Missing {0}', t('"{0*}" ID', ref)),
-                                });
-                            }
+            }
+            const { props } = (0, ml_core_1.ariaSpecs)(document.specs, attr.rule.option.ariaVersion);
+            const aria = props.find(prop => prop.name === name);
+            if (aria) {
+                if (aria.value === 'ID reference' && !idList.has(value)) {
+                    report({
+                        scope: attr,
+                        line: (_g = attr.valueNode) === null || _g === void 0 ? void 0 : _g.startLine,
+                        col: (_h = attr.valueNode) === null || _h === void 0 ? void 0 : _h.startCol,
+                        raw: (_j = attr.valueNode) === null || _j === void 0 ? void 0 : _j.raw,
+                        message: t('Missing {0}', t('"{0*}" ID', value)),
+                    });
+                }
+                else if (aria.value === 'ID reference list') {
+                    const refs = value
+                        .split(/\s/)
+                        .map(id => id.trim())
+                        .filter(_ => _);
+                    for (const ref of refs) {
+                        if (!idList.has(ref)) {
+                            report({
+                                scope: attr,
+                                line: (_k = attr.valueNode) === null || _k === void 0 ? void 0 : _k.startLine,
+                                col: (_l = attr.valueNode) === null || _l === void 0 ? void 0 : _l.startCol,
+                                raw: (_m = attr.valueNode) === null || _m === void 0 ? void 0 : _m.raw,
+                                message: t('Missing {0}', t('"{0*}" ID', ref)),
+                            });
                         }
                     }
                 }

package/lib/no-use-event-handler-attr/index.js

@@ -6,32 +6,30 @@ exports.default = (0, ml_core_1.createRule)({
     defaultServerity: 'warning',
     defaultOptions: {},
     async verify({ document, report, t }) {
-        await document.walkOn('Element', el => {
-            if (el.isCustomElement) {
+        await document.walkOn('Attr', attr => {
+            if (attr.ownerElement.isCustomElement) {
                 return;
             }
-            const ignoreList = Array.isArray(el.rule.option.ignore)
-                ? el.rule.option.ignore
-                : el.rule.option.ignore
-                    ? [el.rule.option.ignore]
+            const ignoreList = Array.isArray(attr.rule.option.ignore)
+                ? attr.rule.option.ignore
+                : attr.rule.option.ignore
+                    ? [attr.rule.option.ignore]
                     : [];
-            el.attributes.forEach(attr => {
-                const name = attr.getName().potential;
-                for (const ignore of ignoreList) {
-                    if ((0, helpers_1.match)(name, ignore)) {
-                        return;
-                    }
+            const name = attr.name;
+            for (const ignore of ignoreList) {
+                if ((0, helpers_1.match)(name, ignore)) {
+                    return;
                 }
-                if (/^on/i.test(name)) {
-                    report({
-                        scope: el,
-                        raw: attr.raw,
-                        line: attr.startLine,
-                        col: attr.startCol,
-                        message: t('{0} is disallowed', t('the "{0*}" {1}', name, 'attribute')),
-                    });
-                }
-            });
+            }
+            if (/^on/i.test(name)) {
+                report({
+                    scope: attr,
+                    raw: attr.raw,
+                    line: attr.startLine,
+                    col: attr.startCol,
+                    message: t('{0} is disallowed', t('the "{0*}" {1}', name, 'attribute')),
+                });
+            }
         });
     },
 });

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

@@ -1,6 +1,9 @@
-import type { PermittedStructuresSchema } from '@markuplint/ml-spec';
+import type { ContentModel } from '@markuplint/ml-spec';
+declare type TagRule = ContentModel & {
+    tag: string;
+};
 declare type Options = {
     ignoreHasMutableChildren: boolean;
 };
-declare const _default: import("@markuplint/ml-core").RuleSeed<PermittedStructuresSchema[], Options>;
+declare const _default: import("@markuplint/ml-core").RuleSeed<TagRule[], Options>;
 export default _default;

package/lib/permitted-contents/index.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const ml_core_1 = require("@markuplint/ml-core");
-const helpers_1 = require("../helpers");
+const ml_spec_1 = require("@markuplint/ml-spec");
 const permitted_content_spec_to_regexp_1 = tslib_1.__importDefault(require("./permitted-content.spec-to-regexp"));
-const unfold_content_models_to_tags_1 = tslib_1.__importDefault(require("./unfold-content-models-to-tags"));
 const expMapOnNodeId = new Map();
 exports.default = (0, ml_core_1.createRule)({
     defaultValue: [],
@@ -13,51 +12,50 @@ exports.default = (0, ml_core_1.createRule)({
     },
     async verify({ document, report, t }) {
         let idCounter = 0;
-        await document.walkOn('Element', node => {
+        await document.walkOn('Element', el => {
             var _a;
-            if (!node.rule.value) {
+            if (!el.rule.value) {
                 return;
             }
-            if (node.rule.option.ignoreHasMutableChildren && node.hasMutableChildren()) {
+            if (el.rule.option.ignoreHasMutableChildren && el.hasMutableChildren()) {
                 return;
             }
-            const specType = node.ns === 'html' ? 'HTML' : node.ns === 'svg' ? 'SVG' : 'Any Language';
-            const childNodes = node.getChildElementsAndTextNodeWithoutWhitespaces();
-            const spec = !node.isCustomElement && ((_a = (0, helpers_1.htmlSpec)(document.specs, node.nameWithNS)) === null || _a === void 0 ? void 0 : _a.permittedStructures);
-            const expGen = new permitted_content_spec_to_regexp_1.default(idCounter++);
+            const specType = el.namespaceURI === 'http://www.w3.org/1999/xhtml'
+                ? 'HTML'
+                : el.namespaceURI === 'http://www.w3.org/2000/svg'
+                    ? 'SVG'
+                    : 'Any Language';
+            const childNodes = el.getChildElementsAndTextNodeWithoutWhitespaces();
+            const spec = !el.isCustomElement && ((_a = (0, ml_core_1.getSpec)(el, document.specs)) === null || _a === void 0 ? void 0 : _a.contentModel);
+            const expGen = new permitted_content_spec_to_regexp_1.default(document.specs, idCounter++);
             if (spec) {
-                if (spec.ancestor && !node.closest(spec.ancestor)) {
+                if (spec.descendantOf && !el.closest(spec.descendantOf)) {
                     report({
-                        scope: node,
-                        message: t('{0} must be {1}', t('the "{0*}" {1}', node.nodeName, 'element'), t('{0} of {1}', 'descendant', t('the "{0*}" {1}', spec.ancestor, 'element'))),
+                        scope: el,
+                        message: t('{0} must be {1}', t('the "{0*}" {1}', el.localName, 'element'), t('{0} of {1}', 'descendant', t('the "{0*}" {1}', spec.descendantOf, 'element'))),
                     });
                     return;
                 }
                 let matched = false;
                 if (spec.conditional) {
                     for (const conditional of spec.conditional) {
-                        matched =
-                            ('hasAttr' in conditional.condition && node.hasAttribute(conditional.condition.hasAttr)) ||
-                                ('parent' in conditional.condition &&
-                                    !!node.parentNode &&
-                                    node.parentNode.type === 'Element' &&
-                                    node.parentNode.matches(conditional.condition.parent));
+                        matched = el.matches(conditional.condition);
                         // console.log({ ...conditional, matched });
                         if (matched) {
                             try {
-                                const parentExp = getRegExpFromParentNode(document.specs, node, expGen);
-                                const exp = expGen.specToRegExp(conditional.contents, parentExp, node.ns);
-                                const conditionalResult = match(exp, childNodes, node.ns, false);
+                                const parentExp = getRegExpFromParentNode(document.specs, el, expGen);
+                                const exp = expGen.specToRegExp(conditional.contents, parentExp, el.namespaceURI);
+                                const conditionalResult = match(exp, childNodes, false, document.specs);
                                 if (!conditionalResult) {
-                                    const message = t('{0} is {1:c}', t('{0} of {1}', t('the {0}', 'content'), t('the "{0*}" {1}', node.nodeName, 'element')), 'invalid');
+                                    const message = t('{0} is {1:c}', t('{0} of {1}', t('the {0}', 'content'), t('the "{0*}" {1}', el.localName, 'element')), 'invalid');
                                     report({
-                                        scope: node,
+                                        scope: el,
                                         message: specType !== 'Any Language'
                                             ? t('{0} according to {1}', message, `the ${specType} specification`)
                                             : message,
-                                        line: node.startLine,
-                                        col: node.startCol,
-                                        raw: node.raw,
+                                        line: el.startLine,
+                                        col: el.startCol,
+                                        raw: el.raw,
                                     });
                                     break;
                                 }
@@ -65,7 +63,7 @@ exports.default = (0, ml_core_1.createRule)({
                             catch (e) {
                                 if (e instanceof Error) {
                                     // eslint-disable-next-line no-console
-                                    console.warn(node.raw, 'conditional', conditional, e.message);
+                                    console.warn(el.raw, 'conditional', conditional, e.message);
                                 }
                                 else {
                                     throw e;
@@ -76,12 +74,12 @@ exports.default = (0, ml_core_1.createRule)({
                 }
                 if (!matched) {
                     try {
-                        const exp = getRegExpFromNode(document.specs, node, expGen);
-                        const specResult = match(exp, childNodes, node.ns, false);
+                        const exp = getRegExpFromNode(document.specs, el, expGen);
+                        const specResult = match(exp, childNodes, false, document.specs);
                         if (!specResult) {
-                            const message = t('{0} is {1:c}', t('{0} of {1}', t('the {0}', 'content'), t('the "{0*}" {1}', node.nodeName, 'element')), 'invalid');
+                            const message = t('{0} is {1:c}', t('{0} of {1}', t('the {0}', 'content'), t('the "{0*}" {1}', el.localName, 'element')), 'invalid');
                             report({
-                                scope: node,
+                                scope: el,
                                 message: specType !== 'Any Language'
                                     ? t('{0} according to {1}', message, `the ${specType} specification`)
                                     : message,
@@ -91,7 +89,7 @@ exports.default = (0, ml_core_1.createRule)({
                     catch (e) {
                         if (e instanceof Error) {
                             // eslint-disable-next-line no-console
-                            console.warn(node.raw, 'HTML Spec', e.message);
+                            console.warn(el.raw, 'HTML Spec', e.message);
                         }
                         else {
                             throw e;
@@ -99,22 +97,22 @@ exports.default = (0, ml_core_1.createRule)({
                     }
                 }
             }
-            for (const rule of node.rule.value) {
-                if (rule.tag.toLowerCase() !== node.nodeName.toLowerCase()) {
+            for (const rule of el.rule.value) {
+                if (rule.tag.toLowerCase() !== el.localName.toLowerCase()) {
                     continue;
                 }
-                const parentExp = getRegExpFromParentNode(document.specs, node, expGen);
+                const parentExp = getRegExpFromParentNode(document.specs, el, expGen);
                 try {
-                    const exp = expGen.specToRegExp(rule.contents, parentExp, node.ns);
+                    const exp = expGen.specToRegExp(rule.contents, parentExp, el.namespaceURI);
                     // Evaluate the custom element if the optional schema.
-                    const r = match(exp, childNodes, node.ns, node.isCustomElement);
+                    const r = match(exp, childNodes, el.isCustomElement, document.specs);
                     if (!r) {
                         report({
-                            scope: node,
-                            message: t('{0} is {1:c}', t('{0} of {1}', t('the {0}', 'content'), t('the "{0*}" {1}', node.nodeName, 'element')), 'invalid'),
-                            line: node.startLine,
-                            col: node.startCol,
-                            raw: node.raw,
+                            scope: el,
+                            message: t('{0} is {1:c}', t('{0} of {1}', t('the {0}', 'content'), t('the "{0*}" {1}', el.localName, 'element')), 'invalid'),
+                            line: el.startLine,
+                            col: el.startCol,
+                            raw: el.raw,
                         });
                         return;
                     }
@@ -122,7 +120,7 @@ exports.default = (0, ml_core_1.createRule)({
                 catch (e) {
                     if (e instanceof Error) {
                         // eslint-disable-next-line no-console
-                        console.warn(node.raw, 'rule', rule, e.message);
+                        console.warn(el.raw, 'rule', rule, e.message);
                     }
                     else {
                         throw e;
@@ -133,53 +131,54 @@ exports.default = (0, ml_core_1.createRule)({
         expMapOnNodeId.clear();
     },
 });
-function normalization(nodes, ownNS, evalCustomElement) {
-    return nodes
+function normalization(el, evalCustomElement) {
+    return el
         .map(node => {
         // FIXME: https://github.com/markuplint/markuplint/issues/388
-        if (!evalCustomElement && node.type === 'Element' && node.isCustomElement) {
+        if (!evalCustomElement && node.is(node.ELEMENT_NODE) && node.isCustomElement) {
             return '';
         }
-        if (node.type !== 'Element') {
+        if (!node.is(node.ELEMENT_NODE)) {
             return '<#text>';
         }
-        ownNS = ownNS || 'html';
-        const name = node.nameWithNS.replace(new RegExp(`^${ownNS}:`), '');
-        return `<${name}>`;
+        const { localNameWithNS } = (0, ml_core_1.resolveNamespace)(node.localName, node.namespaceURI);
+        return `<${localNameWithNS}>`;
     })
         .join('');
 }
-function getRegExpFromNode(specs, node, expGen) {
+function getRegExpFromNode(specs, el, expGen) {
     var _a;
     // console.log({ n: node.nodeName });
-    if (expMapOnNodeId.has(node.uuid)) {
-        return expMapOnNodeId.get(node.uuid);
+    if (expMapOnNodeId.has(el.uuid)) {
+        return expMapOnNodeId.get(el.uuid);
     }
-    const parentExp = node.parentNode ? getRegExpFromNode(specs, node.parentNode, expGen) : null;
-    const spec = !node.isCustomElement && ((_a = (0, helpers_1.htmlSpec)(specs, node.nameWithNS || node.nodeName.toLowerCase())) === null || _a === void 0 ? void 0 : _a.permittedStructures);
+    const parentExp = el.parentNode ? getRegExpFromNode(specs, el.parentNode, expGen) : null;
+    const spec = el.nodeType === el.ELEMENT_NODE && !el.isCustomElement && ((_a = (0, ml_core_1.getSpec)(el, specs)) === null || _a === void 0 ? void 0 : _a.contentModel);
     const contentRule = spec ? spec.contents : true;
-    const exp = expGen.specToRegExp(contentRule, parentExp, node.ns || null);
-    expMapOnNodeId.set(node.uuid, exp);
+    const exp = expGen.specToRegExp(contentRule, parentExp, el.nodeType === el.ELEMENT_NODE ? el.namespaceURI : undefined);
+    expMapOnNodeId.set(el.uuid, exp);
     return exp;
 }
-function getRegExpFromParentNode(specs, node, expGen) {
+function getRegExpFromParentNode(specs, el, expGen) {
     // console.log({ p: node.nodeName });
-    const parentExp = node.parentNode ? getRegExpFromNode(specs, node.parentNode, expGen) : null;
+    const parentExp = el.parentNode ? getRegExpFromNode(specs, el.parentNode, expGen) : null;
     return parentExp;
 }
 const matchingCacheMap = new Map();
-function match(exp, childNodes, ownNS, evalCustomElement) {
-    const target = normalization(childNodes, ownNS, evalCustomElement);
-    const cacheKey = target + exp.source + childNodes.map(n => (n.type == 'Element' ? n.toNormalizeString() : n.originRaw)).join('');
+function match(exp, childNodes, evalCustomElement, specs) {
+    const target = normalization(childNodes, evalCustomElement);
+    const cacheKey = target +
+        exp.source +
+        childNodes.map(n => (n.is(n.ELEMENT_NODE) ? n.toNormalizeString() : n.originRaw)).join('');
     const res = matchingCacheMap.get(cacheKey);
     if (res != null) {
         return res;
     }
-    const matched = _match(target, exp, childNodes);
+    const matched = _match(target, exp, childNodes, specs);
     matchingCacheMap.set(cacheKey, matched);
     return matched;
 }
-function _match(target, exp, childNodes) {
+function _match(target, exp, childNodes, specs) {
     const result = exp.exec(target);
     if (!result) {
         return false;
@@ -200,12 +199,12 @@ function _match(target, exp, childNodes) {
         switch (type) {
             case 'ACM': {
                 const [model, tag] = _selector;
-                const selectors = (0, unfold_content_models_to_tags_1.default)(`#${model}`).filter(selector => {
+                const selectors = (0, ml_spec_1.contentModelCategoryToTagNames)(`#${model}`, specs).filter(selector => {
                     const [, tagName] = /^([^[\]]+)(?:\[[^\]]+\])?$/.exec(selector) || [];
                     return tagName.toLowerCase() === tag.toLowerCase();
                 });
                 for (const node of childNodes) {
-                    if (node.type === 'Text') {
+                    if (node.is(node.TEXT_NODE)) {
                         continue;
                     }
                     if (node.nodeName.toLowerCase() !== tag.toLowerCase()) {
@@ -233,7 +232,7 @@ function _match(target, exp, childNodes) {
                     : null;
                 _selector.forEach(content => {
                     if (content[0] === '_') {
-                        (0, unfold_content_models_to_tags_1.default)(content.replace('_', '#')).forEach(tag => contents.add(tag));
+                        (0, ml_spec_1.contentModelCategoryToTagNames)(content.replace('_', '#'), specs).forEach(tag => contents.add(tag));
                         return;
                     }
                     contents.add(content);
@@ -251,7 +250,7 @@ function _match(target, exp, childNodes) {
                 // });
                 for (const node of childNodes) {
                     for (const target of targetsMaybeIncludesNotAllowedDescendants) {
-                        if (node.type === 'Text') {
+                        if (node.is(node.TEXT_NODE)) {
                             if (selectors.includes('#text')) {
                                 return false;
                             }

package/lib/permitted-contents/permitted-content.spec-to-regexp.d.ts

@@ -1,9 +1,9 @@
-import type { PermittedContent } from '@markuplint/ml-spec';
+import type { NamespaceURI } from '@markuplint/ml-ast';
+import type { MLMLSpec, PermittedContent } from '@markuplint/ml-spec';
 export default class ExpGenerator {
-    private _id;
-    private _idCounter;
-    constructor(_id: number);
-    specToRegExp(contentRule: PermittedContent[] | boolean, parentExp?: RegExp | null, ownNS?: string | null): RegExp;
+    #private;
+    constructor(specs: MLMLSpec, id: number);
+    specToRegExp(contentRule: PermittedContent[] | boolean, parentExp?: RegExp | null, ownNS?: NamespaceURI): RegExp;
     private _toPattern;
     private _interleavePattern;
     private _targetTags;

package/lib/permitted-contents/permitted-content.spec-to-regexp.js

@@ -1,20 +1,23 @@
 "use strict";
-var _TagList_list;
+var _ExpGenerator_id, _ExpGenerator_specs, _ExpGenerator_idCounter, _TagList_list;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const ml_spec_1 = require("@markuplint/ml-spec");
 const helpers_1 = require("../helpers");
 const array_combination_1 = tslib_1.__importDefault(require("./array.combination"));
-const unfold_content_models_to_tags_1 = tslib_1.__importDefault(require("./unfold-content-models-to-tags"));
 const ALL = '(?:<[^>]+>)?';
 const ___TRANSPARENT___ = '___TRANSPARENT___';
 const ___InTRANSPARENT = '___InTRANSPARENT';
 const CUSTOM_ELEMENT = `(?:<[a-z](?:${helpers_1.rePCENChar})*\\-(?:${helpers_1.rePCENChar})*>)`;
 class ExpGenerator {
-    constructor(_id) {
-        this._id = _id;
-        this._idCounter = 0;
+    constructor(specs, id) {
+        _ExpGenerator_id.set(this, void 0);
+        _ExpGenerator_specs.set(this, void 0);
+        _ExpGenerator_idCounter.set(this, 0);
+        tslib_1.__classPrivateFieldSet(this, _ExpGenerator_id, id, "f");
+        tslib_1.__classPrivateFieldSet(this, _ExpGenerator_specs, specs, "f");
     }
-    specToRegExp(contentRule, parentExp = null, ownNS = null) {
+    specToRegExp(contentRule, parentExp = null, ownNS = 'http://www.w3.org/1999/xhtml') {
         if (contentRule === true) {
             return new RegExp(`^(?:${ALL})+$`);
         }
@@ -22,10 +25,11 @@ class ExpGenerator {
             return new RegExp('^$');
         }
         const parentPattern = parentExp ? parentExp.source.replace(/^\^|\$$/g, '') : ALL;
-        const pattern = this._toPattern(contentRule, null, ownNS, 1, 1).replace(___TRANSPARENT___, () => `(?<TRANSPARENT_${this._id}${this._idCounter++}>${parentPattern})`);
+        const pattern = this._toPattern(contentRule, null, ownNS, 1, 1).replace(___TRANSPARENT___, () => { var _a, _b; return `(?<TRANSPARENT_${tslib_1.__classPrivateFieldGet(this, _ExpGenerator_id, "f")}${tslib_1.__classPrivateFieldSet(this, _ExpGenerator_idCounter, (_b = tslib_1.__classPrivateFieldGet(this, _ExpGenerator_idCounter, "f"), _a = _b++, _b), "f"), _a}>${parentPattern})`; });
         return new RegExp(`^${pattern}$`, 'i');
     }
     _toPattern(contentRule, ignore, ownNS, min, max) {
+        var _a, _b;
         if (isTarget(contentRule)) {
             return this._targetTags(contentRule, ignore, ownNS, min, max);
         }
@@ -87,7 +91,7 @@ class ExpGenerator {
         }
         const range = createRange(min, max);
         const c = notAllowedDescendantsNamedCapture
-            ? `?<NAD_${this._id}${this._idCounter++}_${notAllowedDescendantsNamedCapture}>`
+            ? `?<NAD_${tslib_1.__classPrivateFieldGet(this, _ExpGenerator_id, "f")}${tslib_1.__classPrivateFieldSet(this, _ExpGenerator_idCounter, (_b = tslib_1.__classPrivateFieldGet(this, _ExpGenerator_idCounter, "f"), _a = _b++, _b), "f"), _a}_${notAllowedDescendantsNamedCapture}>`
             : '?:';
         if (1 === exp.length && range === '') {
             if (notAllowedDescendantsNamedCapture) {
@@ -117,6 +121,7 @@ class ExpGenerator {
         return join(Array.from(tagList), createRange(min, max));
     }
     _resolveTags(target, ownNS) {
+        var _a, _b;
         const list = Array.isArray(target) ? target : [target];
         const tagList = new TagList();
         for (const name of list) {
@@ -131,8 +136,8 @@ class ExpGenerator {
                         break;
                     }
                     default: {
-                        const selectors = (0, unfold_content_models_to_tags_1.default)(name);
-                        const counter = this._idCounter++;
+                        const selectors = (0, ml_spec_1.contentModelCategoryToTagNames)(name, tslib_1.__classPrivateFieldGet(this, _ExpGenerator_specs, "f"));
+                        const counter = (tslib_1.__classPrivateFieldSet(this, _ExpGenerator_idCounter, (_b = tslib_1.__classPrivateFieldGet(this, _ExpGenerator_idCounter, "f"), _a = _b++, _b), "f"), _a);
                         selectors.forEach(selector => {
                             if (selector === '#custom') {
                                 tagList.addPattern(CUSTOM_ELEMENT);
@@ -141,7 +146,7 @@ class ExpGenerator {
                             if (/]$/i.test(selector)) {
                                 const [, tagName] = /^([^[\]]+)\[[^\]]+\]$/.exec(selector) || [];
                                 // ACM = Attributes by content model
-                                const exp = `(?<ACM_${this._id}${counter}_${name.slice(1)}_${tagName}><${tagName}>)`;
+                                const exp = `(?<ACM_${tslib_1.__classPrivateFieldGet(this, _ExpGenerator_id, "f")}${counter}_${name.slice(1)}_${tagName}><${tagName}>)`;
                                 tagList.addPattern(exp);
                                 return;
                             }
@@ -157,6 +162,7 @@ class ExpGenerator {
     }
 }
 exports.default = ExpGenerator;
+_ExpGenerator_id = new WeakMap(), _ExpGenerator_specs = new WeakMap(), _ExpGenerator_idCounter = new WeakMap();
 class TagList {
     constructor() {
         _TagList_list.set(this, new Set());
@@ -165,9 +171,8 @@ class TagList {
         tslib_1.__classPrivateFieldGet(this, _TagList_list, "f").add(pattern);
     }
     addTag(tagNameOrSelector, ownNS) {
-        if (ownNS) {
-            tagNameOrSelector = tagNameOrSelector.replace(new RegExp(`^${ownNS}:`, 'i'), '');
-        }
+        tagNameOrSelector = tagNameOrSelector.replace(/\|/g, ':');
+        tagNameOrSelector = tagNameOrSelector.replace(/^html:/i, '');
         tslib_1.__classPrivateFieldGet(this, _TagList_list, "f").add(`<${tagNameOrSelector}>`);
     }
     result() {