@markuplint/ml-core 2.3.3 → 3.0.0-alpha.1

package/lib/configs.d.ts

@@ -1,2 +1,2 @@
 import type { Config } from '@markuplint/ml-config';
-export declare const configs: Record<string, Config>;
+export declare function getPreset(name: string): Promise<Config>;

package/lib/configs.js

@@ -1,11 +1,31 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configs = void 0;
-exports.configs = {
-    recommended: require('../markuplint-recommended.json'),
-    // For test
-    ___test: {
-        // @ts-ignore
-        ___configs: 'test',
-    },
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPreset = void 0;
+async function getPreset(name) {
+    const json = await Promise.resolve().then(() => __importStar(require(`@markuplint/config-presets/preset.${name}.json`)));
+    return json.default;
+}
+exports.getPreset = getPreset;

package/lib/index.d.ts

@@ -1,14 +1,14 @@
 export { RuleInfo, RuleConfig, RuleConfigValue } from '@markuplint/ml-config';
-export { getAttrSpecs } from '@markuplint/ml-spec';
+export { ariaSpecs, contentModelCategoryToTagNames, getAttrSpecs, getComputedRole, getImplicitRole, getPermittedRoles, getRoleSpec, getSpec, resolveNamespace, } from '@markuplint/ml-spec';
+export { default as Ruleset } from './ruleset';
+export { enableDebug } from './debug';
+export { getIndent } from './ml-dom/helper/getIndent';
+export * from './configs';
 export * from './convert-ruleset';
 export * from './ml-core';
-export * from './ml-rule';
-export { default as Ruleset } from './ruleset';
 export * from './ml-dom';
+export * from './ml-rule';
 export * from './plugin';
-export { getIndent } from './ml-dom/helper/getIndent';
-export * from './utils';
-export * from './types';
-export * from './configs';
 export * from './test';
-export { enableDebug } from './debug';
+export * from './types';
+export * from './utils';

package/lib/index.js

@@ -1,21 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enableDebug = exports.getIndent = exports.Ruleset = exports.getAttrSpecs = void 0;
+exports.getIndent = exports.enableDebug = exports.Ruleset = exports.resolveNamespace = exports.getSpec = exports.getRoleSpec = exports.getPermittedRoles = exports.getImplicitRole = exports.getComputedRole = exports.getAttrSpecs = exports.contentModelCategoryToTagNames = exports.ariaSpecs = void 0;
 const tslib_1 = require("tslib");
 var ml_spec_1 = require("@markuplint/ml-spec");
+Object.defineProperty(exports, "ariaSpecs", { enumerable: true, get: function () { return ml_spec_1.ariaSpecs; } });
+Object.defineProperty(exports, "contentModelCategoryToTagNames", { enumerable: true, get: function () { return ml_spec_1.contentModelCategoryToTagNames; } });
 Object.defineProperty(exports, "getAttrSpecs", { enumerable: true, get: function () { return ml_spec_1.getAttrSpecs; } });
-tslib_1.__exportStar(require("./convert-ruleset"), exports);
-tslib_1.__exportStar(require("./ml-core"), exports);
-tslib_1.__exportStar(require("./ml-rule"), exports);
+Object.defineProperty(exports, "getComputedRole", { enumerable: true, get: function () { return ml_spec_1.getComputedRole; } });
+Object.defineProperty(exports, "getImplicitRole", { enumerable: true, get: function () { return ml_spec_1.getImplicitRole; } });
+Object.defineProperty(exports, "getPermittedRoles", { enumerable: true, get: function () { return ml_spec_1.getPermittedRoles; } });
+Object.defineProperty(exports, "getRoleSpec", { enumerable: true, get: function () { return ml_spec_1.getRoleSpec; } });
+Object.defineProperty(exports, "getSpec", { enumerable: true, get: function () { return ml_spec_1.getSpec; } });
+Object.defineProperty(exports, "resolveNamespace", { enumerable: true, get: function () { return ml_spec_1.resolveNamespace; } });
 var ruleset_1 = require("./ruleset");
 Object.defineProperty(exports, "Ruleset", { enumerable: true, get: function () { return tslib_1.__importDefault(ruleset_1).default; } });
-tslib_1.__exportStar(require("./ml-dom"), exports);
-tslib_1.__exportStar(require("./plugin"), exports);
+var debug_1 = require("./debug");
+Object.defineProperty(exports, "enableDebug", { enumerable: true, get: function () { return debug_1.enableDebug; } });
 var getIndent_1 = require("./ml-dom/helper/getIndent");
 Object.defineProperty(exports, "getIndent", { enumerable: true, get: function () { return getIndent_1.getIndent; } });
-tslib_1.__exportStar(require("./utils"), exports);
-tslib_1.__exportStar(require("./types"), exports);
 tslib_1.__exportStar(require("./configs"), exports);
+tslib_1.__exportStar(require("./convert-ruleset"), exports);
+tslib_1.__exportStar(require("./ml-core"), exports);
+tslib_1.__exportStar(require("./ml-dom"), exports);
+tslib_1.__exportStar(require("./ml-rule"), exports);
+tslib_1.__exportStar(require("./plugin"), exports);
 tslib_1.__exportStar(require("./test"), exports);
-var debug_1 = require("./debug");
-Object.defineProperty(exports, "enableDebug", { enumerable: true, get: function () { return debug_1.enableDebug; } });
+tslib_1.__exportStar(require("./types"), exports);
+tslib_1.__exportStar(require("./utils"), exports);

package/lib/ml-core.d.ts

@@ -9,11 +9,11 @@ export declare type MLCoreParams = {
 } & MLFabric;
 export declare class MLCore {
     #private;
-    constructor({ parser, sourceCode, ruleset, rules, locale, schemas, parserOptions, filename, debug }: MLCoreParams);
+    constructor({ parser, sourceCode, ruleset, rules, locale, schemas, parserOptions, pretenders, filename, debug, }: MLCoreParams);
     get document(): ParserError | Document<RuleConfigValue, unknown>;
-    verify(fix?: boolean): Promise<Violation[]>;
     setCode(sourceCode: string): void;
     update({ parser, ruleset, rules, locale, schemas, parserOptions }: Partial<MLFabric>): void;
-    private _parse;
+    verify(fix?: boolean): Promise<Violation[]>;
     private _createDocument;
+    private _parse;
 }

package/lib/ml-core.js

@@ -1,5 +1,5 @@
 "use strict";
-var _MLCore_filename, _MLCore_document, _MLCore_parser, _MLCore_sourceCode, _MLCore_ast, _MLCore_ruleset, _MLCore_locale, _MLCore_rules, _MLCore_schemas, _MLCore_ignoreFrontMatter;
+var _MLCore_ast, _MLCore_document, _MLCore_filename, _MLCore_locale, _MLCore_parser, _MLCore_parserOptions, _MLCore_pretenders, _MLCore_rules, _MLCore_ruleset, _MLCore_schemas, _MLCore_sourceCode;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MLCore = void 0;
 const tslib_1 = require("tslib");
@@ -8,24 +8,25 @@ const debug_1 = require("./debug");
 const ml_dom_1 = require("./ml-dom");
 const resultLog = debug_1.log.extend('result');
 class MLCore {
-    constructor({ parser, sourceCode, ruleset, rules, locale, schemas, parserOptions, filename, debug }) {
+    constructor({ parser, sourceCode, ruleset, rules, locale, schemas, parserOptions, pretenders, filename, debug, }) {
         var _a, _b, _c;
-        _MLCore_filename.set(this, void 0);
-        _MLCore_document.set(this, void 0);
-        _MLCore_parser.set(this, void 0);
-        _MLCore_sourceCode.set(this, void 0);
         _MLCore_ast.set(this, null);
-        _MLCore_ruleset.set(this, void 0);
+        _MLCore_document.set(this, void 0);
+        _MLCore_filename.set(this, void 0);
         _MLCore_locale.set(this, void 0);
+        _MLCore_parser.set(this, void 0);
+        _MLCore_parserOptions.set(this, void 0);
+        _MLCore_pretenders.set(this, void 0);
         _MLCore_rules.set(this, void 0);
+        _MLCore_ruleset.set(this, void 0);
         _MLCore_schemas.set(this, void 0);
-        _MLCore_ignoreFrontMatter.set(this, void 0);
+        _MLCore_sourceCode.set(this, void 0);
         if (debug) {
             (0, debug_1.enableDebug)();
         }
         tslib_1.__classPrivateFieldSet(this, _MLCore_parser, parser, "f");
         tslib_1.__classPrivateFieldSet(this, _MLCore_sourceCode, sourceCode, "f");
-        tslib_1.__classPrivateFieldSet(this, _MLCore_ignoreFrontMatter, !!parserOptions.ignoreFrontMatter, "f");
+        tslib_1.__classPrivateFieldSet(this, _MLCore_parserOptions, parserOptions, "f");
         tslib_1.__classPrivateFieldSet(this, _MLCore_ruleset, {
             rules: (_a = ruleset.rules) !== null && _a !== void 0 ? _a : {},
             nodeRules: (_b = ruleset.nodeRules) !== null && _b !== void 0 ? _b : [],
@@ -35,12 +36,36 @@ class MLCore {
         tslib_1.__classPrivateFieldSet(this, _MLCore_schemas, schemas, "f");
         tslib_1.__classPrivateFieldSet(this, _MLCore_filename, filename, "f");
         tslib_1.__classPrivateFieldSet(this, _MLCore_rules, rules, "f");
+        tslib_1.__classPrivateFieldSet(this, _MLCore_pretenders, pretenders, "f");
         this._parse();
         this._createDocument();
     }
     get document() {
         return tslib_1.__classPrivateFieldGet(this, _MLCore_document, "f");
     }
+    setCode(sourceCode) {
+        tslib_1.__classPrivateFieldSet(this, _MLCore_sourceCode, sourceCode, "f");
+        this._parse();
+        this._createDocument();
+    }
+    update({ parser, ruleset, rules, locale, schemas, parserOptions }) {
+        var _a, _b, _c;
+        tslib_1.__classPrivateFieldSet(this, _MLCore_parser, parser !== null && parser !== void 0 ? parser : tslib_1.__classPrivateFieldGet(this, _MLCore_parser, "f"), "f");
+        tslib_1.__classPrivateFieldSet(this, _MLCore_ruleset, {
+            rules: (_a = ruleset === null || ruleset === void 0 ? void 0 : ruleset.rules) !== null && _a !== void 0 ? _a : tslib_1.__classPrivateFieldGet(this, _MLCore_ruleset, "f").rules,
+            nodeRules: (_b = ruleset === null || ruleset === void 0 ? void 0 : ruleset.nodeRules) !== null && _b !== void 0 ? _b : tslib_1.__classPrivateFieldGet(this, _MLCore_ruleset, "f").nodeRules,
+            childNodeRules: (_c = ruleset === null || ruleset === void 0 ? void 0 : ruleset.childNodeRules) !== null && _c !== void 0 ? _c : tslib_1.__classPrivateFieldGet(this, _MLCore_ruleset, "f").childNodeRules,
+        }, "f");
+        tslib_1.__classPrivateFieldSet(this, _MLCore_rules, rules !== null && rules !== void 0 ? rules : tslib_1.__classPrivateFieldGet(this, _MLCore_rules, "f"), "f");
+        tslib_1.__classPrivateFieldSet(this, _MLCore_locale, locale !== null && locale !== void 0 ? locale : tslib_1.__classPrivateFieldGet(this, _MLCore_locale, "f"), "f");
+        tslib_1.__classPrivateFieldSet(this, _MLCore_schemas, schemas !== null && schemas !== void 0 ? schemas : tslib_1.__classPrivateFieldGet(this, _MLCore_schemas, "f"), "f");
+        if (parserOptions &&
+            (parserOptions.ignoreFrontMatter !== tslib_1.__classPrivateFieldGet(this, _MLCore_parserOptions, "f").ignoreFrontMatter ||
+                parserOptions.authoredElementName !== tslib_1.__classPrivateFieldGet(this, _MLCore_parserOptions, "f").authoredElementName)) {
+            this._parse();
+        }
+        this._createDocument();
+    }
     async verify(fix = false) {
         (0, debug_1.log)('verify: start');
         const violations = [];
@@ -62,7 +87,7 @@ class MLCore {
                 continue;
             }
             (0, debug_1.log)('%s Rule: verify', rule.name);
-            const results = await rule.verify(tslib_1.__classPrivateFieldGet(this, _MLCore_document, "f"), tslib_1.__classPrivateFieldGet(this, _MLCore_locale, "f"), ruleInfo, fix).catch(e => {
+            const results = await rule.verify(tslib_1.__classPrivateFieldGet(this, _MLCore_document, "f"), tslib_1.__classPrivateFieldGet(this, _MLCore_locale, "f"), fix).catch(e => {
                 if (e instanceof parser_utils_1.ParserError) {
                     return e;
                 }
@@ -101,34 +126,18 @@ class MLCore {
         (0, debug_1.log)('verify: end');
         return violations;
     }
-    setCode(sourceCode) {
-        tslib_1.__classPrivateFieldSet(this, _MLCore_sourceCode, sourceCode, "f");
-        this._parse();
-        this._createDocument();
-    }
-    update({ parser, ruleset, rules, locale, schemas, parserOptions }) {
-        var _a, _b, _c;
-        tslib_1.__classPrivateFieldSet(this, _MLCore_parser, parser !== null && parser !== void 0 ? parser : tslib_1.__classPrivateFieldGet(this, _MLCore_parser, "f"), "f");
-        tslib_1.__classPrivateFieldSet(this, _MLCore_ruleset, {
-            rules: (_a = ruleset === null || ruleset === void 0 ? void 0 : ruleset.rules) !== null && _a !== void 0 ? _a : tslib_1.__classPrivateFieldGet(this, _MLCore_ruleset, "f").rules,
-            nodeRules: (_b = ruleset === null || ruleset === void 0 ? void 0 : ruleset.nodeRules) !== null && _b !== void 0 ? _b : tslib_1.__classPrivateFieldGet(this, _MLCore_ruleset, "f").nodeRules,
-            childNodeRules: (_c = ruleset === null || ruleset === void 0 ? void 0 : ruleset.childNodeRules) !== null && _c !== void 0 ? _c : tslib_1.__classPrivateFieldGet(this, _MLCore_ruleset, "f").childNodeRules,
-        }, "f");
-        tslib_1.__classPrivateFieldSet(this, _MLCore_rules, rules !== null && rules !== void 0 ? rules : tslib_1.__classPrivateFieldGet(this, _MLCore_rules, "f"), "f");
-        tslib_1.__classPrivateFieldSet(this, _MLCore_locale, locale !== null && locale !== void 0 ? locale : tslib_1.__classPrivateFieldGet(this, _MLCore_locale, "f"), "f");
-        tslib_1.__classPrivateFieldSet(this, _MLCore_schemas, schemas !== null && schemas !== void 0 ? schemas : tslib_1.__classPrivateFieldGet(this, _MLCore_schemas, "f"), "f");
-        if (parserOptions && parserOptions.ignoreFrontMatter !== tslib_1.__classPrivateFieldGet(this, _MLCore_ignoreFrontMatter, "f")) {
-            this._parse();
+    _createDocument() {
+        if (!tslib_1.__classPrivateFieldGet(this, _MLCore_ast, "f")) {
+            return;
         }
-        this._createDocument();
-    }
-    _parse() {
         try {
-            tslib_1.__classPrivateFieldSet(this, _MLCore_ast, tslib_1.__classPrivateFieldGet(this, _MLCore_parser, "f").parse(tslib_1.__classPrivateFieldGet(this, _MLCore_sourceCode, "f"), 0, 0, 0, tslib_1.__classPrivateFieldGet(this, _MLCore_ignoreFrontMatter, "f")), "f");
+            tslib_1.__classPrivateFieldSet(this, _MLCore_document, new ml_dom_1.Document(tslib_1.__classPrivateFieldGet(this, _MLCore_ast, "f"), tslib_1.__classPrivateFieldGet(this, _MLCore_ruleset, "f"), tslib_1.__classPrivateFieldGet(this, _MLCore_schemas, "f"), {
+                filename: tslib_1.__classPrivateFieldGet(this, _MLCore_filename, "f"),
+                endTag: tslib_1.__classPrivateFieldGet(this, _MLCore_parser, "f").endTag,
+                pretenders: tslib_1.__classPrivateFieldGet(this, _MLCore_pretenders, "f"),
+            }), "f");
         }
         catch (err) {
-            (0, debug_1.log)('Caught the parse error: %O', err);
-            tslib_1.__classPrivateFieldSet(this, _MLCore_ast, null, "f");
             if (err instanceof parser_utils_1.ParserError) {
                 tslib_1.__classPrivateFieldSet(this, _MLCore_document, err, "f");
             }
@@ -137,18 +146,13 @@ class MLCore {
             }
         }
     }
-    _createDocument() {
-        if (!tslib_1.__classPrivateFieldGet(this, _MLCore_ast, "f")) {
-            return;
-        }
+    _parse() {
         try {
-            tslib_1.__classPrivateFieldSet(this, _MLCore_document, new ml_dom_1.Document(tslib_1.__classPrivateFieldGet(this, _MLCore_ast, "f"), tslib_1.__classPrivateFieldGet(this, _MLCore_ruleset, "f"), tslib_1.__classPrivateFieldGet(this, _MLCore_schemas, "f"), {
-                filename: tslib_1.__classPrivateFieldGet(this, _MLCore_filename, "f"),
-                tagNameCaseSensitive: tslib_1.__classPrivateFieldGet(this, _MLCore_parser, "f").tagNameCaseSensitive,
-                endTag: tslib_1.__classPrivateFieldGet(this, _MLCore_parser, "f").endTag,
-            }), "f");
+            tslib_1.__classPrivateFieldSet(this, _MLCore_ast, tslib_1.__classPrivateFieldGet(this, _MLCore_parser, "f").parse(tslib_1.__classPrivateFieldGet(this, _MLCore_sourceCode, "f"), tslib_1.__classPrivateFieldGet(this, _MLCore_parserOptions, "f")), "f");
         }
         catch (err) {
+            (0, debug_1.log)('Caught the parse error: %O', err);
+            tslib_1.__classPrivateFieldSet(this, _MLCore_ast, null, "f");
             if (err instanceof parser_utils_1.ParserError) {
                 tslib_1.__classPrivateFieldSet(this, _MLCore_document, err, "f");
             }
@@ -159,4 +163,4 @@ class MLCore {
     }
 }
 exports.MLCore = MLCore;
-_MLCore_filename = new WeakMap(), _MLCore_document = new WeakMap(), _MLCore_parser = new WeakMap(), _MLCore_sourceCode = new WeakMap(), _MLCore_ast = new WeakMap(), _MLCore_ruleset = new WeakMap(), _MLCore_locale = new WeakMap(), _MLCore_rules = new WeakMap(), _MLCore_schemas = new WeakMap(), _MLCore_ignoreFrontMatter = new WeakMap();
+_MLCore_ast = new WeakMap(), _MLCore_document = new WeakMap(), _MLCore_filename = new WeakMap(), _MLCore_locale = new WeakMap(), _MLCore_parser = new WeakMap(), _MLCore_parserOptions = new WeakMap(), _MLCore_pretenders = new WeakMap(), _MLCore_rules = new WeakMap(), _MLCore_ruleset = new WeakMap(), _MLCore_schemas = new WeakMap(), _MLCore_sourceCode = new WeakMap();

package/lib/ml-dom/helper/accname.d.ts

@@ -1,2 +1,3 @@
-import type MLDOMAbstractElement from '../tokens/abstract-element';
-export declare function getAccname(el: MLDOMAbstractElement<any, any>): string;
+import type { MLElement } from '../node/element';
+import type { ARIAVersion } from '@markuplint/ml-spec';
+export declare function getAccname(el: MLElement<any, any>, version: ARIAVersion): string;

package/lib/ml-dom/helper/accname.js

@@ -1,13 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAccname = void 0;
-const dom_accessibility_api_1 = require("dom-accessibility-api");
+const ml_spec_1 = require("@markuplint/ml-spec");
 const debug_1 = require("../../debug");
 const accnameLog = debug_1.log.extend('accname');
-function getAccname(el) {
+function getAccname(el, version) {
+    let accname = safeGet(el);
+    if (accname) {
+        return accname;
+    }
+    accname = getAccnameFromPretender(el);
+    if (accname) {
+        return accname;
+    }
+    if (isHidden(el)) {
+        return '';
+    }
+    if (isFromContent(el, version)) {
+        return Array.from(el.childNodes)
+            .map(child => {
+            if (child.is(child.ELEMENT_NODE)) {
+                return getAccname(child, version);
+            }
+            if (child.is(child.TEXT_NODE)) {
+                return child.textContent || '';
+            }
+            return '';
+        })
+            .join('');
+    }
+    return '';
+}
+exports.getAccname = getAccname;
+function safeGet(el) {
     try {
-        // @ts-ignore
-        const name = (0, dom_accessibility_api_1.computeAccessibleName)(el);
+        const name = (0, ml_spec_1.getAccname)(el);
         return name;
     }
     catch (err) {
@@ -16,4 +43,25 @@ function getAccname(el) {
         return '';
     }
 }
-exports.getAccname = getAccname;
+function getAccnameFromPretender(el) {
+    var _a, _b;
+    if (((_a = el.pretenderContext) === null || _a === void 0 ? void 0 : _a.type) === 'pretender' && ((_b = el.pretenderContext.aria) === null || _b === void 0 ? void 0 : _b.name)) {
+        if (typeof el.pretenderContext.aria.name === 'boolean') {
+            return 'some-name(Pretender Options)';
+        }
+        const attrName = el.pretenderContext.aria.name.fromAttr;
+        const attrValue = el.getAttributePretended(attrName);
+        if (attrValue) {
+            return attrValue;
+        }
+    }
+    return '';
+}
+function isHidden(el) {
+    return el.getAttribute('aria-hidden') === 'true' || el.hasAttribute('hidden');
+}
+function isFromContent(el, version) {
+    var _a;
+    const role = (0, ml_spec_1.getComputedRole)(el.ownerMLDocument.specs, el, version);
+    return !!((_a = role.role) === null || _a === void 0 ? void 0 : _a.accessibleNameFromContent);
+}

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

@@ -1,6 +1,5 @@
-import type { Document } from '../';
-import type { MappedNode } from './mapped-nodes';
-import type { MLASTAbstructNode } from '@markuplint/ml-ast';
+import type { MLDocument } from '../node/document';
+import type { MappedNode } from '../node/types';
+import type { MLASTAbstractNode } from '@markuplint/ml-ast';
 import type { RuleConfigValue } from '@markuplint/ml-config';
-import { MLDOMElement } from '../tokens';
-export declare function createNode<N extends MLASTAbstructNode, T extends RuleConfigValue, O = null>(astNode: N, document: Document<T, O>, pearNode?: MLDOMElement<T, O>): MappedNode<N, T, O>;
+export declare function createNode<N extends MLASTAbstractNode, T extends RuleConfigValue, O = null>(astNode: N, document: MLDocument<T, O>): MappedNode<N, T, O>;

package/lib/ml-dom/helper/create-node.js

@@ -1,34 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNode = void 0;
-const tslib_1 = require("tslib");
-const tokens_1 = require("../tokens");
-const preprocessor_specific_block_1 = tslib_1.__importDefault(require("../tokens/preprocessor-specific-block"));
-function createNode(astNode, document, pearNode) {
+const block_1 = require("../node/block");
+const comment_1 = require("../node/comment");
+const document_type_1 = require("../node/document-type");
+const element_1 = require("../node/element");
+const text_1 = require("../node/text");
+function createNode(astNode, document) {
     const _astNode = astNode;
     switch (_astNode.type) {
         case 'doctype': {
-            return new tokens_1.MLDOMDoctype(_astNode, document);
+            return new document_type_1.MLDocumentType(_astNode, document);
         }
         case 'starttag': {
-            return new tokens_1.MLDOMElement(_astNode, document);
-        }
-        case 'endtag': {
-            return new tokens_1.MLDOMElementCloseTag(_astNode, document, pearNode);
+            return new element_1.MLElement(_astNode, document);
         }
         case 'psblock': {
-            return new preprocessor_specific_block_1.default(_astNode, document);
+            return new block_1.MLBlock(_astNode, document);
         }
         case 'comment': {
-            return new tokens_1.MLDOMComment(_astNode, document);
+            return new comment_1.MLComment(_astNode, document);
         }
         case 'text': {
-            return new tokens_1.MLDOMText(_astNode, document);
-        }
-        case 'omittedtag': {
-            return new tokens_1.MLDOMOmittedElement(_astNode, document);
+            return new text_1.MLText(_astNode, document);
         }
     }
-    throw new TypeError(`Invalid AST node typs "${astNode.type}"`);
+    throw new TypeError(`Invalid AST node types "${astNode.type}"`);
 }
 exports.createNode = createNode;

package/lib/ml-dom/helper/debug.d.ts

@@ -1,2 +1,2 @@
-import type { AnonymousNode } from '@markuplint/ml-core';
-export declare function nodeListToDebugMaps(nodeList: Readonly<AnonymousNode<any, any>[]>, withAttr?: boolean): string[];
+import type { MLNode } from '../node/node';
+export declare function nodeListToDebugMaps(nodeList: Readonly<MLNode<any, any>[]>, withAttr?: boolean): string[];

package/lib/ml-dom/helper/debug.js

@@ -5,33 +5,33 @@ function nodeListToDebugMaps(nodeList, withAttr = false) {
     return nodeList
         .map(n => {
         const r = [];
-        if (n.type !== 'OmittedElement') {
-            r.push(tokenDebug(n));
-            if (n.type === 'Element') {
-                r.push(`  namespaceURI: ${!!n.namespaceURI}`);
-                r.push(`  isInFragmentDocument: ${!!n.isInFragmentDocument}`);
-                r.push(`  isForeignElement: ${!!n.isForeignElement}`);
-                r.push(`  isCustomElement: ${!!n.isCustomElement}`);
-            }
-            if (withAttr && 'attributes' in n) {
+        if (n.is(n.ELEMENT_NODE) && n.isOmitted) {
+            r.push(`[N/A]>[N/A](N/A)${n.nodeName}: ${visibleWhiteSpace(n.raw)}`);
+            return r;
+        }
+        r.push(tokenDebug(n));
+        if (n.is(n.ELEMENT_NODE)) {
+            r.push(`  namespaceURI: ${!!n.namespaceURI}`);
+            r.push(`  elementType: ${n.elementType}`);
+            r.push(`  isInFragmentDocument: ${!!n.isInFragmentDocument}`);
+            r.push(`  isForeignElement: ${!!n.isForeignElement}`);
+            if (withAttr) {
                 r.push(...attributesToDebugMaps(n.attributes)
                     .flat()
                     .map(l => `  ${l}`));
             }
         }
-        else {
-            r.push(`[N/A]>[N/A](N/A)${n.nodeName}: ${visibleWhiteSpace(n.raw)}`);
-        }
         return r;
     })
         .flat();
 }
 exports.nodeListToDebugMaps = nodeListToDebugMaps;
 function attributesToDebugMaps(attributes) {
-    return attributes.map(n => {
+    return attributes
+        .map(n => {
         const r = [
             tokenDebug({
-                name: n.potentialName,
+                name: n.name,
                 startOffset: n.startOffset,
                 endOffset: n.endOffset,
                 startLine: n.startLine,
@@ -41,26 +41,40 @@ function attributesToDebugMaps(attributes) {
                 raw: n.raw,
             }),
         ];
-        if (n.attrType === 'html-attr') {
+        if (n.spacesBeforeName) {
             r.push(`  ${tokenDebug(n.spacesBeforeName, 'bN')}`);
-            r.push(`  ${tokenDebug(n.name, 'name')}`);
+        }
+        if (n.nameNode) {
+            r.push(`  ${tokenDebug(n.nameNode, 'name')}`);
+        }
+        if (n.spacesBeforeEqual) {
             r.push(`  ${tokenDebug(n.spacesBeforeEqual, 'bE')}`);
+        }
+        if (n.equal) {
             r.push(`  ${tokenDebug(n.equal, 'equal')}`);
+        }
+        if (n.spacesAfterEqual) {
             r.push(`  ${tokenDebug(n.spacesAfterEqual, 'aE')}`);
+        }
+        if (n.startQuote) {
             r.push(`  ${tokenDebug(n.startQuote, 'sQ')}`);
+        }
+        if (n.valueNode) {
             r.push(`  ${tokenDebug(n.valueNode, 'value')}`);
+        }
+        if (n.endQuote) {
             r.push(`  ${tokenDebug(n.endQuote, 'eQ')}`);
+        }
+        if (n.spacesBeforeName) {
             r.push(`  isDirective: ${!!n.isDirective}`);
             r.push(`  isDynamicValue: ${!!n.isDynamicValue}`);
         }
-        if (n.potentialName != null) {
-            r.push(`  potentialName: ${visibleWhiteSpace(n.potentialName)}`);
-        }
-        if (n.attrType === 'html-attr' && n.candidate) {
+        if (n.candidate) {
             r.push(`  candidate: ${visibleWhiteSpace(n.candidate)}`);
         }
         return r;
-    });
+    })
+        .flat();
 }
 function tokenDebug(n, type = '') {
     return `[${n.startLine}:${n.startCol}]>[${n.endLine}:${n.endCol}](${n.startOffset},${n.endOffset})${n.nodeName || n.potentialName || n.name || n.type || type}: ${visibleWhiteSpace(n.raw)}`;

package/lib/ml-dom/helper/getIndent.d.ts

@@ -1,18 +1,18 @@
-import type { MLDOMNode, MLDOMText } from '../tokens';
-import type { AnonymousNode } from '../types';
+import type { MLNode } from '../node/node';
+import type { MLText } from '../node/text';
 /**
  *
  * @deprecated
  * @param node
  */
-export declare function getIndent(node: AnonymousNode<any, any>): MLDOMIndentation | null;
+export declare function getIndent(node: MLNode<any, any>): MLDOMIndentation | null;
 declare class MLDOMIndentation {
     #private;
     readonly line: number;
-    constructor(originTextNode: MLDOMText<any, any>, raw: string, line: number, parentNode: MLDOMNode<any, any>);
+    constructor(originTextNode: MLText<any, any>, raw: string, line: number, parentNode: MLNode<any, any>);
+    get raw(): string;
     get type(): 'tab' | 'space' | 'mixed' | 'none';
     get width(): number;
-    get raw(): string;
     fix(raw: string): void;
 }
 export {};

package/lib/ml-dom/helper/getIndent.js

@@ -1,5 +1,5 @@
 "use strict";
-var _MLDOMIndentation_node, _MLDOMIndentation_parent, _MLDOMIndentation_fixed;
+var _MLDOMIndentation_fixed, _MLDOMIndentation_node, _MLDOMIndentation_parent;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIndent = void 0;
 const tslib_1 = require("tslib");
@@ -13,8 +13,8 @@ function getIndent(node) {
     if (!prevToken) {
         return null;
     }
-    if (node.type === 'Text') {
-        if (node.isRawText) {
+    if (node.is(node.TEXT_NODE)) {
+        if (node.isRawTextElementContent()) {
             return null;
         }
         const matched = node.raw.match(/^(\s*(?:\r?\n)+\s*)(?:[^\s]+)/);
@@ -31,7 +31,7 @@ function getIndent(node) {
         }
         return null;
     }
-    if (prevToken.type !== 'Text') {
+    if (!prevToken.is(node.TEXT_NODE)) {
         return null;
     }
     // One or more newlines and zero or more spaces or tabs.
@@ -52,33 +52,33 @@ function getIndent(node) {
 exports.getIndent = getIndent;
 class MLDOMIndentation {
     constructor(originTextNode, raw, line, parentNode) {
+        _MLDOMIndentation_fixed.set(this, void 0);
         _MLDOMIndentation_node.set(this, void 0);
         _MLDOMIndentation_parent.set(this, void 0);
-        _MLDOMIndentation_fixed.set(this, void 0);
         this.line = line;
         tslib_1.__classPrivateFieldSet(this, _MLDOMIndentation_node, originTextNode, "f");
         tslib_1.__classPrivateFieldSet(this, _MLDOMIndentation_parent, parentNode, "f");
         tslib_1.__classPrivateFieldSet(this, _MLDOMIndentation_fixed, raw, "f");
     }
+    get raw() {
+        if (!tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_parent, "f").is(tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_parent, "f").TEXT_NODE) && this.line !== tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_node, "f").endLine) {
+            return '';
+        }
+        return tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_fixed, "f");
+    }
     get type() {
-        if (tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_parent, "f").type !== 'Text' && this.line !== tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_node, "f").endLine) {
+        if (!tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_parent, "f").is(tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_parent, "f").TEXT_NODE) && this.line !== tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_node, "f").endLine) {
             return 'none';
         }
         const raw = tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_fixed, "f");
         return raw === '' ? 'none' : /^\t+$/.test(raw) ? 'tab' : /^[^\t]+$/.test(raw) ? 'space' : 'mixed';
     }
     get width() {
-        if (tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_parent, "f").type !== 'Text' && this.line !== tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_node, "f").endLine) {
+        if (!tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_parent, "f").is(tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_parent, "f").TEXT_NODE) && this.line !== tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_node, "f").endLine) {
             return 0;
         }
         return tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_fixed, "f").length;
     }
-    get raw() {
-        if (tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_parent, "f").type !== 'Text' && this.line !== tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_node, "f").endLine) {
-            return '';
-        }
-        return tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_fixed, "f");
-    }
     fix(raw) {
         const current = tslib_1.__classPrivateFieldGet(this, _MLDOMIndentation_fixed, "f");
         tslib_1.__classPrivateFieldSet(this, _MLDOMIndentation_fixed, raw, "f");
@@ -94,7 +94,7 @@ class MLDOMIndentation {
         }
     }
 }
-_MLDOMIndentation_node = new WeakMap(), _MLDOMIndentation_parent = new WeakMap(), _MLDOMIndentation_fixed = new WeakMap();
+_MLDOMIndentation_fixed = new WeakMap(), _MLDOMIndentation_node = new WeakMap(), _MLDOMIndentation_parent = new WeakMap();
 function isFirstToken(node) {
     return !node.prevToken;
 }