xstate 5.0.0-beta.33 → 5.0.0-beta.35

package/dist/{send-0edee2b4.esm.js → send-211a2a94.esm.js}

@@ -1,5 +1,5 @@
-import { j as cloneState, e as evaluateGuard } from './raise-2d92eae8.esm.js';
-import { f as ActorStatus, k as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, y as XSTATE_ERROR } from './interpreter-03737810.esm.js';
+import { j as cloneState, e as evaluateGuard } from './raise-511399cc.esm.js';
+import { f as ActorStatus, j as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, x as XSTATE_ERROR } from './interpreter-de5217bc.esm.js';
 
 function createSpawner(actorContext, {
   machine,
@@ -25,6 +25,7 @@ function createSpawner(actorContext, {
           event,
           self: actorContext.self
         }) : input,
+        src,
         systemId
       });
       spawnedChildren[actorRef.id] = actorRef;
@@ -50,6 +51,7 @@ function createSpawner(actorContext, {
         id: options.id,
         parent: actorContext.self,
         input: options.input,
+        src: undefined,
         systemId
       });
       if (options.syncSnapshot) {
@@ -256,7 +258,7 @@ function resolveSendTo(actorContext, state, args, {
   event: eventOrExpr,
   id,
   delay
-}) {
+}, extra) {
   const delaysMap = state.machine.implementations.delays;
   if (typeof eventOrExpr === 'string') {
     throw new Error(`Only event objects may be used with sendTo; use sendTo({ type: "${eventOrExpr}" }) instead`);
@@ -281,7 +283,7 @@ function resolveSendTo(actorContext, state, args, {
       // #_invokeid. If the target is the special term '#_invokeid', where invokeid is the invokeid of an SCXML session that the sending session has created by <invoke>, the Processor must add the event to the external queue of that session.
       targetActorRef = state.children[resolvedTarget.slice(2)];
     } else {
-      targetActorRef = state.children[resolvedTarget];
+      targetActorRef = extra?.deferredActorIds.includes(resolvedTarget) ? resolvedTarget : state.children[resolvedTarget];
     }
     if (!targetActorRef) {
       throw new Error(`Unable to send event to actor '${resolvedTarget}' from machine '${state.machine.id}'.`);
@@ -296,16 +298,21 @@ function resolveSendTo(actorContext, state, args, {
     delay: resolvedDelay
   }];
 }
+function retryResolveSendTo(_, state, params) {
+  if (typeof params.to === 'string') {
+    params.to = state.children[params.to];
+  }
+}
 function executeSendTo(actorContext, params) {
   if (typeof params.delay === 'number') {
     actorContext.self.delaySend(params);
     return;
   }
-  const {
-    to,
-    event
-  } = params;
   actorContext.defer(() => {
+    const {
+      to,
+      event
+    } = params;
     actorContext?.system._relay(actorContext.self, to, event.type === XSTATE_ERROR ? createErrorActorEvent(actorContext.self.id, event.data) : event);
   });
 }
@@ -327,6 +334,7 @@ function sendTo(to, eventOrExpr, options) {
   sendTo.id = options?.id;
   sendTo.delay = options?.delay;
   sendTo.resolve = resolveSendTo;
+  sendTo.retryResolve = retryResolveSendTo;
   sendTo.execute = executeSendTo;
   return sendTo;
 }

package/dist/{send-0e8675c8.development.cjs.js → send-894c4b18.development.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var guards_dist_xstateGuards = require('./raise-4c6a5a96.development.cjs.js');
-var interpreter = require('./interpreter-0c630f66.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-26e4d83c.development.cjs.js');
+var interpreter = require('./interpreter-d3567419.development.cjs.js');
 
 function createSpawner(actorContext, {
   machine,
@@ -27,6 +27,7 @@ function createSpawner(actorContext, {
           event,
           self: actorContext.self
         }) : input,
+        src,
         systemId
       });
       spawnedChildren[actorRef.id] = actorRef;
@@ -52,6 +53,7 @@ function createSpawner(actorContext, {
         id: options.id,
         parent: actorContext.self,
         input: options.input,
+        src: undefined,
         systemId
       });
       if (options.syncSnapshot) {
@@ -270,7 +272,7 @@ function resolveSendTo(actorContext, state, args, {
   event: eventOrExpr,
   id,
   delay
-}) {
+}, extra) {
   const delaysMap = state.machine.implementations.delays;
   if (typeof eventOrExpr === 'string') {
     throw new Error(`Only event objects may be used with sendTo; use sendTo({ type: "${eventOrExpr}" }) instead`);
@@ -295,7 +297,7 @@ function resolveSendTo(actorContext, state, args, {
       // #_invokeid. If the target is the special term '#_invokeid', where invokeid is the invokeid of an SCXML session that the sending session has created by <invoke>, the Processor must add the event to the external queue of that session.
       targetActorRef = state.children[resolvedTarget.slice(2)];
     } else {
-      targetActorRef = state.children[resolvedTarget];
+      targetActorRef = extra?.deferredActorIds.includes(resolvedTarget) ? resolvedTarget : state.children[resolvedTarget];
     }
     if (!targetActorRef) {
       throw new Error(`Unable to send event to actor '${resolvedTarget}' from machine '${state.machine.id}'.`);
@@ -310,16 +312,21 @@ function resolveSendTo(actorContext, state, args, {
     delay: resolvedDelay
   }];
 }
+function retryResolveSendTo(_, state, params) {
+  if (typeof params.to === 'string') {
+    params.to = state.children[params.to];
+  }
+}
 function executeSendTo(actorContext, params) {
   if (typeof params.delay === 'number') {
     actorContext.self.delaySend(params);
     return;
   }
-  const {
-    to,
-    event
-  } = params;
   actorContext.defer(() => {
+    const {
+      to,
+      event
+    } = params;
     actorContext?.system._relay(actorContext.self, to, event.type === interpreter.XSTATE_ERROR ? interpreter.createErrorActorEvent(actorContext.self.id, event.data) : event);
   });
 }
@@ -344,6 +351,7 @@ function sendTo(to, eventOrExpr, options) {
   sendTo.id = options?.id;
   sendTo.delay = options?.delay;
   sendTo.resolve = resolveSendTo;
+  sendTo.retryResolve = retryResolveSendTo;
   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-054e9fb7.cjs.js');
-var guards_dist_xstateGuards = require('./raise-987c242e.cjs.js');
-var send = require('./send-bd1bd0e3.cjs.js');
+var interpreter = require('./interpreter-69605bf0.cjs.js');
+var guards_dist_xstateGuards = require('./raise-0ff57677.cjs.js');
+var send = require('./send-19ffc568.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 class SimulatedClock {
@@ -303,7 +303,7 @@ class StateNode {
     return guards_dist_xstateGuards.memo(this, 'delayedTransitions', () => guards_dist_xstateGuards.getDelayedTransitions(this));
   }
   get initial() {
-    return guards_dist_xstateGuards.memo(this, 'initial', () => guards_dist_xstateGuards.formatInitialTransition(this, this.config.initial || []));
+    return guards_dist_xstateGuards.memo(this, 'initial', () => guards_dist_xstateGuards.formatInitialTransition(this, this.config.initial));
   }
   next(state, event) {
     const eventType = event.type;
@@ -471,7 +471,7 @@ class StateMachine {
       ...state,
       value: guards_dist_xstateGuards.resolveStateValue(this.root, state.value),
       configuration,
-      status: guards_dist_xstateGuards.isInFinalState(configuration) ? 'done' : state.status
+      status: guards_dist_xstateGuards.isInFinalState(configurationSet, this.root) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -539,7 +539,7 @@ class StateMachine {
         spawn,
         input: event.input
       });
-      return guards_dist_xstateGuards.resolveActionsAndContext([send.assign(assignment)], initEvent, preInitial, actorCtx);
+      return guards_dist_xstateGuards.resolveActionsAndContext(preInitial, initEvent, actorCtx, [send.assign(assignment)]);
     }
     return preInitial;
   }
@@ -552,7 +552,7 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = guards_dist_xstateGuards.microstep([{
-      target: [...preInitialState.configuration].filter(guards_dist_xstateGuards.isAtomicStateNode),
+      target: [...guards_dist_xstateGuards.getInitialStateNodes(this.root)],
       source: this.root,
       reenter: true,
       actions: [],
@@ -567,7 +567,7 @@ class StateMachine {
   start(state) {
     Object.values(state.children).forEach(child => {
       if (child.status === 0) {
-        child.start?.();
+        child.start();
       }
     });
   }
@@ -611,10 +611,29 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    return this.createState(new guards_dist_xstateGuards.State({
+    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
       ...snapshot,
       children
     }, this));
+    let seen = new Set();
+    function reviveContext(contextPart, children) {
+      if (seen.has(contextPart)) {
+        return;
+      }
+      seen.add(contextPart);
+      for (let key in contextPart) {
+        const value = contextPart[key];
+        if (value && typeof value === 'object') {
+          if ('xstate$$type' in value && value.xstate$$type === interpreter.$$ACTOR_TYPE) {
+            contextPart[key] = children[value.id];
+            continue;
+          }
+          reviveContext(value, children);
+        }
+      }
+    }
+    reviveContext(restoredSnapshot.context, children);
+    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-0c630f66.development.cjs.js');
-var guards_dist_xstateGuards = require('./raise-4c6a5a96.development.cjs.js');
-var send = require('./send-0e8675c8.development.cjs.js');
+var interpreter = require('./interpreter-d3567419.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-26e4d83c.development.cjs.js');
+var send = require('./send-894c4b18.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 class SimulatedClock {
@@ -303,7 +303,7 @@ class StateNode {
     return guards_dist_xstateGuards.memo(this, 'delayedTransitions', () => guards_dist_xstateGuards.getDelayedTransitions(this));
   }
   get initial() {
-    return guards_dist_xstateGuards.memo(this, 'initial', () => guards_dist_xstateGuards.formatInitialTransition(this, this.config.initial || []));
+    return guards_dist_xstateGuards.memo(this, 'initial', () => guards_dist_xstateGuards.formatInitialTransition(this, this.config.initial));
   }
   next(state, event) {
     const eventType = event.type;
@@ -474,7 +474,7 @@ class StateMachine {
       ...state,
       value: guards_dist_xstateGuards.resolveStateValue(this.root, state.value),
       configuration,
-      status: guards_dist_xstateGuards.isInFinalState(configuration) ? 'done' : state.status
+      status: guards_dist_xstateGuards.isInFinalState(configurationSet, this.root) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -542,7 +542,7 @@ class StateMachine {
         spawn,
         input: event.input
       });
-      return guards_dist_xstateGuards.resolveActionsAndContext([send.assign(assignment)], initEvent, preInitial, actorCtx);
+      return guards_dist_xstateGuards.resolveActionsAndContext(preInitial, initEvent, actorCtx, [send.assign(assignment)]);
     }
     return preInitial;
   }
@@ -555,7 +555,7 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = guards_dist_xstateGuards.microstep([{
-      target: [...preInitialState.configuration].filter(guards_dist_xstateGuards.isAtomicStateNode),
+      target: [...guards_dist_xstateGuards.getInitialStateNodes(this.root)],
       source: this.root,
       reenter: true,
       actions: [],
@@ -570,7 +570,7 @@ class StateMachine {
   start(state) {
     Object.values(state.children).forEach(child => {
       if (child.status === 0) {
-        child.start?.();
+        child.start();
       }
     });
   }
@@ -614,10 +614,29 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    return this.createState(new guards_dist_xstateGuards.State({
+    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
       ...snapshot,
       children
     }, this));
+    let seen = new Set();
+    function reviveContext(contextPart, children) {
+      if (seen.has(contextPart)) {
+        return;
+      }
+      seen.add(contextPart);
+      for (let key in contextPart) {
+        const value = contextPart[key];
+        if (value && typeof value === 'object') {
+          if ('xstate$$type' in value && value.xstate$$type === interpreter.$$ACTOR_TYPE) {
+            contextPart[key] = children[value.id];
+            continue;
+          }
+          reviveContext(value, children);
+        }
+      }
+    }
+    reviveContext(restoredSnapshot.context, children);
+    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-825f3d6e.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-825f3d6e.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-46f122aa.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-46f122aa.development.esm.js';
-import { a as assign } from './send-4d5b92dc.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-4d5b92dc.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, $ as $$ACTOR_TYPE, e as matchesState } from './interpreter-5c4e6634.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-5c4e6634.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 getInitialStateNodes, q as isStateId, s as getStateNodeByPath, u as getPersistedState } from './raise-cdcdf834.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-cdcdf834.development.esm.js';
+import { a as assign } from './send-1de74f4d.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-1de74f4d.development.esm.js';
 import '../dev/dist/xstate-dev.development.esm.js';
 
 class SimulatedClock {
@@ -302,7 +302,7 @@ class StateNode {
     return memo(this, 'delayedTransitions', () => getDelayedTransitions(this));
   }
   get initial() {
-    return memo(this, 'initial', () => formatInitialTransition(this, this.config.initial || []));
+    return memo(this, 'initial', () => formatInitialTransition(this, this.config.initial));
   }
   next(state, event) {
     const eventType = event.type;
@@ -473,7 +473,7 @@ class StateMachine {
       ...state,
       value: resolveStateValue(this.root, state.value),
       configuration,
-      status: isInFinalState(configuration) ? 'done' : state.status
+      status: isInFinalState(configurationSet, this.root) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -541,7 +541,7 @@ class StateMachine {
         spawn,
         input: event.input
       });
-      return resolveActionsAndContext([assign(assignment)], initEvent, preInitial, actorCtx);
+      return resolveActionsAndContext(preInitial, initEvent, actorCtx, [assign(assignment)]);
     }
     return preInitial;
   }
@@ -554,7 +554,7 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = microstep([{
-      target: [...preInitialState.configuration].filter(isAtomicStateNode),
+      target: [...getInitialStateNodes(this.root)],
       source: this.root,
       reenter: true,
       actions: [],
@@ -569,7 +569,7 @@ class StateMachine {
   start(state) {
     Object.values(state.children).forEach(child => {
       if (child.status === 0) {
-        child.start?.();
+        child.start();
       }
     });
   }
@@ -613,10 +613,29 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    return this.createState(new State({
+    const restoredSnapshot = this.createState(new State({
       ...snapshot,
       children
     }, this));
+    let seen = new Set();
+    function reviveContext(contextPart, children) {
+      if (seen.has(contextPart)) {
+        return;
+      }
+      seen.add(contextPart);
+      for (let key in contextPart) {
+        const value = contextPart[key];
+        if (value && typeof value === 'object') {
+          if ('xstate$$type' in value && value.xstate$$type === $$ACTOR_TYPE) {
+            contextPart[key] = children[value.id];
+            continue;
+          }
+          reviveContext(value, children);
+        }
+      }
+    }
+    reviveContext(restoredSnapshot.context, children);
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */

package/dist/xstate.esm.js

@@ -1,10 +1,10 @@
 export { createEmptyActor, fromCallback, fromEventObservable, fromObservable, fromPromise, fromTransition } from '../actors/dist/xstate-actors.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-03737810.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-03737810.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-2d92eae8.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-2d92eae8.esm.js';
-import { a as assign } from './send-0edee2b4.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-0edee2b4.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, $ as $$ACTOR_TYPE, e as matchesState } from './interpreter-de5217bc.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-de5217bc.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 getInitialStateNodes, q as isStateId, s as getStateNodeByPath, u as getPersistedState } from './raise-511399cc.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-511399cc.esm.js';
+import { a as assign } from './send-211a2a94.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-211a2a94.esm.js';
 import '../dev/dist/xstate-dev.esm.js';
 
 class SimulatedClock {
@@ -302,7 +302,7 @@ class StateNode {
     return memo(this, 'delayedTransitions', () => getDelayedTransitions(this));
   }
   get initial() {
-    return memo(this, 'initial', () => formatInitialTransition(this, this.config.initial || []));
+    return memo(this, 'initial', () => formatInitialTransition(this, this.config.initial));
   }
   next(state, event) {
     const eventType = event.type;
@@ -470,7 +470,7 @@ class StateMachine {
       ...state,
       value: resolveStateValue(this.root, state.value),
       configuration,
-      status: isInFinalState(configuration) ? 'done' : state.status
+      status: isInFinalState(configurationSet, this.root) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -538,7 +538,7 @@ class StateMachine {
         spawn,
         input: event.input
       });
-      return resolveActionsAndContext([assign(assignment)], initEvent, preInitial, actorCtx);
+      return resolveActionsAndContext(preInitial, initEvent, actorCtx, [assign(assignment)]);
     }
     return preInitial;
   }
@@ -551,7 +551,7 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = microstep([{
-      target: [...preInitialState.configuration].filter(isAtomicStateNode),
+      target: [...getInitialStateNodes(this.root)],
       source: this.root,
       reenter: true,
       actions: [],
@@ -566,7 +566,7 @@ class StateMachine {
   start(state) {
     Object.values(state.children).forEach(child => {
       if (child.status === 0) {
-        child.start?.();
+        child.start();
       }
     });
   }
@@ -610,10 +610,29 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    return this.createState(new State({
+    const restoredSnapshot = this.createState(new State({
       ...snapshot,
       children
     }, this));
+    let seen = new Set();
+    function reviveContext(contextPart, children) {
+      if (seen.has(contextPart)) {
+        return;
+      }
+      seen.add(contextPart);
+      for (let key in contextPart) {
+        const value = contextPart[key];
+        if (value && typeof value === 'object') {
+          if ('xstate$$type' in value && value.xstate$$type === $$ACTOR_TYPE) {
+            contextPart[key] = children[value.id];
+            continue;
+          }
+          reviveContext(value, children);
+        }
+      }
+    }
+    reviveContext(restoredSnapshot.context, children);
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */