xstate 5.0.0-beta.31 → 5.0.0-beta.33

package/dist/{interpreter-e4d2487f.development.esm.js → interpreter-825f3d6e.development.esm.js}

@@ -147,13 +147,14 @@ function reportUnhandledError(err) {
 
 const symbolObservable = (() => typeof Symbol === 'function' && Symbol.observable || '@@observable')();
 
-function createSystem() {
-  let sessionIdCounter = 0;
+let idCounter = 0;
+function createSystem(rootActor) {
   const children = new Map();
   const keyedActors = new Map();
   const reverseKeyedActors = new WeakMap();
+  const observers = new Set();
   const system = {
-    _bookId: () => `x:${sessionIdCounter++}`,
+    _bookId: () => `x:${idCounter++}`,
     _register: (sessionId, actorRef) => {
       children.set(sessionId, actorRef);
       return sessionId;
@@ -176,6 +177,25 @@ function createSystem() {
       }
       keyedActors.set(systemId, actorRef);
       reverseKeyedActors.set(actorRef, systemId);
+    },
+    inspect: observer => {
+      observers.add(observer);
+    },
+    _sendInspectionEvent: event => {
+      const resolvedInspectionEvent = {
+        ...event,
+        rootId: rootActor.sessionId
+      };
+      observers.forEach(observer => observer.next?.(resolvedInspectionEvent));
+    },
+    _relay: (source, target, event) => {
+      system._sendInspectionEvent({
+        type: '@xstate.event',
+        sourceRef: source,
+        targetRef: target,
+        event
+      });
+      target._send(event);
     }
   };
   return system;
@@ -406,10 +426,14 @@ class Actor {
       logger,
       parent,
       id,
-      systemId
+      systemId,
+      inspect
     } = resolvedOptions;
-    const self = this;
-    this.system = parent?.system ?? createSystem();
+    this.system = parent?.system ?? createSystem(this);
+    if (inspect && !parent) {
+      // Always inspect at the system-level
+      this.system.inspect(toObserver(inspect));
+    }
     if (systemId) {
       this._systemId = systemId;
       this.system._set(systemId, this);
@@ -423,7 +447,7 @@ class Actor {
     this.src = resolvedOptions.src;
     this.ref = this;
     this._actorContext = {
-      self,
+      self: this,
       id: this.id,
       sessionId: this.sessionId,
       logger: this.logger,
@@ -442,6 +466,10 @@ class Actor {
     // Ensure that the send method is bound to this Actor instance
     // if destructured
     this.send = this.send.bind(this);
+    this.system._sendInspectionEvent({
+      type: '@xstate.actor',
+      actorRef: this
+    });
     this._initState();
   }
   _initState() {
@@ -450,7 +478,7 @@ class Actor {
 
   // array of functions to defer
 
-  update(snapshot) {
+  update(snapshot, event) {
     // Update state
     this._state = snapshot;
 
@@ -472,14 +500,24 @@ class Actor {
         this._stopProcedure();
         this._complete();
         this._doneEvent = createDoneActorEvent(this.id, this._state.output);
-        this._parent?.send(this._doneEvent);
+        if (this._parent) {
+          this.system._relay(this, this._parent, this._doneEvent);
+        }
         break;
       case 'error':
         this._stopProcedure();
         this._error(this._state.error);
-        this._parent?.send(createErrorActorEvent(this.id, this._state.error));
+        if (this._parent) {
+          this.system._relay(this, this._parent, createErrorActorEvent(this.id, this._state.error));
+        }
         break;
     }
+    this.system._sendInspectionEvent({
+      type: '@xstate.snapshot',
+      actorRef: this,
+      event,
+      snapshot
+    });
   }
   subscribe(nextListenerOrObserver, errorListener, completeListener) {
     const observer = toObserver(nextListenerOrObserver, errorListener, completeListener);
@@ -512,12 +550,19 @@ class Actor {
       this.system._set(this._systemId, this);
     }
     this.status = ActorStatus.Running;
+    const initEvent = createInitEvent(this.options.input);
+    this.system._sendInspectionEvent({
+      type: '@xstate.event',
+      sourceRef: this._parent,
+      targetRef: this,
+      event: initEvent
+    });
     const status = this._state.status;
     switch (status) {
       case 'done':
         // a state machine can be "done" upon intialization (it could reach a final state using initial microsteps)
         // we still need to complete observers, flush deferreds etc
-        this.update(this._state);
+        this.update(this._state, initEvent);
       // fallthrough
       case 'error':
         // TODO: rethink cleanup of observers, mailbox, etc
@@ -537,7 +582,7 @@ class Actor {
     // TODO: this notifies all subscribers but usually this is redundant
     // there is no real change happening here
     // we need to rethink if this needs to be refactored
-    this.update(this._state);
+    this.update(this._state, initEvent);
     if (this.options.devTools) {
       this.attachDevTools();
     }
@@ -565,7 +610,7 @@ class Actor {
       this._parent?.send(createErrorActorEvent(this.id, err));
       return;
     }
-    this.update(nextState);
+    this.update(nextState, event);
     if (event.type === XSTATE_STOP) {
       this._stopProcedure();
       this._complete();
@@ -651,14 +696,9 @@ class Actor {
   }
 
   /**
-   * Sends an event to the running Actor to trigger a transition.
-   *
-   * @param event The event to send
+   * @internal
    */
-  send(event) {
-    if (typeof event === 'string') {
-      throw new Error(`Only event objects may be sent to actors; use .send({ type: "${event}" }) instead`);
-    }
+  _send(event) {
     if (this.status === ActorStatus.Stopped) {
       // do nothing
       {
@@ -670,6 +710,18 @@ class Actor {
     this.mailbox.enqueue(event);
   }
 
+  /**
+   * Sends an event to the running Actor to trigger a transition.
+   *
+   * @param event The event to send
+   */
+  send(event) {
+    if (typeof event === 'string') {
+      throw new Error(`Only event objects may be sent to actors; use .send({ type: "${event}" }) instead`);
+    }
+    this.system._relay(undefined, this, event);
+  }
+
   // TODO: make private (and figure out a way to do this within the machine)
   delaySend({
     event,
@@ -678,11 +730,7 @@ class Actor {
     to
   }) {
     const timerId = this.clock.setTimeout(() => {
-      if (to) {
-        to.send(event);
-      } else {
-        this.send(event);
-      }
+      this.system._relay(this, to ?? this, event);
     }, delay);
 
     // TODO: consider the rehydration story here

package/dist/{raise-6a68d0cc.esm.js → raise-2d92eae8.esm.js}

@@ -1,4 +1,4 @@
-import { r as resolveReferencedActor, d as createActor, f as ActorStatus, k as createErrorActorEvent, l as toStateValue, n as STATE_IDENTIFIER, o as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, q as toStatePath, s as createDoneStateEvent, u as resolveOutput, j as XSTATE_STOP, X as XSTATE_INIT, W as WILDCARD, v as isArray, w as createAfterEvent, x as flatten, e as matchesState } from './interpreter-d5fa7ce0.esm.js';
+import { r as resolveReferencedActor, d as createActor, f as ActorStatus, k as createErrorActorEvent, l as toStateValue, n as STATE_IDENTIFIER, o as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, q as toStatePath, s as createDoneStateEvent, u as resolveOutput, j as XSTATE_STOP, X as XSTATE_INIT, W as WILDCARD, v as isArray, w as createAfterEvent, x as flatten, e as matchesState } from './interpreter-03737810.esm.js';
 
 const cache = new WeakMap();
 function memo(object, key, fn) {
@@ -1073,12 +1073,12 @@ function resolveActionsAndContext(actions, event, currentState, actorCtx) {
   });
   for (const action of actions) {
     const isInline = typeof action === 'function';
-    const resolved = isInline ? action :
+    const resolvedAction = isInline ? action :
     // the existing type of `.actions` assumes non-nullable `TExpressionAction`
     // it's fine to cast this here to get a common type and lack of errors in the rest of the code
     // our logic below makes sure that we call those 2 "variants" correctly
     machine.implementations.actions[typeof action === 'string' ? action : action.type];
-    if (!resolved) {
+    if (!resolvedAction) {
       continue;
     }
     const actionArgs = {
@@ -1098,20 +1098,22 @@ function resolveActionsAndContext(actions, event, currentState, actorCtx) {
       // TS isn't able to narrow it down here
       action
     };
-    if (!('resolve' in resolved)) {
+    if (!('resolve' in resolvedAction)) {
       if (actorCtx?.self.status === ActorStatus.Running) {
-        resolved(actionArgs);
+        resolvedAction(actionArgs);
       } else {
-        actorCtx?.defer(() => resolved(actionArgs));
+        actorCtx?.defer(() => {
+          resolvedAction(actionArgs);
+        });
       }
       continue;
     }
-    const builtinAction = resolved;
-    const [nextState, params, actions] = builtinAction.resolve(actorCtx, intermediateState, actionArgs, resolved // this holds all params
+    const builtinAction = resolvedAction;
+    const [nextState, params, actions] = builtinAction.resolve(actorCtx, intermediateState, actionArgs, resolvedAction // this holds all params
     );
 
     intermediateState = nextState;
-    if ('execute' in resolved) {
+    if ('execute' in resolvedAction) {
       if (actorCtx?.self.status === ActorStatus.Running) {
         builtinAction.execute(actorCtx, params);
       } else {

package/dist/{raise-6fbd4513.development.esm.js → raise-46f122aa.development.esm.js}

@@ -1,4 +1,4 @@
-import { r as resolveReferencedActor, d as createActor, f as ActorStatus, k as createErrorActorEvent, l as toStateValue, n as STATE_IDENTIFIER, o as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, q as toStatePath, s as createDoneStateEvent, u as resolveOutput, W as WILDCARD, j as XSTATE_STOP, X as XSTATE_INIT, v as isArray, w as createAfterEvent, x as flatten, e as matchesState } from './interpreter-e4d2487f.development.esm.js';
+import { r as resolveReferencedActor, d as createActor, f as ActorStatus, k as createErrorActorEvent, l as toStateValue, n as STATE_IDENTIFIER, o as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, q as toStatePath, s as createDoneStateEvent, u as resolveOutput, W as WILDCARD, j as XSTATE_STOP, X as XSTATE_INIT, v as isArray, w as createAfterEvent, x as flatten, e as matchesState } from './interpreter-825f3d6e.development.esm.js';
 
 const cache = new WeakMap();
 function memo(object, key, fn) {
@@ -1104,12 +1104,12 @@ function resolveActionsAndContext(actions, event, currentState, actorCtx) {
   });
   for (const action of actions) {
     const isInline = typeof action === 'function';
-    const resolved = isInline ? action :
+    const resolvedAction = isInline ? action :
     // the existing type of `.actions` assumes non-nullable `TExpressionAction`
     // it's fine to cast this here to get a common type and lack of errors in the rest of the code
     // our logic below makes sure that we call those 2 "variants" correctly
     machine.implementations.actions[typeof action === 'string' ? action : action.type];
-    if (!resolved) {
+    if (!resolvedAction) {
       continue;
     }
     const actionArgs = {
@@ -1129,20 +1129,22 @@ function resolveActionsAndContext(actions, event, currentState, actorCtx) {
       // TS isn't able to narrow it down here
       action
     };
-    if (!('resolve' in resolved)) {
+    if (!('resolve' in resolvedAction)) {
       if (actorCtx?.self.status === ActorStatus.Running) {
-        resolved(actionArgs);
+        resolvedAction(actionArgs);
       } else {
-        actorCtx?.defer(() => resolved(actionArgs));
+        actorCtx?.defer(() => {
+          resolvedAction(actionArgs);
+        });
       }
       continue;
     }
-    const builtinAction = resolved;
-    const [nextState, params, actions] = builtinAction.resolve(actorCtx, intermediateState, actionArgs, resolved // this holds all params
+    const builtinAction = resolvedAction;
+    const [nextState, params, actions] = builtinAction.resolve(actorCtx, intermediateState, actionArgs, resolvedAction // this holds all params
     );
 
     intermediateState = nextState;
-    if ('execute' in resolved) {
+    if ('execute' in resolvedAction) {
       if (actorCtx?.self.status === ActorStatus.Running) {
         builtinAction.execute(actorCtx, params);
       } else {

package/dist/{raise-b4bfe138.development.cjs.js → raise-4c6a5a96.development.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var interpreter = require('./interpreter-a2236840.development.cjs.js');
+var interpreter = require('./interpreter-0c630f66.development.cjs.js');
 
 const cache = new WeakMap();
 function memo(object, key, fn) {
@@ -1106,12 +1106,12 @@ function resolveActionsAndContext(actions, event, currentState, actorCtx) {
   });
   for (const action of actions) {
     const isInline = typeof action === 'function';
-    const resolved = isInline ? action :
+    const resolvedAction = isInline ? action :
     // the existing type of `.actions` assumes non-nullable `TExpressionAction`
     // it's fine to cast this here to get a common type and lack of errors in the rest of the code
     // our logic below makes sure that we call those 2 "variants" correctly
     machine.implementations.actions[typeof action === 'string' ? action : action.type];
-    if (!resolved) {
+    if (!resolvedAction) {
       continue;
     }
     const actionArgs = {
@@ -1131,20 +1131,22 @@ function resolveActionsAndContext(actions, event, currentState, actorCtx) {
       // TS isn't able to narrow it down here
       action
     };
-    if (!('resolve' in resolved)) {
+    if (!('resolve' in resolvedAction)) {
       if (actorCtx?.self.status === interpreter.ActorStatus.Running) {
-        resolved(actionArgs);
+        resolvedAction(actionArgs);
       } else {
-        actorCtx?.defer(() => resolved(actionArgs));
+        actorCtx?.defer(() => {
+          resolvedAction(actionArgs);
+        });
       }
       continue;
     }
-    const builtinAction = resolved;
-    const [nextState, params, actions] = builtinAction.resolve(actorCtx, intermediateState, actionArgs, resolved // this holds all params
+    const builtinAction = resolvedAction;
+    const [nextState, params, actions] = builtinAction.resolve(actorCtx, intermediateState, actionArgs, resolvedAction // this holds all params
     );
 
     intermediateState = nextState;
-    if ('execute' in resolved) {
+    if ('execute' in resolvedAction) {
       if (actorCtx?.self.status === interpreter.ActorStatus.Running) {
         builtinAction.execute(actorCtx, params);
       } else {

package/dist/{raise-90808d65.cjs.js → raise-987c242e.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var interpreter = require('./interpreter-05e11c15.cjs.js');
+var interpreter = require('./interpreter-054e9fb7.cjs.js');
 
 const cache = new WeakMap();
 function memo(object, key, fn) {
@@ -1075,12 +1075,12 @@ function resolveActionsAndContext(actions, event, currentState, actorCtx) {
   });
   for (const action of actions) {
     const isInline = typeof action === 'function';
-    const resolved = isInline ? action :
+    const resolvedAction = isInline ? action :
     // the existing type of `.actions` assumes non-nullable `TExpressionAction`
     // it's fine to cast this here to get a common type and lack of errors in the rest of the code
     // our logic below makes sure that we call those 2 "variants" correctly
     machine.implementations.actions[typeof action === 'string' ? action : action.type];
-    if (!resolved) {
+    if (!resolvedAction) {
       continue;
     }
     const actionArgs = {
@@ -1100,20 +1100,22 @@ function resolveActionsAndContext(actions, event, currentState, actorCtx) {
       // TS isn't able to narrow it down here
       action
     };
-    if (!('resolve' in resolved)) {
+    if (!('resolve' in resolvedAction)) {
       if (actorCtx?.self.status === interpreter.ActorStatus.Running) {
-        resolved(actionArgs);
+        resolvedAction(actionArgs);
       } else {
-        actorCtx?.defer(() => resolved(actionArgs));
+        actorCtx?.defer(() => {
+          resolvedAction(actionArgs);
+        });
       }
       continue;
     }
-    const builtinAction = resolved;
-    const [nextState, params, actions] = builtinAction.resolve(actorCtx, intermediateState, actionArgs, resolved // this holds all params
+    const builtinAction = resolvedAction;
+    const [nextState, params, actions] = builtinAction.resolve(actorCtx, intermediateState, actionArgs, resolvedAction // this holds all params
     );
 
     intermediateState = nextState;
-    if ('execute' in resolved) {
+    if ('execute' in resolvedAction) {
       if (actorCtx?.self.status === interpreter.ActorStatus.Running) {
         builtinAction.execute(actorCtx, params);
       } else {

package/dist/{send-4163d2af.development.cjs.js → send-0e8675c8.development.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var guards_dist_xstateGuards = require('./raise-b4bfe138.development.cjs.js');
-var interpreter = require('./interpreter-a2236840.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-4c6a5a96.development.cjs.js');
+var interpreter = require('./interpreter-0c630f66.development.cjs.js');
 
 function createSpawner(actorContext, {
   machine,
@@ -320,7 +320,7 @@ function executeSendTo(actorContext, params) {
     event
   } = params;
   actorContext.defer(() => {
-    to.send(event.type === interpreter.XSTATE_ERROR ? interpreter.createErrorActorEvent(actorContext.self.id, event.data) : event);
+    actorContext?.system._relay(actorContext.self, to, event.type === interpreter.XSTATE_ERROR ? interpreter.createErrorActorEvent(actorContext.self.id, event.data) : event);
   });
 }
 /**

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

@@ -1,5 +1,5 @@
-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';
+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';
 
 function createSpawner(actorContext, {
   machine,
@@ -306,7 +306,7 @@ function executeSendTo(actorContext, params) {
     event
   } = params;
   actorContext.defer(() => {
-    to.send(event.type === XSTATE_ERROR ? createErrorActorEvent(actorContext.self.id, event.data) : event);
+    actorContext?.system._relay(actorContext.self, to, event.type === XSTATE_ERROR ? createErrorActorEvent(actorContext.self.id, event.data) : event);
   });
 }
 /**

package/dist/{send-7baeedcb.development.esm.js → send-4d5b92dc.development.esm.js}

@@ -1,5 +1,5 @@
-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';
+import { j as cloneState, e as evaluateGuard } from './raise-46f122aa.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-825f3d6e.development.esm.js';
 
 function createSpawner(actorContext, {
   machine,
@@ -318,7 +318,7 @@ function executeSendTo(actorContext, params) {
     event
   } = params;
   actorContext.defer(() => {
-    to.send(event.type === XSTATE_ERROR ? createErrorActorEvent(actorContext.self.id, event.data) : event);
+    actorContext?.system._relay(actorContext.self, to, event.type === XSTATE_ERROR ? createErrorActorEvent(actorContext.self.id, event.data) : event);
   });
 }
 /**

package/dist/{send-72e85cc6.cjs.js → send-bd1bd0e3.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var guards_dist_xstateGuards = require('./raise-90808d65.cjs.js');
-var interpreter = require('./interpreter-05e11c15.cjs.js');
+var guards_dist_xstateGuards = require('./raise-987c242e.cjs.js');
+var interpreter = require('./interpreter-054e9fb7.cjs.js');
 
 function createSpawner(actorContext, {
   machine,
@@ -308,7 +308,7 @@ function executeSendTo(actorContext, params) {
     event
   } = params;
   actorContext.defer(() => {
-    to.send(event.type === interpreter.XSTATE_ERROR ? interpreter.createErrorActorEvent(actorContext.self.id, event.data) : event);
+    actorContext?.system._relay(actorContext.self, to, event.type === interpreter.XSTATE_ERROR ? interpreter.createErrorActorEvent(actorContext.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-05e11c15.cjs.js');
-var guards_dist_xstateGuards = require('./raise-90808d65.cjs.js');
-var send = require('./send-72e85cc6.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');
 require('../dev/dist/xstate-dev.cjs.js');
 
 class SimulatedClock {
@@ -408,6 +408,10 @@ class StateMachine {
     this.version = this.config.version;
     this.types = this.config.types ?? {};
     this.transition = this.transition.bind(this);
+    this.getInitialState = this.getInitialState.bind(this);
+    this.restoreState = this.restoreState.bind(this);
+    this.start = this.start.bind(this);
+    this.getPersistedState = this.getPersistedState.bind(this);
     this.root = new StateNode(config, {
       _key: this.id,
       _machine: this
@@ -602,39 +606,15 @@ class StateMachine {
       const actorState = logic.restoreState?.(childState, _actorCtx);
       const actorRef = interpreter.createActor(logic, {
         id: actorId,
+        parent: _actorCtx?.self,
         state: actorState
       });
       children[actorId] = actorRef;
     });
-    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
+    return this.createState(new guards_dist_xstateGuards.State({
       ...snapshot,
       children
     }, this));
-
-    // TODO: DRY this up
-    restoredSnapshot.configuration.forEach(stateNode => {
-      if (stateNode.invoke) {
-        stateNode.invoke.forEach(invokeConfig => {
-          const {
-            id,
-            src
-          } = invokeConfig;
-          if (children[id]) {
-            return;
-          }
-          const referenced = interpreter.resolveReferencedActor(this.implementations.actors[src]);
-          if (referenced) {
-            const actorRef = interpreter.createActor(referenced.src, {
-              id,
-              parent: _actorCtx?.self,
-              input: 'input' in invokeConfig ? invokeConfig.input : referenced.input
-            });
-            children[id] = actorRef;
-          }
-        });
-      }
-    });
-    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-a2236840.development.cjs.js');
-var guards_dist_xstateGuards = require('./raise-b4bfe138.development.cjs.js');
-var send = require('./send-4163d2af.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');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 class SimulatedClock {
@@ -408,6 +408,10 @@ class StateMachine {
     this.version = this.config.version;
     this.types = this.config.types ?? {};
     this.transition = this.transition.bind(this);
+    this.getInitialState = this.getInitialState.bind(this);
+    this.restoreState = this.restoreState.bind(this);
+    this.start = this.start.bind(this);
+    this.getPersistedState = this.getPersistedState.bind(this);
     this.root = new StateNode(config, {
       _key: this.id,
       _machine: this
@@ -605,39 +609,15 @@ class StateMachine {
       const actorState = logic.restoreState?.(childState, _actorCtx);
       const actorRef = interpreter.createActor(logic, {
         id: actorId,
+        parent: _actorCtx?.self,
         state: actorState
       });
       children[actorId] = actorRef;
     });
-    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
+    return this.createState(new guards_dist_xstateGuards.State({
       ...snapshot,
       children
     }, this));
-
-    // TODO: DRY this up
-    restoredSnapshot.configuration.forEach(stateNode => {
-      if (stateNode.invoke) {
-        stateNode.invoke.forEach(invokeConfig => {
-          const {
-            id,
-            src
-          } = invokeConfig;
-          if (children[id]) {
-            return;
-          }
-          const referenced = interpreter.resolveReferencedActor(this.implementations.actors[src]);
-          if (referenced) {
-            const actorRef = interpreter.createActor(referenced.src, {
-              id,
-              parent: _actorCtx?.self,
-              input: 'input' in invokeConfig ? invokeConfig.input : referenced.input
-            });
-            children[id] = actorRef;
-          }
-        });
-      }
-    });
-    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */