xstate 6.0.0-alpha.24 → 6.0.0-alpha.25

package/dist/{StateMachine-4f3ebd99.esm.js → StateMachine-69278d2c.esm.js}

@@ -1,8 +1,8 @@
-import { M as setSnapshotActorRef, N as getSnapshotActorRef, O as createSnapshotSystem, q as isMachineSnapshot, h as createActor, S as STATE_DELIMITER, P as mapValues, t as toArray, Q as createInvokeId, R as getDelayedTransitions, U as getEventDescriptorKey, V as evaluateCandidate, W as formatTransition, Y as NULL_EVENT, Z as toTransitionConfigArray, _ as createInvokeTimeoutEventId, $ as getCandidates, a0 as matchesActorSession, a1 as formatRouteTransitions, a2 as resolveStateValue, a3 as getAllStateNodes, s as getStateNodes, a4 as createMachineSnapshot, a5 as isInFinalState, j as macrostep, a6 as cloneMachineSnapshot, a7 as transitionNode, e as XSTATE_TIMER, m as matchesEventDescriptor, a8 as getTransitionResult, a9 as hasEffect, aa as createErrorPlatformEvent, r as resolveActionsWithContext, k as createInitEvent, l as createSpawnEffect, n as initialMicrostep, ab as toStatePath, ac as isStateId, ad as getStateNodeByPath, ae as getPersistedSnapshot, af as resolveReferencedActor, ag as $$ACTOR_TYPE } from './index-cf2e8954.esm.js';
+import { M as setSnapshotActorRef, N as getSnapshotActorRef, O as createSnapshotSystem, q as isMachineSnapshot, h as createActor, S as STATE_DELIMITER, P as mapValues, t as toArray, Q as createInvokeId, R as getDelayedTransitions, U as getEventDescriptorKey, V as evaluateCandidate, W as formatTransition, Y as NULL_EVENT, Z as toTransitionConfigArray, _ as createInvokeTimeoutEventId, $ as getCandidates, a0 as matchesActorSession, a1 as formatRouteTransitions, a2 as resolveStateValue, a3 as getAllStateNodes, s as getStateNodes, a4 as createMachineSnapshot, a5 as isInFinalState, j as macrostep, a6 as cloneMachineSnapshot, a7 as transitionNode, e as XSTATE_TIMER, m as matchesEventDescriptor, a8 as getTransitionResult, a9 as hasEffect, aa as createErrorPlatformEvent, r as resolveActionsWithContext, k as createInitEvent, l as createSpawnEffect, n as initialMicrostep, ab as toStatePath, ac as isStateId, ad as getStateNodeByPath, ae as getPersistedSnapshot, af as resolveReferencedActor, ag as createInvokeTimeoutEvent, ah as $$ACTOR_TYPE } from './index-036a773f.esm.js';
 
