xstate 6.0.0-alpha.23 → 6.0.0-alpha.24

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var dist_xstateActors = require('./index-434fac23.cjs.js');
+var dist_xstateActors = require('./index-0ef8d20d.cjs.js');
 
 function createSpawner(actorScope, actorSources, spawnedChildren) {
   return (src, options) => {
@@ -184,8 +184,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;
     /**
@@ -302,8 +302,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) {
@@ -344,6 +343,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) {
@@ -354,20 +356,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,
@@ -398,11 +410,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
@@ -411,25 +423,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) {
@@ -885,7 +911,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,
@@ -893,6 +920,7 @@ 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

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var dist_xstateActors = require('./index-41c0375c.development.cjs.js');
+var dist_xstateActors = require('./index-46c96e83.development.cjs.js');
 
 function createSpawner(actorScope, actorSources, spawnedChildren) {
   return (src, options) => {
@@ -185,8 +185,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 +303,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 +361,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 +374,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 +428,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 +441,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) {
@@ -914,7 +940,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,
@@ -922,6 +949,7 @@ 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

package/dist/{StateMachine-022864fd.esm.js → StateMachine-4f3ebd99.esm.js}

@@ -1,4 +1,4 @@
-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 $$ACTOR_TYPE } from './index-cf2e8954.esm.js';
 
 function createSpawner(actorScope, actorSources, spawnedChildren) {
   return (src, options) => {
@@ -182,8 +182,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 +300,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 +341,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 +354,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 +408,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 +421,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) {
@@ -883,7 +909,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,
@@ -891,6 +918,7 @@ 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

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

@@ -1,4 +1,4 @@
-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-f5407323.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 $$ACTOR_TYPE } from './index-1a180503.development.esm.js';
 
 function createSpawner(actorScope, actorSources, spawnedChildren) {
   return (src, options) => {
@@ -183,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;
     /**
@@ -301,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) {
@@ -360,6 +359,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) {
@@ -370,20 +372,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,
@@ -414,11 +426,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
@@ -427,25 +439,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) {
@@ -912,7 +938,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,
@@ -920,6 +947,7 @@ 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

package/dist/declarations/src/StateNode.d.ts

@@ -50,8 +50,8 @@ export declare class StateNode<TContext extends MachineContext = MachineContext,
      */
     meta?: any;
     /**
-     * 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.
      */
     output?: Mapper<MachineContext, EventObject, unknown, EventObject> | NonReducibleUnknown;
     /**