xstate 5.0.0-beta.19 → 5.0.0-beta.21

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

@@ -3,8 +3,19 @@ import type { State } from "./State.js";
 import type { ActorStatus, Clock, Interpreter } from "./interpreter.js";
 import type { StateMachine } from "./StateMachine.js";
 import { TypegenDisabled, ResolveTypegenMeta, TypegenConstraint, MarkAllImplementationsAsProvided, AreAllImplementationsAssumedToBeProvided } from "./typegenTypes.js";
-import { PromiseEvent } from "./actors/promise.js";
-import { CallbackActorRef } from "./actors/callback.js";
+import { PromiseActorLogic } from "./actors/promise.js";
+/**
+ * `T | unknown` reduces to `unknown` and that can be problematic when it comes to contextual typing.
+ * It especially is a problem when the union has a function member, like here:
+ *
+ * ```ts
+ * declare function test(cbOrVal: ((arg: number) => unknown) | unknown): void;
+ * test((arg) => {}) // oops, implicit any
+ * ```
+ *
+ * This type can be used to avoid this problem. This union represents the same value space as `unknown`.
+ */
+export type NonReducibleUnknown = {} | null | undefined;
 export type AnyFunction = (...args: any[]) => any;
 type ReturnTypeOrValue<T> = T extends AnyFunction ? ReturnType<T> : T;
 export type IsNever<T> = [T] extends [never] ? true : false;
@@ -14,11 +25,12 @@ export type Compute<A extends any> = {
 export type Prop<T, K> = K extends keyof T ? T[K] : never;
 export type Values<T> = T[keyof T];
 export type Merge<M, N> = Omit<M, keyof N> & N;
+export type IndexByProp<T extends Record<P, string>, P extends keyof T> = {
+    [E in T as E[P]]: E;
+};
 export type IndexByType<T extends {
     type: string;
-}> = {
-    [K in T['type']]: T extends any ? (K extends T['type'] ? T : never) : never;
-};
+}> = IndexByProp<T, 'type'>;
 export type Equals<A1 extends any, A2 extends any> = (<A>() => A extends A2 ? true : false) extends <A>() => A extends A1 ? true : false ? true : false;
 export type IsAny<T> = Equals<T, any>;
 export type Cast<A, B> = A extends B ? A : B;
@@ -55,12 +67,14 @@ export type MachineContext = Record<string, any>;
 export interface ActionArgs<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> extends UnifiedArg<TContext, TEvent> {
     action: TAction;
 }
-export type Spawner = <T extends ActorLogic<any, any> | string>(// TODO: read string from machine logic keys
+export type InputFrom<T extends AnyActorLogic> = T extends StateMachine<infer _TContext, infer _TEvent, infer _TActions, infer _TActors, infer TInput, infer _TResolvedTypesMeta> ? TInput : T extends ActorLogic<infer _TEvent, infer _TSnapshot, infer _TInternalState, infer _TPersisted, infer _TSystem, infer TInput> ? TInput : never;
+export type OutputFrom<T extends AnyActorLogic> = T extends ActorLogic<infer _TEvent, infer _TSnapshot, infer _TInternalState, infer _TPersisted, infer _TSystem, infer _TInput, infer TOutput> ? TOutput : never;
+export type Spawner = <T extends AnyActorLogic | string>(// TODO: read string from machine logic keys
 logic: T, options?: Partial<{
     id: string;
     systemId?: string;
-    input: any;
-}>) => T extends ActorLogic<infer TActorEvent, infer TActorEmitted, infer _, infer __, infer ___> ? ActorRef<TActorEvent, TActorEmitted> : ActorRef<any, any>;
+    input: T extends AnyActorLogic ? InputFrom<T> : any;
+}>) => ActorRefFrom<T>;
 export interface AssignArgs<TContext extends MachineContext, TExpressionEvent extends EventObject> extends ActionArgs<TContext, TExpressionEvent> {
     spawn: Spawner;
 }
@@ -96,9 +110,9 @@ export interface DefaultGuardObject<TContext extends MachineContext, TEvent exte
     children?: Array<GuardObject<TContext, TEvent>>;
     predicate?: GuardPredicate<TContext, TEvent>;
 }
-export type GuardEvaluator<TContext extends MachineContext, TEvent extends EventObject> = (guard: GuardDefinition<TContext, TEvent>, context: TContext, event: TEvent, state: State<TContext, TEvent>) => boolean;
+export type GuardEvaluator<TContext extends MachineContext, TEvent extends EventObject> = (guard: GuardDefinition<TContext, TEvent>, context: TContext, event: TEvent, state: State<TContext, TEvent, TODO>) => boolean;
 export interface GuardArgs<TContext extends MachineContext, TEvent extends EventObject> {
-    state: State<TContext, TEvent, any>;
+    state: State<TContext, TEvent, TODO>;
     guard: GuardDefinition<TContext, TEvent>;
     evaluate: GuardEvaluator<TContext, TEvent>;
 }
@@ -144,14 +158,6 @@ export interface InitialTransitionConfig<TContext extends MachineContext, TEvent
     target: TransitionTarget;
 }
 export type Transition<TContext extends MachineContext, TEvent extends EventObject = EventObject> = string | TransitionConfig<TContext, TEvent> | ConditionalTransitionConfig<TContext, TEvent>;
