xstate 5.0.0-beta.29 → 5.0.0-beta.31

package/dist/{send-42c83fb2.development.esm.js → send-7baeedcb.development.esm.js}

@@ -1,5 +1,5 @@
-import { j as cloneState, e as evaluateGuard } from './raise-e778a828.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-6e7909c8.development.esm.js';
+import { j as cloneState, e as evaluateGuard } from './raise-6fbd4513.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-e4d2487f.development.esm.js';
 
 function createSpawner(actorContext, {
   machine,
@@ -17,7 +17,7 @@ function createSpawner(actorContext, {
       const input = 'input' in options ? options.input : referenced.input;
 
       // TODO: this should also receive `src`
-      const actor = createActor(referenced.src, {
+      const actorRef = createActor(referenced.src, {
         id: options.id,
         parent: actorContext.self,
         input: typeof input === 'function' ? input({
@@ -27,16 +27,48 @@ function createSpawner(actorContext, {
         }) : input,
         systemId
       });
-      spawnedChildren[actor.id] = actor;
-      return actor;
+      spawnedChildren[actorRef.id] = actorRef;
+      if (options.syncSnapshot) {
+        actorRef.subscribe({
+          next: snapshot => {
+            if (snapshot.status === 'active') {
+              actorContext.self.send({
+                type: `xstate.snapshot.${actorRef.id}`,
+                snapshot
+              });
+            }
+          },
+          error: () => {
+            /* TODO */
+          }
+        });
+      }
+      return actorRef;
     } else {
       // TODO: this should also receive `src`
-      return createActor(src, {
+      const actorRef = createActor(src, {
         id: options.id,
         parent: actorContext.self,
         input: options.input,
         systemId
       });
+      if (options.syncSnapshot) {
+        actorRef.subscribe({
+          next: snapshot => {
+            if (snapshot.status === 'active') {
+              actorContext.self.send({
+                type: `xstate.snapshot.${actorRef.id}`,
+                snapshot,
+                id: actorRef.id
+              });
+            }
+          },
+          error: () => {
+            /* TODO */
+          }
+        });
+      }
+      return actorRef;
     }
   };
   return (src, options) => {
@@ -57,7 +89,7 @@ function createSpawner(actorContext, {
   };
 }
 
-function resolve$4(actorContext, state, actionArgs, {
+function resolveAssign(actorContext, state, actionArgs, {
   assignment
 }) {
   if (!state.context) {
@@ -103,11 +135,11 @@ function assign(assignment) {
   }
   assign.type = 'xstate.assign';
   assign.assignment = assignment;
-  assign.resolve = resolve$4;
+  assign.resolve = resolveAssign;
   return assign;
 }
 
-function resolve$3(_, state, actionArgs, {
+function resolveChoose(_, state, actionArgs, {
   branches
 }) {
   const matchedActions = branches.find(condition => {
@@ -123,11 +155,11 @@ function choose(branches) {
   }
   choose.type = 'xstate.choose';
   choose.branches = branches;
-  choose.resolve = resolve$3;
+  choose.resolve = resolveChoose;
   return choose;
 }
 
-function resolve$2(_, state, actionArgs, {
+function resolveLog(_, state, actionArgs, {
   value,
   label
 }) {
@@ -136,7 +168,7 @@ function resolve$2(_, state, actionArgs, {
     label
   }];
 }
-function execute$1({
+function executeLog({
   logger
 }, {
   value,
@@ -171,12 +203,12 @@ function log(value = ({
   log.type = 'xstate.log';
   log.value = value;
   log.label = label;
-  log.resolve = resolve$2;
-  log.execute = execute$1;
+  log.resolve = resolveLog;
+  log.execute = executeLog;
   return log;
 }
 
-function resolve$1(_, state, args, {
+function resolvePure(_, state, args, {
   get
 }) {
   return [state, undefined, toArray(get({
@@ -192,7 +224,7 @@ function pure(getActions) {
   }
   pure.type = 'xstate.pure';
   pure.get = getActions;
-  pure.resolve = resolve$1;
+  pure.resolve = resolvePure;
   return pure;
 }
 
@@ -231,7 +263,7 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
   return SpecialTargets;
 }({});
 
-function resolve(actorContext, state, args, {
+function resolveSendTo(actorContext, state, args, {
   to,
   event: eventOrExpr,
   id,
@@ -276,7 +308,7 @@ function resolve(actorContext, state, args, {
     delay: resolvedDelay
   }];
 }
-function execute(actorContext, params) {
+function executeSendTo(actorContext, params) {
   if (typeof params.delay === 'number') {
     actorContext.self.delaySend(params);
     return;
@@ -309,8 +341,8 @@ function sendTo(to, eventOrExpr, options) {
   sendTo.event = eventOrExpr;
   sendTo.id = options?.id;
   sendTo.delay = options?.delay;
-  sendTo.resolve = resolve;
-  sendTo.execute = execute;
+  sendTo.resolve = resolveSendTo;
+  sendTo.execute = executeSendTo;
   return sendTo;
 }
 

package/dist/{send-fff224db.esm.js → send-e5f0f3f6.esm.js}

@@ -1,5 +1,5 @@
-import { j as cloneState, e as evaluateGuard } from './raise-59f2c242.esm.js';
-import { f as ActorStatus, k as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, y as XSTATE_ERROR } from './interpreter-498891b2.esm.js';
+import { j as cloneState, e as evaluateGuard } from './raise-6a68d0cc.esm.js';
+import { f as ActorStatus, k as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, y as XSTATE_ERROR } from './interpreter-d5fa7ce0.esm.js';
 
 function createSpawner(actorContext, {
   machine,
@@ -17,7 +17,7 @@ function createSpawner(actorContext, {
       const input = 'input' in options ? options.input : referenced.input;
 
       // TODO: this should also receive `src`
-      const actor = createActor(referenced.src, {
+      const actorRef = createActor(referenced.src, {
         id: options.id,
         parent: actorContext.self,
         input: typeof input === 'function' ? input({
@@ -27,16 +27,48 @@ function createSpawner(actorContext, {
         }) : input,
         systemId
       });
-      spawnedChildren[actor.id] = actor;
-      return actor;
+      spawnedChildren[actorRef.id] = actorRef;
+      if (options.syncSnapshot) {
+        actorRef.subscribe({
+          next: snapshot => {
+            if (snapshot.status === 'active') {
+              actorContext.self.send({
+                type: `xstate.snapshot.${actorRef.id}`,
+                snapshot
+              });
+            }
+          },
+          error: () => {
+            /* TODO */
+          }
+        });
+      }
+      return actorRef;
     } else {
       // TODO: this should also receive `src`
-      return createActor(src, {
+      const actorRef = createActor(src, {
         id: options.id,
         parent: actorContext.self,
         input: options.input,
         systemId
       });
+      if (options.syncSnapshot) {
+        actorRef.subscribe({
+          next: snapshot => {
+            if (snapshot.status === 'active') {
+              actorContext.self.send({
+                type: `xstate.snapshot.${actorRef.id}`,
+                snapshot,
+                id: actorRef.id
+              });
+            }
+          },
+          error: () => {
+            /* TODO */
+          }
+        });
+      }
+      return actorRef;
     }
   };
   return (src, options) => {
@@ -57,7 +89,7 @@ function createSpawner(actorContext, {
   };
 }
 
-function resolve$4(actorContext, state, actionArgs, {
+function resolveAssign(actorContext, state, actionArgs, {
   assignment
 }) {
   if (!state.context) {
@@ -100,11 +132,11 @@ function assign(assignment) {
   }
   assign.type = 'xstate.assign';
   assign.assignment = assignment;
-  assign.resolve = resolve$4;
+  assign.resolve = resolveAssign;
   return assign;
 }
 
-function resolve$3(_, state, actionArgs, {
+function resolveChoose(_, state, actionArgs, {
   branches
 }) {
   const matchedActions = branches.find(condition => {
@@ -117,11 +149,11 @@ function choose(branches) {
   }
   choose.type = 'xstate.choose';
   choose.branches = branches;
-  choose.resolve = resolve$3;
+  choose.resolve = resolveChoose;
   return choose;
 }
 
-function resolve$2(_, state, actionArgs, {
+function resolveLog(_, state, actionArgs, {
   value,
   label
 }) {
@@ -130,7 +162,7 @@ function resolve$2(_, state, actionArgs, {
     label
   }];
 }
-function execute$1({
+function executeLog({
   logger
 }, {
   value,
@@ -162,12 +194,12 @@ function log(value = ({
   log.type = 'xstate.log';
   log.value = value;
   log.label = label;
-  log.resolve = resolve$2;
-  log.execute = execute$1;
+  log.resolve = resolveLog;
+  log.execute = executeLog;
   return log;
 }
 
-function resolve$1(_, state, args, {
+function resolvePure(_, state, args, {
   get
 }) {
   return [state, undefined, toArray(get({
@@ -180,7 +212,7 @@ function pure(getActions) {
   }
   pure.type = 'xstate.pure';
   pure.get = getActions;
-  pure.resolve = resolve$1;
+  pure.resolve = resolvePure;
   return pure;
 }
 
@@ -219,7 +251,7 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
   return SpecialTargets;
 }({});
 
-function resolve(actorContext, state, args, {
+function resolveSendTo(actorContext, state, args, {
   to,
   event: eventOrExpr,
   id,
@@ -264,7 +296,7 @@ function resolve(actorContext, state, args, {
     delay: resolvedDelay
   }];
 }
-function execute(actorContext, params) {
+function executeSendTo(actorContext, params) {
   if (typeof params.delay === 'number') {
     actorContext.self.delaySend(params);
     return;
@@ -294,8 +326,8 @@ function sendTo(to, eventOrExpr, options) {
   sendTo.event = eventOrExpr;
   sendTo.id = options?.id;
   sendTo.delay = options?.delay;
-  sendTo.resolve = resolve;
-  sendTo.execute = execute;
+  sendTo.resolve = resolveSendTo;
+  sendTo.execute = executeSendTo;
   return sendTo;
 }
 

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-c357bc50.cjs.js');
-var guards_dist_xstateGuards = require('./raise-03e57569.cjs.js');
-var send = require('./send-51717e53.cjs.js');
+var interpreter = require('./interpreter-05e11c15.cjs.js');
+var guards_dist_xstateGuards = require('./raise-90808d65.cjs.js');
+var send = require('./send-72e85cc6.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 class SimulatedClock {
@@ -187,7 +187,7 @@ class StateNode {
     this.entry = interpreter.toArray(this.config.entry).slice();
     this.exit = interpreter.toArray(this.config.exit).slice();
     this.meta = this.config.meta;
-    this.output = this.type === 'final' ? this.config.output : undefined;
+    this.output = this.type === 'final' || !this.parent ? this.config.output : undefined;
     this.tags = interpreter.toArray(config.tags).slice();
   }
   _initialize() {
@@ -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 */

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-e2c6a579.development.cjs.js');
-var guards_dist_xstateGuards = require('./raise-f751dfac.development.cjs.js');
-var send = require('./send-f53778f6.development.cjs.js');
+var interpreter = require('./interpreter-a2236840.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-b4bfe138.development.cjs.js');
+var send = require('./send-4163d2af.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 class SimulatedClock {
@@ -187,7 +187,7 @@ class StateNode {
     this.entry = interpreter.toArray(this.config.entry).slice();
     this.exit = interpreter.toArray(this.config.exit).slice();
     this.meta = this.config.meta;
-    this.output = this.type === 'final' ? this.config.output : undefined;
+    this.output = this.type === 'final' || !this.parent ? this.config.output : undefined;
     this.tags = interpreter.toArray(config.tags).slice();
   }
   _initialize() {
@@ -415,6 +415,9 @@ class StateMachine {
     this.root._initialize();
     this.states = this.root.states; // TODO: remove!
     this.events = this.root.events;
+    if (!this.root.output && Object.values(this.states).some(state => state.type === 'final' && !!state.output)) {
+      console.warn('Missing `machine.output` declaration (top-level final state with output detected)');
+    }
   }
 
   /**
@@ -467,7 +470,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 +489,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 +527,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 +592,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 +609,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 +637,7 @@ class StateMachine {
         });
       }
     });
-    return restoredState;
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */

package/dist/xstate.development.esm.js

@@ -1,10 +1,10 @@
 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-6e7909c8.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-6e7909c8.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-e778a828.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-e778a828.development.esm.js';
-import { a as assign } from './send-42c83fb2.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-42c83fb2.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-e4d2487f.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-e4d2487f.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-6fbd4513.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-6fbd4513.development.esm.js';
+import { a as assign } from './send-7baeedcb.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-7baeedcb.development.esm.js';
 import '../dev/dist/xstate-dev.development.esm.js';
 
 class SimulatedClock {
@@ -186,7 +186,7 @@ class StateNode {
     this.entry = toArray(this.config.entry).slice();
     this.exit = toArray(this.config.exit).slice();
     this.meta = this.config.meta;
-    this.output = this.type === 'final' ? this.config.output : undefined;
+    this.output = this.type === 'final' || !this.parent ? this.config.output : undefined;
     this.tags = toArray(config.tags).slice();
   }
   _initialize() {
@@ -414,6 +414,9 @@ class StateMachine {
     this.root._initialize();
     this.states = this.root.states; // TODO: remove!
     this.events = this.root.events;
+    if (!this.root.output && Object.values(this.states).some(state => state.type === 'final' && !!state.output)) {
+      console.warn('Missing `machine.output` declaration (top-level final state with output detected)');
+    }
   }
 
   /**
@@ -466,7 +469,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 +488,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 +526,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 +591,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 +608,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 +636,7 @@ class StateMachine {
         });
       }
     });
-    return restoredState;
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */