xstate 6.0.0-alpha.21 → 6.0.0-alpha.23

package/dist/xstate.development.esm.js

@@ -1,7 +1,7 @@
-import { m as matchesEventDescriptor, t as toArray$1, b as builtInActions, X as XSTATE_INIT, d as deriveDeferredStarts, c as createTransitionEnqueue, a as XSTATE_STOP, r as resolveActionsWithContext, p as parseDelayToMilliseconds, i as isAtomicStateNode, e as createActor, f as macrostep, g as createInitEvent, h as initialMicrostep, j as getProperAncestors } from './index-d39fb138.development.esm.js';
-export { A as Actor, T as TimeoutError, n as __unsafe_getAllOwnEventDescriptors, q as checkStateIn, e as createActor, C as createAsyncLogic, x as createCallbackLogic, w as createEmptyActor, z as createEventObservableLogic, D as createListenerLogic, B as createLogic, y as createObservableLogic, F as createSubscriptionLogic, l as getStateNodes, v as isBuiltInExecutableAction, k as isMachineSnapshot, E as listenerLogic, o as matchesState, s as pathToStateValue, G as subscriptionLogic, u as toObserver } from './index-d39fb138.development.esm.js';
-import { S as StateMachine } from './StateMachine-e25dd61f.development.esm.js';
-export { S as StateMachine, a as StateNode } from './StateMachine-e25dd61f.development.esm.js';
+import { m as matchesEventDescriptor, t as toArray$1, b as builtInActions, X as XSTATE_INIT, f as finalizeTransitionResult, d as deriveDeferredStarts, c as createTransitionEnqueue, a as XSTATE_STOP, r as resolveActionsWithContext, e as XSTATE_TIMER, g as createSendToEffect, p as parseDelayToMilliseconds, i as isAtomicStateNode, h as createActor, j as macrostep, k as createInitEvent, l as createSpawnEffect, n as initialMicrostep, o as getProperAncestors } from './index-f5407323.development.esm.js';
+export { A as Actor, T as TimeoutError, u as __unsafe_getAllOwnEventDescriptors, w as checkStateIn, h as createActor, H as createAsyncLogic, D as createCallbackLogic, C as createEmptyActor, F as createEventObservableLogic, I as createListenerLogic, G as createLogic, E as createObservableLogic, K as createSubscriptionLogic, z as executeEffects, s as getStateNodes, B as isBuiltInExecutableAction, q as isMachineSnapshot, J as listenerLogic, v as matchesState, x as pathToStateValue, L as subscriptionLogic, y as toObserver } from './index-f5407323.development.esm.js';
+import { S as StateMachine, c as createInertActorScope, s as setInertActorScopeSnapshot, a as attachSnapshotActorRef } from './StateMachine-d2247245.development.esm.js';
+export { S as StateMachine, d as StateNode, g as getInitialSnapshot, b as getNextSnapshot } from './StateMachine-d2247245.development.esm.js';
 
 /**
  * Asserts that the given event object is of the specified type or types. Throws
@@ -135,6 +135,8 @@ function createSnapshot(value, context, input, machine, stateInput) {
     context,
     input,
     children: {},
+    timers: {},
+    _nextTimerId: 0,
     _stateInput: stateInput,
     machine
   };
@@ -148,6 +150,8 @@ function cloneSnapshot(snapshot, value, context, stateInput) {
     context,
     input: snapshot.input,
     children: snapshot.children,
+    timers: snapshot.timers,
+    _nextTimerId: snapshot._nextTimerId,
     _stateInput: stateInput,
     machine: snapshot.machine
   };
@@ -161,6 +165,8 @@ function stopSnapshot(snapshot) {
     context: snapshot.context,
     input: undefined,
     children: snapshot.children,
+    timers: snapshot.timers,
+    _nextTimerId: snapshot._nextTimerId,
     _stateInput: snapshot._stateInput,
     machine: snapshot.machine
   };
@@ -184,10 +190,14 @@ function resolveSimpleEnqueuedActions(rawActions) {
       return undefined;
     }
     executableActions.push({
+      kind: 'action',
       type: action.action.name || '(anonymous)',
       params: undefined,
       args: action.args,
-      exec: action.args.length ? action.action.bind(null, ...action.args) : action.action
+      action: action.action,
+      exec() {
+        return this.action?.(...this.args);
+      }
     });
   }
   return executableActions;
@@ -294,7 +304,32 @@ function createFSM(config) {
       return [snapshot, []];
     }
     if (event.type === XSTATE_STOP) {
-      return [stopSnapshot(snapshot), emptyExecutableActions];
+      const actions = [];
+      const enqueue = createTransitionEnqueue(actorScope, actions, []);
+      for (const id of Object.keys(snapshot.timers)) {
+        enqueue.cancel(id);
+      }
+      const [withoutTimers, cancelEffects] = resolveActionsWithContext(snapshot, event, actorScope, actions);
+      return [stopSnapshot(withoutTimers), cancelEffects];
+    }
+    if (event.type === XSTATE_TIMER) {
+      const timer = snapshot.timers[event.id];
+      if (!timer) {
+        return [snapshot, emptyExecutableActions];
+      }
+      const timers = {
+        ...snapshot.timers
+      };
+      delete timers[timer.id];
+      const nextSnapshot = {
+        ...snapshot,
+        timers
+      };
+      if (timer.type === '@xstate.raise') {
+        return transitionCore(nextSnapshot, timer.event, actorScope);
+      }
+      const target = timer.target === 'self' ? actorScope.self : timer.target;
+      return [nextSnapshot, [createSendToEffect(actorScope, target, timer.event)]];
     }
     const stateConfig = config.states[snapshot.value];
     const directTransition = stateConfig?.on?.[event.type];
@@ -390,7 +425,7 @@ function createFSM(config) {
   };
   const transition = (...args) => {
     const [nextSnapshot, effects] = transitionCore(...args);
-    return [nextSnapshot, [...effects, ...deriveDeferredStarts(effects)]];
+    return finalizeTransitionResult(args[2], args[0], [nextSnapshot, [...effects, ...deriveDeferredStarts(effects)]]);
   };
   const logic = {
     id: config.id,
@@ -411,7 +446,7 @@ function createFSM(config) {
         nextSnapshot = raisedSnapshot;
         actions.push(...raisedActions);
       }
-      return [nextSnapshot, [...actions, ...deriveDeferredStarts(actions)]];
+      return finalizeTransitionResult(actorScope, undefined, [nextSnapshot, [...actions, ...deriveDeferredStarts(actions)]]);
     },
     getInitialSnapshot: (actorScope, input) => logic.initialTransition(input, actorScope)[0],
     getPersistedSnapshot: ({
@@ -2180,71 +2215,6 @@ function mergeSetupConfigs(base, extension) {
   };
 }
 
-/** @internal */
-function createInertActorScope(actorLogic) {
-  const self = createActor(actorLogic, {
-    _inert: true
-  });
-  const inertActorScope = {
-    self: self,
-    defer: () => {},
-    id: '',
-    logger: () => {},
-    sessionId: '',
-    stopChild: () => {},
-    system: self.system,
-    emit: () => {},
-    actionExecutor: () => {}
-  };
-  return inertActorScope;
-}
-
-/** @deprecated Use `initialTransition(…)` instead. */
-function getInitialSnapshot(actorLogic, ...[input]) {
-  const actorScope = createInertActorScope(actorLogic);
-  return actorLogic.initialTransition(input, actorScope)[0];
-}
-
-/**
- * Determines the next snapshot for the given `actorLogic` based on the given
- * `snapshot` and `event`.
- *
- * If the `snapshot` is `undefined`, the initial snapshot of the `actorLogic` is
- * used.
- *
- * @deprecated Use `transition(…)` instead.
- * @example
- *
- * ```ts
- * import { getNextSnapshot } from 'xstate';
- * import { trafficLightMachine } from './trafficLightMachine.ts';
- *
- * const nextSnapshot = getNextSnapshot(
- *   trafficLightMachine, // actor logic
- *   undefined, // snapshot (or initial state if undefined)
- *   { type: 'TIMER' }
- * ); // event object
- *
- * console.log(nextSnapshot.value);
- * // => 'yellow'
- *
- * const nextSnapshot2 = getNextSnapshot(
- *   trafficLightMachine, // actor logic
- *   nextSnapshot, // snapshot
- *   { type: 'TIMER' }
- * ); // event object
- *
- * console.log(nextSnapshot2.value);
- * // =>'red'
- * ```
- */
-function getNextSnapshot(actorLogic, snapshot, event) {
-  const inertActorScope = createInertActorScope(actorLogic);
-  inertActorScope.self._snapshot = snapshot;
-  const transitionResult = actorLogic.transition(snapshot, event, inertActorScope);
-  return Array.isArray(transitionResult) ? transitionResult[0] : transitionResult;
-}
-
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
@@ -2401,24 +2371,9 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
   return SpecialTargets;
 }({});
 
