xstate 6.0.0-alpha.47 → 6.0.0-alpha.49

package/dist/{createActor-ff132afa.development.esm.js → createActor-88709f74.development.esm.js}

@@ -2298,7 +2298,8 @@ function resolveHistoryDefaultTransition(stateNode) {
     target,
     source: stateNode,
     reenter: false,
-    eventType: ''
+    eventType: '',
+    to: stateNode.config._historyDefaultTransition
   };
 }
 function isHistoryNode(stateNode) {
@@ -2312,7 +2313,9 @@ function getInitialStateNodes(stateNode) {
     }
     set.add(descStateNode);
     if (descStateNode.type === 'compound') {
-      iter(descStateNode.initial.target[0]);
+      for (const target of descStateNode.initial.target ?? []) {
+        iter(target);
+      }
     } else if (descStateNode.type === 'parallel') {
       for (const child of getChildren(descStateNode)) {
         iter(child);
@@ -2565,6 +2568,18 @@ function getTransitionDomain(transition, snapshot, resolveTransition) {
     targets,
     reenter
   } = resolveTransition(transition);
+  if (transition._transitionDomain) {
+    if (transition._transitionDomain === 'internal' && transition.source.type === 'compound' && targetStates.every(target => isDescendant(target, transition.source))) {
+      return transition.source;
+    }
+    const [head, ...tail] = targetStates.concat(transition.source);
+    for (const ancestor of getProperAncestors(head, undefined)) {
+      if (ancestor.type === 'compound' && tail.every(stateNode => isDescendant(stateNode, ancestor))) {
+        return ancestor;
+      }
+    }
+    return;
+  }
 
   // A history target that restores the source itself must exit and reenter
   // the source (SCXML domain = the source's ancestor), unlike a plain
@@ -2617,12 +2632,28 @@ function computeExitSet(transitions, stateNodeSet, snapshot, resolveTransition)
   return [...statesToExit];
 }
 function initialMicrostep(root, preInitialState, actorScope, initEvent, internalQueue) {
+  const initialStateNodes = [...getInitialStateNodes(root)];
+  const statesForDefaultEntry = new Set();
+  const collectDefaultEntryStates = stateNode => {
+    if (stateNode.type === 'compound') {
+      statesForDefaultEntry.add(stateNode);
+      for (const target of stateNode.initial.target ?? []) {
+        collectDefaultEntryStates(target);
+      }
+    } else if (stateNode.type === 'parallel') {
+      for (const child of getChildren(stateNode)) {
+        collectDefaultEntryStates(child);
+      }
+    }
+  };
+  collectDefaultEntryStates(root);
   return microstep([{
-    target: [...getInitialStateNodes(root)],
+    target: initialStateNodes.filter(stateNode => !initialStateNodes.some(other => other !== stateNode && isDescendant(other, stateNode))),
     source: root,
     reenter: true,
     eventType: null,
-    toJSON: null
+    toJSON: null,
+    _statesForDefaultEntry: [...statesForDefaultEntry]
   }], preInitialState, actorScope, initEvent, true, internalQueue);
 }
 
@@ -2801,6 +2832,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
       // in other words, those are states for which initial actions should be executed
       // when we target `#deep_child` initial actions of its ancestors shouldn't be executed
       const statesForDefaultEntry = new Set();
+      const historyDefaultsByParent = new Map();
       const addAncestorStatesToEnter = (ancestors, reentrancyDomain) => {
         for (const anc of ancestors) {
           if (!reentrancyDomain || isDescendant(anc, reentrancyDomain)) {
@@ -2829,6 +2861,11 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             }
           } else {
             const historyDefaultTransition = resolveHistoryDefaultTransition(stateNode);
+            const historyParent = stateNode.parent;
+            statesForDefaultEntry.add(historyParent);
+            const defaults = historyDefaultsByParent.get(historyParent) ?? [];
+            defaults.push(historyDefaultTransition);
+            historyDefaultsByParent.set(historyParent, defaults);
             const {
               targets
             } = getCurrentTransitionResult(historyDefaultTransition);
@@ -2846,13 +2883,19 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           return;
         }
         if (stateNode.type === 'compound') {
-          const [initialState] = getCurrentTransitionResult(stateNode.initial).targets;
-          if (!isHistoryNode(initialState)) {
-            statesToEnter.add(initialState);
-            statesForDefaultEntry.add(initialState);
+          const initialStates = getCurrentTransitionResult(stateNode.initial).targets ?? [];
+          for (const initialState of initialStates) {
+            if (!isHistoryNode(initialState)) {
+              statesToEnter.add(initialState);
+            }
+          }
+          statesForDefaultEntry.add(stateNode);
+          for (const initialState of initialStates) {
+            addDescendantStatesToEnter(initialState);
+          }
+          for (const initialState of initialStates) {
+            addAncestorStatesToEnter(getProperAncestors(initialState, stateNode), undefined);
           }
-          addDescendantStatesToEnter(initialState);
-          addAncestorStatesToEnter(getProperAncestors(initialState, stateNode), undefined);
           return;
         }
         if (stateNode.type === 'parallel') {
@@ -2894,7 +2937,9 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         }
       }
       if (isInitial) {
-        statesForDefaultEntry.add(currentSnapshot.machine.root);
+        for (const stateNode of filteredTransitions[0]._statesForDefaultEntry ?? [currentSnapshot.machine.root]) {
+          statesForDefaultEntry.add(stateNode);
+        }
       }
       const stateInputMap = {
         ...currentSnapshot._stateInputs
@@ -2979,17 +3024,28 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           nextState.context = context;
         }
         if (statesForDefaultEntry.has(stateNodeToEnter)) {
-          const {
-            actions: initialActions,
-            input: initialInput
-          } = getTransitionResult(stateNodeToEnter.initial, nextState, event, actorScope);
-          if (initialActions) {
-            actions.push(...initialActions);
-          }
-          if (initialInput && stateNodeToEnter.initial?.target) {
-            for (const targetNode of stateNodeToEnter.initial.target) {
-              stateInputMap[targetNode.id] = initialInput;
-              stateInputsChanged = true;
+          const defaultTransitions = [stateNodeToEnter.initial, ...(historyDefaultsByParent.get(stateNodeToEnter) ?? [])].filter(Boolean);
+          for (const defaultTransition of defaultTransitions) {
+            const {
+              actions: initialActions,
+              context: initialContext,
+              input: initialInput,
+              internalEvents: initialInternalEvents
+            } = getTransitionResult(defaultTransition, nextState, event, actorScope);
+            if (initialActions) {
+              actions.push(...initialActions);
+            }
+            if (initialInternalEvents?.length) {
+              internalQueue.push(...initialInternalEvents);
+            }
+            if (initialContext !== undefined) {
+              nextState.context = mergeContextPatch(nextState.context, initialContext);
+            }
+            if (initialInput && defaultTransition.target) {
+              for (const targetNode of defaultTransition.target) {
+                stateInputMap[targetNode.id] = initialInput;
+                stateInputsChanged = true;
+              }
             }
           }
         }
@@ -5738,4 +5794,4 @@ function createActor(logic, options) {
   return new Actor(logic, options);
 }
 
-export { evaluateCandidate as $, Actor as A, checkStateIn as B, pathToStateValue as C, toObserver as D, executeEffects as E, isBuiltInExecutableAction as F, deliverEvent as G, runStep as H, stopActor as I, terminateActor as J, createInitEvent as K, createCustomEffect as L, XSTATE_LOGIC_EFFECT_START as M, XSTATE_LOGIC_EFFECT_RESOLVE as N, XSTATE_LOGIC_EFFECT_REJECT as O, createEmitEffect as P, resolveRegisteredActorSource as Q, allocateChildId as R, assertChildIdFree as S, reserveChildId as T, STATE_DELIMITER as U, mapValues as V, createInvokeId as W, XSTATE_INIT as X, getDelayedTransitions as Y, getEventDescriptorKey as Z, getCandidates as _, beginSpawnAllocation as a, formatTransition as a0, NULL_EVENT as a1, toTransitionConfigArray as a2, createInvokeTimeoutEventId as a3, matchesActorSession as a4, formatRouteTransitions as a5, resolveStateValue as a6, getAllStateNodes as a7, createMachineSnapshot as a8, isInFinalState as a9, getProperAncestors as aA, isRemoteActorRef as aB, getActorIdPrefix as aC, getAllOwnEvents as aD, matchesEvent as aE, encodeAddressSegment as aF, getRootActorId as aG, RUNTIME_OPERATIONS as aH, withSystemInspector as aI, getSnapshotActorRef as aJ, withExecutionIdentity as aK, createInertActorScope as aa, setInertActorScopeSnapshot as ab, attachSnapshotActorRef as ac, macrostep as ad, isInertActorScope as ae, setSnapshotActorRef as af, cloneMachineSnapshot as ag, transitionNode as ah, getTransitionResult as ai, hasEffect as aj, createErrorPlatformEvent as ak, withActorSelf as al, takeSpawnAllocationCounters as am, mergeActorIdCounters as an, createSpawnEffect as ao, initialMicrostep as ap, toStatePath as aq, isStateId as ar, getStateNodeByPath as as, getPersistedSnapshot as at, createRemoteActorRef as au, resolveReferencedActor as av, createInvokeTimeoutEvent as aw, parseGeneratedActorId as ax, ACTOR_REF_TYPE as ay, hasAmbientInspector as az, builtInActions as b, createTransitionEnqueue as c, deriveDeferredStarts as d, XSTATE_STOP as e, finalizeTransitionResult as f, XSTATE_TIMER as g, createSendToEffect as h, isLazyActorScope as i, isAtomicStateNode as j, createActor as k, createListenerLogic as l, matchesEventDescriptor as m, createSubscriptionLogic as n, listenerLogic as o, parseDelayToMilliseconds as p, getInitialSnapshot as q, resolveActionsWithContext as r, subscriptionLogic as s, toArray as t, getNextSnapshot as u, isMachineSnapshot as v, withActorScope as w, getStateNodes as x, getAllOwnEventDescriptors as y, matchesState as z };
+export { matchesActorSession as $, Actor as A, XSTATE_LOGIC_EFFECT_START as B, XSTATE_LOGIC_EFFECT_RESOLVE as C, XSTATE_LOGIC_EFFECT_REJECT as D, finalizeTransitionResult as E, createEmitEffect as F, createSendToEffect as G, XSTATE_INIT as H, withActorScope as I, XSTATE_TIMER as J, isLazyActorScope as K, resolveRegisteredActorSource as L, allocateChildId as M, assertChildIdFree as N, reserveChildId as O, mapValues as P, createInvokeId as Q, getDelayedTransitions as R, STATE_DELIMITER as S, getEventDescriptorKey as T, getCandidates as U, evaluateCandidate as V, formatTransition as W, XSTATE_STOP as X, NULL_EVENT as Y, toTransitionConfigArray as Z, createInvokeTimeoutEventId as _, createListenerLogic as a, formatRouteTransitions as a0, resolveStateValue as a1, getAllStateNodes as a2, createMachineSnapshot as a3, isInFinalState as a4, createInertActorScope as a5, setInertActorScopeSnapshot as a6, beginSpawnAllocation as a7, attachSnapshotActorRef as a8, macrostep as a9, getAllOwnEvents as aA, matchesEvent as aB, encodeAddressSegment as aC, getRootActorId as aD, RUNTIME_OPERATIONS as aE, withSystemInspector as aF, getSnapshotActorRef as aG, withExecutionIdentity as aH, isInertActorScope as aa, setSnapshotActorRef as ab, cloneMachineSnapshot as ac, transitionNode as ad, getTransitionResult as ae, hasEffect as af, createErrorPlatformEvent as ag, withActorSelf as ah, resolveActionsWithContext as ai, takeSpawnAllocationCounters as aj, mergeActorIdCounters as ak, createSpawnEffect as al, initialMicrostep as am, toStatePath as an, isStateId as ao, getStateNodeByPath as ap, getPersistedSnapshot as aq, createRemoteActorRef as ar, resolveReferencedActor as as, createInvokeTimeoutEvent as at, parseGeneratedActorId as au, ACTOR_REF_TYPE as av, hasAmbientInspector as aw, getProperAncestors as ax, isRemoteActorRef as ay, getActorIdPrefix as az, createSubscriptionLogic as b, createActor as c, getNextSnapshot as d, isMachineSnapshot as e, getStateNodes as f, getInitialSnapshot as g, getAllOwnEventDescriptors as h, isAtomicStateNode as i, matchesState as j, checkStateIn as k, listenerLogic as l, matchesEventDescriptor as m, pathToStateValue as n, toObserver as o, parseDelayToMilliseconds as p, executeEffects as q, isBuiltInExecutableAction as r, subscriptionLogic as s, toArray as t, deliverEvent as u, runStep as v, stopActor as w, terminateActor as x, createInitEvent as y, createCustomEffect as z };

package/dist/{createActor-6736cbbe.development.cjs.js → createActor-a1e0dffb.development.cjs.js}

@@ -2300,7 +2300,8 @@ function resolveHistoryDefaultTransition(stateNode) {
     target,
     source: stateNode,
     reenter: false,
-    eventType: ''
+    eventType: '',
+    to: stateNode.config._historyDefaultTransition
   };
 }
 function isHistoryNode(stateNode) {
@@ -2314,7 +2315,9 @@ function getInitialStateNodes(stateNode) {
     }
     set.add(descStateNode);
     if (descStateNode.type === 'compound') {
-      iter(descStateNode.initial.target[0]);
+      for (const target of descStateNode.initial.target ?? []) {
+        iter(target);
+      }
     } else if (descStateNode.type === 'parallel') {
       for (const child of getChildren(descStateNode)) {
         iter(child);
@@ -2567,6 +2570,18 @@ function getTransitionDomain(transition, snapshot, resolveTransition) {
     targets,
     reenter
   } = resolveTransition(transition);
+  if (transition._transitionDomain) {
+    if (transition._transitionDomain === 'internal' && transition.source.type === 'compound' && targetStates.every(target => isDescendant(target, transition.source))) {
+      return transition.source;
+    }
+    const [head, ...tail] = targetStates.concat(transition.source);
+    for (const ancestor of getProperAncestors(head, undefined)) {
+      if (ancestor.type === 'compound' && tail.every(stateNode => isDescendant(stateNode, ancestor))) {
+        return ancestor;
+      }
+    }
+    return;
+  }
 
   // A history target that restores the source itself must exit and reenter
   // the source (SCXML domain = the source's ancestor), unlike a plain
@@ -2619,12 +2634,28 @@ function computeExitSet(transitions, stateNodeSet, snapshot, resolveTransition)
   return [...statesToExit];
 }
 function initialMicrostep(root, preInitialState, actorScope, initEvent, internalQueue) {
+  const initialStateNodes = [...getInitialStateNodes(root)];
+  const statesForDefaultEntry = new Set();
+  const collectDefaultEntryStates = stateNode => {
+    if (stateNode.type === 'compound') {
+      statesForDefaultEntry.add(stateNode);
+      for (const target of stateNode.initial.target ?? []) {
+        collectDefaultEntryStates(target);
+      }
+    } else if (stateNode.type === 'parallel') {
+      for (const child of getChildren(stateNode)) {
+        collectDefaultEntryStates(child);
+      }
+    }
+  };
+  collectDefaultEntryStates(root);
   return microstep([{
-    target: [...getInitialStateNodes(root)],
+    target: initialStateNodes.filter(stateNode => !initialStateNodes.some(other => other !== stateNode && isDescendant(other, stateNode))),
     source: root,
     reenter: true,
     eventType: null,
-    toJSON: null
+    toJSON: null,
+    _statesForDefaultEntry: [...statesForDefaultEntry]
   }], preInitialState, actorScope, initEvent, true, internalQueue);
 }
 
@@ -2803,6 +2834,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
       // in other words, those are states for which initial actions should be executed
       // when we target `#deep_child` initial actions of its ancestors shouldn't be executed
       const statesForDefaultEntry = new Set();
+      const historyDefaultsByParent = new Map();
       const addAncestorStatesToEnter = (ancestors, reentrancyDomain) => {
         for (const anc of ancestors) {
           if (!reentrancyDomain || isDescendant(anc, reentrancyDomain)) {
@@ -2831,6 +2863,11 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             }
           } else {
             const historyDefaultTransition = resolveHistoryDefaultTransition(stateNode);
+            const historyParent = stateNode.parent;
+            statesForDefaultEntry.add(historyParent);
+            const defaults = historyDefaultsByParent.get(historyParent) ?? [];
+            defaults.push(historyDefaultTransition);
+            historyDefaultsByParent.set(historyParent, defaults);
             const {
               targets
             } = getCurrentTransitionResult(historyDefaultTransition);
@@ -2848,13 +2885,19 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           return;
         }
         if (stateNode.type === 'compound') {
-          const [initialState] = getCurrentTransitionResult(stateNode.initial).targets;
-          if (!isHistoryNode(initialState)) {
-            statesToEnter.add(initialState);
-            statesForDefaultEntry.add(initialState);
+          const initialStates = getCurrentTransitionResult(stateNode.initial).targets ?? [];
+          for (const initialState of initialStates) {
+            if (!isHistoryNode(initialState)) {
+              statesToEnter.add(initialState);
+            }
+          }
+          statesForDefaultEntry.add(stateNode);
+          for (const initialState of initialStates) {
+            addDescendantStatesToEnter(initialState);
+          }
+          for (const initialState of initialStates) {
+            addAncestorStatesToEnter(getProperAncestors(initialState, stateNode), undefined);
           }
-          addDescendantStatesToEnter(initialState);
-          addAncestorStatesToEnter(getProperAncestors(initialState, stateNode), undefined);
           return;
         }
         if (stateNode.type === 'parallel') {
@@ -2896,7 +2939,9 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         }
       }
       if (isInitial) {
-        statesForDefaultEntry.add(currentSnapshot.machine.root);
+        for (const stateNode of filteredTransitions[0]._statesForDefaultEntry ?? [currentSnapshot.machine.root]) {
+          statesForDefaultEntry.add(stateNode);
+        }
       }
       const stateInputMap = {
         ...currentSnapshot._stateInputs
@@ -2981,17 +3026,28 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           nextState.context = context;
         }
         if (statesForDefaultEntry.has(stateNodeToEnter)) {
-          const {
-            actions: initialActions,
-            input: initialInput
-          } = getTransitionResult(stateNodeToEnter.initial, nextState, event, actorScope);
-          if (initialActions) {
-            actions.push(...initialActions);
-          }
-          if (initialInput && stateNodeToEnter.initial?.target) {
-            for (const targetNode of stateNodeToEnter.initial.target) {
-              stateInputMap[targetNode.id] = initialInput;
-              stateInputsChanged = true;
+          const defaultTransitions = [stateNodeToEnter.initial, ...(historyDefaultsByParent.get(stateNodeToEnter) ?? [])].filter(Boolean);
+          for (const defaultTransition of defaultTransitions) {
+            const {
+              actions: initialActions,
+              context: initialContext,
+              input: initialInput,
+              internalEvents: initialInternalEvents
+            } = getTransitionResult(defaultTransition, nextState, event, actorScope);
+            if (initialActions) {
+              actions.push(...initialActions);
+            }
+            if (initialInternalEvents?.length) {
+              internalQueue.push(...initialInternalEvents);
+            }
+            if (initialContext !== undefined) {
+              nextState.context = mergeContextPatch(nextState.context, initialContext);
+            }
+            if (initialInput && defaultTransition.target) {
+              for (const targetNode of defaultTransition.target) {
+                stateInputMap[targetNode.id] = initialInput;
+                stateInputsChanged = true;
+              }
             }
           }
         }
@@ -5755,7 +5811,6 @@ exports.allocateChildId = allocateChildId;
 exports.assertChildIdFree = assertChildIdFree;
 exports.attachSnapshotActorRef = attachSnapshotActorRef;
 exports.beginSpawnAllocation = beginSpawnAllocation;
-exports.builtInActions = builtInActions;
 exports.checkStateIn = checkStateIn;
 exports.cloneMachineSnapshot = cloneMachineSnapshot;
 exports.createActor = createActor;
@@ -5773,9 +5828,7 @@ exports.createRemoteActorRef = createRemoteActorRef;
 exports.createSendToEffect = createSendToEffect;
 exports.createSpawnEffect = createSpawnEffect;
 exports.createSubscriptionLogic = createSubscriptionLogic;
-exports.createTransitionEnqueue = createTransitionEnqueue;
 exports.deliverEvent = deliverEvent;
-exports.deriveDeferredStarts = deriveDeferredStarts;
 exports.encodeAddressSegment = encodeAddressSegment;
 exports.evaluateCandidate = evaluateCandidate;
 exports.executeEffects = executeEffects;

package/dist/{createActor-bfe8b6bd.cjs.js → createActor-b4dd05ae.cjs.js}

@@ -2282,7 +2282,8 @@ function resolveHistoryDefaultTransition(stateNode) {
     target,
     source: stateNode,
     reenter: false,
-    eventType: ''
+    eventType: '',
+    to: stateNode.config._historyDefaultTransition
   };
 }
 function isHistoryNode(stateNode) {
@@ -2296,7 +2297,9 @@ function getInitialStateNodes(stateNode) {
     }
     set.add(descStateNode);
     if (descStateNode.type === 'compound') {
-      iter(descStateNode.initial.target[0]);
+      for (const target of descStateNode.initial.target ?? []) {
+        iter(target);
+      }
     } else if (descStateNode.type === 'parallel') {
       for (const child of getChildren(descStateNode)) {
         iter(child);
@@ -2549,6 +2552,18 @@ function getTransitionDomain(transition, snapshot, resolveTransition) {
     targets,
     reenter
   } = resolveTransition(transition);
+  if (transition._transitionDomain) {
+    if (transition._transitionDomain === 'internal' && transition.source.type === 'compound' && targetStates.every(target => isDescendant(target, transition.source))) {
+      return transition.source;
+    }
+    const [head, ...tail] = targetStates.concat(transition.source);
+    for (const ancestor of getProperAncestors(head, undefined)) {
+      if (ancestor.type === 'compound' && tail.every(stateNode => isDescendant(stateNode, ancestor))) {
+        return ancestor;
+      }
+    }
+    return;
+  }
 
   // A history target that restores the source itself must exit and reenter
   // the source (SCXML domain = the source's ancestor), unlike a plain
@@ -2601,12 +2616,28 @@ function computeExitSet(transitions, stateNodeSet, snapshot, resolveTransition)
   return [...statesToExit];
 }
 function initialMicrostep(root, preInitialState, actorScope, initEvent, internalQueue) {
+  const initialStateNodes = [...getInitialStateNodes(root)];
+  const statesForDefaultEntry = new Set();
+  const collectDefaultEntryStates = stateNode => {
+    if (stateNode.type === 'compound') {
+      statesForDefaultEntry.add(stateNode);
+      for (const target of stateNode.initial.target ?? []) {
+        collectDefaultEntryStates(target);
+      }
+    } else if (stateNode.type === 'parallel') {
+      for (const child of getChildren(stateNode)) {
+        collectDefaultEntryStates(child);
+      }
+    }
+  };
+  collectDefaultEntryStates(root);
   return microstep([{
-    target: [...getInitialStateNodes(root)],
+    target: initialStateNodes.filter(stateNode => !initialStateNodes.some(other => other !== stateNode && isDescendant(other, stateNode))),
     source: root,
     reenter: true,
     eventType: null,
-    toJSON: null
+    toJSON: null,
+    _statesForDefaultEntry: [...statesForDefaultEntry]
   }], preInitialState, actorScope, initEvent, true, internalQueue);
 }
 
@@ -2785,6 +2816,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
       // in other words, those are states for which initial actions should be executed
       // when we target `#deep_child` initial actions of its ancestors shouldn't be executed
       const statesForDefaultEntry = new Set();
+      const historyDefaultsByParent = new Map();
       const addAncestorStatesToEnter = (ancestors, reentrancyDomain) => {
         for (const anc of ancestors) {
           if (!reentrancyDomain || isDescendant(anc, reentrancyDomain)) {
@@ -2813,6 +2845,11 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             }
           } else {
             const historyDefaultTransition = resolveHistoryDefaultTransition(stateNode);
+            const historyParent = stateNode.parent;
+            statesForDefaultEntry.add(historyParent);
+            const defaults = historyDefaultsByParent.get(historyParent) ?? [];
+            defaults.push(historyDefaultTransition);
+            historyDefaultsByParent.set(historyParent, defaults);
             const {
               targets
             } = getCurrentTransitionResult(historyDefaultTransition);
@@ -2830,13 +2867,19 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           return;
         }
         if (stateNode.type === 'compound') {
-          const [initialState] = getCurrentTransitionResult(stateNode.initial).targets;
-          if (!isHistoryNode(initialState)) {
-            statesToEnter.add(initialState);
-            statesForDefaultEntry.add(initialState);
+          const initialStates = getCurrentTransitionResult(stateNode.initial).targets ?? [];
+          for (const initialState of initialStates) {
+            if (!isHistoryNode(initialState)) {
+              statesToEnter.add(initialState);
+            }
+          }
+          statesForDefaultEntry.add(stateNode);
+          for (const initialState of initialStates) {
+            addDescendantStatesToEnter(initialState);
+          }
+          for (const initialState of initialStates) {
+            addAncestorStatesToEnter(getProperAncestors(initialState, stateNode), undefined);
           }
-          addDescendantStatesToEnter(initialState);
-          addAncestorStatesToEnter(getProperAncestors(initialState, stateNode), undefined);
           return;
         }
         if (stateNode.type === 'parallel') {
@@ -2878,7 +2921,9 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         }
       }
       if (isInitial) {
-        statesForDefaultEntry.add(currentSnapshot.machine.root);
+        for (const stateNode of filteredTransitions[0]._statesForDefaultEntry ?? [currentSnapshot.machine.root]) {
+          statesForDefaultEntry.add(stateNode);
+        }
       }
       const stateInputMap = {
         ...currentSnapshot._stateInputs
@@ -2963,17 +3008,28 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           nextState.context = context;
         }
         if (statesForDefaultEntry.has(stateNodeToEnter)) {
-          const {
-            actions: initialActions,
-            input: initialInput
-          } = getTransitionResult(stateNodeToEnter.initial, nextState, event, actorScope);
-          if (initialActions) {
-            actions.push(...initialActions);
-          }
-          if (initialInput && stateNodeToEnter.initial?.target) {
-            for (const targetNode of stateNodeToEnter.initial.target) {
-              stateInputMap[targetNode.id] = initialInput;
-              stateInputsChanged = true;
+          const defaultTransitions = [stateNodeToEnter.initial, ...(historyDefaultsByParent.get(stateNodeToEnter) ?? [])].filter(Boolean);
+          for (const defaultTransition of defaultTransitions) {
+            const {
+              actions: initialActions,
+              context: initialContext,
+              input: initialInput,
+              internalEvents: initialInternalEvents
+            } = getTransitionResult(defaultTransition, nextState, event, actorScope);
+            if (initialActions) {
+              actions.push(...initialActions);
+            }
+            if (initialInternalEvents?.length) {
+              internalQueue.push(...initialInternalEvents);
+            }
+            if (initialContext !== undefined) {
+              nextState.context = mergeContextPatch(nextState.context, initialContext);
+            }
+            if (initialInput && defaultTransition.target) {
+              for (const targetNode of defaultTransition.target) {
+                stateInputMap[targetNode.id] = initialInput;
+                stateInputsChanged = true;
+              }
             }
           }
         }
@@ -5716,7 +5772,6 @@ exports.allocateChildId = allocateChildId;
 exports.assertChildIdFree = assertChildIdFree;
 exports.attachSnapshotActorRef = attachSnapshotActorRef;
 exports.beginSpawnAllocation = beginSpawnAllocation;
-exports.builtInActions = builtInActions;
 exports.checkStateIn = checkStateIn;
 exports.cloneMachineSnapshot = cloneMachineSnapshot;
 exports.createActor = createActor;
@@ -5734,9 +5789,7 @@ exports.createRemoteActorRef = createRemoteActorRef;
 exports.createSendToEffect = createSendToEffect;
 exports.createSpawnEffect = createSpawnEffect;
 exports.createSubscriptionLogic = createSubscriptionLogic;
-exports.createTransitionEnqueue = createTransitionEnqueue;
 exports.deliverEvent = deliverEvent;
-exports.deriveDeferredStarts = deriveDeferredStarts;
 exports.encodeAddressSegment = encodeAddressSegment;
 exports.evaluateCandidate = evaluateCandidate;
 exports.executeEffects = executeEffects;

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

@@ -1,15 +1,15 @@
 import { AnyActorLogic, AnyEventObject, AnyStateMachine, EventObject, MachineContext, MetaObject } from "./types.js";
-export interface RaiseJSON {
+interface RaiseJSON {
     type: '@xstate.raise';
     event: EventObject;
     id?: string;
     delay?: number;
 }
-export interface CancelJSON {
+interface CancelJSON {
     type: '@xstate.cancel';
     id: string;
 }
-export interface LogJSON {
+interface LogJSON {
     type: '@xstate.log';
     args: any[];
 }
@@ -21,78 +21,12 @@ interface AssignJSON {
     type: '@xstate.assign';
     context: MachineContext;
 }
-interface ScxmlAssignJSON {
-    type: 'scxml.assign';
-    /** SCXML location attribute - the context property to assign to */
-    location: string;
-    /** SCXML expr attribute - expression to evaluate */
-    expr: string;
-}
-export interface ScxmlRaiseJSON {
-    type: 'scxml.raise';
-    /** Event type, or undefined if using eventexpr */
-    event?: string;
-    /** Expression to evaluate for event type */
-    eventexpr?: string;
-    /** Params with expressions to evaluate */
-    params?: Array<{
-        name: string;
-        expr: string;
-    }>;
-    id?: string;
-    delay?: number;
-    /** Expression for delay */
-    delayexpr?: string;
-    /** Static target (e.g. '#_parent') */
-    target?: string;
-    /** Expression for target */
-    targetexpr?: string;
-}
-interface ScxmlScriptJSON {
-    type: 'scxml.script';
-    /** The script code to execute */
-    code: string;
-}
-export interface ScxmlForeachJSON {
-    type: 'scxml.foreach';
-    array: string;
-    item: string;
-    index?: string;
-    actions: ActionJSON[];
-}
-export interface ScxmlCancelJSON {
-    type: 'scxml.cancel';
-    sendidexpr: string;
-}
-export interface ScxmlDonedataJSON {
-    params?: Array<{
-        name: string;
-        expr: string;
-    }>;
-    contentExpr?: string;
-    contentText?: string;
-}
-/**
- * Isolated executable-content block. Errors in nested actions stop this block
- * but do not propagate to the surrounding action list. Used to model SCXML's
- * separate <onentry>/<onexit> blocks: each is its own block per spec.
- */
-interface ScxmlBlockJSON {
-    type: 'scxml.block';
-    actions: ActionJSON[];
-}
-interface ScxmlIfJSON {
-    type: 'scxml.if';
-    branches: Array<{
-        cond?: string;
-        actions: ActionJSON[];
-    }>;
-}
+type BuiltInActionJSON = RaiseJSON | CancelJSON | LogJSON | EmitJSON | AssignJSON;
 interface CustomActionJSON {
     type: string;
     params?: unknown;
 }
-export type ActionJSON = CustomActionJSON | RaiseJSON | CancelJSON | LogJSON | EmitJSON | AssignJSON | ScxmlAssignJSON | ScxmlRaiseJSON | ScxmlScriptJSON | ScxmlIfJSON | ScxmlForeachJSON | ScxmlCancelJSON | ScxmlBlockJSON | ExpressionJSON | CodeJSON;
+export type ActionJSON = CustomActionJSON | BuiltInActionJSON | ExpressionJSON | CodeJSON;
 export interface GuardJSON {
     type: string;
     params?: unknown;
@@ -150,11 +84,6 @@ export interface StateNodeJSON {
     after?: Record<string, TransitionConfigJSON | TransitionConfigJSON[]>;
     always?: TransitionConfigJSON | TransitionConfigJSON[];
     choice?: ChoiceBranchJSON[] | ResolvableJSON;
-    /**
-     * JSON route config. Unlike the authoring API (a function), the JSON layer
-     * allows an object form whose `guard` may be a named guard reference (string)
-     * resolved against the machine's `guards` sources.
-     */
     route?: {
         description?: string;
         reenter?: boolean;
@@ -175,7 +104,6 @@ export interface StateNodeJSON {
     target?: string | [string, ...string[]];
     output?: unknown;
     context?: Record<string, unknown>;
-    _scxmlDonedata?: ScxmlDonedataJSON;
 }
 export interface MachineJSON extends StateNodeJSON {
     '@exprLang'?: string;