xstate 6.0.0-alpha.53 → 6.0.0-alpha.54

package/dist/{createActor-41e3bbc3.development.esm.js → createActor-04e2ee20.development.esm.js}

@@ -1177,7 +1177,7 @@ async function executeEffects(effects, runtime) {
     await effect.exec(runtime);
   }
 }
-function resolveActionsWithContext(currentSnapshot, event, actorScope, actions) {
+function resolveActionsWithContext(currentSnapshot, event, actorScope, actions, internalEvents) {
   let intermediateSnapshot = currentSnapshot;
   const executableActions = [];
   for (const action of actions) {
@@ -1201,7 +1201,20 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
     };
     const isInline = typeof action === 'function';
     const actionRecord = getTransitionActionRecord(action);
-    const resolvedAction = isInline ? action : actionRecord ? actionRecord.action.bind(null, ...actionRecord.args) : false;
+    let resolvedActionArgs = actionRecord?.args;
+    if (actionRecord?.action === builtInActions['@xstate.sendTo'] && typeof actionRecord.args[1] === 'string') {
+      const childId = actionRecord.args[1];
+      const target = Object.hasOwn(intermediateSnapshot.children, childId) ? intermediateSnapshot.children[childId] : undefined;
+      if (!target) {
+        internalEvents?.push(createErrorPlatformEvent('communication', {
+          message: `Unable to send event to unknown child '${childId}'`,
+          event: actionRecord.args[2]
+        }));
+        continue;
+      }
+      resolvedActionArgs = [actionRecord.args[0], target, ...actionRecord.args.slice(2)];
+    }
+    const resolvedAction = isInline ? action : actionRecord ? actionRecord.action.bind(null, ...resolvedActionArgs) : false;
     let actionParams = undefined;
     if (typeof action === 'object' && action !== null) {
       const {
@@ -1242,13 +1255,13 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
       continue;
     }
     if (!resolvedAction || !('resolve' in resolvedAction)) {
-      const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, action.args) : undefined;
+      const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, resolvedActionArgs) : undefined;
       const isEmittedEvent = typeof action === 'object' && action !== null && !actionRecord;
       const executableAction = {
         kind: builtInFields ? 'builtin' : isEmittedEvent ? 'emit' : 'action',
         type: typeof action === 'object' ? 'action' in action && typeof action.action === 'function' ? action.action.name ?? '(anonymous)' : action.type : action.name || '(anonymous)',
         params: builtInFields ? undefined : actionParams,
-        args: typeof action === 'object' && 'action' in action ? action.args : [],
+        args: typeof action === 'object' && 'action' in action ? resolvedActionArgs : [],
         ...(builtInFields ? {} : isEmittedEvent ? {
           source: actorScope.self,
           event: action
@@ -2796,12 +2809,12 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             context: nextContext
           });
         }
-        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, exitActions);
+        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, exitActions, internalQueue);
         nextState = resolvedState;
         executableActions.push(...resolvedActions);
         const invokeStopActions = getInvokeStopActions(exitStateNode, nextState.children);
         if (invokeStopActions.length) {
-          const [stoppedState, stopEffects] = resolveActionsWithContext(nextState, event, actorScope, invokeStopActions);
+          const [stoppedState, stopEffects] = resolveActionsWithContext(nextState, event, actorScope, invokeStopActions, internalQueue);
           nextState = stoppedState;
           executableActions.push(...stopEffects);
         }
@@ -2932,14 +2945,18 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
         }
       };
