@webreflection/utils 0.2.20 → 0.2.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webreflection/utils",
-  "version": "0.2.20",
+  "version": "0.2.21",
   "type": "module",
   "types": {
     "./all": "./types/all.d.ts",

package/src/cache.js

@@ -1,22 +1,18 @@
 // @ts-check
 
-/**
- * @template K,V
- * @type {(self: Cache<K,V>) => void}
- */
-let cleanup;
-
 /**
  * @template K,V
  * @extends Map<K,V>
  */
 export default class Cache extends Map {
-  static {
-    cleanup = self => {
-      self.#run = true;
-      self.#queue.splice(0).forEach(self.delete, self);
-    };
-  }
+  /**
+   * @template K,V
+   * @type {(self: Cache<K,V>) => void}
+   */
+  #cleanup = () => {
+    this.#run = true;
+    this.#queue.splice(0).forEach(this.delete, this);
+  };
 
   /** @type {number} */
   #delay;
@@ -36,11 +32,11 @@ export default class Cache extends Map {
       this.#run = false;
       if (this.#delay < 1) {
         // @ts-ignore
-        queueMicrotask(() => cleanup(this));
+        queueMicrotask(this.#cleanup);
       }
       else {
         // @ts-ignore
-        setTimeout(cleanup, this.#delay, this);
+        setTimeout(this.#cleanup, this.#delay);
       }
     }
   }
@@ -64,7 +60,8 @@ export default class Cache extends Map {
    * @returns
    */
   getOrInsert(key, value) {
-    return this.has(key) ? this.get(key) : this.put(key, value);
+    const known = this.get(key);
+    return known === void 0 && !this.has(key) ? this.put(key, value) : known;
   }
 
   /**
@@ -73,7 +70,8 @@ export default class Cache extends Map {
    * @returns
    */
   getOrInsertComputed(key, callback) {
-    return this.has(key) ? this.get(key) : this.put(key, callback(key));
+    const known = this.get(key);
+    return known === void 0 && !this.has(key) ? this.put(key, callback(key)) : known;
   }
 
   /**

package/src/registry.js

@@ -68,6 +68,11 @@ export default class Registry extends Map {
     for (const [key, value] of iterable ?? []) this.set(key, value);
   }
 
+  clear() {
+    if (this.#unique) fail('Unable to clear registry with unique keys');
+    super.clear();
+  }
+
   /**
    * Remove a key when unique-key protection is disabled.
    *
@@ -88,8 +93,8 @@ export default class Registry extends Map {
    */
   set(key, value) {
     if (!this.#key(key)) fail('Invalid key:', key);
-    if (this.#unique && super.has(key)) fail('Duplicate key:', key);
     if (!this.#value(value)) fail('Invalid value:', value);
+    if (this.#unique && super.has(key)) fail('Duplicate key:', key);
     return super.set(key, value);
   }
 }