@asamuzakjp/dom-selector 8.1.1 → 8.1.3

package/package.json

@@ -58,24 +58,26 @@
       "yargs": "^18.0.0"
     },
     "eslint": {
-      "brace-expansion": "^1.1.13"
+      "brace-expansion": "^1.1.13",
+      "js-yaml": "^4.1.2"
     },
     "jsdom": "$jsdom",
     "mocha": {
-      "diff": "^8.0.3"
+      "diff": "^8.0.3",
+      "js-yaml": "^4.1.2"
     },
     "serialize-javascript": "^7.0.4"
   },
   "scripts": {
-    "bench": "node benchmark/bench.js",
-    "bench:cache": "node benchmark/bench-cache.js",
-    "bench:nwsapi": "node benchmark/bench-nwsapi.js",
-    "bench:ps-form": "node benchmark/bench-default.js && node benchmark/bench-indeterminate.js && node benchmark/bench-valid-invalid.js",
-    "bench:ps-has": "node benchmark/bench-has.js",
-    "bench:ps-nth": "node benchmark/bench-nth-child.js && node benchmark/bench-nth-of-type.js",
-    "bench:ps-traverse": "node benchmark/bench-dir.js && node benchmark/bench-lang.js",
-    "bench:ts": "node benchmark/bench-testing-library.js",
-    "bench:universal": "node benchmark/bench-universal.js",
+    "bench": "node --expose-gc benchmark/bench.js",
+    "bench:cache": "node --expose-gc benchmark/bench-cache.js",
+    "bench:nwsapi": "node --expose-gc benchmark/bench-nwsapi.js",
+    "bench:ps-form": "node --expose-gc benchmark/bench-default.js && node --expose-gc benchmark/bench-indeterminate.js && node --expose-gc benchmark/bench-valid-invalid.js",
+    "bench:ps-has": "node --expose-gc benchmark/bench-has.js",
+    "bench:ps-nth": "node --expose-gc benchmark/bench-nth-child.js && node --expose-gc benchmark/bench-nth-of-type.js",
+    "bench:ps-traverse": "node --expose-gc benchmark/bench-dir.js && node --expose-gc benchmark/bench-lang.js",
+    "bench:ts": "node --expose-gc benchmark/bench-testing-library.js",
+    "bench:universal": "node --expose-gc benchmark/bench-universal.js",
     "build": "npm run tsc && npm run lint && npm test",
     "lint": "eslint --fix .",
     "test": "c8 --reporter=text mocha --exit test/**/*.test.js",
@@ -86,5 +88,5 @@
   "engines": {
     "node": "^22.13.0 || >=24.0.0"
   },
-  "version": "8.1.1"
+  "version": "8.1.3"
 }

package/src/index.js

@@ -101,6 +101,15 @@ export class DOMSelector {
     doc.contentType === 'text/html' &&
     doc.documentElement;
 
+  /**
+   * Wraps the node for IDL internal implementation if idlUtils is present.
+   * @private
+   * @param {Document|DocumentFragment|Element} node - The raw node.
+   * @returns {object} The wrapped or raw node.
+   */
+  #wrapNode = node =>
+    this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
+
   /**
    * Clears the internal caches.
    * @param {boolean} [clearAll] - Whether to clear all caches. If false,
@@ -205,8 +214,7 @@ export class DOMSelector {
       }
       if (filterMatches) {
         try {
-          const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          const match = this.#nwsapi.match(selector, n);
+          const match = this.#nwsapi.match(selector, this.#wrapNode(node));
           let ast = null;
           if (match) {
             const astCacheKey = `check_ast_${selector}`;
@@ -226,16 +234,15 @@ export class DOMSelector {
         }
       }
     }
-    if (this.#idlUtils) {
-      node = this.#idlUtils.wrapperForImpl(node);
-    }
     const options = {
       ...opt,
       check: true,
       noexcept: true,
       warn: false
     };
-    return this.#finder.setup(selector, node, options).find(TARGET_SELF);
+    return this.#finder
+      .setup(selector, this.#wrapNode(node), options)
+      .find(TARGET_SELF);
   };
 
   /**
@@ -263,18 +270,16 @@ export class DOMSelector {
       }
       if (filterMatches) {
         try {
-          const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          return this.#nwsapi.match(selector, n);
+          return this.#nwsapi.match(selector, this.#wrapNode(node));
         } catch (e) {
           // fall through
         }
       }
     }
     try {
-      if (this.#idlUtils) {
-        node = this.#idlUtils.wrapperForImpl(node);
-      }
-      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_SELF);
+      const nodes = this.#finder
+        .setup(selector, this.#wrapNode(node), opt)
+        .find(TARGET_SELF);
       return nodes.size > 0;
     } catch (e) {
       this.#finder.onError(e, opt);
@@ -307,25 +312,20 @@ export class DOMSelector {
       }
       if (filterMatches) {
         try {
-          const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          return this.#nwsapi.closest(selector, n);
+          return this.#nwsapi.closest(selector, this.#wrapNode(node));
         } catch (e) {
           // fall through
         }
       }
     }
-    let res;
     try {
-      if (this.#idlUtils) {
-        node = this.#idlUtils.wrapperForImpl(node);
-      }
+      node = this.#wrapNode(node);
       const nodes = this.#finder.setup(selector, node, opt).find(TARGET_LINEAL);
       if (nodes.size) {
         let refNode = node;
         while (refNode) {
           if (nodes.has(refNode)) {
-            res = refNode;
-            break;
+            return refNode;
           }
           refNode = refNode.parentNode;
         }
@@ -333,7 +333,7 @@ export class DOMSelector {
     } catch (e) {
       this.#finder.onError(e, opt);
     }
-    return res ?? null;
+    return null;
   };
 
   /**
@@ -374,19 +374,16 @@ export class DOMSelector {
       }
     }
     */
-    let res;
     try {
-      if (this.#idlUtils) {
-        node = this.#idlUtils.wrapperForImpl(node);
-      }
+      node = this.#wrapNode(node);
       const nodes = this.#finder.setup(selector, node, opt).find(TARGET_FIRST);
       if (nodes.size) {
-        res = nodes.values().next().value;
+        return nodes.values().next().value;
       }
     } catch (e) {
       this.#finder.onError(e, opt);
     }
-    return res ?? null;
+    return null;
   };
 
   /**
@@ -407,37 +404,43 @@ export class DOMSelector {
     if (document && REG_UNIVERSAL.test(selector)) {
       return collectAllDescendants(node, document);
     }
-    if (
-      (node === this.#document || REG_TEST_LIB.test(selector)) &&
-      this.#canUseNwsapi(document)
-    ) {
-      const cacheKey = `querySelectorAll_${selector}`;
-      let filterMatches = this.#cache.get(cacheKey);
-      if (filterMatches === undefined) {
-        filterMatches = filterSelector(selector, TARGET_ALL);
-        this.#cache.set(cacheKey, filterMatches);
+    if (this.#canUseNwsapi(document)) {
+      let routeToNwsapi = node === this.#document;
+      if (!routeToNwsapi) {
+        const testCacheKey = `testlib_${selector}`;
+        let isTestLib = this.#cache.get(testCacheKey);
+        if (isTestLib === undefined) {
+          isTestLib = REG_TEST_LIB.test(selector);
+          this.#cache.set(testCacheKey, isTestLib);
+        }
+        routeToNwsapi = isTestLib;
       }
-      if (filterMatches) {
-        try {
-          const n = this.#idlUtils ? this.#idlUtils.wrapperForImpl(node) : node;
-          return this.#nwsapi.select(selector, n);
-        } catch (e) {
-          // fall through
+      if (routeToNwsapi) {
+        const cacheKey = `querySelectorAll_${selector}`;
+        let filterMatches = this.#cache.get(cacheKey);
+        if (filterMatches === undefined) {
+          filterMatches = filterSelector(selector, TARGET_ALL);
+          this.#cache.set(cacheKey, filterMatches);
+        }
+        if (filterMatches) {
+          try {
+            return this.#nwsapi.select(selector, this.#wrapNode(node));
+          } catch (e) {
+            // fall through
+          }
         }
       }
     }
-    let res;
     try {
-      if (this.#idlUtils) {
-        node = this.#idlUtils.wrapperForImpl(node);
-      }
-      const nodes = this.#finder.setup(selector, node, opt).find(TARGET_ALL);
+      const nodes = this.#finder
+        .setup(selector, this.#wrapNode(node), opt)
+        .find(TARGET_ALL);
       if (nodes.size) {
-        res = [...nodes];
+        return [...nodes];
       }
     } catch (e) {
       this.#finder.onError(e, opt);
     }
-    return res ?? [];
+    return [];
   };
 }

package/src/js/constant.js

@@ -81,7 +81,6 @@ export const TAG_TYPE = `\\*|${TAG_TYPE_WO_UNIVERSAL}`;
 export const TAG_TYPE_I = '\\*|[A-Z][\\w-]*';
 export const COMPOUND = `(?:${TAG_TYPE}|(?:${TAG_TYPE})?(?:${SUB_TYPE})+)`;
 export const COMPOUND_L = `(?:${TAG_TYPE}|(?:${TAG_TYPE})?(?:${SUB_TYPE}|${LOGIC_IS})+)`;
-export const COMPOUND_L_I = `(?:(?:${TAG_TYPE_I})?(?:${SUB_TYPE}|${LOGIC_IS})+)`;
 export const COMPOUND_I = `(?:${TAG_TYPE_I}|(?:${TAG_TYPE_I})?(?:${SUB_TYPE})+)`;
 export const COMPOUND_WO_PSEUDO = `(?:${TAG_TYPE}|(?:${TAG_TYPE})?(?:${SUB_TYPE_WO_PSEUDO})+)`;
 export const COMPLEX = `${COMPOUND}(?:${COMBO}${COMPOUND})*`;

package/src/js/finder.js

@@ -113,7 +113,6 @@ export class Finder {
   #ast;
   #astCache = new WeakMap();
   #check;
-  #combinatorCache;
   #descendant;
   #document;
   #documentCache = new WeakMap();
@@ -246,7 +245,6 @@ export class Finder {
    */
   clearResults = (all = false) => {
     this.#anbCache = null;
-    this.#combinatorCache = null;
     this.#focusWithinCache = null;
     this.#invalidateResults = null;
     this.#nthChildCache = null;
@@ -2223,36 +2221,12 @@ export class Finder {
         break;
       }
       case '~': {
-        const parentNode = node.parentNode;
-        if (!parentNode) {
-          break;
-        }
-        if (!this.#combinatorCache) {
-          this.#combinatorCache = new WeakMap();
-        }
-        let cacheMap = this.#combinatorCache.get(parentNode);
-        if (!cacheMap) {
-          cacheMap = new Map();
-          this.#combinatorCache.set(parentNode, cacheMap);
-        }
-        let matchedSet = cacheMap.get(leaves);
-        if (!matchedSet) {
-          matchedSet = new Set();
-          let child = parentNode.firstElementChild;
-          while (child) {
-            if (this._matchLeaves(leaves, child, opt)) {
-              matchedSet.add(child);
-            }
-            child = child.nextElementSibling;
-          }
-          cacheMap.set(leaves, matchedSet);
-        }
         let refNode =
           dir === DIR_NEXT
             ? node.nextElementSibling
             : node.previousElementSibling;
         while (refNode) {
-          if (matchedSet.has(refNode)) {
+          if (this._matchLeaves(leaves, refNode, opt)) {
             matched.push(refNode);
           }
           refNode =

package/src/js/selector.js

@@ -11,8 +11,6 @@ import {
   COMBINATOR,
   COMBO,
   COMPOUND_I,
-  COMPOUND_L_I,
-  DESCEND,
   HAS_COMPOUND,
   KEYS_LOGICAL,
   KEYS_PS_CLASS_SUPPORTED,
@@ -23,6 +21,7 @@ import {
   PS_CLASS_SELECTOR,
   PS_ELEMENT_SELECTOR,
   SELECTOR,
+  SUB_TYPE,
   SYNTAX_ERR,
   TARGET_ALL
 } from './constant.js';
@@ -30,9 +29,11 @@ import {
 /* regexp */
 const REG_EXCLUDE_BASIC =
   /[|\\]|::|[^\u0021-\u007F\s]|\[\s*[\w$*=^|~-]+(?:(?:"[\w$*=^|~\s'-]+"|'[\w$*=^|~\s"-]+')?(?:\s+[\w$*=^|~-]+)+|"[^"\]]{1,255}|'[^'\]]{1,255})\s*\]|:(?:is|where)\(\s*\)/;
+const REG_EXCLUDE_QSA = new RegExp(
+  `(?:^(?:[A-Z]|\\.)[\\w-]*$|^(?:${SUB_TYPE}|:${N_TH})+$|${COMPOUND_I}${COMBO}${COMPOUND_I})`,
+  'i'
+);
 const REG_COMPLEX = new RegExp(`${COMPOUND_I}${COMBO}${COMPOUND_I}`, 'i');
-const REG_COMPOUND = new RegExp(`^${COMPOUND_L_I}$`, 'i');
-const REG_DESCEND = new RegExp(`${COMPOUND_I}${DESCEND}${COMPOUND_I}`, 'i');
 const REG_LOGIC_COMPLEX = new RegExp(
   `:(?!${PSEUDO_CLASS}|${N_TH}|${LOGIC_COMPLEX})`
 );
@@ -264,7 +265,6 @@ export const extractSubjectsRegExp = (selector, caseSensitive) => {
  * @returns {boolean} - True if the selector is valid for nwsapi.
  */
 export const filterSelector = (selector, target) => {
-  const isQuerySelectorAll = target === TARGET_ALL;
   // Basic validation and fast-fail for null/undefined/non-string values.
   if (
     !selector ||
@@ -277,6 +277,10 @@ export const filterSelector = (selector, target) => {
   if (REG_INVALID_SYNTAX.test(selector)) {
     return false;
   }
+  // Target-specific early exits.
+  if (target === TARGET_ALL && REG_EXCLUDE_QSA.test(selector)) {
+    return false;
+  }
   // Exclude various complex or unsupported selectors early.
   // i.e. non-ASCII, escaped selectors, namespaced selectors, pseudo-elements.
   if (selector.includes('/') || REG_EXCLUDE_BASIC.test(selector)) {
@@ -289,18 +293,11 @@ export const filterSelector = (selector, target) => {
       return false;
     }
   }
-  // Target-specific early exits.
-  if (target === TARGET_ALL && !REG_COMPOUND.test(selector)) {
-    return false;
-  }
   // Logic for pseudo-classes.
   if (selector.includes(':')) {
-    // Exclude descendant combinators in logical selectors for querySelectorAll.
-    if (isQuerySelectorAll && REG_DESCEND.test(selector)) {
-      return false;
-    }
     // Determine if the selector has complex logical structures.
-    const isComplex = isQuerySelectorAll ? false : REG_COMPLEX.test(selector);
+    const isComplex =
+      target === TARGET_ALL ? false : REG_COMPLEX.test(selector);
     // Handle :has() specifically.
     if (selector.includes(':has(')) {
       if (!isComplex || REG_LOGIC_HAS_COMPOUND.test(selector)) {

package/types/js/constant.d.ts

@@ -62,7 +62,6 @@ export const TAG_TYPE: "\\*|[A-Za-z][\\w-]*";
 export const TAG_TYPE_I: "\\*|[A-Z][\\w-]*";
 export const COMPOUND: "(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+)+)";
 export const COMPOUND_L: "(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+|:is\\(\\s*[^)]+\\s*\\))+)";
-export const COMPOUND_L_I: "(?:(?:\\*|[A-Z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+|:is\\(\\s*[^)]+\\s*\\))+)";
 export const COMPOUND_I: "(?:\\*|[A-Z][\\w-]*|(?:\\*|[A-Z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+)+)";
 export const COMPOUND_WO_PSEUDO: "(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.][\\w-]+)+)";
 export const COMPLEX: "(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+)+)(?:\\s?[\\s>~+]\\s?(?:\\*|[A-Za-z][\\w-]*|(?:\\*|[A-Za-z][\\w-]*)?(?:\\[[^|\\]]+\\]|[#.:][\\w-]+)+))*";