@rhombus-toolkit/collections 2.0.1 → 2.0.2

package/dist/bundle/index.d.ts

@@ -30,6 +30,7 @@ declare class ImmutableLinkedList<T> implements Iterable<T> {
 
 declare class KindaWeakMap<K, V extends WeakKey> {
     #private;
+    /** An existing key keeps its place in iteration order, as with `Map`. */
     set(key: K, value: V): this;
     delete(key: K): boolean;
     get(key: K): V | undefined;

package/dist/bundle/index.js

@@ -60,25 +60,29 @@ function tailOf(link) {
 // src/KindaWeakMap.ts
 class KindaWeakMap {
   #map = new Map;
-  #registry = new FinalizationRegistry((key) => {
-    if (this.#map.get(key)?.deref() === undefined) {
+  #registry = new FinalizationRegistry(({ key, ref }) => {
+    if (this.#map.get(key) === ref) {
       this.#map.delete(key);
     }
   });
   set(key, value) {
-    this.delete(key);
-    this.#registry.register(value, key, value);
-    this.#map.set(key, new WeakRef(value));
+    const held = this.#map.get(key);
+    if (held) {
+      this.#registry.unregister(held);
+    }
+    const ref = new WeakRef(value);
+    this.#registry.register(value, { key, ref }, ref);
+    this.#map.set(key, ref);
     return this;
   }
   delete(key) {
-    const value = this.get(key);
-    this.#map.delete(key);
-    if (value === undefined) {
+    const held = this.#map.get(key);
+    if (!held) {
       return false;
     }
-    this.#registry.unregister(value);
-    return true;
+    this.#map.delete(key);
+    this.#registry.unregister(held);
+    return held.deref() !== undefined;
   }
   get(key) {
     return this.#map.get(key)?.deref();
@@ -87,7 +91,7 @@ class KindaWeakMap {
     return this.get(key) !== undefined;
   }
   clear() {
-    this.values().forEach((value) => this.#registry.unregister(value));
+    this.#map.forEach((ref) => this.#registry.unregister(ref));
     this.#map.clear();
   }
   forEach(callbackfn, thisArg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhombus-toolkit/collections",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Collection data structures: ImmutableLinkedList (persistent, both ends known), KindaWeakMap (strong keys, weak values).",
   "repository": {
     "type": "git",