+      const enteredTargetsByTransition = new Map();
       for (const transition of filteredTransitions) {
         const domain = getTransitionDomain(transition, currentSnapshot, getCurrentTransitionResult);
         const {
           targets,
           reenter
         } = getCurrentTransitionResult(transition);
+        const enteredTargets = new Set();
+        enteredTargetsByTransition.set(transition, enteredTargets);
         for (const targetNode of targets ?? []) {
           if (!isHistoryNode(targetNode) && (transition.source !== targetNode || transition.source !== domain || reenter)) {
+            enteredTargets.add(targetNode);
             statesToEnter.add(targetNode);
             statesForDefaultEntry.add(targetNode);
           }
@@ -2975,7 +2992,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           input
         } = getCurrentTransitionResult(transition);
         if (input && targets) {
-          for (const targetNode of targets) {
+          for (const targetNode of targets.filter(targetNode => enteredTargetsByTransition.get(transition)?.has(targetNode))) {
             stateInputMap[targetNode.id] = input;
             stateInputsChanged = true;
           }
@@ -3074,7 +3091,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             }
           }
         }
-        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, actions);
+        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, actions, internalQueue);
         nextState = resolvedState;
         actions.length = 0;
         executableActions.push(...resolvedActions);
@@ -3123,7 +3140,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
     };
 
     // Execute transition content
-    const [resolvedTransitionState, transitionExecutableActions] = resolveActionsWithContext(nextState, event, actorScope, transitionActions);
+    const [resolvedTransitionState, transitionExecutableActions] = resolveActionsWithContext(nextState, event, actorScope, transitionActions, internalQueue);
     nextState = resolvedTransitionState;
     executableActions.push(...transitionExecutableActions);
     if (context && context !== currentSnapshot.context) {
@@ -3150,7 +3167,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
         }
       });
-      const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, allExitActions);
+      const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, allExitActions, internalQueue);
       nextState = resolvedState;
       executableActions.push(...resolvedActions);
       const [stoppedState, stopEffects] = stopChildren(nextState, event, actorScope);

package/dist/{createActor-20277025.cjs.js → createActor-54b4caed.cjs.js}

@@ -1171,7 +1171,7 @@ async function executeEffects(effects, runtime) {
     await effect.exec(runtime);
   }
 }
-function resolveActionsWithContext(currentSnapshot, event, actorScope, actions) {
+function resolveActionsWithContext(currentSnapshot, event, actorScope, actions, internalEvents) {
   let intermediateSnapshot = currentSnapshot;
   const executableActions = [];
   for (const action of actions) {
@@ -1195,7 +1195,20 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
     };
     const isInline = typeof action === 'function';
     const actionRecord = getTransitionActionRecord(action);
-    const resolvedAction = isInline ? action : actionRecord ? actionRecord.action.bind(null, ...actionRecord.args) : false;
+    let resolvedActionArgs = actionRecord?.args;
+    if (actionRecord?.action === builtInActions['@xstate.sendTo'] && typeof actionRecord.args[1] === 'string') {
+      const childId = actionRecord.args[1];
+      const target = Object.hasOwn(intermediateSnapshot.children, childId) ? intermediateSnapshot.children[childId] : undefined;
+      if (!target) {
+        internalEvents?.push(createErrorPlatformEvent('communication', {
+          message: `Unable to send event to unknown child '${childId}'`,
+          event: actionRecord.args[2]
+        }));
+        continue;
+      }
+      resolvedActionArgs = [actionRecord.args[0], target, ...actionRecord.args.slice(2)];
+    }
+    const resolvedAction = isInline ? action : actionRecord ? actionRecord.action.bind(null, ...resolvedActionArgs) : false;
     let actionParams = undefined;
     if (typeof action === 'object' && action !== null) {
       const {
@@ -1236,13 +1249,13 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
       continue;
     }
     if (!resolvedAction || !('resolve' in resolvedAction)) {
-      const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, action.args) : undefined;
+      const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, resolvedActionArgs) : undefined;
       const isEmittedEvent = typeof action === 'object' && action !== null && !actionRecord;
       const executableAction = {
         kind: builtInFields ? 'builtin' : isEmittedEvent ? 'emit' : 'action',
         type: typeof action === 'object' ? 'action' in action && typeof action.action === 'function' ? action.action.name ?? '(anonymous)' : action.type : action.name || '(anonymous)',
         params: builtInFields ? undefined : actionParams,
-        args: typeof action === 'object' && 'action' in action ? action.args : [],
+        args: typeof action === 'object' && 'action' in action ? resolvedActionArgs : [],
         ...(builtInFields ? {} : isEmittedEvent ? {
           source: actorScope.self,
           event: action
@@ -2780,12 +2793,12 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             context: nextContext
           });
         }
-        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, exitActions);
+        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, exitActions, internalQueue);
         nextState = resolvedState;
         executableActions.push(...resolvedActions);
         const invokeStopActions = getInvokeStopActions(exitStateNode, nextState.children);
         if (invokeStopActions.length) {
-          const [stoppedState, stopEffects] = resolveActionsWithContext(nextState, event, actorScope, invokeStopActions);
+          const [stoppedState, stopEffects] = resolveActionsWithContext(nextState, event, actorScope, invokeStopActions, internalQueue);
           nextState = stoppedState;
           executableActions.push(...stopEffects);
         }
