@asamuzakjp/dom-selector 7.0.8 → 7.0.10

package/package.json

@@ -24,6 +24,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
+    "@asamuzakjp/generational-cache": "^1.0.1",
     "@asamuzakjp/nwsapi": "^2.3.9",
     "bidi-js": "^1.0.3",
     "css-tree": "^3.2.1",
@@ -31,7 +32,7 @@
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.11",
-    "@types/node": "^25.5.2",
+    "@types/node": "^25.6.0",
     "benchmark": "^2.1.4",
     "c8": "^11.0.0",
     "chai": "^6.2.2",
@@ -42,12 +43,13 @@
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-regexp": "^3.1.0",
     "eslint-plugin-unicorn": "^64.0.0",
-    "globals": "^17.4.0",
-    "jsdom": "^29.0.1",
+    "globals": "^17.5.0",
+    "jsdom": "^29.0.2",
+    "mitata": "^1.0.34",
     "mocha": "^11.7.5",
     "neostandard": "^0.13.0",
-    "prettier": "^3.8.1",
-    "sinon": "^21.0.3",
+    "prettier": "^3.8.3",
+    "sinon": "^21.1.2",
     "typescript": "^6.0.2",
     "wpt-runner": "^7.0.0"
   },
@@ -60,6 +62,8 @@
   },
   "scripts": {
     "bench": "node benchmark/bench.js",
+    "bench:cache": "node benchmark/bench-cache.js",
+    "bench:cacheMonster": "node benchmark/bench-cache-monster.js",
     "bench:sizzle": "node benchmark/bench-sizzle.js",
     "build": "npm run tsc && npm run lint && npm test",
     "lint": "eslint --fix .",
@@ -71,5 +75,5 @@
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
   },
-  "version": "7.0.8"
+  "version": "7.0.10"
 }

package/src/index.js

@@ -6,6 +6,7 @@
  */
 
 /* import */
+import { GenerationalCache } from '@asamuzakjp/generational-cache';
 import { Finder } from './js/finder.js';
 import { filterSelector, getType, initNwsapi } from './js/utility.js';
 
@@ -19,51 +20,7 @@ import {
   TARGET_LINEAL,
   TARGET_SELF
 } from './js/constant.js';
-const MAX_CACHE = 1024;
-
-/* Generational Cache */
-export class GenerationalCache {
-  constructor(max) {
-    this.max = Math.ceil(max / 2);
-    this.current = new Map();
-    this.old = new Map();
-  }
-
-  get(key) {
-    let value = this.current.get(key);
-    if (value !== undefined) {
-      return value;
-    }
-    value = this.old.get(key);
-    if (value !== undefined) {
-      this.set(key, value);
-      return value;
-    }
-    return undefined;
-  }
-
-  set(key, value) {
-    this.current.set(key, value);
-    if (this.current.size >= this.max) {
-      this.old = this.current;
-      this.current = new Map();
-    }
-  }
-
-  has(key) {
-    return this.current.has(key) || this.old.has(key);
-  }
-
-  delete(key) {
-    this.current.delete(key);
-    this.old.delete(key);
-  }
-
-  clear() {
-    this.current.clear();
-    this.old.clear();
-  }
-}
+const CACHE_SIZE = 1024;
 
 /**
  * @typedef {object} CheckResult
@@ -89,13 +46,13 @@ export class DOMSelector {
    * @param {object} [opt] - Options.
    */
   constructor(window, document, opt = {}) {
-    const { idlUtils } = opt;
+    const { cacheSize, idlUtils } = opt;
     this.#window = window;
     this.#document = document ?? window.document;
     this.#finder = new Finder(window);
     this.#idlUtils = idlUtils;
     this.#nwsapi = initNwsapi(window, document);
-    this.#cache = new GenerationalCache(MAX_CACHE);
+    this.#cache = new GenerationalCache(cacheSize ?? CACHE_SIZE);
   }
 
   /**
@@ -104,7 +61,6 @@ export class DOMSelector {
    */
   clear = () => {
     this.#finder.clearResults(true);
-    // this.#cache.clear();
   };
 
   /**

package/src/js/matcher.js

@@ -443,16 +443,19 @@ export const matchAttributeSelector = (ast, node, opt = {}) => {
   const { name: astIdentValue, value: astStringValue } = astValue ?? {};
   let attrValue;
   if (astIdentValue) {
+    // Ident values are not unescaped by css-tree, so we must unescape them
+    // (e.g. `\5c` hex escapes, `\n` character escapes).
     if (caseInsensitive) {
-      attrValue = astIdentValue.toLowerCase().replace(/\\(?!\\)/g, '');
+      attrValue = unescapeSelector(astIdentValue).toLowerCase();
     } else {
-      attrValue = astIdentValue.replace(/\\(?!\\)/g, '');
+      attrValue = unescapeSelector(astIdentValue);
     }
   } else if (astStringValue) {
+    // String values (quoted) are already unescaped by css-tree, so use as-is.
     if (caseInsensitive) {
-      attrValue = astStringValue.toLowerCase().replace(/\\(?!\\)/g, '');
+      attrValue = astStringValue.toLowerCase();
     } else {
-      attrValue = astStringValue.replace(/\\(?!\\)/g, '');
+      attrValue = astStringValue;
     }
   } else if (astStringValue === '') {
     attrValue = astStringValue;

package/src/js/parser.js

@@ -72,6 +72,13 @@ export const unescapeSelector = (selector = '') => {
       const item = arr[i];
       if (item === '' && i === l - 1) {
         selectorItems.push(U_FFFD);
+      } else if (item === '') {
+        // Empty segment at non-last position means \\ (escaped backslash)
+        selectorItems.push('\\');
+        i++; // skip the next segment which is the remainder after \\
+        if (i < l) {
+          selectorItems.push(arr[i]);
+        }
       } else {
         const hexExists = /^([\da-f]{1,6}\s?)/i.exec(item);
         if (hexExists) {

package/types/index.d.ts

@@ -1,14 +1,3 @@
-export class GenerationalCache {
-    constructor(max: any);
-    max: number;
-    current: Map<any, any>;
-    old: Map<any, any>;
-    get(key: any): any;
-    set(key: any, value: any): void;
-    has(key: any): boolean;
-    delete(key: any): void;
-    clear(): void;
-}
 export class DOMSelector {
     constructor(window: Window, document: Document, opt?: object);
     clear: () => void;