xstate 5.0.0-beta.22 → 5.0.0-beta.24

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

@@ -4,6 +4,7 @@ import type { ActorStatus, Clock, Actor } from "./interpreter.js";
 import type { StateMachine } from "./StateMachine.js";
 import { TypegenDisabled, ResolveTypegenMeta, TypegenConstraint, MarkAllImplementationsAsProvided, AreAllImplementationsAssumedToBeProvided } from "./typegenTypes.js";
 import { PromiseActorLogic } from "./actors/promise.js";
+import { Guard, GuardPredicate, UnknownGuard } from "./guards.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:
@@ -36,8 +37,6 @@ export type IsAny<T> = Equals<T, any>;
 export type Cast<A, B> = A extends B ? A : B;
 export type NoInfer<T> = [T][T extends any ? 0 : any];
 export type LowInfer<T> = T & {};
-export type EventType = string;
-export type ActionType = string;
 export type MetaObject = Record<string, any>;
 export type Lazy<T> = () => T;
 export type MaybeLazy<T> = T | Lazy<T>;
@@ -55,19 +54,19 @@ export interface AnyEventObject extends EventObject {
 }
 export interface ParameterizedObject {
     type: string;
-    params?: Record<string, any>;
+    params?: Record<string, unknown>;
 }
-export interface UnifiedArg<TContext extends MachineContext, TEvent extends EventObject> {
+export interface UnifiedArg<TContext extends MachineContext, TExpressionEvent extends EventObject> {
     context: TContext;
-    event: TEvent;
-    self: ActorRef<TEvent>;
+    event: TExpressionEvent;
+    self: ActorRef<TExpressionEvent>;
     system: ActorSystem<any>;
 }
 export type MachineContext = Record<string, any>;
-export interface ActionArgs<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> extends UnifiedArg<TContext, TEvent> {
+export interface ActionArgs<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject | undefined> extends UnifiedArg<TContext, TEvent> {
     action: TAction;
 }
-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 InputFrom<T extends AnyActorLogic> = T extends StateMachine<infer _TContext, infer _TEvent, infer _TActor, infer _TAction, infer _TGuard, infer TInput, infer _TOutput, 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<{
@@ -75,19 +74,24 @@ logic: T, options?: Partial<{
     systemId?: string;
     input: T extends AnyActorLogic ? InputFrom<T> : any;
 }>) => ActorRefFrom<T>;
-export interface AssignArgs<TContext extends MachineContext, TExpressionEvent extends EventObject> extends ActionArgs<TContext, TExpressionEvent> {
+export interface AssignArgs<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined> extends ActionArgs<TContext, TExpressionEvent, TExpressionAction> {
     spawn: Spawner;
 }
-export type ActionFunction<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> = {
-    (args: ActionArgs<TContext, TExpressionEvent, TAction>): void;
+export type ActionFunction<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TAction extends ParameterizedObject> = {
+    (args: ActionArgs<TContext, TExpressionEvent, TExpressionAction>): void;
     _out_TEvent?: TEvent;
+    _out_TAction?: TAction;
 };
-export interface ChooseBranch<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent> {
-    guard?: GuardConfig<TContext, TExpressionEvent>;
-    actions: Actions<TContext, TExpressionEvent, TEvent>;
-}
-export type Action<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent> = ActionType | ParameterizedObject | ActionFunction<TContext, TExpressionEvent, TEvent, ParameterizedObject>;
-export type Actions<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent> = SingleOrArray<Action<TContext, TExpressionEvent, TEvent>>;
+export interface ChooseBranch<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent, TAction extends ParameterizedObject = ParameterizedObject, TExpressionGuard extends ParameterizedObject | undefined = ParameterizedObject | undefined, TGuard extends ParameterizedObject = ParameterizedObject> {
+    guard?: Guard<TContext, TExpressionEvent, TExpressionGuard, TGuard>;
+    actions: Actions<TContext, TExpressionEvent, TEvent, undefined, TAction>;
+}
+export type NoRequiredParams<T extends ParameterizedObject> = T extends any ? {
+    type: T['type'];
+} extends T ? T['type'] : never : never;
+export type Action<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TAction extends ParameterizedObject> = NoRequiredParams<TAction> | TAction | ActionFunction<TContext, TExpressionEvent, TEvent, TExpressionAction, TAction>;
+export type UnknownAction = Action<MachineContext, EventObject, EventObject, ParameterizedObject | undefined, ParameterizedObject>;
+export type Actions<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TAction extends ParameterizedObject> = SingleOrArray<Action<TContext, TExpressionEvent, TEvent, TExpressionAction, TAction>>;
 export type StateKey = string | AnyState;
 export interface StateValueMap {
     [key: string]: StateValue;
@@ -99,70 +103,24 @@ export interface StateValueMap {
  * - For complex state nodes, this is an object, e.g., `{ success: "someChildState" }`.
  */
 export type StateValue = string | StateValueMap;
-export type GuardPredicate<TContext extends MachineContext, TEvent extends EventObject> = (args: {
-    context: TContext;
-    event: TEvent;
-} & GuardArgs<TContext, TEvent>) => boolean;
-export interface DefaultGuardObject<TContext extends MachineContext, TEvent extends EventObject> extends ParameterizedObject {
-    /**
-     * Nested guards
-     */
-    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, TODO>) => boolean;
-export interface GuardArgs<TContext extends MachineContext, TEvent extends EventObject> {
-    state: State<TContext, TEvent, TODO>;
-    guard: GuardDefinition<TContext, TEvent>;
-    evaluate: GuardEvaluator<TContext, TEvent>;
-}
-export type GuardConfig<TContext extends MachineContext, TEvent extends EventObject> = string | GuardPredicate<TContext, TEvent> | GuardObject<TContext, TEvent>;
-export type GuardObject<TContext extends MachineContext, TEvent extends EventObject> = BooleanGuardObject<TContext, TEvent> | DefaultGuardObject<TContext, TEvent>;
-export interface GuardDefinition<TContext extends MachineContext, TEvent extends EventObject> {
-    type: string;
-    children?: Array<GuardDefinition<TContext, TEvent>>;
-    predicate?: GuardPredicate<TContext, TEvent>;
-    params: {
-        [key: string]: any;
-    };
-}
-export interface BooleanGuardObject<TContext extends MachineContext, TEvent extends EventObject> extends ParameterizedObject {
-    type: 'xstate.boolean';
-    children: Array<GuardConfig<TContext, TEvent>>;
-    params: {
-        op: 'and' | 'or' | 'not';
-    };
-    predicate: undefined;
-}
-export interface BooleanGuardDefinition<TContext extends MachineContext, TEvent extends EventObject> extends GuardDefinition<TContext, TEvent> {
-    type: 'xstate.boolean';
-    params: {
-        op: 'and' | 'or' | 'not';
-    };
-}
 export type TransitionTarget = SingleOrArray<string>;
-export interface TransitionConfig<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent, TAction extends ParameterizedObject = ParameterizedObject> {
-    guard?: GuardConfig<TContext, TExpressionEvent>;
-    actions?: Actions<TContext, TExpressionEvent, TEvent>;
+export interface TransitionConfig<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject> {
+    guard?: Guard<TContext, TExpressionEvent, undefined, TGuard>;
+    actions?: Actions<TContext, TExpressionEvent, TEvent, undefined, TAction>;
     reenter?: boolean;
     target?: TransitionTarget | undefined;
     meta?: Record<string, any>;
     description?: string;
 }
-export interface TargetTransitionConfig<TContext extends MachineContext, TEvent extends EventObject> extends TransitionConfig<TContext, TEvent> {
+export interface InitialTransitionConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject> extends TransitionConfig<TContext, TEvent, TEvent, TAction, TGuard> {
     target: TransitionTarget;
 }
-export type ConditionalTransitionConfig<TContext extends MachineContext, TEvent extends EventObject = EventObject> = Array<TransitionConfig<TContext, TEvent>>;
-export interface InitialTransitionConfig<TContext extends MachineContext, TEvent extends EventObject> extends TransitionConfig<TContext, TEvent> {
-    guard?: never;
-    target: TransitionTarget;
-}
-export type Transition<TContext extends MachineContext, TEvent extends EventObject = EventObject> = string | TransitionConfig<TContext, TEvent> | ConditionalTransitionConfig<TContext, TEvent>;
+export type AnyTransitionConfig = TransitionConfig<any, any, any, any, any>;
 export interface InvokeMeta {
     src: string;
     meta: MetaObject | undefined;
 }
-export interface InvokeDefinition<TContext extends MachineContext, TEvent extends EventObject> {
+export interface InvokeDefinition<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject> {
     id: string;
     systemId: string | undefined;
     /**
@@ -173,13 +131,13 @@ export interface InvokeDefinition<TContext extends MachineContext, TEvent extend
     /**
      * The transition to take upon the invoked child machine reaching its final top-level state.
      */
-    onDone?: string | SingleOrArray<TransitionConfig<TContext, DoneInvokeEvent<any>>>;
+    onDone?: string | SingleOrArray<TransitionConfig<TContext, DoneInvokeEvent<any>, DoneInvokeEvent<any>, TAction, TGuard>>;
     /**
      * The transition to take upon the invoked child machine sending an error event.
      */
-    onError?: string | SingleOrArray<TransitionConfig<TContext, ErrorEvent<any>>>;
-    onSnapshot?: string | SingleOrArray<TransitionConfig<TContext, SnapshotEvent<any>>>;
-    toJSON: () => Omit<InvokeDefinition<TContext, TEvent>, 'onDone' | 'onError' | 'toJSON'>;
+    onError?: string | SingleOrArray<TransitionConfig<TContext, ErrorEvent<any>, ErrorEvent<any>, TAction, TGuard>>;
+    onSnapshot?: string | SingleOrArray<TransitionConfig<TContext, SnapshotEvent<any>, SnapshotEvent<any>, TAction, TGuard>>;
+    toJSON: () => Omit<InvokeDefinition<TContext, TEvent, TAction, TGuard>, 'onDone' | 'onError' | 'toJSON'>;
     meta: MetaObject | undefined;
 }
 export interface Delay {
@@ -189,27 +147,27 @@ export interface Delay {
      */
     delay: number;
 }
-export type DelayedTransitions<TContext extends MachineContext, TEvent extends EventObject> = Record<string | number, string | SingleOrArray<TransitionConfig<TContext, TEvent>>> | Array<TransitionConfig<TContext, TEvent> & {
+export type DelayedTransitions<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject> = Record<string | number, string | SingleOrArray<TransitionConfig<TContext, TEvent, TEvent, TAction, TGuard>>> | Array<TransitionConfig<TContext, TEvent, TEvent, TAction, TGuard> & {
     delay: number | string | ((args: UnifiedArg<TContext, TEvent>) => number);
 }>;
 export type StateTypes = 'atomic' | 'compound' | 'parallel' | 'final' | 'history' | string;
-export type SingleOrArray<T> = T[] | T;
+export type SingleOrArray<T> = readonly 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, TActor extends ProvidedActor> = {
-    [K in string]: StateNodeConfig<TContext, TEvent, TAction, TActor>;
+export type StatesConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TActor extends ProvidedActor, TOutput> = {
+    [K in string]: StateNodeConfig<TContext, TEvent, TAction, TGuard, TActor, TOutput>;
 };
 export type StatesDefinition<TContext extends MachineContext, TEvent extends EventObject> = {
     [K in string]: StateNodeDefinition<TContext, TEvent>;
 };
 export type TransitionConfigTarget = string | undefined;
-export type TransitionConfigOrTarget<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent> = SingleOrArray<TransitionConfigTarget | TransitionConfig<TContext, TExpressionEvent, TEvent>>;
-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 type TransitionConfigOrTarget<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject> = SingleOrArray<TransitionConfigTarget | TransitionConfig<TContext, TExpressionEvent, TEvent, TAction, TGuard>>;
+export type TransitionsConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject> = {
+    [K in TEvent['type'] | '*']?: K extends '*' ? TransitionConfigOrTarget<TContext, TEvent, TEvent, TAction, TGuard> : TransitionConfigOrTarget<TContext, ExtractEvent<TEvent, K>, TEvent, TAction, TGuard>;
 };
 type IsLiteralString<T extends string> = string extends T ? false : true;
-type DistributeActors<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor> = TActor extends {
+type DistributeActors<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TAction extends ParameterizedObject, TGuard extends ParameterizedObject> = TActor extends {
     src: infer TSrc;
 } ? Compute<{
     systemId?: string;
@@ -221,12 +179,12 @@ type DistributeActors<TContext extends MachineContext, TEvent extends EventObjec
     /**
      * 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>>;
+    onDone?: string | SingleOrArray<TransitionConfigOrTarget<TContext, DoneInvokeEvent<OutputFrom<TActor['logic']>>, TEvent, TAction, TGuard>>;
     /**
      * 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>>;
+    onError?: string | SingleOrArray<TransitionConfigOrTarget<TContext, ErrorEvent<any>, TEvent, TAction, TGuard>>;
+    onSnapshot?: string | SingleOrArray<TransitionConfigOrTarget<TContext, SnapshotEvent<any>, TEvent, TAction, TGuard>>;
     /**
      * Meta data related to this invocation
      */
@@ -244,7 +202,7 @@ type DistributeActors<TContext extends MachineContext, TEvent extends EventObjec
      */
     id?: string;
 })> : never;
-export type InvokeConfig<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor> = IsLiteralString<TActor['src']> extends true ? DistributeActors<TContext, TEvent, TActor> : {
+export type InvokeConfig<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TAction extends ParameterizedObject, TGuard extends ParameterizedObject> = IsLiteralString<TActor['src']> extends true ? DistributeActors<TContext, TEvent, TActor, TAction, TGuard> : {
     /**
      * The unique identifier for the invoked machine. If not specified, this
      * will be the machine's own `id`, or the URL (from `src`).
@@ -259,22 +217,23 @@ export type InvokeConfig<TContext extends MachineContext, TEvent extends EventOb
     /**
      * The transition to take upon the invoked child machine reaching its final top-level state.
      */
-    onDone?: string | SingleOrArray<TransitionConfigOrTarget<TContext, DoneInvokeEvent<any>, TEvent>>;
+    onDone?: string | SingleOrArray<TransitionConfigOrTarget<TContext, DoneInvokeEvent<any>, TEvent, TAction, TGuard>>;
     /**
      * 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>>;
+    onError?: string | SingleOrArray<TransitionConfigOrTarget<TContext, ErrorEvent<any>, TEvent, TAction, TGuard>>;
+    onSnapshot?: string | SingleOrArray<TransitionConfigOrTarget<TContext, SnapshotEvent<any>, TEvent, TAction, TGuard>>;
     /**
      * Meta data related to this invocation
      */
     meta?: MetaObject;
 };
-export interface StateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TActor extends ProvidedActor> {
+export type AnyInvokeConfig = InvokeConfig<any, any, any, any, any>;
+export interface StateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TActor extends ProvidedActor, TOutput> {
     /**
      * The initial state transition.
      */
-    initial?: InitialTransitionConfig<TContext, TEvent> | SingleOrArray<string> | undefined;
+    initial?: InitialTransitionConfig<TContext, TEvent, TAction, TGuard> | SingleOrArray<string> | undefined;
     /**
      * The type of this state node:
      *
@@ -294,38 +253,38 @@ 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, TActor> | undefined;
+    states?: StatesConfig<TContext, TEvent, TAction, TGuard, TActor, NonReducibleUnknown> | undefined;
     /**
      * The services to invoke upon entering this state node. These services will be stopped upon exiting this state node.
      */
-    invoke?: SingleOrArray<TActor['src'] | InvokeConfig<TContext, TEvent, TActor>>;
+    invoke?: SingleOrArray<TActor['src'] | InvokeConfig<TContext, TEvent, TActor, TAction, TGuard>>;
     /**
      * The mapping of event types to their potential transition(s).
      */
-    on?: TransitionsConfig<TContext, TEvent>;
+    on?: TransitionsConfig<TContext, TEvent, TAction, TGuard>;
     /**
      * The action(s) to be executed upon entering the state node.
      */
-    entry?: Actions<TContext, TEvent, TEvent>;
+    entry?: Actions<TContext, TEvent, TEvent, undefined, TAction>;
     /**
      * The action(s) to be executed upon exiting the state node.
      */
-    exit?: Actions<TContext, TEvent, TEvent>;
+    exit?: Actions<TContext, TEvent, TEvent, undefined, TAction>;
     /**
      * The potential transition(s) to be taken upon reaching a final child state node.
      *
      * This is equivalent to defining a `[done(id)]` transition on this state node's `on` property.
      */
-    onDone?: string | SingleOrArray<TransitionConfig<TContext, DoneEventObject>> | undefined;
+    onDone?: string | SingleOrArray<TransitionConfig<TContext, DoneEventObject, DoneEventObject, TAction, TGuard>> | undefined;
     /**
      * The mapping (or array) of delays (in milliseconds) to their potential transition(s).
      * The delayed transitions are taken after the specified delay in an interpreter.
      */
-    after?: DelayedTransitions<TContext, TEvent>;
+    after?: DelayedTransitions<TContext, TEvent, TAction, TGuard>;
     /**
      * An eventless transition that is always taken when this state node is active.
      */
-    always?: TransitionConfigOrTarget<TContext, TEvent>;
+    always?: TransitionConfigOrTarget<TContext, TEvent, TEvent, TAction, TGuard>;
     /**
      * @private
      */
@@ -340,7 +299,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> | NonReducibleUnknown;
+    output?: Mapper<TContext, TEvent, TOutput> | TOutput;
     /**
      * The unique ID of the state node, which can be referenced as a transition target via the
      * `#id` syntax.
@@ -363,6 +322,7 @@ export interface StateNodeConfig<TContext extends MachineContext, TEvent extends
      */
     target?: string;
 }
+export type AnyStateNodeConfig = StateNodeConfig<any, any, any, any, any, any>;
 export interface StateNodeDefinition<TContext extends MachineContext, TEvent extends EventObject> {
     id: string;
     version?: string | undefined;
@@ -373,12 +333,12 @@ export interface StateNodeDefinition<TContext extends MachineContext, TEvent ext
     states: StatesDefinition<TContext, TEvent>;
     on: TransitionDefinitionMap<TContext, TEvent>;
     transitions: Array<TransitionDefinition<TContext, TEvent>>;
-    entry: Action<any, any, any>[];
-    exit: Action<any, any, any>[];
+    entry: UnknownAction[];
+    exit: UnknownAction[];
     meta: any;
     order: number;
     output?: FinalStateNodeConfig<TContext, TEvent>['output'];
-    invoke: Array<InvokeDefinition<TContext, TEvent>>;
+    invoke: Array<InvokeDefinition<TContext, TEvent, TODO, TODO>>;
     description?: string;
     tags: string[];
 }
@@ -386,10 +346,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, any>;
-export type AnyStateMachine = StateMachine<any, any, any, any, any, any>;
+export type AnyState = State<any, any, any, any, any>;
+export type AnyStateMachine = StateMachine<any, any, 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, TODO, TODO> {
+export interface AtomicStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> extends StateNodeConfig<TContext, TEvent, TODO, TODO, TODO, TODO> {
     initial?: undefined;
     parallel?: false | undefined;
     states?: undefined;
@@ -407,37 +367,43 @@ export interface FinalStateNodeConfig<TContext extends MachineContext, TEvent ex
      */
     output?: Mapper<TContext, TEvent, any>;
 }
-export type SimpleOrStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> = AtomicStateNodeConfig<TContext, TEvent> | StateNodeConfig<TContext, TEvent, TODO, TODO>;
+export type SimpleOrStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> = AtomicStateNodeConfig<TContext, TEvent> | StateNodeConfig<TContext, TEvent, TODO, TODO, 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;
-    } ? TAction : never>;
+    } ? TAction : never, TAction>;
 };
-export type DelayFunctionMap<TContext extends MachineContext, TEvent extends EventObject> = Record<string, DelayConfig<TContext, TEvent>>;
-export type DelayConfig<TContext extends MachineContext, TEvent extends EventObject> = number | DelayExpr<TContext, TEvent>;
-export interface MachineImplementationsSimplified<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> {
-    guards: Record<string, GuardPredicate<TContext, TEvent>>;
+type GuardMap<TContext extends MachineContext, TEvent extends EventObject, TGuard extends ParameterizedObject> = {
+    [K in TGuard['type']]?: GuardPredicate<TContext, TEvent, TGuard extends {
+        type: K;
+    } ? TGuard : never, TGuard>;
+};
+export type DelayFunctionMap<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject> = Record<string, DelayConfig<TContext, TEvent, TAction>>;
+export type DelayConfig<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined> = number | DelayExpr<TContext, TExpressionEvent, TExpressionAction>;
+export interface MachineImplementationsSimplified<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject, TGuard extends ParameterizedObject = ParameterizedObject> {
+    guards: GuardMap<TContext, TEvent, TGuard>;
     actions: ActionFunctionMap<TContext, TEvent, TAction>;
     actors: Record<string, AnyActorLogic | {
         src: AnyActorLogic;
         input: Mapper<TContext, TEvent, any> | any;
     }>;
-    delays: DelayFunctionMap<TContext, TEvent>;
+    delays: DelayFunctionMap<TContext, TEvent, TAction>;
 }
-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 MaybeNarrowedEvent<TIndexedEvents, TCausingLookup, K> = Cast<Prop<TIndexedEvents, K extends keyof TCausingLookup ? TCausingLookup[K] : TIndexedEvents[keyof TIndexedEvents]>, EventObject>;
+type MachineImplementationsActions<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingActions = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingActions'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>, TIndexedActions = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedActions'>> = {
+    [K in keyof TIndexedActions]?: ActionFunction<TContext, MaybeNarrowedEvent<TIndexedEvents, TEventsCausingActions, K>, Cast<Prop<TIndexedEvents, keyof TIndexedEvents>, EventObject>, Cast<TIndexedActions[K], ParameterizedObject>, Cast<Prop<TIndexedActions, keyof TIndexedActions>, 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>>;
+        input: Mapper<TContext, MaybeNarrowedEvent<TIndexedEvents, TEventsCausingActors, K>, 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>>;
+    [K in keyof TEventsCausingDelays]?: DelayConfig<TContext, Cast<Prop<TIndexedEvents, TEventsCausingDelays[K]>, EventObject>, ParameterizedObject | undefined>;
 };
-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 MachineImplementationsGuards<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingGuards = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingGuards'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>, TIndexedGuards = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedGuards'>> = {
+    [K in keyof TIndexedGuards]?: Guard<TContext, MaybeNarrowedEvent<TIndexedEvents, TEventsCausingGuards, K>, Cast<TIndexedGuards[K], ParameterizedObject>, Cast<Prop<TIndexedGuards, keyof TIndexedGuards>, ParameterizedObject>>;
 };
 type MakeKeysRequired<T extends string> = {
     [K in T]: unknown;
@@ -457,14 +423,17 @@ 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, _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>>;
+export type InternalMachineImplementations<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TAction extends ParameterizedObject, 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, TActor extends ProvidedActor = ProvidedActor, TAction extends ParameterizedObject = ParameterizedObject, TGuard extends ParameterizedObject = ParameterizedObject, TTypesMeta extends TypegenConstraint = TypegenDisabled> = InternalMachineImplementations<TContext, TEvent, TActor, TAction, ResolveTypegenMeta<TTypesMeta, TEvent, TActor, TAction, TGuard>>;
 type InitialContext<TContext extends MachineContext, TInput> = TContext | ContextFactory<TContext, TInput>;
 export type ContextFactory<TContext extends MachineContext, TInput> = ({ spawn, input }: {
     spawn: Spawner;
     input: TInput;
 }) => TContext;
-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>> & {
+type RootStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TActor extends ProvidedActor, TOutput> = Omit<StateNodeConfig<TContext, TEvent, TAction, TGuard, TActor, TOutput>, 'states'> & {
+    states?: StatesConfig<TContext, TEvent, TAction, TGuard, TActor, TOutput> | undefined;
+};
+export type MachineConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject, TGuard extends ParameterizedObject = ParameterizedObject, TActor extends ProvidedActor = ProvidedActor, TInput = any, TOutput = unknown, TTypesMeta = TypegenDisabled> = (RootStateNodeConfig<NoInfer<TContext>, NoInfer<TEvent>, NoInfer<TAction>, NoInfer<TGuard>, NoInfer<TActor>, NoInfer<TOutput>> & {
     /**
      * The initial context (extended state)
      */
@@ -472,7 +441,7 @@ export type MachineConfig<TContext extends MachineContext, TEvent extends EventO
      * The machine's own version.
      */
     version?: string;
-    types?: MachineTypes<TContext, TEvent, TActor, TInput, TTypesMeta>;
+    types?: MachineTypes<TContext, TEvent, TAction, TGuard, TActor, TInput, TOutput, TTypesMeta>;
 }) & (Equals<TContext, MachineContext> extends true ? {
     context?: InitialContext<LowInfer<TContext>, TInput>;
 } : {
@@ -483,20 +452,15 @@ export interface ProvidedActor {
     logic: AnyActorLogic;
     id?: string;
 }
-export interface MachineTypes<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TInput, TTypesMeta = TypegenDisabled> {
+export interface MachineTypes<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TActor extends ProvidedActor, TInput, TOutput, TTypesMeta = TypegenDisabled> {
     context?: TContext;
-    actions?: {
-        type: string;
-        [key: string]: any;
-    };
-    actors?: TActor;
     events?: TEvent;
-    guards?: {
-        type: string;
-        [key: string]: any;
-    };
-    typegen?: TTypesMeta;
+    actors?: TActor;
+    actions?: TAction;
+    guards?: TGuard;
     input?: TInput;
+    output?: TOutput;
+    typegen?: TTypesMeta;
 }
 export interface HistoryStateNode<TContext extends MachineContext> extends StateNode<TContext> {
     history: 'shallow' | 'deep';
@@ -540,57 +504,57 @@ export interface DoneEventObject extends EventObject {
     toString(): string;
 }
 export type DoneEvent = DoneEventObject & string;
-export type DelayExpr<TContext extends MachineContext, TEvent extends EventObject> = (args: UnifiedArg<TContext, TEvent>) => number;
-export type LogExpr<TContext extends MachineContext, TEvent extends EventObject> = (args: UnifiedArg<TContext, TEvent>) => unknown;
-export type SendExpr<TContext extends MachineContext, TExpressionEvent extends EventObject, TSentEvent extends EventObject = AnyEventObject> = (args: UnifiedArg<TContext, TExpressionEvent>) => TSentEvent;
+export type DelayExpr<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined> = (args: ActionArgs<TContext, TExpressionEvent, TExpressionAction>) => number;
+export type LogExpr<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined> = (args: ActionArgs<TContext, TExpressionEvent, TExpressionAction>) => unknown;
+export type SendExpr<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TSentEvent extends EventObject> = (args: ActionArgs<TContext, TExpressionEvent, TExpressionAction>) => TSentEvent;
 export declare enum SpecialTargets {
     Parent = "#_parent",
     Internal = "#_internal"
 }
-export interface SendToActionOptions<TContext extends MachineContext, TEvent extends EventObject> extends RaiseActionOptions<TContext, TEvent> {
+export interface SendToActionOptions<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined> extends RaiseActionOptions<TContext, TExpressionEvent, TExpressionAction> {
 }
-export interface RaiseActionOptions<TContext extends MachineContext, TEvent extends EventObject> {
+export interface RaiseActionOptions<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined> {
     id?: string;
-    delay?: number | string | DelayExpr<TContext, TEvent>;
+    delay?: number | string | DelayExpr<TContext, TExpressionEvent, TExpressionAction>;
 }
-export interface RaiseActionParams<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject> extends RaiseActionOptions<TContext, TExpressionEvent> {
-    event: TEvent | SendExpr<TContext, TExpressionEvent, TEvent>;
+export interface RaiseActionParams<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TEvent extends EventObject> extends RaiseActionOptions<TContext, TExpressionEvent, TExpressionAction> {
+    event: TEvent | SendExpr<TContext, TExpressionEvent, TExpressionAction, TEvent>;
 }
-export interface SendToActionParams<TContext extends MachineContext, TEvent extends EventObject, TSentEvent extends EventObject = EventObject> extends SendToActionOptions<TContext, TEvent> {
-    event: TSentEvent | SendExpr<TContext, TEvent, TSentEvent>;
+export interface SendToActionParams<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TSentEvent extends EventObject> extends SendToActionOptions<TContext, TExpressionEvent, TExpressionAction> {
+    event: TSentEvent | SendExpr<TContext, TExpressionEvent, TExpressionAction, TSentEvent>;
 }
-export type Assigner<TContext extends MachineContext, TExpressionEvent extends EventObject> = (args: AssignArgs<TContext, TExpressionEvent>) => Partial<TContext>;
-export type PartialAssigner<TContext extends MachineContext, TExpressionEvent extends EventObject, TKey extends keyof TContext> = (args: AssignArgs<TContext, TExpressionEvent>) => TContext[TKey];
-export type PropertyAssigner<TContext extends MachineContext, TExpressionEvent extends EventObject> = {
-    [K in keyof TContext]?: PartialAssigner<TContext, TExpressionEvent, K> | TContext[K];
+export type Assigner<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined> = (args: AssignArgs<TContext, TExpressionEvent, TExpressionAction>) => Partial<TContext>;
+export type PartialAssigner<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TKey extends keyof TContext> = (args: AssignArgs<TContext, TExpressionEvent, TExpressionAction>) => TContext[TKey];
+export type PropertyAssigner<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined> = {
+    [K in keyof TContext]?: PartialAssigner<TContext, TExpressionEvent, TExpressionAction, K> | TContext[K];
 };
-export type Mapper<TContext extends MachineContext, TEvent extends EventObject, TParams> = (args: {
+export type Mapper<TContext extends MachineContext, TEvent extends EventObject, TResult> = (args: {
     context: TContext;
     event: TEvent;
     self: ActorRef<TEvent>;
-}) => TParams;
+}) => TResult;
 export type PropertyMapper<TContext extends MachineContext, TEvent extends EventObject, TParams extends {}> = {
     [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;
+export interface TransitionDefinition<TContext extends MachineContext, TEvent extends EventObject> extends Omit<TransitionConfig<TContext, TEvent, TEvent, TODO, TODO>, 'target' | 'guard'> {
+    target: ReadonlyArray<StateNode<TContext, TEvent>> | undefined;
     source: StateNode<TContext, TEvent>;
-    actions: Action<any, any, any>[];
+    actions: readonly UnknownAction[];
     reenter: boolean;
-    guard?: GuardDefinition<TContext, TEvent>;
+    guard?: UnknownGuard;
     eventType: TEvent['type'] | '*';
     toJSON: () => {
         target: string[] | undefined;
         source: string;
-        actions: Action<any, any, any>[];
-        guard?: GuardDefinition<TContext, TEvent>;
+        actions: readonly UnknownAction[];
+        guard?: UnknownGuard;
         eventType: TEvent['type'] | '*';
         meta?: Record<string, any>;
     };
 }
 export type AnyTransitionDefinition = TransitionDefinition<any, any>;
 export interface InitialTransitionDefinition<TContext extends MachineContext, TEvent extends EventObject> extends TransitionDefinition<TContext, TEvent> {
-    target: Array<StateNode<TContext, TEvent>>;
+    target: ReadonlyArray<StateNode<TContext, TEvent>>;
     guard?: never;
 }
 export type TransitionDefinitionMap<TContext extends MachineContext, TEvent extends EventObject> = {
@@ -599,32 +563,7 @@ export type TransitionDefinitionMap<TContext extends MachineContext, TEvent exte
     }> : EventObject>>;
 };
 export interface DelayedTransitionDefinition<TContext extends MachineContext, TEvent extends EventObject> extends TransitionDefinition<TContext, TEvent> {
-    delay: number | string | DelayExpr<TContext, TEvent>;
-}
-export interface Edge<TContext extends MachineContext, TEvent extends EventObject, TEventType extends TEvent['type'] = string> {
-    event: TEventType;
-    source: StateNode<TContext, TEvent>;
-    target: StateNode<TContext, TEvent>;
-    cond?: GuardConfig<TContext, TEvent & {
-        type: TEventType;
-    }>;
-    actions: Array<Action<TContext, TEvent>>;
-    meta?: MetaObject;
-    transition: TransitionDefinition<TContext, TEvent>;
-}
-export interface NodesAndEdges<TContext extends MachineContext, TEvent extends EventObject> {
-    nodes: StateNode[];
-    edges: Array<Edge<TContext, TEvent, TEvent['type']>>;
-}
-export interface Segment<TContext extends MachineContext, TEvent extends EventObject> {
-    /**
-     * From state.
-     */
-    state: State<TContext, TEvent, TODO>;
-    /**
-     * Event from state.
-     */
-    event: TEvent;
+    delay: number | string | DelayExpr<TContext, TEvent, undefined>;
 }
 export interface StateLike<TContext extends MachineContext> {
     value: StateValue;
@@ -642,7 +581,7 @@ export interface StateConfig<TContext extends MachineContext, TEvent extends Eve
     output?: any;
     error?: unknown;
     tags?: Set<string>;
-    machine?: StateMachine<TContext, TEvent, any, any, any, any>;
+    machine?: StateMachine<TContext, TEvent, any, any, any, any, any, any>;
     _internalQueue?: Array<TEvent>;
 }
 export interface ActorOptions<TLogic extends AnyActorLogic> {
@@ -734,16 +673,15 @@ export interface ActorRef<TEvent extends EventObject, TSnapshot = any> extends S
     src?: string;
 }
 export type AnyActorRef = ActorRef<any, any>;
-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 ActorLogicFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<any, any, any, 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, infer TActor, infer _TAction, infer _TGuard, infer _Tinput, infer TOutput, infer TResolvedTypesMeta> ? ActorRef<TEvent, State<TContext, TEvent, TActor, TOutput, 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: AnyActor) => void;
 /**
  * @deprecated Use `Actor<T>` instead.
  */
-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> ? Actor<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 type InterpreterFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine)> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, infer TActor, infer _TAction, infer _TGuard, infer TInput, infer TOutput, infer TResolvedTypesMeta> ? Actor<ActorLogic<TEvent, State<TContext, TEvent, TActor, TOutput, TResolvedTypesMeta>, State<TContext, TEvent, TActor, TOutput, TResolvedTypesMeta>, PersistedMachineState<State<TContext, TEvent, TActor, TOutput, 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 TActor, infer TAction, infer _TGuard, infer _TInput, infer _TOutput, infer TResolvedTypesMeta> ? InternalMachineImplementations<TContext, TEvent, TActor, TAction, TResolvedTypesMeta, TRequireMissingImplementations> : never;
+export type __ResolvedTypesMetaFrom<T> = T extends StateMachine<any, any, any, any, any, any, any, infer TResolvedTypesMeta> ? TResolvedTypesMeta : never;
 export interface ActorContext<TEvent extends EventObject, TSnapshot, TSystem extends ActorSystem<any> = ActorSystem<any>> {
     self: ActorRef<TEvent, TSnapshot>;
     id: string;
@@ -782,13 +720,13 @@ 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 Actor<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 SnapshotFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends ActorRef<infer _, infer TSnapshot> ? TSnapshot : R extends Actor<infer TLogic> ? SnapshotFrom<TLogic> : R extends StateMachine<infer _, infer __, 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 ____, infer _____> ? TEvent : R extends State<infer _TContext, infer TEvent, infer _TAction, infer _TActor> ? TEvent : R extends ActorRef<infer TEvent, infer _> ? TEvent : never : never;
+type ResolveEventType<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer _TContext, infer TEvent, infer _TActor, infer _TAction, infer _TGuard, infer _TInput, infer _TOutput, infer _TResolvedTypesMeta> ? TEvent : R extends State<infer _TContext, infer TEvent, infer _TActor, infer _TOutput, infer _TResolvedTypesMeta> ? 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 ____, infer _____> ? TContext : R extends State<infer TContext, infer _TEvent, infer _TAction, infer _TActor> ? TContext : R extends Actor<infer TActorLogic> ? TActorLogic extends StateMachine<infer TContext, infer _TEvent, infer _TActions, infer _TActors, infer _TInput, infer _TTypesMeta> ? TContext : never : never : never;
+export type ContextFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer _, infer __, infer ___, infer ____, infer _____, infer ______, infer _______> ? TContext : R extends State<infer TContext, infer _TEvent, infer _TActor, infer _TOutput, infer _TResolvedTypesMeta> ? TContext : R extends Actor<infer TActorLogic> ? TActorLogic extends StateMachine<infer TContext, infer _TEvent, infer _TActor, infer _TAction, infer _TGuard, infer _TInput, infer _TOutput, infer _TTypesMeta> ? TContext : never : never : never;
 export type InferEvent<E extends EventObject> = {
     [T in E['type']]: {
         type: T;