-/**
- * A pending effect (delayed event/transition that has not fired yet) captured
- * in a persisted snapshot — a serialized built-in action descriptor plus its
- * runtime progress, with enough information to restore it under any strategy.
- */
+/** A deterministic delayed-delivery declaration owned by a logic snapshot. */
 
-/**
- * How pending effects (timers) from a persisted snapshot are restored on
- * `actor.start()`:
- *
- * - `'resume'` (default) — the clock was "frozen" while persisted: a 5-minute
- *   timer persisted with 1 minute elapsed fires after 4 more minutes.
- * - `'restart'` — timers start over with their full delay.
- * - `'absolute'` — timers honor the original wall-clock expiry (`startedAt +
- *   delay`); already-expired timers fire immediately.
- * - A custom function receiving the pending effect and returning the remaining
- *   delay in ms.
- */
+/** The logical input delivered to a timer's source when its runtime delay ends. */
 
 /** @deprecated Use `AnyActor` instead. */
 
@@ -2464,8 +2419,6 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
 
 /** The concrete actor instance type produced from actor logic. */
 
-// TODO: in v6, this should only accept AnyActorLogic, like ActorRefFromLogic
-
 /**
  * Represents logic which can be used by an actor.
  *
@@ -2483,8 +2436,27 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
 
 /** @deprecated */
 
