xstate 6.0.0-beta.0 → 6.0.0-beta.2

package/dist/xstate-persist.cjs.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var createActor = require('./createActor-25900f76.cjs.js');
-var machineSchemas = require('./machineSchemas-88d01821.cjs.js');
+var legacySnapshot = require('./legacySnapshot-8d595687.cjs.js');
+var createActor = require('./createActor-c91c9ffe.cjs.js');
 require('./validation-4561b43c.cjs.js');
 
 /**
@@ -51,7 +51,7 @@ function restoreActor(logic, persistedSnapshot, options) {
  * `restoreSnapshot` (or verbatim).
  */
 function restoreLogicSnapshot(logic, persisted, actorScope) {
-  if (logic instanceof machineSchemas.StateMachine) {
+  if (logic instanceof legacySnapshot.StateMachine) {
     return restoreMachineSnapshot(logic, persisted, actorScope);
   }
   // Only `undefined` means "no snapshot": an explicit `null` (or another
@@ -64,7 +64,7 @@ function restoreLogicSnapshot(logic, persisted, actorScope) {
 function createRestoreHook(logic, persisted) {
   return {
     restore: actorScope => restoreLogicSnapshot(logic, persisted, actorScope),
-    error: error => logic instanceof machineSchemas.StateMachine ? createRestoreErrorSnapshot(logic, persisted, error) : undefined
+    error: error => logic instanceof legacySnapshot.StateMachine ? createRestoreErrorSnapshot(logic, persisted, error) : undefined
   };
 }
 
@@ -93,10 +93,17 @@ function createRestoreErrorSnapshot(machine, persisted, error) {
  * in context.
  */
 function restoreMachineSnapshot(machine, snapshot, actorScope) {
+  // A reactive Proxy wraps state nodes but bound transitions use raw nodes.
+  // Normalize here for both restoreActor and direct callers.
+  if (machine instanceof legacySnapshot.StateMachine) {
+    machine = machine._raw();
+  }
+  // TODO(v7): remove with legacySnapshot.ts.
+  snapshot = legacySnapshot.upgradeLegacyPersistedSnapshot(snapshot);
   const usesInertScope = !actorScope;
   const resolvedActorScope = actorScope ?? createActor.createInertActorScope(machine);
   if (!snapshot || typeof snapshot !== 'object' || Array.isArray(snapshot)) {
-    throw new machineSchemas.InvalidSnapshotError(createActor.xstateError(24, machine.id));
+    throw new legacySnapshot.InvalidSnapshotError(createActor.xstateError(24, machine.id));
   }
   const snapshotMachine = snapshot.machine;
   // A live machine snapshot carries its producing machine so helpers such as
@@ -122,7 +129,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
   const {
     nodes,
     childLogics
-  } = machineSchemas.validatePersistedSnapshot(machine, snapshotData);
+  } = legacySnapshot.validatePersistedSnapshot(machine, snapshotData);
   const children = {};
   const snapshotChildren = snapshotData.children;
   for (const actorId of Object.keys(snapshotChildren)) {
@@ -187,7 +194,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     const target = typeof timer.target === 'string' ? timer.target === 'self' ? 'self' : children[timer.target] : createActor.isSerializedActorRef(timer.target) ? timer.target : resolvedActorScope.self._parent;
     if (!target) {
       const targetDescription = typeof timer.target === 'string' ? timer.target : timer.target.type;
-      throw new machineSchemas.InvalidSnapshotError(createActor.xstateError(33, targetDescription));
+      throw new legacySnapshot.InvalidSnapshotError(createActor.xstateError(33, targetDescription));
     }
     timers.push({
       ...timer,
@@ -204,7 +211,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       const arr = historyValue[key];
       for (const item of arr) {
         let resolved;
-        if (item instanceof machineSchemas.StateNode) {
+        if (item instanceof legacySnapshot.StateNode) {
           resolved = item;
         } else {
           try {
@@ -228,12 +235,15 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     // `_nextActorIds` plus the child-id fold below; dropped so old and new
     // snapshots round-trip to the same shape.
     _nextActorId: _legacyNextActorId,
+    nextTimerId,
+    nextActorIds,
+    stateInputs: _persistedStateInputs,
     ...persistedRest
   } = snapshot;
   // Fold generated-shaped child ids into the counters as a floor: snapshots
   // persisted before per-actor counters (or hand-crafted ones) still must
   // never reuse a live child's id.
-  let restoredCounters = persistedRest._nextActorIds;
+  let restoredCounters = nextActorIds;
   for (const childId of Object.keys(snapshotChildren)) {
     const generated = createActor.parseGeneratedActorId(childId);
     if (generated && (restoredCounters?.[generated.prefix] ?? 0) <= generated.index) {
@@ -252,7 +262,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       return value;
     }
     // The context object itself is data, never a serialized actor ref.
-    // Only an object whose keys are exactly `$actor` (+ `incarnation`)
+    // Only an object whose keys are exactly `@actor` (+ `incarnation`)
     // is a serialized ref; any other object is data.
     if (!isRoot && createActor.isSerializedActorRef(value)) {
       // A ref that names one of this snapshot's children revives to that
@@ -262,7 +272,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       if (value.incarnation !== undefined) {
         return value;
       }
-      return Object.values(children).find(child => child.address === value.$actor) ?? value;
+      return Object.values(children).find(child => child.address === value['@actor']) ?? value;
     }
     const proto = Object.getPrototypeOf(value);
     if (!Array.isArray(value) && proto !== Object.prototype && proto !== null) {
@@ -288,6 +298,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     context: reviveContext(persistedRest.context, true),
     children,
     timers,
+    _nextTimerId: nextTimerId,
     _nextActorIds: restoredCounters,
     _nodes: nodes,
     // Derived from the resolved configuration, so a partial value such as
@@ -308,7 +319,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
   return restoredSnapshot;
 }
 
-exports.snapshotSchema = machineSchemas.snapshotSchema;
+exports.snapshotSchema = legacySnapshot.snapshotSchema;
 exports.restoreActor = restoreActor;
 exports.restoreLogicSnapshot = restoreLogicSnapshot;
 exports.restoreMachineSnapshot = restoreMachineSnapshot;

package/dist/xstate-persist.development.cjs.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var createActor = require('./createActor-a49ae0ce.development.cjs.js');
-var machineSchemas = require('./machineSchemas-6d96bef4.development.cjs.js');
+var legacySnapshot = require('./legacySnapshot-ebf0b2b8.development.cjs.js');
+var createActor = require('./createActor-c029d29f.development.cjs.js');
 require('./validation-f2714a35.development.cjs.js');
 
 /**
@@ -51,7 +51,7 @@ function restoreActor(logic, persistedSnapshot, options) {
  * `restoreSnapshot` (or verbatim).
  */
 function restoreLogicSnapshot(logic, persisted, actorScope) {
-  if (logic instanceof machineSchemas.StateMachine) {
+  if (logic instanceof legacySnapshot.StateMachine) {
     return restoreMachineSnapshot(logic, persisted, actorScope);
   }
   // Only `undefined` means "no snapshot": an explicit `null` (or another
@@ -64,7 +64,7 @@ function restoreLogicSnapshot(logic, persisted, actorScope) {
 function createRestoreHook(logic, persisted) {
   return {
     restore: actorScope => restoreLogicSnapshot(logic, persisted, actorScope),
-    error: error => logic instanceof machineSchemas.StateMachine ? createRestoreErrorSnapshot(logic, persisted, error) : undefined
+    error: error => logic instanceof legacySnapshot.StateMachine ? createRestoreErrorSnapshot(logic, persisted, error) : undefined
   };
 }
 
@@ -93,10 +93,17 @@ function createRestoreErrorSnapshot(machine, persisted, error) {
  * in context.
  */
 function restoreMachineSnapshot(machine, snapshot, actorScope) {
+  // A reactive Proxy wraps state nodes but bound transitions use raw nodes.
+  // Normalize here for both restoreActor and direct callers.
+  if (machine instanceof legacySnapshot.StateMachine) {
+    machine = machine._raw();
+  }
+  // TODO(v7): remove with legacySnapshot.ts.
+  snapshot = legacySnapshot.upgradeLegacyPersistedSnapshot(snapshot);
   const usesInertScope = !actorScope;
   const resolvedActorScope = actorScope ?? createActor.createInertActorScope(machine);
   if (!snapshot || typeof snapshot !== 'object' || Array.isArray(snapshot)) {
-    throw new machineSchemas.InvalidSnapshotError(`Persisted snapshot for ${createActor.describeMachine(machine.id)} must be an object.` );
+    throw new legacySnapshot.InvalidSnapshotError(`Persisted snapshot for ${createActor.describeMachine(machine.id)} must be an object.` );
   }
   const snapshotMachine = snapshot.machine;
   // A live machine snapshot carries its producing machine so helpers such as
@@ -122,7 +129,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
   const {
     nodes,
     childLogics
-  } = machineSchemas.validatePersistedSnapshot(machine, snapshotData);
+  } = legacySnapshot.validatePersistedSnapshot(machine, snapshotData);
   const children = {};
   const snapshotChildren = snapshotData.children;
   for (const actorId of Object.keys(snapshotChildren)) {
@@ -187,7 +194,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     const target = typeof timer.target === 'string' ? timer.target === 'self' ? 'self' : children[timer.target] : createActor.isSerializedActorRef(timer.target) ? timer.target : resolvedActorScope.self._parent;
     if (!target) {
       const targetDescription = typeof timer.target === 'string' ? timer.target : timer.target.type;
-      throw new machineSchemas.InvalidSnapshotError(`Unable to restore timer ${timer.id !== undefined ? `'${timer.id}'` : `for event '${timer.event.type}'`}: target actor '${targetDescription}' is unavailable.` );
+      throw new legacySnapshot.InvalidSnapshotError(`Unable to restore timer ${timer.id !== undefined ? `'${timer.id}'` : `for event '${timer.event.type}'`}: target actor '${targetDescription}' is unavailable.` );
     }
     timers.push({
       ...timer,
@@ -204,7 +211,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       const arr = historyValue[key];
       for (const item of arr) {
         let resolved;
-        if (item instanceof machineSchemas.StateNode) {
+        if (item instanceof legacySnapshot.StateNode) {
           resolved = item;
         } else {
           try {
@@ -239,12 +246,15 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     // `_nextActorIds` plus the child-id fold below; dropped so old and new
     // snapshots round-trip to the same shape.
     _nextActorId: _legacyNextActorId,
+    nextTimerId,
+    nextActorIds,
+    stateInputs: _persistedStateInputs,
     ...persistedRest
   } = snapshot;
   // Fold generated-shaped child ids into the counters as a floor: snapshots
   // persisted before per-actor counters (or hand-crafted ones) still must
   // never reuse a live child's id.
-  let restoredCounters = persistedRest._nextActorIds;
+  let restoredCounters = nextActorIds;
   for (const childId of Object.keys(snapshotChildren)) {
     const generated = createActor.parseGeneratedActorId(childId);
     if (generated && (restoredCounters?.[generated.prefix] ?? 0) <= generated.index) {
@@ -263,7 +273,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       return value;
     }
     // The context object itself is data, never a serialized actor ref.
-    // Only an object whose keys are exactly `$actor` (+ `incarnation`)
+    // Only an object whose keys are exactly `@actor` (+ `incarnation`)
     // is a serialized ref; any other object is data.
     if (!isRoot && createActor.isSerializedActorRef(value)) {
       // A ref that names one of this snapshot's children revives to that
@@ -273,7 +283,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       if (value.incarnation !== undefined) {
         return value;
       }
-      return Object.values(children).find(child => child.address === value.$actor) ?? value;
+      return Object.values(children).find(child => child.address === value['@actor']) ?? value;
     }
     const proto = Object.getPrototypeOf(value);
     if (!Array.isArray(value) && proto !== Object.prototype && proto !== null) {
@@ -299,6 +309,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     context: reviveContext(persistedRest.context, true),
     children,
     timers,
+    _nextTimerId: nextTimerId,
     _nextActorIds: restoredCounters,
     _nodes: nodes,
     // Derived from the resolved configuration, so a partial value such as
@@ -319,7 +330,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
   return restoredSnapshot;
 }
 
-exports.snapshotSchema = machineSchemas.snapshotSchema;
+exports.snapshotSchema = legacySnapshot.snapshotSchema;
 exports.restoreActor = restoreActor;
 exports.restoreLogicSnapshot = restoreLogicSnapshot;
 exports.restoreMachineSnapshot = restoreMachineSnapshot;

package/dist/xstate-persist.development.esm.js

@@ -1,6 +1,6 @@
-import { aT as diagnoseActorOptions, E as Actor, ao as cloneMachineSnapshot, e as createMachineSnapshot, ah as createInertActorScope, ad as describeMachine, aU as createRemoteActorRef, aV as createInvokeTimeoutEvent, o as isSerializedActorRef, aW as parseGeneratedActorId, ai as setInertActorScopeSnapshot, ak as attachSnapshotActorRef, am as isInertActorScope, an as setSnapshotActorRef } from './createActor-551369be.development.esm.js';
-import { S as StateMachine, I as InvalidSnapshotError, v as validatePersistedSnapshot, a as StateNode } from './machineSchemas-b5736804.development.esm.js';
-export { s as snapshotSchema } from './machineSchemas-b5736804.development.esm.js';
+import { S as StateMachine, b as upgradeLegacyPersistedSnapshot, I as InvalidSnapshotError, v as validatePersistedSnapshot, a as StateNode } from './legacySnapshot-ae6594a7.development.esm.js';
+export { s as snapshotSchema } from './legacySnapshot-ae6594a7.development.esm.js';
+import { aV as diagnoseActorOptions, E as Actor, ao as cloneMachineSnapshot, e as createMachineSnapshot, ah as createInertActorScope, ad as describeMachine, aW as createRemoteActorRef, aX as createInvokeTimeoutEvent, o as isSerializedActorRef, aY as parseGeneratedActorId, ai as setInertActorScopeSnapshot, ak as attachSnapshotActorRef, am as isInertActorScope, an as setSnapshotActorRef } from './createActor-0250284a.development.esm.js';
 import './validation-e69470ad.development.esm.js';
 
 /**
@@ -90,6 +90,13 @@ function createRestoreErrorSnapshot(machine, persisted, error) {
  * in context.
  */
 function restoreMachineSnapshot(machine, snapshot, actorScope) {
+  // A reactive Proxy wraps state nodes but bound transitions use raw nodes.
+  // Normalize here for both restoreActor and direct callers.
+  if (machine instanceof StateMachine) {
+    machine = machine._raw();
+  }
+  // TODO(v7): remove with legacySnapshot.ts.
+  snapshot = upgradeLegacyPersistedSnapshot(snapshot);
   const usesInertScope = !actorScope;
   const resolvedActorScope = actorScope ?? createInertActorScope(machine);
   if (!snapshot || typeof snapshot !== 'object' || Array.isArray(snapshot)) {
@@ -236,12 +243,15 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     // `_nextActorIds` plus the child-id fold below; dropped so old and new
     // snapshots round-trip to the same shape.
     _nextActorId: _legacyNextActorId,
+    nextTimerId,
+    nextActorIds,
+    stateInputs: _persistedStateInputs,
     ...persistedRest
   } = snapshot;
   // Fold generated-shaped child ids into the counters as a floor: snapshots
   // persisted before per-actor counters (or hand-crafted ones) still must
   // never reuse a live child's id.
-  let restoredCounters = persistedRest._nextActorIds;
+  let restoredCounters = nextActorIds;
   for (const childId of Object.keys(snapshotChildren)) {
     const generated = parseGeneratedActorId(childId);
     if (generated && (restoredCounters?.[generated.prefix] ?? 0) <= generated.index) {
@@ -260,7 +270,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       return value;
     }
     // The context object itself is data, never a serialized actor ref.
-    // Only an object whose keys are exactly `$actor` (+ `incarnation`)
+    // Only an object whose keys are exactly `@actor` (+ `incarnation`)
     // is a serialized ref; any other object is data.
     if (!isRoot && isSerializedActorRef(value)) {
       // A ref that names one of this snapshot's children revives to that
@@ -270,7 +280,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       if (value.incarnation !== undefined) {
         return value;
       }
-      return Object.values(children).find(child => child.address === value.$actor) ?? value;
+      return Object.values(children).find(child => child.address === value['@actor']) ?? value;
     }
     const proto = Object.getPrototypeOf(value);
     if (!Array.isArray(value) && proto !== Object.prototype && proto !== null) {
@@ -296,6 +306,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     context: reviveContext(persistedRest.context, true),
     children,
     timers,
+    _nextTimerId: nextTimerId,
     _nextActorIds: restoredCounters,
     _nodes: nodes,
     // Derived from the resolved configuration, so a partial value such as

package/dist/xstate-persist.esm.js

@@ -1,6 +1,6 @@
-import { aS as diagnoseActorOptions, F as Actor, x as xstateError, ap as cloneMachineSnapshot, e as createMachineSnapshot, ai as createInertActorScope, aT as createRemoteActorRef, aU as createInvokeTimeoutEvent, o as isSerializedActorRef, aV as parseGeneratedActorId, aj as setInertActorScopeSnapshot, al as attachSnapshotActorRef, an as isInertActorScope, ao as setSnapshotActorRef } from './createActor-cbe3abac.esm.js';
-import { S as StateMachine, I as InvalidSnapshotError, v as validatePersistedSnapshot, a as StateNode } from './machineSchemas-45c21bc2.esm.js';
-export { s as snapshotSchema } from './machineSchemas-45c21bc2.esm.js';
+import { S as StateMachine, b as upgradeLegacyPersistedSnapshot, I as InvalidSnapshotError, v as validatePersistedSnapshot, a as StateNode } from './legacySnapshot-9e06feb4.esm.js';
+export { s as snapshotSchema } from './legacySnapshot-9e06feb4.esm.js';
+import { aU as diagnoseActorOptions, F as Actor, x as xstateError, ap as cloneMachineSnapshot, e as createMachineSnapshot, ai as createInertActorScope, aV as createRemoteActorRef, aW as createInvokeTimeoutEvent, o as isSerializedActorRef, aX as parseGeneratedActorId, aj as setInertActorScopeSnapshot, al as attachSnapshotActorRef, an as isInertActorScope, ao as setSnapshotActorRef } from './createActor-20a97166.esm.js';
 import './validation-05f1d517.esm.js';
 
 /**
@@ -90,6 +90,13 @@ function createRestoreErrorSnapshot(machine, persisted, error) {
  * in context.
  */
 function restoreMachineSnapshot(machine, snapshot, actorScope) {
+  // A reactive Proxy wraps state nodes but bound transitions use raw nodes.
+  // Normalize here for both restoreActor and direct callers.
+  if (machine instanceof StateMachine) {
+    machine = machine._raw();
+  }
+  // TODO(v7): remove with legacySnapshot.ts.
+  snapshot = upgradeLegacyPersistedSnapshot(snapshot);
   const usesInertScope = !actorScope;
   const resolvedActorScope = actorScope ?? createInertActorScope(machine);
   if (!snapshot || typeof snapshot !== 'object' || Array.isArray(snapshot)) {
@@ -225,12 +232,15 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     // `_nextActorIds` plus the child-id fold below; dropped so old and new
     // snapshots round-trip to the same shape.
     _nextActorId: _legacyNextActorId,
+    nextTimerId,
+    nextActorIds,
+    stateInputs: _persistedStateInputs,
     ...persistedRest
   } = snapshot;
   // Fold generated-shaped child ids into the counters as a floor: snapshots
   // persisted before per-actor counters (or hand-crafted ones) still must
   // never reuse a live child's id.
-  let restoredCounters = persistedRest._nextActorIds;
+  let restoredCounters = nextActorIds;
   for (const childId of Object.keys(snapshotChildren)) {
     const generated = parseGeneratedActorId(childId);
     if (generated && (restoredCounters?.[generated.prefix] ?? 0) <= generated.index) {
@@ -249,7 +259,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       return value;
     }
     // The context object itself is data, never a serialized actor ref.
-    // Only an object whose keys are exactly `$actor` (+ `incarnation`)
+    // Only an object whose keys are exactly `@actor` (+ `incarnation`)
     // is a serialized ref; any other object is data.
     if (!isRoot && isSerializedActorRef(value)) {
       // A ref that names one of this snapshot's children revives to that
@@ -259,7 +269,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
       if (value.incarnation !== undefined) {
         return value;
       }
-      return Object.values(children).find(child => child.address === value.$actor) ?? value;
+      return Object.values(children).find(child => child.address === value['@actor']) ?? value;
     }
     const proto = Object.getPrototypeOf(value);
     if (!Array.isArray(value) && proto !== Object.prototype && proto !== null) {
@@ -285,6 +295,7 @@ function restoreMachineSnapshot(machine, snapshot, actorScope) {
     context: reviveContext(persistedRest.context, true),
     children,
     timers,
+    _nextTimerId: nextTimerId,
     _nextActorIds: restoredCounters,
     _nodes: nodes,
     // Derived from the resolved configuration, so a partial value such as