-function createSpawner(actorScope, actorSources, spawnedChildren) {
+function createSpawner(actorScope, actors, spawnedChildren) {
   return (src, options) => {
-    const referencedSrc = Object.entries(actorSources).find(([, logic]) => logic === src)?.[0];
+    const referencedSrc = Object.entries(actors).find(([, logic]) => logic === src)?.[0];
     const actor = actorScope.system.createActorRef(src, {
       id: options?.id,
       parent: actorScope.self,
@@ -45,7 +45,8 @@ function createInertActorScope(actorLogic, snapshot, sourceSelf) {
   const self = createActor(actorLogic, {
     _inert: true,
     ...(previousSelf ? {
-      id: previousSelf.id
+      id: previousSelf.id,
+      _sessionId: previousSelf.sessionId
     } : {}),
     ...(system ? {
       _systemRef: {
@@ -523,12 +524,12 @@ function getEmptyCanActorScope() {
 }
 class StateMachine {
   constructor(/** The raw config used to create the machine. */
-  config, implementations) {
+  config, sources) {
     this.config = config;
     /** The machine's own version. */
     this.version = void 0;
     this.schemas = void 0;
-    this.implementations = void 0;
+    this.sources = void 0;
     /** Runtime options for machine execution. */
     this.options = void 0;
     /** @internal */
@@ -547,12 +548,12 @@ class StateMachine {
      */
     this._json = void 0;
     this.id = config.id || '(machine)';
-    this.implementations = {
-      actorSources: config.actorSources ?? {},
+    this.sources = {
+      actors: config.actors ?? {},
       actions: config.actions ?? {},
       delays: config.delays ?? {},
       guards: config.guards ?? {},
-      ...implementations
+      ...sources
     };
     this.version = this.config.version;
     this.schemas = this.config.schemas;
@@ -579,38 +580,38 @@ class StateMachine {
   }
 
   /**
-   * Clones this state machine with the provided implementations.
+   * Clones this state machine with the provided sources.
    *
-   * @param implementations Options (`actions`, `guards`, `actorSources`,
-   *   `delays`) to recursively merge with the existing options.
-   * @returns A new `StateMachine` instance with the provided implementations.
+   * @param sources Options (`actions`, `guards`, `actors`, `delays`) to
+   *   recursively merge with the existing options.
+   * @returns A new `StateMachine` instance with the provided sources.
    */
-  provide(implementations) {
+  provide(sources) {
     const {
       actions,
       guards,
-      actorSources,
+      actors,
       delays
-    } = this.implementations;
+    } = this.sources;
     const provided = new StateMachine(this.config, {
       actions: {
         ...actions,
-        ...implementations.actions
+        ...sources.actions
       },
       guards: {
         ...guards,
-        ...implementations.guards
+        ...sources.guards
       },
-      actorSources: {
-        ...actorSources,
-        ...implementations.actorSources
+      actors: {
+        ...actors,
+        ...sources.actors
       },
       delays: {
         ...delays,
-        ...implementations.delays
+        ...sources.delays
       }
     });
-    // Providing implementations does not change the serializable definition.
+    // Providing sources does not change the serializable definition.
     provided._json = this._json;
     return provided;
   }
@@ -801,12 +802,12 @@ class StateMachine {
     }, this, actorScope.self);
     if (typeof context === 'function') {
       const children = {};
-      const spawn = createSpawner(actorScope, this.implementations.actorSources, children);
+      const spawn = createSpawner(actorScope, this.sources.actors, children);
       const resolvedContext = context({
         spawn,
         input: initEvent.input,
         self: actorScope.self,
-        actorSources: this.implementations.actorSources
+        actors: this.sources.actors
       });
       const [nextState] = resolveActionsWithContext(preInitial, initEvent, actorScope, []);
       if (resolvedContext) {
@@ -918,7 +919,6 @@ class StateMachine {
         syncSnapshot: actorData.syncSnapshot,
         snapshot: childState,
         src,
-        _sessionId: actorData.sessionId,
         registryKey: actorData.registryKey
       });
       // Mark so `start()` knows to start this child (freshly invoked/spawned
@@ -929,6 +929,14 @@ class StateMachine {
     const timers = {};
     const persistedTimers = snapshotData.timers ?? {};
     for (const [id, timer] of Object.entries(persistedTimers)) {
+      let event = timer.event;
+      if (event.type === 'xstate.timeout.actor') {
+        const actorId = event.actorId;
+        const child = children[actorId];
+        if (child) {
+          event = createInvokeTimeoutEvent(actorId, child.sessionId);
+        }
+      }
       const target = typeof timer.target === 'string' ? timer.target === 'self' ? 'self' : children[timer.target] : resolvedActorScope.self._parent;
       if (!target) {
         const targetDescription = typeof timer.target === 'string' ? timer.target : timer.target.type;
@@ -936,6 +944,7 @@ class StateMachine {
       }
       timers[id] = {
         ...timer,
+        event,
         target
       };
     }

package/dist/{StateMachine-27ce068a.development.cjs.js → StateMachine-ac1167f3.development.cjs.js}

@@ -1,10 +1,10 @@
 'use strict';
 
-var dist_xstateActors = require('./index-46c96e83.development.cjs.js');
+var dist_xstateActors = require('./index-1ad8a761.development.cjs.js');
 
-function createSpawner(actorScope, actorSources, spawnedChildren) {
+function createSpawner(actorScope, actors, spawnedChildren) {
   return (src, options) => {
-    const referencedSrc = Object.entries(actorSources).find(([, logic]) => logic === src)?.[0];
+    const referencedSrc = Object.entries(actors).find(([, logic]) => logic === src)?.[0];
     const actor = actorScope.system.createActorRef(src, {
       id: options?.id,
       parent: actorScope.self,
@@ -47,7 +47,8 @@ function createInertActorScope(actorLogic, snapshot, sourceSelf) {
   const self = dist_xstateActors.createActor(actorLogic, {
     _inert: true,
     ...(previousSelf ? {
-      id: previousSelf.id
+      id: previousSelf.id,
+      _sessionId: previousSelf.sessionId
     } : {}),
     ...(system ? {
       _systemRef: {
@@ -543,12 +544,12 @@ function getEmptyCanActorScope() {
 }
 class StateMachine {
   constructor(/** The raw config used to create the machine. */
-  config, implementations) {
+  config, sources) {
     this.config = config;
     /** The machine's own version. */
     this.version = void 0;
     this.schemas = void 0;
-    this.implementations = void 0;
+    this.sources = void 0;
     /** Runtime options for machine execution. */
     this.options = void 0;
     /** @internal */
@@ -567,18 +568,18 @@ class StateMachine {
      */
     this._json = void 0;
     this.id = config.id || '(machine)';
-    this.implementations = {
-      actorSources: config.actorSources ?? {},
+    this.sources = {
+      actors: config.actors ?? {},
       actions: config.actions ?? {},
       delays: config.delays ?? {},
       guards: config.guards ?? {},
-      ...implementations
+      ...sources
     };
     {
       // The `@xstate.` prefix is reserved for built-in serialized action and
-      // guard descriptors — user implementation names must not collide.
-      for (const kind of ['actions', 'guards', 'actorSources', 'delays']) {
-        for (const key of Object.keys(this.implementations[kind])) {
+      // guard descriptors — user source names must not collide.
+      for (const kind of ['actions', 'guards', 'actors', 'delays']) {
+        for (const key of Object.keys(this.sources[kind])) {
           if (key.startsWith('@xstate.')) {
             throw new Error(`Invalid ${kind} name '${key}': the '@xstate.' prefix is reserved for built-in descriptors.`);
           }
@@ -610,38 +611,38 @@ class StateMachine {
   }
 
   /**
-   * Clones this state machine with the provided implementations.
+   * Clones this state machine with the provided sources.
    *
-   * @param implementations Options (`actions`, `guards`, `actorSources`,
-   *   `delays`) to recursively merge with the existing options.
-   * @returns A new `StateMachine` instance with the provided implementations.
+   * @param sources Options (`actions`, `guards`, `actors`, `delays`) to
+   *   recursively merge with the existing options.
+   * @returns A new `StateMachine` instance with the provided sources.
    */
-  provide(implementations) {
+  provide(sources) {
     const {
       actions,
       guards,
-      actorSources,
+      actors,
       delays
-    } = this.implementations;
+    } = this.sources;
     const provided = new StateMachine(this.config, {
       actions: {
         ...actions,
-        ...implementations.actions
+        ...sources.actions
       },
       guards: {
         ...guards,
-        ...implementations.guards
+        ...sources.guards
       },
-      actorSources: {
-        ...actorSources,
-        ...implementations.actorSources
+      actors: {
+        ...actors,
+        ...sources.actors
       },
       delays: {
         ...delays,
-        ...implementations.delays
+        ...sources.delays
       }
     });
-    // Providing implementations does not change the serializable definition.
+    // Providing sources does not change the serializable definition.
     provided._json = this._json;
     return provided;
   }
@@ -832,12 +833,12 @@ class StateMachine {
     }, this, actorScope.self);
     if (typeof context === 'function') {
       const children = {};
-      const spawn = createSpawner(actorScope, this.implementations.actorSources, children);
+      const spawn = createSpawner(actorScope, this.sources.actors, children);
       const resolvedContext = context({
         spawn,
         input: initEvent.input,
         self: actorScope.self,
-        actorSources: this.implementations.actorSources
+        actors: this.sources.actors
       });
       const [nextState] = dist_xstateActors.resolveActionsWithContext(preInitial, initEvent, actorScope, []);
       if (resolvedContext) {
@@ -949,7 +950,6 @@ class StateMachine {
         syncSnapshot: actorData.syncSnapshot,
         snapshot: childState,
         src,
-        _sessionId: actorData.sessionId,
         registryKey: actorData.registryKey
       });
       // Mark so `start()` knows to start this child (freshly invoked/spawned
@@ -960,6 +960,14 @@ class StateMachine {
     const timers = {};
     const persistedTimers = snapshotData.timers ?? {};
     for (const [id, timer] of Object.entries(persistedTimers)) {
+      let event = timer.event;
+      if (event.type === 'xstate.timeout.actor') {
+        const actorId = event.actorId;
+        const child = children[actorId];
+        if (child) {
+          event = dist_xstateActors.createInvokeTimeoutEvent(actorId, child.sessionId);
+        }
+      }
       const target = typeof timer.target === 'string' ? timer.target === 'self' ? 'self' : children[timer.target] : resolvedActorScope.self._parent;
       if (!target) {
         const targetDescription = typeof timer.target === 'string' ? timer.target : timer.target.type;
@@ -967,6 +975,7 @@ class StateMachine {
       }
       timers[id] = {
         ...timer,
+        event,
         target
       };
     }

package/dist/{StateMachine-0d7aa36b.cjs.js → StateMachine-b20d5a53.cjs.js}

@@ -1,10 +1,10 @@
 'use strict';
 
-var dist_xstateActors = require('./index-0ef8d20d.cjs.js');
+var dist_xstateActors = require('./index-f58cc498.cjs.js');
 
-function createSpawner(actorScope, actorSources, spawnedChildren) {
+function createSpawner(actorScope, actors, spawnedChildren) {
   return (src, options) => {
-    const referencedSrc = Object.entries(actorSources).find(([, logic]) => logic === src)?.[0];
+    const referencedSrc = Object.entries(actors).find(([, logic]) => logic === src)?.[0];
     const actor = actorScope.system.createActorRef(src, {
       id: options?.id,
       parent: actorScope.self,
@@ -47,7 +47,8 @@ function createInertActorScope(actorLogic, snapshot, sourceSelf) {
   const self = dist_xstateActors.createActor(actorLogic, {
     _inert: true,
     ...(previousSelf ? {
-      id: previousSelf.id
+      id: previousSelf.id,
+      _sessionId: previousSelf.sessionId
     } : {}),
     ...(system ? {
       _systemRef: {
@@ -525,12 +526,12 @@ function getEmptyCanActorScope() {
 }
 class StateMachine {
   constructor(/** The raw config used to create the machine. */
-  config, implementations) {
+  config, sources) {
     this.config = config;
     /** The machine's own version. */
     this.version = void 0;
     this.schemas = void 0;
-    this.implementations = void 0;
+    this.sources = void 0;
     /** Runtime options for machine execution. */
     this.options = void 0;
     /** @internal */
@@ -549,12 +550,12 @@ class StateMachine {
      */
     this._json = void 0;
     this.id = config.id || '(machine)';
-    this.implementations = {
-      actorSources: config.actorSources ?? {},
+    this.sources = {
+      actors: config.actors ?? {},
       actions: config.actions ?? {},
       delays: config.delays ?? {},
       guards: config.guards ?? {},
-      ...implementations
+      ...sources
     };
     this.version = this.config.version;
     this.schemas = this.config.schemas;
@@ -581,38 +582,38 @@ class StateMachine {
   }
 
   /**
-   * Clones this state machine with the provided implementations.
+   * Clones this state machine with the provided sources.
    *
-   * @param implementations Options (`actions`, `guards`, `actorSources`,
-   *   `delays`) to recursively merge with the existing options.
-   * @returns A new `StateMachine` instance with the provided implementations.
+   * @param sources Options (`actions`, `guards`, `actors`, `delays`) to
+   *   recursively merge with the existing options.
+   * @returns A new `StateMachine` instance with the provided sources.
    */
-  provide(implementations) {
+  provide(sources) {
     const {
       actions,
       guards,
-      actorSources,
+      actors,
       delays
-    } = this.implementations;
+    } = this.sources;
     const provided = new StateMachine(this.config, {
       actions: {
         ...actions,
-        ...implementations.actions
+        ...sources.actions
       },
       guards: {
         ...guards,
-        ...implementations.guards
+        ...sources.guards
       },
-      actorSources: {
-        ...actorSources,
-        ...implementations.actorSources
+      actors: {
+        ...actors,
+        ...sources.actors
       },
       delays: {
         ...delays,
-        ...implementations.delays
+        ...sources.delays
       }
     });
-    // Providing implementations does not change the serializable definition.
+    // Providing sources does not change the serializable definition.
     provided._json = this._json;
     return provided;
   }
@@ -803,12 +804,12 @@ class StateMachine {
     }, this, actorScope.self);
     if (typeof context === 'function') {
       const children = {};
-      const spawn = createSpawner(actorScope, this.implementations.actorSources, children);
+      const spawn = createSpawner(actorScope, this.sources.actors, children);
       const resolvedContext = context({
         spawn,
         input: initEvent.input,
         self: actorScope.self,
-        actorSources: this.implementations.actorSources
+        actors: this.sources.actors
       });
       const [nextState] = dist_xstateActors.resolveActionsWithContext(preInitial, initEvent, actorScope, []);
       if (resolvedContext) {
@@ -920,7 +921,6 @@ class StateMachine {
         syncSnapshot: actorData.syncSnapshot,
         snapshot: childState,
         src,
-        _sessionId: actorData.sessionId,
         registryKey: actorData.registryKey
       });
       // Mark so `start()` knows to start this child (freshly invoked/spawned
@@ -931,6 +931,14 @@ class StateMachine {
     const timers = {};
     const persistedTimers = snapshotData.timers ?? {};
     for (const [id, timer] of Object.entries(persistedTimers)) {
+      let event = timer.event;
+      if (event.type === 'xstate.timeout.actor') {
+        const actorId = event.actorId;
+        const child = children[actorId];
+        if (child) {
+          event = dist_xstateActors.createInvokeTimeoutEvent(actorId, child.sessionId);
+        }
+      }
       const target = typeof timer.target === 'string' ? timer.target === 'self' ? 'self' : children[timer.target] : resolvedActorScope.self._parent;
       if (!target) {
         const targetDescription = typeof timer.target === 'string' ? timer.target : timer.target.type;
@@ -938,6 +946,7 @@ class StateMachine {
       }
       timers[id] = {
         ...timer,
+        event,
         target
       };
     }

package/dist/{StateMachine-f3d5f2d8.development.esm.js → StateMachine-bf4ec0f1.development.esm.js}

@@ -1,8 +1,8 @@
-import { M as setSnapshotActorRef, N as getSnapshotActorRef, O as createSnapshotSystem, q as isMachineSnapshot, h as createActor, S as STATE_DELIMITER, P as mapValues, t as toArray, Q as createInvokeId, R as getDelayedTransitions, U as getEventDescriptorKey, V as evaluateCandidate, W as formatTransition, Y as NULL_EVENT, Z as toTransitionConfigArray, _ as createInvokeTimeoutEventId, $ as getCandidates, a0 as matchesActorSession, a1 as formatRouteTransitions, a2 as resolveStateValue, a3 as getAllStateNodes, s as getStateNodes, a4 as createMachineSnapshot, a5 as isInFinalState, j as macrostep, a6 as cloneMachineSnapshot, a7 as transitionNode, e as XSTATE_TIMER, m as matchesEventDescriptor, a8 as getTransitionResult, a9 as hasEffect, aa as createErrorPlatformEvent, r as resolveActionsWithContext, k as createInitEvent, l as createSpawnEffect, n as initialMicrostep, ab as toStatePath, ac as isStateId, ad as getStateNodeByPath, ae as getPersistedSnapshot, af as resolveReferencedActor, ag as $$ACTOR_TYPE } from './index-1a180503.development.esm.js';
+import { M as setSnapshotActorRef, N as getSnapshotActorRef, O as createSnapshotSystem, q as isMachineSnapshot, h as createActor, S as STATE_DELIMITER, P as mapValues, t as toArray, Q as createInvokeId, R as getDelayedTransitions, U as getEventDescriptorKey, V as evaluateCandidate, W as formatTransition, Y as NULL_EVENT, Z as toTransitionConfigArray, _ as createInvokeTimeoutEventId, $ as getCandidates, a0 as matchesActorSession, a1 as formatRouteTransitions, a2 as resolveStateValue, a3 as getAllStateNodes, s as getStateNodes, a4 as createMachineSnapshot, a5 as isInFinalState, j as macrostep, a6 as cloneMachineSnapshot, a7 as transitionNode, e as XSTATE_TIMER, m as matchesEventDescriptor, a8 as getTransitionResult, a9 as hasEffect, aa as createErrorPlatformEvent, r as resolveActionsWithContext, k as createInitEvent, l as createSpawnEffect, n as initialMicrostep, ab as toStatePath, ac as isStateId, ad as getStateNodeByPath, ae as getPersistedSnapshot, af as resolveReferencedActor, ag as createInvokeTimeoutEvent, ah as $$ACTOR_TYPE } from './index-b90ebcd4.development.esm.js';
 
-function createSpawner(actorScope, actorSources, spawnedChildren) {
+function createSpawner(actorScope, actors, spawnedChildren) {
   return (src, options) => {
-    const referencedSrc = Object.entries(actorSources).find(([, logic]) => logic === src)?.[0];
+    const referencedSrc = Object.entries(actors).find(([, logic]) => logic === src)?.[0];
     const actor = actorScope.system.createActorRef(src, {
       id: options?.id,
       parent: actorScope.self,
@@ -45,7 +45,8 @@ function createInertActorScope(actorLogic, snapshot, sourceSelf) {
   const self = createActor(actorLogic, {
     _inert: true,
     ...(previousSelf ? {
-      id: previousSelf.id
+      id: previousSelf.id,
+      _sessionId: previousSelf.sessionId
     } : {}),
     ...(system ? {
       _systemRef: {
@@ -541,12 +542,12 @@ function getEmptyCanActorScope() {
 }
 class StateMachine {
   constructor(/** The raw config used to create the machine. */
-  config, implementations) {
+  config, sources) {
     this.config = config;
     /** The machine's own version. */
     this.version = void 0;
     this.schemas = void 0;
-    this.implementations = void 0;
+    this.sources = void 0;
     /** Runtime options for machine execution. */
     this.options = void 0;
     /** @internal */
@@ -565,18 +566,18 @@ class StateMachine {
      */
     this._json = void 0;
     this.id = config.id || '(machine)';
-    this.implementations = {
-      actorSources: config.actorSources ?? {},
+    this.sources = {
+      actors: config.actors ?? {},
       actions: config.actions ?? {},
       delays: config.delays ?? {},
       guards: config.guards ?? {},
-      ...implementations
+      ...sources
     };
     {
       // The `@xstate.` prefix is reserved for built-in serialized action and
-      // guard descriptors — user implementation names must not collide.
-      for (const kind of ['actions', 'guards', 'actorSources', 'delays']) {
-        for (const key of Object.keys(this.implementations[kind])) {
+      // guard descriptors — user source names must not collide.
+      for (const kind of ['actions', 'guards', 'actors', 'delays']) {
+        for (const key of Object.keys(this.sources[kind])) {
           if (key.startsWith('@xstate.')) {
             throw new Error(`Invalid ${kind} name '${key}': the '@xstate.' prefix is reserved for built-in descriptors.`);
           }
@@ -608,38 +609,38 @@ class StateMachine {
   }
 
   /**
-   * Clones this state machine with the provided implementations.
+   * Clones this state machine with the provided sources.
    *
-   * @param implementations Options (`actions`, `guards`, `actorSources`,
-   *   `delays`) to recursively merge with the existing options.
-   * @returns A new `StateMachine` instance with the provided implementations.
+   * @param sources Options (`actions`, `guards`, `actors`, `delays`) to
+   *   recursively merge with the existing options.
+   * @returns A new `StateMachine` instance with the provided sources.
    */
-  provide(implementations) {
+  provide(sources) {
     const {
       actions,
       guards,
-      actorSources,
+      actors,
       delays
-    } = this.implementations;
+    } = this.sources;
     const provided = new StateMachine(this.config, {
       actions: {
         ...actions,
-        ...implementations.actions
+        ...sources.actions
       },
       guards: {
         ...guards,
-        ...implementations.guards
+        ...sources.guards
       },
-      actorSources: {
-        ...actorSources,
-        ...implementations.actorSources
+      actors: {
+        ...actors,
+        ...sources.actors
       },
       delays: {
         ...delays,
-        ...implementations.delays
+        ...sources.delays
       }
     });
-    // Providing implementations does not change the serializable definition.
+    // Providing sources does not change the serializable definition.
     provided._json = this._json;
     return provided;
   }
@@ -830,12 +831,12 @@ class StateMachine {
     }, this, actorScope.self);
     if (typeof context === 'function') {
       const children = {};
-      const spawn = createSpawner(actorScope, this.implementations.actorSources, children);
+      const spawn = createSpawner(actorScope, this.sources.actors, children);
       const resolvedContext = context({
         spawn,
         input: initEvent.input,
         self: actorScope.self,
-        actorSources: this.implementations.actorSources
+        actors: this.sources.actors
       });
       const [nextState] = resolveActionsWithContext(preInitial, initEvent, actorScope, []);
       if (resolvedContext) {
@@ -947,7 +948,6 @@ class StateMachine {
         syncSnapshot: actorData.syncSnapshot,
         snapshot: childState,
         src,
-        _sessionId: actorData.sessionId,
         registryKey: actorData.registryKey
       });
       // Mark so `start()` knows to start this child (freshly invoked/spawned
@@ -958,6 +958,14 @@ class StateMachine {
     const timers = {};
     const persistedTimers = snapshotData.timers ?? {};
     for (const [id, timer] of Object.entries(persistedTimers)) {
+      let event = timer.event;
+      if (event.type === 'xstate.timeout.actor') {
+        const actorId = event.actorId;
+        const child = children[actorId];
+        if (child) {
+          event = createInvokeTimeoutEvent(actorId, child.sessionId);
+        }
+      }
       const target = typeof timer.target === 'string' ? timer.target === 'self' ? 'self' : children[timer.target] : resolvedActorScope.self._parent;
       if (!target) {
         const targetDescription = typeof timer.target === 'string' ? timer.target : timer.target.type;
@@ -965,6 +973,7 @@ class StateMachine {
       }
       timers[id] = {
         ...timer,
+        event,
         target
       };
     }