+/** The terminal result published when an actor completes or errors. */
+
+/** An executable effect that publishes an actor's terminal result. */
+
 /** Mappers for subscribeTo - maps lifecycle events to machine events */
 
+function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
+  if (!microsteps.length) {
+    return microsteps;
+  }
+  const result = microsteps.slice();
+  const finalSnapshot = result.at(-1)[0];
+  setInertActorScopeSnapshot(actorScope, finalSnapshot, false);
+  for (const [snapshot] of result) {
+    if (snapshot !== inputSnapshot) {
+      attachSnapshotActorRef(snapshot.machine, actorScope, snapshot);
+    }
+  }
+  return result;
+}
+
 /**
  * Given actor `logic`, a `snapshot`, and an `event`, returns a tuple of the
  * `nextSnapshot` and `actions` to execute.
@@ -2492,9 +2464,12 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
  * This is a pure function that does not execute `actions`.
  */
 function transition(logic, snapshot, event) {
-  const actorScope = createInertActorScope(logic);
-  const [nextSnapshot, effects] = logic.transition(snapshot, event, actorScope);
-  return [nextSnapshot, effects];
+  const actorScope = createInertActorScope(logic, snapshot);
+  setInertActorScopeSnapshot(actorScope, snapshot, false);
+  const [nextSnapshot, effects] = finalizeTransitionResult(actorScope, snapshot, logic.transition(snapshot, event, actorScope));
+  setInertActorScopeSnapshot(actorScope, nextSnapshot, false);
+  const returnedSnapshot = nextSnapshot === snapshot ? nextSnapshot : attachSnapshotActorRef(logic, actorScope, nextSnapshot);
+  return [returnedSnapshot, effects];
 }
 
 /**
@@ -2506,8 +2481,10 @@ function transition(logic, snapshot, event) {
  */
 function initialTransition(logic, ...[input]) {
   const actorScope = createInertActorScope(logic);
-  const [nextSnapshot, executableActions] = logic.initialTransition(input, actorScope);
-  return [nextSnapshot, executableActions];
+  const [nextSnapshot, executableActions] = finalizeTransitionResult(actorScope, undefined, logic.initialTransition(input, actorScope));
+  setInertActorScopeSnapshot(actorScope, nextSnapshot, false);
+  const returnedSnapshot = attachSnapshotActorRef(logic, actorScope, nextSnapshot);
+  return [returnedSnapshot, executableActions];
 }
 
 /**
@@ -2517,11 +2494,11 @@ function initialTransition(logic, ...[input]) {
  * This is a pure function that does not execute `actions`.
  */
 function getMicrosteps(machine, snapshot, event) {
-  const actorScope = createInertActorScope(machine);
+  const actorScope = createInertActorScope(machine, snapshot);
   const {
     microsteps
   } = macrostep(snapshot, event, actorScope, []);
-  return microsteps;
+  return attachMicrostepActorRefs(microsteps, actorScope, snapshot);
 }
 
 /**
@@ -2536,11 +2513,12 @@ function getInitialMicrosteps(machine, ...[input]) {
   const initEvent = createInitEvent(input);
   const internalQueue = [];
   const preInitialSnapshot = machine._getPreInitialState(actorScope, initEvent);
+  const contextSpawnEffects = Object.values(preInitialSnapshot.children).filter(Boolean).map(actor => createSpawnEffect(actor));
   const first = initialMicrostep(machine.root, preInitialSnapshot, actorScope, initEvent, internalQueue);
   const {
     microsteps
-  } = macrostep(first[0], initEvent, actorScope, internalQueue);
-  return [first, ...microsteps];
+  } = macrostep(first[0], initEvent, actorScope, internalQueue, [[first[0], [...contextSpawnEffects, ...first[1]]]]);
+  return attachMicrostepActorRefs(microsteps, actorScope);
 }
 
 /**
@@ -2703,4 +2681,4 @@ function waitFor(actorRef, predicate, options) {
   });
 }
 
-export { SimulatedClock, SpecialTargets, assertEvent, createFSM, createMachine, createMachineFromConfig, createStateConfig, createSystem, getInitialMicrosteps, getInitialSnapshot, getMicrosteps, getNextSnapshot, getNextTransitions, initialTransition, isTypeSchema, machineConfigToJSON, mapState, serializeMachine, setup, toPromise, transition, types, waitFor };
+export { SimulatedClock, SpecialTargets, assertEvent, createFSM, createMachine, createMachineFromConfig, createStateConfig, createSystem, getInitialMicrosteps, getMicrosteps, getNextTransitions, initialTransition, isTypeSchema, machineConfigToJSON, mapState, serializeMachine, setup, toPromise, transition, types, waitFor };

package/dist/xstate.esm.js

@@ -1,7 +1,7 @@
-import { m as matchesEventDescriptor, t as toArray$1, b as builtInActions, X as XSTATE_INIT, d as deriveDeferredStarts, c as createTransitionEnqueue, a as XSTATE_STOP, r as resolveActionsWithContext, p as parseDelayToMilliseconds, i as isAtomicStateNode, e as createActor, f as macrostep, g as createInitEvent, h as initialMicrostep, j as getProperAncestors } from './index-3f87408c.esm.js';
-export { A as Actor, T as TimeoutError, n as __unsafe_getAllOwnEventDescriptors, q as checkStateIn, e as createActor, C as createAsyncLogic, x as createCallbackLogic, w as createEmptyActor, z as createEventObservableLogic, D as createListenerLogic, B as createLogic, y as createObservableLogic, F as createSubscriptionLogic, l as getStateNodes, v as isBuiltInExecutableAction, k as isMachineSnapshot, E as listenerLogic, o as matchesState, s as pathToStateValue, G as subscriptionLogic, u as toObserver } from './index-3f87408c.esm.js';
-import { S as StateMachine } from './StateMachine-3c17fe3e.esm.js';
-export { S as StateMachine, a as StateNode } from './StateMachine-3c17fe3e.esm.js';
+import { m as matchesEventDescriptor, t as toArray$1, b as builtInActions, X as XSTATE_INIT, f as finalizeTransitionResult, d as deriveDeferredStarts, c as createTransitionEnqueue, a as XSTATE_STOP, r as resolveActionsWithContext, e as XSTATE_TIMER, g as createSendToEffect, p as parseDelayToMilliseconds, i as isAtomicStateNode, h as createActor, j as macrostep, k as createInitEvent, l as createSpawnEffect, n as initialMicrostep, o as getProperAncestors } from './index-3609e096.esm.js';
+export { A as Actor, T as TimeoutError, u as __unsafe_getAllOwnEventDescriptors, w as checkStateIn, h as createActor, H as createAsyncLogic, D as createCallbackLogic, C as createEmptyActor, F as createEventObservableLogic, I as createListenerLogic, G as createLogic, E as createObservableLogic, K as createSubscriptionLogic, z as executeEffects, s as getStateNodes, B as isBuiltInExecutableAction, q as isMachineSnapshot, J as listenerLogic, v as matchesState, x as pathToStateValue, L as subscriptionLogic, y as toObserver } from './index-3609e096.esm.js';
+import { S as StateMachine, c as createInertActorScope, s as setInertActorScopeSnapshot, a as attachSnapshotActorRef } from './StateMachine-022864fd.esm.js';
+export { S as StateMachine, d as StateNode, g as getInitialSnapshot, b as getNextSnapshot } from './StateMachine-022864fd.esm.js';
 
 /**
  * Asserts that the given event object is of the specified type or types. Throws
@@ -135,6 +135,8 @@ function createSnapshot(value, context, input, machine, stateInput) {
     context,
     input,
     children: {},
+    timers: {},
+    _nextTimerId: 0,
     _stateInput: stateInput,
     machine
   };
@@ -148,6 +150,8 @@ function cloneSnapshot(snapshot, value, context, stateInput) {
     context,
     input: snapshot.input,
     children: snapshot.children,
+    timers: snapshot.timers,
+    _nextTimerId: snapshot._nextTimerId,
     _stateInput: stateInput,
     machine: snapshot.machine
   };
@@ -161,6 +165,8 @@ function stopSnapshot(snapshot) {
     context: snapshot.context,
     input: undefined,
     children: snapshot.children,
+    timers: snapshot.timers,
+    _nextTimerId: snapshot._nextTimerId,
     _stateInput: snapshot._stateInput,
     machine: snapshot.machine
   };
@@ -184,10 +190,14 @@ function resolveSimpleEnqueuedActions(rawActions) {
       return undefined;
     }
     executableActions.push({
+      kind: 'action',
       type: action.action.name || '(anonymous)',
       params: undefined,
       args: action.args,
-      exec: action.args.length ? action.action.bind(null, ...action.args) : action.action
+      action: action.action,
+      exec() {
+        return this.action?.(...this.args);
+      }
     });
   }
   return executableActions;
@@ -294,7 +304,32 @@ function createFSM(config) {
       return [snapshot, []];
     }
     if (event.type === XSTATE_STOP) {
-      return [stopSnapshot(snapshot), emptyExecutableActions];
+      const actions = [];
+      const enqueue = createTransitionEnqueue(actorScope, actions, []);
+      for (const id of Object.keys(snapshot.timers)) {
+        enqueue.cancel(id);
+      }
+      const [withoutTimers, cancelEffects] = resolveActionsWithContext(snapshot, event, actorScope, actions);
+      return [stopSnapshot(withoutTimers), cancelEffects];
+    }
+    if (event.type === XSTATE_TIMER) {
+      const timer = snapshot.timers[event.id];
+      if (!timer) {
+        return [snapshot, emptyExecutableActions];
+      }
+      const timers = {
+        ...snapshot.timers
+      };
+      delete timers[timer.id];
+      const nextSnapshot = {
+        ...snapshot,
+        timers
+      };
+      if (timer.type === '@xstate.raise') {
+        return transitionCore(nextSnapshot, timer.event, actorScope);
+      }
+      const target = timer.target === 'self' ? actorScope.self : timer.target;
+      return [nextSnapshot, [createSendToEffect(actorScope, target, timer.event)]];
     }
     const stateConfig = config.states[snapshot.value];
     const directTransition = stateConfig?.on?.[event.type];
@@ -390,7 +425,7 @@ function createFSM(config) {
   };
   const transition = (...args) => {
     const [nextSnapshot, effects] = transitionCore(...args);
-    return [nextSnapshot, [...effects, ...deriveDeferredStarts(effects)]];
+    return finalizeTransitionResult(args[2], args[0], [nextSnapshot, [...effects, ...deriveDeferredStarts(effects)]]);
   };
   const logic = {
     id: config.id,
@@ -411,7 +446,7 @@ function createFSM(config) {
         nextSnapshot = raisedSnapshot;
         actions.push(...raisedActions);
       }
-      return [nextSnapshot, [...actions, ...deriveDeferredStarts(actions)]];
+      return finalizeTransitionResult(actorScope, undefined, [nextSnapshot, [...actions, ...deriveDeferredStarts(actions)]]);
     },
     getInitialSnapshot: (actorScope, input) => logic.initialTransition(input, actorScope)[0],
     getPersistedSnapshot: ({
@@ -2180,71 +2215,6 @@ function mergeSetupConfigs(base, extension) {
   };
 }
 
-/** @internal */
-function createInertActorScope(actorLogic) {
-  const self = createActor(actorLogic, {
-    _inert: true
-  });
-  const inertActorScope = {
-    self: self,
-    defer: () => {},
-    id: '',
-    logger: () => {},
-    sessionId: '',
-    stopChild: () => {},
-    system: self.system,
-    emit: () => {},
-    actionExecutor: () => {}
-  };
-  return inertActorScope;
-}
-
-/** @deprecated Use `initialTransition(…)` instead. */
-function getInitialSnapshot(actorLogic, ...[input]) {
-  const actorScope = createInertActorScope(actorLogic);
-  return actorLogic.initialTransition(input, actorScope)[0];
-}
-
-/**
- * Determines the next snapshot for the given `actorLogic` based on the given
- * `snapshot` and `event`.
- *
- * If the `snapshot` is `undefined`, the initial snapshot of the `actorLogic` is
- * used.
- *
- * @deprecated Use `transition(…)` instead.
- * @example
- *
- * ```ts
- * import { getNextSnapshot } from 'xstate';
- * import { trafficLightMachine } from './trafficLightMachine.ts';
- *
- * const nextSnapshot = getNextSnapshot(
- *   trafficLightMachine, // actor logic
- *   undefined, // snapshot (or initial state if undefined)
- *   { type: 'TIMER' }
- * ); // event object
- *
- * console.log(nextSnapshot.value);
- * // => 'yellow'
- *
- * const nextSnapshot2 = getNextSnapshot(
- *   trafficLightMachine, // actor logic
- *   nextSnapshot, // snapshot
- *   { type: 'TIMER' }
- * ); // event object
- *
- * console.log(nextSnapshot2.value);
- * // =>'red'
- * ```
- */
-function getNextSnapshot(actorLogic, snapshot, event) {
-  const inertActorScope = createInertActorScope(actorLogic);
-  inertActorScope.self._snapshot = snapshot;
-  const transitionResult = actorLogic.transition(snapshot, event, inertActorScope);
-  return Array.isArray(transitionResult) ? transitionResult[0] : transitionResult;
-}
-
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
@@ -2401,24 +2371,9 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
   return SpecialTargets;
 }({});
 
