@yiin/reactive-proxy-state 1.0.30 → 1.0.32

package/dist/index.cjs

@@ -2465,8 +2465,12 @@ function evictDescendantsFromPathCache(root, pathKey) {
   const cache = pathCache.get(root);
   if (!cache)
     return;
-  const prefix = pathKey + ".";
   let evicted = 0;
+  if (cache.has(pathKey)) {
+    cache.delete(pathKey);
+    evicted++;
+  }
+  const prefix = pathKey + ".";
   for (const key of cache.keys()) {
     if (key.startsWith(prefix)) {
       cache.delete(key);
@@ -2593,6 +2597,26 @@ function deleteValue(obj, key) {
   else
     delete obj[key];
 }
+function validateCachedPath(root, fullPath, pathKey, cached) {
+  if (fullPath.length === 0)
+    return cached;
+  const lastKey = fullPath[fullPath.length - 1];
+  let grandparent = root;
+  for (let i = 0;i < fullPath.length - 1; i++) {
+    grandparent = grandparent ? getValue(grandparent, fullPath[i]) : undefined;
+    if (grandparent === undefined)
+      break;
+  }
+  if (grandparent === undefined) {
+    evictDescendantsFromPathCache(root, pathKey);
+    return;
+  }
+  const actual = getValue(grandparent, lastKey);
+  if (actual === cached)
+    return cached;
+  evictDescendantsFromPathCache(root, pathKey);
+  return;
+}
 var actionHandlers = {
   set: function(parent, key, event) {
     setValue(parent, key, event.newValue);
@@ -2746,6 +2770,9 @@ function updateState(root, event) {
       const parentPath = path.slice(0, -1);
       const parentPathKey = parentPath.join(".");
       let parent = pathCache.get(root)?.get(parentPathKey);
+      if (parent !== undefined) {
+        parent = validateCachedPath(root, parentPath, parentPathKey, parent);
+      }
       if (parent === undefined) {
         parent = parentPath.reduce((acc, key) => acc ? getValue(acc, key) : undefined, root);
         if (parent !== undefined)
@@ -2765,6 +2792,9 @@ function updateState(root, event) {
       const targetPath = path;
       const targetPathKey = targetPath.join(".");
       let targetCollection = pathCache.get(root)?.get(targetPathKey);
+      if (targetCollection !== undefined) {
+        targetCollection = validateCachedPath(root, targetPath, targetPathKey, targetCollection);
+      }
       if (targetCollection === undefined) {
         targetCollection = targetPath.reduce((acc, key) => acc ? getValue(acc, key) : undefined, root);
         if (targetCollection !== undefined)

package/dist/index.js

@@ -2405,8 +2405,12 @@ function evictDescendantsFromPathCache(root, pathKey) {
   const cache = pathCache.get(root);
   if (!cache)
     return;
-  const prefix = pathKey + ".";
   let evicted = 0;
+  if (cache.has(pathKey)) {
+    cache.delete(pathKey);
+    evicted++;
+  }
+  const prefix = pathKey + ".";
   for (const key of cache.keys()) {
     if (key.startsWith(prefix)) {
       cache.delete(key);
@@ -2533,6 +2537,26 @@ function deleteValue(obj, key) {
   else
     delete obj[key];
 }
+function validateCachedPath(root, fullPath, pathKey, cached) {
+  if (fullPath.length === 0)
+    return cached;
+  const lastKey = fullPath[fullPath.length - 1];
+  let grandparent = root;
+  for (let i = 0;i < fullPath.length - 1; i++) {
+    grandparent = grandparent ? getValue(grandparent, fullPath[i]) : undefined;
+    if (grandparent === undefined)
+      break;
+  }
+  if (grandparent === undefined) {
+    evictDescendantsFromPathCache(root, pathKey);
+    return;
+  }
+  const actual = getValue(grandparent, lastKey);
+  if (actual === cached)
+    return cached;
+  evictDescendantsFromPathCache(root, pathKey);
+  return;
+}
 var actionHandlers = {
   set: function(parent, key, event) {
     setValue(parent, key, event.newValue);
@@ -2686,6 +2710,9 @@ function updateState(root, event) {
       const parentPath = path.slice(0, -1);
       const parentPathKey = parentPath.join(".");
       let parent = pathCache.get(root)?.get(parentPathKey);
+      if (parent !== undefined) {
+        parent = validateCachedPath(root, parentPath, parentPathKey, parent);
+      }
       if (parent === undefined) {
         parent = parentPath.reduce((acc, key) => acc ? getValue(acc, key) : undefined, root);
         if (parent !== undefined)
@@ -2705,6 +2732,9 @@ function updateState(root, event) {
       const targetPath = path;
       const targetPathKey = targetPath.join(".");
       let targetCollection = pathCache.get(root)?.get(targetPathKey);
+      if (targetCollection !== undefined) {
+        targetCollection = validateCachedPath(root, targetPath, targetPathKey, targetCollection);
+      }
       if (targetCollection === undefined) {
         targetCollection = targetPath.reduce((acc, key) => acc ? getValue(acc, key) : undefined, root);
         if (targetCollection !== undefined)

package/dist/utils.d.ts

@@ -6,9 +6,9 @@ export declare function deepEqual(a: any, b: any, seen?: WeakMap<any, any>): boo
 export declare function getFromPathCache(root: object, pathKey: string): any | undefined;
 export declare function setInPathCache(root: object, pathKey: string, value: any): void;
 /**
- * Evict all cached paths that are descendants of the given path prefix.
- * Called when a value at `pathKey` is replaced so that deeper cached references
- * (which now point to the old, detached object) are not reused.
+ * Evict the cached path entry at `pathKey` AND all its descendants.
+ * Called when a value at `pathKey` is replaced so that the stale cached reference
+ * (and any deeper ones) are not reused on subsequent mutations.
  */
 export declare function evictDescendantsFromPathCache(root: object, pathKey: string): void;
 export declare function getPathConcat(path: string): any[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yiin/reactive-proxy-state",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "author": "Yiin <stanislovas@yiin.lt>",
   "repository": {
     "type": "git",