-export type Receiver<TEvent extends EventObject> = (listener: {
-    bivarianceHack(event: TEvent): void;
-}['bivarianceHack']) => void;
-export type InvokeCallback<TEvent extends EventObject = AnyEventObject, TSentEvent extends EventObject = AnyEventObject> = (sendBack: (event: TSentEvent) => void, onReceive: Receiver<TEvent>, { input, system, self }: {
-    input: any;
-    system: AnyActorSystem;
-    self: CallbackActorRef<TEvent>;
-}) => (() => void) | Promise<any> | void;
 export interface InvokeMeta {
     src: string;
     meta: MetaObject | undefined;
@@ -163,7 +169,7 @@ export interface InvokeDefinition<TContext extends MachineContext, TEvent extend
      * The source of the actor logic to be invoked
      */
     src: string;
-    input?: Mapper<TContext, TEvent, any> | any;
+    input?: Mapper<TContext, TEvent, NonReducibleUnknown> | NonReducibleUnknown;
     /**
      * The transition to take upon the invoked child machine reaching its final top-level state.
      */
@@ -191,8 +197,8 @@ export type SingleOrArray<T> = T[] | T;
 export type StateNodesConfig<TContext extends MachineContext, TEvent extends EventObject> = {
     [K in string]: StateNode<TContext, TEvent>;
 };
-export type StatesConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> = {
-    [K in string]: StateNodeConfig<TContext, TEvent, TAction>;
+export type StatesConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TActor extends ProvidedActor> = {
+    [K in string]: StateNodeConfig<TContext, TEvent, TAction, TActor>;
 };
 export type StatesDefinition<TContext extends MachineContext, TEvent extends EventObject> = {
     [K in string]: StateNodeDefinition<TContext, TEvent>;
@@ -202,7 +208,43 @@ export type TransitionConfigOrTarget<TContext extends MachineContext, TExpressio
 export type TransitionsConfig<TContext extends MachineContext, TEvent extends EventObject> = {
     [K in TEvent['type'] | '*']?: K extends '*' ? TransitionConfigOrTarget<TContext, TEvent> : TransitionConfigOrTarget<TContext, ExtractEvent<TEvent, K>, TEvent>;
 };
-export interface InvokeConfig<TContext extends MachineContext, TEvent extends EventObject> {
+type IsLiteralString<T extends string> = string extends T ? false : true;
+type DistributeActors<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor> = TActor extends {
+    src: infer TSrc;
+} ? Compute<{
+    systemId?: string;
+    /**
+     * The source of the machine to be invoked, or the machine itself.
+     */
+    src: TSrc;
+    input?: Mapper<TContext, TEvent, InputFrom<TActor['logic']>> | InputFrom<TActor['logic']>;
+    /**
+     * The transition to take upon the invoked child machine reaching its final top-level state.
+     */
+    onDone?: string | SingleOrArray<TransitionConfigOrTarget<TContext, DoneInvokeEvent<OutputFrom<TActor['logic']>>, TEvent>>;
+    /**
+     * The transition to take upon the invoked child machine sending an error event.
+     */
+    onError?: string | SingleOrArray<TransitionConfigOrTarget<TContext, ErrorEvent<any>, TEvent>>;
+    onSnapshot?: string | SingleOrArray<TransitionConfigOrTarget<TContext, SnapshotEvent<any>, TEvent>>;
+    /**
+     * Meta data related to this invocation
+     */
+    meta?: MetaObject;
+} & (TActor['id'] extends string ? {
+    /**
+     * The unique identifier for the invoked machine. If not specified, this
+     * will be the machine's own `id`, or the URL (from `src`).
+     */
+    id: TActor['id'];
+} : {
+    /**
+     * The unique identifier for the invoked machine. If not specified, this
+     * will be the machine's own `id`, or the URL (from `src`).
+     */
+    id?: string;
+})> : never;
+export type InvokeConfig<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor> = IsLiteralString<TActor['src']> extends true ? DistributeActors<TContext, TEvent, TActor> : {
     /**
      * The unique identifier for the invoked machine. If not specified, this
      * will be the machine's own `id`, or the URL (from `src`).
@@ -212,8 +254,8 @@ export interface InvokeConfig<TContext extends MachineContext, TEvent extends Ev
     /**
      * The source of the machine to be invoked, or the machine itself.
      */
-    src: string | ActorLogic<any, any>;
-    input?: Mapper<TContext, TEvent, any> | any;
+    src: AnyActorLogic | string;
+    input?: Mapper<TContext, TEvent, NonReducibleUnknown> | NonReducibleUnknown;
     /**
      * The transition to take upon the invoked child machine reaching its final top-level state.
      */
@@ -227,8 +269,8 @@ export interface InvokeConfig<TContext extends MachineContext, TEvent extends Ev
      * Meta data related to this invocation
      */
     meta?: MetaObject;
-}
-export interface StateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> {
+};
+export interface StateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TActor extends ProvidedActor> {
     /**
      * The initial state transition.
      */
@@ -252,11 +294,11 @@ export interface StateNodeConfig<TContext extends MachineContext, TEvent extends
     /**
      * The mapping of state node keys to their state node configurations (recursive).
      */
-    states?: StatesConfig<TContext, TEvent, TAction> | undefined;
+    states?: StatesConfig<TContext, TEvent, TAction, TActor> | undefined;
     /**
      * The services to invoke upon entering this state node. These services will be stopped upon exiting this state node.
      */
-    invoke?: SingleOrArray<string | InvokeConfig<TContext, TEvent>>;
+    invoke?: SingleOrArray<TActor['src'] | InvokeConfig<TContext, TEvent, TActor>>;
     /**
      * The mapping of event types to their potential transition(s).
      */
@@ -298,7 +340,7 @@ export interface StateNodeConfig<TContext extends MachineContext, TEvent extends
      * The output data will be evaluated with the current `context` and placed on the `.data` property
      * of the event.
      */
-    output?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
+    output?: Mapper<TContext, TEvent, any> | NonReducibleUnknown;
     /**
      * The unique ID of the state node, which can be referenced as a transition target via the
      * `#id` syntax.
@@ -344,10 +386,10 @@ export interface StateMachineDefinition<TContext extends MachineContext, TEvent
 }
 export type AnyStateNode = StateNode<any, any>;
 export type AnyStateNodeDefinition = StateNodeDefinition<any, any>;
-export type AnyState = State<any, any, any>;
-export type AnyStateMachine = StateMachine<any, any, any, any, any>;
+export type AnyState = State<any, any, any, any>;
+export type AnyStateMachine = StateMachine<any, any, any, any, any, any>;
 export type AnyStateConfig = StateConfig<any, AnyEventObject>;
-export interface AtomicStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> extends StateNodeConfig<TContext, TEvent> {
+export interface AtomicStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> extends StateNodeConfig<TContext, TEvent, TODO, TODO> {
     initial?: undefined;
     parallel?: false | undefined;
     states?: undefined;
@@ -363,9 +405,9 @@ export interface FinalStateNodeConfig<TContext extends MachineContext, TEvent ex
      * The data to be sent with the "done.state.<id>" event. The data can be
      * static or dynamic (based on assigners).
      */
-    output?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
+    output?: Mapper<TContext, TEvent, any>;
 }
-export type SimpleOrStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> = AtomicStateNodeConfig<TContext, TEvent> | StateNodeConfig<TContext, TEvent>;
+export type SimpleOrStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> = AtomicStateNodeConfig<TContext, TEvent> | StateNodeConfig<TContext, TEvent, TODO, TODO>;
 export type ActionFunctionMap<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> = {
     [K in TAction['type']]?: ActionFunction<TContext, TEvent, TEvent, TAction extends {
         type: K;
@@ -385,18 +427,18 @@ export interface MachineImplementationsSimplified<TContext extends MachineContex
 type MachineImplementationsActions<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingActions = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingActions'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>> = {
     [K in keyof TEventsCausingActions]?: ActionFunction<TContext, Cast<Prop<TIndexedEvents, TEventsCausingActions[K]>, EventObject>, Cast<Prop<TIndexedEvents, keyof TIndexedEvents>, EventObject>, ParameterizedObject>;
 };
+type MachineImplementationsActors<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingActors = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingActors'>, TIndexedActors = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedActors'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>, _TInvokeSrcNameMap = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'invokeSrcNameMap'>> = {
+    [K in keyof TIndexedActors]?: Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic> | {
+        src: Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic>;
+        input: Mapper<TContext, Cast<Prop<TIndexedEvents, K extends keyof TEventsCausingActors ? TEventsCausingActors[K] : TIndexedEvents[keyof TIndexedEvents]>, EventObject>, InputFrom<Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic>>> | InputFrom<Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic>>;
+    };
+};
 type MachineImplementationsDelays<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingDelays = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingDelays'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>> = {
     [K in keyof TEventsCausingDelays]?: DelayConfig<TContext, Cast<Prop<TIndexedEvents, TEventsCausingDelays[K]>, EventObject>>;
 };
 type MachineImplementationsGuards<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingGuards = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingGuards'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>> = {
     [K in keyof TEventsCausingGuards]?: GuardPredicate<TContext, Cast<Prop<TIndexedEvents, TEventsCausingGuards[K]>, EventObject>> | GuardConfig<TContext, Cast<Prop<TIndexedEvents, TEventsCausingGuards[K]>, EventObject>>;
 };
-type MachineImplementationsActors<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingActors = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingActors'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>, _TInvokeSrcNameMap = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'invokeSrcNameMap'>> = {
-    [K in keyof TEventsCausingActors]?: AnyActorLogic | {
-        src: AnyActorLogic;
-        input: Mapper<TContext, Cast<Prop<TIndexedEvents, TEventsCausingActors[K]>, EventObject>, any> | any;
-    };
-};
 type MakeKeysRequired<T extends string> = {
     [K in T]: unknown;
 };
@@ -415,14 +457,14 @@ type GenerateDelaysImplementationsPart<TContext extends MachineContext, TResolve
 type GenerateGuardsImplementationsPart<TContext extends MachineContext, TResolvedTypesMeta, TRequireMissingImplementations, TMissingImplementations> = Compute<MaybeMakeMissingImplementationsRequired<'guards', Prop<TMissingImplementations, 'guards'>, TRequireMissingImplementations> & {
     guards?: MachineImplementationsGuards<TContext, TResolvedTypesMeta>;
 }>;
-export type InternalMachineImplementations<TContext extends MachineContext, _TEvent extends EventObject, TResolvedTypesMeta, TRequireMissingImplementations extends boolean = false, TMissingImplementations = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'missingImplementations'>> = GenerateActionsImplementationsPart<TContext, TResolvedTypesMeta, TRequireMissingImplementations, TMissingImplementations> & GenerateActorsImplementationsPart<TContext, TResolvedTypesMeta, TRequireMissingImplementations, TMissingImplementations> & GenerateDelaysImplementationsPart<TContext, TResolvedTypesMeta, TRequireMissingImplementations, TMissingImplementations> & GenerateGuardsImplementationsPart<TContext, TResolvedTypesMeta, TRequireMissingImplementations, TMissingImplementations>;
-export type MachineImplementations<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject, TActorMap extends ActorMap = ActorMap, TTypesMeta extends TypegenConstraint = TypegenDisabled> = InternalMachineImplementations<TContext, TEvent, ResolveTypegenMeta<TTypesMeta, TEvent, TAction, TActorMap>>;
-type InitialContext<TContext extends MachineContext> = TContext | ContextFactory<TContext>;
-export type ContextFactory<TContext extends MachineContext> = ({ spawn, input }: {
+export type InternalMachineImplementations<TContext extends MachineContext, TEvent extends EventObject, _TAction extends ParameterizedObject, TActor extends ProvidedActor, TResolvedTypesMeta, TRequireMissingImplementations extends boolean = false, TMissingImplementations = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'missingImplementations'>> = Compute<GenerateActionsImplementationsPart<TContext, TResolvedTypesMeta, TRequireMissingImplementations, TMissingImplementations> & GenerateActorsImplementationsPart<TContext, TResolvedTypesMeta, TRequireMissingImplementations, TMissingImplementations> & GenerateDelaysImplementationsPart<TContext, TResolvedTypesMeta, TRequireMissingImplementations, TMissingImplementations> & GenerateGuardsImplementationsPart<TContext, TResolvedTypesMeta, TRequireMissingImplementations, TMissingImplementations>>;
+export type MachineImplementations<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject, TActor extends ProvidedActor = ProvidedActor, TTypesMeta extends TypegenConstraint = TypegenDisabled> = InternalMachineImplementations<TContext, TEvent, TAction, TActor, ResolveTypegenMeta<TTypesMeta, TEvent, TAction, TActor>>;
+type InitialContext<TContext extends MachineContext, TInput> = TContext | ContextFactory<TContext, TInput>;
+export type ContextFactory<TContext extends MachineContext, TInput> = ({ spawn, input }: {
     spawn: Spawner;
-    input: any;
+    input: TInput;
 }) => TContext;
-export type MachineConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject, TActorMap extends ActorMap = ActorMap, TTypesMeta = TypegenDisabled> = (StateNodeConfig<NoInfer<TContext>, NoInfer<TEvent>, TAction> & {
+export type MachineConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject, TActor extends ProvidedActor = ProvidedActor, TInput = any, TTypesMeta = TypegenDisabled> = (StateNodeConfig<NoInfer<TContext>, NoInfer<TEvent>, NoInfer<TAction>, NoInfer<TActor>> & {
     /**
      * The initial context (extended state)
      */
@@ -430,28 +472,31 @@ export type MachineConfig<TContext extends MachineContext, TEvent extends EventO
      * The machine's own version.
      */
     version?: string;
-    types?: MachineTypes<TContext, TEvent, TActorMap, TTypesMeta>;
+    types?: MachineTypes<TContext, TEvent, TActor, TInput, TTypesMeta>;
 }) & (Equals<TContext, MachineContext> extends true ? {
-    context?: InitialContext<LowInfer<TContext>>;
+    context?: InitialContext<LowInfer<TContext>, TInput>;
 } : {
-    context: InitialContext<LowInfer<TContext>>;
+    context: InitialContext<LowInfer<TContext>, TInput>;
 });
-export type ActorMap = Record<string, {
-    output: any;
-}>;
-export interface MachineTypes<TContext extends MachineContext, TEvent extends EventObject, TActorMap extends ActorMap = ActorMap, TTypesMeta = TypegenDisabled> {
+export interface ProvidedActor {
+    src: string;
+    logic: AnyActorLogic;
+    id?: string;
+}
+export interface MachineTypes<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TInput, TTypesMeta = TypegenDisabled> {
     context?: TContext;
     actions?: {
         type: string;
         [key: string]: any;
     };
-    actors?: TActorMap;
+    actors?: TActor;
     events?: TEvent;
     guards?: {
         type: string;
         [key: string]: any;
     };
     typegen?: TTypesMeta;
+    input?: TInput;
 }
 export interface HistoryStateNode<TContext extends MachineContext> extends StateNode<TContext> {
     history: 'shallow' | 'deep';
@@ -470,9 +515,9 @@ export declare enum ConstantPrefix {
     ErrorPlatform = "error.platform",
     ErrorCustom = "xstate.error"
 }
-export interface DoneInvokeEvent<TData> extends EventObject {
+export interface DoneInvokeEvent<TOutput> {
     type: `done.invoke.${string}`;
-    output: TData;
+    output: TOutput;
 }
 export interface ErrorEvent<TErrorData> {
     type: `error.${string}`;
@@ -519,15 +564,13 @@ export type PartialAssigner<TContext extends MachineContext, TExpressionEvent ex
 export type PropertyAssigner<TContext extends MachineContext, TExpressionEvent extends EventObject> = {
     [K in keyof TContext]?: PartialAssigner<TContext, TExpressionEvent, K> | TContext[K];
 };
-export type Mapper<TContext extends MachineContext, TEvent extends EventObject, TParams extends {}> = (args: {
+export type Mapper<TContext extends MachineContext, TEvent extends EventObject, TParams> = (args: {
     context: TContext;
     event: TEvent;
+    self: ActorRef<TEvent>;
 }) => TParams;
 export type PropertyMapper<TContext extends MachineContext, TEvent extends EventObject, TParams extends {}> = {
-    [K in keyof TParams]?: ((args: {
-        context: TContext;
-        event: TEvent;
-    }) => TParams[K]) | TParams[K];
+    [K in keyof TParams]?: Mapper<TContext, TEvent, TParams[K]> | TParams[K];
 };
 export interface TransitionDefinition<TContext extends MachineContext, TEvent extends EventObject> extends Omit<TransitionConfig<TContext, TEvent>, 'target'> {
     target: Array<StateNode<TContext, TEvent>> | undefined;
@@ -577,7 +620,7 @@ export interface Segment<TContext extends MachineContext, TEvent extends EventOb
     /**
      * From state.
      */
-    state: State<TContext, TEvent>;
+    state: State<TContext, TEvent, TODO>;
     /**
      * Event from state.
      */
@@ -597,11 +640,12 @@ export interface StateConfig<TContext extends MachineContext, TEvent extends Eve
     children: Record<string, ActorRef<any>>;
     done?: boolean;
     output?: any;
+    error?: unknown;
     tags?: Set<string>;
-    machine?: StateMachine<TContext, TEvent, any, any, any>;
+    machine?: StateMachine<TContext, TEvent, any, any, any, any>;
     _internalQueue?: Array<TEvent>;
 }
-export interface InterpreterOptions<_TActorLogic extends AnyActorLogic> {
+export interface InterpreterOptions<TLogic extends AnyActorLogic> {
     /**
      * Whether state actions should be executed immediately upon transition. Defaults to `true`.
      */
@@ -635,7 +679,7 @@ export interface InterpreterOptions<_TActorLogic extends AnyActorLogic> {
     /**
      * The input data to pass to the actor.
      */
-    input?: any;
+    input?: InputFrom<TLogic>;
     state?: any;
     /**
      * The source definition.
@@ -676,7 +720,7 @@ export interface ActorRef<TEvent extends EventObject, TSnapshot = any> extends S
     sessionId: string;
     send: (event: TEvent) => void;
     start?: () => void;
-    getSnapshot: () => TSnapshot | undefined;
+    getSnapshot: () => TSnapshot;
     getPersistedState?: () => any;
     stop: () => void;
     toJSON?: () => any;
@@ -686,12 +730,13 @@ export interface ActorRef<TEvent extends EventObject, TSnapshot = any> extends S
     src?: string;
 }
 export type AnyActorRef = ActorRef<any, any>;
-export type ActorRefFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer TEvent, any, any, infer TResolvedTypesMeta> ? ActorRef<TEvent, State<TContext, TEvent, AreAllImplementationsAssumedToBeProvided<TResolvedTypesMeta> extends false ? MarkAllImplementationsAsProvided<TResolvedTypesMeta> : TResolvedTypesMeta>> : R extends Promise<infer U> ? ActorRef<PromiseEvent<U>, U | undefined> : R extends ActorLogic<infer TEvent, infer TSnapshot, infer _, infer __, infer ___> ? ActorRef<TEvent, TSnapshot> : never : never;
+export type ActorLogicFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<any, any, any, any, any> ? R : R extends Promise<infer U> ? PromiseActorLogic<U> : never : never;
+export type ActorRefFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer TEvent, any, any, any, infer TResolvedTypesMeta> ? ActorRef<TEvent, State<TContext, TEvent, TODO, AreAllImplementationsAssumedToBeProvided<TResolvedTypesMeta> extends false ? MarkAllImplementationsAsProvided<TResolvedTypesMeta> : TResolvedTypesMeta>> : R extends Promise<infer U> ? ActorRefFrom<PromiseActorLogic<U>> : R extends ActorLogic<infer TEvent, infer TSnapshot, infer _, infer __, infer ___, infer ____, infer _____> ? ActorRef<TEvent, TSnapshot> : never : never;
 export type DevToolsAdapter = (service: AnyInterpreter) => void;
-export type InterpreterFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine)> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, any, any, infer TResolvedTypesMeta> ? Interpreter<ActorLogic<TEvent, State<TContext, TEvent, TResolvedTypesMeta>, State<TContext, TEvent, TResolvedTypesMeta>, PersistedMachineState<State<TContext, TEvent, TResolvedTypesMeta>>>> : never;
-export type MachineImplementationsFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine), TRequireMissingImplementations extends boolean = false> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, any, any, infer TResolvedTypesMeta> ? InternalMachineImplementations<TContext, TEvent, TResolvedTypesMeta, TRequireMissingImplementations> : never;
-export type __ResolvedTypesMetaFrom<T> = T extends StateMachine<any, any, any, infer TResolvedTypesMeta> ? TResolvedTypesMeta : never;
-export type EventOfMachine<TMachine extends AnyStateMachine> = TMachine extends StateMachine<any, infer E, any, any, any> ? E : never;
+export type InterpreterFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine)> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, infer _TAction, infer TActor, infer TInput, infer TResolvedTypesMeta> ? Interpreter<ActorLogic<TEvent, State<TContext, TEvent, TActor, TResolvedTypesMeta>, State<TContext, TEvent, TActor, TResolvedTypesMeta>, PersistedMachineState<State<TContext, TEvent, TActor, TResolvedTypesMeta>>, ActorSystem<any>, TInput>> : never;
+export type MachineImplementationsFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine), TRequireMissingImplementations extends boolean = false> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, infer TAction, infer TActor, infer _TInput, infer TResolvedTypesMeta> ? InternalMachineImplementations<TContext, TEvent, TAction, TActor, TResolvedTypesMeta, TRequireMissingImplementations> : never;
+export type __ResolvedTypesMetaFrom<T> = T extends StateMachine<any, any, any, any, any, infer TResolvedTypesMeta> ? TResolvedTypesMeta : never;
+export type EventOfMachine<TMachine extends AnyStateMachine> = TMachine extends StateMachine<any, infer E, any, any, any, any> ? E : never;
 export interface ActorContext<TEvent extends EventObject, TSnapshot, TSystem extends ActorSystem<any> = ActorSystem<any>> {
     self: ActorRef<TEvent, TSnapshot>;
     id: string;
@@ -706,10 +751,10 @@ export interface ActorLogic<TEvent extends EventObject, TSnapshot = any, TIntern
 /**
  * Serialized internal state used for persistence & restoration
  */
-TPersisted = TInternalState, TSystem extends ActorSystem<any> = ActorSystem<any>> {
+TPersisted = TInternalState, TSystem extends ActorSystem<any> = ActorSystem<any>, TInput = any, TOutput = unknown> {
     config?: unknown;
     transition: (state: TInternalState, message: TEvent, ctx: ActorContext<TEvent, TSnapshot, TSystem>) => TInternalState;
-    getInitialState: (actorCtx: ActorContext<TEvent, TSnapshot, any>, input: any) => TInternalState;
+    getInitialState: (actorCtx: ActorContext<TEvent, TSnapshot, TSystem>, input: TInput) => TInternalState;
     restoreState?: (persistedState: TPersisted, actorCtx: ActorContext<TEvent, TSnapshot>) => TInternalState;
     getSnapshot?: (state: TInternalState) => TSnapshot;
     getStatus?: (state: TInternalState) => {
@@ -721,15 +766,22 @@ TPersisted = TInternalState, TSystem extends ActorSystem<any> = ActorSystem<any>
      * @returns Persisted state
      */
     getPersistedState?: (state: TInternalState) => TPersisted;
-}
-export type AnyActorLogic = ActorLogic<any, any, any, any>;
-export type SnapshotFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends ActorRef<infer _, infer TSnapshot> ? TSnapshot : R extends Interpreter<infer TLogic> ? SnapshotFrom<TLogic> : R extends StateMachine<infer _, infer __, infer ___, infer ____, infer _____> ? StateFrom<R> : R extends ActorLogic<infer _, infer TSnapshot, infer __, infer ___, infer ____> ? TSnapshot : R extends ActorContext<infer _, infer TSnapshot, infer __> ? TSnapshot : never : never;
+    _out_TOutput?: TOutput;
+}
+export type AnyActorLogic = ActorLogic<any, // event
+any, // snapshot
+any, // internal state
+any, // persisted state
+any, // system
+any, // input
+any>;
+export type SnapshotFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends ActorRef<infer _, infer TSnapshot> ? TSnapshot : R extends Interpreter<infer TLogic> ? SnapshotFrom<TLogic> : R extends StateMachine<infer _, infer __, infer ___, infer ____, infer _____, infer ______> ? StateFrom<R> : R extends ActorLogic<infer _, infer TSnapshot, infer __, infer ___, infer ____> ? TSnapshot : R extends ActorContext<infer _, infer TSnapshot, infer __> ? TSnapshot : never : never;
 export type EventFromLogic<TLogic extends ActorLogic<any, any>> = TLogic extends ActorLogic<infer TEvent, infer _, infer __, infer ___, infer ____> ? TEvent : never;
 export type PersistedStateFrom<TLogic extends ActorLogic<any, any>> = TLogic extends ActorLogic<infer _TEvent, infer _TSnapshot, infer _TInternalState, infer TPersisted> ? TPersisted : never;
 export type InternalStateFrom<TLogic extends ActorLogic<any, any>> = TLogic extends ActorLogic<infer _TEvent, infer _TSnapshot, infer TInternalState, infer _TPersisted> ? TInternalState : never;
-type ResolveEventType<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer _, infer TEvent, infer __, infer ___, infer ____> ? TEvent : R extends State<infer _, infer TEvent, infer __> ? TEvent : R extends ActorRef<infer TEvent, infer _> ? TEvent : never : never;
+type ResolveEventType<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer _, infer TEvent, infer __, infer ___, infer ____, infer _____> ? TEvent : R extends State<infer _TContext, infer TEvent, infer _TAction, infer _TActor> ? TEvent : R extends ActorRef<infer TEvent, infer _> ? TEvent : never : never;
 export type EventFrom<T, K extends Prop<TEvent, 'type'> = never, TEvent extends EventObject = ResolveEventType<T>> = IsNever<K> extends true ? TEvent : ExtractEvent<TEvent, K>;
-export type ContextFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer _, infer __, infer ___, infer ____> ? TContext : R extends State<infer TContext, infer _, infer __> ? TContext : R extends Interpreter<infer TActorLogic> ? TActorLogic extends StateMachine<infer TContext, infer _> ? TContext : never : never : never;
+export type ContextFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer _, infer __, infer ___, infer ____, infer _____> ? TContext : R extends State<infer TContext, infer _TEvent, infer _TAction, infer _TActor> ? TContext : R extends Interpreter<infer TActorLogic> ? TActorLogic extends StateMachine<infer TContext, infer _TEvent, infer _TActions, infer _TActors, infer _TInput, infer _TTypesMeta> ? TContext : never : never : never;
 export type InferEvent<E extends EventObject> = {
     [T in E['type']]: {
         type: T;
@@ -751,7 +803,7 @@ export interface ActorSystem<T extends ActorSystemInfo> {
     get: <K extends keyof T['actors']>(key: K) => T['actors'][K] | undefined;
 }
 export type AnyActorSystem = ActorSystem<any>;
-export type PersistedMachineState<TState extends AnyState> = Pick<TState, 'value' | 'output' | 'context' | 'done' | 'historyValue'> & {
+export type PersistedMachineState<TState extends AnyState> = Pick<TState, 'value' | 'output' | 'error' | 'context' | 'done' | 'historyValue'> & {
     children: {
         [K in keyof TState['children']]: {
             state: any;

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

@@ -1,6 +1,6 @@
 import { AnyActorLogic, AnyState } from "./index.js";
 import type { StateNode } from "./StateNode.js";
-import type { ActorLogic, AnyEventObject, EventObject, EventType, InvokeConfig, MachineContext, Mapper, Observer, PropertyMapper, ErrorEvent, SingleOrArray, StateLike, StateValue, Subscribable, TransitionConfig, TransitionConfigTarget } from "./types.js";
+import type { ActorLogic, AnyEventObject, EventObject, EventType, InvokeConfig, MachineContext, Mapper, Observer, ErrorEvent, SingleOrArray, StateLike, StateValue, Subscribable, TransitionConfig, TransitionConfigTarget, TODO, AnyActorRef } from "./types.js";
 export declare function keys<T extends object>(value: T): Array<keyof T & string>;
 export declare function matchesState(parentStateId: StateValue, childStateId: StateValue): boolean;
 export declare function toStatePath(stateId: string | string[]): string[];
@@ -26,7 +26,7 @@ export declare function toStatePaths(stateValue: StateValue | undefined): string
 export declare function flatten<T>(array: Array<T | T[]>): T[];
 export declare function toArrayStrict<T>(value: T[] | T): T[];
 export declare function toArray<T>(value: T[] | T | undefined): T[];
-export declare function mapContext<TContext extends MachineContext, TEvent extends EventObject>(mapper: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>, context: TContext, event: TEvent): any;
+export declare function mapContext<TContext extends MachineContext, TEvent extends EventObject>(mapper: Mapper<TContext, TEvent, any>, context: TContext, event: TEvent, self: AnyActorRef): any;
 export declare function isBuiltInEvent(eventType: EventType): boolean;
 export declare function isPromiseLike(value: any): value is PromiseLike<any>;
 export declare function isActorLogic(value: any): value is ActorLogic<any, any>;
@@ -38,7 +38,7 @@ export declare function isErrorEvent(event: AnyEventObject): event is ErrorEvent
 export declare function toTransitionConfigArray<TContext extends MachineContext, TEvent extends EventObject>(configLike: SingleOrArray<TransitionConfig<TContext, TEvent> | TransitionConfigTarget>): Array<TransitionConfig<TContext, TEvent>>;
 export declare function normalizeTarget<TContext extends MachineContext, TEvent extends EventObject>(target: SingleOrArray<string | StateNode<TContext, TEvent>> | undefined): Array<string | StateNode<TContext, TEvent>> | undefined;
 export declare function reportUnhandledExceptionOnInvocation(originalError: any, currentError: any, id: string): void;
-export declare function toInvokeConfig<TContext extends MachineContext, TEvent extends EventObject>(invocable: InvokeConfig<TContext, TEvent> | string | ActorLogic<any, any>, id: string): InvokeConfig<TContext, TEvent>;
+export declare function toInvokeConfig<TContext extends MachineContext, TEvent extends EventObject>(invocable: InvokeConfig<TContext, TEvent, TODO> | string | AnyActorLogic, id: string): InvokeConfig<TContext, TEvent, TODO>;
 export declare function toObserver<T>(nextHandler?: Observer<T> | ((value: T) => void), errorHandler?: (error: any) => void, completionHandler?: () => void): Observer<T>;
 export declare function createInvokeId(stateNodeId: string, index: number): string;
 export declare function resolveReferencedActor(referenced: AnyActorLogic | {

package/dist/xstate.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-2d912781.cjs.js');
+var actors_dist_xstateActors = require('./actions-c619a105.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 const EMPTY_OBJECT = {};
@@ -216,7 +216,6 @@ class StateNode {
         };
       }
       return {
-        type: 'xstate.invoke',
         ...invokeConfig,
         src: resolvedSrc,
         id: resolvedId,
@@ -364,8 +363,9 @@ class StateMachine {
     this.__TContext = void 0;
     this.__TEvent = void 0;
     this.__TAction = void 0;
-    this.__TActorMap = void 0;
+    this.__TActor = void 0;
     this.__TResolvedTypesMeta = void 0;
+    this.__TInput = void 0;
     this.id = config.id || '(machine)';
     this.implementations = {
       actors: implementations?.actors ?? {},
@@ -453,7 +453,9 @@ class StateMachine {
   transition(state, event, actorCtx) {
     // TODO: handle error events in a better way
     if (actors_dist_xstateActors.isErrorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
-      throw event.data;
+      return actors_dist_xstateActors.cloneState(state, {
+        error: event.data
+      });
     }
     const {
       state: nextState
@@ -524,15 +526,10 @@ class StateMachine {
     } = actors_dist_xstateActors.macrostep(nextState, initEvent, actorCtx);
     return macroState;
   }
-  start(state, actorCtx) {
+  start(state) {
     Object.values(state.children).forEach(child => {
       if (child.status === 0) {
-        try {
-          child.start?.();
-        } catch (err) {
-          // TODO: unify error handling when child starts
-          actorCtx.self.send(actors_dist_xstateActors.error(child.id, err));
-        }
+        child.start?.();
       }
     });
   }
@@ -559,7 +556,10 @@ class StateMachine {
     return stateConfig instanceof actors_dist_xstateActors.State ? stateConfig : new actors_dist_xstateActors.State(stateConfig, this);
   }
   getStatus(state) {
-    return state.done ? {
+    return state.error ? {
+      status: 'error',
+      data: state.error
+    } : state.done ? {
       status: 'done',
       data: state.output
     } : {

package/dist/xstate.development.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-bce11b97.development.cjs.js');
+var actors_dist_xstateActors = require('./actions-a95d2e66.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 const EMPTY_OBJECT = {};
@@ -216,7 +216,6 @@ class StateNode {
         };
       }
       return {
-        type: 'xstate.invoke',
         ...invokeConfig,
         src: resolvedSrc,
         id: resolvedId,
@@ -364,8 +363,9 @@ class StateMachine {
     this.__TContext = void 0;
     this.__TEvent = void 0;
     this.__TAction = void 0;
-    this.__TActorMap = void 0;
+    this.__TActor = void 0;
     this.__TResolvedTypesMeta = void 0;
+    this.__TInput = void 0;
     this.id = config.id || '(machine)';
     this.implementations = {
       actors: implementations?.actors ?? {},
@@ -453,7 +453,9 @@ class StateMachine {
   transition(state, event, actorCtx) {
     // TODO: handle error events in a better way
     if (actors_dist_xstateActors.isErrorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
-      throw event.data;
+      return actors_dist_xstateActors.cloneState(state, {
+        error: event.data
+      });
     }
     const {
       state: nextState
@@ -524,15 +526,10 @@ class StateMachine {
     } = actors_dist_xstateActors.macrostep(nextState, initEvent, actorCtx);
     return macroState;
   }
-  start(state, actorCtx) {
+  start(state) {
     Object.values(state.children).forEach(child => {
       if (child.status === 0) {
-        try {
-          child.start?.();
-        } catch (err) {
-          // TODO: unify error handling when child starts
-          actorCtx.self.send(actors_dist_xstateActors.error(child.id, err));
-        }
+        child.start?.();
       }
     });
   }
@@ -559,7 +556,10 @@ class StateMachine {
     return stateConfig instanceof actors_dist_xstateActors.State ? stateConfig : new actors_dist_xstateActors.State(stateConfig, this);
   }
   getStatus(state) {
-    return state.done ? {
+    return state.error ? {
+      status: 'error',
+      data: state.error
+    } : state.done ? {
       status: 'done',
       data: state.output
     } : {