@@ -2916,14 +2929,18 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
         }
       };
+      const enteredTargetsByTransition = new Map();
       for (const transition of filteredTransitions) {
         const domain = getTransitionDomain(transition, currentSnapshot, getCurrentTransitionResult);
         const {
           targets,
           reenter
         } = getCurrentTransitionResult(transition);
+        const enteredTargets = new Set();
+        enteredTargetsByTransition.set(transition, enteredTargets);
         for (const targetNode of targets ?? []) {
           if (!isHistoryNode(targetNode) && (transition.source !== targetNode || transition.source !== domain || reenter)) {
+            enteredTargets.add(targetNode);
             statesToEnter.add(targetNode);
             statesForDefaultEntry.add(targetNode);
           }
@@ -2959,7 +2976,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           input
         } = getCurrentTransitionResult(transition);
         if (input && targets) {
-          for (const targetNode of targets) {
+          for (const targetNode of targets.filter(targetNode => enteredTargetsByTransition.get(transition)?.has(targetNode))) {
             stateInputMap[targetNode.id] = input;
             stateInputsChanged = true;
           }
@@ -3058,7 +3075,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             }
           }
         }
-        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, actions);
+        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, actions, internalQueue);
         nextState = resolvedState;
         actions.length = 0;
         executableActions.push(...resolvedActions);
@@ -3107,7 +3124,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
     };
 
     // Execute transition content
-    const [resolvedTransitionState, transitionExecutableActions] = resolveActionsWithContext(nextState, event, actorScope, transitionActions);
+    const [resolvedTransitionState, transitionExecutableActions] = resolveActionsWithContext(nextState, event, actorScope, transitionActions, internalQueue);
     nextState = resolvedTransitionState;
     executableActions.push(...transitionExecutableActions);
     if (context && context !== currentSnapshot.context) {
@@ -3134,7 +3151,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
         }
       });
-      const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, allExitActions);
+      const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, allExitActions, internalQueue);
       nextState = resolvedState;
       executableActions.push(...resolvedActions);
       const [stoppedState, stopEffects] = stopChildren(nextState, event, actorScope);

package/dist/{createActor-4d94dd53.development.cjs.js → createActor-72c06d5c.development.cjs.js}

@@ -1179,7 +1179,7 @@ async function executeEffects(effects, runtime) {
     await effect.exec(runtime);
   }
 }
