@asamuzakjp/dom-selector 7.0.0 → 7.0.2

package/package.json

@@ -23,37 +23,40 @@
     },
     "./package.json": "./package.json"
   },
-  "types": "types/index.d.ts",
   "dependencies": {
     "@asamuzakjp/nwsapi": "^2.3.9",
     "bidi-js": "^1.0.3",
-    "css-tree": "^3.1.0",
+    "css-tree": "^3.2.1",
     "is-potential-custom-element-name": "^1.0.1",
     "lru-cache": "^11.2.6"
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.11",
     "benchmark": "^2.1.4",
-    "c8": "^10.1.3",
+    "c8": "^11.0.0",
     "chai": "^6.2.2",
     "commander": "^14.0.3",
-    "eslint": "^9.39.3",
+    "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-jsdoc": "^62.7.0",
+    "eslint-plugin-jsdoc": "^62.8.0",
     "eslint-plugin-prettier": "^5.5.5",
-    "eslint-plugin-regexp": "^3.0.0",
+    "eslint-plugin-regexp": "^3.1.0",
     "eslint-plugin-unicorn": "^63.0.0",
-    "globals": "^17.3.0",
+    "globals": "^17.4.0",
     "jsdom": "^28.1.0",
     "mocha": "^11.7.5",
-    "neostandard": "^0.12.2",
+    "neostandard": "^0.13.0",
     "prettier": "^3.8.1",
-    "sinon": "^21.0.1",
+    "sinon": "^21.0.2",
     "typescript": "^5.9.3",
     "wpt-runner": "^6.1.0"
   },
   "overrides": {
-    "jsdom": "$jsdom"
+    "c8": {
+      "yargs": "^18.0.0"
+    },
+    "jsdom": "$jsdom",
+    "serialize-javascript": "^7.0.4"
   },
   "scripts": {
     "bench": "node benchmark/bench.js",
@@ -68,5 +71,5 @@
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
   },
-  "version": "7.0.0"
+  "version": "7.0.2"
 }

package/src/index.js

@@ -119,20 +119,13 @@ export class DOMSelector {
         }
       }
     }
