xstate 6.0.0-alpha.20 → 6.0.0-alpha.21

package/dist/{StateMachine-f2b70732.cjs.js → StateMachine-1b155670.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var dist_xstateActors = require('./index-42956779.cjs.js');
+var dist_xstateActors = require('./index-e694228c.cjs.js');
 
 function createSpawner(actorScope, {
   machine,

package/dist/{StateMachine-42f1d26c.esm.js → StateMachine-3c17fe3e.esm.js}

@@ -1,4 +1,4 @@
-import { P as ProcessingStatus, H as resolveReferencedActor, e as createActor, S as STATE_DELIMITER, I as mapValues, t as toArray, J as createInvokeId, K as getDelayedTransitions, L as evaluateCandidate, M as formatTransition, N as NULL_EVENT, O as toTransitionConfigArray, Q as createInvokeTimeoutEvent, R as getCandidates, U as formatRouteTransitions, V as resolveStateValue, W as getAllStateNodes, l as getStateNodes, Y as createMachineSnapshot, Z as isInFinalState, f as macrostep, d as deriveDeferredStarts, _ as cloneMachineSnapshot, $ as transitionNode, m as matchesEventDescriptor, a0 as getTransitionResult, a1 as hasEffect, a2 as createErrorPlatformEvent, r as resolveActionsWithContext, g as createInitEvent, h as initialMicrostep, a3 as toStatePath, a4 as isStateId, a5 as getStateNodeByPath, a6 as getPersistedSnapshot, a7 as $$ACTOR_TYPE } from './index-d88b0c55.esm.js';
+import { P as ProcessingStatus, H as resolveReferencedActor, e as createActor, S as STATE_DELIMITER, I as mapValues, t as toArray, J as createInvokeId, K as getDelayedTransitions, L as evaluateCandidate, M as formatTransition, N as NULL_EVENT, O as toTransitionConfigArray, Q as createInvokeTimeoutEvent, R as getCandidates, U as formatRouteTransitions, V as resolveStateValue, W as getAllStateNodes, l as getStateNodes, Y as createMachineSnapshot, Z as isInFinalState, f as macrostep, d as deriveDeferredStarts, _ as cloneMachineSnapshot, $ as transitionNode, m as matchesEventDescriptor, a0 as getTransitionResult, a1 as hasEffect, a2 as createErrorPlatformEvent, r as resolveActionsWithContext, g as createInitEvent, h as initialMicrostep, a3 as toStatePath, a4 as isStateId, a5 as getStateNodeByPath, a6 as getPersistedSnapshot, a7 as $$ACTOR_TYPE } from './index-3f87408c.esm.js';
 
 function createSpawner(actorScope, {
   machine,

package/dist/{StateMachine-6661eb0d.development.cjs.js → StateMachine-550ff7f2.development.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var dist_xstateActors = require('./index-49293864.development.cjs.js');
+var dist_xstateActors = require('./index-ec7c7a2d.development.cjs.js');
 
 function createSpawner(actorScope, {
   machine,

package/dist/{StateMachine-ba3ccedf.development.esm.js → StateMachine-e25dd61f.development.esm.js}

@@ -1,4 +1,4 @@
-import { P as ProcessingStatus, H as resolveReferencedActor, e as createActor, S as STATE_DELIMITER, I as mapValues, t as toArray, J as createInvokeId, K as getDelayedTransitions, L as evaluateCandidate, M as formatTransition, N as NULL_EVENT, O as toTransitionConfigArray, Q as createInvokeTimeoutEvent, R as getCandidates, U as formatRouteTransitions, V as resolveStateValue, W as getAllStateNodes, l as getStateNodes, Y as createMachineSnapshot, Z as isInFinalState, f as macrostep, d as deriveDeferredStarts, _ as cloneMachineSnapshot, $ as transitionNode, m as matchesEventDescriptor, a0 as getTransitionResult, a1 as hasEffect, a2 as createErrorPlatformEvent, r as resolveActionsWithContext, g as createInitEvent, h as initialMicrostep, a3 as toStatePath, a4 as isStateId, a5 as getStateNodeByPath, a6 as getPersistedSnapshot, a7 as $$ACTOR_TYPE } from './index-dc3443b6.development.esm.js';
+import { P as ProcessingStatus, H as resolveReferencedActor, e as createActor, S as STATE_DELIMITER, I as mapValues, t as toArray, J as createInvokeId, K as getDelayedTransitions, L as evaluateCandidate, M as formatTransition, N as NULL_EVENT, O as toTransitionConfigArray, Q as createInvokeTimeoutEvent, R as getCandidates, U as formatRouteTransitions, V as resolveStateValue, W as getAllStateNodes, l as getStateNodes, Y as createMachineSnapshot, Z as isInFinalState, f as macrostep, d as deriveDeferredStarts, _ as cloneMachineSnapshot, $ as transitionNode, m as matchesEventDescriptor, a0 as getTransitionResult, a1 as hasEffect, a2 as createErrorPlatformEvent, r as resolveActionsWithContext, g as createInitEvent, h as initialMicrostep, a3 as toStatePath, a4 as isStateId, a5 as getStateNodeByPath, a6 as getPersistedSnapshot, a7 as $$ACTOR_TYPE } from './index-d39fb138.development.esm.js';
 
 function createSpawner(actorScope, {
   machine,

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

@@ -80,6 +80,9 @@ type SetupOrConfigSchemaMap<TSchemas, TKey extends 'events' | 'emitted' | 'child
 type SetupStateKeys<TStateSchemas extends Record<string, SetupStateSchema>> = keyof TStateSchemas & string;
 type SetupStateKey<TStateSchemas extends Record<string, SetupStateSchema>> = string extends SetupStateKeys<TStateSchemas> ? string : [SetupStateKeys<TStateSchemas>] extends [never] ? string : SetupStateKeys<TStateSchemas>;
 type SetupStateTarget<TStateSchemas extends Record<string, SetupStateSchema>> = string extends SetupStateKeys<TStateSchemas> ? string : [SetupStateKeys<TStateSchemas>] extends [never] ? string : SetupStateKeys<TStateSchemas> | `.${string}` | `#${string}`;
+type StateSchemasWithKeys<TStateSchemas extends Record<string, SetupStateSchema>, TStateKeys extends string> = TStateSchemas & {
+    [K in Exclude<TStateKeys, keyof TStateSchemas>]: {};
+};
 /**
  * The sibling state schemas of a dotted path: the children of the path's
  * parent. A bare transition target resolves relative to the parent, so the
@@ -103,23 +106,6 @@ type StatePaths<TStates extends Record<string, SetupStateSchema>> = string exten
  * the leading sibling-schemas and state-schema arguments.
  */
 type SetupStateNodeConfig<TStates extends Record<string, SetupStateSchema>, TStateSchema extends SetupStateSchema, TSchemas extends SetupSchemas, TSetupActionMap extends Implementations['actions'], TSetupActorMap extends Implementations['actorSources'], TSetupGuardMap extends Implementations['guards'], TSetupDelayMap extends Implementations['delays'], TSystemRegistry extends SystemRegistry> = StateNodeConfigWithNestedInput<TStates, TStateSchema, SetupContext<TSchemas, StandardSchemaV1>, SetupContextShape<TSchemas, StandardSchemaV1, SetupContext<TSchemas, StandardSchemaV1>>, SetupEvents<TSchemas, Record<string, StandardSchemaV1>>, Cast<SetupChildren<TSchemas, Record<string, StandardSchemaV1>>, Record<string, AnyActorRef | undefined>>, string, SetupTags<TSchemas, StandardSchemaV1>, SetupOutput<TSchemas, StandardSchemaV1>, SetupEmitted<TSchemas, Record<string, StandardSchemaV1>>, SetupMeta<TSchemas, StandardSchemaV1>, SetupActions<TSchemas, TSetupActionMap>, TSetupActorMap, SetupGuards<TSchemas, TSetupGuardMap>, TSetupDelayMap, TSystemRegistry>;
-type InvalidSetupStateKeys<TConfig, TStateSchemas extends Record<string, SetupStateSchema>> = string extends SetupStateKeys<TStateSchemas> ? never : [SetupStateKeys<TStateSchemas>] extends [never] ? never : TConfig extends {
-    states: infer TStates;
-} ? Exclude<keyof TStates & string, SetupStateKeys<TStateSchemas>> : never;
-type ValidateSetupStateKeys<TConfig, TStateSchemas extends Record<string, SetupStateSchema>> = [InvalidSetupStateKeys<TConfig, TStateSchemas>] extends [never] ? unknown : {
-    states: {
-        [K in InvalidSetupStateKeys<TConfig, TStateSchemas>]: never;
-    };
-};
-type ValidateNestedSetupStateKeys<TConfig, TStateSchemas extends Record<string, SetupStateSchema>> = TConfig extends {
-    states: infer TConfigStates;
-} ? TConfigStates extends Record<string, unknown> ? {
-    states: {
-        [K in keyof TConfigStates & keyof TStateSchemas & string]: TStateSchemas[K] extends {
-            states: infer TChildStateSchemas;
-        } ? TChildStateSchemas extends Record<string, SetupStateSchema> ? TConfigStates[K] & ValidateSetupStateKeys<TConfigStates[K], TChildStateSchemas> & ValidateNestedSetupStateKeys<TConfigStates[K], TChildStateSchemas> : TConfigStates[K] : TConfigStates[K];
-    };
-} : unknown : unknown;
 type SetupContext<TSchemas, TContextSchema extends StandardSchemaV1> = [
     SetupSchema<TSchemas, 'context'>
 ] extends [never] ? unknown extends StandardSchemaV1.InferOutput<TContextSchema> ? MachineContext : StandardSchemaV1.InferOutput<TContextSchema> & MachineContext : StandardSchemaV1.InferOutput<SetupSchema<TSchemas, 'context'>> & MachineContext;
@@ -176,10 +162,15 @@ type StateInput<TStateSchema extends SetupStateSchema> = TStateSchema['schemas']
 } ? TInputSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TInputSchema> : undefined : undefined;
 type StateContext<TStateSchema extends SetupStateSchema, TFallbackContext extends MachineContext> = TStateSchema['schemas'] extends {
     context: infer TContextSchema;
-} ? TContextSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TContextSchema> & MachineContext : TFallbackContext : TFallbackContext;
+} ? TContextSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TContextSchema> & MachineContext & RootContextMarker<TFallbackContext> : RootContext<TFallbackContext> : RootContext<TFallbackContext>;
+declare const rootContext: unique symbol;
+type RootContextMarker<TContext> = {
+    readonly [rootContext]?: RootContext<TContext>;
+};
+type RootContext<TContext> = typeof rootContext extends keyof TContext ? TContext[typeof rootContext] : TContext;
 type StateContextShape<TStateSchema extends SetupStateSchema, TFallbackContext> = TStateSchema['schemas'] extends {
     context: infer TContextSchema;
-} ? TContextSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TContextSchema> : TFallbackContext : TFallbackContext;
+} ? TContextSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TContextSchema> & RootContextMarker<TFallbackContext> : RootContext<TFallbackContext> : RootContext<TFallbackContext>;
 type WithNestedStates<TConfig, TNestedStates> = TConfig extends {
     type: 'choice';
 } ? TConfig : Omit<TConfig, 'states'> & {
@@ -232,7 +223,7 @@ type MergeStateSchema<TConfig extends StateSchema, TSetup extends StateSchema> =
     } : undefined : undefined;
 };
 /** Machine config with typed state input */
-type SetupMachineConfig<TStateSchemas extends Record<string, SetupStateSchema>, TSchemas extends SetupSchemas, TContextSchema extends StandardSchemaV1, TEventSchemaMap extends Record<string, StandardSchemaV1>, TEmittedSchemaMap extends Record<string, StandardSchemaV1>, TInputSchema extends StandardSchemaV1, TOutputSchema extends StandardSchemaV1, TMetaSchema extends StandardSchemaV1, TTagSchema extends StandardSchemaV1, TChildrenSchemaMap extends Record<string, StandardSchemaV1>, TContext extends MachineContext, TEvent extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TDelays extends string, TTag extends string, TEmitted extends EventObject, TMeta extends MetaObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actorSources'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TSystemRegistry extends SystemRegistry, TContextRequired extends boolean, TRootDelays extends string = TDelays, TRootActionMap extends Implementations['actions'] = TActionMap, TRootActorMap extends Implementations['actorSources'] = TActorMap, TRootGuardMap extends Implementations['guards'] = TGuardMap> = Omit<Next_MachineConfig<SetupOrConfigSchema<TSchemas, 'context', TContextSchema>, SetupOrConfigSchemaMap<TSchemas, 'events', TEventSchemaMap>, SetupOrConfigSchemaMap<TSchemas, 'emitted', TEmittedSchemaMap>, SetupOrConfigSchema<TSchemas, 'input', TInputSchema>, SetupOrConfigSchema<TSchemas, 'output', TOutputSchema>, SetupOrConfigSchema<TSchemas, 'meta', TMetaSchema>, SetupOrConfigSchema<TSchemas, 'tags', TTagSchema>, SetupOrConfigSchemaMap<TSchemas, 'children', TChildrenSchemaMap>, TContext, TEvent, TChildren, TDelays, TTag, TActionMap, TActorMap, TGuardMap, TDelayMap, TContextRequired, TSystemRegistry>, 'states' | 'initial' | 'on' | 'always' | 'invoke' | 'actions' | 'actorSources' | 'guards' | 'delays'> & {
+type SetupMachineConfig<TStateSchemas extends Record<string, SetupStateSchema>, TStateKeys extends string, TSchemas extends SetupSchemas, TContextSchema extends StandardSchemaV1, TEventSchemaMap extends Record<string, StandardSchemaV1>, TEmittedSchemaMap extends Record<string, StandardSchemaV1>, TInputSchema extends StandardSchemaV1, TOutputSchema extends StandardSchemaV1, TMetaSchema extends StandardSchemaV1, TTagSchema extends StandardSchemaV1, TChildrenSchemaMap extends Record<string, StandardSchemaV1>, TContext extends MachineContext, TEvent extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TDelays extends string, TTag extends string, TEmitted extends EventObject, TMeta extends MetaObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actorSources'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TSystemRegistry extends SystemRegistry, TContextRequired extends boolean, TRootDelays extends string = TDelays, TRootActionMap extends Implementations['actions'] = TActionMap, TRootActorMap extends Implementations['actorSources'] = TActorMap, TRootGuardMap extends Implementations['guards'] = TGuardMap> = Omit<Next_MachineConfig<SetupOrConfigSchema<TSchemas, 'context', TContextSchema>, SetupOrConfigSchemaMap<TSchemas, 'events', TEventSchemaMap>, SetupOrConfigSchemaMap<TSchemas, 'emitted', TEmittedSchemaMap>, SetupOrConfigSchema<TSchemas, 'input', TInputSchema>, SetupOrConfigSchema<TSchemas, 'output', TOutputSchema>, SetupOrConfigSchema<TSchemas, 'meta', TMetaSchema>, SetupOrConfigSchema<TSchemas, 'tags', TTagSchema>, SetupOrConfigSchemaMap<TSchemas, 'children', TChildrenSchemaMap>, TContext, TEvent, TChildren, TDelays, TTag, TActionMap, TActorMap, TGuardMap, TDelayMap, TContextRequired, TSystemRegistry>, 'states' | 'initial' | 'on' | 'always' | 'invoke' | 'actions' | 'actorSources' | 'guards' | 'delays'> & {
     actions?: TRootActionMap;
     actorSources?: TRootActorMap;
     guards?: TRootGuardMap;
@@ -243,19 +234,19 @@ type SetupMachineConfig<TStateSchemas extends Record<string, SetupStateSchema>,
             stateNode: AnyStateNode;
         }) => number);
     };
-    initial?: SetupStateKey<TStateSchemas> | InitialTransitionWithInput<TStateSchemas, TContext, TEvent> | undefined;
+    initial?: TStateKeys | InitialTransitionWithInput<TStateSchemas, TContext, TEvent> | undefined;
     on?: StateTransitions<TStateSchemas, TContext, SetupContextShape<TSchemas, TContextSchema, TContext>, TEvent, TEmitted, TChildren, TMeta, TActionMap, TActorMap, TGuardMap, TDelayMap, TSystemRegistry>;
     always?: StateTransitionConfigOrTarget<TStateSchemas, TContext, SetupContextShape<TSchemas, TContextSchema, TContext>, TEvent, TEvent, TEmitted, TChildren, TMeta, TActionMap, TActorMap, TGuardMap, TDelayMap, TSystemRegistry>;
     invoke?: SingleOrArray<SetupInvokeConfig<TStateSchemas, TContext, SetupContextShape<TSchemas, TContextSchema, TContext>, TEvent, TEmitted, TChildren, TMeta, TActionMap, TActorMap, TGuardMap, TDelayMap, TSystemRegistry>>;
-    states?: StatesWithInput<TStateSchemas, TStateSchemas, TContext, SetupContextShape<TSchemas, TContextSchema, TContext>, TEvent, TChildren, TDelays, TTag, SetupOutput<TSchemas, TOutputSchema>, TEmitted, TMeta, TActionMap, TActorMap, TGuardMap, TDelayMap, TSystemRegistry>;
+    states?: StatesWithInput<TStateSchemas, TStateSchemas, TContext, SetupContextShape<TSchemas, TContextSchema, TContext>, TEvent, TChildren, TDelays, TTag, SetupOutput<TSchemas, TOutputSchema>, TEmitted, TMeta, TActionMap, TActorMap, TGuardMap, TDelayMap, TSystemRegistry, TStateKeys>;
 };
 /** States config type that provides typed input for known states */
-type StatesWithInput<TRootStateSchemas extends Record<string, SetupStateSchema>, TStateSchemas extends Record<string, SetupStateSchema>, TContext extends MachineContext, TContextShape, TEvent extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TDelays extends string, TTag extends string, TOutput, TEmitted extends EventObject, TMeta extends MetaObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actorSources'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TSystemRegistry extends SystemRegistry> = {
-    [K in keyof TStateSchemas & string]?: StateNodeConfigWithNestedInput<TRootStateSchemas, TStateSchemas[K], TContext, TContextShape, TEvent, TChildren, TDelays, TTag, TOutput, TEmitted, TMeta, TActionMap, TActorMap, TGuardMap, TDelayMap, TSystemRegistry>;
+type StatesWithInput<TRootStateSchemas extends Record<string, SetupStateSchema>, TStateSchemas extends Record<string, SetupStateSchema>, TContext extends MachineContext, TContextShape, TEvent extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TDelays extends string, TTag extends string, TOutput, TEmitted extends EventObject, TMeta extends MetaObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actorSources'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TSystemRegistry extends SystemRegistry, TStateKeys extends string = SetupStateKey<TStateSchemas>> = {
+    [K in TStateKeys]?: StateNodeConfigWithNestedInput<StateSchemasWithKeys<TRootStateSchemas, TStateKeys>, K extends keyof TStateSchemas ? TStateSchemas[K] : {}, TContext, TContextShape, TEvent, TChildren, TDelays, TTag, TOutput, TEmitted, TMeta, TActionMap, TActorMap, TGuardMap, TDelayMap, TSystemRegistry>;
 };
 /** State node config that recursively applies typed input for nested states */
 type StateNodeConfigWithNestedInput<TSiblingStateSchemas extends Record<string, SetupStateSchema>, TStateSchema extends SetupStateSchema, TContext extends MachineContext, TContextShape, TEvent extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TDelays extends string, TTag extends string, TOutput, TEmitted extends EventObject, TMeta extends MetaObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actorSources'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TSystemRegistry extends SystemRegistry> = WithNestedStates<Omit<Next_StateNodeConfig<StateContext<TStateSchema, TContext>, TEvent, TDelays, TTag, TOutput, TEmitted, TMeta, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, StateInput<TStateSchema>, Record<string, unknown>, TSystemRegistry>, 'on' | 'always' | 'initial' | 'invoke' | 'onDone'> & {