-function resolveActionsWithContext(currentSnapshot, event, actorScope, actions) {
+function resolveActionsWithContext(currentSnapshot, event, actorScope, actions, internalEvents) {
   let intermediateSnapshot = currentSnapshot;
   const executableActions = [];
   for (const action of actions) {
@@ -1203,7 +1203,20 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
     };
     const isInline = typeof action === 'function';
     const actionRecord = getTransitionActionRecord(action);
-    const resolvedAction = isInline ? action : actionRecord ? actionRecord.action.bind(null, ...actionRecord.args) : false;
+    let resolvedActionArgs = actionRecord?.args;
+    if (actionRecord?.action === builtInActions['@xstate.sendTo'] && typeof actionRecord.args[1] === 'string') {
+      const childId = actionRecord.args[1];
+      const target = Object.hasOwn(intermediateSnapshot.children, childId) ? intermediateSnapshot.children[childId] : undefined;
+      if (!target) {
+        internalEvents?.push(createErrorPlatformEvent('communication', {
+          message: `Unable to send event to unknown child '${childId}'`,
+          event: actionRecord.args[2]
+        }));
+        continue;
+      }
+      resolvedActionArgs = [actionRecord.args[0], target, ...actionRecord.args.slice(2)];
+    }
+    const resolvedAction = isInline ? action : actionRecord ? actionRecord.action.bind(null, ...resolvedActionArgs) : false;
     let actionParams = undefined;
     if (typeof action === 'object' && action !== null) {
       const {
@@ -1244,13 +1257,13 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
       continue;
     }
     if (!resolvedAction || !('resolve' in resolvedAction)) {
-      const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, action.args) : undefined;
+      const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, resolvedActionArgs) : undefined;
       const isEmittedEvent = typeof action === 'object' && action !== null && !actionRecord;
       const executableAction = {
         kind: builtInFields ? 'builtin' : isEmittedEvent ? 'emit' : 'action',
         type: typeof action === 'object' ? 'action' in action && typeof action.action === 'function' ? action.action.name ?? '(anonymous)' : action.type : action.name || '(anonymous)',
         params: builtInFields ? undefined : actionParams,
-        args: typeof action === 'object' && 'action' in action ? action.args : [],
+        args: typeof action === 'object' && 'action' in action ? resolvedActionArgs : [],
         ...(builtInFields ? {} : isEmittedEvent ? {
           source: actorScope.self,
           event: action
@@ -2798,12 +2811,12 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             context: nextContext
           });
         }
-        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, exitActions);
+        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, exitActions, internalQueue);
         nextState = resolvedState;
         executableActions.push(...resolvedActions);
         const invokeStopActions = getInvokeStopActions(exitStateNode, nextState.children);
         if (invokeStopActions.length) {
-          const [stoppedState, stopEffects] = resolveActionsWithContext(nextState, event, actorScope, invokeStopActions);
+          const [stoppedState, stopEffects] = resolveActionsWithContext(nextState, event, actorScope, invokeStopActions, internalQueue);
           nextState = stoppedState;
           executableActions.push(...stopEffects);
         }
@@ -2934,14 +2947,18 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
         }
       };
+      const enteredTargetsByTransition = new Map();
       for (const transition of filteredTransitions) {
         const domain = getTransitionDomain(transition, currentSnapshot, getCurrentTransitionResult);
         const {
           targets,
           reenter
         } = getCurrentTransitionResult(transition);
+        const enteredTargets = new Set();
+        enteredTargetsByTransition.set(transition, enteredTargets);
         for (const targetNode of targets ?? []) {
           if (!isHistoryNode(targetNode) && (transition.source !== targetNode || transition.source !== domain || reenter)) {
+            enteredTargets.add(targetNode);
             statesToEnter.add(targetNode);
             statesForDefaultEntry.add(targetNode);
           }
@@ -2977,7 +2994,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           input
         } = getCurrentTransitionResult(transition);
         if (input && targets) {
-          for (const targetNode of targets) {
+          for (const targetNode of targets.filter(targetNode => enteredTargetsByTransition.get(transition)?.has(targetNode))) {
             stateInputMap[targetNode.id] = input;
             stateInputsChanged = true;
           }
@@ -3076,7 +3093,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             }
           }
         }
-        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, actions);
+        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, actions, internalQueue);
         nextState = resolvedState;
         actions.length = 0;
         executableActions.push(...resolvedActions);
@@ -3125,7 +3142,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
     };
 
     // Execute transition content
