@markuplint/selector 4.0.0-alpha.1 → 4.0.0-alpha.10

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Yusuke Hirao
+Copyright (c) 2017-2024 Yusuke Hirao
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -7,7 +7,7 @@ export function contentModelPseudoClass(specs) {
         category = category.trim().toLowerCase();
         const selectors = contentModelCategoryToTagNames(`#${category}`, specs.def);
         const matched = selectors
-            .map(selector => {
+            .flatMap(selector => {
             if (selector === '#custom') {
                 // @ts-ignore
                 if (el.isCustomElement) {
@@ -37,14 +37,13 @@ export function contentModelPseudoClass(specs) {
             }
             return createSelector(selector, specs).search(el);
         })
-            .flat()
             .filter((m) => m.matched);
         if (matched.length > 0) {
             return {
                 specificity: [0, 1, 0],
                 matched: true,
-                nodes: matched.map(m => (m.matched ? m.nodes : [])).flat(),
-                has: matched.map(m => (m.matched ? m.has : [])).flat(),
+                nodes: matched.flatMap(m => (m.matched ? m.nodes : [])),
+                has: matched.flatMap(m => (m.matched ? m.has : [])),
             };
         }
         return {

package/lib/match-selector.js

@@ -1,5 +1,15 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var _SelectorTarget_combinedFrom, _SelectorTarget_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';
@@ -176,46 +186,38 @@ el, selector) {
         tagSelector = el.localName;
         specificity[2] = 1;
     }
-    if (selector.attrName) {
-        const selectorAttrName = selector.attrName;
-        const matchedAttrNameList = Array.from(el.attributes).map(attr => {
-            const attrName = attr.name;
-            const matchedAttrName = regexSelectorMatches(selectorAttrName, attrName, isPureHTMLElement(el));
+    const isPure = isPureHTMLElement(el);
+    if (selector.attrName || selector.attrValue) {
+        const matchedAttrList = [...el.attributes]
+            .map(attr => {
+            const matchedAttrName = regexSelectorMatches(selector.attrName, attr.name, isPure);
+            if (selector.attrName && !matchedAttrName) {
+                return null;
+            }
+            const matchedAttrValue = regexSelectorMatches(selector.attrValue, attr.value, isPure);
+            if (selector.attrValue && !matchedAttrValue) {
+                return null;
+            }
             if (matchedAttrName) {
                 delete matchedAttrName.$0;
-                data = {
-                    ...data,
-                    ...matchedAttrName,
-                };
-                specifiedAttr.set(attrName, '');
             }
-            return matchedAttrName;
-        });
-        if (!matchedAttrNameList.some(_ => !!_)) {
-            matched = false;
-        }
-    }
-    if (selector.attrValue) {
-        const selectorAttrValue = selector.attrValue;
-        const matchedAttrValueList = Array.from(el.attributes).map(attr => {
-            const attrName = attr.name;
-            const attrValue = attr.value;
-            const matchedAttrValue = regexSelectorMatches(selectorAttrValue, attrValue, isPureHTMLElement(el));
             if (matchedAttrValue) {
                 delete matchedAttrValue.$0;
-                data = {
-                    ...data,
-                    ...matchedAttrValue,
-                };
-                specifiedAttr.set(attrName, attrValue);
             }
-            return matchedAttrValue;
-        });
-        if (!matchedAttrValueList.some(_ => !!_)) {
+            data = {
+                ...data,
+                ...matchedAttrName,
+                ...matchedAttrValue,
+            };
+            specifiedAttr.set(attr.name, matchedAttrValue ? attr.value : '');
+            return matchedAttrValue ?? matchedAttrName ?? null;
+        })
+            .filter((a) => !!a);
+        if (matchedAttrList.length === 0) {
             matched = false;
         }
     }
-    const attrSelector = Array.from(specifiedAttr.entries())
+    const attrSelector = [...specifiedAttr.entries()]
         .map(([name, value]) => {
         return `[${name}${value ? `="${value}"` : ''}]`;
     })

package/lib/regex-selector-matches.d.ts

@@ -1,3 +1,3 @@
-export declare function regexSelectorMatches(reg: string, raw: string, ignoreCase: boolean): {
+export declare function regexSelectorMatches(reg: string | undefined, raw: string, ignoreCase: boolean): {
     [x: string]: string;
 } | null;

package/lib/regex-selector-matches.js

@@ -1,4 +1,7 @@
 export function regexSelectorMatches(reg, raw, ignoreCase) {
+    if (!reg) {
+        return null;
+    }
     const res = {};
     const pattern = toRegexp(reg);
     const regex = new RegExp(pattern instanceof RegExp ? pattern : `^${pattern.trim()}$`, ignoreCase ? 'i' : undefined);
@@ -6,14 +9,15 @@ export function regexSelectorMatches(reg, raw, ignoreCase) {
     if (!matched) {
         return null;
     }
-    matched.forEach((val, i) => (res[`$${i}`] = val));
+    for (const [i, val] of matched.entries())
+        res[`$${i}`] = val;
     return {
         ...res,
         ...matched.groups,
     };
 }
 function toRegexp(pattern) {
-    const matched = pattern.match(/^\/(.+)\/([ig]*)$/i);
+    const matched = pattern.match(/^\/(.+)\/([gi]*)$/i);
     if (matched && matched[1]) {
         return new RegExp(matched[1], matched[2]);
     }

package/lib/selector.js

@@ -1,5 +1,15 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var _Selector_ruleset, _Ruleset_selectorGroup, _StructuredSelector_edge, _StructuredSelector_selector, _SelectorTarget_combinedFrom, _SelectorTarget_extended, _SelectorTarget_isAdded;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { resolveNamespace } from '@markuplint/ml-spec';
 import parser from 'postcss-selector-parser';
 import { compareSpecificity } from './compare-specificity.js';
@@ -45,11 +55,11 @@ class Ruleset {
                 selectors.push(...root.nodes);
             }).processSync(selector);
         }
-        catch (e) {
-            if (e instanceof Error) {
+        catch (error) {
+            if (error instanceof Error) {
                 throw new InvalidSelectorError(selector);
             }
-            throw e;
+            throw error;
         }
         return new Ruleset(selectors, extended, 0);
     }
@@ -58,13 +68,11 @@ class Ruleset {
         __classPrivateFieldGet(this, _Ruleset_selectorGroup, "f").push(...selectors.map(selector => new StructuredSelector(selector, depth, extended)));
         const head = __classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0];
         this.headCombinator = head?.headCombinator ?? null;
-        if (this.headCombinator) {
-            if (depth <= 0) {
-                if (__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]?.selector) {
-                    throw new InvalidSelectorError(__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]?.selector);
-                }
-                throw new Error('Combinated selector depth is not expected');
+        if (this.headCombinator && depth <= 0) {
+            if (__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]?.selector) {
+                throw new InvalidSelectorError(__classPrivateFieldGet(this, _Ruleset_selectorGroup, "f")[0]?.selector);
             }
+            throw new Error('Combinated selector depth is not expected');
         }
     }
     match(
@@ -90,12 +98,12 @@ class StructuredSelector {
         __classPrivateFieldSet(this, _StructuredSelector_edge, new SelectorTarget(extended, depth), "f");
         this.headCombinator =
             __classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0]?.type === 'combinator' ? __classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes[0].value ?? null : null;
-        const nodes = __classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes.slice();
+        const nodes = [...__classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes];
         if (0 < depth && this.headCombinator) {
             // eslint-disable-next-line import/no-named-as-default-member
             nodes.unshift(parser.pseudo({ value: ':scope' }));
         }
-        nodes.forEach(node => {
+        for (const node of nodes) {
             switch (node.type) {
                 case 'combinator': {
                     const combinedTarget = new SelectorTarget(extended, depth);
@@ -117,7 +125,7 @@ class StructuredSelector {
                     __classPrivateFieldGet(this, _StructuredSelector_edge, "f").add(node);
                 }
             }
-        });
+        }
     }
     get selector() {
         return __classPrivateFieldGet(this, _StructuredSelector_selector, "f").nodes.join('');
@@ -512,7 +520,7 @@ _SelectorTarget_combinedFrom = new WeakMap(), _SelectorTarget_extended = new Wea
 function attrMatch(attr, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 el) {
-    return Array.from(el.attributes).some(attrOfEl => {
+    return [...el.attributes].some(attrOfEl => {
         if (attr.attribute !== attrOfEl.localName) {
             return false;
         }
@@ -632,8 +640,8 @@ scope, extended, depth) {
             return {
                 specificity,
                 matched: matched.length > 0,
-                nodes: matched.map(m => m.nodes).flat(),
-                has: matched.map(m => m.has).flat(),
+                nodes: matched.flatMap(m => m.nodes),
+                has: matched.flatMap(m => m.has),
             };
         }
         case ':has': {
@@ -642,9 +650,7 @@ scope, extended, depth) {
             switch (ruleset.headCombinator) {
                 case '+':
                 case '~': {
-                    const has = getSiblings(el)
-                        .map(sib => ruleset.match(sib, el).filter((m) => m.matched))
-                        .flat();
+                    const has = getSiblings(el).flatMap(sib => ruleset.match(sib, el).filter((m) => m.matched));
                     if (has.length > 0) {
                         return {
                             specificity,
@@ -659,9 +665,7 @@ scope, extended, depth) {
                     };
                 }
                 default: {
-                    const has = getDescendants(el)
-                        .map(sib => ruleset.match(sib, el).filter((m) => m.matched))
-                        .flat();
+                    const has = getDescendants(el).flatMap(sib => ruleset.match(sib, el).filter((m) => m.matched));
                     if (has.length > 0) {
                         return {
                             specificity,
@@ -684,8 +688,8 @@ scope, extended, depth) {
             return {
                 specificity: [0, 0, 0],
                 matched: matched.length > 0,
-                nodes: matched.map(m => m.nodes).flat(),
-                has: matched.map(m => m.has).flat(),
+                nodes: matched.flatMap(m => m.nodes),
+                has: matched.flatMap(m => m.has),
             };
         }
         case ':scope': {
@@ -747,6 +751,7 @@ scope, extended, depth) {
         case ':nth-col': {
             throw new Error(`Unsupported pseudo ${pseudo.toString()} selector yet. If you want it, please request it as the issue (https://github.com/markuplint/markuplint/issues/new).`);
         }
+        /* eslint-disable unicorn/no-useless-switch-case */
         case ':dir':
         case ':lang':
         case ':any-link':
@@ -780,6 +785,7 @@ scope, extended, depth) {
             }
             throw new Error(`Unsupported pseudo ${pseudo.toString()} selector.`);
         }
+        /* eslint-enable unicorn/no-useless-switch-case */
     }
 }
 function isScope(
@@ -792,22 +798,17 @@ scope) {
 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))
-            .flat(),
-        ...(includeSelf ? [el] : []),
-    ];
+    return [...[...el.children].flatMap(child => getDescendants(child, true)), ...(includeSelf ? [el] : [])];
 }
 function getSiblings(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 el) {
-    return Array.from(el.parentElement?.children ?? []);
+    return [...(el.parentElement?.children ?? [])];
 }
 function getSpecificity(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 results) {
-    let specificity = undefined;
+    let specificity;
     for (const result of results) {
         if (specificity) {
             const order = compareSpecificity(specificity, result.specificity);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/selector",
-	"version": "4.0.0-alpha.1",
+	"version": "4.0.0-alpha.10",
 	"description": "Extended W3C Selectors matcher",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,16 +25,15 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-spec": "4.0.0-alpha.1",
-		"@types/debug": "^4.1.8",
+		"@markuplint/ml-spec": "4.0.0-alpha.10",
+		"@types/debug": "^4.1.12",
 		"debug": "^4.3.4",
-		"postcss-selector-parser": "^6.0.13",
-		"tslib": "^2.6.1",
-		"type-fest": "^4.1.0"
+		"postcss-selector-parser": "^6.0.15",
+		"type-fest": "^4.10.1"
 	},
 	"devDependencies": {
-		"@types/jsdom": "21.1.1",
-		"jsdom": "22.1.0"
+		"@types/jsdom": "21.1.6",
+		"jsdom": "24.0.0"
 	},
-	"gitHead": "22502ee22a378ae766033d687dbc0443e5ed35dc"
+	"gitHead": "b41153ea665aa8f091daf6114a06047f4ccb8350"
 }