@asamuzakjp/dom-selector 7.0.7 → 7.0.9

package/package.json

@@ -43,7 +43,7 @@
     "eslint-plugin-regexp": "^3.1.0",
     "eslint-plugin-unicorn": "^64.0.0",
     "globals": "^17.4.0",
-    "jsdom": "^29.0.1",
+    "jsdom": "^29.0.2",
     "mocha": "^11.7.5",
     "neostandard": "^0.13.0",
     "prettier": "^3.8.1",
@@ -71,5 +71,5 @@
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
   },
-  "version": "7.0.7"
+  "version": "7.0.9"
 }

package/src/index.js

@@ -6,6 +6,7 @@
  */
 
 /* import */
+import { GenerationalCache } from './js/cache.js';
 import { Finder } from './js/finder.js';
 import { filterSelector, getType, initNwsapi } from './js/utility.js';
 
@@ -21,50 +22,6 @@ 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.
@@ -104,7 +61,6 @@ export class DOMSelector {
    */
   clear = () => {
     this.#finder.clearResults(true);
-    // this.#cache.clear();
   };
 
   /**
@@ -130,10 +86,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);
       }
@@ -144,9 +98,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);
             }
@@ -193,10 +146,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);
       }
@@ -245,10 +196,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);
       }
@@ -304,10 +253,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);
       }
@@ -357,10 +304,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/src/js/cache.js

@@ -0,0 +1,77 @@
+/**
+ * cache.js
+ */
+
+/* Generational Cache */
+export class GenerationalCache {
+  #max;
+  #boundary;
+  #current;
+  #old;
+
+  /**
+   * constructor
+   * @param {number} max - max cache size
+   */
+  constructor(max) {
+    this.#current = new Map();
+    this.#old = new Map();
+    this.max = max;
+  }
+
+  get size() {
+    return this.#current.size + this.#old.size;
+  }
+
+  /**
+   * @returns {number} max cache size
+   */
+  get max() {
+    return this.#max;
+  }
+
+  set max(value) {
+    if (Number.isFinite(value) && value > 4) {
+      this.#max = value;
+      this.#boundary = Math.ceil(value / 2);
+    } else {
+      this.#max = 4;
+      this.#boundary = 2;
+    }
+    this.clear();
+  }
+
+  get(key) {
+    if (this.#current.has(key)) {
+      return this.#current.get(key);
+    }
+    const 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.#boundary) {
+      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();
+  }
+}

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;

package/types/js/cache.d.ts

@@ -0,0 +1,12 @@
+export class GenerationalCache {
+    constructor(max: number);
+    set max(value: number);
+    get max(): number;
+    get size(): number;
+    get(key: any): any;
+    set(key: any, value: any): void;
+    has(key: any): boolean;
+    delete(key: any): void;
+    clear(): void;
+    #private;
+}