@asamuzakjp/dom-selector 8.0.2 → 8.1.2

package/README.md

@@ -119,10 +119,11 @@ See the table below for the full list of supported selectors.
 * `selector` **{string}** CSS selector.
 * **Returns** **{boolean}** `true` if the selector is supported, `false` otherwise.
 
-### `clear()`
+### `clear(clearAll?)`
 
-Clears the internal cache of finder results to free up memory.
+Clears the internal caches to free up memory.
 
+* `clearAll` **{boolean}?** Whether to clear all caches. If false, only cached matching results are cleared. Defaults to `false`.
 * **Returns** **{void}**
 
 ## Supported CSS selectors
@@ -162,7 +163,7 @@ Clears the internal cache of finder results to free up memory.
 | `E:visited` | ✓ | Returns `false` or `null` to prevent fingerprinting. |
 | `E:local-link` | ✓ | |
 | `E:target` | ✓ | |
-| `E:target-within` | ✓ | |
+| `E:target-within` | | Removed from spec. |
 | `E:scope` | ✓ | |
 | `E:hover` | ✓ | |
 | `E:active` | ✓ | |
@@ -173,7 +174,7 @@ Clears the internal cache of finder results to free up memory.
 | `E:current(s)` | Unsupported | |
 | `E:past` | Unsupported | |
 | `E:future` | Unsupported | |
-| `E:open`<br>`E:closed` | Partially supported | Matching with `<select>`, e.g. `select:open`, is not supported. |
+| `E:open` | Partially supported | Matching with `<select>`, e.g. `select:open`, or `<input type="color">` are not supported. |
 | `E:popover-open` | Unsupported | |
 | `E:enabled`<br>`E:disabled` | ✓ | |
 | `E:read-write`<br>`E:read-only` | ✓ | |

package/package.json

@@ -25,29 +25,29 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@asamuzakjp/generational-cache": "^2.0.2",
+    "@asamuzakjp/generational-cache": "^2.0.4",
     "bidi-js": "^1.0.3",
     "css-tree": "^3.2.1",
     "is-potential-custom-element-name": "^1.0.1"
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.11",
-    "@types/node": "^25.9.1",
+    "@types/node": "^25.9.3",
     "c8": "^11.0.0",
     "chai": "^6.2.2",
-    "commander": "^14.0.3",
+    "commander": "^15.0.0",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-jsdoc": "^63.0.0",
-    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-jsdoc": "^63.0.2",
+    "eslint-plugin-prettier": "^5.5.6",
     "eslint-plugin-regexp": "^3.1.0",
-    "eslint-plugin-unicorn": "^64.0.0",
+    "eslint-plugin-unicorn": "^65.0.1",
     "globals": "^17.6.0",
     "jsdom": "^29.1.1",
     "mitata": "^1.0.34",
-    "mocha": "^11.7.5",
+    "mocha": "^11.7.6",
     "neostandard": "^0.13.0",
-    "prettier": "^3.8.3",
+    "prettier": "^3.8.4",
     "sinon": "^22.0.0",
     "tinybench": "^6.0.2",
     "typescript": "^6.0.3",
@@ -70,6 +70,12 @@
     "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",
     "build": "npm run tsc && npm run lint && npm test",
     "lint": "eslint --fix .",
     "test": "c8 --reporter=text mocha --exit test/**/*.test.js",
@@ -80,5 +86,5 @@
   "engines": {
     "node": "^22.13.0 || >=24.0.0"
   },
-  "version": "8.0.2"
+  "version": "8.1.2"
 }

package/src/index.js

@@ -15,12 +15,15 @@ import {
   filterSelector,
   isSupportedAST
 } from './js/selector.js';
-import { getType } from './js/utility.js';
+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,
@@ -30,6 +33,10 @@ 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 = /^(?:\*\|)?\*$/;
 
 /**
  * @typedef {object} CheckResult
@@ -59,7 +66,9 @@ export class DOMSelector {
     this.#window = window;
     this.#document = document ?? window.document;
     this.#idlUtils = idlUtils;
-    this.#cache = new GenerationalCache(cacheSize ?? CACHE_SIZE);
+    this.#cache = new GenerationalCache(cacheSize ?? CACHE_SIZE, {
+      strictvalidate: false
+    });
     this.#finder = new Finder(this.#window);
     this.#nwsapi = new Nwsapi(this.#window, this.#document);
   }
@@ -82,10 +91,26 @@ export class DOMSelector {
   };
 
   /**
-   * Clears the internal cache of finder results.
+   * Determines whether Nwsapi can be used for the given document.
+   * @private
+   * @param {Document} doc - The document object to check.
+   * @returns {boolean} `true` if Nwsapi can be used, otherwise `false`.
+   */
+  #canUseNwsapi = doc =>
+    doc === this.#document &&
+    doc.contentType === 'text/html' &&
+    doc.documentElement;
+
+  /**
+   * Clears the internal caches.
+   * @param {boolean} [clearAll] - Whether to clear all caches. If false,
+   * only cached matching results are cleared.
    * @returns {void}
    */
