@markuplint/selector 3.0.0-dev.25 → 3.0.0-dev.300

package/lib/compare-specificity.d.ts

@@ -1,2 +1,2 @@
-import type { Specificity } from './types';
+import type { Specificity } from './types.js';
 export declare function compareSpecificity(a: Specificity, b: Specificity): 0 | 1 | -1;

package/lib/compare-specificity.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareSpecificity = void 0;
-function compareSpecificity(a, b) {
+export function compareSpecificity(a, b) {
     if (a[0] < b[0]) {
         return -1;
     }
@@ -22,4 +19,3 @@ function compareSpecificity(a, b) {
     }
     return 0;
 }
-exports.compareSpecificity = compareSpecificity;

package/lib/create-selector.d.ts

@@ -1,3 +1,3 @@
 import type { MLMLSpec } from '@markuplint/ml-spec';
-import { Selector } from './selector';
-export declare function createSelector(selector: string, specs: MLMLSpec): Selector;
+import { Selector } from './selector.js';
+export declare function createSelector(selector: string, specs?: MLMLSpec): Selector;

package/lib/create-selector.js

@@ -1,22 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSelector = void 0;
-const aria_pseudo_class_1 = require("./extended-selector/aria-pseudo-class");
-const aria_role_pseudo_class_1 = require("./extended-selector/aria-role-pseudo-class");
-const content_model_pseudo_class_1 = require("./extended-selector/content-model-pseudo-class");
-const selector_1 = require("./selector");
+import { ariaPseudoClass } from './extended-selector/aria-pseudo-class.js';
+import { ariaRolePseudoClass } from './extended-selector/aria-role-pseudo-class.js';
+import { contentModelPseudoClass } from './extended-selector/content-model-pseudo-class.js';
+import { Selector } from './selector.js';
 const caches = new Map();
-function createSelector(selector, specs) {
+export function createSelector(selector, specs) {
     let instance = caches.get(selector);
     if (instance) {
         return instance;
     }
-    instance = new selector_1.Selector(selector, {
-        model: (0, content_model_pseudo_class_1.contentModelPseudoClass)(specs),
-        aria: (0, aria_pseudo_class_1.ariaPseudoClass)(),
-        role: (0, aria_role_pseudo_class_1.ariaRolePseudoClass)(specs),
-    });
+    instance = new Selector(selector, specs
+        ? {
+            model: contentModelPseudoClass(specs),
+            aria: ariaPseudoClass(),
+            role: ariaRolePseudoClass(specs),
+        }
+        : undefined);
     caches.set(selector, instance);
     return instance;
 }
-exports.createSelector = createSelector;

package/lib/debug.js

@@ -1,18 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.enableDebug = exports.log = void 0;
-const tslib_1 = require("tslib");
-const debug_1 = tslib_1.__importDefault(require("debug"));
+import debug from 'debug';
 const CLI_NS = 'markuplint-cli';
-exports.log = (0, debug_1.default)('selector');
-function enableDebug() {
-    if (!exports.log.enabled) {
-        debug_1.default.enable(`${exports.log.namespace}*`);
-        (0, exports.log)(`Debug enable: ${exports.log.namespace}`);
-        if (!debug_1.default.enabled(CLI_NS)) {
-            debug_1.default.enable(`${exports.log.namespace}*,${CLI_NS}*`);
-            (0, exports.log)(`Debug enable: ${exports.log.namespace}, ${CLI_NS}`);
+export const log = debug('selector');
+export function enableDebug() {
+    if (!log.enabled) {
+        debug.enable(`${log.namespace}*`);
+        log(`Debug enable: ${log.namespace}`);
+        if (!debug.enabled(CLI_NS)) {
+            debug.enable(`${log.namespace}*,${CLI_NS}*`);
+            log(`Debug enable: ${log.namespace}, ${CLI_NS}`);
         }
     }
 }
-exports.enableDebug = enableDebug;

package/lib/extended-selector/aria-pseudo-class.d.ts

@@ -1,4 +1,4 @@
-import type { SelectorResult } from '../types';
+import type { SelectorResult } from '../types.js';
 /**
  * Version Syntax is not support yet.
  */

package/lib/extended-selector/aria-pseudo-class.js

@@ -1,14 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ariaPseudoClass = void 0;
-const ml_spec_1 = require("@markuplint/ml-spec");
+import { validateAriaVersion, ARIA_RECOMMENDED_VERSION, getAccname } from '@markuplint/ml-spec';
 /**
  * Version Syntax is not support yet.
  */
-function ariaPseudoClass() {
-    return (content) => (el) => {
+export function ariaPseudoClass() {
+    return (content) => (
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el) => {
         const aria = ariaPseudoClassParser(content);
-        const name = (0, ml_spec_1.getAccname)(el);
+        const name = getAccname(el);
         switch (aria.type) {
             case 'hasName': {
                 if (name) {
@@ -41,11 +40,13 @@ function ariaPseudoClass() {
         }
     };
 }
-exports.ariaPseudoClass = ariaPseudoClass;
 function ariaPseudoClassParser(syntax) {
     const [_query, _version] = syntax.split('|');
-    const query = _query.replace(/\s+/g, '').toLowerCase();
-    const version = _version === '1.1' ? '1.1' : '1.2';
+    const query = _query?.replace(/\s+/g, '').toLowerCase();
+    const version = _version ?? ARIA_RECOMMENDED_VERSION;
+    if (!validateAriaVersion(version)) {
+        throw new SyntaxError(`Unsupported ARIA version: ${version}`);
+    }
     switch (query) {
         case 'hasname': {
             return {

package/lib/extended-selector/aria-role-pseudo-class.d.ts

@@ -1,3 +1,3 @@
-import type { SelectorResult } from '../types';
+import type { SelectorResult } from '../types.js';
 import type { MLMLSpec } from '@markuplint/ml-spec';
 export declare function ariaRolePseudoClass(specs: MLMLSpec): (content: string) => (el: Element) => SelectorResult;

package/lib/extended-selector/aria-role-pseudo-class.js

@@ -1,13 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ariaRolePseudoClass = void 0;
-const ml_spec_1 = require("@markuplint/ml-spec");
-function ariaRolePseudoClass(specs) {
-    return (content) => (el) => {
-        var _a, _b;
+import { validateAriaVersion, ARIA_RECOMMENDED_VERSION, getComputedRole } from '@markuplint/ml-spec';
+export function ariaRolePseudoClass(specs) {
+    return (content) => (
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el) => {
         const aria = ariaPseudoClassParser(content);
-        const computed = (0, ml_spec_1.getComputedRole)(specs, el, (_a = aria.version) !== null && _a !== void 0 ? _a : '1.2');
-        if (((_b = computed.role) === null || _b === void 0 ? void 0 : _b.name) === aria.role) {
+        const computed = getComputedRole(specs, el, aria.version ?? ARIA_RECOMMENDED_VERSION);
+        if (computed.role?.name === aria.role) {
             return {
                 specificity: [0, 1, 0],
                 matched: true,
@@ -21,12 +19,14 @@ function ariaRolePseudoClass(specs) {
         };
     };
 }
-exports.ariaRolePseudoClass = ariaRolePseudoClass;
 function ariaPseudoClassParser(syntax) {
     const [roleName, _version] = syntax.split('|');
-    const version = _version === '1.1' ? '1.1' : '1.2';
+    const version = _version ?? ARIA_RECOMMENDED_VERSION;
+    if (!validateAriaVersion(version)) {
+        throw new SyntaxError(`Unsupported ARIA version: ${version}`);
+    }
     return {
-        role: roleName.trim().toLowerCase(),
+        role: roleName?.trim().toLowerCase() ?? syntax.trim().toLowerCase(),
         version,
     };
 }

package/lib/extended-selector/content-model-pseudo-class.d.ts

@@ -1,3 +1,3 @@
-import type { SelectorResult } from '../types';
+import type { SelectorResult } from '../types.js';
 import type { MLMLSpec } from '@markuplint/ml-spec';
 export declare function contentModelPseudoClass(specs: MLMLSpec): (category: string) => (el: Element) => SelectorResult;

package/lib/extended-selector/content-model-pseudo-class.js

@@ -1,12 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.contentModelPseudoClass = void 0;
-const ml_spec_1 = require("@markuplint/ml-spec");
-const create_selector_1 = require("../create-selector");
-function contentModelPseudoClass(specs) {
-    return (category) => (el) => {
+import { contentModelCategoryToTagNames } from '@markuplint/ml-spec';
+import { createSelector } from '../create-selector.js';
+export function contentModelPseudoClass(specs) {
+    return (category) => (
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el) => {
         category = category.trim().toLowerCase();
-        const selectors = (0, ml_spec_1.contentModelCategoryToTagNames)(`#${category}`, specs.def);
+        const selectors = contentModelCategoryToTagNames(`#${category}`, specs.def);
         const matched = selectors
             .map(selector => {
             if (selector === '#custom') {
@@ -36,11 +35,11 @@ function contentModelPseudoClass(specs) {
                     },
                 ];
             }
-            return (0, create_selector_1.createSelector)(selector, specs).search(el);
+            return createSelector(selector, specs).search(el);
         })
             .flat()
             .filter((m) => m.matched);
-        if (matched.length) {
+        if (matched.length > 0) {
             return {
                 specificity: [0, 1, 0],
                 matched: true,
@@ -54,4 +53,3 @@ function contentModelPseudoClass(specs) {
         };
     };
 }
-exports.contentModelPseudoClass = contentModelPseudoClass;

package/lib/index.d.ts

@@ -1,4 +1,5 @@
-export { compareSpecificity } from './compare-specificity';
-export { matchSelector } from './match-selector';
-export { createSelector } from './create-selector';
-export * from './types';
+export { compareSpecificity } from './compare-specificity.js';
+export { matchSelector } from './match-selector.js';
+export { createSelector } from './create-selector.js';
+export { InvalidSelectorError } from './invalid-selector-error.js';
+export * from './types.js';

package/lib/index.js

@@ -1,11 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSelector = exports.matchSelector = exports.compareSpecificity = void 0;
-const tslib_1 = require("tslib");
-var compare_specificity_1 = require("./compare-specificity");
-Object.defineProperty(exports, "compareSpecificity", { enumerable: true, get: function () { return compare_specificity_1.compareSpecificity; } });
-var match_selector_1 = require("./match-selector");
-Object.defineProperty(exports, "matchSelector", { enumerable: true, get: function () { return match_selector_1.matchSelector; } });
-var create_selector_1 = require("./create-selector");
-Object.defineProperty(exports, "createSelector", { enumerable: true, get: function () { return create_selector_1.createSelector; } });
-tslib_1.__exportStar(require("./types"), exports);
+export { compareSpecificity } from './compare-specificity.js';
+export { matchSelector } from './match-selector.js';
+export { createSelector } from './create-selector.js';
+export { InvalidSelectorError } from './invalid-selector-error.js';
+export * from './types.js';

package/lib/invalid-selector-error.d.ts

@@ -1,3 +1,5 @@
 export declare class InvalidSelectorError extends Error {
     name: string;
+    selector: string;
+    constructor(selector: string, message?: string);
 }

package/lib/invalid-selector-error.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InvalidSelectorError = void 0;
-class InvalidSelectorError extends Error {
-    constructor() {
-        super(...arguments);
+export class InvalidSelectorError extends Error {
+    constructor(selector, message) {
+        super(message ?? `Invalid selector: "${selector}"`);
         this.name = 'InvalidSelectorError';
+        this.selector = selector;
     }
 }
-exports.InvalidSelectorError = InvalidSelectorError;

package/lib/is.js

@@ -1,15 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPureHTMLElement = exports.isNonDocumentTypeChildNode = exports.isElement = void 0;
-function isElement(node) {
+export function isElement(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+node) {
     return node.nodeType === node.ELEMENT_NODE;
 }
-exports.isElement = isElement;
-function isNonDocumentTypeChildNode(node) {
+export function isNonDocumentTypeChildNode(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+node) {
     return 'previousElementSibling' in node && 'nextElementSibling' in node;
 }
-exports.isNonDocumentTypeChildNode = isNonDocumentTypeChildNode;
-function isPureHTMLElement(el) {
+export function isPureHTMLElement(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el) {
     return el.localName !== el.nodeName;
 }
-exports.isPureHTMLElement = isPureHTMLElement;

package/lib/match-selector.d.ts

@@ -1,13 +1,13 @@
-import type { Specificity, RegexSelector } from './types';
+import type { Specificity, RegexSelector } from './types.js';
 export type SelectorMatches = SelectorMatched | SelectorUnmatched;
 type SelectorMatched = {
-    matched: true;
-    selector: string;
-    specificity: Specificity;
-    data?: Record<string, string>;
+    readonly matched: true;
+    readonly selector: string;
+    readonly specificity: Specificity;
+    readonly data?: Readonly<Record<string, string>>;
 };
 type SelectorUnmatched = {
-    matched: false;
+    readonly matched: false;
 };
 export declare function matchSelector(el: Node, selector: string | RegexSelector | undefined): SelectorMatches;
 export {};

package/lib/match-selector.js

@@ -1,21 +1,20 @@
-"use strict";
 var _SelectorTarget_combinedFrom, _SelectorTarget_selector;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchSelector = void 0;
-const tslib_1 = require("tslib");
-const is_1 = require("./is");
-const regex_selector_matches_1 = require("./regex-selector-matches");
-const selector_1 = require("./selector");
-function matchSelector(el, selector) {
-    if (!selector) {
+import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
+import { isElement, isNonDocumentTypeChildNode, isPureHTMLElement } from './is.js';
+import { regexSelectorMatches } from './regex-selector-matches.js';
+import { Selector } from './selector.js';
+export function matchSelector(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, selector) {
+    if (selector == null || selector === '') {
         return {
             matched: false,
         };
     }
     if (typeof selector === 'string') {
-        const sel = new selector_1.Selector(selector);
+        const sel = new Selector(selector);
         const specificity = sel.match(el);
-        if (specificity) {
+        if (specificity !== false) {
             return {
                 matched: true,
                 selector,
@@ -28,8 +27,9 @@ function matchSelector(el, selector) {
     }
     return regexSelect(el, selector);
 }
-exports.matchSelector = matchSelector;
-function regexSelect(el, selector) {
+function regexSelect(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, selector) {
     let edge = new SelectorTarget(selector);
     let edgeSelector = selector.combination;
     while (edgeSelector) {
@@ -44,23 +44,25 @@ class SelectorTarget {
     constructor(selector) {
         _SelectorTarget_combinedFrom.set(this, null);
         _SelectorTarget_selector.set(this, void 0);
-        tslib_1.__classPrivateFieldSet(this, _SelectorTarget_selector, selector, "f");
+        __classPrivateFieldSet(this, _SelectorTarget_selector, selector, "f");
     }
     from(target, combinator) {
-        tslib_1.__classPrivateFieldSet(this, _SelectorTarget_combinedFrom, { target, combinator }, "f");
+        __classPrivateFieldSet(this, _SelectorTarget_combinedFrom, { target, combinator }, "f");
     }
-    match(el) {
+    match(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el) {
         const unitCheck = this._matchWithoutCombineChecking(el);
         if (!unitCheck.matched) {
             return unitCheck;
         }
-        if (!tslib_1.__classPrivateFieldGet(this, _SelectorTarget_combinedFrom, "f")) {
+        if (!__classPrivateFieldGet(this, _SelectorTarget_combinedFrom, "f")) {
             return unitCheck;
         }
-        if (!(0, is_1.isNonDocumentTypeChildNode)(el)) {
+        if (!isNonDocumentTypeChildNode(el)) {
             return unitCheck;
         }
-        const { target, combinator } = tslib_1.__classPrivateFieldGet(this, _SelectorTarget_combinedFrom, "f");
+        const { target, combinator } = __classPrivateFieldGet(this, _SelectorTarget_combinedFrom, "f");
         switch (combinator) {
             // Descendant combinator
             case ' ': {
@@ -135,17 +137,21 @@ class SelectorTarget {
                 return { matched: false };
             }
             default: {
-                throw new Error(`Unsupported ${tslib_1.__classPrivateFieldGet(this, _SelectorTarget_combinedFrom, "f").combinator} combinator in selector`);
+                throw new Error(`Unsupported ${__classPrivateFieldGet(this, _SelectorTarget_combinedFrom, "f").combinator} combinator in selector`);
             }
         }
     }
-    _matchWithoutCombineChecking(el) {
-        return uncombinedRegexSelect(el, tslib_1.__classPrivateFieldGet(this, _SelectorTarget_selector, "f"));
+    _matchWithoutCombineChecking(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el) {
+        return uncombinedRegexSelect(el, __classPrivateFieldGet(this, _SelectorTarget_selector, "f"));
     }
 }
 _SelectorTarget_combinedFrom = new WeakMap(), _SelectorTarget_selector = new WeakMap();
-function uncombinedRegexSelect(el, selector) {
-    if (!(0, is_1.isElement)(el)) {
+function uncombinedRegexSelect(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, selector) {
+    if (!isElement(el)) {
         return {
             matched: false,
         };
@@ -156,7 +162,7 @@ function uncombinedRegexSelect(el, selector) {
     const specificity = [0, 0, 0];
     const specifiedAttr = new Map();
     if (selector.nodeName) {
-        const matchedNodeName = (0, regex_selector_matches_1.regexSelectorMatches)(selector.nodeName, el.localName, (0, is_1.isPureHTMLElement)(el));
+        const matchedNodeName = regexSelectorMatches(selector.nodeName, el.localName, isPureHTMLElement(el));
         if (matchedNodeName) {
             delete matchedNodeName.$0;
         }
@@ -174,7 +180,7 @@ function uncombinedRegexSelect(el, selector) {
         const selectorAttrName = selector.attrName;
         const matchedAttrNameList = Array.from(el.attributes).map(attr => {
             const attrName = attr.name;
-            const matchedAttrName = (0, regex_selector_matches_1.regexSelectorMatches)(selectorAttrName, attrName, (0, is_1.isPureHTMLElement)(el));
+            const matchedAttrName = regexSelectorMatches(selectorAttrName, attrName, isPureHTMLElement(el));
             if (matchedAttrName) {
                 delete matchedAttrName.$0;
                 data = {
@@ -194,7 +200,7 @@ function uncombinedRegexSelect(el, selector) {
         const matchedAttrValueList = Array.from(el.attributes).map(attr => {
             const attrName = attr.name;
             const attrValue = attr.value;
-            const matchedAttrValue = (0, regex_selector_matches_1.regexSelectorMatches)(selectorAttrValue, attrValue, (0, is_1.isPureHTMLElement)(el));
+            const matchedAttrValue = regexSelectorMatches(selectorAttrValue, attrValue, isPureHTMLElement(el));
             if (matchedAttrValue) {
                 delete matchedAttrValue.$0;
                 data = {

package/lib/regex-selector-matches.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.regexSelectorMatches = void 0;
-function regexSelectorMatches(reg, raw, ignoreCase) {
+export function regexSelectorMatches(reg, raw, ignoreCase) {
     const res = {};
     const pattern = toRegexp(reg);
     const regex = new RegExp(pattern instanceof RegExp ? pattern : `^${pattern.trim()}$`, ignoreCase ? 'i' : undefined);
@@ -15,10 +12,9 @@ function regexSelectorMatches(reg, raw, ignoreCase) {
         ...matched.groups,
     };
 }
-exports.regexSelectorMatches = regexSelectorMatches;
 function toRegexp(pattern) {
     const matched = pattern.match(/^\/(.+)\/([ig]*)$/i);
-    if (matched) {
+    if (matched && matched[1]) {
         return new RegExp(matched[1], matched[2]);
     }
     return pattern;

package/lib/selector.d.ts

@@ -1,5 +1,5 @@
-import type { SelectorResult, Specificity } from './types';
-type ExtendedPseudoClass = Record<string, (content: string) => (el: Element) => SelectorResult>;
+import type { SelectorResult, Specificity } from './types.js';
+type ExtendedPseudoClass = Readonly<Record<string, (content: string) => (el: Element) => SelectorResult>>;
 export declare class Selector {
     #private;
     constructor(selector: string, extended?: ExtendedPseudoClass);