xstate 6.0.0-beta.2 → 6.0.0-beta.3

package/README.md

@@ -171,8 +171,8 @@ import { createFSM } from 'xstate/fsm';
 const machine = createFSM({
   initial: 'inactive',
   states: {
-    inactive: { on: { toggle: 'active' } },
-    active: { on: { toggle: 'inactive' } }
+    inactive: { on: { toggle: { target: 'active' } } },
+    active: { on: { toggle: { target: 'inactive' } } }
   }
 });
 
@@ -180,6 +180,8 @@ let state = machine.initialState;
 [state] = machine.transition(state, { type: 'toggle' });
 ```
 
+States can declare eventless `always` transitions. The machine follows them
+during initialization and after handled events until it reaches a stable state.
 The FSM is also actor logic, so `createActor(machine)` from `xstate` runs it.
 
 For typed context, event payloads, or state-specific context snapshots, use

package/dist/{createActor-20a97166.esm.js → createActor-49ea55ba.esm.js}

@@ -905,6 +905,7 @@ function resolveRegisteredActorSource(actors, logic) {
 const systemLogicMetadata = Symbol('xstate.systemLogicMetadata');
 
 const subscriptions = /* #__PURE__ */new WeakMap();
+const XSTATE_ATTACHED_FORWARD = 'xstate.attached.forward';
 
 /**
  * Internal factory for actor logic that attaches to another actor on start
@@ -967,9 +968,11 @@ id) {
         unsubscribe: teardown
       });
     },
-    transition: (state, event, {
-      self
-    }) => {
+    transition: (state, event, scope) => {
+      const self = scope.self;
+      if (event.type === XSTATE_ATTACHED_FORWARD) {
+        return [state, state.status === 'active' && self._parent ? [createSendToEffect(scope, self._parent, event.event)] : []];
+      }
       if (event.type === XSTATE_STOP) {
         subscriptions.get(self)?.unsubscribe();
         subscriptions.delete(self);
@@ -984,7 +987,8 @@ id) {
     initialTransition,
     getInitialSnapshot: (actorScope, input) => initialTransition(input)[0],
     getPersistedSnapshot: snapshot => snapshot,
-    restoreSnapshot: snapshot => snapshot
+    restoreSnapshot: snapshot => snapshot,
+    isInternalEventType: eventType => eventType === XSTATE_ATTACHED_FORWARD
   };
   Object.defineProperty(logic, systemLogicMetadata, {
     value: {
@@ -1002,7 +1006,10 @@ function relayMappedToParent(self, system, getEvent) {
   if (self.getSnapshot().status === 'stopped' || !self._parent) {
     return;
   }
-  system._relay(self, self._parent, getEvent());
+  system._relay(self, self, {
+    type: XSTATE_ATTACHED_FORWARD,
+    event: getEvent()
+  });
 }
 
 /** @public */
@@ -3868,7 +3875,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
           addAncestorStatesToEnter(ancestors, !transition.source.parent && reenter ? undefined : domain);
         }
-        if (reenter && domain === transition.source) {
+        if (targets?.length && reenter && domain === transition.source) {
           // A reentering transition whose domain is its own source exits and
           // reenters the source, so the source must be entered explicitly —
           // it has no ancestor inside the domain to add it.
@@ -4417,7 +4424,9 @@ function macrostep(snapshot, event, actorScope, internalQueue, initialMicrosteps
   if (!internalQueue.length && snapshot.machine._hasEventlessTransitions === false) {
     return completeMacrostep();
   }
-  let shouldSelectEventlessTransitions = true;
+
+  // A timer notification must not run eventless transitions before delivery.
+  let shouldSelectEventlessTransitions = event.type !== XSTATE_TIMER;
   const maxIterations = snapshot.machine.options?.maxIterations ?? Infinity;
   let iterationCount = 0;
   // The last few state values visited, for the infinite-loop error.
@@ -7102,4 +7111,4 @@ function createActor(logic, ...[options]) {
   return new Actor(logic, options);
 }
 
-export { resolveRegisteredActorSource as $, isMachineSnapshot as A, listenerLogic as B, subscriptionLogic as C, createListenerLogic as D, createSubscriptionLogic as E, Actor as F, matchesState as G, toObserver as H, InfiniteTransitionError as I, executeEffects as J, isBuiltInExecutableEffect as K, deliverEvent as L, runStep as M, stopActor as N, terminateActor as O, ProcessingStatus as P, createInitEvent as Q, createDeadLetterEffect as R, createCustomEffect as S, XSTATE_LOGIC_EFFECT_START as T, XSTATE_LOGIC_EFFECT_RESOLVE as U, XSTATE_LOGIC_EFFECT_REJECT as V, createEmitEffect as W, XSTATE_STOP_EFFECT as X, createSendToEffect as Y, XSTATE_INIT as Z, publishEmittedEvent as _, assertUnreservedSourceName as a, allocateChildId as a0, assertChildIdFree as a1, reserveChildId as a2, hasUnescapedDot as a3, STATE_DELIMITER as a4, mapValues as a5, createInvokeId as a6, getDelayedTransitions as a7, getCandidates as a8, evaluateCandidate as a9, initialMicrostep as aA, createStartEffect as aB, isStateId as aC, getPersistedSnapshot as aD, detachedScopes as aE, hasAmbientInspector as aF, getProperAncestors as aG, isRemoteActorRef as aH, getAllOwnEvents as aI, matchesEvent as aJ, getRootActorId as aK, RUNTIME_OPERATIONS as aL, createTimerEffect as aM, getSnapshotActorRef as aN, withExecutionOwner as aO, getTimerStart as aP, recordTimerStart as aQ, withSystemInspector as aR, adoptSystem as aS, withExecutionIdentity as aT, diagnoseActorOptions as aU, createRemoteActorRef as aV, createInvokeTimeoutEvent as aW, parseGeneratedActorId as aX, formatTransition as aa, NULL_EVENT as ab, toTransitionConfigArray as ac, matchesActorSession as ad, describeMachine as ae, formatRouteTransitions as af, resolveStateValue as ag, isInFinalState as ah, createInertActorScope as ai, setInertActorScopeSnapshot as aj, beginSpawnAllocation as ak, attachSnapshotActorRef as al, macrostep as am, isInertActorScope as an, setSnapshotActorRef as ao, cloneMachineSnapshot as ap, transitionNode as aq, XSTATE_TIMER as ar, getTransitionResult as as, hasEffect as at, createErrorPlatformEvent as au, withActorSelf as av, resolveActionsWithContext as aw, takeSpawnAllocationCounters as ax, mergeActorIdCounters as ay, createSpawnEffect as az, getStateNodes as b, isActorRefLike as c, diagnoseAuthorConfig as d, createMachineSnapshot as e, diagnoseSetupConfig as f, getAllStateNodes as g, createActor as h, isAtomicStateNode as i, encodeAddressSegment as j, getActorIdPrefix as k, finalizeTransitionResult as l, matchesEventDescriptor as m, getTimerKey as n, isSerializedActorRef as o, parseDelayToMilliseconds as p, readTimerKey as q, resolveInvokedActorLogic as r, systemLogicMetadata as s, toArray as t, XSTATE_STOP as u, createDoneActorEvent as v, createErrorActorEvent as w, xstateError as x, serializeTimerKey as y, matchesTimerKey as z };
+export { publishEmittedEvent as $, matchesTimerKey as A, isMachineSnapshot as B, listenerLogic as C, subscriptionLogic as D, createListenerLogic as E, createSubscriptionLogic as F, Actor as G, matchesState as H, InfiniteTransitionError as I, toObserver as J, executeEffects as K, isBuiltInExecutableEffect as L, deliverEvent as M, runStep as N, stopActor as O, ProcessingStatus as P, terminateActor as Q, createInitEvent as R, createDeadLetterEffect as S, createCustomEffect as T, XSTATE_LOGIC_EFFECT_START as U, XSTATE_LOGIC_EFFECT_RESOLVE as V, XSTATE_LOGIC_EFFECT_REJECT as W, XSTATE_ATTACHED_FORWARD as X, createEmitEffect as Y, createSendToEffect as Z, XSTATE_INIT as _, assertUnreservedSourceName as a, resolveRegisteredActorSource as a0, allocateChildId as a1, assertChildIdFree as a2, reserveChildId as a3, hasUnescapedDot as a4, STATE_DELIMITER as a5, mapValues as a6, createInvokeId as a7, getDelayedTransitions as a8, getCandidates as a9, createSpawnEffect as aA, initialMicrostep as aB, createStartEffect as aC, isStateId as aD, getPersistedSnapshot as aE, detachedScopes as aF, hasAmbientInspector as aG, getProperAncestors as aH, isRemoteActorRef as aI, getAllOwnEvents as aJ, matchesEvent as aK, getRootActorId as aL, RUNTIME_OPERATIONS as aM, createTimerEffect as aN, getSnapshotActorRef as aO, withExecutionOwner as aP, getTimerStart as aQ, recordTimerStart as aR, withSystemInspector as aS, adoptSystem as aT, withExecutionIdentity as aU, diagnoseActorOptions as aV, createRemoteActorRef as aW, createInvokeTimeoutEvent as aX, parseGeneratedActorId as aY, evaluateCandidate as aa, formatTransition as ab, NULL_EVENT as ac, toTransitionConfigArray as ad, matchesActorSession as ae, describeMachine as af, formatRouteTransitions as ag, resolveStateValue as ah, isInFinalState as ai, createInertActorScope as aj, setInertActorScopeSnapshot as ak, beginSpawnAllocation as al, attachSnapshotActorRef as am, macrostep as an, isInertActorScope as ao, setSnapshotActorRef as ap, cloneMachineSnapshot as aq, transitionNode as ar, XSTATE_TIMER as as, getTransitionResult as at, hasEffect as au, createErrorPlatformEvent as av, withActorSelf as aw, resolveActionsWithContext as ax, takeSpawnAllocationCounters as ay, mergeActorIdCounters as az, getStateNodes as b, isActorRefLike as c, diagnoseAuthorConfig as d, createMachineSnapshot as e, diagnoseSetupConfig as f, getAllStateNodes as g, createActor as h, isAtomicStateNode as i, encodeAddressSegment as j, getActorIdPrefix as k, finalizeTransitionResult as l, matchesEventDescriptor as m, getTimerKey as n, isSerializedActorRef as o, parseDelayToMilliseconds as p, readTimerKey as q, resolveInvokedActorLogic as r, systemLogicMetadata as s, toArray as t, XSTATE_STOP_EFFECT as u, XSTATE_STOP as v, createDoneActorEvent as w, xstateError as x, createErrorActorEvent as y, serializeTimerKey as z };

package/dist/{createActor-c91c9ffe.cjs.js → createActor-73aa92ba.cjs.js}

@@ -907,6 +907,7 @@ function resolveRegisteredActorSource(actors, logic) {
 const systemLogicMetadata = Symbol('xstate.systemLogicMetadata');
 
 const subscriptions = /* #__PURE__ */new WeakMap();
+const XSTATE_ATTACHED_FORWARD = 'xstate.attached.forward';
 
 /**
  * Internal factory for actor logic that attaches to another actor on start
@@ -969,9 +970,11 @@ id) {
         unsubscribe: teardown
       });
     },
-    transition: (state, event, {
-      self
-    }) => {
+    transition: (state, event, scope) => {
+      const self = scope.self;
+      if (event.type === XSTATE_ATTACHED_FORWARD) {
+        return [state, state.status === 'active' && self._parent ? [createSendToEffect(scope, self._parent, event.event)] : []];
+      }
       if (event.type === XSTATE_STOP) {
         subscriptions.get(self)?.unsubscribe();
         subscriptions.delete(self);
@@ -986,7 +989,8 @@ id) {
     initialTransition,
     getInitialSnapshot: (actorScope, input) => initialTransition(input)[0],
     getPersistedSnapshot: snapshot => snapshot,
-    restoreSnapshot: snapshot => snapshot
+    restoreSnapshot: snapshot => snapshot,
+    isInternalEventType: eventType => eventType === XSTATE_ATTACHED_FORWARD
   };
   Object.defineProperty(logic, systemLogicMetadata, {
     value: {
@@ -1004,7 +1008,10 @@ function relayMappedToParent(self, system, getEvent) {
   if (self.getSnapshot().status === 'stopped' || !self._parent) {
     return;
   }
-  system._relay(self, self._parent, getEvent());
+  system._relay(self, self, {
+    type: XSTATE_ATTACHED_FORWARD,
+    event: getEvent()
+  });
 }
 
 /** @public */
@@ -3870,7 +3877,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
           addAncestorStatesToEnter(ancestors, !transition.source.parent && reenter ? undefined : domain);
         }
-        if (reenter && domain === transition.source) {
+        if (targets?.length && reenter && domain === transition.source) {
           // A reentering transition whose domain is its own source exits and
           // reenters the source, so the source must be entered explicitly —
           // it has no ancestor inside the domain to add it.
@@ -4419,7 +4426,9 @@ function macrostep(snapshot, event, actorScope, internalQueue, initialMicrosteps
   if (!internalQueue.length && snapshot.machine._hasEventlessTransitions === false) {
     return completeMacrostep();
   }
-  let shouldSelectEventlessTransitions = true;
+
+  // A timer notification must not run eventless transitions before delivery.
+  let shouldSelectEventlessTransitions = event.type !== XSTATE_TIMER;
   const maxIterations = snapshot.machine.options?.maxIterations ?? Infinity;
   let iterationCount = 0;
   // The last few state values visited, for the infinite-loop error.
@@ -7110,6 +7119,7 @@ exports.NULL_EVENT = NULL_EVENT;
 exports.ProcessingStatus = ProcessingStatus;
 exports.RUNTIME_OPERATIONS = RUNTIME_OPERATIONS;
 exports.STATE_DELIMITER = STATE_DELIMITER;
+exports.XSTATE_ATTACHED_FORWARD = XSTATE_ATTACHED_FORWARD;
 exports.XSTATE_INIT = XSTATE_INIT;
 exports.XSTATE_LOGIC_EFFECT_REJECT = XSTATE_LOGIC_EFFECT_REJECT;
 exports.XSTATE_LOGIC_EFFECT_RESOLVE = XSTATE_LOGIC_EFFECT_RESOLVE;

package/dist/{createActor-0250284a.development.esm.js → createActor-a085b20b.development.esm.js}

@@ -953,6 +953,7 @@ function resolveRegisteredActorSource(actors, logic) {
 const systemLogicMetadata = Symbol('xstate.systemLogicMetadata');
 
 const subscriptions = /* #__PURE__ */new WeakMap();
+const XSTATE_ATTACHED_FORWARD = 'xstate.attached.forward';
 
 /**
  * Internal factory for actor logic that attaches to another actor on start
@@ -1015,9 +1016,11 @@ id) {
         unsubscribe: teardown
       });
     },
-    transition: (state, event, {
-      self
-    }) => {
+    transition: (state, event, scope) => {
+      const self = scope.self;
+      if (event.type === XSTATE_ATTACHED_FORWARD) {
+        return [state, state.status === 'active' && self._parent ? [createSendToEffect(scope, self._parent, event.event)] : []];
+      }
       if (event.type === XSTATE_STOP) {
         subscriptions.get(self)?.unsubscribe();
         subscriptions.delete(self);
@@ -1032,7 +1035,8 @@ id) {
     initialTransition,
     getInitialSnapshot: (actorScope, input) => initialTransition(input)[0],
     getPersistedSnapshot: snapshot => snapshot,
-    restoreSnapshot: snapshot => snapshot
+    restoreSnapshot: snapshot => snapshot,
+    isInternalEventType: eventType => eventType === XSTATE_ATTACHED_FORWARD
   };
   Object.defineProperty(logic, systemLogicMetadata, {
     value: {
@@ -1050,7 +1054,10 @@ function relayMappedToParent(self, system, getEvent) {
   if (self.getSnapshot().status === 'stopped' || !self._parent) {
     return;
   }
-  system._relay(self, self._parent, getEvent());
+  system._relay(self, self, {
+    type: XSTATE_ATTACHED_FORWARD,
+    event: getEvent()
+  });
 }
 
 /** @public */
@@ -3967,7 +3974,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
           addAncestorStatesToEnter(ancestors, !transition.source.parent && reenter ? undefined : domain);
         }
-        if (reenter && domain === transition.source) {
+        if (targets?.length && reenter && domain === transition.source) {
           // A reentering transition whose domain is its own source exits and
           // reenters the source, so the source must be entered explicitly —
           // it has no ancestor inside the domain to add it.
@@ -4525,7 +4532,9 @@ function macrostep(snapshot, event, actorScope, internalQueue, initialMicrosteps
   if (!internalQueue.length && snapshot.machine._hasEventlessTransitions === false) {
     return completeMacrostep();
   }
-  let shouldSelectEventlessTransitions = true;
+
+  // A timer notification must not run eventless transitions before delivery.
+  let shouldSelectEventlessTransitions = event.type !== XSTATE_TIMER;
   const maxIterations = snapshot.machine.options?.maxIterations ?? Infinity;
   let iterationCount = 0;
   // The last few state values visited, for the infinite-loop error.
@@ -7375,4 +7384,4 @@ function createActor(logic, ...[options]) {
   return new Actor(logic, options);
 }
 
-export { allocateChildId as $, listenerLogic as A, subscriptionLogic as B, createListenerLogic as C, createSubscriptionLogic as D, Actor as E, matchesState as F, toObserver as G, executeEffects as H, InfiniteTransitionError as I, isBuiltInExecutableEffect as J, deliverEvent as K, runStep as L, stopActor as M, terminateActor as N, createInitEvent as O, ProcessingStatus as P, createDeadLetterEffect as Q, createCustomEffect as R, XSTATE_LOGIC_EFFECT_START as S, XSTATE_LOGIC_EFFECT_RESOLVE as T, XSTATE_LOGIC_EFFECT_REJECT as U, createEmitEffect as V, createSendToEffect as W, XSTATE_STOP_EFFECT as X, XSTATE_INIT as Y, publishEmittedEvent as Z, resolveRegisteredActorSource as _, assertUnreservedSourceName as a, assertChildIdFree as a0, reserveChildId as a1, hasUnescapedDot as a2, STATE_DELIMITER as a3, mapValues as a4, createInvokeId as a5, getDelayedTransitions as a6, getCandidates as a7, evaluateCandidate as a8, formatTransition as a9, initialMicrostep as aA, createStartEffect as aB, isStateId as aC, getPersistedSnapshot as aD, detachedScopes as aE, toStatePath as aF, hasAmbientInspector as aG, getProperAncestors as aH, isRemoteActorRef as aI, getAllOwnEvents as aJ, matchesEvent as aK, getRootActorId as aL, RUNTIME_OPERATIONS as aM, createTimerEffect as aN, getSnapshotActorRef as aO, withExecutionOwner as aP, getTimerStart as aQ, recordTimerStart as aR, withSystemInspector as aS, adoptSystem as aT, withExecutionIdentity as aU, diagnoseActorOptions as aV, createRemoteActorRef as aW, createInvokeTimeoutEvent as aX, parseGeneratedActorId as aY, NULL_EVENT as aa, toTransitionConfigArray as ab, matchesActorSession as ac, describeMachine as ad, formatRouteTransitions as ae, resolveStateValue as af, isInFinalState as ag, createInertActorScope as ah, setInertActorScopeSnapshot as ai, beginSpawnAllocation as aj, attachSnapshotActorRef as ak, macrostep as al, isInertActorScope as am, setSnapshotActorRef as an, cloneMachineSnapshot as ao, transitionNode as ap, XSTATE_TIMER as aq, getTransitionResult as ar, hasEffect as as, createErrorPlatformEvent as at, withActorSelf as au, resolveActionsWithContext as av, freezeContext as aw, takeSpawnAllocationCounters as ax, mergeActorIdCounters as ay, createSpawnEffect as az, getStateNodes as b, isActorRefLike as c, diagnoseAuthorConfig as d, createMachineSnapshot as e, diagnoseSetupConfig as f, getAllStateNodes as g, createActor as h, isAtomicStateNode as i, encodeAddressSegment as j, getActorIdPrefix as k, finalizeTransitionResult as l, matchesEventDescriptor as m, getTimerKey as n, isSerializedActorRef as o, parseDelayToMilliseconds as p, readTimerKey as q, resolveInvokedActorLogic as r, systemLogicMetadata as s, toArray as t, XSTATE_STOP as u, createDoneActorEvent as v, createErrorActorEvent as w, serializeTimerKey as x, matchesTimerKey as y, isMachineSnapshot as z };
+export { resolveRegisteredActorSource as $, isMachineSnapshot as A, listenerLogic as B, subscriptionLogic as C, createListenerLogic as D, createSubscriptionLogic as E, Actor as F, matchesState as G, toObserver as H, InfiniteTransitionError as I, executeEffects as J, isBuiltInExecutableEffect as K, deliverEvent as L, runStep as M, stopActor as N, terminateActor as O, ProcessingStatus as P, createInitEvent as Q, createDeadLetterEffect as R, createCustomEffect as S, XSTATE_LOGIC_EFFECT_START as T, XSTATE_LOGIC_EFFECT_RESOLVE as U, XSTATE_LOGIC_EFFECT_REJECT as V, createEmitEffect as W, XSTATE_ATTACHED_FORWARD as X, createSendToEffect as Y, XSTATE_INIT as Z, publishEmittedEvent as _, assertUnreservedSourceName as a, allocateChildId as a0, assertChildIdFree as a1, reserveChildId as a2, hasUnescapedDot as a3, STATE_DELIMITER as a4, mapValues as a5, createInvokeId as a6, getDelayedTransitions as a7, getCandidates as a8, evaluateCandidate as a9, createSpawnEffect as aA, initialMicrostep as aB, createStartEffect as aC, isStateId as aD, getPersistedSnapshot as aE, detachedScopes as aF, toStatePath as aG, hasAmbientInspector as aH, getProperAncestors as aI, isRemoteActorRef as aJ, getAllOwnEvents as aK, matchesEvent as aL, getRootActorId as aM, RUNTIME_OPERATIONS as aN, createTimerEffect as aO, getSnapshotActorRef as aP, withExecutionOwner as aQ, getTimerStart as aR, recordTimerStart as aS, withSystemInspector as aT, adoptSystem as aU, withExecutionIdentity as aV, diagnoseActorOptions as aW, createRemoteActorRef as aX, createInvokeTimeoutEvent as aY, parseGeneratedActorId as aZ, formatTransition as aa, NULL_EVENT as ab, toTransitionConfigArray as ac, matchesActorSession as ad, describeMachine as ae, formatRouteTransitions as af, resolveStateValue as ag, isInFinalState as ah, createInertActorScope as ai, setInertActorScopeSnapshot as aj, beginSpawnAllocation as ak, attachSnapshotActorRef as al, macrostep as am, isInertActorScope as an, setSnapshotActorRef as ao, cloneMachineSnapshot as ap, transitionNode as aq, XSTATE_TIMER as ar, getTransitionResult as as, hasEffect as at, createErrorPlatformEvent as au, withActorSelf as av, resolveActionsWithContext as aw, freezeContext as ax, takeSpawnAllocationCounters as ay, mergeActorIdCounters as az, getStateNodes as b, isActorRefLike as c, diagnoseAuthorConfig as d, createMachineSnapshot as e, diagnoseSetupConfig as f, getAllStateNodes as g, createActor as h, isAtomicStateNode as i, encodeAddressSegment as j, getActorIdPrefix as k, finalizeTransitionResult as l, matchesEventDescriptor as m, getTimerKey as n, isSerializedActorRef as o, parseDelayToMilliseconds as p, readTimerKey as q, resolveInvokedActorLogic as r, systemLogicMetadata as s, toArray as t, XSTATE_STOP_EFFECT as u, XSTATE_STOP as v, createDoneActorEvent as w, createErrorActorEvent as x, serializeTimerKey as y, matchesTimerKey as z };

package/dist/{createActor-c029d29f.development.cjs.js → createActor-dfb6b790.development.cjs.js}

@@ -955,6 +955,7 @@ function resolveRegisteredActorSource(actors, logic) {
 const systemLogicMetadata = Symbol('xstate.systemLogicMetadata');
 
 const subscriptions = /* #__PURE__ */new WeakMap();
+const XSTATE_ATTACHED_FORWARD = 'xstate.attached.forward';
 
 /**
  * Internal factory for actor logic that attaches to another actor on start
@@ -1017,9 +1018,11 @@ id) {
         unsubscribe: teardown
       });
     },
-    transition: (state, event, {
-      self
-    }) => {
+    transition: (state, event, scope) => {
+      const self = scope.self;
+      if (event.type === XSTATE_ATTACHED_FORWARD) {
+        return [state, state.status === 'active' && self._parent ? [createSendToEffect(scope, self._parent, event.event)] : []];
+      }
       if (event.type === XSTATE_STOP) {
         subscriptions.get(self)?.unsubscribe();
         subscriptions.delete(self);
@@ -1034,7 +1037,8 @@ id) {
     initialTransition,
     getInitialSnapshot: (actorScope, input) => initialTransition(input)[0],
     getPersistedSnapshot: snapshot => snapshot,
-    restoreSnapshot: snapshot => snapshot
+    restoreSnapshot: snapshot => snapshot,
+    isInternalEventType: eventType => eventType === XSTATE_ATTACHED_FORWARD
   };
   Object.defineProperty(logic, systemLogicMetadata, {
     value: {
@@ -1052,7 +1056,10 @@ function relayMappedToParent(self, system, getEvent) {
   if (self.getSnapshot().status === 'stopped' || !self._parent) {
     return;
   }
-  system._relay(self, self._parent, getEvent());
+  system._relay(self, self, {
+    type: XSTATE_ATTACHED_FORWARD,
+    event: getEvent()
+  });
 }
 
 /** @public */
@@ -3969,7 +3976,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           }
           addAncestorStatesToEnter(ancestors, !transition.source.parent && reenter ? undefined : domain);
         }
-        if (reenter && domain === transition.source) {
+        if (targets?.length && reenter && domain === transition.source) {
           // A reentering transition whose domain is its own source exits and
           // reenters the source, so the source must be entered explicitly —
           // it has no ancestor inside the domain to add it.
@@ -4527,7 +4534,9 @@ function macrostep(snapshot, event, actorScope, internalQueue, initialMicrosteps
   if (!internalQueue.length && snapshot.machine._hasEventlessTransitions === false) {
     return completeMacrostep();
   }
-  let shouldSelectEventlessTransitions = true;
+
+  // A timer notification must not run eventless transitions before delivery.
+  let shouldSelectEventlessTransitions = event.type !== XSTATE_TIMER;
   const maxIterations = snapshot.machine.options?.maxIterations ?? Infinity;
   let iterationCount = 0;
   // The last few state values visited, for the infinite-loop error.
@@ -7383,6 +7392,7 @@ exports.NULL_EVENT = NULL_EVENT;
 exports.ProcessingStatus = ProcessingStatus;
 exports.RUNTIME_OPERATIONS = RUNTIME_OPERATIONS;
 exports.STATE_DELIMITER = STATE_DELIMITER;
+exports.XSTATE_ATTACHED_FORWARD = XSTATE_ATTACHED_FORWARD;
 exports.XSTATE_INIT = XSTATE_INIT;
 exports.XSTATE_LOGIC_EFFECT_REJECT = XSTATE_LOGIC_EFFECT_REJECT;
 exports.XSTATE_LOGIC_EFFECT_RESOLVE = XSTATE_LOGIC_EFFECT_RESOLVE;

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

@@ -1,5 +1,8 @@
 import type { EventObject, InferEvents, MachineContext, SetupSchemas, SetupStateSchema } from "./base.types.js";
 import type { StandardSchemaV1 } from "./schema.types.js";
+type FSMInitEvent = {
+    type: 'xstate.init';
+};
 /** @public */
 export type FSMArgs<TContext extends MachineContext, TEvent extends EventObject> = {
     context: TContext;
@@ -22,13 +25,14 @@ type EventForType<TEvent extends EventObject, TType extends string> = [
     type: TType;
 }>;
 /** @public */
-export type FSMTransition<TContext extends MachineContext, TEvent extends EventObject, TState extends string, TTransitionContext extends MachineContext = TContext> = TState | FSMTransitionConfig<TTransitionContext, TState> | FSMTransitionFunction<TContext, TEvent, TState, TTransitionContext>;
+export type FSMTransition<TContext extends MachineContext, TEvent extends EventObject, TState extends string, TTransitionContext extends MachineContext = TContext> = FSMTransitionConfig<TTransitionContext, TState> | FSMTransitionFunction<TContext, TEvent, TState, TTransitionContext>;
 type FSMOn<TContext extends MachineContext, TEvent extends EventObject, TState extends string, TTransitionContext extends MachineContext = TContext> = {
     [TType in TEvent['type'] & string]?: FSMTransition<TContext, EventForType<TEvent, TType>, TState, TTransitionContext>;
 };
 /** @public */
 export type FSMStateConfig<TContext extends MachineContext, TEvent extends EventObject, TState extends string, TTransitionContext extends MachineContext = TContext> = {
     on?: FSMOn<TContext, TEvent, TState, TTransitionContext>;
+    always?: FSMTransition<TContext, TEvent | FSMInitEvent, TState, TTransitionContext>;
 };
 type FSMContextConfig<TContext extends MachineContext> = string extends keyof TContext ? {
     context?: TContext;
@@ -134,14 +138,10 @@ type FSMSetupTransitionConfig<TSourceContext extends MachineContext, TStates ext
 } | {
     [TTarget in keyof TStates & string]: FSMSetupTargetTransitionConfig<TSourceContext, TTarget, FSMSetupStateContext<TTarget, TStates, TGlobalContext>>;
 }[keyof TStates & string];
-type FSMSetupStringTransition<TSourceContext extends MachineContext, TStates extends FSMSetupStates, TGlobalContext extends MachineContext> = {
-    [TTarget in keyof TStates & string]: [TSourceContext] extends [
-        FSMSetupStateContext<TTarget, TStates, TGlobalContext>
-    ] ? TTarget : never;
-}[keyof TStates & string];
 type FSMSetupTransitionFunction<TSourceContext extends MachineContext, TEvent extends EventObject, TStates extends FSMSetupStates, TGlobalContext extends MachineContext> = (args: FSMArgs<TSourceContext, TEvent>) => FSMSetupTransitionConfig<TSourceContext, TStates, TGlobalContext> | undefined;
-type FSMSetupTransition<TSourceContext extends MachineContext, TEvent extends EventObject, TStates extends FSMSetupStates, TGlobalContext extends MachineContext, TMachineStates extends Record<string, unknown>> = [keyof TStates] extends [never] ? FSMTransition<TSourceContext, TEvent, keyof TMachineStates & string> : FSMSetupStringTransition<TSourceContext, TStates, TGlobalContext> | FSMSetupTransitionConfig<TSourceContext, TStates, TGlobalContext> | FSMSetupTransitionFunction<TSourceContext, TEvent, TStates, TGlobalContext>;
+type FSMSetupTransition<TSourceContext extends MachineContext, TEvent extends EventObject, TStates extends FSMSetupStates, TGlobalContext extends MachineContext, TMachineStates extends Record<string, unknown>> = [keyof TStates] extends [never] ? FSMTransition<TSourceContext, TEvent, keyof TMachineStates & string> : FSMSetupTransitionConfig<TSourceContext, TStates, TGlobalContext> | FSMSetupTransitionFunction<TSourceContext, TEvent, TStates, TGlobalContext>;
 type FSMSetupStateConfig<TSourceContext extends MachineContext, TEvent extends EventObject, TStates extends FSMSetupStates, TGlobalContext extends MachineContext, TMachineStates extends Record<string, unknown>> = {
+    always?: FSMSetupTransition<TSourceContext, TEvent | FSMInitEvent, TStates, TGlobalContext, TMachineStates>;
     on?: {
         [TType in TEvent['type'] & string]?: FSMSetupTransition<TSourceContext, EventForType<TEvent, TType>, TStates, TGlobalContext, TMachineStates>;
     };

package/dist/{effectDescriptor-47f73e7e.cjs.js → effectDescriptor-3402f63e.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-c91c9ffe.cjs.js');
+var createActor = require('./createActor-73aa92ba.cjs.js');
 
 function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
   const result = microsteps.map(([snapshot, actions, transitions]) => [snapshot, actions, transitions ?? []]);

package/dist/{effectDescriptor-e93df910.esm.js → effectDescriptor-65821048.development.esm.js}

@@ -1,4 +1,4 @@
-import { ai as createInertActorScope, aj as setInertActorScopeSnapshot, l as finalizeTransitionResult, al as attachSnapshotActorRef, Q as createInitEvent, aF as hasAmbientInspector, ak as beginSpawnAllocation, am as macrostep, az as createSpawnEffect, aA as initialMicrostep, i as isAtomicStateNode, aG as getProperAncestors, q as readTimerKey, k as getActorIdPrefix, o as isSerializedActorRef, aH as isRemoteActorRef } from './createActor-20a97166.esm.js';
+import { ai as createInertActorScope, aj as setInertActorScopeSnapshot, l as finalizeTransitionResult, al as attachSnapshotActorRef, Q as createInitEvent, aH as hasAmbientInspector, ak as beginSpawnAllocation, am as macrostep, aA as createSpawnEffect, aB as initialMicrostep, i as isAtomicStateNode, aI as getProperAncestors, q as readTimerKey, k as getActorIdPrefix, o as isSerializedActorRef, aJ as isRemoteActorRef } from './createActor-a085b20b.development.esm.js';
 
 function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
   const result = microsteps.map(([snapshot, actions, transitions]) => [snapshot, actions, transitions ?? []]);

package/dist/{effectDescriptor-5ac7dccb.development.esm.js → effectDescriptor-72c62058.esm.js}

@@ -1,4 +1,4 @@
-import { ah as createInertActorScope, ai as setInertActorScopeSnapshot, l as finalizeTransitionResult, ak as attachSnapshotActorRef, O as createInitEvent, aG as hasAmbientInspector, aj as beginSpawnAllocation, al as macrostep, az as createSpawnEffect, aA as initialMicrostep, i as isAtomicStateNode, aH as getProperAncestors, q as readTimerKey, k as getActorIdPrefix, o as isSerializedActorRef, aI as isRemoteActorRef } from './createActor-0250284a.development.esm.js';
+import { aj as createInertActorScope, ak as setInertActorScopeSnapshot, l as finalizeTransitionResult, am as attachSnapshotActorRef, R as createInitEvent, aG as hasAmbientInspector, al as beginSpawnAllocation, an as macrostep, aA as createSpawnEffect, aB as initialMicrostep, i as isAtomicStateNode, aH as getProperAncestors, q as readTimerKey, k as getActorIdPrefix, o as isSerializedActorRef, aI as isRemoteActorRef } from './createActor-49ea55ba.esm.js';
 
 function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
   const result = microsteps.map(([snapshot, actions, transitions]) => [snapshot, actions, transitions ?? []]);

package/dist/{effectDescriptor-3fff5c51.development.cjs.js → effectDescriptor-d0ea44ad.development.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-c029d29f.development.cjs.js');
+var createActor = require('./createActor-dfb6b790.development.cjs.js');
 
 function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
   const result = microsteps.map(([snapshot, actions, transitions]) => [snapshot, actions, transitions ?? []]);

package/dist/{legacySnapshot-ae6594a7.development.esm.js → legacySnapshot-11aba2d2.development.esm.js}

@@ -1,4 +1,4 @@
-import { _ as resolveRegisteredActorSource, $ as allocateChildId, a0 as assertChildIdFree, a1 as reserveChildId, a2 as hasUnescapedDot, a3 as STATE_DELIMITER, a4 as mapValues, t as toArray, a5 as createInvokeId, a6 as getDelayedTransitions, a7 as getCandidates, a8 as evaluateCandidate, a9 as formatTransition, aa as NULL_EVENT, ab as toTransitionConfigArray, ac as matchesActorSession, ad as describeMachine, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, o as isSerializedActorRef, a as assertUnreservedSourceName, ae as formatRouteTransitions, af as resolveStateValue, e as createMachineSnapshot, ag as isInFinalState, ah as createInertActorScope, ai as setInertActorScopeSnapshot, Q as createDeadLetterEffect, aj as beginSpawnAllocation, ak as attachSnapshotActorRef, al as macrostep, am as isInertActorScope, an as setSnapshotActorRef, ao as cloneMachineSnapshot, ap as transitionNode, aq as XSTATE_TIMER, m as matchesEventDescriptor, ar as getTransitionResult, as as hasEffect, at as createErrorPlatformEvent, au as withActorSelf, av as resolveActionsWithContext, aw as freezeContext, ax as takeSpawnAllocationCounters, ay as mergeActorIdCounters, O as createInitEvent, az as createSpawnEffect, aA as initialMicrostep, aB as createStartEffect, aC as isStateId, aD as getPersistedSnapshot, aE as detachedScopes, aF as toStatePath, h as createActor } from './createActor-0250284a.development.esm.js';
+import { $ as resolveRegisteredActorSource, a0 as allocateChildId, a1 as assertChildIdFree, a2 as reserveChildId, a3 as hasUnescapedDot, a4 as STATE_DELIMITER, a5 as mapValues, t as toArray, a6 as createInvokeId, a7 as getDelayedTransitions, a8 as getCandidates, a9 as evaluateCandidate, aa as formatTransition, ab as NULL_EVENT, ac as toTransitionConfigArray, ad as matchesActorSession, ae as describeMachine, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, o as isSerializedActorRef, a as assertUnreservedSourceName, af as formatRouteTransitions, ag as resolveStateValue, e as createMachineSnapshot, ah as isInFinalState, ai as createInertActorScope, aj as setInertActorScopeSnapshot, R as createDeadLetterEffect, ak as beginSpawnAllocation, al as attachSnapshotActorRef, am as macrostep, an as isInertActorScope, ao as setSnapshotActorRef, ap as cloneMachineSnapshot, aq as transitionNode, ar as XSTATE_TIMER, m as matchesEventDescriptor, as as getTransitionResult, at as hasEffect, au as createErrorPlatformEvent, av as withActorSelf, aw as resolveActionsWithContext, ax as freezeContext, ay as takeSpawnAllocationCounters, az as mergeActorIdCounters, Q as createInitEvent, aA as createSpawnEffect, aB as initialMicrostep, aC as createStartEffect, aD as isStateId, aE as getPersistedSnapshot, aF as detachedScopes, aG as toStatePath, h as createActor } from './createActor-a085b20b.development.esm.js';
 import { a as assertValid } from './validation-e69470ad.development.esm.js';
 
 var isDevelopment = true;

package/dist/{legacySnapshot-ebf0b2b8.development.cjs.js → legacySnapshot-2e2c1d3b.development.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-c029d29f.development.cjs.js');
+var createActor = require('./createActor-dfb6b790.development.cjs.js');
 var validation = require('./validation-f2714a35.development.cjs.js');
 
 var isDevelopment = true;

package/dist/{legacySnapshot-8d595687.cjs.js → legacySnapshot-a85dfbe2.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-c91c9ffe.cjs.js');
+var createActor = require('./createActor-73aa92ba.cjs.js');
 var validation = require('./validation-4561b43c.cjs.js');
 
 var isDevelopment = false;

package/dist/{legacySnapshot-9e06feb4.esm.js → legacySnapshot-fffe81a0.esm.js}

@@ -1,4 +1,4 @@
-import { $ as resolveRegisteredActorSource, a0 as allocateChildId, a1 as assertChildIdFree, a2 as reserveChildId, a3 as hasUnescapedDot, x as xstateError, a4 as STATE_DELIMITER, a5 as mapValues, t as toArray, a6 as createInvokeId, a7 as getDelayedTransitions, a8 as getCandidates, a9 as evaluateCandidate, aa as formatTransition, ab as NULL_EVENT, ac as toTransitionConfigArray, ad as matchesActorSession, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, ae as describeMachine, o as isSerializedActorRef, af as formatRouteTransitions, ag as resolveStateValue, e as createMachineSnapshot, ah as isInFinalState, ai as createInertActorScope, aj as setInertActorScopeSnapshot, R as createDeadLetterEffect, ak as beginSpawnAllocation, al as attachSnapshotActorRef, am as macrostep, an as isInertActorScope, ao as setSnapshotActorRef, ap as cloneMachineSnapshot, aq as transitionNode, ar as XSTATE_TIMER, m as matchesEventDescriptor, as as getTransitionResult, at as hasEffect, au as createErrorPlatformEvent, av as withActorSelf, aw as resolveActionsWithContext, ax as takeSpawnAllocationCounters, ay as mergeActorIdCounters, Q as createInitEvent, az as createSpawnEffect, aA as initialMicrostep, aB as createStartEffect, aC as isStateId, aD as getPersistedSnapshot, aE as detachedScopes, h as createActor } from './createActor-20a97166.esm.js';
+import { a0 as resolveRegisteredActorSource, a1 as allocateChildId, a2 as assertChildIdFree, a3 as reserveChildId, a4 as hasUnescapedDot, x as xstateError, a5 as STATE_DELIMITER, a6 as mapValues, t as toArray, a7 as createInvokeId, a8 as getDelayedTransitions, a9 as getCandidates, aa as evaluateCandidate, ab as formatTransition, ac as NULL_EVENT, ad as toTransitionConfigArray, ae as matchesActorSession, g as getAllStateNodes, b as getStateNodes, r as resolveInvokedActorLogic, af as describeMachine, o as isSerializedActorRef, ag as formatRouteTransitions, ah as resolveStateValue, e as createMachineSnapshot, ai as isInFinalState, aj as createInertActorScope, ak as setInertActorScopeSnapshot, S as createDeadLetterEffect, al as beginSpawnAllocation, am as attachSnapshotActorRef, an as macrostep, ao as isInertActorScope, ap as setSnapshotActorRef, aq as cloneMachineSnapshot, ar as transitionNode, as as XSTATE_TIMER, m as matchesEventDescriptor, at as getTransitionResult, au as hasEffect, av as createErrorPlatformEvent, aw as withActorSelf, ax as resolveActionsWithContext, ay as takeSpawnAllocationCounters, az as mergeActorIdCounters, R as createInitEvent, aA as createSpawnEffect, aB as initialMicrostep, aC as createStartEffect, aD as isStateId, aE as getPersistedSnapshot, aF as detachedScopes, h as createActor } from './createActor-49ea55ba.esm.js';
 import { a as assertValid } from './validation-05f1d517.esm.js';
 
 var isDevelopment = false;

package/dist/xstate-actors.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var createActor = require('./createActor-c91c9ffe.cjs.js');
+var createActor = require('./createActor-73aa92ba.cjs.js');
 var validation = require('./validation-4561b43c.cjs.js');
 
 /** @public */
@@ -253,6 +253,7 @@ function createStepLogic(config) {
 }
 
 const instanceStates = /* #__PURE__ */new WeakMap();
+const XSTATE_CALLBACK_SEND_BACK = 'xstate.callback.sendBack';
 
 /** @public */
 
@@ -372,8 +373,10 @@ function createCallbackLogic(callbackOrConfig) {
   const callback = typeof callbackOrConfig === 'function' ? callbackOrConfig : callbackOrConfig.run;
   const schemas = typeof callbackOrConfig === 'function' ? undefined : callbackOrConfig.schemas;
   const validator = typeof callbackOrConfig === 'function' ? undefined : callbackOrConfig.validator;
-  return createStepLogic({
-    validator,
+  const logic = createStepLogic({
+    validator: validator && {
+      check: request => request.kind === 'event' && request.event.type === XSTATE_CALLBACK_SEND_BACK ? undefined : validator.check(request)
+    },
     schemas,
     context: undefined,
     run: (args, enq) => {
@@ -383,6 +386,10 @@ function createCallbackLogic(callbackOrConfig) {
         self,
         system
       } = args;
+      if (event.type === XSTATE_CALLBACK_SEND_BACK) {
+        enq.sendBack(event.event);
+        return;
+      }
       const emit = args.emit;
       const callbackState = instanceStates.get(self);
       callbackState?.receivers?.forEach(receiver => receiver(event));
@@ -402,7 +409,10 @@ function createCallbackLogic(callbackOrConfig) {
             }
             const parent = self._parent;
             if (parent) {
-              system._relay(self, parent, event);
+              system._relay(self, self, {
+                type: XSTATE_CALLBACK_SEND_BACK,
+                event
+              });
             }
           },
           receive: listener => {
@@ -419,6 +429,10 @@ function createCallbackLogic(callbackOrConfig) {
       });
     }
   });
+  Object.assign(logic, {
+    isInternalEventType: eventType => eventType === XSTATE_CALLBACK_SEND_BACK
+  });
+  return logic;
 }
 
 const XSTATE_OBSERVABLE_NEXT = 'xstate.observable.next';
@@ -667,6 +681,11 @@ function createEventObservableLogic(lazyObservableOrConfig) {
         return [state, []];
       }
       switch (event.type) {
+        case XSTATE_OBSERVABLE_NEXT:
+          {
+            const parent = actorScope.self._parent;
+            return [state, parent ? [createActor.createSendToEffect(actorScope, parent, event.data)] : []];
+          }
         case XSTATE_OBSERVABLE_ERROR:
           return createActor.finalizeTransitionResult(actorScope, state, [{
             ...state,
@@ -732,7 +751,10 @@ function createEventObservableLogic(lazyObservableOrConfig) {
       }).subscribe({
         next: value => {
           if (self._parent) {
-            system._relay(self, self._parent, value);
+            system._relay(self, self, {
+              type: XSTATE_OBSERVABLE_NEXT,
+              data: value
+            });
           }
         },
         error: err => {
@@ -757,6 +779,9 @@ function createEventObservableLogic(lazyObservableOrConfig) {
       _subscription: undefined
     })
   };
+  Object.assign(logic, {
+    isInternalEventType: eventType => eventType === XSTATE_OBSERVABLE_NEXT || eventType === XSTATE_OBSERVABLE_ERROR || eventType === XSTATE_OBSERVABLE_COMPLETE
+  });
   return logic;
 }