jotai-state-tree 1.4.1 → 1.4.2

package/dist/{chunk-MSLAD5CJ.mjs → chunk-Q6QPBXHH.mjs}

@@ -42,9 +42,12 @@ var identifierFinalizationRegistry = new FinalizationRegistry(
   (info) => {
     const typeMap = identifierRegistry.get(info.typeName);
     if (typeMap) {
-      typeMap.delete(info.identifier);
-      if (typeMap.size === 0) {
-        identifierRegistry.delete(info.typeName);
+      const ref = typeMap.get(info.identifier);
+      if (!ref || ref.deref() === void 0) {
+        typeMap.delete(info.identifier);
+        if (typeMap.size === 0) {
+          identifierRegistry.delete(info.typeName);
+        }
       }
     }
   }
@@ -71,6 +74,35 @@ function notifyLifecycleChange(node, isAlive2) {
     listeners.forEach((listener) => listener(isAlive2));
   }
 }
+function cloneAndSerialize(value) {
+  if (value === null || value === void 0) {
+    return value;
+  }
+  if (hasStateTreeNode(value)) {
+    return getSnapshotFromNode(getStateTreeNode(value));
+  }
+  if (Array.isArray(value)) {
+    return value.map(cloneAndSerialize);
+  }
+  if (typeof value === "object") {
+    if (value instanceof Map) {
+      const res = {};
+      for (const [k, v] of value.entries()) {
+        res[k] = cloneAndSerialize(v);
+      }
+      return res;
+    }
+    const proto = Object.getPrototypeOf(value);
+    if (proto === null || proto === Object.prototype) {
+      const res = {};
+      for (const [k, v] of Object.entries(value)) {
+        res[k] = cloneAndSerialize(v);
+      }
+      return res;
+    }
+  }
+  return value;
+}
 var StateTreeNode = class {
   constructor(type, initialValue, env, parent, pathSegment) {
     this.$parent = null;
@@ -88,6 +120,8 @@ var StateTreeNode = class {
     /** Cached snapshot for structural sharing optimization */
     this.cachedSnapshot = void 0;
     this.isSnapshotDirty = true;
+    /** Strong reference to the instance proxy to prevent GC of active nodes */
+    this.instance = null;
     this.$id = generateNodeId();
     this.$type = type;
     this.$env = env ?? parent?.$env;
@@ -108,6 +142,7 @@ var StateTreeNode = class {
   }
   /** Set the instance reference */
   setInstance(instance) {
+    this.instance = instance;
     const entry = nodeRegistry.get(this.$id);
     if (entry && instance && typeof instance === "object") {
       entry.instance = new WeakRef(instance);
@@ -115,8 +150,7 @@ var StateTreeNode = class {
   }
   /** Get the instance */
   getInstance() {
-    const entry = nodeRegistry.get(this.$id);
-    return entry?.instance?.deref() ?? null;
+    return this.instance;
   }
   /** Get current value from atom */
   getValue() {
@@ -222,9 +256,27 @@ var StateTreeNode = class {
   }
   /** Notify patch listeners */
   notifyPatch(patch, reversePatch) {
-    this.patchListeners.forEach((listener) => listener(patch, reversePatch));
+    const serializedPatch = {
+      ...patch,
+      value: "value" in patch ? cloneAndSerialize(patch.value) : void 0
+    };
+    if (!("value" in patch)) {
+      delete serializedPatch.value;
+    }
+    const serializedReversePatch = {
+      ...reversePatch,
+      value: "value" in reversePatch ? cloneAndSerialize(reversePatch.value) : void 0,
+      oldValue: "oldValue" in reversePatch ? cloneAndSerialize(reversePatch.oldValue) : void 0
+    };
+    if (!("value" in reversePatch)) {
+      delete serializedReversePatch.value;
+    }
+    if (!("oldValue" in reversePatch)) {
+      delete serializedReversePatch.oldValue;
+    }
+    this.patchListeners.forEach((listener) => listener(serializedPatch, serializedReversePatch));
     if (this.$parent) {
-      this.$parent.notifyPatch(patch, reversePatch);
+      this.$parent.notifyPatch(serializedPatch, serializedReversePatch);
     }
   }
   /** Notify snapshot listeners */
@@ -261,6 +313,7 @@ var StateTreeNode = class {
   /** Destroy this node and all children */
   destroy() {
     if (!this.$isAlive) return;
+    this.instance = null;
     lifecycleHookHandlers.runBeforeDestroy?.(this);
     this.children.forEach((child) => child.destroy());
     this.children.clear();
@@ -900,6 +953,8 @@ function unfreeze(target) {
 }
 
 // src/undo.ts
+var undoManagersRegistry = /* @__PURE__ */ new WeakMap();
+var timeTravelManagersRegistry = /* @__PURE__ */ new WeakMap();
 var UndoManager = class {
   constructor(target, options = {}) {
     this.historyEntries = [];
@@ -920,6 +975,7 @@ var UndoManager = class {
       groupByTime: options.groupByTime ?? false,
       groupingWindow: options.groupingWindow ?? 200
     };
+    undoManagersRegistry.set(target, this);
     this.disposer = onPatch(target, (patch, reversePatch) => {
       this.recordPatch(patch, reversePatch);
     });
@@ -1013,6 +1069,13 @@ var UndoManager = class {
         applyPatch(this.target, entry.patches[i]);
       }
       this.currentIndex--;
+      const tt = timeTravelManagersRegistry.get(this.target);
+      if (tt) {
+        const N = tt.snapshots.length;
+        const M = this.historyEntries.length;
+        const ttIndex = this.currentIndex + 1 + (N - 1 - M);
+        tt.index = Math.max(0, Math.min(N - 1, ttIndex));
+      }
     } finally {
       this.isUndoing = false;
       rootNode.$isApplyingHistory = wasApplying;
@@ -1033,6 +1096,13 @@ var UndoManager = class {
       for (const patch of entry.inversePatches) {
         applyPatch(this.target, patch);
       }
+      const tt = timeTravelManagersRegistry.get(this.target);
+      if (tt) {
+        const N = tt.snapshots.length;
+        const M = this.historyEntries.length;
+        const ttIndex = this.currentIndex + 1 + (N - 1 - M);
+        tt.index = Math.max(0, Math.min(N - 1, ttIndex));
+      }
     } finally {
       this.isRedoing = false;
       rootNode.$isApplyingHistory = wasApplying;
@@ -1086,6 +1156,7 @@ var UndoManager = class {
     }
   }
   dispose() {
+    undoManagersRegistry.delete(this.target);
     if (this.disposer) {
       this.disposer();
       this.disposer = null;
@@ -1112,6 +1183,7 @@ var TimeTravelManager = class {
     this.target = target;
     this.maxSnapshots = options.maxSnapshots ?? 50;
     this.autoRecord = options.autoRecord ?? false;
+    timeTravelManagersRegistry.set(target, this);
     this.record();
     if (this.autoRecord) {
       this.disposer = onPatch(target, () => {
@@ -1193,6 +1265,13 @@ var TimeTravelManager = class {
     try {
       this.index = index;
       applySnapshot(this.target, this.snapshots[index]);
+      const undo = undoManagersRegistry.get(this.target);
+      if (undo) {
+        const N = this.snapshots.length;
+        const M = undo.historyEntries.length;
+        const undoIndex = this.index - 1 - (N - 1 - M);
+        undo.currentIndex = Math.max(-1, Math.min(M - 1, undoIndex));
+      }
     } finally {
       this.isApplying = false;
       rootNode.$isApplyingHistory = wasApplying;
@@ -1210,6 +1289,7 @@ var TimeTravelManager = class {
     this.record();
   }
   dispose() {
+    timeTravelManagersRegistry.delete(this.target);
     if (this.disposer) {
       this.disposer();
       this.disposer = null;
@@ -1302,6 +1382,7 @@ function createActionRecorder(target) {
 export {
   setLifecycleHookHandlers,
   getIsApplyingSnapshotOrPatch,
+  setIsApplyingSnapshotOrPatch,
   getGlobalStore,
   setGlobalStore,
   resetGlobalStore,

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance } from './undo-BcBI_BQM.mjs';
-export { L as CustomTypeOptions, aG as IActionRecorder, aH as IActionRecording, C as IAnyComplexType, D as IAnyMixin, aE as IHistoryEntry, F as IJsonPatch, y as IMSTArray, z as IMSTMap, G as IReversibleJsonPatch, x as IStateTreeNode, aF as ITimeTravelManager, aC as IUndoManager, aD as IUndoManagerOptions, H as IValidationContext, K as IValidationError, J as IValidationResult, A as ModelInstance, E as ModelSelf, B as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, aB as createActionRecorder, aA as createTimeTravelManager, az as createUndoManager, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './undo-BcBI_BQM.mjs';
+import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance } from './undo-DL1pyOkT.mjs';
+export { L as CustomTypeOptions, aG as IActionRecorder, aH as IActionRecording, C as IAnyComplexType, D as IAnyMixin, aE as IHistoryEntry, F as IJsonPatch, y as IMSTArray, z as IMSTMap, G as IReversibleJsonPatch, x as IStateTreeNode, aF as ITimeTravelManager, aC as IUndoManager, aD as IUndoManagerOptions, H as IValidationContext, K as IValidationError, J as IValidationResult, A as ModelInstance, E as ModelSelf, B as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, aB as createActionRecorder, aA as createTimeTravelManager, az as createUndoManager, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './undo-DL1pyOkT.mjs';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance } from './undo-BcBI_BQM.js';
-export { L as CustomTypeOptions, aG as IActionRecorder, aH as IActionRecording, C as IAnyComplexType, D as IAnyMixin, aE as IHistoryEntry, F as IJsonPatch, y as IMSTArray, z as IMSTMap, G as IReversibleJsonPatch, x as IStateTreeNode, aF as ITimeTravelManager, aC as IUndoManager, aD as IUndoManagerOptions, H as IValidationContext, K as IValidationError, J as IValidationResult, A as ModelInstance, E as ModelSelf, B as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, aB as createActionRecorder, aA as createTimeTravelManager, az as createUndoManager, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './undo-BcBI_BQM.js';
+import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance } from './undo-DL1pyOkT.js';
+export { L as CustomTypeOptions, aG as IActionRecorder, aH as IActionRecording, C as IAnyComplexType, D as IAnyMixin, aE as IHistoryEntry, F as IJsonPatch, y as IMSTArray, z as IMSTMap, G as IReversibleJsonPatch, x as IStateTreeNode, aF as ITimeTravelManager, aC as IUndoManager, aD as IUndoManagerOptions, H as IValidationContext, K as IValidationError, J as IValidationResult, A as ModelInstance, E as ModelSelf, B as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, aB as createActionRecorder, aA as createTimeTravelManager, az as createUndoManager, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './undo-DL1pyOkT.js';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/index.js

@@ -473,9 +473,12 @@ var identifierFinalizationRegistry = new FinalizationRegistry(
   (info) => {
     const typeMap = identifierRegistry.get(info.typeName);
     if (typeMap) {
-      typeMap.delete(info.identifier);
-      if (typeMap.size === 0) {
-        identifierRegistry.delete(info.typeName);
+      const ref = typeMap.get(info.identifier);
+      if (!ref || ref.deref() === void 0) {
+        typeMap.delete(info.identifier);
+        if (typeMap.size === 0) {
+          identifierRegistry.delete(info.typeName);
+        }
       }
     }
   }
@@ -502,6 +505,35 @@ function notifyLifecycleChange(node, isAlive2) {
     listeners.forEach((listener) => listener(isAlive2));
   }
 }
+function cloneAndSerialize(value) {
+  if (value === null || value === void 0) {
+    return value;
+  }
+  if (hasStateTreeNode(value)) {
+    return getSnapshotFromNode(getStateTreeNode(value));
+  }
+  if (Array.isArray(value)) {
+    return value.map(cloneAndSerialize);
+  }
+  if (typeof value === "object") {
+    if (value instanceof Map) {
+      const res = {};
+      for (const [k, v] of value.entries()) {
+        res[k] = cloneAndSerialize(v);
+      }
+      return res;
+    }
+    const proto = Object.getPrototypeOf(value);
+    if (proto === null || proto === Object.prototype) {
+      const res = {};
+      for (const [k, v] of Object.entries(value)) {
+        res[k] = cloneAndSerialize(v);
+      }
+      return res;
+    }
+  }
+  return value;
+}
 var StateTreeNode = class {
   constructor(type, initialValue, env, parent, pathSegment) {
     this.$parent = null;
@@ -519,6 +551,8 @@ var StateTreeNode = class {
     /** Cached snapshot for structural sharing optimization */
     this.cachedSnapshot = void 0;
     this.isSnapshotDirty = true;
+    /** Strong reference to the instance proxy to prevent GC of active nodes */
+    this.instance = null;
     this.$id = generateNodeId();
     this.$type = type;
     this.$env = env ?? parent?.$env;
@@ -539,6 +573,7 @@ var StateTreeNode = class {
   }
   /** Set the instance reference */
   setInstance(instance) {
+    this.instance = instance;
     const entry = nodeRegistry.get(this.$id);
     if (entry && instance && typeof instance === "object") {
       entry.instance = new WeakRef(instance);
@@ -546,8 +581,7 @@ var StateTreeNode = class {
   }
   /** Get the instance */
   getInstance() {
-    const entry = nodeRegistry.get(this.$id);
-    return entry?.instance?.deref() ?? null;
+    return this.instance;
   }
   /** Get current value from atom */
   getValue() {
@@ -653,9 +687,27 @@ var StateTreeNode = class {
   }
   /** Notify patch listeners */
   notifyPatch(patch, reversePatch) {
-    this.patchListeners.forEach((listener) => listener(patch, reversePatch));
+    const serializedPatch = {
+      ...patch,
+      value: "value" in patch ? cloneAndSerialize(patch.value) : void 0
+    };
+    if (!("value" in patch)) {
+      delete serializedPatch.value;
+    }
+    const serializedReversePatch = {
+      ...reversePatch,
+      value: "value" in reversePatch ? cloneAndSerialize(reversePatch.value) : void 0,
+      oldValue: "oldValue" in reversePatch ? cloneAndSerialize(reversePatch.oldValue) : void 0
+    };
+    if (!("value" in reversePatch)) {
+      delete serializedReversePatch.value;
+    }
+    if (!("oldValue" in reversePatch)) {
+      delete serializedReversePatch.oldValue;
+    }
+    this.patchListeners.forEach((listener) => listener(serializedPatch, serializedReversePatch));
     if (this.$parent) {
-      this.$parent.notifyPatch(patch, reversePatch);
+      this.$parent.notifyPatch(serializedPatch, serializedReversePatch);
     }
   }
   /** Notify snapshot listeners */
@@ -692,6 +744,7 @@ var StateTreeNode = class {
   /** Destroy this node and all children */
   destroy() {
     if (!this.$isAlive) return;
+    this.instance = null;
     lifecycleHookHandlers.runBeforeDestroy?.(this);
     this.children.forEach((child) => child.destroy());
     this.children.clear();
@@ -3716,6 +3769,8 @@ function createWithDefaults(type, snapshot = {}, env) {
 }
 
 // src/undo.ts
+var undoManagersRegistry = /* @__PURE__ */ new WeakMap();
+var timeTravelManagersRegistry = /* @__PURE__ */ new WeakMap();
 var UndoManager = class {
   constructor(target, options = {}) {
     this.historyEntries = [];
@@ -3736,6 +3791,7 @@ var UndoManager = class {
       groupByTime: options.groupByTime ?? false,
       groupingWindow: options.groupingWindow ?? 200
     };
+    undoManagersRegistry.set(target, this);
     this.disposer = onPatch(target, (patch, reversePatch) => {
       this.recordPatch(patch, reversePatch);
     });
@@ -3829,6 +3885,13 @@ var UndoManager = class {
         applyPatch(this.target, entry.patches[i]);
       }
       this.currentIndex--;
+      const tt = timeTravelManagersRegistry.get(this.target);
+      if (tt) {
+        const N = tt.snapshots.length;
+        const M = this.historyEntries.length;
+        const ttIndex = this.currentIndex + 1 + (N - 1 - M);
+        tt.index = Math.max(0, Math.min(N - 1, ttIndex));
+      }
     } finally {
       this.isUndoing = false;
       rootNode.$isApplyingHistory = wasApplying;
@@ -3849,6 +3912,13 @@ var UndoManager = class {
       for (const patch of entry.inversePatches) {
         applyPatch(this.target, patch);
       }
+      const tt = timeTravelManagersRegistry.get(this.target);
+      if (tt) {
+        const N = tt.snapshots.length;
+        const M = this.historyEntries.length;
+        const ttIndex = this.currentIndex + 1 + (N - 1 - M);
+        tt.index = Math.max(0, Math.min(N - 1, ttIndex));
+      }
     } finally {
       this.isRedoing = false;
       rootNode.$isApplyingHistory = wasApplying;
@@ -3902,6 +3972,7 @@ var UndoManager = class {
     }
   }
   dispose() {
+    undoManagersRegistry.delete(this.target);
     if (this.disposer) {
       this.disposer();
       this.disposer = null;
@@ -3928,6 +3999,7 @@ var TimeTravelManager = class {
     this.target = target;
     this.maxSnapshots = options.maxSnapshots ?? 50;
     this.autoRecord = options.autoRecord ?? false;
+    timeTravelManagersRegistry.set(target, this);
     this.record();
     if (this.autoRecord) {
       this.disposer = onPatch(target, () => {
@@ -4009,6 +4081,13 @@ var TimeTravelManager = class {
     try {
       this.index = index;
       applySnapshot(this.target, this.snapshots[index]);
+      const undo = undoManagersRegistry.get(this.target);
+      if (undo) {
+        const N = this.snapshots.length;
+        const M = undo.historyEntries.length;
+        const undoIndex = this.index - 1 - (N - 1 - M);
+        undo.currentIndex = Math.max(-1, Math.min(M - 1, undoIndex));
+      }
     } finally {
       this.isApplying = false;
       rootNode.$isApplyingHistory = wasApplying;
@@ -4026,6 +4105,7 @@ var TimeTravelManager = class {
     this.record();
   }
   dispose() {
+    timeTravelManagersRegistry.delete(this.target);
     if (this.disposer) {
       this.disposer();
       this.disposer = null;

package/dist/index.mjs

@@ -62,7 +62,7 @@ import {
   tryResolve,
   unfreeze,
   walk
-} from "./chunk-MSLAD5CJ.mjs";
+} from "./chunk-Q6QPBXHH.mjs";
 
 // src/primitives.ts
 function createSimpleType(name, validator, defaultValue) {

package/dist/react.d.mts

@@ -1,6 +1,6 @@
 import React, { ComponentType, FC, ReactNode } from 'react';
-import { ag as getGlobalStore, aD as IUndoManagerOptions, aC as IUndoManager, aF as ITimeTravelManager } from './undo-BcBI_BQM.mjs';
-export { aI as hasStateTreeNode } from './undo-BcBI_BQM.mjs';
+import { ag as getGlobalStore, aD as IUndoManagerOptions, aC as IUndoManager, aF as ITimeTravelManager } from './undo-DL1pyOkT.mjs';
+export { aI as hasStateTreeNode } from './undo-DL1pyOkT.mjs';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/react.d.ts

@@ -1,6 +1,6 @@
 import React, { ComponentType, FC, ReactNode } from 'react';
-import { ag as getGlobalStore, aD as IUndoManagerOptions, aC as IUndoManager, aF as ITimeTravelManager } from './undo-BcBI_BQM.js';
-export { aI as hasStateTreeNode } from './undo-BcBI_BQM.js';
+import { ag as getGlobalStore, aD as IUndoManagerOptions, aC as IUndoManager, aF as ITimeTravelManager } from './undo-DL1pyOkT.js';
+export { aI as hasStateTreeNode } from './undo-DL1pyOkT.js';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/react.js

@@ -93,9 +93,12 @@ var identifierFinalizationRegistry = new FinalizationRegistry(
   (info) => {
     const typeMap = identifierRegistry.get(info.typeName);
     if (typeMap) {
-      typeMap.delete(info.identifier);
-      if (typeMap.size === 0) {
-        identifierRegistry.delete(info.typeName);
+      const ref = typeMap.get(info.identifier);
+      if (!ref || ref.deref() === void 0) {
+        typeMap.delete(info.identifier);
+        if (typeMap.size === 0) {
+          identifierRegistry.delete(info.typeName);
+        }
       }
     }
   }
@@ -122,6 +125,35 @@ function notifyLifecycleChange(node, isAlive) {
     listeners.forEach((listener) => listener(isAlive));
   }
 }
+function cloneAndSerialize(value) {
+  if (value === null || value === void 0) {
+    return value;
+  }
+  if (hasStateTreeNode(value)) {
+    return getSnapshotFromNode(getStateTreeNode(value));
+  }
+  if (Array.isArray(value)) {
+    return value.map(cloneAndSerialize);
+  }
+  if (typeof value === "object") {
+    if (value instanceof Map) {
+      const res = {};
+      for (const [k, v] of value.entries()) {
+        res[k] = cloneAndSerialize(v);
+      }
+      return res;
+    }
+    const proto = Object.getPrototypeOf(value);
+    if (proto === null || proto === Object.prototype) {
+      const res = {};
+      for (const [k, v] of Object.entries(value)) {
+        res[k] = cloneAndSerialize(v);
+      }
+      return res;
+    }
+  }
+  return value;
+}
 var StateTreeNode = class {
   constructor(type, initialValue, env, parent, pathSegment) {
     this.$parent = null;
@@ -139,6 +171,8 @@ var StateTreeNode = class {
     /** Cached snapshot for structural sharing optimization */
     this.cachedSnapshot = void 0;
     this.isSnapshotDirty = true;
+    /** Strong reference to the instance proxy to prevent GC of active nodes */
+    this.instance = null;
     this.$id = generateNodeId();
     this.$type = type;
     this.$env = env ?? parent?.$env;
@@ -159,6 +193,7 @@ var StateTreeNode = class {
   }
   /** Set the instance reference */
   setInstance(instance) {
+    this.instance = instance;
     const entry = nodeRegistry.get(this.$id);
     if (entry && instance && typeof instance === "object") {
       entry.instance = new WeakRef(instance);
@@ -166,8 +201,7 @@ var StateTreeNode = class {
   }
   /** Get the instance */
   getInstance() {
-    const entry = nodeRegistry.get(this.$id);
-    return entry?.instance?.deref() ?? null;
+    return this.instance;
   }
   /** Get current value from atom */
   getValue() {
@@ -273,9 +307,27 @@ var StateTreeNode = class {
   }
   /** Notify patch listeners */
   notifyPatch(patch, reversePatch) {
-    this.patchListeners.forEach((listener) => listener(patch, reversePatch));
+    const serializedPatch = {
+      ...patch,
+      value: "value" in patch ? cloneAndSerialize(patch.value) : void 0
+    };
+    if (!("value" in patch)) {
+      delete serializedPatch.value;
+    }
+    const serializedReversePatch = {
+      ...reversePatch,
+      value: "value" in reversePatch ? cloneAndSerialize(reversePatch.value) : void 0,
+      oldValue: "oldValue" in reversePatch ? cloneAndSerialize(reversePatch.oldValue) : void 0
+    };
+    if (!("value" in reversePatch)) {
+      delete serializedReversePatch.value;
+    }
+    if (!("oldValue" in reversePatch)) {
+      delete serializedReversePatch.oldValue;
+    }
+    this.patchListeners.forEach((listener) => listener(serializedPatch, serializedReversePatch));
     if (this.$parent) {
-      this.$parent.notifyPatch(patch, reversePatch);
+      this.$parent.notifyPatch(serializedPatch, serializedReversePatch);
     }
   }
   /** Notify snapshot listeners */
@@ -312,6 +364,7 @@ var StateTreeNode = class {
   /** Destroy this node and all children */
   destroy() {
     if (!this.$isAlive) return;
+    this.instance = null;
     lifecycleHookHandlers.runBeforeDestroy?.(this);
     this.children.forEach((child) => child.destroy());
     this.children.clear();
@@ -560,6 +613,8 @@ function onAction(target, listener) {
 }
 
 // src/undo.ts
+var undoManagersRegistry = /* @__PURE__ */ new WeakMap();
+var timeTravelManagersRegistry = /* @__PURE__ */ new WeakMap();
 var UndoManager = class {
   constructor(target, options = {}) {
     this.historyEntries = [];
@@ -580,6 +635,7 @@ var UndoManager = class {
       groupByTime: options.groupByTime ?? false,
       groupingWindow: options.groupingWindow ?? 200
     };
+    undoManagersRegistry.set(target, this);
     this.disposer = onPatch(target, (patch, reversePatch) => {
       this.recordPatch(patch, reversePatch);
     });
@@ -673,6 +729,13 @@ var UndoManager = class {
         applyPatch(this.target, entry.patches[i]);
       }
       this.currentIndex--;
+      const tt = timeTravelManagersRegistry.get(this.target);
+      if (tt) {
+        const N = tt.snapshots.length;
+        const M = this.historyEntries.length;
+        const ttIndex = this.currentIndex + 1 + (N - 1 - M);
+        tt.index = Math.max(0, Math.min(N - 1, ttIndex));
+      }
     } finally {
       this.isUndoing = false;
       rootNode.$isApplyingHistory = wasApplying;
@@ -693,6 +756,13 @@ var UndoManager = class {
       for (const patch of entry.inversePatches) {
         applyPatch(this.target, patch);
       }
+      const tt = timeTravelManagersRegistry.get(this.target);
+      if (tt) {
+        const N = tt.snapshots.length;
+        const M = this.historyEntries.length;
+        const ttIndex = this.currentIndex + 1 + (N - 1 - M);
+        tt.index = Math.max(0, Math.min(N - 1, ttIndex));
+      }
     } finally {
       this.isRedoing = false;
       rootNode.$isApplyingHistory = wasApplying;
@@ -746,6 +816,7 @@ var UndoManager = class {
     }
   }
   dispose() {
+    undoManagersRegistry.delete(this.target);
     if (this.disposer) {
       this.disposer();
       this.disposer = null;
@@ -772,6 +843,7 @@ var TimeTravelManager = class {
     this.target = target;
     this.maxSnapshots = options.maxSnapshots ?? 50;
     this.autoRecord = options.autoRecord ?? false;
+    timeTravelManagersRegistry.set(target, this);
     this.record();
     if (this.autoRecord) {
       this.disposer = onPatch(target, () => {
@@ -853,6 +925,13 @@ var TimeTravelManager = class {
     try {
       this.index = index;
       applySnapshot(this.target, this.snapshots[index]);
+      const undo = undoManagersRegistry.get(this.target);
+      if (undo) {
+        const N = this.snapshots.length;
+        const M = undo.historyEntries.length;
+        const undoIndex = this.index - 1 - (N - 1 - M);
+        undo.currentIndex = Math.max(-1, Math.min(M - 1, undoIndex));
+      }
     } finally {
       this.isApplying = false;
       rootNode.$isApplyingHistory = wasApplying;
@@ -870,6 +949,7 @@ var TimeTravelManager = class {
     this.record();
   }
   dispose() {
+    timeTravelManagersRegistry.delete(this.target);
     if (this.disposer) {
       this.disposer();
       this.disposer = null;
@@ -1229,6 +1309,15 @@ function useHydrateStore(target, snapshot, options) {
     return;
   }
   const node = getStateTreeNode(target);
+  (0, import_react.useMemo)(() => {
+    const wasApplying = getIsApplyingSnapshotOrPatch();
+    setIsApplyingSnapshotOrPatch(true);
+    try {
+      applySnapshotToNode(node, snapshot);
+    } finally {
+      setIsApplyingSnapshotOrPatch(wasApplying);
+    }
+  }, [node, snapshot]);
   const pairs = (0, import_react.useMemo)(() => {
     const collectedPairs = [];
     function collect(n) {