@asamuzakjp/dom-selector 7.0.6 → 7.0.8

package/package.json

@@ -27,8 +27,7 @@
     "@asamuzakjp/nwsapi": "^2.3.9",
     "bidi-js": "^1.0.3",
     "css-tree": "^3.2.1",
-    "is-potential-custom-element-name": "^1.0.1",
-    "lru-cache": "^11.2.7"
+    "is-potential-custom-element-name": "^1.0.1"
   },
   "devDependencies": {
     "@types/css-tree": "^2.3.11",
@@ -72,5 +71,5 @@
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
   },
-  "version": "7.0.6"
+  "version": "7.0.8"
 }

package/src/index.js

@@ -6,7 +6,6 @@
  */
 
 /* import */
-import { LRUCache } from 'lru-cache';
 import { Finder } from './js/finder.js';
 import { filterSelector, getType, initNwsapi } from './js/utility.js';
 
@@ -22,6 +21,50 @@ import {
 } 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();
+  }
+}
+
 /**
  * @typedef {object} CheckResult
  * @property {boolean} match - The match result.
@@ -52,9 +95,7 @@ export class DOMSelector {
     this.#finder = new Finder(window);
     this.#idlUtils = idlUtils;
     this.#nwsapi = initNwsapi(window, document);
-    this.#cache = new LRUCache({
-      max: MAX_CACHE
-    });
+    this.#cache = new GenerationalCache(MAX_CACHE);
   }
 
   /**
@@ -63,6 +104,7 @@ export class DOMSelector {
    */
   clear = () => {
     this.#finder.clearResults(true);
+    // this.#cache.clear();
   };
 
   /**
@@ -88,10 +130,8 @@ export class DOMSelector {
       node.parentNode
     ) {
       const cacheKey = `check_${selector}`;
-      let filterMatches = false;
-      if (this.#cache.has(cacheKey)) {
-        filterMatches = this.#cache.get(cacheKey);
-      } else {
+      let filterMatches = this.#cache.get(cacheKey);
+      if (filterMatches === undefined) {
         filterMatches = filterSelector(selector, TARGET_SELF);
         this.#cache.set(cacheKey, filterMatches);
       }
@@ -102,9 +142,8 @@ export class DOMSelector {
           let ast = null;
           if (match) {
             const astCacheKey = `check_ast_${selector}`;
-            if (this.#cache.has(astCacheKey)) {
-              ast = this.#cache.get(astCacheKey);
-            } else {
+            ast = this.#cache.get(astCacheKey);
+            if (ast === undefined) {
               ast = this.#finder.getAST(selector);
               this.#cache.set(astCacheKey, ast);
             }
@@ -151,10 +190,8 @@ export class DOMSelector {
       node.parentNode
     ) {
       const cacheKey = `matches_${selector}`;
-      let filterMatches = false;
-      if (this.#cache.has(cacheKey)) {
-        filterMatches = this.#cache.get(cacheKey);
-      } else {
+      let filterMatches = this.#cache.get(cacheKey);
+      if (filterMatches === undefined) {
         filterMatches = filterSelector(selector, TARGET_SELF);
         this.#cache.set(cacheKey, filterMatches);
       }
@@ -203,10 +240,8 @@ export class DOMSelector {
       node.parentNode
     ) {
       const cacheKey = `closest_${selector}`;
-      let filterMatches = false;
-      if (this.#cache.has(cacheKey)) {
-        filterMatches = this.#cache.get(cacheKey);
-      } else {
+      let filterMatches = this.#cache.get(cacheKey);
+      if (filterMatches === undefined) {
         filterMatches = filterSelector(selector, TARGET_LINEAL);
         this.#cache.set(cacheKey, filterMatches);
       }
@@ -262,10 +297,8 @@ export class DOMSelector {
       (node.nodeType !== DOCUMENT_FRAGMENT_NODE || !node.host)
     ) {
       const cacheKey = `querySelector_${selector}`;
-      let filterMatches = false;
-      if (this.#cache.has(cacheKey)) {
-        filterMatches = this.#cache.get(cacheKey);
-      } else {
+      let filterMatches = this.#cache.get(cacheKey);
+      if (filterMatches === undefined) {
         filterMatches = filterSelector(selector, TARGET_FIRST);
         this.#cache.set(cacheKey, filterMatches);
       }
@@ -315,10 +348,8 @@ export class DOMSelector {
       (node.nodeType !== DOCUMENT_FRAGMENT_NODE || !node.host)
     ) {
       const cacheKey = `querySelectorAll_${selector}`;
-      let filterMatches = false;
-      if (this.#cache.has(cacheKey)) {
-        filterMatches = this.#cache.get(cacheKey);
-      } else {
+      let filterMatches = this.#cache.get(cacheKey);
+      if (filterMatches === undefined) {
         filterMatches = filterSelector(selector, TARGET_ALL);
         this.#cache.set(cacheKey, filterMatches);
       }

package/types/index.d.ts

@@ -1,3 +1,14 @@
+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;