-  clear = () => {
+  clear = (clearAll = false) => {
+    if (clearAll) {
+      this.#cache.clear();
+    }
     this.#finder.clearResults(true);
   };
 
@@ -162,13 +187,16 @@ export class DOMSelector {
     if (error) {
       return this.#finder.onError(error, opt);
     }
+    if (REG_UNIVERSAL.test(selector)) {
+      const ast = this.#finder.getAST(selector);
+      return {
+        ast,
+        match: true,
+        pseudoElement: null
+      };
+    }
     const document = node.ownerDocument;
-    if (
-      document === this.#document &&
-      document.contentType === 'text/html' &&
-      document.documentElement &&
-      node.parentNode
-    ) {
+    if (node.parentNode && this.#canUseNwsapi(document)) {
       const cacheKey = `check_${selector}`;
       let filterMatches = this.#cache.get(cacheKey);
       if (filterMatches === undefined) {
@@ -201,10 +229,13 @@ export class DOMSelector {
     if (this.#idlUtils) {
       node = this.#idlUtils.wrapperForImpl(node);
     }
-    opt.check = true;
-    opt.noexcept = true;
-    opt.warn = false;
-    return this.#finder.setup(selector, node, opt).find(TARGET_SELF);
+    const options = {
+      ...opt,
+      check: true,
+      noexcept: true,
+      warn: false
+    };
+    return this.#finder.setup(selector, node, options).find(TARGET_SELF);
   };
 
   /**
@@ -219,13 +250,11 @@ export class DOMSelector {
     if (error) {
       return this.#finder.onError(error, opt);
     }
+    if (REG_UNIVERSAL.test(selector)) {
+      return true;
+    }
     const document = node.ownerDocument;
-    if (
-      document === this.#document &&
-      document.contentType === 'text/html' &&
-      document.documentElement &&
-      node.parentNode
-    ) {
+    if (node.parentNode && this.#canUseNwsapi(document)) {
       const cacheKey = `matches_${selector}`;
       let filterMatches = this.#cache.get(cacheKey);
       if (filterMatches === undefined) {
@@ -241,17 +270,16 @@ export class DOMSelector {
         }
       }
     }
-    let res;
     try {
       if (this.#idlUtils) {
         node = this.#idlUtils.wrapperForImpl(node);
       }
       const nodes = this.#finder.setup(selector, node, opt).find(TARGET_SELF);
-      res = nodes.size;
+      return nodes.size > 0;
     } catch (e) {
       this.#finder.onError(e, opt);
     }
-    return !!res;
+    return false;
   };
 
   /**
@@ -266,13 +294,11 @@ export class DOMSelector {
     if (error) {
       return this.#finder.onError(error, opt);
     }
+    if (REG_UNIVERSAL.test(selector)) {
+      return node;
+    }
     const document = node.ownerDocument;
-    if (
-      document === this.#document &&
-      document.contentType === 'text/html' &&
-      document.documentElement &&
-      node.parentNode
-    ) {
+    if (node.parentNode && this.#canUseNwsapi(document)) {
       const cacheKey = `closest_${selector}`;
       let filterMatches = this.#cache.get(cacheKey);
       if (filterMatches === undefined) {
@@ -322,13 +348,15 @@ export class DOMSelector {
     if (error) {
       return this.#finder.onError(error, opt);
     }
+    if (REG_UNIVERSAL.test(selector)) {
+      return node.firstElementChild;
+    }
+    /*
     const document =
       node.nodeType === DOCUMENT_NODE ? node : node.ownerDocument;
     if (
-      node === this.#document &&
-      document === this.#document &&
-      document.contentType === 'text/html' &&
-      document.documentElement
+      (node === this.#document || REG_TEST_LIB.test(selector)) &&
+      this.#canUseNwsapi(document)
     ) {
       const cacheKey = `querySelector_${selector}`;
       let filterMatches = this.#cache.get(cacheKey);
@@ -345,6 +373,7 @@ export class DOMSelector {
         }
       }
     }
+    */
     let res;
     try {
       if (this.#idlUtils) {
@@ -352,7 +381,7 @@ export class DOMSelector {
       }
       const nodes = this.#finder.setup(selector, node, opt).find(TARGET_FIRST);
       if (nodes.size) {
-        [res] = [...nodes];
+        res = nodes.values().next().value;
       }
     } catch (e) {
       this.#finder.onError(e, opt);
@@ -375,11 +404,12 @@ export class DOMSelector {
     }
     const document =
       node.nodeType === DOCUMENT_NODE ? node : node.ownerDocument;
+    if (document && REG_UNIVERSAL.test(selector)) {
+      return collectAllDescendants(node, document);
+    }
     if (
-      node === this.#document &&
-      document === this.#document &&
-      document.contentType === 'text/html' &&
-      document.documentElement
+      (node === this.#document || REG_TEST_LIB.test(selector)) &&
+      this.#canUseNwsapi(document)
     ) {
       const cacheKey = `querySelectorAll_${selector}`;
       let filterMatches = this.#cache.get(cacheKey);

package/src/js/constant.js

@@ -70,11 +70,14 @@ export const SIBLING = '\\s?[+~]\\s?';
 export const LOGIC_IS = `:is\\(\\s*[^)]+\\s*\\)`;
 // N_TH: excludes An+B with selector list, e.g. :nth-child(2n+1 of .foo)
 export const N_TH = `nth-(?:last-)?(?:child|of-type)\\(\\s*(?:even|odd|${ANB})\\s*\\)`;
-// SUB_TYPE: attr, id, class, pseudo-class, note that [foo|=bar] is excluded
-export const SUB_TYPE = '\\[[^|\\]]+\\]|[#.:][\\w-]+';
-export const SUB_TYPE_WO_PSEUDO = '\\[[^|\\]]+\\]|[#.][\\w-]+';
+// ATTR_TYPE: excludes [foo|=bar]
+export const ATTR_TYPE = '\\[[^|\\]]+\\]';
+// SUB_TYPE: attr, id, class, pseudo-class
+export const SUB_TYPE = `${ATTR_TYPE}|[#.:][\\w-]+`;
+export const SUB_TYPE_WO_PSEUDO = `${ATTR_TYPE}|[#.][\\w-]+`;
 // TAG_TYPE: *, tag
-export const TAG_TYPE = '\\*|[A-Za-z][\\w-]*';
+export const TAG_TYPE_WO_UNIVERSAL = '[A-Za-z][\\w-]*';
+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})+)`;