-/**
- * A pending effect (delayed event/transition that has not fired yet) captured
- * in a persisted snapshot — a serialized built-in action descriptor plus its
- * runtime progress, with enough information to restore it under any strategy.
- */
+/** A deterministic delayed-delivery declaration owned by a logic snapshot. */
 
-/**
- * How pending effects (timers) from a persisted snapshot are restored on
- * `actor.start()`:
- *
- * - `'resume'` (default) — the clock was "frozen" while persisted: a 5-minute
- *   timer persisted with 1 minute elapsed fires after 4 more minutes.
- * - `'restart'` — timers start over with their full delay.
- * - `'absolute'` — timers honor the original wall-clock expiry (`startedAt +
- *   delay`); already-expired timers fire immediately.
- * - A custom function receiving the pending effect and returning the remaining
- *   delay in ms.
- */
+/** The logical input delivered to a timer's source when its runtime delay ends. */
 
 /** @deprecated Use `AnyActor` instead. */
 
@@ -2464,8 +2419,6 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
 
 /** The concrete actor instance type produced from actor logic. */
 
-// TODO: in v6, this should only accept AnyActorLogic, like ActorRefFromLogic
-
 /**
  * Represents logic which can be used by an actor.
  *
@@ -2483,8 +2436,27 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
 
 /** @deprecated */
 