-    initial?: TStateSchema['states'] extends Record<string, SetupStateSchema> ? SetupStateKey<TStateSchema['states']> | InitialTransitionWithInput<TStateSchema['states'], StateContext<TStateSchema, TContext>, TEvent> : string | {
+    initial?: TStateSchema['states'] extends Record<string, SetupStateSchema> ? SetupStateKey<TStateSchema['states']> | (string & {}) | InitialTransitionWithInput<TStateSchema['states'], StateContext<TStateSchema, TContext>, TEvent> : string | {
         target: string;
         input?: Record<string, unknown>;
     } | undefined;
@@ -371,7 +362,7 @@ export interface SetupReturn<TStates extends Record<string, SetupStateSchema> =
     /** Extends the setup configuration */
     extend<const TExtendSchemas extends SetupSchemas = {}, const TExtendStates extends Record<string, SetupStateSchema> = {}, TExtendActionMap extends Implementations['actions'] = {}, TExtendActorMap extends Implementations['actorSources'] = {}, TExtendGuardMap extends Implementations['guards'] = {}, TExtendDelayMap extends Implementations['delays'] = {}>(config: SetupConfig<TExtendSchemas, TExtendStates, TExtendActionMap, TExtendActorMap, TExtendGuardMap, TExtendDelayMap>): SetupReturn<MergeImplementationMaps<TStates, TExtendStates>, MergeImplementationMaps<TSchemas, TExtendSchemas>, MergeImplementationMaps<TSetupActionMap, TExtendActionMap>, MergeImplementationMaps<TSetupActorMap, TExtendActorMap>, MergeImplementationMaps<TSetupGuardMap, TExtendGuardMap>, MergeImplementationMaps<TSetupDelayMap, TExtendDelayMap>, TSetupDelays | Extract<keyof TExtendDelayMap, string>, TSystemRegistry>;
     /** Creates a state machine with the setup configuration */
-    createMachine<TContextSchema extends StandardSchemaV1 = StandardSchemaV1, const TEventSchemaMap extends Record<string, StandardSchemaV1> = Record<string, StandardSchemaV1>, TEmittedSchemaMap extends Record<string, StandardSchemaV1> = Record<string, StandardSchemaV1>, TInputSchema extends StandardSchemaV1 = StandardSchemaV1, TOutputSchema extends StandardSchemaV1 = StandardSchemaV1, TMetaSchema extends StandardSchemaV1 = StandardSchemaV1, TTagSchema extends StandardSchemaV1 = StandardSchemaV1, const TChildrenSchemaMap extends Record<string, StandardSchemaV1> = Record<string, StandardSchemaV1>, const TActionSchemaMap extends ActionSchemas = {}, const TGuardSchemaMap extends GuardSchemas = {}, _TEvent extends EventObject = EventObject, TActor extends ProvidedActor = ProvidedActor, TActionMap extends Implementations['actions'] = {}, TActorMap extends Implementations['actorSources'] = {}, TGuardMap extends Implementations['guards'] = {}, TDelayMap extends Implementations['delays'] = {}, TDelays extends string = Extract<keyof TDelayMap, string>, TTag extends SetupTags<TSchemas, TTagSchema> = SetupTags<TSchemas, TTagSchema>, TInput = unknown, TConfig extends SetupMachineConfig<TStates, TSchemas, TContextSchema, TEventSchemaMap, TEmittedSchemaMap, TInputSchema, TOutputSchema, TMetaSchema, TTagSchema, TChildrenSchemaMap, SetupContext<TSchemas, TContextSchema>, SetupEvents<TSchemas, TEventSchemaMap>, Cast<MergeChildren<SetupChildren<TSchemas, TChildrenSchemaMap>, TActor>, Record<string, AnyActorRef | undefined>>, TSetupDelays | TDelays, TTag, SetupEmitted<TSchemas, TEmittedSchemaMap>, SetupMeta<TSchemas, TMetaSchema>, MergeImplementationMaps<SetupActions<TSchemas, TSetupActionMap>, MergeImplementationMaps<InferActions<TActionSchemaMap>, TActionMap>>, MergeImplementationMaps<TSetupActorMap, TActorMap>, MergeImplementationMaps<SetupGuards<TSchemas, TSetupGuardMap>, MergeImplementationMaps<InferGuards<TGuardSchemaMap>, TGuardMap>>, MergeImplementationMaps<TSetupDelayMap, TDelayMap>, TSystemRegistry, SetupContextRequired<TSchemas, TContextSchema>, TDelays, TActionMap, TActorMap, TGuardMap> = SetupMachineConfig<TStates, TSchemas, TContextSchema, TEventSchemaMap, TEmittedSchemaMap, TInputSchema, TOutputSchema, TMetaSchema, TTagSchema, TChildrenSchemaMap, SetupContext<TSchemas, TContextSchema>, SetupEvents<TSchemas, TEventSchemaMap>, Cast<MergeChildren<SetupChildren<TSchemas, TChildrenSchemaMap>, TActor>, Record<string, AnyActorRef | undefined>>, TSetupDelays | TDelays, TTag, SetupEmitted<TSchemas, TEmittedSchemaMap>, SetupMeta<TSchemas, TMetaSchema>, MergeImplementationMaps<SetupActions<TSchemas, TSetupActionMap>, MergeImplementationMaps<InferActions<TActionSchemaMap>, TActionMap>>, MergeImplementationMaps<TSetupActorMap, TActorMap>, MergeImplementationMaps<SetupGuards<TSchemas, TSetupGuardMap>, MergeImplementationMaps<InferGuards<TGuardSchemaMap>, TGuardMap>>, MergeImplementationMaps<TSetupDelayMap, TDelayMap>, TSystemRegistry, SetupContextRequired<TSchemas, TContextSchema>, TDelays, TActionMap, TActorMap, TGuardMap>>(config: {
+    createMachine<TContextSchema extends StandardSchemaV1 = StandardSchemaV1, const TEventSchemaMap extends Record<string, StandardSchemaV1> = Record<string, StandardSchemaV1>, TEmittedSchemaMap extends Record<string, StandardSchemaV1> = Record<string, StandardSchemaV1>, TInputSchema extends StandardSchemaV1 = StandardSchemaV1, TOutputSchema extends StandardSchemaV1 = StandardSchemaV1, TMetaSchema extends StandardSchemaV1 = StandardSchemaV1, TTagSchema extends StandardSchemaV1 = StandardSchemaV1, const TChildrenSchemaMap extends Record<string, StandardSchemaV1> = Record<string, StandardSchemaV1>, const TActionSchemaMap extends ActionSchemas = {}, const TGuardSchemaMap extends GuardSchemas = {}, _TEvent extends EventObject = EventObject, TActor extends ProvidedActor = ProvidedActor, TActionMap extends Implementations['actions'] = {}, TActorMap extends Implementations['actorSources'] = {}, TGuardMap extends Implementations['guards'] = {}, TDelayMap extends Implementations['delays'] = {}, TDelays extends string = Extract<keyof TDelayMap, string>, TTag extends SetupTags<TSchemas, TTagSchema> = SetupTags<TSchemas, TTagSchema>, TInput = unknown, const TStateKeys extends string = SetupStateKey<TStates>, TConfig extends SetupMachineConfig<TStates, TStateKeys, TSchemas, TContextSchema, TEventSchemaMap, TEmittedSchemaMap, TInputSchema, TOutputSchema, TMetaSchema, TTagSchema, TChildrenSchemaMap, SetupContext<TSchemas, TContextSchema>, SetupEvents<TSchemas, TEventSchemaMap>, Cast<MergeChildren<SetupChildren<TSchemas, TChildrenSchemaMap>, TActor>, Record<string, AnyActorRef | undefined>>, TSetupDelays | TDelays, TTag, SetupEmitted<TSchemas, TEmittedSchemaMap>, SetupMeta<TSchemas, TMetaSchema>, MergeImplementationMaps<SetupActions<TSchemas, TSetupActionMap>, MergeImplementationMaps<InferActions<TActionSchemaMap>, TActionMap>>, MergeImplementationMaps<TSetupActorMap, TActorMap>, MergeImplementationMaps<SetupGuards<TSchemas, TSetupGuardMap>, MergeImplementationMaps<InferGuards<TGuardSchemaMap>, TGuardMap>>, MergeImplementationMaps<TSetupDelayMap, TDelayMap>, TSystemRegistry, SetupContextRequired<TSchemas, TContextSchema>, TDelays, TActionMap, TActorMap, TGuardMap> = SetupMachineConfig<TStates, TStateKeys, TSchemas, TContextSchema, TEventSchemaMap, TEmittedSchemaMap, TInputSchema, TOutputSchema, TMetaSchema, TTagSchema, TChildrenSchemaMap, SetupContext<TSchemas, TContextSchema>, SetupEvents<TSchemas, TEventSchemaMap>, Cast<MergeChildren<SetupChildren<TSchemas, TChildrenSchemaMap>, TActor>, Record<string, AnyActorRef | undefined>>, TSetupDelays | TDelays, TTag, SetupEmitted<TSchemas, TEmittedSchemaMap>, SetupMeta<TSchemas, TMetaSchema>, MergeImplementationMaps<SetupActions<TSchemas, TSetupActionMap>, MergeImplementationMaps<InferActions<TActionSchemaMap>, TActionMap>>, MergeImplementationMaps<TSetupActorMap, TActorMap>, MergeImplementationMaps<SetupGuards<TSchemas, TSetupGuardMap>, MergeImplementationMaps<InferGuards<TGuardSchemaMap>, TGuardMap>>, MergeImplementationMaps<TSetupDelayMap, TDelayMap>, TSystemRegistry, SetupContextRequired<TSchemas, TContextSchema>, TDelays, TActionMap, TActorMap, TGuardMap>>(config: {
         schemas?: {
             events?: TEventSchemaMap;
             context?: TContextSchema;
@@ -388,7 +379,8 @@ export interface SetupReturn<TStates extends Record<string, SetupStateSchema> =
         actorSources?: TActorMap;
         guards?: TGuardMap;
         delays?: TDelayMap;
-    } & TConfig & ValidateSetupStateKeys<TConfig, TStates> & ValidateNestedSetupStateKeys<TConfig, TStates> & ValidateSetupDelayReferences<TConfig, TSetupDelays> & ValidateRegistryKeys<TConfig, TSystemRegistry, MergeImplementationMaps<TSetupActorMap, TActorMap>>): StateMachine<SetupContext<TSchemas, TContextSchema>, SetupEvents<TSchemas, TEventSchemaMap> | ([RoutableStateId<Cast<TConfig, StateSchema>>] extends [never] ? never : {
+        states?: Record<TStateKeys, unknown>;
+    } & TConfig & ValidateSetupDelayReferences<TConfig, TSetupDelays> & ValidateRegistryKeys<TConfig, TSystemRegistry, MergeImplementationMaps<TSetupActorMap, TActorMap>>): StateMachine<SetupContext<TSchemas, TContextSchema>, SetupEvents<TSchemas, TEventSchemaMap> | ([RoutableStateId<Cast<TConfig, StateSchema>>] extends [never] ? never : {
         type: 'xstate.route';
         to: RoutableStateId<Cast<TConfig, StateSchema>>;
     }), Cast<MergeChildren<SetupChildren<TSchemas, TChildrenSchemaMap>, TActor>, Record<string, AnyActorRef | undefined>>, StateValue, TTag & string, [

package/dist/declarations/src/types.v6.d.ts

@@ -41,7 +41,10 @@ export type InferActions<TActionSchemaMap extends ActionSchemas> = string extend
 export type InferGuards<TGuardSchemaMap extends GuardSchemas> = string extends keyof TGuardSchemaMap ? {} : {
     [K in keyof TGuardSchemaMap & string]: (params: StandardSchemaV1.InferOutput<TGuardSchemaMap[K]['params']>) => boolean;
 };
-type OutputConfig<TContext extends MachineContext, TEvent extends EventObject, TOutput> = unknown extends TOutput ? Mapper<TContext, TEvent, NonReducibleUnknown, TEvent> | NonReducibleUnknown : Mapper<TContext, TEvent, TOutput, TEvent> | TOutput;
+type OutputMapper<TContext extends MachineContext, TEvent extends EventObject, TResult, TInput = Record<string, unknown> | undefined> = (args: Parameters<Mapper<TContext, TEvent, TResult, TEvent>>[0] & {
+    input: TInput;
+}) => TResult;
+type OutputConfig<TContext extends MachineContext, TEvent extends EventObject, TOutput, TInput = Record<string, unknown> | undefined> = unknown extends TOutput ? OutputMapper<TContext, TEvent, NonReducibleUnknown, TInput> | NonReducibleUnknown : OutputMapper<TContext, TEvent, TOutput, TInput> | TOutput;
 export type ValidateTopLevelFinalOutputs<TConfig, TContext extends MachineContext, TEvent extends EventObject> = TConfig extends {
     schemas: {
         output: infer TOutputSchema extends StandardSchemaV1;
@@ -394,7 +397,7 @@ interface Next_RegularStateNodeConfig<TContext extends MachineContext, TEvent ex
      * The output data will be evaluated with the current `context` and placed on
      * the `.data` property of the event.
      */
-    output?: OutputConfig<TContext, TEvent, TOutput>;
+    output?: OutputConfig<TContext, TEvent, TOutput, TInput>;
     /**
      * The unique ID of the state node, which can be referenced as a transition
      * target via the `#id` syntax.

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

@@ -8,7 +8,7 @@ export declare function mapValues<P, O extends Record<string, unknown>>(collecti
     [key in keyof O]: P;
 };
 export declare function toArray<T>(value: readonly T[] | T | undefined): readonly T[];
-export declare function resolveOutput<TContext extends MachineContext, TExpressionEvent extends EventObject>(mapper: Mapper<TContext, TExpressionEvent, unknown, EventObject> | NonReducibleUnknown, context: TContext, event: TExpressionEvent, self: AnyActor): unknown;
+export declare function resolveOutput<TContext extends MachineContext, TExpressionEvent extends EventObject>(mapper: Mapper<TContext, TExpressionEvent, unknown, EventObject> | NonReducibleUnknown, context: TContext, event: TExpressionEvent, self: AnyActor, input?: Record<string, unknown>): unknown;
 export declare function getEventOutput<TEvent extends EventObject>(event: TEvent): OutputArg<TEvent>['output'];
 export declare function isErrorEvent(event: AnyEventObject): event is ErrorEvent;
 export declare function toTransitionConfigArray(configLike: SingleOrArray<AnyTransitionConfig | TransitionConfigTarget | AnyTransitionConfigFunction>): Array<AnyTransitionConfig>;

package/dist/{index-d88b0c55.esm.js → index-3f87408c.esm.js}

@@ -348,6 +348,13 @@ function createSubscriptionLogic() {
 // Singleton logic instance
 const subscriptionLogic = /* #__PURE__ */createSubscriptionLogic();
 
+const builtInExecutableAction = Symbol('xstate.builtInExecutableAction');
+function brandBuiltInExecutableAction(action) {
+  Object.defineProperty(action, builtInExecutableAction, {
+    value: true
+  });
+  return action;
+}
 function mergeContextPatch(context, patch) {
   return {
     ...context,
@@ -534,7 +541,7 @@ function getBuiltInActionFields(action, args) {
 function createStartEffect(actor) {
   const action = builtInActions['@xstate.start'];
   const args = [actor];
-  return {
+  return brandBuiltInExecutableAction({
     type: XSTATE_START,
     params: {
       action,
@@ -544,7 +551,7 @@ function createStartEffect(actor) {
     exec: action.bind(null, actor),
     actor,
     id: actor.id
-  };
+  });
 }
 
 /**
@@ -573,23 +580,7 @@ function deriveDeferredStarts(effects) {
   return [...attachedStarts, ...childStarts];
 }
 function isBuiltInExecutableAction(action) {
-  if (!Object.prototype.hasOwnProperty.call(builtInActions, action.type)) {
-    return false;
-  }
-  switch (action.type) {
-    case '@xstate.spawn':
-      return 'actor' in action && 'logic' in action && 'src' in action && 'input' in action;
-    case '@xstate.start':
-    case '@xstate.stop':
-      return 'actor' in action;
-    case '@xstate.raise':
-    case '@xstate.sendTo':
-      return 'event' in action;
-    case '@xstate.cancel':
-      return 'id' in action;
-    default:
-      return false;
-  }
+  return action[builtInExecutableAction] === true;
 }
 function resolveActionsWithContext(currentSnapshot, event, actorScope, actions) {
   let intermediateSnapshot = currentSnapshot;
@@ -643,13 +634,14 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
     }
     if (!resolvedAction || !('resolve' in resolvedAction)) {
       const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, action.args) : undefined;
-      executableActions.push({
+      const executableAction = {
         type: typeof action === 'object' ? 'action' in action && typeof action.action === 'function' ? action.action.name ?? '(anonymous)' : action.type : action.name || '(anonymous)',
         params: actionParams,
         args: typeof action === 'object' && 'action' in action ? action.args : [],
         exec: resolvedAction || (typeof action === 'object' && action !== null ? () => actorScope.defer(() => actorScope.emit(action)) : undefined),
         ...builtInFields
-      });
+      };
+      executableActions.push(builtInFields ? brandBuiltInExecutableAction(executableAction) : executableAction);
       continue;
     }
   }
@@ -1505,7 +1497,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         let completionOutput;
         if (rootCompletionNode.output !== undefined && rootCompletionNode.parent) {
           const rootDoneEvent = internalQueue.find(e => e.type === `xstate.done.state.${rootNode.id}`);
-          completionOutput = rootDoneEvent && rootCompletionNode.parent === rootNode ? rootDoneEvent.output : resolveOutput(rootCompletionNode.output, nextState.context, event, actorScope.self);
+          completionOutput = rootDoneEvent && rootCompletionNode.parent === rootNode ? rootDoneEvent.output : resolveOutput(rootCompletionNode.output, nextState.context, event, actorScope.self, stateInputMap[rootCompletionNode.id]);
         } else if (rootCompletionNode.type === 'parallel') {
           const parallelDoneType = `xstate.done.state.${rootCompletionNode.id}`;
           const parallelDoneEvent = internalQueue.find(e => e.type === parallelDoneType);
@@ -1727,14 +1719,14 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         let ancestorMarker = parent?.type === 'parallel' ? parent : parent?.parent;
         let rootCompletionNode = ancestorMarker || stateNodeToEnter;
         if (parent?.type === 'compound') {
-          internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output !== undefined ? resolveOutput(stateNodeToEnter.output, nextState.context, event, actorScope.self) : undefined));
+          internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output !== undefined ? resolveOutput(stateNodeToEnter.output, nextState.context, event, actorScope.self, stateInput) : undefined));
         }
         while (ancestorMarker?.type === 'parallel' && !completedNodes.has(ancestorMarker) && isInFinalState(mutStateNodeSet, ancestorMarker)) {
           completedNodes.add(ancestorMarker);
           const regionOutput = {};
           for (const region of getChildren(ancestorMarker)) {
             if (region.type === 'final') {
-              regionOutput[region.key] = region.output !== undefined ? resolveOutput(region.output, nextState.context, event, actorScope.self) : undefined;
+              regionOutput[region.key] = region.output !== undefined ? resolveOutput(region.output, nextState.context, event, actorScope.self, stateInputMap[region.id]) : undefined;
               continue;
             }
             if (region.type === 'parallel') {
@@ -1744,7 +1736,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
               continue;
             }
             const finalChild = getChildren(region).find(s => s.type === 'final' && mutStateNodeSet.has(s));
-            regionOutput[region.key] = finalChild?.output !== undefined ? resolveOutput(finalChild.output, nextState.context, event, actorScope.self) : undefined;
+            regionOutput[region.key] = finalChild?.output !== undefined ? resolveOutput(finalChild.output, nextState.context, event, actorScope.self, stateInputMap[finalChild.id]) : undefined;
           }
           internalQueue.push(createDoneStateEvent(ancestorMarker.id, regionOutput));
           rootCompletionNode = ancestorMarker;
@@ -2358,14 +2350,15 @@ function toArray(value) {
   }
   return toArrayStrict(value);
 }
-function resolveOutput(mapper, context, event, self) {
+function resolveOutput(mapper, context, event, self, input) {
   if (typeof mapper === 'function') {
     const outputMapper = mapper;
     const args = {
       context,
       event,
       output: getEventOutput(event),
-      self
+      self,
+      input
     };
     return outputMapper(args);
   }

package/dist/{index-dc3443b6.development.esm.js → index-d39fb138.development.esm.js}

@@ -349,6 +349,13 @@ function createSubscriptionLogic() {
 // Singleton logic instance
 const subscriptionLogic = /* #__PURE__ */createSubscriptionLogic();
 
+const builtInExecutableAction = Symbol('xstate.builtInExecutableAction');
+function brandBuiltInExecutableAction(action) {
+  Object.defineProperty(action, builtInExecutableAction, {
+    value: true
+  });
+  return action;
+}
 function mergeContextPatch(context, patch) {
   return {
     ...context,
@@ -535,7 +542,7 @@ function getBuiltInActionFields(action, args) {
 function createStartEffect(actor) {
   const action = builtInActions['@xstate.start'];
   const args = [actor];
-  return {
+  return brandBuiltInExecutableAction({
     type: XSTATE_START,
     params: {
       action,
@@ -545,7 +552,7 @@ function createStartEffect(actor) {
     exec: action.bind(null, actor),
     actor,
     id: actor.id
-  };
+  });
 }
 
 /**
@@ -574,23 +581,7 @@ function deriveDeferredStarts(effects) {
   return [...attachedStarts, ...childStarts];
 }
 function isBuiltInExecutableAction(action) {
-  if (!Object.prototype.hasOwnProperty.call(builtInActions, action.type)) {
-    return false;
-  }
-  switch (action.type) {
-    case '@xstate.spawn':
-      return 'actor' in action && 'logic' in action && 'src' in action && 'input' in action;
-    case '@xstate.start':
-    case '@xstate.stop':
-      return 'actor' in action;
-    case '@xstate.raise':
-    case '@xstate.sendTo':
-      return 'event' in action;
-    case '@xstate.cancel':
-      return 'id' in action;
-    default:
-      return false;
-  }
+  return action[builtInExecutableAction] === true;
 }
 function resolveActionsWithContext(currentSnapshot, event, actorScope, actions) {
   let intermediateSnapshot = currentSnapshot;
@@ -644,13 +635,14 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
     }
     if (!resolvedAction || !('resolve' in resolvedAction)) {
       const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, action.args) : undefined;
-      executableActions.push({
+      const executableAction = {
         type: typeof action === 'object' ? 'action' in action && typeof action.action === 'function' ? action.action.name ?? '(anonymous)' : action.type : action.name || '(anonymous)',
         params: actionParams,
         args: typeof action === 'object' && 'action' in action ? action.args : [],
         exec: resolvedAction || (typeof action === 'object' && action !== null ? () => actorScope.defer(() => actorScope.emit(action)) : undefined),
         ...builtInFields
-      });
+      };
+      executableActions.push(builtInFields ? brandBuiltInExecutableAction(executableAction) : executableAction);
       continue;
     }
   }
@@ -1516,7 +1508,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         let completionOutput;
         if (rootCompletionNode.output !== undefined && rootCompletionNode.parent) {
           const rootDoneEvent = internalQueue.find(e => e.type === `xstate.done.state.${rootNode.id}`);
-          completionOutput = rootDoneEvent && rootCompletionNode.parent === rootNode ? rootDoneEvent.output : resolveOutput(rootCompletionNode.output, nextState.context, event, actorScope.self);
+          completionOutput = rootDoneEvent && rootCompletionNode.parent === rootNode ? rootDoneEvent.output : resolveOutput(rootCompletionNode.output, nextState.context, event, actorScope.self, stateInputMap[rootCompletionNode.id]);
         } else if (rootCompletionNode.type === 'parallel') {
           const parallelDoneType = `xstate.done.state.${rootCompletionNode.id}`;
           const parallelDoneEvent = internalQueue.find(e => e.type === parallelDoneType);
@@ -1738,14 +1730,14 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         let ancestorMarker = parent?.type === 'parallel' ? parent : parent?.parent;
         let rootCompletionNode = ancestorMarker || stateNodeToEnter;
         if (parent?.type === 'compound') {
-          internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output !== undefined ? resolveOutput(stateNodeToEnter.output, nextState.context, event, actorScope.self) : undefined));
+          internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output !== undefined ? resolveOutput(stateNodeToEnter.output, nextState.context, event, actorScope.self, stateInput) : undefined));
         }
         while (ancestorMarker?.type === 'parallel' && !completedNodes.has(ancestorMarker) && isInFinalState(mutStateNodeSet, ancestorMarker)) {
           completedNodes.add(ancestorMarker);
           const regionOutput = {};
           for (const region of getChildren(ancestorMarker)) {
             if (region.type === 'final') {
-              regionOutput[region.key] = region.output !== undefined ? resolveOutput(region.output, nextState.context, event, actorScope.self) : undefined;
+              regionOutput[region.key] = region.output !== undefined ? resolveOutput(region.output, nextState.context, event, actorScope.self, stateInputMap[region.id]) : undefined;
               continue;
             }
             if (region.type === 'parallel') {
@@ -1755,7 +1747,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
               continue;
             }
             const finalChild = getChildren(region).find(s => s.type === 'final' && mutStateNodeSet.has(s));
-            regionOutput[region.key] = finalChild?.output !== undefined ? resolveOutput(finalChild.output, nextState.context, event, actorScope.self) : undefined;
+            regionOutput[region.key] = finalChild?.output !== undefined ? resolveOutput(finalChild.output, nextState.context, event, actorScope.self, stateInputMap[finalChild.id]) : undefined;
           }
           internalQueue.push(createDoneStateEvent(ancestorMarker.id, regionOutput));
           rootCompletionNode = ancestorMarker;
@@ -2375,14 +2367,15 @@ function toArray(value) {
   }
   return toArrayStrict(value);
 }
-function resolveOutput(mapper, context, event, self) {
+function resolveOutput(mapper, context, event, self, input) {
   if (typeof mapper === 'function') {
     const outputMapper = mapper;
     const args = {
       context,
       event,
       output: getEventOutput(event),
-      self
+      self,
+      input
     };
     return outputMapper(args);
   }

package/dist/{index-42956779.cjs.js → index-e694228c.cjs.js}

@@ -350,6 +350,13 @@ function createSubscriptionLogic() {
 // Singleton logic instance
 const subscriptionLogic = /* #__PURE__ */createSubscriptionLogic();
 
+const builtInExecutableAction = Symbol('xstate.builtInExecutableAction');
+function brandBuiltInExecutableAction(action) {
+  Object.defineProperty(action, builtInExecutableAction, {
+    value: true
+  });
+  return action;
+}
 function mergeContextPatch(context, patch) {
   return {
     ...context,
@@ -536,7 +543,7 @@ function getBuiltInActionFields(action, args) {
 function createStartEffect(actor) {
   const action = builtInActions['@xstate.start'];
   const args = [actor];
-  return {
+  return brandBuiltInExecutableAction({
     type: XSTATE_START,
     params: {
       action,
@@ -546,7 +553,7 @@ function createStartEffect(actor) {
     exec: action.bind(null, actor),
     actor,
     id: actor.id
-  };
+  });
 }
 
 /**
@@ -575,23 +582,7 @@ function deriveDeferredStarts(effects) {
   return [...attachedStarts, ...childStarts];
 }
 function isBuiltInExecutableAction(action) {
-  if (!Object.prototype.hasOwnProperty.call(builtInActions, action.type)) {
-    return false;
-  }
-  switch (action.type) {
-    case '@xstate.spawn':
-      return 'actor' in action && 'logic' in action && 'src' in action && 'input' in action;
-    case '@xstate.start':
-    case '@xstate.stop':
-      return 'actor' in action;
-    case '@xstate.raise':
-    case '@xstate.sendTo':
-      return 'event' in action;
-    case '@xstate.cancel':
-      return 'id' in action;
-    default:
-      return false;
-  }
+  return action[builtInExecutableAction] === true;
 }
 function resolveActionsWithContext(currentSnapshot, event, actorScope, actions) {
   let intermediateSnapshot = currentSnapshot;
@@ -645,13 +636,14 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
     }
     if (!resolvedAction || !('resolve' in resolvedAction)) {
       const builtInFields = typeof action === 'object' && action !== null && 'action' in action && typeof action.action === 'function' ? getBuiltInActionFields(action.action, action.args) : undefined;
-      executableActions.push({
+      const executableAction = {
         type: typeof action === 'object' ? 'action' in action && typeof action.action === 'function' ? action.action.name ?? '(anonymous)' : action.type : action.name || '(anonymous)',
         params: actionParams,
         args: typeof action === 'object' && 'action' in action ? action.args : [],
         exec: resolvedAction || (typeof action === 'object' && action !== null ? () => actorScope.defer(() => actorScope.emit(action)) : undefined),
         ...builtInFields
-      });
+      };
+      executableActions.push(builtInFields ? brandBuiltInExecutableAction(executableAction) : executableAction);
       continue;
     }
   }
@@ -1507,7 +1499,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         let completionOutput;
         if (rootCompletionNode.output !== undefined && rootCompletionNode.parent) {
           const rootDoneEvent = internalQueue.find(e => e.type === `xstate.done.state.${rootNode.id}`);
-          completionOutput = rootDoneEvent && rootCompletionNode.parent === rootNode ? rootDoneEvent.output : resolveOutput(rootCompletionNode.output, nextState.context, event, actorScope.self);
+          completionOutput = rootDoneEvent && rootCompletionNode.parent === rootNode ? rootDoneEvent.output : resolveOutput(rootCompletionNode.output, nextState.context, event, actorScope.self, stateInputMap[rootCompletionNode.id]);
         } else if (rootCompletionNode.type === 'parallel') {
           const parallelDoneType = `xstate.done.state.${rootCompletionNode.id}`;
           const parallelDoneEvent = internalQueue.find(e => e.type === parallelDoneType);
@@ -1729,14 +1721,14 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         let ancestorMarker = parent?.type === 'parallel' ? parent : parent?.parent;
         let rootCompletionNode = ancestorMarker || stateNodeToEnter;
         if (parent?.type === 'compound') {
-          internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output !== undefined ? resolveOutput(stateNodeToEnter.output, nextState.context, event, actorScope.self) : undefined));
+          internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output !== undefined ? resolveOutput(stateNodeToEnter.output, nextState.context, event, actorScope.self, stateInput) : undefined));
         }
         while (ancestorMarker?.type === 'parallel' && !completedNodes.has(ancestorMarker) && isInFinalState(mutStateNodeSet, ancestorMarker)) {
           completedNodes.add(ancestorMarker);
           const regionOutput = {};
           for (const region of getChildren(ancestorMarker)) {
             if (region.type === 'final') {
-              regionOutput[region.key] = region.output !== undefined ? resolveOutput(region.output, nextState.context, event, actorScope.self) : undefined;
+              regionOutput[region.key] = region.output !== undefined ? resolveOutput(region.output, nextState.context, event, actorScope.self, stateInputMap[region.id]) : undefined;
               continue;
             }
             if (region.type === 'parallel') {
@@ -1746,7 +1738,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
               continue;
             }
             const finalChild = getChildren(region).find(s => s.type === 'final' && mutStateNodeSet.has(s));
-            regionOutput[region.key] = finalChild?.output !== undefined ? resolveOutput(finalChild.output, nextState.context, event, actorScope.self) : undefined;
+            regionOutput[region.key] = finalChild?.output !== undefined ? resolveOutput(finalChild.output, nextState.context, event, actorScope.self, stateInputMap[finalChild.id]) : undefined;
           }
           internalQueue.push(createDoneStateEvent(ancestorMarker.id, regionOutput));
           rootCompletionNode = ancestorMarker;
@@ -2360,14 +2352,15 @@ function toArray(value) {
   }
   return toArrayStrict(value);
 }
-function resolveOutput(mapper, context, event, self) {
+function resolveOutput(mapper, context, event, self, input) {
   if (typeof mapper === 'function') {
     const outputMapper = mapper;
     const args = {
       context,
       event,
       output: getEventOutput(event),
-      self
+      self,
+      input
     };
     return outputMapper(args);
   }