@markuplint/selector 3.3.0 → 3.5.0

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

@@ -6,7 +6,9 @@ const ml_spec_1 = require("@markuplint/ml-spec");
  * Version Syntax is not support yet.
  */
 function ariaPseudoClass() {
-    return (content) => (el) => {
+    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);
         switch (aria.type) {
@@ -44,7 +46,7 @@ function ariaPseudoClass() {
 exports.ariaPseudoClass = ariaPseudoClass;
 function ariaPseudoClassParser(syntax) {
     const [_query, _version] = syntax.split('|');
-    const query = _query.replace(/\s+/g, '').toLowerCase();
+    const query = _query === null || _query === void 0 ? void 0 : _query.replace(/\s+/g, '').toLowerCase();
     const version = _version === '1.1' ? '1.1' : '1.2';
     switch (query) {
         case 'hasname': {

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

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ariaRolePseudoClass = void 0;
 const ml_spec_1 = require("@markuplint/ml-spec");
 function ariaRolePseudoClass(specs) {
-    return (content) => (el) => {
+    return (content) => (
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el) => {
         var _a, _b;
         const aria = ariaPseudoClassParser(content);
         const computed = (0, ml_spec_1.getComputedRole)(specs, el, (_a = aria.version) !== null && _a !== void 0 ? _a : '1.2');
@@ -23,10 +25,11 @@ function ariaRolePseudoClass(specs) {
 }
 exports.ariaRolePseudoClass = ariaRolePseudoClass;
 function ariaPseudoClassParser(syntax) {
+    var _a;
     const [roleName, _version] = syntax.split('|');
     const version = _version === '1.1' ? '1.1' : '1.2';
     return {
-        role: roleName.trim().toLowerCase(),
+        role: (_a = roleName === null || roleName === void 0 ? void 0 : roleName.trim().toLowerCase()) !== null && _a !== void 0 ? _a : syntax.trim().toLowerCase(),
         version,
     };
 }

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

@@ -4,7 +4,9 @@ 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) => {
+    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 matched = selectors

package/lib/is.js

@@ -1,15 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPureHTMLElement = exports.isNonDocumentTypeChildNode = exports.isElement = void 0;
-function isElement(node) {
+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) {
+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) {
+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';
 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

@@ -6,7 +6,9 @@ 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) {
+function matchSelector(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, selector) {
     if (!selector) {
         return {
             matched: false,
@@ -29,7 +31,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) {
@@ -49,7 +53,9 @@ class SelectorTarget {
     from(target, combinator) {
         tslib_1.__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;
@@ -139,12 +145,16 @@ class SelectorTarget {
             }
         }
     }
-    _matchWithoutCombineChecking(el) {
+    _matchWithoutCombineChecking(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el) {
         return uncombinedRegexSelect(el, tslib_1.__classPrivateFieldGet(this, _SelectorTarget_selector, "f"));
     }
 }
 _SelectorTarget_combinedFrom = new WeakMap(), _SelectorTarget_selector = new WeakMap();
-function uncombinedRegexSelect(el, selector) {
+function uncombinedRegexSelect(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, selector) {
     if (!(0, is_1.isElement)(el)) {
         return {
             matched: false,

package/lib/regex-selector-matches.js

@@ -18,7 +18,7 @@ function regexSelectorMatches(reg, raw, ignoreCase) {
 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>;
+type ExtendedPseudoClass = Readonly<Record<string, (content: string) => (el: Element) => SelectorResult>>;
 export declare class Selector {
     #private;
     constructor(selector: string, extended?: ExtendedPseudoClass);

package/lib/selector.js

@@ -16,7 +16,12 @@ class Selector {
         _Selector_ruleset.set(this, void 0);
         tslib_1.__classPrivateFieldSet(this, _Selector_ruleset, Ruleset.parse(selector, extended), "f");
     }
-    match(el, scope = (0, is_1.isElement)(el) ? el : null) {
+    match(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    scope) {
+        scope = (0, is_1.isElement)(el) ? el : null;
         const results = this.search(el, scope);
         for (const result of results) {
             if (result.matched) {
@@ -25,7 +30,12 @@ class Selector {
         }
         return false;
     }
-    search(el, scope = (0, is_1.isElement)(el) ? el : null) {
+    search(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    scope) {
+        scope = (0, is_1.isElement)(el) ? el : null;
         return tslib_1.__classPrivateFieldGet(this, _Selector_ruleset, "f").match(el, scope);
     }
 }
@@ -48,17 +58,22 @@ class Ruleset {
         return new Ruleset(selectors, extended, 0);
     }
     constructor(selectors, extended, depth) {
+        var _a;
         _Ruleset_selectorGroup.set(this, []);
         tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f").push(...selectors.map(selector => new StructuredSelector(selector, depth, extended)));
         const head = tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0];
         this.headCombinator = (head === null || head === void 0 ? void 0 : head.headCombinator) || null;
         if (this.headCombinator) {
             if (depth <= 0) {
-                throw new invalid_selector_error_1.InvalidSelectorError(`'${tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0].selector}' is not a valid selector`);
+                throw new invalid_selector_error_1.InvalidSelectorError(`'${(_a = tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]) === null || _a === void 0 ? void 0 : _a.selector}' is not a valid selector`);
             }
         }
     }
-    match(el, scope) {
+    match(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    scope) {
         (0, debug_1.log)('<%s> (%s)', (0, is_1.isElement)(el) ? el.localName : el.nodeName, scope ? ((0, is_1.isElement)(scope) ? scope.localName : scope.nodeName) : null);
         return tslib_1.__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f").map(selector => {
             selLog('"%s"', selector.selector);
@@ -71,16 +86,18 @@ class Ruleset {
 _Ruleset_selectorGroup = new WeakMap();
 class StructuredSelector {
     constructor(selector, depth, extended) {
+        var _a;
         _StructuredSelector_edge.set(this, void 0);
         _StructuredSelector_selector.set(this, void 0);
         tslib_1.__classPrivateFieldSet(this, _StructuredSelector_selector, selector, "f");
         tslib_1.__classPrivateFieldSet(this, _StructuredSelector_edge, new SelectorTarget(extended, depth), "f");
         this.headCombinator =
-            tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0].type === 'combinator' ? tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0].value || null : null;
+            ((_a = tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0]) === null || _a === void 0 ? void 0 : _a.type) === 'combinator' ? tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0].value || null : null;
+        const nodes = tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes.slice();
         if (0 < depth && this.headCombinator) {
-            tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes.unshift((0, postcss_selector_parser_1.pseudo)({ value: ':scope' }));
+            nodes.unshift((0, postcss_selector_parser_1.pseudo)({ value: ':scope' }));
         }
-        tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes.forEach(node => {
+        nodes.forEach(node => {
             switch (node.type) {
                 case 'combinator': {
                     const combinedTarget = new SelectorTarget(extended, depth);
@@ -107,7 +124,11 @@ class StructuredSelector {
     get selector() {
         return tslib_1.__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes.join('');
     }
-    match(el, scope) {
+    match(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    scope) {
         return tslib_1.__classPrivateFieldGet(this, _StructuredSelector_edge, "f").match(el, scope, 0);
     }
 }
@@ -154,7 +175,11 @@ class SelectorTarget {
     from(target, combinator) {
         tslib_1.__classPrivateFieldSet(this, _SelectorTarget_combinedFrom, { target, combinator }, "f");
     }
-    match(el, scope, count) {
+    match(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    scope, count) {
         var _a;
         const result = this._match(el, scope, count);
         if (selLog.enabled) {
@@ -179,7 +204,11 @@ class SelectorTarget {
             this.pseudo.map(pseudo => pseudo.value).join(''),
         ].join('');
     }
-    _match(el, scope, count) {
+    _match(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    scope, count) {
         const unitCheck = this._matchWithoutCombineChecking(el, scope);
         if (!unitCheck.matched) {
             return unitCheck;
@@ -248,7 +277,7 @@ class SelectorTarget {
                 const matchedNodes = [];
                 const has = [];
                 const not = [];
-                const specificity = unitCheck.specificity;
+                const specificity = [...unitCheck.specificity];
                 const parentNode = el.parentElement;
                 if (parentNode) {
                     const res = target.match(parentNode, scope, count + 1);
@@ -292,7 +321,7 @@ class SelectorTarget {
                 const matchedNodes = [];
                 const has = [];
                 const not = [];
-                const specificity = unitCheck.specificity;
+                const specificity = [...unitCheck.specificity];
                 if (el.previousElementSibling) {
                     const res = target.match(el.previousElementSibling, scope, count + 1);
                     specificity[0] += res.specificity[0];
@@ -390,7 +419,11 @@ class SelectorTarget {
             }
         }
     }
-    _matchWithoutCombineChecking(el, scope) {
+    _matchWithoutCombineChecking(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    el, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    scope) {
         var _a;
         const specificity = [0, 0, 0];
         if (!(0, is_1.isElement)(el)) {
@@ -481,7 +514,9 @@ class SelectorTarget {
     }
 }
 _SelectorTarget_combinedFrom = new WeakMap(), _SelectorTarget_extended = new WeakMap(), _SelectorTarget_isAdded = new WeakMap();
-function attrMatch(attr, el) {
+function attrMatch(attr, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el) {
     return Array.from(el.attributes).some(attrOfEl => {
         if (attr.attribute !== attrOfEl.localName) {
             return false;
@@ -541,7 +576,11 @@ function attrMatch(attr, el) {
         return true;
     });
 }
-function pseudoMatch(pseudo, el, scope, extended, depth) {
+function pseudoMatch(pseudo, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+scope, extended, depth) {
     switch (pseudo.value) {
         //
         /**
@@ -738,6 +777,9 @@ function pseudoMatch(pseudo, el, scope, extended, depth) {
                 }
                 const content = pseudo.nodes.map(node => node.toString()).join('');
                 const hook = extended[ext];
+                if (!hook) {
+                    continue;
+                }
                 const matcher = hook(content);
                 return matcher(el);
             }
@@ -745,10 +787,16 @@ function pseudoMatch(pseudo, el, scope, extended, depth) {
         }
     }
 }
-function isScope(el, scope) {
+function isScope(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+scope) {
     return el === scope || el.parentNode === null;
 }
-function getDescendants(el, includeSelf = false) {
+function getDescendants(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, includeSelf = false) {
     return [
         ...Array.from(el.children)
             .map(child => getDescendants(child, true))
@@ -756,11 +804,15 @@ function getDescendants(el, includeSelf = false) {
         ...(includeSelf ? [el] : []),
     ];
 }
-function getSiblings(el) {
+function getSiblings(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el) {
     var _a;
     return Array.from(((_a = el.parentElement) === null || _a === void 0 ? void 0 : _a.children) || []);
 }
-function getSpecificity(results) {
+function getSpecificity(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+results) {
     let specificity;
     for (const result of results) {
         if (specificity) {

package/lib/types.d.ts

@@ -1,24 +1,24 @@
-export type Specificity = [number, number, number];
+export type Specificity = readonly [number, number, number];
 export type SelectorResult = SelectorMatchedResult | SelectorUnmatchedResult;
 export type SelectorMatchedResult = {
-    specificity: Specificity;
-    matched: true;
-    nodes: (Element | Text)[];
-    has: SelectorMatchedResult[];
+    readonly specificity: Specificity;
+    readonly matched: true;
+    readonly nodes: readonly (Element | Text)[];
+    readonly has: readonly SelectorMatchedResult[];
 };
 export type SelectorUnmatchedResult = {
-    specificity: Specificity;
-    matched: false;
-    not?: SelectorMatchedResult[];
+    readonly specificity: Specificity;
+    readonly matched: false;
+    readonly not?: readonly SelectorMatchedResult[];
 };
 export type RegexSelector = RegexSelectorWithoutCombination & {
-    combination?: {
-        combinator: RegexSelectorCombinator;
+    readonly combination?: {
+        readonly combinator: RegexSelectorCombinator;
     } & RegexSelector;
 };
 export type RegexSelectorCombinator = ' ' | '>' | '+' | '~' | ':has(+)' | ':has(~)';
 export type RegexSelectorWithoutCombination = {
-    nodeName?: string;
-    attrName?: string;
-    attrValue?: string;
+    readonly nodeName?: string;
+    readonly attrName?: string;
+    readonly attrValue?: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/selector",
-	"version": "3.3.0",
+	"version": "3.5.0",
 	"description": "Extended W3C Selectors matcher",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,10 +25,11 @@
 		"tslib": "^2.4.1"
 	},
 	"devDependencies": {
-		"@markuplint/ml-spec": "3.3.0",
+		"@markuplint/ml-spec": "3.5.0",
 		"@types/debug": "^4.1.7",
 		"@types/jsdom": "16",
-		"jsdom": "19"
+		"jsdom": "19",
+		"type-fest": "^3.6.1"
 	},
-	"gitHead": "791fb22a4df7acb985ced3808923fba0cd95c28a"
+	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
 }