xstate 6.0.0-alpha.23 → 6.0.0-alpha.25

package/dist/{StateMachine-022864fd.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 evaluateCandidate, V as formatTransition, W as NULL_EVENT, Y as toTransitionConfigArray, Z as createInvokeTimeoutEvent, _ as getCandidates, $ as formatRouteTransitions, a0 as resolveStateValue, a1 as getAllStateNodes, s as getStateNodes, a2 as createMachineSnapshot, a3 as isInFinalState, j as macrostep, a4 as cloneMachineSnapshot, a5 as transitionNode, e as XSTATE_TIMER, m as matchesEventDescriptor, a6 as getTransitionResult, a7 as hasEffect, a8 as createErrorPlatformEvent, r as resolveActionsWithContext, k as createInitEvent, l as createSpawnEffect, n as initialMicrostep, a9 as toStatePath, aa as isStateId, ab as getStateNodeByPath, ac as getPersistedSnapshot, ad as resolveReferencedActor, ae as $$ACTOR_TYPE } from './index-3609e096.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: {
@@ -182,8 +183,8 @@ class StateNode {
      */
     this.meta = void 0;
     /**
-     * The output data sent with the "xstate.done.state._id_" event if this is a
-     * final state node.
+     * The output data sent with the `xstate.done.state` event if this is a final
+     * state node.
      */
     this.output = void 0;
     /**
@@ -300,8 +301,7 @@ class StateNode {
 
   /** @internal */
   next(snapshot, event, self) {
-    const eventType = event.type;
-    const candidates = memo(this, `candidates-${eventType}`, () => getCandidates(this, eventType));
+    const candidates = memo(this, `candidates-${getEventDescriptorKey(event)}`, () => getCandidates(this, event));
     for (const candidate of candidates) {
       const guardPassed = evaluateCandidate(candidate, event, snapshot, this, self);
       if (guardPassed) {
@@ -342,6 +342,9 @@ function mapTransitionConfigs(transitionsConfig, mapper) {
 }
 function formatTransitions(stateNode) {
   const transitions = new Map();
+  const addTransitions = (descriptor, additions) => {
+    transitions.set(descriptor, [...(transitions.get(descriptor) ?? []), ...additions]);
+  };
   if (stateNode.config.on) {
     for (const descriptor of Object.keys(stateNode.config.on)) {
       if (descriptor === NULL_EVENT) {
@@ -352,20 +355,30 @@ function formatTransitions(stateNode) {
     }
   }
   if (stateNode.config.onDone) {
-    const descriptor = `xstate.done.state.${stateNode.id}`;
-    transitions.set(descriptor, mapTransitionConfigs(stateNode.config.onDone, transition => formatTransition(stateNode, descriptor, transition)));
+    const descriptor = 'xstate.done.state';
+    addTransitions(descriptor, mapTransitionConfigs(stateNode.config.onDone, transition => formatTransition(stateNode, descriptor, {
+      ...transition,
+      matches: {
+        ...transition.matches,
+        stateId: stateNode.id
+      }
+    })));
   }
   if (stateNode.config.onError) {
     const descriptor = 'xstate.error.*';
     transitions.set(descriptor, mapTransitionConfigs(stateNode.config.onError, transition => formatTransition(stateNode, descriptor, transition)));
   }
-  const createCancelInvokeTimeoutTransition = (descriptor, timeoutEventType) => formatTransition(stateNode, descriptor, {
+  const createCancelInvokeTimeoutTransition = (descriptor, timeoutEventId, actorId) => formatTransition(stateNode, descriptor, {
+    matches: {
+      actorId
+    },
+    _eventMatcher: (event, snapshot) => matchesActorSession(event, snapshot, actorId),
     to: (_args, enq) => {
-      enq.cancel(timeoutEventType);
+      enq.cancel(timeoutEventId);
       return {};
     }
   });
-  const formatInvokeCompletionTransition = (descriptor, transitionConfig, timeoutEventType) => {
+  const formatInvokeCompletionTransition = (descriptor, transitionConfig, timeoutEventId) => {
     const {
       target,
       to,
@@ -396,11 +409,11 @@ function formatTransitions(stateNode) {
           });
           const result = to(args, trackingEnqueue);
           if (result !== undefined || didEnqueue) {
-            enq.cancel(timeoutEventType);
+            enq.cancel(timeoutEventId);
           }
           return result;
         }
-        enq.cancel(timeoutEventType);
+        enq.cancel(timeoutEventId);
         return {
           target,
           reenter
@@ -409,25 +422,39 @@ function formatTransitions(stateNode) {
     });
   };
   for (const invokeDef of stateNode.invoke) {
-    const invokeTimeoutEventType = invokeDef.timeout !== undefined ? createInvokeTimeoutEvent(invokeDef.id).type : undefined;
+    const withInvokeMatch = transition => ({
+      ...transition,
+      matches: {
+        ...transition.matches,
+        actorId: invokeDef.id
+      },
+      _eventMatcher: (event, snapshot) => matchesActorSession(event, snapshot, invokeDef.id)
+    });
+    const invokeTimeoutEventId = invokeDef.timeout !== undefined ? createInvokeTimeoutEventId(invokeDef.id) : undefined;
     if (invokeDef.onDone) {
-      const descriptor = `xstate.done.actor.${invokeDef.id}`;
-      const invokeDoneTransitions = mapTransitionConfigs(invokeDef.onDone, transition => invokeTimeoutEventType ? formatInvokeCompletionTransition(descriptor, transition, invokeTimeoutEventType) : formatTransition(stateNode, descriptor, transition));
-      if (invokeTimeoutEventType) {
-        invokeDoneTransitions.push(createCancelInvokeTimeoutTransition(descriptor, invokeTimeoutEventType));
+      const descriptor = 'xstate.done.actor';
+      const invokeDoneTransitions = mapTransitionConfigs(invokeDef.onDone, rawTransition => {
+        const transition = withInvokeMatch(rawTransition);
+        return invokeTimeoutEventId ? formatInvokeCompletionTransition(descriptor, transition, invokeTimeoutEventId) : formatTransition(stateNode, descriptor, transition);
+      });
+      if (invokeTimeoutEventId) {
+        invokeDoneTransitions.push(createCancelInvokeTimeoutTransition(descriptor, invokeTimeoutEventId, invokeDef.id));
       }
-      transitions.set(descriptor, invokeDoneTransitions);
-    } else if (invokeTimeoutEventType) {
-      const descriptor = `xstate.done.actor.${invokeDef.id}`;
-      transitions.set(descriptor, [createCancelInvokeTimeoutTransition(descriptor, invokeTimeoutEventType)]);
+      addTransitions(descriptor, invokeDoneTransitions);
+    } else if (invokeTimeoutEventId) {
+      const descriptor = 'xstate.done.actor';
+      addTransitions(descriptor, [createCancelInvokeTimeoutTransition(descriptor, invokeTimeoutEventId, invokeDef.id)]);
     }
     if (invokeDef.onError) {
-      const descriptor = `xstate.error.actor.${invokeDef.id}`;
-      transitions.set(descriptor, mapTransitionConfigs(invokeDef.onError, transition => invokeTimeoutEventType ? formatInvokeCompletionTransition(descriptor, transition, invokeTimeoutEventType) : formatTransition(stateNode, descriptor, transition)));
+      const descriptor = 'xstate.error.actor';
+      addTransitions(descriptor, mapTransitionConfigs(invokeDef.onError, rawTransition => {
+        const transition = withInvokeMatch(rawTransition);
+        return invokeTimeoutEventId ? formatInvokeCompletionTransition(descriptor, transition, invokeTimeoutEventId) : formatTransition(stateNode, descriptor, transition);
+      }));
     }
     if (invokeDef.onSnapshot) {
-      const descriptor = `xstate.snapshot.${invokeDef.id}`;
-      transitions.set(descriptor, mapTransitionConfigs(invokeDef.onSnapshot, transition => formatTransition(stateNode, descriptor, transition)));
+      const descriptor = 'xstate.snapshot.actor';
+      addTransitions(descriptor, mapTransitionConfigs(invokeDef.onSnapshot, transition => formatTransition(stateNode, descriptor, withInvokeMatch(transition))));
     }
   }
   for (const delayedTransition of stateNode.after) {
@@ -497,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 */
@@ -521,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;
@@ -553,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;
   }
@@ -775,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) {
@@ -883,7 +910,8 @@ class StateMachine {
       const src = actorData.src;
       const logic = typeof src === 'string' ? resolveReferencedActor(this, src) : src;
       if (!logic) {
-        continue;
+        const sourceId = typeof src === 'string' ? src : '<unknown>';
+        throw new Error(`Unable to restore child actor '${actorId}': child source '${sourceId}' is not provided in machine '${this.id}'.`);
       }
       const actor = resolvedActorScope.system.createActorRef(logic, {
         id: actorId,
@@ -901,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;
@@ -908,6 +944,7 @@ class StateMachine {
       }
       timers[id] = {
         ...timer,
+        event,
         target
       };
     }

package/dist/{StateMachine-53114dce.development.cjs.js → StateMachine-ac1167f3.development.cjs.js}

@@ -1,10 +1,10 @@
 'use strict';
 
-var dist_xstateActors = require('./index-41c0375c.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: {
@@ -185,8 +186,8 @@ class StateNode {
      */
     this.meta = void 0;
     /**
-     * The output data sent with the "xstate.done.state._id_" event if this is a
-     * final state node.
+     * The output data sent with the `xstate.done.state` event if this is a final
+     * state node.
      */
     this.output = void 0;
     /**
@@ -303,8 +304,7 @@ class StateNode {
 
   /** @internal */
   next(snapshot, event, self) {
-    const eventType = event.type;
-    const candidates = memo(this, `candidates-${eventType}`, () => dist_xstateActors.getCandidates(this, eventType));
+    const candidates = memo(this, `candidates-${dist_xstateActors.getEventDescriptorKey(event)}`, () => dist_xstateActors.getCandidates(this, event));
     for (const candidate of candidates) {
       const guardPassed = dist_xstateActors.evaluateCandidate(candidate, event, snapshot, this, self);
       if (guardPassed) {
@@ -362,6 +362,9 @@ function mapTransitionConfigs(transitionsConfig, mapper) {
 }
 function formatTransitions(stateNode) {
   const transitions = new Map();
+  const addTransitions = (descriptor, additions) => {
+    transitions.set(descriptor, [...(transitions.get(descriptor) ?? []), ...additions]);
+  };
   if (stateNode.config.on) {
     for (const descriptor of Object.keys(stateNode.config.on)) {
       if (descriptor === dist_xstateActors.NULL_EVENT) {
@@ -372,20 +375,30 @@ function formatTransitions(stateNode) {
     }
   }
   if (stateNode.config.onDone) {
-    const descriptor = `xstate.done.state.${stateNode.id}`;
-    transitions.set(descriptor, mapTransitionConfigs(stateNode.config.onDone, transition => dist_xstateActors.formatTransition(stateNode, descriptor, transition)));
+    const descriptor = 'xstate.done.state';
+    addTransitions(descriptor, mapTransitionConfigs(stateNode.config.onDone, transition => dist_xstateActors.formatTransition(stateNode, descriptor, {
+      ...transition,
+      matches: {
+        ...transition.matches,
+        stateId: stateNode.id
+      }
+    })));
   }
   if (stateNode.config.onError) {
     const descriptor = 'xstate.error.*';
     transitions.set(descriptor, mapTransitionConfigs(stateNode.config.onError, transition => dist_xstateActors.formatTransition(stateNode, descriptor, transition)));
   }
-  const createCancelInvokeTimeoutTransition = (descriptor, timeoutEventType) => dist_xstateActors.formatTransition(stateNode, descriptor, {
+  const createCancelInvokeTimeoutTransition = (descriptor, timeoutEventId, actorId) => dist_xstateActors.formatTransition(stateNode, descriptor, {
+    matches: {
+      actorId
+    },
+    _eventMatcher: (event, snapshot) => dist_xstateActors.matchesActorSession(event, snapshot, actorId),
     to: (_args, enq) => {
-      enq.cancel(timeoutEventType);
+      enq.cancel(timeoutEventId);
       return {};
     }
   });
-  const formatInvokeCompletionTransition = (descriptor, transitionConfig, timeoutEventType) => {
+  const formatInvokeCompletionTransition = (descriptor, transitionConfig, timeoutEventId) => {
     const {
       target,
       to,
@@ -416,11 +429,11 @@ function formatTransitions(stateNode) {
           });
           const result = to(args, trackingEnqueue);
           if (result !== undefined || didEnqueue) {
-            enq.cancel(timeoutEventType);
+            enq.cancel(timeoutEventId);
           }
           return result;
         }
-        enq.cancel(timeoutEventType);
+        enq.cancel(timeoutEventId);
         return {
           target,
           reenter
@@ -429,25 +442,39 @@ function formatTransitions(stateNode) {
     });
   };
   for (const invokeDef of stateNode.invoke) {
-    const invokeTimeoutEventType = invokeDef.timeout !== undefined ? dist_xstateActors.createInvokeTimeoutEvent(invokeDef.id).type : undefined;
+    const withInvokeMatch = transition => ({
+      ...transition,
+      matches: {
+        ...transition.matches,
+        actorId: invokeDef.id
+      },
+      _eventMatcher: (event, snapshot) => dist_xstateActors.matchesActorSession(event, snapshot, invokeDef.id)
+    });
+    const invokeTimeoutEventId = invokeDef.timeout !== undefined ? dist_xstateActors.createInvokeTimeoutEventId(invokeDef.id) : undefined;
     if (invokeDef.onDone) {
-      const descriptor = `xstate.done.actor.${invokeDef.id}`;
-      const invokeDoneTransitions = mapTransitionConfigs(invokeDef.onDone, transition => invokeTimeoutEventType ? formatInvokeCompletionTransition(descriptor, transition, invokeTimeoutEventType) : dist_xstateActors.formatTransition(stateNode, descriptor, transition));
-      if (invokeTimeoutEventType) {
-        invokeDoneTransitions.push(createCancelInvokeTimeoutTransition(descriptor, invokeTimeoutEventType));
+      const descriptor = 'xstate.done.actor';
+      const invokeDoneTransitions = mapTransitionConfigs(invokeDef.onDone, rawTransition => {
+        const transition = withInvokeMatch(rawTransition);
+        return invokeTimeoutEventId ? formatInvokeCompletionTransition(descriptor, transition, invokeTimeoutEventId) : dist_xstateActors.formatTransition(stateNode, descriptor, transition);
+      });
+      if (invokeTimeoutEventId) {
+        invokeDoneTransitions.push(createCancelInvokeTimeoutTransition(descriptor, invokeTimeoutEventId, invokeDef.id));
       }
-      transitions.set(descriptor, invokeDoneTransitions);
-    } else if (invokeTimeoutEventType) {
-      const descriptor = `xstate.done.actor.${invokeDef.id}`;
-      transitions.set(descriptor, [createCancelInvokeTimeoutTransition(descriptor, invokeTimeoutEventType)]);
+      addTransitions(descriptor, invokeDoneTransitions);
+    } else if (invokeTimeoutEventId) {
+      const descriptor = 'xstate.done.actor';
+      addTransitions(descriptor, [createCancelInvokeTimeoutTransition(descriptor, invokeTimeoutEventId, invokeDef.id)]);
     }
     if (invokeDef.onError) {
-      const descriptor = `xstate.error.actor.${invokeDef.id}`;
-      transitions.set(descriptor, mapTransitionConfigs(invokeDef.onError, transition => invokeTimeoutEventType ? formatInvokeCompletionTransition(descriptor, transition, invokeTimeoutEventType) : dist_xstateActors.formatTransition(stateNode, descriptor, transition)));
+      const descriptor = 'xstate.error.actor';
+      addTransitions(descriptor, mapTransitionConfigs(invokeDef.onError, rawTransition => {
+        const transition = withInvokeMatch(rawTransition);
+        return invokeTimeoutEventId ? formatInvokeCompletionTransition(descriptor, transition, invokeTimeoutEventId) : dist_xstateActors.formatTransition(stateNode, descriptor, transition);
+      }));
     }
     if (invokeDef.onSnapshot) {
-      const descriptor = `xstate.snapshot.${invokeDef.id}`;
-      transitions.set(descriptor, mapTransitionConfigs(invokeDef.onSnapshot, transition => dist_xstateActors.formatTransition(stateNode, descriptor, transition)));
+      const descriptor = 'xstate.snapshot.actor';
+      addTransitions(descriptor, mapTransitionConfigs(invokeDef.onSnapshot, transition => dist_xstateActors.formatTransition(stateNode, descriptor, withInvokeMatch(transition))));
     }
   }
   for (const delayedTransition of stateNode.after) {
@@ -517,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 */
@@ -541,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.`);
           }
@@ -584,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;
   }
@@ -806,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) {
@@ -914,7 +941,8 @@ class StateMachine {
       const src = actorData.src;
       const logic = typeof src === 'string' ? dist_xstateActors.resolveReferencedActor(this, src) : src;
       if (!logic) {
-        continue;
+        const sourceId = typeof src === 'string' ? src : '<unknown>';
+        throw new Error(`Unable to restore child actor '${actorId}': child source '${sourceId}' is not provided in machine '${this.id}'.`);
       }
       const actor = resolvedActorScope.system.createActorRef(logic, {
         id: actorId,
@@ -932,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;
@@ -939,6 +975,7 @@ class StateMachine {
       }
       timers[id] = {
         ...timer,
+        event,
         target
       };
     }