xstate 5.0.0-beta.37 → 5.0.0-beta.39

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-97aff8d2.cjs.js');
-var guards_dist_xstateGuards = require('./raise-800296d7.cjs.js');
-var send = require('./send-4cc29786.cjs.js');
+var interpreter = require('./interpreter-5dfcd203.cjs.js');
+var guards_dist_xstateGuards = require('./raise-291d2181.cjs.js');
+var send = require('./send-af152aca.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 class SimulatedClock {
@@ -478,7 +478,7 @@ class StateMachine {
    * @param state The current State instance or state value
    * @param event The received event
    */
-  transition(state, event, actorCtx) {
+  transition(state, event, actorScope) {
     // 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, {
@@ -488,7 +488,7 @@ class StateMachine {
     }
     const {
       state: nextState
-    } = guards_dist_xstateGuards.macrostep(state, event, actorCtx);
+    } = guards_dist_xstateGuards.macrostep(state, event, actorScope);
     return nextState;
   }
 
@@ -499,8 +499,8 @@ class StateMachine {
    * @param state The current state
    * @param event The received event
    */
-  microstep(state, event, actorCtx) {
-    return guards_dist_xstateGuards.macrostep(state, event, actorCtx).microstates;
+  microstep(state, event, actorScope) {
+    return guards_dist_xstateGuards.macrostep(state, event, actorScope).microstates;
   }
   getTransitionData(state, event) {
     return guards_dist_xstateGuards.transitionNode(this.root, state.value, state, event) || [];
@@ -510,7 +510,7 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, initEvent, internalQueue) {
+  getPreInitialState(actorScope, initEvent, internalQueue) {
     const {
       context
     } = this.config;
@@ -531,7 +531,7 @@ class StateMachine {
         spawn,
         input: event.input
       });
-      return guards_dist_xstateGuards.resolveActionsAndContext(preInitial, initEvent, actorCtx, [send.assign(assignment)], internalQueue);
+      return guards_dist_xstateGuards.resolveActionsAndContext(preInitial, initEvent, actorScope, [send.assign(assignment)], internalQueue);
     }
     return preInitial;
   }
@@ -539,10 +539,10 @@ class StateMachine {
   /**
    * Returns the initial `State` instance, with reference to `self` as an `ActorRef`.
    */
-  getInitialState(actorCtx, input) {
+  getInitialState(actorScope, input) {
     const initEvent = interpreter.createInitEvent(input); // TODO: fix;
     const internalQueue = [];
-    const preInitialState = this.getPreInitialState(actorCtx, initEvent, internalQueue);
+    const preInitialState = this.getPreInitialState(actorScope, initEvent, internalQueue);
     const nextState = guards_dist_xstateGuards.microstep([{
       target: [...guards_dist_xstateGuards.getInitialStateNodes(this.root)],
       source: this.root,
@@ -550,15 +550,15 @@ class StateMachine {
       actions: [],
       eventType: null,
       toJSON: null // TODO: fix
-    }], preInitialState, actorCtx, initEvent, true, internalQueue);
+    }], preInitialState, actorScope, initEvent, true, internalQueue);
     const {
       state: macroState
-    } = guards_dist_xstateGuards.macrostep(nextState, initEvent, actorCtx, internalQueue);
+    } = guards_dist_xstateGuards.macrostep(nextState, initEvent, actorScope, internalQueue);
     return macroState;
   }
   start(state) {
     Object.values(state.children).forEach(child => {
-      if (child.status === 0) {
+      if (child.getSnapshot().status === 'active') {
         child.start();
       }
     });
@@ -585,21 +585,23 @@ class StateMachine {
   createState(stateConfig) {
     return stateConfig instanceof guards_dist_xstateGuards.State ? stateConfig : new guards_dist_xstateGuards.State(stateConfig, this);
   }
-  restoreState(snapshot, _actorCtx) {
+  restoreState(snapshot, _actorScope) {
     const children = {};
-    Object.keys(snapshot.children).forEach(actorId => {
-      const actorData = snapshot.children[actorId];
+    const snapshotChildren = snapshot.children;
+    Object.keys(snapshotChildren).forEach(actorId => {
+      const actorData = snapshotChildren[actorId];
       const childState = actorData.state;
       const src = actorData.src;
       const logic = src ? interpreter.resolveReferencedActor(this, src)?.src : undefined;
       if (!logic) {
         return;
       }
-      const actorState = logic.restoreState?.(childState, _actorCtx);
+      const actorState = logic.restoreState?.(childState, _actorScope);
       const actorRef = interpreter.createActor(logic, {
         id: actorId,
-        parent: _actorCtx?.self,
-        state: actorState
+        parent: _actorScope?.self,
+        state: actorState,
+        systemId: actorData.systemId
       });
       children[actorId] = actorRef;
     });
@@ -737,6 +739,7 @@ exports.getStateNodes = guards_dist_xstateGuards.getStateNodes;
 exports.not = guards_dist_xstateGuards.not;
 exports.or = guards_dist_xstateGuards.or;
 exports.raise = guards_dist_xstateGuards.raise;
+exports.spawn = guards_dist_xstateGuards.spawn;
 exports.stateIn = guards_dist_xstateGuards.stateIn;
 exports.stop = guards_dist_xstateGuards.stop;
 exports.SpecialTargets = send.SpecialTargets;

package/dist/xstate.cjs.mjs

@@ -33,6 +33,7 @@ export {
   raise,
   sendParent,
   sendTo,
+  spawn,
   stateIn,
   stop,
   toObserver,

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-e58ca48d.development.cjs.js');
-var guards_dist_xstateGuards = require('./raise-1fd59c65.development.cjs.js');
-var send = require('./send-b309ef4e.development.cjs.js');
+var interpreter = require('./interpreter-03a5c3f5.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-17cb3d9d.development.cjs.js');
+var send = require('./send-33433787.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 class SimulatedClock {
@@ -481,7 +481,7 @@ class StateMachine {
    * @param state The current State instance or state value
    * @param event The received event
    */
-  transition(state, event, actorCtx) {
+  transition(state, event, actorScope) {
     // 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, {
@@ -491,7 +491,7 @@ class StateMachine {
     }
     const {
       state: nextState
-    } = guards_dist_xstateGuards.macrostep(state, event, actorCtx);
+    } = guards_dist_xstateGuards.macrostep(state, event, actorScope);
     return nextState;
   }
 
@@ -502,8 +502,8 @@ class StateMachine {
    * @param state The current state
    * @param event The received event
    */
-  microstep(state, event, actorCtx) {
-    return guards_dist_xstateGuards.macrostep(state, event, actorCtx).microstates;
+  microstep(state, event, actorScope) {
+    return guards_dist_xstateGuards.macrostep(state, event, actorScope).microstates;
   }
   getTransitionData(state, event) {
     return guards_dist_xstateGuards.transitionNode(this.root, state.value, state, event) || [];
@@ -513,7 +513,7 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, initEvent, internalQueue) {
+  getPreInitialState(actorScope, initEvent, internalQueue) {
     const {
       context
     } = this.config;
@@ -534,7 +534,7 @@ class StateMachine {
         spawn,
         input: event.input
       });
-      return guards_dist_xstateGuards.resolveActionsAndContext(preInitial, initEvent, actorCtx, [send.assign(assignment)], internalQueue);
+      return guards_dist_xstateGuards.resolveActionsAndContext(preInitial, initEvent, actorScope, [send.assign(assignment)], internalQueue);
     }
     return preInitial;
   }
@@ -542,10 +542,10 @@ class StateMachine {
   /**
    * Returns the initial `State` instance, with reference to `self` as an `ActorRef`.
    */
-  getInitialState(actorCtx, input) {
+  getInitialState(actorScope, input) {
     const initEvent = interpreter.createInitEvent(input); // TODO: fix;
     const internalQueue = [];
-    const preInitialState = this.getPreInitialState(actorCtx, initEvent, internalQueue);
+    const preInitialState = this.getPreInitialState(actorScope, initEvent, internalQueue);
     const nextState = guards_dist_xstateGuards.microstep([{
       target: [...guards_dist_xstateGuards.getInitialStateNodes(this.root)],
       source: this.root,
@@ -553,15 +553,15 @@ class StateMachine {
       actions: [],
       eventType: null,
       toJSON: null // TODO: fix
-    }], preInitialState, actorCtx, initEvent, true, internalQueue);
+    }], preInitialState, actorScope, initEvent, true, internalQueue);
     const {
       state: macroState
-    } = guards_dist_xstateGuards.macrostep(nextState, initEvent, actorCtx, internalQueue);
+    } = guards_dist_xstateGuards.macrostep(nextState, initEvent, actorScope, internalQueue);
     return macroState;
   }
   start(state) {
     Object.values(state.children).forEach(child => {
-      if (child.status === 0) {
+      if (child.getSnapshot().status === 'active') {
         child.start();
       }
     });
@@ -588,21 +588,23 @@ class StateMachine {
   createState(stateConfig) {
     return stateConfig instanceof guards_dist_xstateGuards.State ? stateConfig : new guards_dist_xstateGuards.State(stateConfig, this);
   }
-  restoreState(snapshot, _actorCtx) {
+  restoreState(snapshot, _actorScope) {
     const children = {};
-    Object.keys(snapshot.children).forEach(actorId => {
-      const actorData = snapshot.children[actorId];
+    const snapshotChildren = snapshot.children;
+    Object.keys(snapshotChildren).forEach(actorId => {
+      const actorData = snapshotChildren[actorId];
       const childState = actorData.state;
       const src = actorData.src;
       const logic = src ? interpreter.resolveReferencedActor(this, src)?.src : undefined;
       if (!logic) {
         return;
       }
-      const actorState = logic.restoreState?.(childState, _actorCtx);
+      const actorState = logic.restoreState?.(childState, _actorScope);
       const actorRef = interpreter.createActor(logic, {
         id: actorId,
-        parent: _actorCtx?.self,
-        state: actorState
+        parent: _actorScope?.self,
+        state: actorState,
+        systemId: actorData.systemId
       });
       children[actorId] = actorRef;
     });
@@ -743,6 +745,7 @@ exports.getStateNodes = guards_dist_xstateGuards.getStateNodes;
 exports.not = guards_dist_xstateGuards.not;
 exports.or = guards_dist_xstateGuards.or;
 exports.raise = guards_dist_xstateGuards.raise;
+exports.spawn = guards_dist_xstateGuards.spawn;
 exports.stateIn = guards_dist_xstateGuards.stateIn;
 exports.stop = guards_dist_xstateGuards.stop;
 exports.SpecialTargets = send.SpecialTargets;

package/dist/xstate.development.cjs.mjs

@@ -33,6 +33,7 @@ export {
   raise,
   sendParent,
   sendTo,
+  spawn,
   stateIn,
   stop,
   toObserver,

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, $ as $$ACTOR_TYPE, e as matchesState } from './interpreter-1c52b23c.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-1c52b23c.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-e342a840.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-e342a840.development.esm.js';
-import { a as assign } from './send-83ccc98b.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-83ccc98b.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-70cd9217.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-70cd9217.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-e044f460.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, C as spawn, y as stateIn, B as stop } from './raise-e044f460.development.esm.js';
+import { a as assign } from './send-f1a2a827.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-f1a2a827.development.esm.js';
 import '../dev/dist/xstate-dev.development.esm.js';
 
 class SimulatedClock {
@@ -480,7 +480,7 @@ class StateMachine {
    * @param state The current State instance or state value
    * @param event The received event
    */
-  transition(state, event, actorCtx) {
+  transition(state, event, actorScope) {
     // TODO: handle error events in a better way
     if (isErrorActorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
       return cloneState(state, {
@@ -490,7 +490,7 @@ class StateMachine {
     }
     const {
       state: nextState
-    } = macrostep(state, event, actorCtx);
+    } = macrostep(state, event, actorScope);
     return nextState;
   }
 
@@ -501,8 +501,8 @@ class StateMachine {
    * @param state The current state
    * @param event The received event
    */
-  microstep(state, event, actorCtx) {
-    return macrostep(state, event, actorCtx).microstates;
+  microstep(state, event, actorScope) {
+    return macrostep(state, event, actorScope).microstates;
   }
   getTransitionData(state, event) {
     return transitionNode(this.root, state.value, state, event) || [];
@@ -512,7 +512,7 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, initEvent, internalQueue) {
+  getPreInitialState(actorScope, initEvent, internalQueue) {
     const {
       context
     } = this.config;
@@ -533,7 +533,7 @@ class StateMachine {
         spawn,
         input: event.input
       });
-      return resolveActionsAndContext(preInitial, initEvent, actorCtx, [assign(assignment)], internalQueue);
+      return resolveActionsAndContext(preInitial, initEvent, actorScope, [assign(assignment)], internalQueue);
     }
     return preInitial;
   }
@@ -541,10 +541,10 @@ class StateMachine {
   /**
    * Returns the initial `State` instance, with reference to `self` as an `ActorRef`.
    */
-  getInitialState(actorCtx, input) {
+  getInitialState(actorScope, input) {
     const initEvent = createInitEvent(input); // TODO: fix;
     const internalQueue = [];
-    const preInitialState = this.getPreInitialState(actorCtx, initEvent, internalQueue);
+    const preInitialState = this.getPreInitialState(actorScope, initEvent, internalQueue);
     const nextState = microstep([{
       target: [...getInitialStateNodes(this.root)],
       source: this.root,
@@ -552,15 +552,15 @@ class StateMachine {
       actions: [],
       eventType: null,
       toJSON: null // TODO: fix
-    }], preInitialState, actorCtx, initEvent, true, internalQueue);
+    }], preInitialState, actorScope, initEvent, true, internalQueue);
     const {
       state: macroState
-    } = macrostep(nextState, initEvent, actorCtx, internalQueue);
+    } = macrostep(nextState, initEvent, actorScope, internalQueue);
     return macroState;
   }
   start(state) {
     Object.values(state.children).forEach(child => {
-      if (child.status === 0) {
+      if (child.getSnapshot().status === 'active') {
         child.start();
       }
     });
@@ -587,21 +587,23 @@ class StateMachine {
   createState(stateConfig) {
     return stateConfig instanceof State ? stateConfig : new State(stateConfig, this);
   }
-  restoreState(snapshot, _actorCtx) {
+  restoreState(snapshot, _actorScope) {
     const children = {};
-    Object.keys(snapshot.children).forEach(actorId => {
-      const actorData = snapshot.children[actorId];
+    const snapshotChildren = snapshot.children;
+    Object.keys(snapshotChildren).forEach(actorId => {
+      const actorData = snapshotChildren[actorId];
       const childState = actorData.state;
       const src = actorData.src;
       const logic = src ? resolveReferencedActor(this, src)?.src : undefined;
       if (!logic) {
         return;
       }
-      const actorState = logic.restoreState?.(childState, _actorCtx);
+      const actorState = logic.restoreState?.(childState, _actorScope);
       const actorRef = createActor(logic, {
         id: actorId,
-        parent: _actorCtx?.self,
-        state: actorState
+        parent: _actorScope?.self,
+        state: actorState,
+        systemId: actorData.systemId
       });
       children[actorId] = actorRef;
     });

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, $ as $$ACTOR_TYPE, e as matchesState } from './interpreter-8def682e.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-8def682e.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-21c417c1.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-21c417c1.esm.js';
-import { a as assign } from './send-92854675.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-92854675.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-1e8c1c0c.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-1e8c1c0c.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-62de3670.esm.js';
+export { S as State, v as and, z as cancel, h as getStateNodes, w as not, x as or, A as raise, C as spawn, y as stateIn, B as stop } from './raise-62de3670.esm.js';
+import { a as assign } from './send-1249d4ac.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-1249d4ac.esm.js';
 import '../dev/dist/xstate-dev.esm.js';
 
 class SimulatedClock {
@@ -477,7 +477,7 @@ class StateMachine {
    * @param state The current State instance or state value
    * @param event The received event
    */
-  transition(state, event, actorCtx) {
+  transition(state, event, actorScope) {
     // TODO: handle error events in a better way
     if (isErrorActorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
       return cloneState(state, {
@@ -487,7 +487,7 @@ class StateMachine {
     }
     const {
       state: nextState
-    } = macrostep(state, event, actorCtx);
+    } = macrostep(state, event, actorScope);
     return nextState;
   }
 
@@ -498,8 +498,8 @@ class StateMachine {
    * @param state The current state
    * @param event The received event
    */
-  microstep(state, event, actorCtx) {
-    return macrostep(state, event, actorCtx).microstates;
+  microstep(state, event, actorScope) {
+    return macrostep(state, event, actorScope).microstates;
   }
   getTransitionData(state, event) {
     return transitionNode(this.root, state.value, state, event) || [];
@@ -509,7 +509,7 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, initEvent, internalQueue) {
+  getPreInitialState(actorScope, initEvent, internalQueue) {
     const {
       context
     } = this.config;
@@ -530,7 +530,7 @@ class StateMachine {
         spawn,
         input: event.input
       });
-      return resolveActionsAndContext(preInitial, initEvent, actorCtx, [assign(assignment)], internalQueue);
+      return resolveActionsAndContext(preInitial, initEvent, actorScope, [assign(assignment)], internalQueue);
     }
     return preInitial;
   }
@@ -538,10 +538,10 @@ class StateMachine {
   /**
    * Returns the initial `State` instance, with reference to `self` as an `ActorRef`.
    */
-  getInitialState(actorCtx, input) {
+  getInitialState(actorScope, input) {
     const initEvent = createInitEvent(input); // TODO: fix;
     const internalQueue = [];
-    const preInitialState = this.getPreInitialState(actorCtx, initEvent, internalQueue);
+    const preInitialState = this.getPreInitialState(actorScope, initEvent, internalQueue);
     const nextState = microstep([{
       target: [...getInitialStateNodes(this.root)],
       source: this.root,
@@ -549,15 +549,15 @@ class StateMachine {
       actions: [],
       eventType: null,
       toJSON: null // TODO: fix
-    }], preInitialState, actorCtx, initEvent, true, internalQueue);
+    }], preInitialState, actorScope, initEvent, true, internalQueue);
     const {
       state: macroState
-    } = macrostep(nextState, initEvent, actorCtx, internalQueue);
+    } = macrostep(nextState, initEvent, actorScope, internalQueue);
     return macroState;
   }
   start(state) {
     Object.values(state.children).forEach(child => {
-      if (child.status === 0) {
+      if (child.getSnapshot().status === 'active') {
         child.start();
       }
     });
@@ -584,21 +584,23 @@ class StateMachine {
   createState(stateConfig) {
     return stateConfig instanceof State ? stateConfig : new State(stateConfig, this);
   }
-  restoreState(snapshot, _actorCtx) {
+  restoreState(snapshot, _actorScope) {
     const children = {};
-    Object.keys(snapshot.children).forEach(actorId => {
-      const actorData = snapshot.children[actorId];
+    const snapshotChildren = snapshot.children;
+    Object.keys(snapshotChildren).forEach(actorId => {
+      const actorData = snapshotChildren[actorId];
       const childState = actorData.state;
       const src = actorData.src;
       const logic = src ? resolveReferencedActor(this, src)?.src : undefined;
       if (!logic) {
         return;
       }
-      const actorState = logic.restoreState?.(childState, _actorCtx);
+      const actorState = logic.restoreState?.(childState, _actorScope);
       const actorRef = createActor(logic, {
         id: actorId,
-        parent: _actorCtx?.self,
-        state: actorState
+        parent: _actorScope?.self,
+        state: actorState,
+        systemId: actorData.systemId
       });
       children[actorId] = actorRef;
     });