@asamuzakjp/dom-selector 8.1.4 → 8.1.5

package/package.json

@@ -76,7 +76,7 @@
     "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:tl": "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 .",
@@ -88,5 +88,5 @@
   "engines": {
     "node": "^22.13.0 || >=24.0.0"
   },
-  "version": "8.1.4"
+  "version": "8.1.5"
 }

package/src/index.js

@@ -19,11 +19,8 @@ import { collectAllDescendants, getType } from './js/utility.js';
 
 /* constants */
 import {
-  ATTR_TYPE,
-  COMBO,
   DOCUMENT_NODE,
   ELEMENT_NODE,
-  TAG_TYPE_WO_UNIVERSAL,
   TARGET_ALL,
   TARGET_FIRST,
   TARGET_LINEAL,
@@ -33,9 +30,6 @@ const CACHE_SIZE = 2048;
 
 /* regexp */
 const REG_SELECTOR = /[[\]():\\"'`]/;
-const REG_TEST_LIB = new RegExp(
-  `^(?:${TAG_TYPE_WO_UNIVERSAL}|[*]?${ATTR_TYPE}(?:\\s*,\\s*${TAG_TYPE_WO_UNIVERSAL}${COMBO}${TAG_TYPE_WO_UNIVERSAL})?)$`
-);
 const REG_UNIVERSAL = /^(?:\*\|)?\*$/;
 
 /**
@@ -351,13 +345,11 @@ export class DOMSelector {
     if (REG_UNIVERSAL.test(selector)) {
       return node.firstElementChild;
     }
+    // Only enabled when debugging.
     /*
     const document =
       node.nodeType === DOCUMENT_NODE ? node : node.ownerDocument;
-    if (
-      (node === this.#document || REG_TEST_LIB.test(selector)) &&
-      this.#canUseNwsapi(document)
-    ) {
+    if (node === this.#document && this.#canUseNwsapi(document)) {
       const cacheKey = `querySelector_${selector}`;
       let filterMatches = this.#cache.get(cacheKey);
       if (filterMatches === undefined) {
@@ -405,29 +397,17 @@ export class DOMSelector {
       return collectAllDescendants(node, document);
     }
     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;
+      const cacheKey = `querySelectorAll_${selector}`;
+      let filterMatches = this.#cache.get(cacheKey);
+      if (filterMatches === undefined) {
+        filterMatches = filterSelector(selector, TARGET_ALL);
+        this.#cache.set(cacheKey, filterMatches);
       }
-      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
-          }
+      if (filterMatches) {
+        try {
+          return this.#nwsapi.select(selector, this.#wrapNode(node));
+        } catch (e) {
+          // fall through
         }
       }
     }

package/src/js/selector.js

@@ -8,6 +8,7 @@ import { generateException } from './utility.js';
 
 /* constants */
 import {
+  ATTR_TYPE,
   COMBINATOR,
   COMBO,
   COMPOUND_I,
@@ -21,8 +22,8 @@ import {
   PS_CLASS_SELECTOR,
   PS_ELEMENT_SELECTOR,
   SELECTOR,
-  SUB_TYPE,
   SYNTAX_ERR,
+  TAG_TYPE_WO_UNIVERSAL,
   TARGET_ALL
 } from './constant.js';
 
@@ -30,7 +31,7 @@ import {
 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})`,
+  `(?:^(?:[A-Z]|\\.)[\\w-]*$|${COMPOUND_I}${COMBO}${COMPOUND_I})`,
   'i'
 );
 const REG_COMPLEX = new RegExp(`${COMPOUND_I}${COMBO}${COMPOUND_I}`, 'i');
@@ -51,6 +52,9 @@ const REG_CLASS = /\.(\D[^#.*]+)/g;
 const REG_TAG = /^([^#.]+)/;
 const REG_INVALID_SYNTAX =
   /[+~>]\s*[+~>]|^\s*[+~>]|[+~>]\s*$|^\s*,|,\s*,|,\s*$/;
+const REG_TEST_LIB = new RegExp(
+  `^(?:[*]?${ATTR_TYPE}(?:\\s*,\\s*${TAG_TYPE_WO_UNIVERSAL}${COMBO}${TAG_TYPE_WO_UNIVERSAL})?)$`
+);
 
 /**
  * Find a nested :has() pseudo-class.
@@ -278,7 +282,11 @@ export const filterSelector = (selector, target) => {
     return false;
   }
   // Target-specific early exits.
-  if (target === TARGET_ALL && REG_EXCLUDE_QSA.test(selector)) {
+  if (
+    target === TARGET_ALL &&
+    REG_EXCLUDE_QSA.test(selector) &&
+    !REG_TEST_LIB.test(selector)
+  ) {
     return false;
   }
   // Exclude various complex or unsupported selectors early.