+/** The terminal result published when an actor completes or errors. */
+
+/** An executable effect that publishes an actor's terminal result. */
+
 /** Mappers for subscribeTo - maps lifecycle events to machine events */
 
+function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
+  if (!microsteps.length) {
+    return microsteps;
+  }
+  const result = microsteps.slice();
+  const finalSnapshot = result.at(-1)[0];
+  setInertActorScopeSnapshot(actorScope, finalSnapshot, false);
+  for (const [snapshot] of result) {
+    if (snapshot !== inputSnapshot) {
+      attachSnapshotActorRef(snapshot.machine, actorScope, snapshot);
+    }
+  }
+  return result;
+}
+
 /**
  * Given actor `logic`, a `snapshot`, and an `event`, returns a tuple of the
  * `nextSnapshot` and `actions` to execute.
@@ -2492,9 +2464,12 @@ let SpecialTargets = /*#__PURE__*/function (SpecialTargets) {
  * This is a pure function that does not execute `actions`.
  */
 function transition(logic, snapshot, event) {
-  const actorScope = createInertActorScope(logic);
-  const [nextSnapshot, effects] = logic.transition(snapshot, event, actorScope);
-  return [nextSnapshot, effects];
+  const actorScope = createInertActorScope(logic, snapshot);
+  setInertActorScopeSnapshot(actorScope, snapshot, false);
+  const [nextSnapshot, effects] = finalizeTransitionResult(actorScope, snapshot, logic.transition(snapshot, event, actorScope));
+  setInertActorScopeSnapshot(actorScope, nextSnapshot, false);
+  const returnedSnapshot = nextSnapshot === snapshot ? nextSnapshot : attachSnapshotActorRef(logic, actorScope, nextSnapshot);
+  return [returnedSnapshot, effects];
 }
 
 /**
@@ -2506,8 +2481,10 @@ function transition(logic, snapshot, event) {
  */
 function initialTransition(logic, ...[input]) {
   const actorScope = createInertActorScope(logic);
-  const [nextSnapshot, executableActions] = logic.initialTransition(input, actorScope);
-  return [nextSnapshot, executableActions];
+  const [nextSnapshot, executableActions] = finalizeTransitionResult(actorScope, undefined, logic.initialTransition(input, actorScope));
+  setInertActorScopeSnapshot(actorScope, nextSnapshot, false);
+  const returnedSnapshot = attachSnapshotActorRef(logic, actorScope, nextSnapshot);
+  return [returnedSnapshot, executableActions];
 }
 
 /**
@@ -2517,11 +2494,11 @@ function initialTransition(logic, ...[input]) {
  * This is a pure function that does not execute `actions`.
  */
 function getMicrosteps(machine, snapshot, event) {
-  const actorScope = createInertActorScope(machine);
+  const actorScope = createInertActorScope(machine, snapshot);
   const {
     microsteps
   } = macrostep(snapshot, event, actorScope, []);
-  return microsteps;
+  return attachMicrostepActorRefs(microsteps, actorScope, snapshot);
 }
 
 /**
@@ -2536,11 +2513,12 @@ function getInitialMicrosteps(machine, ...[input]) {
   const initEvent = createInitEvent(input);
   const internalQueue = [];
   const preInitialSnapshot = machine._getPreInitialState(actorScope, initEvent);
+  const contextSpawnEffects = Object.values(preInitialSnapshot.children).filter(Boolean).map(actor => createSpawnEffect(actor));
   const first = initialMicrostep(machine.root, preInitialSnapshot, actorScope, initEvent, internalQueue);
   const {
     microsteps
-  } = macrostep(first[0], initEvent, actorScope, internalQueue);
-  return [first, ...microsteps];
+  } = macrostep(first[0], initEvent, actorScope, internalQueue, [[first[0], [...contextSpawnEffects, ...first[1]]]]);
+  return attachMicrostepActorRefs(microsteps, actorScope);
 }
 
 /**
@@ -2700,4 +2678,4 @@ function waitFor(actorRef, predicate, options) {
   });
 }
 
-export { SimulatedClock, SpecialTargets, assertEvent, createFSM, createMachine, createMachineFromConfig, createStateConfig, createSystem, getInitialMicrosteps, getInitialSnapshot, getMicrosteps, getNextSnapshot, getNextTransitions, initialTransition, isTypeSchema, machineConfigToJSON, mapState, serializeMachine, setup, toPromise, transition, types, waitFor };
+export { SimulatedClock, SpecialTargets, assertEvent, createFSM, createMachine, createMachineFromConfig, createStateConfig, createSystem, getInitialMicrosteps, getMicrosteps, getNextTransitions, initialTransition, isTypeSchema, machineConfigToJSON, mapState, serializeMachine, setup, toPromise, transition, types, waitFor };