serializable-bptree 5.1.3 → 5.1.6

package/dist/cjs/index.cjs

@@ -290,9 +290,10 @@ var CacheEntanglement = class {
   lifespan;
   dependencies;
   caches;
-  assignments;
   parameters;
+  assignments;
   dependencyProperties;
+  updateRequirements;
   constructor(creation, option) {
     option = option ?? {};
     const {
@@ -306,9 +307,10 @@ var CacheEntanglement = class {
     this.lifespan = this._normalizeMs(lifespan ?? 0);
     this.assignments = [];
     this.caches = new InvertedWeakMap({ lifespan: this.lifespan });
+    this.parameters = /* @__PURE__ */ new Map();
     this.dependencies = dependencies ?? {};
     this.dependencyProperties = Object.keys(this.dependencies);
-    this.parameters = {};
+    this.updateRequirements = /* @__PURE__ */ new Set();
     for (const name in this.dependencies) {
       const dependency = this.dependencies[name];
       if (!dependency.assignments.includes(this)) {
@@ -322,16 +324,30 @@ var CacheEntanglement = class {
     }
     return time;
   }
+  bubbleUpdateSignal(key) {
+    this.updateRequirements.add(key);
+    for (let i = 0, len = this.assignments.length; i < len; i++) {
+      const t = this.assignments[i];
+      const instance = t;
+      for (const cacheKey of instance.caches.keys()) {
+        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
+          instance.bubbleUpdateSignal(cacheKey);
+        }
+      }
+    }
+  }
   dependencyKey(key) {
-    const tokens = key.split("/");
-    tokens.pop();
-    return tokens.join("/");
+    const i = key.lastIndexOf("/");
+    if (i === -1) {
+      return key;
+    }
+    return key.substring(0, i);
   }
   /**
    * Returns all keys stored in the instance.
    */
   keys() {
-    return this.caches.keys();
+    return this.parameters.keys();
   }
   /**
    * Deletes all cache values stored in the instance.
@@ -346,17 +362,33 @@ var CacheEntanglement = class {
    * @param key The key to search.
    */
   exists(key) {
-    return this.caches.has(key);
+    return this.parameters.has(key);
   }
   /**
-   * Returns the cache value stored in the key within the instance. If the cached value is not present, an error is thrown.
+   * Checks if there is a cache value stored in the key within the instance.
+   * This method is an alias for `exists`.
    * @param key The key to search.
    */
-  get(key) {
-    if (!this.caches.has(key)) {
-      throw new Error(`Cache value not found: ${key}`);
+  has(key) {
+    return this.exists(key);
+  }
+  /**
+   * Deletes the cache value stored in the key within the instance.
+   * @param key The key to delete.
+   */
+  delete(key) {
+    this.caches.delete(key);
+    this.parameters.delete(key);
+    this.updateRequirements.delete(key);
+    for (let i = 0, len = this.assignments.length; i < len; i++) {
+      const t = this.assignments[i];
+      const instance = t;
+      for (const cacheKey of instance.keys()) {
+        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
+          instance.delete(cacheKey);
+        }
+      }
     }
-    return this.caches.get(key);
   }
 };
 var CacheData = class _CacheData {
@@ -407,6 +439,15 @@ var CacheEntanglementSync = class extends CacheEntanglement {
   constructor(creation, option) {
     super(creation, option);
   }
+  recache(key) {
+    if (!this.parameters.has(key)) {
+      return;
+    }
+    if (!this.caches.has(key) || this.updateRequirements.has(key)) {
+      this.resolve(key, ...this.parameters.get(key));
+    }
+    return this.caches.get(key);
+  }
   resolve(key, ...parameter) {
     const resolved = {};
     const dependencyKey = this.dependencyKey(key);
@@ -414,59 +455,55 @@ var CacheEntanglementSync = class extends CacheEntanglement {
     for (let i = 0, len = this.dependencyProperties.length; i < len; i++) {
       const name = this.dependencyProperties[i];
       const dependency = this.dependencies[name];
-      if (!dependency.caches.has(key) && !dependency.caches.has(dependencyKey)) {
+      if (!dependency.exists(key) && !dependency.exists(dependencyKey)) {
         throw new Error(`The key '${key}' or '${dependencyKey}' has not been assigned yet in dependency '${name.toString()}'.`, {
           cause: {
             from: this
           }
         });
       }
-      const dependencyValue = dependency.caches.get(key) ?? dependency.caches.get(dependencyKey);
+      const dependencyValue = dependency.recache(key) ?? dependency.recache(dependencyKey);
       resolved[name] = dependencyValue;
     }
-    this.parameters[key] = parameter;
     const value = new CacheData(this.creation(key, resolved, ...parameter));
+    this.updateRequirements.delete(key);
+    this.parameters.set(key, parameter);
     this.caches.set(key, value);
     return value;
   }
+  get(key) {
+    if (!this.parameters.has(key)) {
+      throw new Error(`Cache value not found: ${key}`);
+    }
+    return this.cache(key, ...this.parameters.get(key));
+  }
   cache(key, ...parameter) {
-    if (!this.caches.has(key)) {
-      this.update(key, ...parameter);
+    if (!this.caches.has(key) || this.updateRequirements.has(key)) {
+      this.resolve(key, ...parameter);
     } else {
       this.caches.extendExpire(key);
     }
     return this.caches.get(key);
   }
   update(key, ...parameter) {
+    this.bubbleUpdateSignal(key);
     this.resolve(key, ...parameter);
-    for (let i = 0, len = this.assignments.length; i < len; i++) {
-      const t = this.assignments[i];
-      const instance = t;
-      for (const cacheKey of instance.caches.keys()) {
-        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
-          instance.update(cacheKey, ...instance.parameters[cacheKey]);
-        }
-      }
-    }
     return this.caches.get(key);
   }
-  delete(key) {
-    this.caches.delete(key);
-    for (let i = 0, len = this.assignments.length; i < len; i++) {
-      const t = this.assignments[i];
-      const instance = t;
-      for (const cacheKey of instance.caches.keys()) {
-        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
-          instance.delete(cacheKey);
-        }
-      }
-    }
-  }
 };
 var CacheEntanglementAsync = class extends CacheEntanglement {
   constructor(creation, option) {
     super(creation, option);
   }
+  async recache(key) {
+    if (!this.parameters.has(key)) {
+      return;
+    }
+    if (!this.caches.has(key) || this.updateRequirements.has(key)) {
+      await this.resolve(key, ...this.parameters.get(key));
+    }
+    return this.caches.get(key);
+  }
   async resolve(key, ...parameter) {
     const resolved = {};
     const dependencyKey = this.dependencyKey(key);
@@ -474,23 +511,30 @@ var CacheEntanglementAsync = class extends CacheEntanglement {
     for (let i = 0, len = this.dependencyProperties.length; i < len; i++) {
       const name = this.dependencyProperties[i];
       const dependency = this.dependencies[name];
-      if (!dependency.caches.has(key) && !dependency.caches.has(dependencyKey)) {
+      if (!dependency.exists(key) && !dependency.exists(dependencyKey)) {
         throw new Error(`The key '${key}' or '${dependencyKey}' has not been assigned yet in dependency '${name.toString()}'.`, {
           cause: {
             from: this
           }
         });
       }
-      const dependencyValue = dependency.caches.get(key) ?? dependency.caches.get(dependencyKey);
+      const dependencyValue = await dependency.recache(key) ?? await dependency.recache(dependencyKey);
       resolved[name] = dependencyValue;
     }
-    this.parameters[key] = parameter;
     const value = new CacheData(await this.creation(key, resolved, ...parameter));
+    this.updateRequirements.delete(key);
+    this.parameters.set(key, parameter);
     this.caches.set(key, value);
     return value;
   }
+  async get(key) {
+    if (!this.parameters.has(key)) {
+      throw new Error(`Cache value not found: ${key}`);
+    }
+    return this.cache(key, ...this.parameters.get(key));
+  }
   async cache(key, ...parameter) {
-    if (!this.caches.has(key)) {
+    if (!this.caches.has(key) || this.updateRequirements.has(key)) {
       await this.update(key, ...parameter);
     } else {
       this.caches.extendExpire(key);
@@ -498,30 +542,10 @@ var CacheEntanglementAsync = class extends CacheEntanglement {
     return this.caches.get(key);
   }
   async update(key, ...parameter) {
+    this.bubbleUpdateSignal(key);
     await this.resolve(key, ...parameter);
-    for (let i = 0, len = this.assignments.length; i < len; i++) {
-      const t = this.assignments[i];
-      const instance = t;
-      for (const cacheKey of instance.caches.keys()) {
-        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
-          await instance.update(cacheKey, ...instance.parameters[cacheKey]);
-        }
-      }
-    }
     return this.caches.get(key);
   }
-  async delete(key) {
-    this.caches.delete(key);
-    for (let i = 0, len = this.assignments.length; i < len; i++) {
-      const t = this.assignments[i];
-      const instance = t;
-      for (const cacheKey of instance.caches.keys()) {
-        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
-          await instance.delete(cacheKey);
-        }
-      }
-    }
-  }
 };
 
 // src/base/BPTree.ts
@@ -625,9 +649,7 @@ var BPTree = class {
         if (this.comparator.isSame(value, nValue)) {
           const keys = node.keys[i];
           if (keys.includes(key)) {
-            throw new Error("The key already exists.", {
-              cause: { key, value }
-            });
+            break;
           }
           keys.push(key);
           this.bufferForNodeUpdate(node);

package/dist/esm/index.mjs

@@ -256,9 +256,10 @@ var CacheEntanglement = class {
   lifespan;
   dependencies;
   caches;
-  assignments;
   parameters;
+  assignments;
   dependencyProperties;
+  updateRequirements;
   constructor(creation, option) {
     option = option ?? {};
     const {
@@ -272,9 +273,10 @@ var CacheEntanglement = class {
     this.lifespan = this._normalizeMs(lifespan ?? 0);
     this.assignments = [];
     this.caches = new InvertedWeakMap({ lifespan: this.lifespan });
+    this.parameters = /* @__PURE__ */ new Map();
     this.dependencies = dependencies ?? {};
     this.dependencyProperties = Object.keys(this.dependencies);
-    this.parameters = {};
+    this.updateRequirements = /* @__PURE__ */ new Set();
     for (const name in this.dependencies) {
       const dependency = this.dependencies[name];
       if (!dependency.assignments.includes(this)) {
@@ -288,16 +290,30 @@ var CacheEntanglement = class {
     }
     return time;
   }
+  bubbleUpdateSignal(key) {
+    this.updateRequirements.add(key);
+    for (let i = 0, len = this.assignments.length; i < len; i++) {
+      const t = this.assignments[i];
+      const instance = t;
+      for (const cacheKey of instance.caches.keys()) {
+        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
+          instance.bubbleUpdateSignal(cacheKey);
+        }
+      }
+    }
+  }
   dependencyKey(key) {
-    const tokens = key.split("/");
-    tokens.pop();
-    return tokens.join("/");
+    const i = key.lastIndexOf("/");
+    if (i === -1) {
+      return key;
+    }
+    return key.substring(0, i);
   }
   /**
    * Returns all keys stored in the instance.
    */
   keys() {
-    return this.caches.keys();
+    return this.parameters.keys();
   }
   /**
    * Deletes all cache values stored in the instance.
@@ -312,17 +328,33 @@ var CacheEntanglement = class {
    * @param key The key to search.
    */
   exists(key) {
-    return this.caches.has(key);
+    return this.parameters.has(key);
   }
   /**
-   * Returns the cache value stored in the key within the instance. If the cached value is not present, an error is thrown.
+   * Checks if there is a cache value stored in the key within the instance.
+   * This method is an alias for `exists`.
    * @param key The key to search.
    */
-  get(key) {
-    if (!this.caches.has(key)) {
-      throw new Error(`Cache value not found: ${key}`);
+  has(key) {
+    return this.exists(key);
+  }
+  /**
+   * Deletes the cache value stored in the key within the instance.
+   * @param key The key to delete.
+   */
+  delete(key) {
+    this.caches.delete(key);
+    this.parameters.delete(key);
+    this.updateRequirements.delete(key);
+    for (let i = 0, len = this.assignments.length; i < len; i++) {
+      const t = this.assignments[i];
+      const instance = t;
+      for (const cacheKey of instance.keys()) {
+        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
+          instance.delete(cacheKey);
+        }
+      }
     }
-    return this.caches.get(key);
   }
 };
 var CacheData = class _CacheData {
@@ -373,6 +405,15 @@ var CacheEntanglementSync = class extends CacheEntanglement {
   constructor(creation, option) {
     super(creation, option);
   }
+  recache(key) {
+    if (!this.parameters.has(key)) {
+      return;
+    }
+    if (!this.caches.has(key) || this.updateRequirements.has(key)) {
+      this.resolve(key, ...this.parameters.get(key));
+    }
+    return this.caches.get(key);
+  }
   resolve(key, ...parameter) {
     const resolved = {};
     const dependencyKey = this.dependencyKey(key);
@@ -380,59 +421,55 @@ var CacheEntanglementSync = class extends CacheEntanglement {
     for (let i = 0, len = this.dependencyProperties.length; i < len; i++) {
       const name = this.dependencyProperties[i];
       const dependency = this.dependencies[name];
-      if (!dependency.caches.has(key) && !dependency.caches.has(dependencyKey)) {
+      if (!dependency.exists(key) && !dependency.exists(dependencyKey)) {
         throw new Error(`The key '${key}' or '${dependencyKey}' has not been assigned yet in dependency '${name.toString()}'.`, {
           cause: {
             from: this
           }
         });
       }
-      const dependencyValue = dependency.caches.get(key) ?? dependency.caches.get(dependencyKey);
+      const dependencyValue = dependency.recache(key) ?? dependency.recache(dependencyKey);
       resolved[name] = dependencyValue;
     }
-    this.parameters[key] = parameter;
     const value = new CacheData(this.creation(key, resolved, ...parameter));
+    this.updateRequirements.delete(key);
+    this.parameters.set(key, parameter);
     this.caches.set(key, value);
     return value;
   }
+  get(key) {
+    if (!this.parameters.has(key)) {
+      throw new Error(`Cache value not found: ${key}`);
+    }
+    return this.cache(key, ...this.parameters.get(key));
+  }
   cache(key, ...parameter) {
-    if (!this.caches.has(key)) {
-      this.update(key, ...parameter);
+    if (!this.caches.has(key) || this.updateRequirements.has(key)) {
+      this.resolve(key, ...parameter);
     } else {
       this.caches.extendExpire(key);
     }
     return this.caches.get(key);
   }
   update(key, ...parameter) {
+    this.bubbleUpdateSignal(key);
     this.resolve(key, ...parameter);
-    for (let i = 0, len = this.assignments.length; i < len; i++) {
-      const t = this.assignments[i];
-      const instance = t;
-      for (const cacheKey of instance.caches.keys()) {
-        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
-          instance.update(cacheKey, ...instance.parameters[cacheKey]);
-        }
-      }
-    }
     return this.caches.get(key);
   }
-  delete(key) {
-    this.caches.delete(key);
-    for (let i = 0, len = this.assignments.length; i < len; i++) {
-      const t = this.assignments[i];
-      const instance = t;
-      for (const cacheKey of instance.caches.keys()) {
-        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
-          instance.delete(cacheKey);
-        }
-      }
-    }
-  }
 };
 var CacheEntanglementAsync = class extends CacheEntanglement {
   constructor(creation, option) {
     super(creation, option);
   }
+  async recache(key) {
+    if (!this.parameters.has(key)) {
+      return;
+    }
+    if (!this.caches.has(key) || this.updateRequirements.has(key)) {
+      await this.resolve(key, ...this.parameters.get(key));
+    }
+    return this.caches.get(key);
+  }
   async resolve(key, ...parameter) {
     const resolved = {};
     const dependencyKey = this.dependencyKey(key);
@@ -440,23 +477,30 @@ var CacheEntanglementAsync = class extends CacheEntanglement {
     for (let i = 0, len = this.dependencyProperties.length; i < len; i++) {
       const name = this.dependencyProperties[i];
       const dependency = this.dependencies[name];
-      if (!dependency.caches.has(key) && !dependency.caches.has(dependencyKey)) {
+      if (!dependency.exists(key) && !dependency.exists(dependencyKey)) {
         throw new Error(`The key '${key}' or '${dependencyKey}' has not been assigned yet in dependency '${name.toString()}'.`, {
           cause: {
             from: this
           }
         });
       }
-      const dependencyValue = dependency.caches.get(key) ?? dependency.caches.get(dependencyKey);
+      const dependencyValue = await dependency.recache(key) ?? await dependency.recache(dependencyKey);
       resolved[name] = dependencyValue;
     }
-    this.parameters[key] = parameter;
     const value = new CacheData(await this.creation(key, resolved, ...parameter));
+    this.updateRequirements.delete(key);
+    this.parameters.set(key, parameter);
     this.caches.set(key, value);
     return value;
   }
+  async get(key) {
+    if (!this.parameters.has(key)) {
+      throw new Error(`Cache value not found: ${key}`);
+    }
+    return this.cache(key, ...this.parameters.get(key));
+  }
   async cache(key, ...parameter) {
-    if (!this.caches.has(key)) {
+    if (!this.caches.has(key) || this.updateRequirements.has(key)) {
       await this.update(key, ...parameter);
     } else {
       this.caches.extendExpire(key);
@@ -464,30 +508,10 @@ var CacheEntanglementAsync = class extends CacheEntanglement {
     return this.caches.get(key);
   }
   async update(key, ...parameter) {
+    this.bubbleUpdateSignal(key);
     await this.resolve(key, ...parameter);
-    for (let i = 0, len = this.assignments.length; i < len; i++) {
-      const t = this.assignments[i];
-      const instance = t;
-      for (const cacheKey of instance.caches.keys()) {
-        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
-          await instance.update(cacheKey, ...instance.parameters[cacheKey]);
-        }
-      }
-    }
     return this.caches.get(key);
   }
-  async delete(key) {
-    this.caches.delete(key);
-    for (let i = 0, len = this.assignments.length; i < len; i++) {
-      const t = this.assignments[i];
-      const instance = t;
-      for (const cacheKey of instance.caches.keys()) {
-        if (cacheKey === key || cacheKey.startsWith(`${key}/`)) {
-          await instance.delete(cacheKey);
-        }
-      }
-    }
-  }
 };
 
 // src/base/BPTree.ts
@@ -591,9 +615,7 @@ var BPTree = class {
         if (this.comparator.isSame(value, nValue)) {
           const keys = node.keys[i];
           if (keys.includes(key)) {
-            throw new Error("The key already exists.", {
-              cause: { key, value }
-            });
+            break;
           }
           keys.push(key);
           this.bufferForNodeUpdate(node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serializable-bptree",
-  "version": "5.1.3",
+  "version": "5.1.6",
   "description": "Store the B+tree flexibly, not only in-memory.",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.cjs",
@@ -39,10 +39,10 @@
     "@types/jest": "^29.5.14",
     "esbuild": "^0.25.5",
     "jest": "^29.7.0",
-    "ts-jest": "^29.3.4",
+    "ts-jest": "^29.4.0",
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "cache-entanglement": "^1.5.5"
+    "cache-entanglement": "^1.6.0"
   }
 }