xstate 5.0.0-beta.28 → 5.0.0-beta.30

package/dist/{raise-436a57a2.cjs.js → raise-e79b1f86.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var interpreter = require('./interpreter-672794ae.cjs.js');
+var interpreter = require('./interpreter-a2c1e529.cjs.js');
 
 const cache = new WeakMap();
 function memo(object, key, fn) {
@@ -892,7 +892,7 @@ function microstepProcedure(transitions, currentState, mutConfiguration, event,
       historyValue,
       _internalQueue: internalQueue,
       context: nextState.context,
-      done,
+      status: done ? 'done' : currentState.status,
       output,
       children: nextState.children
     });
@@ -1121,7 +1121,7 @@ function macrostep(state, event, actorCtx) {
     nextState = microstep(transitions, state, actorCtx, nextEvent, false);
     states.push(nextState);
   }
-  while (!nextState.done) {
+  while (nextState.status === 'active') {
     let enabledTransitions = selectEventlessTransitions(nextState, nextEvent);
     if (!enabledTransitions.length) {
       if (!nextState._internalQueue.length) {
@@ -1138,7 +1138,7 @@ function macrostep(state, event, actorCtx) {
       states.push(nextState);
     }
   }
-  if (nextState.done) {
+  if (nextState.status !== 'active') {
     // Perform the stop step to ensure that child actors are stopped
     stopStep(nextEvent, nextState, actorCtx);
   }
@@ -1231,7 +1231,8 @@ class State {
           meta: {},
           configuration: [],
           // TODO: fix,
-          children: {}
+          children: {},
+          status: 'active'
         }, machine);
       }
       return stateValue;
@@ -1242,7 +1243,8 @@ class State {
       context,
       meta: undefined,
       configuration: Array.from(configuration),
-      children: {}
+      children: {},
+      status: 'active'
     }, machine);
   }
 
@@ -1255,8 +1257,7 @@ class State {
     this.machine = machine;
     this.tags = void 0;
     this.value = void 0;
-    this.done = void 0;
-    this.output = void 0;
+    this.status = void 0;
     this.error = void 0;
     this.context = void 0;
     this.historyValue = {};
@@ -1272,7 +1273,7 @@ class State {
     this.children = config.children;
     this.value = getStateValue(machine.root, this.configuration);
     this.tags = new Set(interpreter.flatten(this.configuration.map(sn => sn.tags)));
-    this.done = config.done ?? false;
+    this.status = config.status;
     this.output = config.output;
     this.error = config.error;
   }
@@ -1367,9 +1368,10 @@ function getPersistedState(state) {
   } = state;
   const childrenJson = {};
   for (const id in children) {
+    const child = children[id];
     childrenJson[id] = {
-      state: children[id].getPersistedState?.(),
-      src: children[id].src
+      state: child.getPersistedState?.(),
+      src: child.src
     };
   }
   return {

package/dist/{send-e8b55d00.development.cjs.js → send-19a256f0.development.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var guards_dist_xstateGuards = require('./raise-74b72ca5.development.cjs.js');
-var interpreter = require('./interpreter-a1432c7d.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-7cae872b.development.cjs.js');
+var interpreter = require('./interpreter-7f1dc557.development.cjs.js');
 
 function createSpawner(actorContext, {
   machine,

package/dist/{send-e63b7b83.development.esm.js → send-a1d772da.development.esm.js}

@@ -1,5 +1,5 @@
-import { j as cloneState, e as evaluateGuard } from './raise-a60c9290.development.esm.js';
-import { f as ActorStatus, l as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, C as XSTATE_ERROR } from './interpreter-a77bb0ec.development.esm.js';
+import { j as cloneState, e as evaluateGuard } from './raise-6e4f5cf7.development.esm.js';
+import { f as ActorStatus, k as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, y as XSTATE_ERROR } from './interpreter-945c4b96.development.esm.js';
 
 function createSpawner(actorContext, {
   machine,

package/dist/{send-35e1a689.cjs.js → send-e7063201.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var guards_dist_xstateGuards = require('./raise-436a57a2.cjs.js');
-var interpreter = require('./interpreter-672794ae.cjs.js');
+var guards_dist_xstateGuards = require('./raise-e79b1f86.cjs.js');
+var interpreter = require('./interpreter-a2c1e529.cjs.js');
 
 function createSpawner(actorContext, {
   machine,

package/dist/{send-4192e7bc.esm.js → send-f4fb3ba5.esm.js}

@@ -1,5 +1,5 @@
-import { j as cloneState, e as evaluateGuard } from './raise-b9c9a234.esm.js';
-import { f as ActorStatus, l as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, C as XSTATE_ERROR } from './interpreter-b5203bcb.esm.js';
+import { j as cloneState, e as evaluateGuard } from './raise-0b7dde8b.esm.js';
+import { f as ActorStatus, k as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, y as XSTATE_ERROR } from './interpreter-b8f53c4b.esm.js';
 
 function createSpawner(actorContext, {
   machine,

package/dist/xstate.cjs.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var actors_dist_xstateActors = require('../actors/dist/xstate-actors.cjs.js');
-var interpreter = require('./interpreter-672794ae.cjs.js');
-var guards_dist_xstateGuards = require('./raise-436a57a2.cjs.js');
-var send = require('./send-35e1a689.cjs.js');
+var interpreter = require('./interpreter-a2c1e529.cjs.js');
+var guards_dist_xstateGuards = require('./raise-e79b1f86.cjs.js');
+var send = require('./send-e7063201.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 class SimulatedClock {
@@ -58,7 +58,7 @@ class SimulatedClock {
 }
 
 const EMPTY_OBJECT = {};
-const toSerializableActon = action => {
+const toSerializableAction = action => {
   if (typeof action === 'string') {
     return {
       type: action
@@ -212,13 +212,13 @@ class StateNode {
       initial: this.initial ? {
         target: this.initial.target,
         source: this,
-        actions: this.initial.actions.map(toSerializableActon),
+        actions: this.initial.actions.map(toSerializableAction),
         eventType: null,
         reenter: false,
         toJSON: () => ({
           target: this.initial.target.map(t => `#${t.id}`),
           source: `#${this.id}`,
-          actions: this.initial.actions.map(toSerializableActon),
+          actions: this.initial.actions.map(toSerializableAction),
           eventType: null
         })
       } : undefined,
@@ -229,10 +229,10 @@ class StateNode {
       on: this.on,
       transitions: [...this.transitions.values()].flat().map(t => ({
         ...t,
-        actions: t.actions.map(toSerializableActon)
+        actions: t.actions.map(toSerializableAction)
       })),
-      entry: this.entry.map(toSerializableActon),
-      exit: this.exit.map(toSerializableActon),
+      entry: this.entry.map(toSerializableAction),
+      exit: this.exit.map(toSerializableAction),
       meta: this.meta,
       order: this.order || -1,
       output: this.output,
@@ -467,7 +467,7 @@ class StateMachine {
       ...state,
       value: guards_dist_xstateGuards.resolveStateValue(this.root, state.value),
       configuration,
-      done: guards_dist_xstateGuards.isInFinalState(configuration)
+      status: guards_dist_xstateGuards.isInFinalState(configuration) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -486,6 +486,7 @@ class StateMachine {
     // TODO: handle error events in a better way
     if (interpreter.isErrorActorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
       return guards_dist_xstateGuards.cloneState(state, {
+        status: 'error',
         error: event.data
       });
     }
@@ -523,7 +524,8 @@ class StateMachine {
       context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
       configuration: guards_dist_xstateGuards.getInitialConfiguration(this.root),
-      children: {}
+      children: {},
+      status: 'active'
     }));
     if (typeof context === 'function') {
       const assignment = ({
@@ -587,21 +589,10 @@ class StateMachine {
   createState(stateConfig) {
     return stateConfig instanceof guards_dist_xstateGuards.State ? stateConfig : new guards_dist_xstateGuards.State(stateConfig, this);
   }
-  getStatus(state) {
-    return state.error ? {
-      status: 'error',
-      data: state.error
-    } : state.done ? {
-      status: 'done',
-      data: state.output
-    } : {
-      status: 'active'
-    };
-  }
-  restoreState(state, _actorCtx) {
+  restoreState(snapshot, _actorCtx) {
     const children = {};
-    Object.keys(state.children).forEach(actorId => {
-      const actorData = state.children[actorId];
+    Object.keys(snapshot.children).forEach(actorId => {
+      const actorData = snapshot.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
       const logic = src ? interpreter.resolveReferencedActor(this.implementations.actors[src])?.src : undefined;
@@ -615,13 +606,13 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    const restoredState = this.createState(new guards_dist_xstateGuards.State({
-      ...state,
+    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
+      ...snapshot,
       children
     }, this));
 
     // TODO: DRY this up
-    restoredState.configuration.forEach(stateNode => {
+    restoredSnapshot.configuration.forEach(stateNode => {
       if (stateNode.invoke) {
         stateNode.invoke.forEach(invokeConfig => {
           const {
@@ -643,7 +634,7 @@ class StateMachine {
         });
       }
     });
-    return restoredState;
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */
@@ -740,8 +731,6 @@ exports.fromEventObservable = actors_dist_xstateActors.fromEventObservable;
 exports.fromObservable = actors_dist_xstateActors.fromObservable;
 exports.fromPromise = actors_dist_xstateActors.fromPromise;
 exports.fromTransition = actors_dist_xstateActors.fromTransition;
-exports.isActorRef = actors_dist_xstateActors.isActorRef;
-exports.toActorRef = actors_dist_xstateActors.toActorRef;
 exports.Actor = interpreter.Actor;
 exports.ActorStatus = interpreter.ActorStatus;
 exports.InterpreterStatus = interpreter.InterpreterStatus;

package/dist/xstate.cjs.mjs

@@ -23,7 +23,6 @@ export {
   fromTransition,
   getStateNodes,
   interpret,
-  isActorRef,
   log,
   mapState,
   matchesState,
@@ -36,7 +35,6 @@ export {
   sendTo,
   stateIn,
   stop,
-  toActorRef,
   toObserver,
   waitFor
 } from "./xstate.cjs.js";

package/dist/xstate.development.cjs.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var actors_dist_xstateActors = require('../actors/dist/xstate-actors.development.cjs.js');
-var interpreter = require('./interpreter-a1432c7d.development.cjs.js');
-var guards_dist_xstateGuards = require('./raise-74b72ca5.development.cjs.js');
-var send = require('./send-e8b55d00.development.cjs.js');
+var interpreter = require('./interpreter-7f1dc557.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-7cae872b.development.cjs.js');
+var send = require('./send-19a256f0.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 class SimulatedClock {
@@ -58,7 +58,7 @@ class SimulatedClock {
 }
 
 const EMPTY_OBJECT = {};
-const toSerializableActon = action => {
+const toSerializableAction = action => {
   if (typeof action === 'string') {
     return {
       type: action
@@ -212,13 +212,13 @@ class StateNode {
       initial: this.initial ? {
         target: this.initial.target,
         source: this,
-        actions: this.initial.actions.map(toSerializableActon),
+        actions: this.initial.actions.map(toSerializableAction),
         eventType: null,
         reenter: false,
         toJSON: () => ({
           target: this.initial.target.map(t => `#${t.id}`),
           source: `#${this.id}`,
-          actions: this.initial.actions.map(toSerializableActon),
+          actions: this.initial.actions.map(toSerializableAction),
           eventType: null
         })
       } : undefined,
@@ -229,10 +229,10 @@ class StateNode {
       on: this.on,
       transitions: [...this.transitions.values()].flat().map(t => ({
         ...t,
-        actions: t.actions.map(toSerializableActon)
+        actions: t.actions.map(toSerializableAction)
       })),
-      entry: this.entry.map(toSerializableActon),
-      exit: this.exit.map(toSerializableActon),
+      entry: this.entry.map(toSerializableAction),
+      exit: this.exit.map(toSerializableAction),
       meta: this.meta,
       order: this.order || -1,
       output: this.output,
@@ -467,7 +467,7 @@ class StateMachine {
       ...state,
       value: guards_dist_xstateGuards.resolveStateValue(this.root, state.value),
       configuration,
-      done: guards_dist_xstateGuards.isInFinalState(configuration)
+      status: guards_dist_xstateGuards.isInFinalState(configuration) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -486,6 +486,7 @@ class StateMachine {
     // TODO: handle error events in a better way
     if (interpreter.isErrorActorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
       return guards_dist_xstateGuards.cloneState(state, {
+        status: 'error',
         error: event.data
       });
     }
@@ -523,7 +524,8 @@ class StateMachine {
       context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
       configuration: guards_dist_xstateGuards.getInitialConfiguration(this.root),
-      children: {}
+      children: {},
+      status: 'active'
     }));
     if (typeof context === 'function') {
       const assignment = ({
@@ -587,21 +589,10 @@ class StateMachine {
   createState(stateConfig) {
     return stateConfig instanceof guards_dist_xstateGuards.State ? stateConfig : new guards_dist_xstateGuards.State(stateConfig, this);
   }
-  getStatus(state) {
-    return state.error ? {
-      status: 'error',
-      data: state.error
-    } : state.done ? {
-      status: 'done',
-      data: state.output
-    } : {
-      status: 'active'
-    };
-  }
-  restoreState(state, _actorCtx) {
+  restoreState(snapshot, _actorCtx) {
     const children = {};
-    Object.keys(state.children).forEach(actorId => {
-      const actorData = state.children[actorId];
+    Object.keys(snapshot.children).forEach(actorId => {
+      const actorData = snapshot.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
       const logic = src ? interpreter.resolveReferencedActor(this.implementations.actors[src])?.src : undefined;
@@ -615,13 +606,13 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    const restoredState = this.createState(new guards_dist_xstateGuards.State({
-      ...state,
+    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
+      ...snapshot,
       children
     }, this));
 
     // TODO: DRY this up
-    restoredState.configuration.forEach(stateNode => {
+    restoredSnapshot.configuration.forEach(stateNode => {
       if (stateNode.invoke) {
         stateNode.invoke.forEach(invokeConfig => {
           const {
@@ -643,7 +634,7 @@ class StateMachine {
         });
       }
     });
-    return restoredState;
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */
@@ -743,8 +734,6 @@ exports.fromEventObservable = actors_dist_xstateActors.fromEventObservable;
 exports.fromObservable = actors_dist_xstateActors.fromObservable;
 exports.fromPromise = actors_dist_xstateActors.fromPromise;
 exports.fromTransition = actors_dist_xstateActors.fromTransition;
-exports.isActorRef = actors_dist_xstateActors.isActorRef;
-exports.toActorRef = actors_dist_xstateActors.toActorRef;
 exports.Actor = interpreter.Actor;
 exports.ActorStatus = interpreter.ActorStatus;
 exports.InterpreterStatus = interpreter.InterpreterStatus;

package/dist/xstate.development.cjs.mjs

@@ -23,7 +23,6 @@ export {
   fromTransition,
   getStateNodes,
   interpret,
-  isActorRef,
   log,
   mapState,
   matchesState,
@@ -36,7 +35,6 @@ export {
   sendTo,
   stateIn,
   stop,
-  toActorRef,
   toObserver,
   waitFor
 } from "./xstate.development.cjs.js";

package/dist/xstate.development.esm.js

@@ -1,10 +1,10 @@
-export { createEmptyActor, fromCallback, fromEventObservable, fromObservable, fromPromise, fromTransition, isActorRef, toActorRef } from '../actors/dist/xstate-actors.development.esm.js';
-import { S as STATE_DELIMITER, m as mapValues, t as toArray, a as toTransitionConfigArray, N as NULL_EVENT, c as createInvokeId, i as isErrorActorEvent, b as createInitEvent, r as resolveReferencedActor, d as createActor, e as matchesState } from './interpreter-a77bb0ec.development.esm.js';
-export { A as Actor, f as ActorStatus, I as InterpreterStatus, d as createActor, g as interpret, e as matchesState, p as pathToStateValue, h as toObserver } from './interpreter-a77bb0ec.development.esm.js';
-import { f as formatTransitions, a as formatTransition, m as memo, e as evaluateGuard, g as getDelayedTransitions, b as formatInitialTransition, c as getCandidates, d as getConfiguration, h as getStateNodes, r as resolveStateValue, i as isInFinalState, S as State, j as cloneState, k as macrostep, t as transitionNode, l as getInitialConfiguration, n as resolveActionsAndContext, o as microstep, p as isAtomicStateNode, q as isStateId, s as getStateNodeByPath, u as getPersistedState } from './raise-a60c9290.development.esm.js';
-export { S as State, v as and, z as cancel, h as getStateNodes, w as not, x as or, A as raise, y as stateIn, B as stop } from './raise-a60c9290.development.esm.js';
-import { a as assign } from './send-e63b7b83.development.esm.js';
-export { S as SpecialTargets, a as assign, c as choose, e as escalate, f as forwardTo, l as log, p as pure, s as sendParent, b as sendTo } from './send-e63b7b83.development.esm.js';
+export { createEmptyActor, fromCallback, fromEventObservable, fromObservable, fromPromise, fromTransition } from '../actors/dist/xstate-actors.development.esm.js';
+import { S as STATE_DELIMITER, m as mapValues, t as toArray, a as toTransitionConfigArray, N as NULL_EVENT, c as createInvokeId, i as isErrorActorEvent, b as createInitEvent, r as resolveReferencedActor, d as createActor, e as matchesState } from './interpreter-945c4b96.development.esm.js';
+export { A as Actor, f as ActorStatus, I as InterpreterStatus, d as createActor, g as interpret, e as matchesState, p as pathToStateValue, h as toObserver } from './interpreter-945c4b96.development.esm.js';
+import { f as formatTransitions, a as formatTransition, m as memo, e as evaluateGuard, g as getDelayedTransitions, b as formatInitialTransition, c as getCandidates, d as getConfiguration, h as getStateNodes, r as resolveStateValue, i as isInFinalState, S as State, j as cloneState, k as macrostep, t as transitionNode, l as getInitialConfiguration, n as resolveActionsAndContext, o as microstep, p as isAtomicStateNode, q as isStateId, s as getStateNodeByPath, u as getPersistedState } from './raise-6e4f5cf7.development.esm.js';
+export { S as State, v as and, z as cancel, h as getStateNodes, w as not, x as or, A as raise, y as stateIn, B as stop } from './raise-6e4f5cf7.development.esm.js';
+import { a as assign } from './send-a1d772da.development.esm.js';
+export { S as SpecialTargets, a as assign, c as choose, e as escalate, f as forwardTo, l as log, p as pure, s as sendParent, b as sendTo } from './send-a1d772da.development.esm.js';
 import '../dev/dist/xstate-dev.development.esm.js';
 
 class SimulatedClock {
@@ -57,7 +57,7 @@ class SimulatedClock {
 }
 
 const EMPTY_OBJECT = {};
-const toSerializableActon = action => {
+const toSerializableAction = action => {
   if (typeof action === 'string') {
     return {
       type: action
@@ -211,13 +211,13 @@ class StateNode {
       initial: this.initial ? {
         target: this.initial.target,
         source: this,
-        actions: this.initial.actions.map(toSerializableActon),
+        actions: this.initial.actions.map(toSerializableAction),
         eventType: null,
         reenter: false,
         toJSON: () => ({
           target: this.initial.target.map(t => `#${t.id}`),
           source: `#${this.id}`,
-          actions: this.initial.actions.map(toSerializableActon),
+          actions: this.initial.actions.map(toSerializableAction),
           eventType: null
         })
       } : undefined,
@@ -228,10 +228,10 @@ class StateNode {
       on: this.on,
       transitions: [...this.transitions.values()].flat().map(t => ({
         ...t,
-        actions: t.actions.map(toSerializableActon)
+        actions: t.actions.map(toSerializableAction)
       })),
-      entry: this.entry.map(toSerializableActon),
-      exit: this.exit.map(toSerializableActon),
+      entry: this.entry.map(toSerializableAction),
+      exit: this.exit.map(toSerializableAction),
       meta: this.meta,
       order: this.order || -1,
       output: this.output,
@@ -466,7 +466,7 @@ class StateMachine {
       ...state,
       value: resolveStateValue(this.root, state.value),
       configuration,
-      done: isInFinalState(configuration)
+      status: isInFinalState(configuration) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -485,6 +485,7 @@ class StateMachine {
     // TODO: handle error events in a better way
     if (isErrorActorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
       return cloneState(state, {
+        status: 'error',
         error: event.data
       });
     }
@@ -522,7 +523,8 @@ class StateMachine {
       context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
       configuration: getInitialConfiguration(this.root),
-      children: {}
+      children: {},
+      status: 'active'
     }));
     if (typeof context === 'function') {
       const assignment = ({
@@ -586,21 +588,10 @@ class StateMachine {
   createState(stateConfig) {
     return stateConfig instanceof State ? stateConfig : new State(stateConfig, this);
   }
-  getStatus(state) {
-    return state.error ? {
-      status: 'error',
-      data: state.error
-    } : state.done ? {
-      status: 'done',
-      data: state.output
-    } : {
-      status: 'active'
-    };
-  }
-  restoreState(state, _actorCtx) {
+  restoreState(snapshot, _actorCtx) {
     const children = {};
-    Object.keys(state.children).forEach(actorId => {
-      const actorData = state.children[actorId];
+    Object.keys(snapshot.children).forEach(actorId => {
+      const actorData = snapshot.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
       const logic = src ? resolveReferencedActor(this.implementations.actors[src])?.src : undefined;
@@ -614,13 +605,13 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    const restoredState = this.createState(new State({
-      ...state,
+    const restoredSnapshot = this.createState(new State({
+      ...snapshot,
       children
     }, this));
 
     // TODO: DRY this up
-    restoredState.configuration.forEach(stateNode => {
+    restoredSnapshot.configuration.forEach(stateNode => {
       if (stateNode.invoke) {
         stateNode.invoke.forEach(invokeConfig => {
           const {
@@ -642,7 +633,7 @@ class StateMachine {
         });
       }
     });
-    return restoredState;
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */