xstate 5.18.2 → 5.19.0

package/dist/{log-98fcce74.cjs.js → log-b0ee96de.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var guards_dist_xstateGuards = require('./raise-b1e0b9a9.cjs.js');
+var guards_dist_xstateGuards = require('./raise-60cebf03.cjs.js');
 
 function createSpawner(actorScope, {
   machine,
@@ -85,7 +85,7 @@ function resolveAssign(actorScope, snapshot, actionArgs, actionParams, {
       ...snapshot.children,
       ...spawnedChildren
     } : snapshot.children
-  })];
+  }), undefined, undefined];
 }
 /**
  * Updates the current context of the machine.
@@ -122,7 +122,7 @@ function resolveAssign(actorScope, snapshot, actionArgs, actionParams, {
  *   update.
  */
 function assign(assignment) {
-  function assign(args, params) {
+  function assign(_args, _params) {
   }
   assign.type = 'xstate.assign';
   assign.assignment = assignment;
@@ -136,7 +136,7 @@ function resolveEmit(_, snapshot, args, actionParams, {
   const resolvedEvent = typeof eventOrExpr === 'function' ? eventOrExpr(args, actionParams) : eventOrExpr;
   return [snapshot, {
     event: resolvedEvent
-  }];
+  }, undefined];
 }
 function executeEmit(actorScope, {
   event
@@ -181,7 +181,7 @@ function executeEmit(actorScope, {
  */
 function emit(/** The event to emit, or an expression that returns an event to emit. */
 eventOrExpr) {
-  function emit(args, params) {
+  function emit(_args, _params) {
   }
   emit.type = 'xstate.emit';
   emit.event = eventOrExpr;
@@ -226,8 +226,6 @@ eventOrExpr) {
  *   "someChildState" }`.
  */
 
-// TODO: remove once TS fixes this type-widening issue
-
 /** @deprecated Use `AnyMachineSnapshot` instead */
 
 // TODO: possibly refactor this somehow, use even a simpler type, and maybe even make `machine.options` private or something
@@ -258,6 +256,8 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
 
 /** @deprecated */
 
+// TODO: cover all that can be actually returned
+
 function resolveSendTo(actorScope, snapshot, args, actionParams, {
   to,
   event: eventOrExpr,
@@ -266,7 +266,9 @@ function resolveSendTo(actorScope, snapshot, args, actionParams, {
 }, extra) {
   const delaysMap = snapshot.machine.implementations.delays;
   if (typeof eventOrExpr === 'string') {
-    throw new Error(`Only event objects may be used with sendTo; use sendTo({ type: "${eventOrExpr}" }) instead`);
+    throw new Error(
+    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+    `Only event objects may be used with sendTo; use sendTo({ type: "${eventOrExpr}" }) instead`);
   }
   const resolvedEvent = typeof eventOrExpr === 'function' ? eventOrExpr(args, actionParams) : eventOrExpr;
   let resolvedDelay;
@@ -279,9 +281,12 @@ function resolveSendTo(actorScope, snapshot, args, actionParams, {
   const resolvedTarget = typeof to === 'function' ? to(args, actionParams) : to;
   let targetActorRef;
   if (typeof resolvedTarget === 'string') {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
     if (resolvedTarget === SpecialTargets.Parent) {
       targetActorRef = actorScope.self._parent;
-    } else if (resolvedTarget === SpecialTargets.Internal) {
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
+    else if (resolvedTarget === SpecialTargets.Internal) {
       targetActorRef = actorScope.self;
     } else if (resolvedTarget.startsWith('#_')) {
       // SCXML compatibility: https://www.w3.org/TR/scxml/#SCXMLEventProcessor
@@ -298,10 +303,11 @@ function resolveSendTo(actorScope, snapshot, args, actionParams, {
   }
   return [snapshot, {
     to: targetActorRef,
+    targetId: typeof resolvedTarget === 'string' ? resolvedTarget : undefined,
     event: resolvedEvent,
     id,
     delay: resolvedDelay
-  }];
+  }, undefined];
 }
 function retryResolveSendTo(_, snapshot, params) {
   if (typeof params.to === 'string') {
@@ -340,9 +346,9 @@ function executeSendTo(actorScope, params) {
  *   - `delay` - The number of milliseconds to delay the sending of the event.
  */
 function sendTo(to, eventOrExpr, options) {
-  function sendTo(args, params) {
+  function sendTo(_args, _params) {
   }
-  sendTo.type = 'xsnapshot.sendTo';
+  sendTo.type = 'xstate.sendTo';
   sendTo.to = to;
   sendTo.event = eventOrExpr;
   sendTo.id = options?.id;
@@ -442,7 +448,7 @@ function resolveEnqueueActions(actorScope, snapshot, args, actionParams, {
  * ```
  */
 function enqueueActions(collect) {
-  function enqueueActions(args, params) {
+  function enqueueActions(_args, _params) {
   }
   enqueueActions.type = 'xstate.enqueueActions';
   enqueueActions.collect = collect;
@@ -457,7 +463,7 @@ function resolveLog(_, snapshot, actionArgs, actionParams, {
   return [snapshot, {
     value: typeof value === 'function' ? value(actionArgs, actionParams) : value,
     label
-  }];
+  }, undefined];
 }
 function executeLog({
   logger
@@ -487,7 +493,7 @@ function log(value = ({
   context,
   event
 }), label) {
-  function log(args, params) {
+  function log(_args, _params) {
   }
   log.type = 'xstate.log';
   log.value = value;

package/dist/{log-38475d87.development.esm.js → log-ef30c65f.development.esm.js}

@@ -1,4 +1,4 @@
-import { T as ProcessingStatus, z as resolveReferencedActor, A as createActor, U as cloneMachineSnapshot, V as executingCustomAction, W as XSTATE_ERROR, Y as createErrorActorEvent, e as evaluateGuard, M as cancel, O as raise, P as spawnChild, R as stopChild } from './raise-5ea71f04.development.esm.js';
+import { T as ProcessingStatus, z as resolveReferencedActor, A as createActor, U as cloneMachineSnapshot, V as executingCustomAction, W as XSTATE_ERROR, Y as createErrorActorEvent, e as evaluateGuard, M as cancel, O as raise, P as spawnChild, R as stopChild } from './raise-1db27a82.development.esm.js';
 
 function createSpawner(actorScope, {
   machine,
@@ -83,7 +83,7 @@ function resolveAssign(actorScope, snapshot, actionArgs, actionParams, {
       ...snapshot.children,
       ...spawnedChildren
     } : snapshot.children
-  })];
+  }), undefined, undefined];
 }
 /**
  * Updates the current context of the machine.
@@ -123,7 +123,7 @@ function assign(assignment) {
   if (executingCustomAction) {
     console.warn('Custom actions should not call `assign()` directly, as it is not imperative. See https://stately.ai/docs/actions#built-in-actions for more details.');
   }
-  function assign(args, params) {
+  function assign(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
@@ -137,13 +137,10 @@ function assign(assignment) {
 function resolveEmit(_, snapshot, args, actionParams, {
   event: eventOrExpr
 }) {
-  if (typeof eventOrExpr === 'string') {
-    throw new Error(`Only event objects may be used with emit; use emit({ type: "${eventOrExpr}" }) instead`);
-  }
   const resolvedEvent = typeof eventOrExpr === 'function' ? eventOrExpr(args, actionParams) : eventOrExpr;
   return [snapshot, {
     event: resolvedEvent
-  }];
+  }, undefined];
 }
 function executeEmit(actorScope, {
   event
@@ -191,7 +188,7 @@ eventOrExpr) {
   if (executingCustomAction) {
     console.warn('Custom actions should not call `emit()` directly, as it is not imperative. See https://stately.ai/docs/actions#built-in-actions for more details.');
   }
-  function emit(args, params) {
+  function emit(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
@@ -239,8 +236,6 @@ eventOrExpr) {
  *   "someChildState" }`.
  */
 
-// TODO: remove once TS fixes this type-widening issue
-
 /** @deprecated Use `AnyMachineSnapshot` instead */
 
 // TODO: possibly refactor this somehow, use even a simpler type, and maybe even make `machine.options` private or something
@@ -271,6 +266,8 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
 
 /** @deprecated */
 
+// TODO: cover all that can be actually returned
+
 function resolveSendTo(actorScope, snapshot, args, actionParams, {
   to,
   event: eventOrExpr,
@@ -279,7 +276,9 @@ function resolveSendTo(actorScope, snapshot, args, actionParams, {
 }, extra) {
   const delaysMap = snapshot.machine.implementations.delays;
   if (typeof eventOrExpr === 'string') {
-    throw new Error(`Only event objects may be used with sendTo; use sendTo({ type: "${eventOrExpr}" }) instead`);
+    throw new Error(
+    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+    `Only event objects may be used with sendTo; use sendTo({ type: "${eventOrExpr}" }) instead`);
   }
   const resolvedEvent = typeof eventOrExpr === 'function' ? eventOrExpr(args, actionParams) : eventOrExpr;
   let resolvedDelay;
@@ -292,9 +291,12 @@ function resolveSendTo(actorScope, snapshot, args, actionParams, {
   const resolvedTarget = typeof to === 'function' ? to(args, actionParams) : to;
   let targetActorRef;
   if (typeof resolvedTarget === 'string') {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
     if (resolvedTarget === SpecialTargets.Parent) {
       targetActorRef = actorScope.self._parent;
-    } else if (resolvedTarget === SpecialTargets.Internal) {
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
+    else if (resolvedTarget === SpecialTargets.Internal) {
       targetActorRef = actorScope.self;
     } else if (resolvedTarget.startsWith('#_')) {
       // SCXML compatibility: https://www.w3.org/TR/scxml/#SCXMLEventProcessor
@@ -311,10 +313,11 @@ function resolveSendTo(actorScope, snapshot, args, actionParams, {
   }
   return [snapshot, {
     to: targetActorRef,
+    targetId: typeof resolvedTarget === 'string' ? resolvedTarget : undefined,
     event: resolvedEvent,
     id,
     delay: resolvedDelay
-  }];
+  }, undefined];
 }
 function retryResolveSendTo(_, snapshot, params) {
   if (typeof params.to === 'string') {
@@ -354,14 +357,14 @@ function executeSendTo(actorScope, params) {
  */
 function sendTo(to, eventOrExpr, options) {
   if (executingCustomAction) {
-    console.warn('Custom actions should not call `raise()` directly, as it is not imperative. See https://stately.ai/docs/actions#built-in-actions for more details.');
+    console.warn('Custom actions should not call `sendTo()` directly, as it is not imperative. See https://stately.ai/docs/actions#built-in-actions for more details.');
   }
-  function sendTo(args, params) {
+  function sendTo(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
   }
-  sendTo.type = 'xsnapshot.sendTo';
+  sendTo.type = 'xstate.sendTo';
   sendTo.to = to;
   sendTo.event = eventOrExpr;
   sendTo.id = options?.id;
@@ -471,7 +474,7 @@ function resolveEnqueueActions(actorScope, snapshot, args, actionParams, {
  * ```
  */
 function enqueueActions(collect) {
-  function enqueueActions(args, params) {
+  function enqueueActions(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
@@ -489,7 +492,7 @@ function resolveLog(_, snapshot, actionArgs, actionParams, {
   return [snapshot, {
     value: typeof value === 'function' ? value(actionArgs, actionParams) : value,
     label
-  }];
+  }, undefined];
 }
 function executeLog({
   logger
@@ -519,7 +522,7 @@ function log(value = ({
   context,
   event
 }), label) {
-  function log(args, params) {
+  function log(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }

package/dist/{raise-5ea71f04.development.esm.js → raise-1db27a82.development.esm.js}

@@ -154,7 +154,7 @@ function toStatePath(stateId) {
   if (isArray(stateId)) {
     return stateId;
   }
-  let result = [];
+  const result = [];
   let segment = '';
   for (let i = 0; i < stateId.length; i++) {
     const char = stateId.charCodeAt(i);
@@ -234,7 +234,7 @@ function resolveOutput(mapper, context, event, self) {
     });
   }
   if (!!mapper && typeof mapper === 'object' && Object.values(mapper).some(val => typeof val === 'function')) {
-    console.warn(`Dynamically mapping values to individual properties is deprecated. Use a single function that returns the mapped object instead.\nFound object containing properties whose values are possibly mapping functions: ${Object.entries(mapper).filter(([key, value]) => typeof value === 'function').map(([key, value]) => `\n - ${key}: ${value.toString().replace(/\n\s*/g, '')}`).join('')}`);
+    console.warn(`Dynamically mapping values to individual properties is deprecated. Use a single function that returns the mapped object instead.\nFound object containing properties whose values are possibly mapping functions: ${Object.entries(mapper).filter(([, value]) => typeof value === 'function').map(([key, value]) => `\n - ${key}: ${value.toString().replace(/\n\s*/g, '')}`).join('')}`);
   }
   return mapper;
 }
@@ -422,6 +422,7 @@ function createSystem(rootActor, options) {
   return system;
 }
 
+let executingCustomAction = false;
 const $$ACTOR_TYPE = 1;
 
 // those values are currently used by @xstate/react directly so it's important to keep the assigned values in sync
@@ -542,10 +543,37 @@ class Actor {
         if (!listeners && !wildcardListener) {
           return;
         }
-        const allListeners = new Set([...(listeners ? listeners.values() : []), ...(wildcardListener ? wildcardListener.values() : [])]);
-        for (const handler of Array.from(allListeners)) {
+        const allListeners = [...(listeners ? listeners.values() : []), ...(wildcardListener ? wildcardListener.values() : [])];
+        for (const handler of allListeners) {
           handler(emittedEvent);
         }
+      },
+      actionExecutor: action => {
+        const exec = () => {
+          this._actorScope.system._sendInspectionEvent({
+            type: '@xstate.action',
+            actorRef: this,
+            action: {
+              type: action.type,
+              params: action.params
+            }
+          });
+          if (!action.exec) {
+            return;
+          }
+          const saveExecutingCustomAction = executingCustomAction;
+          try {
+            executingCustomAction = true;
+            action.exec(action.info, action.params);
+          } finally {
+            executingCustomAction = saveExecutingCustomAction;
+          }
+        };
+        if (this._processingStatus === ProcessingStatus.Running) {
+          exec();
+        } else {
+          this._deferred.push(exec);
+        }
       }
     };
 
@@ -1085,11 +1113,13 @@ function resolveCancel(_, snapshot, actionArgs, actionParams, {
   sendId
 }) {
   const resolvedSendId = typeof sendId === 'function' ? sendId(actionArgs, actionParams) : sendId;
-  return [snapshot, resolvedSendId];
+  return [snapshot, {
+    sendId: resolvedSendId
+  }, undefined];
 }
-function executeCancel(actorScope, resolvedSendId) {
+function executeCancel(actorScope, params) {
   actorScope.defer(() => {
-    actorScope.system.scheduler.cancel(actorScope.self, resolvedSendId);
+    actorScope.system.scheduler.cancel(actorScope.self, params.sendId);
   });
 }
 /**
@@ -1125,7 +1155,7 @@ function executeCancel(actorScope, resolvedSendId) {
  * @param sendId The `id` of the `sendTo(...)` action to cancel.
  */
 function cancel(sendId) {
-  function cancel(args, params) {
+  function cancel(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
@@ -1147,22 +1177,26 @@ function resolveSpawn(actorScope, snapshot, actionArgs, _actionParams, {
   const logic = typeof src === 'string' ? resolveReferencedActor(snapshot.machine, src) : src;
   const resolvedId = typeof id === 'function' ? id(actionArgs) : id;
   let actorRef;
+  let resolvedInput = undefined;
   if (logic) {
+    resolvedInput = typeof input === 'function' ? input({
+      context: snapshot.context,
+      event: actionArgs.event,
+      self: actorScope.self
+    }) : input;
     actorRef = createActor(logic, {
       id: resolvedId,
       src,
       parent: actorScope.self,
       syncSnapshot,
       systemId,
-      input: typeof input === 'function' ? input({
-        context: snapshot.context,
-        event: actionArgs.event,
-        self: actorScope.self
-      }) : input
+      input: resolvedInput
     });
   }
   if (!actorRef) {
-    console.warn(`Actor type '${src}' not found in machine '${actorScope.id}'.`);
+    console.warn(
+    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions,@typescript-eslint/no-base-to-string
+    `Actor type '${src}' not found in machine '${actorScope.id}'.`);
   }
   return [cloneMachineSnapshot(snapshot, {
     children: {
@@ -1171,11 +1205,13 @@ function resolveSpawn(actorScope, snapshot, actionArgs, _actionParams, {
     }
   }), {
     id,
-    actorRef
-  }];
+    systemId,
+    actorRef,
+    src,
+    input: resolvedInput
+  }, undefined];
 }
 function executeSpawn(actorScope, {
-  id,
   actorRef
 }) {
   if (!actorRef) {
@@ -1194,12 +1230,12 @@ function spawnChild(...[src, {
   input,
   syncSnapshot = false
 } = {}]) {
-  function spawnChild(args, params) {
+  function spawnChild(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
   }
-  spawnChild.type = 'snapshot.spawnChild';
+  spawnChild.type = 'xstate.spawnChild';
   spawnChild.id = id;
   spawnChild.systemId = systemId;
   spawnChild.src = src;
@@ -1224,7 +1260,7 @@ function resolveStop(_, snapshot, args, actionParams, {
   }
   return [cloneMachineSnapshot(snapshot, {
     children
-  }), resolvedActorRef];
+  }), resolvedActorRef, undefined];
 }
 function executeStop(actorScope, actorRef) {
   if (!actorRef) {
@@ -1256,7 +1292,7 @@ function executeStop(actorScope, actorRef) {
  * @param actorRef The actor to stop.
  */
 function stopChild(actorRef) {
-  function stop(args, params) {
+  function stop(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
@@ -1286,7 +1322,7 @@ function checkStateIn(snapshot, _, {
   return snapshot.matches(stateValue);
 }
 function stateIn(stateValue) {
-  function stateIn(args, params) {
+  function stateIn() {
     {
       throw new Error(`This isn't supposed to be called`);
     }
@@ -1334,7 +1370,7 @@ function checkNot(snapshot, {
  * @returns A guard
  */
 function not(guard) {
-  function not(args, params) {
+  function not(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
@@ -1382,7 +1418,7 @@ function checkAnd(snapshot, {
  * @returns A guard action object
  */
 function and(guards) {
-  function and(args, params) {
+  function and(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
@@ -1430,7 +1466,7 @@ function checkOr(snapshot, {
  * @returns A guard action object
  */
 function or(guards) {
-  function or(args, params) {
+  function or(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }
@@ -1616,7 +1652,7 @@ function getDelayedTransitions(stateNode) {
   if (!afterConfig) {
     return [];
   }
-  const mutateEntryExit = (delay, i) => {
+  const mutateEntryExit = delay => {
     const afterEvent = createAfterEvent(delay, stateNode.id);
     const eventType = afterEvent.type;
     stateNode.entry.push(raise(afterEvent, {
@@ -1626,7 +1662,7 @@ function getDelayedTransitions(stateNode) {
     stateNode.exit.push(cancel(eventType));
     return eventType;
   };
-  const delayedTransitions = Object.keys(afterConfig).flatMap((delay, i) => {
+  const delayedTransitions = Object.keys(afterConfig).flatMap(delay => {
     const configTransition = afterConfig[delay];
     const resolvedTransition = typeof configTransition === 'string' ? {
       target: configTransition
@@ -1716,7 +1752,9 @@ function formatTransitions(stateNode) {
 function formatInitialTransition(stateNode, _target) {
   const resolvedTarget = typeof _target === 'string' ? stateNode.states[_target] : _target ? stateNode.states[_target.target] : undefined;
   if (!resolvedTarget && _target) {
-    throw new Error(`Initial state node "${_target}" not found on parent state node #${stateNode.id}`);
+    throw new Error(
+    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-base-to-string
+    `Initial state node "${_target}" not found on parent state node #${stateNode.id}`);
   }
   const transition = {
     source: stateNode,
@@ -1826,7 +1864,7 @@ function getStateNodeByPath(stateNode, statePath) {
   if (typeof statePath === 'string' && isStateId(statePath)) {
     try {
       return stateNode.machine.getStateNodeById(statePath);
-    } catch (e) {
+    } catch {
       // try individual paths
       // throw e;
     }
@@ -2055,18 +2093,20 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
 
   // Exit states
   if (!isInitial) {
-    [nextState, historyValue] = exitStates(nextState, event, actorScope, filteredTransitions, mutStateNodeSet, historyValue, internalQueue);
+    [nextState, historyValue] = exitStates(nextState, event, actorScope, filteredTransitions, mutStateNodeSet, historyValue, internalQueue, actorScope.actionExecutor);
   }
 
   // Execute transition content
-  nextState = resolveActionsAndContext(nextState, event, actorScope, filteredTransitions.flatMap(t => t.actions), internalQueue);
+  nextState = resolveActionsAndContext(nextState, event, actorScope, filteredTransitions.flatMap(t => t.actions), internalQueue, undefined);
 
   // Enter states
   nextState = enterStates(nextState, event, actorScope, filteredTransitions, mutStateNodeSet, internalQueue, historyValue, isInitial);
   const nextStateNodes = [...mutStateNodeSet];
   if (nextState.status === 'done') {
-    nextState = resolveActionsAndContext(nextState, event, actorScope, nextStateNodes.sort((a, b) => b.order - a.order).flatMap(state => state.exit), internalQueue);
+    nextState = resolveActionsAndContext(nextState, event, actorScope, nextStateNodes.sort((a, b) => b.order - a.order).flatMap(state => state.exit), internalQueue, undefined);
   }
+
+  // eslint-disable-next-line no-useless-catch
   try {
     if (historyValue === currentSnapshot.historyValue && areStateNodeCollectionsEqual(currentSnapshot._nodes, mutStateNodeSet)) {
       return nextState;
@@ -2236,7 +2276,7 @@ function addAncestorStatesToEnter(statesToEnter, historyValue, statesForDefaultE
 function addProperAncestorStatesToEnter(stateNode, toStateNode, statesToEnter, historyValue, statesForDefaultEntry) {
   addAncestorStatesToEnter(statesToEnter, historyValue, statesForDefaultEntry, getProperAncestors(stateNode, toStateNode));
 }
-function exitStates(currentSnapshot, event, actorScope, transitions, mutStateNodeSet, historyValue, internalQueue) {
+function exitStates(currentSnapshot, event, actorScope, transitions, mutStateNodeSet, historyValue, internalQueue, _actionExecutor) {
   let nextSnapshot = currentSnapshot;
   const statesToExit = computeExitSet(transitions, mutStateNodeSet, historyValue);
   statesToExit.sort((a, b) => b.order - a.order);
@@ -2260,12 +2300,14 @@ function exitStates(currentSnapshot, event, actorScope, transitions, mutStateNod
     }
   }
   for (const s of statesToExit) {
-    nextSnapshot = resolveActionsAndContext(nextSnapshot, event, actorScope, [...s.exit, ...s.invoke.map(def => stopChild(def.id))], internalQueue);
+    nextSnapshot = resolveActionsAndContext(nextSnapshot, event, actorScope, [...s.exit, ...s.invoke.map(def => stopChild(def.id))], internalQueue, undefined);
     mutStateNodeSet.delete(s);
   }
   return [nextSnapshot, changedHistory || historyValue];
 }
-let executingCustomAction = false;
+function getAction(machine, actionType) {
+  return machine.implementations.actions[actionType];
+}
 function resolveAndExecuteActionsWithContext(currentSnapshot, event, actorScope, actions, extra, retries) {
   const {
     machine
@@ -2277,10 +2319,8 @@ function resolveAndExecuteActionsWithContext(currentSnapshot, event, actorScope,
     // the existing type of `.actions` assumes non-nullable `TExpressionAction`
     // it's fine to cast this here to get a common type and lack of errors in the rest of the code
     // our logic below makes sure that we call those 2 "variants" correctly
-    machine.implementations.actions[typeof action === 'string' ? action : action.type];
-    if (!resolvedAction) {
-      continue;
-    }
+
+    getAction(machine, typeof action === 'string' ? action : action.type);
     const actionArgs = {
       context: intermediateSnapshot.context,
       event,
@@ -2291,30 +2331,13 @@ function resolveAndExecuteActionsWithContext(currentSnapshot, event, actorScope,
       context: intermediateSnapshot.context,
       event
     }) : action.params : undefined;
-    function executeAction() {
-      actorScope.system._sendInspectionEvent({
-        type: '@xstate.action',
-        actorRef: actorScope.self,
-        action: {
-          type: typeof action === 'string' ? action : typeof action === 'object' ? action.type : action.name || '(anonymous)',
-          params: actionParams
-        }
+    if (!resolvedAction || !('resolve' in resolvedAction)) {
+      actorScope.actionExecutor({
+        type: typeof action === 'string' ? action : typeof action === 'object' ? action.type : action.name || '(anonymous)',
+        info: actionArgs,
+        params: actionParams,
+        exec: resolvedAction
       });
-      try {
-        executingCustomAction = resolvedAction;
-        resolvedAction(actionArgs, actionParams);
-      } finally {
-        executingCustomAction = false;
-      }
-    }
-    if (!('resolve' in resolvedAction)) {
-      if (actorScope.self._processingStatus === ProcessingStatus.Running) {
-        executeAction();
-      } else {
-        actorScope.defer(() => {
-          executeAction();
-        });
-      }
       continue;
     }
     const builtinAction = resolvedAction;
@@ -2326,11 +2349,12 @@ function resolveAndExecuteActionsWithContext(currentSnapshot, event, actorScope,
       retries?.push([builtinAction, params]);
     }
     if ('execute' in builtinAction) {
-      if (actorScope.self._processingStatus === ProcessingStatus.Running) {
-        builtinAction.execute(actorScope, params);
-      } else {
-        actorScope.defer(builtinAction.execute.bind(null, actorScope, params));
-      }
+      actorScope.actionExecutor({
+        type: builtinAction.type,
+        info: actionArgs,
+        params,
+        exec: builtinAction.execute.bind(null, actorScope, params)
+      });
     }
     if (actions) {
       intermediateSnapshot = resolveAndExecuteActionsWithContext(intermediateSnapshot, event, actorScope, actions, extra, retries);
@@ -2349,7 +2373,7 @@ function resolveActionsAndContext(currentSnapshot, event, actorScope, actions, i
   });
   return nextState;
 }
-function macrostep(snapshot, event, actorScope, internalQueue = []) {
+function macrostep(snapshot, event, actorScope, internalQueue) {
   if (event.type === WILDCARD) {
     throw new Error(`An event cannot have the wildcard type ('${WILDCARD}')`);
   }
@@ -2431,7 +2455,7 @@ function macrostep(snapshot, event, actorScope, internalQueue = []) {
   };
 }
 function stopChildren(nextState, event, actorScope) {
-  return resolveActionsAndContext(nextState, event, actorScope, Object.values(nextState.children).map(child => stopChild(child)), []);
+  return resolveActionsAndContext(nextState, event, actorScope, Object.values(nextState.children).map(child => stopChild(child)), [], undefined);
 }
 function selectTransitions(event, nextState) {
   return nextState.machine.getTransitionData(nextState, event);
@@ -2604,7 +2628,9 @@ function resolveRaise(_, snapshot, args, actionParams, {
 }) {
   const delaysMap = snapshot.machine.implementations.delays;
   if (typeof eventOrExpr === 'string') {
-    throw new Error(`Only event objects may be used with raise; use raise({ type: "${eventOrExpr}" }) instead`);
+    throw new Error(
+    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+    `Only event objects may be used with raise; use raise({ type: "${eventOrExpr}" }) instead`);
   }
   const resolvedEvent = typeof eventOrExpr === 'function' ? eventOrExpr(args, actionParams) : eventOrExpr;
   let resolvedDelay;
@@ -2621,7 +2647,7 @@ function resolveRaise(_, snapshot, args, actionParams, {
     event: resolvedEvent,
     id,
     delay: resolvedDelay
-  }];
+  }, undefined];
 }
 function executeRaise(actorScope, params) {
   const {
@@ -2647,7 +2673,7 @@ function raise(eventOrExpr, options) {
   if (executingCustomAction) {
     console.warn('Custom actions should not call `raise()` directly, as it is not imperative. See https://stately.ai/docs/actions#built-in-actions for more details.');
   }
-  function raise(args, params) {
+  function raise(_args, _params) {
     {
       throw new Error(`This isn't supposed to be called`);
     }