xstate 5.0.0-beta.38 → 5.0.0-beta.40

package/dist/{send-4b616da9.esm.js → send-59f66c58.esm.js}

@@ -1,7 +1,7 @@
-import { j as cloneState, e as evaluateGuard } from './raise-c989c7fb.esm.js';
-import { f as ActorStatus, j as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, x as XSTATE_ERROR } from './interpreter-c80ce92e.esm.js';
+import { j as cloneState, e as evaluateGuard } from './raise-2b2fdec3.esm.js';
+import { f as ActorStatus, j as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, x as XSTATE_ERROR } from './interpreter-ed0fac7e.esm.js';
 
-function createSpawner(actorContext, {
+function createSpawner(actorScope, {
   machine,
   context
 }, event, spawnedChildren) {
@@ -19,11 +19,11 @@ function createSpawner(actorContext, {
       // TODO: this should also receive `src`
       const actorRef = createActor(referenced.src, {
         id: options.id,
-        parent: actorContext.self,
+        parent: actorScope.self,
         input: typeof input === 'function' ? input({
           context,
           event,
-          self: actorContext.self
+          self: actorScope.self
         }) : input,
         src,
         systemId
@@ -33,7 +33,7 @@ function createSpawner(actorContext, {
         actorRef.subscribe({
           next: snapshot => {
             if (snapshot.status === 'active') {
-              actorContext.self.send({
+              actorScope.self.send({
                 type: `xstate.snapshot.${actorRef.id}`,
                 snapshot
               });
@@ -47,7 +47,7 @@ function createSpawner(actorContext, {
       // TODO: this should also receive `src`
       const actorRef = createActor(src, {
         id: options.id,
-        parent: actorContext.self,
+        parent: actorScope.self,
         input: options.input,
         src: undefined,
         systemId
@@ -56,7 +56,7 @@ function createSpawner(actorContext, {
         actorRef.subscribe({
           next: snapshot => {
             if (snapshot.status === 'active') {
-              actorContext.self.send({
+              actorScope.self.send({
                 type: `xstate.snapshot.${actorRef.id}`,
                 snapshot,
                 id: actorRef.id
@@ -72,14 +72,14 @@ function createSpawner(actorContext, {
   return (src, options) => {
     const actorRef = spawn(src, options); // TODO: fix types
     spawnedChildren[actorRef.id] = actorRef;
-    actorContext.defer(() => {
+    actorScope.defer(() => {
       if (actorRef.status === ActorStatus.Stopped) {
         return;
       }
       try {
         actorRef.start?.();
       } catch (err) {
-        actorContext.self.send(createErrorActorEvent(actorRef.id, err));
+        actorScope.self.send(createErrorActorEvent(actorRef.id, err));
         return;
       }
     });
@@ -87,7 +87,7 @@ function createSpawner(actorContext, {
   };
 }
 
-function resolveAssign(actorContext, state, actionArgs, actionParams, {
+function resolveAssign(actorScope, state, actionArgs, actionParams, {
   assignment
 }) {
   if (!state.context) {
@@ -97,9 +97,9 @@ function resolveAssign(actorContext, state, actionArgs, actionParams, {
   const assignArgs = {
     context: state.context,
     event: actionArgs.event,
-    spawn: createSpawner(actorContext, state, actionArgs.event, spawnedChildren),
-    self: actorContext?.self,
-    system: actorContext?.system
+    spawn: createSpawner(actorScope, state, actionArgs.event, spawnedChildren),
+    self: actorScope?.self,
+    system: actorScope?.system
   };
   let partialUpdate = {};
   if (typeof assignment === 'function') {
@@ -254,7 +254,7 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
   return SpecialTargets;
 }({});
 
-function resolveSendTo(actorContext, state, args, actionParams, {
+function resolveSendTo(actorScope, state, args, actionParams, {
   to,
   event: eventOrExpr,
   id,
@@ -276,9 +276,9 @@ function resolveSendTo(actorContext, state, args, actionParams, {
   let targetActorRef;
   if (typeof resolvedTarget === 'string') {
     if (resolvedTarget === SpecialTargets.Parent) {
-      targetActorRef = actorContext?.self._parent;
+      targetActorRef = actorScope?.self._parent;
     } else if (resolvedTarget === SpecialTargets.Internal) {
-      targetActorRef = actorContext?.self;
+      targetActorRef = actorScope?.self;
     } else if (resolvedTarget.startsWith('#_')) {
       // SCXML compatibility: https://www.w3.org/TR/scxml/#SCXMLEventProcessor
       // #_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.
@@ -290,7 +290,7 @@ function resolveSendTo(actorContext, state, args, actionParams, {
       throw new Error(`Unable to send event to actor '${resolvedTarget}' from machine '${state.machine.id}'.`);
     }
   } else {
-    targetActorRef = resolvedTarget || actorContext?.self;
+    targetActorRef = resolvedTarget || actorScope?.self;
   }
   return [state, {
     to: targetActorRef,
@@ -304,20 +304,20 @@ function retryResolveSendTo(_, state, params) {
     params.to = state.children[params.to];
   }
 }
-function executeSendTo(actorContext, params) {
+function executeSendTo(actorScope, params) {
   if (typeof params.delay === 'number') {
-    actorContext.self.delaySend(params);
+    actorScope.self.delaySend(params);
     return;
   }
 
   // this forms an outgoing events queue
   // thanks to that the recipient actors are able to read the *updated* snapshot value of the sender
-  actorContext.defer(() => {
+  actorScope.defer(() => {
     const {
       to,
       event
     } = params;
-    actorContext?.system._relay(actorContext.self, to, event.type === XSTATE_ERROR ? createErrorActorEvent(actorContext.self.id, event.data) : event);
+    actorScope?.system._relay(actorScope.self, to, event.type === XSTATE_ERROR ? createErrorActorEvent(actorScope.self.id, event.data) : event);
   });
 }
 /**

package/dist/{send-58725522.development.cjs.js → send-c45d0d2c.development.cjs.js}

@@ -1,9 +1,9 @@
 'use strict';
 
-var guards_dist_xstateGuards = require('./raise-b69a3d16.development.cjs.js');
-var interpreter = require('./interpreter-ed3f81f7.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-8325e2df.development.cjs.js');
+var interpreter = require('./interpreter-bae5c279.development.cjs.js');
 
-function createSpawner(actorContext, {
+function createSpawner(actorScope, {
   machine,
   context
 }, event, spawnedChildren) {
@@ -21,11 +21,11 @@ function createSpawner(actorContext, {
       // TODO: this should also receive `src`
       const actorRef = interpreter.createActor(referenced.src, {
         id: options.id,
-        parent: actorContext.self,
+        parent: actorScope.self,
         input: typeof input === 'function' ? input({
           context,
           event,
-          self: actorContext.self
+          self: actorScope.self
         }) : input,
         src,
         systemId
@@ -35,7 +35,7 @@ function createSpawner(actorContext, {
         actorRef.subscribe({
           next: snapshot => {
             if (snapshot.status === 'active') {
-              actorContext.self.send({
+              actorScope.self.send({
                 type: `xstate.snapshot.${actorRef.id}`,
                 snapshot
               });
@@ -49,7 +49,7 @@ function createSpawner(actorContext, {
       // TODO: this should also receive `src`
       const actorRef = interpreter.createActor(src, {
         id: options.id,
-        parent: actorContext.self,
+        parent: actorScope.self,
         input: options.input,
         src: undefined,
         systemId
@@ -58,7 +58,7 @@ function createSpawner(actorContext, {
         actorRef.subscribe({
           next: snapshot => {
             if (snapshot.status === 'active') {
-              actorContext.self.send({
+              actorScope.self.send({
                 type: `xstate.snapshot.${actorRef.id}`,
                 snapshot,
                 id: actorRef.id
@@ -74,14 +74,14 @@ function createSpawner(actorContext, {
   return (src, options) => {
     const actorRef = spawn(src, options); // TODO: fix types
     spawnedChildren[actorRef.id] = actorRef;
-    actorContext.defer(() => {
+    actorScope.defer(() => {
       if (actorRef.status === interpreter.ActorStatus.Stopped) {
         return;
       }
       try {
         actorRef.start?.();
       } catch (err) {
-        actorContext.self.send(interpreter.createErrorActorEvent(actorRef.id, err));
+        actorScope.self.send(interpreter.createErrorActorEvent(actorRef.id, err));
         return;
       }
     });
@@ -89,7 +89,7 @@ function createSpawner(actorContext, {
   };
 }
 
-function resolveAssign(actorContext, state, actionArgs, actionParams, {
+function resolveAssign(actorScope, state, actionArgs, actionParams, {
   assignment
 }) {
   if (!state.context) {
@@ -99,9 +99,9 @@ function resolveAssign(actorContext, state, actionArgs, actionParams, {
   const assignArgs = {
     context: state.context,
     event: actionArgs.event,
-    spawn: createSpawner(actorContext, state, actionArgs.event, spawnedChildren),
-    self: actorContext?.self,
-    system: actorContext?.system
+    spawn: createSpawner(actorScope, state, actionArgs.event, spawnedChildren),
+    self: actorScope?.self,
+    system: actorScope?.system
   };
   let partialUpdate = {};
   if (typeof assignment === 'function') {
@@ -268,7 +268,7 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
   return SpecialTargets;
 }({});
 
-function resolveSendTo(actorContext, state, args, actionParams, {
+function resolveSendTo(actorScope, state, args, actionParams, {
   to,
   event: eventOrExpr,
   id,
@@ -290,9 +290,9 @@ function resolveSendTo(actorContext, state, args, actionParams, {
   let targetActorRef;
   if (typeof resolvedTarget === 'string') {
     if (resolvedTarget === SpecialTargets.Parent) {
-      targetActorRef = actorContext?.self._parent;
+      targetActorRef = actorScope?.self._parent;
     } else if (resolvedTarget === SpecialTargets.Internal) {
-      targetActorRef = actorContext?.self;
+      targetActorRef = actorScope?.self;
     } else if (resolvedTarget.startsWith('#_')) {
       // SCXML compatibility: https://www.w3.org/TR/scxml/#SCXMLEventProcessor
       // #_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.
@@ -304,7 +304,7 @@ function resolveSendTo(actorContext, state, args, actionParams, {
       throw new Error(`Unable to send event to actor '${resolvedTarget}' from machine '${state.machine.id}'.`);
     }
   } else {
-    targetActorRef = resolvedTarget || actorContext?.self;
+    targetActorRef = resolvedTarget || actorScope?.self;
   }
   return [state, {
     to: targetActorRef,
@@ -318,20 +318,20 @@ function retryResolveSendTo(_, state, params) {
     params.to = state.children[params.to];
   }
 }
-function executeSendTo(actorContext, params) {
+function executeSendTo(actorScope, params) {
   if (typeof params.delay === 'number') {
-    actorContext.self.delaySend(params);
+    actorScope.self.delaySend(params);
     return;
   }
 
   // this forms an outgoing events queue
   // thanks to that the recipient actors are able to read the *updated* snapshot value of the sender
-  actorContext.defer(() => {
+  actorScope.defer(() => {
     const {
       to,
       event
     } = params;
-    actorContext?.system._relay(actorContext.self, to, event.type === interpreter.XSTATE_ERROR ? interpreter.createErrorActorEvent(actorContext.self.id, event.data) : event);
+    actorScope?.system._relay(actorScope.self, to, event.type === interpreter.XSTATE_ERROR ? interpreter.createErrorActorEvent(actorScope.self.id, event.data) : event);
   });
 }
 /**

package/dist/{send-bff8c910.development.esm.js → send-f6b49072.development.esm.js}

@@ -1,7 +1,7 @@
-import { j as cloneState, e as evaluateGuard } from './raise-42073973.development.esm.js';
-import { f as ActorStatus, j as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, x as XSTATE_ERROR } from './interpreter-4005eb36.development.esm.js';
+import { j as cloneState, e as evaluateGuard } from './raise-37f9f3b8.development.esm.js';
+import { f as ActorStatus, j as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, x as XSTATE_ERROR } from './interpreter-410d7ca9.development.esm.js';
 
-function createSpawner(actorContext, {
+function createSpawner(actorScope, {
   machine,
   context
 }, event, spawnedChildren) {
@@ -19,11 +19,11 @@ function createSpawner(actorContext, {
       // TODO: this should also receive `src`
       const actorRef = createActor(referenced.src, {
         id: options.id,
-        parent: actorContext.self,
+        parent: actorScope.self,
         input: typeof input === 'function' ? input({
           context,
           event,
-          self: actorContext.self
+          self: actorScope.self
         }) : input,
         src,
         systemId
@@ -33,7 +33,7 @@ function createSpawner(actorContext, {
         actorRef.subscribe({
           next: snapshot => {
             if (snapshot.status === 'active') {
-              actorContext.self.send({
+              actorScope.self.send({
                 type: `xstate.snapshot.${actorRef.id}`,
                 snapshot
               });
@@ -47,7 +47,7 @@ function createSpawner(actorContext, {
       // TODO: this should also receive `src`
       const actorRef = createActor(src, {
         id: options.id,
-        parent: actorContext.self,
+        parent: actorScope.self,
         input: options.input,
         src: undefined,
         systemId
@@ -56,7 +56,7 @@ function createSpawner(actorContext, {
         actorRef.subscribe({
           next: snapshot => {
             if (snapshot.status === 'active') {
-              actorContext.self.send({
+              actorScope.self.send({
                 type: `xstate.snapshot.${actorRef.id}`,
                 snapshot,
                 id: actorRef.id
@@ -72,14 +72,14 @@ function createSpawner(actorContext, {
   return (src, options) => {
     const actorRef = spawn(src, options); // TODO: fix types
     spawnedChildren[actorRef.id] = actorRef;
-    actorContext.defer(() => {
+    actorScope.defer(() => {
       if (actorRef.status === ActorStatus.Stopped) {
         return;
       }
       try {
         actorRef.start?.();
       } catch (err) {
-        actorContext.self.send(createErrorActorEvent(actorRef.id, err));
+        actorScope.self.send(createErrorActorEvent(actorRef.id, err));
         return;
       }
     });
@@ -87,7 +87,7 @@ function createSpawner(actorContext, {
   };
 }
 
-function resolveAssign(actorContext, state, actionArgs, actionParams, {
+function resolveAssign(actorScope, state, actionArgs, actionParams, {
   assignment
 }) {
   if (!state.context) {
@@ -97,9 +97,9 @@ function resolveAssign(actorContext, state, actionArgs, actionParams, {
   const assignArgs = {
     context: state.context,
     event: actionArgs.event,
-    spawn: createSpawner(actorContext, state, actionArgs.event, spawnedChildren),
-    self: actorContext?.self,
-    system: actorContext?.system
+    spawn: createSpawner(actorScope, state, actionArgs.event, spawnedChildren),
+    self: actorScope?.self,
+    system: actorScope?.system
   };
   let partialUpdate = {};
   if (typeof assignment === 'function') {
@@ -266,7 +266,7 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
   return SpecialTargets;
 }({});
 
-function resolveSendTo(actorContext, state, args, actionParams, {
+function resolveSendTo(actorScope, state, args, actionParams, {
   to,
   event: eventOrExpr,
   id,
@@ -288,9 +288,9 @@ function resolveSendTo(actorContext, state, args, actionParams, {
   let targetActorRef;
   if (typeof resolvedTarget === 'string') {
     if (resolvedTarget === SpecialTargets.Parent) {
-      targetActorRef = actorContext?.self._parent;
+      targetActorRef = actorScope?.self._parent;
     } else if (resolvedTarget === SpecialTargets.Internal) {
-      targetActorRef = actorContext?.self;
+      targetActorRef = actorScope?.self;
     } else if (resolvedTarget.startsWith('#_')) {
       // SCXML compatibility: https://www.w3.org/TR/scxml/#SCXMLEventProcessor
       // #_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.
@@ -302,7 +302,7 @@ function resolveSendTo(actorContext, state, args, actionParams, {
       throw new Error(`Unable to send event to actor '${resolvedTarget}' from machine '${state.machine.id}'.`);
     }
   } else {
-    targetActorRef = resolvedTarget || actorContext?.self;
+    targetActorRef = resolvedTarget || actorScope?.self;
   }
   return [state, {
     to: targetActorRef,
@@ -316,20 +316,20 @@ function retryResolveSendTo(_, state, params) {
     params.to = state.children[params.to];
   }
 }
-function executeSendTo(actorContext, params) {
+function executeSendTo(actorScope, params) {
   if (typeof params.delay === 'number') {
-    actorContext.self.delaySend(params);
+    actorScope.self.delaySend(params);
     return;
   }
 
   // this forms an outgoing events queue
   // thanks to that the recipient actors are able to read the *updated* snapshot value of the sender
-  actorContext.defer(() => {
+  actorScope.defer(() => {
     const {
       to,
       event
     } = params;
-    actorContext?.system._relay(actorContext.self, to, event.type === XSTATE_ERROR ? createErrorActorEvent(actorContext.self.id, event.data) : event);
+    actorScope?.system._relay(actorScope.self, to, event.type === XSTATE_ERROR ? createErrorActorEvent(actorScope.self.id, event.data) : event);
   });
 }
 /**

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-b6f22ee2.cjs.js');
-var guards_dist_xstateGuards = require('./raise-7faa9b3b.cjs.js');
-var send = require('./send-34160163.cjs.js');
+var interpreter = require('./interpreter-586abde4.cjs.js');
+var guards_dist_xstateGuards = require('./raise-27909189.cjs.js');
+var send = require('./send-4fdf275e.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,7 +585,7 @@ 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 = {};
     const snapshotChildren = snapshot.children;
     Object.keys(snapshotChildren).forEach(actorId => {
@@ -596,11 +596,12 @@ class StateMachine {
       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,
+        parent: _actorScope?.self,
         state: actorState,
+        src,
         systemId: actorData.systemId
       });
       children[actorId] = actorRef;

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-ed3f81f7.development.cjs.js');
-var guards_dist_xstateGuards = require('./raise-b69a3d16.development.cjs.js');
-var send = require('./send-58725522.development.cjs.js');
+var interpreter = require('./interpreter-bae5c279.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-8325e2df.development.cjs.js');
+var send = require('./send-c45d0d2c.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,7 +588,7 @@ 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 = {};
     const snapshotChildren = snapshot.children;
     Object.keys(snapshotChildren).forEach(actorId => {
@@ -599,11 +599,12 @@ class StateMachine {
       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,
+        parent: _actorScope?.self,
         state: actorState,
+        src,
         systemId: actorData.systemId
       });
       children[actorId] = actorRef;