-    const [resolvedTransitionState, transitionExecutableActions] = resolveActionsWithContext(nextState, event, actorScope, transitionActions);
+    const [resolvedTransitionState, transitionExecutableActions] = resolveActionsWithContext(nextState, event, actorScope, transitionActions, internalQueue);
     nextState = resolvedTransitionState;
     executableActions.push(...transitionExecutableActions);
     if (context && context !== currentSnapshot.context) {
@@ -3152,7 +3169,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
         }
       });
-      const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, allExitActions);
+      const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, allExitActions, internalQueue);
       nextState = resolvedState;
       executableActions.push(...resolvedActions);
       const [stoppedState, stopEffects] = stopChildren(nextState, event, actorScope);

package/dist/{createActor-6fa87eea.esm.js → createActor-a7b9d1be.esm.js}

@@ -1169,7 +1169,7 @@ async function executeEffects(effects, runtime) {
     await effect.exec(runtime);
   }
 }
-function resolveActionsWithContext(currentSnapshot, event, actorScope, actions) {
+function resolveActionsWithContext(currentSnapshot, event, actorScope, actions, internalEvents) {
   let intermediateSnapshot = currentSnapshot;
   const executableActions = [];
   for (const action of actions) {
@@ -1193,7 +1193,20 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
     };
     const isInline = typeof action === 'function';
     const actionRecord = getTransitionActionRecord(action);
-    const resolvedAction = isInline ? action : actionRecord ? actionRecord.action.bind(null, ...actionRecord.args) : false;
+    let resolvedActionArgs = actionRecord?.args;
+    if (actionRecord?.action === builtInActions['@xstate.sendTo'] && typeof actionRecord.args[1] === 'string') {
+      const childId = actionRecord.args[1];
+      const target = Object.hasOwn(intermediateSnapshot.children, childId) ? intermediateSnapshot.children[childId] : undefined;
+      if (!target) {
+        internalEvents?.push(createErrorPlatformEvent('communication', {
+          message: `Unable to send event to unknown child '${childId}'`,
+          event: actionRecord.args[2]
+        }));
+        continue;
+      }
+      resolvedActionArgs = [actionRecord.args[0], target, ...actionRecord.args.slice(2)];
+    }
+    const resolvedAction = isInline ? action : actionRecord ? actionRecord.action.bind(null, ...resolvedActionArgs) : false;
     let actionParams = undefined;
     if (typeof action === 'object' && action !== null) {
       const {
@@ -1234,13 +1247,13 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
       continue;
     }
     if (!resolvedAction || !('resolve' in resolvedAction)) {
-      const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, action.args) : undefined;
+      const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, resolvedActionArgs) : undefined;
       const isEmittedEvent = typeof action === 'object' && action !== null && !actionRecord;
       const executableAction = {
         kind: builtInFields ? 'builtin' : isEmittedEvent ? 'emit' : 'action',
         type: typeof action === 'object' ? 'action' in action && typeof action.action === 'function' ? action.action.name ?? '(anonymous)' : action.type : action.name || '(anonymous)',
         params: builtInFields ? undefined : actionParams,
-        args: typeof action === 'object' && 'action' in action ? action.args : [],
+        args: typeof action === 'object' && 'action' in action ? resolvedActionArgs : [],
         ...(builtInFields ? {} : isEmittedEvent ? {
           source: actorScope.self,
           event: action
@@ -2778,12 +2791,12 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             context: nextContext
           });
         }
-        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, exitActions);
+        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, exitActions, internalQueue);
         nextState = resolvedState;
         executableActions.push(...resolvedActions);
         const invokeStopActions = getInvokeStopActions(exitStateNode, nextState.children);
         if (invokeStopActions.length) {
-          const [stoppedState, stopEffects] = resolveActionsWithContext(nextState, event, actorScope, invokeStopActions);
+          const [stoppedState, stopEffects] = resolveActionsWithContext(nextState, event, actorScope, invokeStopActions, internalQueue);
           nextState = stoppedState;
           executableActions.push(...stopEffects);
         }
@@ -2914,14 +2927,18 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
         }
       };