-    let res;
-    try {
-      if (this.#idlUtils) {
-        node = this.#idlUtils.wrapperForImpl(node);
-      }
-      opt.check = true;
-      opt.noexept = true;
-      opt.warn = false;
-      this.#finder.setup(selector, node, opt);
-      res = this.#finder.find(TARGET_SELF);
-    } catch (e) {
-      this.#finder.onError(e, opt);
+    if (this.#idlUtils) {
+      node = this.#idlUtils.wrapperForImpl(node);
     }
-    return res;
+    opt.check = true;
+    opt.noexcept = true;
+    opt.warn = false;
+    return this.#finder.setup(selector, node, opt).find(TARGET_SELF);
   };
 
   /**
@@ -168,8 +161,7 @@ export class DOMSelector {
       if (filterMatches) {
         try {
           const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          const res = this.#nwsapi.match(selector, n);
-          return res;
+          return this.#nwsapi.match(selector, n);
         } catch (e) {
           // fall through
         }
@@ -180,8 +172,7 @@ export class DOMSelector {
       if (this.#idlUtils) {
         node = this.#idlUtils.wrapperForImpl(node);
       }
-      this.#finder.setup(selector, node, opt);
-      const nodes = this.#finder.find(TARGET_SELF);
+      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_SELF);
       res = nodes.size;
     } catch (e) {
       this.#finder.onError(e, opt);
@@ -222,8 +213,7 @@ export class DOMSelector {
       if (filterMatches) {
         try {
           const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          const res = this.#nwsapi.closest(selector, n);
-          return res;
+          return this.#nwsapi.closest(selector, n);
         } catch (e) {
           // fall through
         }
@@ -234,8 +224,7 @@ export class DOMSelector {
       if (this.#idlUtils) {
         node = this.#idlUtils.wrapperForImpl(node);
       }
-      this.#finder.setup(selector, node, opt);
-      const nodes = this.#finder.find(TARGET_LINEAL);
+      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_LINEAL);
       if (nodes.size) {
         let refNode = node;
         while (refNode) {
@@ -269,8 +258,7 @@ export class DOMSelector {
       if (this.#idlUtils) {
         node = this.#idlUtils.wrapperForImpl(node);
       }
-      this.#finder.setup(selector, node, opt);
-      const nodes = this.#finder.find(TARGET_FIRST);
+      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_FIRST);
       if (nodes.size) {
         [res] = [...nodes];
       }
@@ -312,8 +300,7 @@ export class DOMSelector {
       if (filterMatches) {
         try {
           const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          const res = this.#nwsapi.select(selector, n);
-          return res;
+          return this.#nwsapi.select(selector, n);
         } catch (e) {
           // fall through
         }
@@ -324,8 +311,7 @@ export class DOMSelector {
       if (this.#idlUtils) {
         node = this.#idlUtils.wrapperForImpl(node);
       }
-      this.#finder.setup(selector, node, opt);
-      const nodes = this.#finder.find(TARGET_ALL);
+      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_ALL);
       if (nodes.size) {
         res = [...nodes];
       }

package/src/js/finder.js

@@ -215,7 +215,6 @@ export class Finder {
     this.#scoped =
       this.#node !== this.#root && this.#node.nodeType === ELEMENT_NODE;
     this.#selector = selector;
-    [this.#ast, this.#nodes] = this._correspond(selector);
     this.#pseudoElement = [];
     this.#walkers = new WeakMap();
     this.#nodeWalker = null;
@@ -379,12 +378,7 @@ export class Finder {
         nodes[i] = [];
       }
     } else {
-      try {
-        this.#selectorAST = parseSelector(selector);
-      } catch (e) {
-        this.#selectorAST = null;
-        return this.onError(e);
-      }
+      this.#selectorAST = parseSelector(selector);
       const { branches, info } = walkAST(this.#selectorAST, true);
       const {
         hasHasPseudoFunc,
@@ -802,13 +796,13 @@ export class Finder {
   };
 
   /**
-   * match pseudo-class selector
+   * Matches pseudo-class selector.
    * @private
    * @see https://html.spec.whatwg.org/#pseudo-classes
-   * @param {object} ast - AST
-   * @param {object} node - Element node
-   * @param {object} [opt] - options
-   * @returns {Set.<object>} - collection of matched nodes
+   * @param {object} ast - The AST.
+   * @param {object} node - The Element node.
+   * @param {object} [opt] - Options.
+   * @returns {Set.<object>} A collection of matched nodes.
    */
   _matchPseudoClassSelector(ast, node, opt = {}) {
     const { children: astChildren, name: astName } = ast;
@@ -1535,7 +1529,7 @@ export class Finder {
           const attrType = node.getAttribute('type');
           if (
             localName === 'input' &&
-            !(node.readonly || node.hasAttribute('readonly')) &&
+            !(node.readOnly || node.hasAttribute('readonly')) &&
             !(node.disabled || node.hasAttribute('disabled')) &&
             KEYS_INPUT_RANGE.has(attrType)
           ) {
@@ -2408,7 +2402,7 @@ export class Finder {
     let nodes = [];
     let filtered = false;
     if (targetType === TARGET_SELF) {
-      [nodes, filtered] = this._matchSelf(leaves);
+      [nodes, filtered] = this._matchSelf(leaves, this.#check);
     } else if (targetType === TARGET_LINEAL) {
       [nodes, filtered] = this._findLineal(leaves, { complex });
     } else if (
@@ -2447,7 +2441,7 @@ export class Finder {
     let nodes = [];
     let filtered = false;
     if (targetType === TARGET_SELF) {
-      [nodes, filtered] = this._matchSelf(leaves);
+      [nodes, filtered] = this._matchSelf(leaves, this.#check);
     } else if (targetType === TARGET_LINEAL) {
       [nodes, filtered] = this._findLineal(leaves, { complex });
     } else {
@@ -2470,7 +2464,7 @@ export class Finder {
     let nodes = [];
     let filtered = false;
     if (targetType === TARGET_SELF) {
-      [nodes, filtered] = this._matchSelf(leaves);
+      [nodes, filtered] = this._matchSelf(leaves, this.#check);
     } else if (targetType === TARGET_LINEAL) {
       [nodes, filtered] = this._findLineal(leaves, { complex });
     } else {
@@ -2542,7 +2536,7 @@ export class Finder {
         }
       }
     } else if (targetType === TARGET_SELF) {
-      [nodes, filtered] = this._matchSelf(leaves);
+      [nodes, filtered] = this._matchSelf(leaves, this.#check);
     } else if (targetType === TARGET_LINEAL) {
       [nodes, filtered] = this._findLineal(leaves, { complex });
     } else if (targetType === TARGET_FIRST) {
@@ -2733,6 +2727,7 @@ export class Finder {
    * @returns {Array.<Array.<object>>} An array containing the AST and nodes.
    */
   _collectNodes = targetType => {
+    [this.#ast, this.#nodes] = this._correspond(this.#selector);
     const ast = this.#ast.values();
     if (targetType === TARGET_ALL || targetType === TARGET_FIRST) {
       const pendingItems = new Set();
@@ -3039,7 +3034,27 @@ export class Finder {
    * @returns {Set.<object>} A collection of matched nodes.
    */
   find = targetType => {
-    const [[...branches], collectedNodes] = this._collectNodes(targetType);
+    let collection;
+    try {
+      collection = this._collectNodes(targetType);
+    } catch (e) {
+      if (this.#check) {
+        let pseudoElement;
+        if (this.#pseudoElement.length) {
+          pseudoElement = this.#pseudoElement.join('');
+        } else {
+          pseudoElement = null;
+        }
+        return {
+          pseudoElement,
+          match: false,
+          ast: this.#selectorAST ?? null
+        };
+      } else {
+        throw e;
+      }
+    }
+    const [[...branches], collectedNodes] = collection;
     const l = branches.length;
     let sort =
       l > 1 && targetType === TARGET_ALL && this.#selector.includes(':scope');
@@ -3137,9 +3152,6 @@ export class Finder {
    * @returns {object} The AST for the selector.
    */
   getAST = selector => {
-    if (selector === this.#selector && this.#selectorAST) {
-      return this.#selectorAST;
-    }
     return parseSelector(selector);
   };
 }

package/src/js/matcher.js

@@ -427,15 +427,15 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
   let attrValue;
   if (astIdentValue) {
     if (caseInsensitive) {
-      attrValue = astIdentValue.toLowerCase();
+      attrValue = astIdentValue.toLowerCase().replace(/\\(?!\\)/g, '');
     } else {
-      attrValue = astIdentValue;
+      attrValue = astIdentValue.replace(/\\(?!\\)/g, '');
     }
   } else if (astStringValue) {
     if (caseInsensitive) {
-      attrValue = astStringValue.toLowerCase();
+      attrValue = astStringValue.toLowerCase().replace(/\\(?!\\)/g, '');
     } else {
-      attrValue = astStringValue;
+      attrValue = astStringValue.replace(/\\(?!\\)/g, '');
     }
   } else if (astStringValue === '') {
     attrValue = astStringValue;

package/src/js/parser.js

@@ -170,8 +170,7 @@ export const parseSelector = sel => {
   }
   try {
     return cssTree.parse(selector, {
-      context: 'selectorList',
-      parseCustomProperty: true
+      context: 'selectorList'
     });
   } catch (e) {
     const { message } = e;