+      const enteredTargetsByTransition = new Map();
       for (const transition of filteredTransitions) {
         const domain = getTransitionDomain(transition, currentSnapshot, getCurrentTransitionResult);
         const {
           targets,
           reenter
         } = getCurrentTransitionResult(transition);
+        const enteredTargets = new Set();
+        enteredTargetsByTransition.set(transition, enteredTargets);
         for (const targetNode of targets ?? []) {
           if (!isHistoryNode(targetNode) && (transition.source !== targetNode || transition.source !== domain || reenter)) {
+            enteredTargets.add(targetNode);
             statesToEnter.add(targetNode);
             statesForDefaultEntry.add(targetNode);
           }
@@ -2957,7 +2974,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           input
         } = getCurrentTransitionResult(transition);
         if (input && targets) {
-          for (const targetNode of targets) {
+          for (const targetNode of targets.filter(targetNode => enteredTargetsByTransition.get(transition)?.has(targetNode))) {
             stateInputMap[targetNode.id] = input;
             stateInputsChanged = true;
           }
@@ -3056,7 +3073,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             }
           }
         }
-        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, actions);
+        const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, actions, internalQueue);
         nextState = resolvedState;
         actions.length = 0;
         executableActions.push(...resolvedActions);
@@ -3105,7 +3122,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
     };
 
     // Execute transition content
-    const [resolvedTransitionState, transitionExecutableActions] = resolveActionsWithContext(nextState, event, actorScope, transitionActions);
+    const [resolvedTransitionState, transitionExecutableActions] = resolveActionsWithContext(nextState, event, actorScope, transitionActions, internalQueue);
     nextState = resolvedTransitionState;
     executableActions.push(...transitionExecutableActions);
     if (context && context !== currentSnapshot.context) {
@@ -3132,7 +3149,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
         }
       });
-      const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, allExitActions);
+      const [resolvedState, resolvedActions] = resolveActionsWithContext(nextState, event, actorScope, allExitActions, internalQueue);
       nextState = resolvedState;
       executableActions.push(...resolvedActions);
       const [stoppedState, stopEffects] = stopChildren(nextState, event, actorScope);

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

@@ -13,9 +13,9 @@ type CompatibleProvidedActorSource<TExpected extends AnyActorLogic, TActual exte
 type ProvidedActors<TExpectedActorMap extends Sources['actors'], TProvidedActorMap extends Partial<Record<keyof TExpectedActorMap & string, AnyActorLogic>>> = {
     [K in keyof TProvidedActorMap]: K extends keyof TExpectedActorMap ? TProvidedActorMap[K] extends AnyActorLogic ? CompatibleProvidedActorSource<TExpectedActorMap[K], TProvidedActorMap[K]> : never : never;
 };
-export declare class StateMachine<TContext extends MachineContext, TEvent extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TStateValue extends StateValue, TTag extends string, TInput, TOutput, TEmitted extends EventObject, TMeta extends MetaObject, TConfig extends StateSchema, TActionMap extends Sources['actions'], TActorMap extends Sources['actors'], TGuardMap extends Sources['guards'], TDelayMap extends Sources['delays'], TInternalEvent extends EventObject = never> implements ActorLogic<MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>, TEvent, TInput, AnyActorSystem, TEmitted> {
+export declare class StateMachine<TContext extends MachineContext, TEvent extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TStateValue extends StateValue, TTag extends string, TInput, TOutput, TEmitted extends EventObject, TMeta extends MetaObject, TConfig extends StateSchema, TActionMap extends Sources['actions'], TActorMap extends Sources['actors'], TGuardMap extends Sources['guards'], TDelayMap extends Sources['delays'], TInternalEvent extends EventObject = never, TTransitionMeta extends MetaObject = TMeta> implements ActorLogic<MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>, TEvent, TInput, AnyActorSystem, TEmitted> {
     /** The raw config used to create the machine. */
-    config: Next_MachineConfig<any, any, any, any, any, any, any, any, any, any, any, any> & {
+    config: Next_MachineConfig<any, any, any, any, any, any, any, any, any, any, any, any, any> & {
         schemas?: AnyMachineSchemas;
         internalEvents?: readonly string[];
     };
@@ -32,14 +32,14 @@ export declare class StateMachine<TContext extends MachineContext, TEvent extend
     sources: Sources;
     /** Runtime options for machine execution. */
     options: MachineOptions;
-    root: StateNode<TContext, TEvent>;
+    root: StateNode<TContext, TEvent, TMeta, TTransitionMeta>;
     id: string;
-    states: StateNode<TContext, TEvent>['states'];
+    states: StateNode<TContext, TEvent, TMeta, TTransitionMeta>['states'];
     events: Array<EventDescriptor<TEvent>>;
     internalEventDescriptors: ReadonlyArray<string>;
     constructor(
     /** The raw config used to create the machine. */
-    config: Next_MachineConfig<any, any, any, any, any, any, any, any, any, any, any, any> & {
+    config: Next_MachineConfig<any, any, any, any, any, any, any, any, any, any, any, any, any> & {
         schemas?: AnyMachineSchemas;
         internalEvents?: readonly string[];
     }, sources?: Sources, validator?: ActorLogicValidator | undefined);
@@ -98,7 +98,7 @@ export declare class StateMachine<TContext extends MachineContext, TEvent extend
     getInitialSnapshot(actorScope?: ActorScope<MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>, TEvent, AnyActorSystem, TEmitted>, input?: TInput): MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>;
     initialTransition(input: TInput | undefined, actorScope?: ActorScope<MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>, TEvent, AnyActorSystem, TEmitted>): ActorLogicTransitionResult<MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>, ExecutableActionObjectFromLogic<this>>;
     start(snapshot?: MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>): void;
-    getStateNodeById(stateId: string): StateNode<TContext, TEvent>;
+    getStateNodeById(stateId: string): StateNode<TContext, TEvent, TMeta, TTransitionMeta>;
     getPersistedSnapshot(snapshot: MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>, options?: unknown): Snapshot<unknown>;
     restoreSnapshot(snapshot: Snapshot<unknown>, actorScope?: ActorScope<MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>, TEvent, AnyActorSystem, TEmitted>): MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>;
 }

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

@@ -1,11 +1,11 @@
 import type { SetupStateSchemas } from "./schema.types.js";
-import type { DelayedTransitionDefinition, EventObject, InitialTransitionDefinition, MachineContext, Mapper, StateNodesConfig, TransitionDefinitionMap, AnyStateMachine, AnyStateNodeConfig, NonReducibleUnknown, EventDescriptor, AnyAction, AnyTransitionDefinition, AnyInvokeDefinition } from "./types.js";
-interface StateNodeOptions<TContext extends MachineContext, TEvent extends EventObject> {
+import type { DelayedTransitionDefinition, EventObject, InitialTransitionDefinition, MachineContext, Mapper, TransitionDefinition, TransitionDefinitionMap, AnyStateMachine, AnyStateNodeConfig, NonReducibleUnknown, EventDescriptor, AnyAction, InvokeDefinition, MetaObject } from "./types.js";
+interface StateNodeOptions<TStateMeta extends MetaObject, TTransitionMeta extends MetaObject> {
     _key: string;
-    _parent?: StateNode<TContext, TEvent>;
+    _parent?: StateNode<any, any, TStateMeta, TTransitionMeta>;
     _machine: AnyStateMachine;
 }
-export declare class StateNode<TContext extends MachineContext = MachineContext, TEvent extends EventObject = EventObject> {
+export declare class StateNode<TContext extends MachineContext = MachineContext, TEvent extends EventObject = EventObject, TStateMeta extends MetaObject = any, TTransitionMeta extends MetaObject = TStateMeta> {
     /** The raw config used to create the machine. */
     config: AnyStateNodeConfig;
     /**
@@ -29,7 +29,7 @@ export declare class StateNode<TContext extends MachineContext = MachineContext,
     /** The string path from the root machine node to this node. */
     path: string[];
     /** The child state nodes. */
-    states: StateNodesConfig<any, any>;
+    states: Record<string, StateNode<TContext, TEvent, TStateMeta, TTransitionMeta>>;
     /**
      * The type of history on this state node. Can be:
      *
@@ -42,14 +42,14 @@ export declare class StateNode<TContext extends MachineContext = MachineContext,
     /** The action(s) to be executed upon exiting the state node. */
     exit: AnyAction | undefined;
     /** The parent state node. */
-    parent?: StateNode<any, any>;
+    parent?: StateNode<TContext, TEvent, TStateMeta, TTransitionMeta>;
     /** The root machine node. */
     machine: AnyStateMachine;
     /**
      * The meta data associated with this state node, which will be returned in
      * State instances.
      */
-    meta?: any;
+    meta?: TStateMeta;
     /**
      * The output data sent with the `xstate.done.state` event if this is a final
      * state node.
@@ -63,17 +63,17 @@ export declare class StateNode<TContext extends MachineContext = MachineContext,
     description?: string;
     schemas: SetupStateSchemas | undefined;
     tags: string[];
-    transitions: Map<string, AnyTransitionDefinition[]>;
-    always?: Array<AnyTransitionDefinition>;
-    invoke: Array<AnyInvokeDefinition>;
-    on: TransitionDefinitionMap<any, any>;
-    after: Array<DelayedTransitionDefinition<any, any>>;
+    transitions: Map<string, TransitionDefinition<any, any, TTransitionMeta>[]>;
+    always?: Array<TransitionDefinition<any, any, TTransitionMeta>>;
+    invoke: Array<InvokeDefinition<any, any, any, TTransitionMeta, any, any, any, any>>;
+    on: TransitionDefinitionMap<any, any, TTransitionMeta>;
+    after: Array<DelayedTransitionDefinition<any, any, TTransitionMeta>>;
     events: Array<EventDescriptor<any>>;
     ownEvents: Array<EventDescriptor<any>>;
     private _candidateCache?;
     constructor(
     /** The raw config used to create the machine. */
-    config: AnyStateNodeConfig, options: StateNodeOptions<TContext, TEvent>);
-    get initial(): InitialTransitionDefinition;
+    config: AnyStateNodeConfig, options: StateNodeOptions<TStateMeta, TTransitionMeta>);
+    get initial(): InitialTransitionDefinition<TTransitionMeta>;
 }
 export {};

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

@@ -1,6 +1,6 @@
 import { symbolObservable } from "./symbolObservable.js";
 import { AnyActorSystem, Clock } from "./system.js";
-import type { ActorTrigger, AnyActor, AnyActorLogic, EmittedFrom, EventFromLogic, SendableEventFromLogic, InputFrom, PersistedSnapshotFor, Snapshot, SnapshotFrom, Readable } from "./types.js";
+import type { ActorTrigger, AnyActor, AnyActorLogic, EmittedFrom, EventFromLogic, SendableEventFromLogic, InputFrom, PersistedSnapshotOf, SnapshotFrom, Readable } from "./types.js";
 import { ActorOptions, ActorInstance, ActorRef, InteropSubscribable, Observer, Subscription } from "./types.js";
 /**
  * Marks a serialized object as an actor reference (`xstate$type` in JSON
@@ -200,7 +200,7 @@ export declare class Actor<TLogic extends AnyActorLogic> implements ActorInstanc
          * owns it. Defaults to `true`.
          */
         embedChildren?: boolean;
-    }): Snapshot<unknown> & PersistedSnapshotFor<TLogic>;
+    }): PersistedSnapshotOf<TLogic>;
     [symbolObservable](): InteropSubscribable<SnapshotFrom<TLogic>>;
     /**
      * Read an actor’s snapshot synchronously.