xstate 5.0.0-beta.23 → 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:
@@ -55,17 +56,17 @@ export interface ParameterizedObject {
     type: string;
     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 | undefined> extends UnifiedArg<TContext, TEvent> {
     action: TAction;
 }
-export type InputFrom<T extends AnyActorLogic> = T extends StateMachine<infer _TContext, infer _TEvent, infer _TAction, infer _TActor, 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<{
@@ -81,11 +82,11 @@ export type ActionFunction<TContext extends MachineContext, TExpressionEvent ext
     _out_TEvent?: TEvent;
     _out_TAction?: TAction;
 };
-export interface ChooseBranch<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent, TAction extends ParameterizedObject = ParameterizedObject> {
-    guard?: GuardConfig<TContext, TExpressionEvent>;
+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>;
 }
-type NoRequiredParams<T extends ParameterizedObject> = T extends any ? {
+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>;
@@ -102,65 +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, TODO>) => boolean;
-export interface GuardArgs<TContext extends MachineContext, TEvent extends EventObject> {
-    state: State<TContext, TEvent, TODO, 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, TAction extends ParameterizedObject> {
-    guard?: GuardConfig<TContext, TExpressionEvent>;
+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 InitialTransitionConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject> extends TransitionConfig<TContext, TEvent, TEvent, TAction> {
-    guard?: never;
+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 AnyTransitionConfig = TransitionConfig<any, any, any, any, any>;
 export interface InvokeMeta {
     src: string;
     meta: MetaObject | undefined;
 }
-export interface InvokeDefinition<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject> {
+export interface InvokeDefinition<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject> {
     id: string;
     systemId: string | undefined;
     /**
@@ -171,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>, DoneInvokeEvent<any>, TAction>>;
+    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>, ErrorEvent<any>, TAction>>;
-    onSnapshot?: string | SingleOrArray<TransitionConfig<TContext, SnapshotEvent<any>, SnapshotEvent<any>, TAction>>;
-    toJSON: () => Omit<InvokeDefinition<TContext, TEvent, TAction>, '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 {
@@ -187,7 +147,7 @@ export interface Delay {
      */
     delay: number;
 }
-export type DelayedTransitions<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject> = Record<string | number, string | SingleOrArray<TransitionConfig<TContext, TEvent, TEvent, TAction>>> | Array<TransitionConfig<TContext, TEvent, TEvent, TAction> & {
+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;
@@ -195,19 +155,19 @@ 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, TOutput> = {
-    [K in string]: StateNodeConfig<TContext, TEvent, TAction, TActor, TOutput>;
+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, TAction extends ParameterizedObject> = SingleOrArray<TransitionConfigTarget | TransitionConfig<TContext, TExpressionEvent, TEvent, TAction>>;
-export type TransitionsConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject> = {
-    [K in TEvent['type'] | '*']?: K extends '*' ? TransitionConfigOrTarget<TContext, TEvent, TEvent, TAction> : TransitionConfigOrTarget<TContext, ExtractEvent<TEvent, K>, TEvent, TAction>;
+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, TAction extends ParameterizedObject> = 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;
@@ -219,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, TAction>>;
+    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, TAction>>;
-    onSnapshot?: string | SingleOrArray<TransitionConfigOrTarget<TContext, SnapshotEvent<any>, TEvent, TAction>>;
+    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
      */
@@ -242,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, TAction extends ParameterizedObject> = IsLiteralString<TActor['src']> extends true ? DistributeActors<TContext, TEvent, TActor, TAction> : {
+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`).
@@ -257,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, TAction>>;
+    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, TAction>>;
-    onSnapshot?: string | SingleOrArray<TransitionConfigOrTarget<TContext, SnapshotEvent<any>, TEvent, TAction>>;
+    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, TOutput> {
+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, TAction> | SingleOrArray<string> | undefined;
+    initial?: InitialTransitionConfig<TContext, TEvent, TAction, TGuard> | SingleOrArray<string> | undefined;
     /**
      * The type of this state node:
      *
@@ -292,15 +253,15 @@ 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, NonReducibleUnknown> | 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, TAction>>;
+    invoke?: SingleOrArray<TActor['src'] | InvokeConfig<TContext, TEvent, TActor, TAction, TGuard>>;
     /**
      * The mapping of event types to their potential transition(s).
      */
-    on?: TransitionsConfig<TContext, TEvent, TAction>;
+    on?: TransitionsConfig<TContext, TEvent, TAction, TGuard>;
     /**
      * The action(s) to be executed upon entering the state node.
      */
@@ -314,16 +275,16 @@ export interface StateNodeConfig<TContext extends MachineContext, TEvent extends
      *
      * This is equivalent to defining a `[done(id)]` transition on this state node's `on` property.
      */
-    onDone?: string | SingleOrArray<TransitionConfig<TContext, DoneEventObject, DoneEventObject, TAction>> | 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, TAction>;
+    after?: DelayedTransitions<TContext, TEvent, TAction, TGuard>;
     /**
      * An eventless transition that is always taken when this state node is active.
      */
-    always?: TransitionConfigOrTarget<TContext, TEvent, TEvent, TAction>;
+    always?: TransitionConfigOrTarget<TContext, TEvent, TEvent, TAction, TGuard>;
     /**
      * @private
      */
@@ -361,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;
@@ -376,7 +338,7 @@ export interface StateNodeDefinition<TContext extends MachineContext, TEvent ext
     meta: any;
     order: number;
     output?: FinalStateNodeConfig<TContext, TEvent>['output'];
-    invoke: Array<InvokeDefinition<TContext, TEvent, TODO>>;
+    invoke: Array<InvokeDefinition<TContext, TEvent, TODO, TODO>>;
     description?: string;
     tags: string[];
 }
@@ -385,9 +347,9 @@ 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, any>;
-export type AnyStateMachine = StateMachine<any, any, 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, 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;
@@ -405,16 +367,21 @@ 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, 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>;
 };
+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> {
-    guards: Record<string, GuardPredicate<TContext, TEvent>>;
+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;
@@ -435,8 +402,8 @@ type MachineImplementationsActors<TContext extends MachineContext, TResolvedType
 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>, 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;
@@ -456,17 +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;
-type RootStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TActor extends ProvidedActor, TOutput> = Omit<StateNodeConfig<TContext, TEvent, TAction, TActor, TOutput>, 'states'> & {
-    states?: StatesConfig<TContext, TEvent, TAction, TActor, TOutput> | undefined;
+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, TActor extends ProvidedActor = ProvidedActor, TInput = any, TOutput = unknown, TTypesMeta = TypegenDisabled> = (RootStateNodeConfig<NoInfer<TContext>, NoInfer<TEvent>, NoInfer<TAction>, NoInfer<TActor>, NoInfer<TOutput>> & {
+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)
      */
@@ -474,7 +441,7 @@ export type MachineConfig<TContext extends MachineContext, TEvent extends EventO
      * The machine's own version.
      */
     version?: string;
-    types?: MachineTypes<TContext, TEvent, TAction, TActor, TInput, TOutput, TTypesMeta>;
+    types?: MachineTypes<TContext, TEvent, TAction, TGuard, TActor, TInput, TOutput, TTypesMeta>;
 }) & (Equals<TContext, MachineContext> extends true ? {
     context?: InitialContext<LowInfer<TContext>, TInput>;
 } : {
@@ -485,18 +452,15 @@ export interface ProvidedActor {
     logic: AnyActorLogic;
     id?: string;
 }
-export interface MachineTypes<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TActor extends ProvidedActor, TInput, TOutput, 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?: TAction;
-    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';
@@ -572,18 +536,18 @@ export type Mapper<TContext extends MachineContext, TEvent extends EventObject,
 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, TEvent, TODO>, 'target'> {
+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: readonly UnknownAction[];
     reenter: boolean;
-    guard?: GuardDefinition<TContext, TEvent>;
+    guard?: UnknownGuard;
     eventType: TEvent['type'] | '*';
     toJSON: () => {
         target: string[] | undefined;
         source: string;
         actions: readonly UnknownAction[];
-        guard?: GuardDefinition<TContext, TEvent>;
+        guard?: UnknownGuard;
         eventType: TEvent['type'] | '*';
         meta?: Record<string, any>;
     };
@@ -617,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> {
@@ -709,15 +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, 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 _TAction, infer TActor, 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 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 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 TAction, infer TActor, infer _TInput, infer _TOutput, infer TResolvedTypesMeta> ? InternalMachineImplementations<TContext, TEvent, TAction, TActor, TResolvedTypesMeta, TRequireMissingImplementations> : never;
-export type __ResolvedTypesMetaFrom<T> = T extends StateMachine<any, any, any, any, any, any, infer TResolvedTypesMeta> ? TResolvedTypesMeta : 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;
@@ -756,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 ______, 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 _TContext, infer TEvent, infer _TAction, infer _TActor, 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;
+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 _____, 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 _TAction, infer _TActor, infer _TInput, infer _TOutput, 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;

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, InvokeConfig, MachineContext, Mapper, Observer, ErrorEvent, SingleOrArray, StateLike, StateValue, Subscribable, TransitionConfig, TransitionConfigTarget, TODO, AnyActorRef } from "./types.js";
+import type { ActorLogic, AnyEventObject, EventObject, MachineContext, Mapper, Observer, ErrorEvent, SingleOrArray, StateLike, StateValue, Subscribable, TransitionConfigTarget, AnyActorRef, AnyTransitionConfig, AnyInvokeConfig } 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[];
@@ -35,10 +35,10 @@ export declare function isArray(value: any): value is readonly any[];
 export declare function isObservable<T>(value: any): value is Subscribable<T>;
 export declare const uniqueId: () => string;
 export declare function isErrorEvent(event: AnyEventObject): event is ErrorEvent<any>;
-export declare function toTransitionConfigArray<TContext extends MachineContext, TEvent extends EventObject>(configLike: SingleOrArray<TransitionConfig<TContext, TEvent, TEvent, TODO> | TransitionConfigTarget>): Array<TransitionConfig<TContext, TEvent, TEvent, TODO>>;
+export declare function toTransitionConfigArray<TContext extends MachineContext, TEvent extends EventObject>(configLike: SingleOrArray<AnyTransitionConfig | TransitionConfigTarget>): Array<AnyTransitionConfig>;
 export declare function normalizeTarget<TContext extends MachineContext, TEvent extends EventObject>(target: SingleOrArray<string | StateNode<TContext, TEvent>> | undefined): ReadonlyArray<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, TODO, TODO> | string | AnyActorLogic, id: string): InvokeConfig<TContext, TEvent, TODO, TODO>;
+export declare function toInvokeConfig<TContext extends MachineContext, TEvent extends EventObject>(invocable: AnyInvokeConfig | string | AnyActorLogic, id: string): AnyInvokeConfig;
 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-e83129c5.cjs.js');
+var actors_dist_xstateActors = require('./actions-6a8cda73.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 const EMPTY_OBJECT = {};
@@ -270,7 +270,8 @@ class StateNode {
       try {
         guardPassed = !guard || actors_dist_xstateActors.evaluateGuard(guard, resolvedContext, event, state);
       } catch (err) {
-        throw new Error(`Unable to evaluate guard '${guard.type}' in transition for event '${eventType}' in state node '${this.id}':\n${err.message}`);
+        const guardType = typeof guard === 'string' ? guard : typeof guard === 'object' ? guard.type : undefined;
+        throw new Error(`Unable to evaluate guard ${guardType ? `'${guardType}' ` : ''}in transition for event '${eventType}' in state node '${this.id}':\n${err.message}`);
       }
       if (guardPassed) {
         actions.push(...candidate.actions);
@@ -362,8 +363,9 @@ class StateMachine {
     this.events = void 0;
     this.__TContext = void 0;
     this.__TEvent = void 0;
-    this.__TAction = void 0;
     this.__TActor = void 0;
+    this.__TAction = void 0;
+    this.__TGuard = void 0;
     this.__TInput = void 0;
     this.__TOutput = void 0;
     this.__TResolvedTypesMeta = void 0;

package/dist/xstate.development.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-0fcd4d15.development.cjs.js');
+var actors_dist_xstateActors = require('./actions-43f7d40e.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 const EMPTY_OBJECT = {};
@@ -270,7 +270,8 @@ class StateNode {
       try {
         guardPassed = !guard || actors_dist_xstateActors.evaluateGuard(guard, resolvedContext, event, state);
       } catch (err) {
-        throw new Error(`Unable to evaluate guard '${guard.type}' in transition for event '${eventType}' in state node '${this.id}':\n${err.message}`);
+        const guardType = typeof guard === 'string' ? guard : typeof guard === 'object' ? guard.type : undefined;
+        throw new Error(`Unable to evaluate guard ${guardType ? `'${guardType}' ` : ''}in transition for event '${eventType}' in state node '${this.id}':\n${err.message}`);
       }
       if (guardPassed) {
         actions.push(...candidate.actions);
@@ -362,8 +363,9 @@ class StateMachine {
     this.events = void 0;
     this.__TContext = void 0;
     this.__TEvent = void 0;
-    this.__TAction = void 0;
     this.__TActor = void 0;
+    this.__TAction = void 0;
+    this.__TGuard = void 0;
     this.__TInput = void 0;
     this.__TOutput = void 0;
     this.__TResolvedTypesMeta = void 0;

package/dist/xstate.development.esm.js

@@ -1,5 +1,5 @@
-import { S as STATE_DELIMITER, m as mapValues, t as toArray, f as formatTransitions, a as toTransitionConfigArray, b as formatTransition, N as NULL_EVENT, c as memo, e as evaluateGuard, d as flatten, g as createInvokeId, h as getDelayedTransitions, i as formatInitialTransition, j as getCandidates, k as toInvokeConfig, l as getConfiguration, n as getStateNodes, r as resolveStateValue, o as isInFinalState, p as State, q as isErrorEvent, s as cloneState, u as macrostep, v as transitionNode, w as getInitialConfiguration, x as resolveActionsAndContext, y as assign, z as createInitEvent, A as microstep, B as isAtomicStateNode, C as isStateId, D as getStateNodeByPath, E as getPersistedState, F as resolveReferencedActor, G as createActor, H as matchesState } from './actions-f6b5002d.development.esm.js';
-export { M as Actor, O as ActorStatus, a7 as ConstantPrefix, P as InterpreterStatus, a8 as SpecialTargets, p as State, a5 as and, y as assign, R as cancel, T as choose, G as createActor, Q as doneInvoke, K as forwardTo, a0 as fromCallback, a1 as fromEventObservable, $ as fromObservable, _ as fromPromise, a2 as fromTransition, n as getStateNodes, L as interpret, U as log, H as matchesState, a4 as not, a6 as or, Y as pathToStateValue, V as pure, W as raise, J as sendParent, I as sendTo, a3 as stateIn, X as stop, Z as toObserver } from './actions-f6b5002d.development.esm.js';
+import { S as STATE_DELIMITER, m as mapValues, t as toArray, f as formatTransitions, a as toTransitionConfigArray, b as formatTransition, N as NULL_EVENT, c as memo, e as evaluateGuard, d as flatten, g as createInvokeId, h as getDelayedTransitions, i as formatInitialTransition, j as getCandidates, k as toInvokeConfig, l as getConfiguration, n as getStateNodes, r as resolveStateValue, o as isInFinalState, p as State, q as isErrorEvent, s as cloneState, u as macrostep, v as transitionNode, w as getInitialConfiguration, x as resolveActionsAndContext, y as assign, z as createInitEvent, A as microstep, B as isAtomicStateNode, C as isStateId, D as getStateNodeByPath, E as getPersistedState, F as resolveReferencedActor, G as createActor, H as matchesState } from './actions-194e6dcc.development.esm.js';
+export { M as Actor, O as ActorStatus, a7 as ConstantPrefix, P as InterpreterStatus, a8 as SpecialTargets, p as State, a5 as and, y as assign, R as cancel, T as choose, G as createActor, Q as doneInvoke, K as forwardTo, a0 as fromCallback, a1 as fromEventObservable, $ as fromObservable, _ as fromPromise, a2 as fromTransition, n as getStateNodes, L as interpret, U as log, H as matchesState, a4 as not, a6 as or, Y as pathToStateValue, V as pure, W as raise, J as sendParent, I as sendTo, a3 as stateIn, X as stop, Z as toObserver } from './actions-194e6dcc.development.esm.js';
 import '../dev/dist/xstate-dev.development.esm.js';
 
 const EMPTY_OBJECT = {};
@@ -267,7 +267,8 @@ class StateNode {
       try {
         guardPassed = !guard || evaluateGuard(guard, resolvedContext, event, state);
       } catch (err) {
-        throw new Error(`Unable to evaluate guard '${guard.type}' in transition for event '${eventType}' in state node '${this.id}':\n${err.message}`);
+        const guardType = typeof guard === 'string' ? guard : typeof guard === 'object' ? guard.type : undefined;
+        throw new Error(`Unable to evaluate guard ${guardType ? `'${guardType}' ` : ''}in transition for event '${eventType}' in state node '${this.id}':\n${err.message}`);
       }
       if (guardPassed) {
         actions.push(...candidate.actions);
@@ -359,8 +360,9 @@ class StateMachine {
     this.events = void 0;
     this.__TContext = void 0;
     this.__TEvent = void 0;
-    this.__TAction = void 0;
     this.__TActor = void 0;
+    this.__TAction = void 0;
+    this.__TGuard = void 0;
     this.__TInput = void 0;
     this.__TOutput = void 0;
     this.__TResolvedTypesMeta = void 0;

package/dist/xstate.esm.js

@@ -1,5 +1,5 @@
-import { S as STATE_DELIMITER, m as mapValues, t as toArray, f as formatTransitions, a as toTransitionConfigArray, b as formatTransition, N as NULL_EVENT, c as memo, e as evaluateGuard, d as flatten, g as createInvokeId, h as getDelayedTransitions, i as formatInitialTransition, j as getCandidates, k as toInvokeConfig, l as getConfiguration, n as getStateNodes, r as resolveStateValue, o as isInFinalState, p as State, q as isErrorEvent, s as cloneState, u as macrostep, v as transitionNode, w as getInitialConfiguration, x as resolveActionsAndContext, y as assign, z as createInitEvent, A as microstep, B as isAtomicStateNode, C as isStateId, D as getStateNodeByPath, E as getPersistedState, F as resolveReferencedActor, G as createActor, H as matchesState } from './actions-bf7f6679.esm.js';
-export { M as Actor, O as ActorStatus, a7 as ConstantPrefix, P as InterpreterStatus, a8 as SpecialTargets, p as State, a5 as and, y as assign, R as cancel, T as choose, G as createActor, Q as doneInvoke, K as forwardTo, a0 as fromCallback, a1 as fromEventObservable, $ as fromObservable, _ as fromPromise, a2 as fromTransition, n as getStateNodes, L as interpret, U as log, H as matchesState, a4 as not, a6 as or, Y as pathToStateValue, V as pure, W as raise, J as sendParent, I as sendTo, a3 as stateIn, X as stop, Z as toObserver } from './actions-bf7f6679.esm.js';
+import { S as STATE_DELIMITER, m as mapValues, t as toArray, f as formatTransitions, a as toTransitionConfigArray, b as formatTransition, N as NULL_EVENT, c as memo, e as evaluateGuard, d as flatten, g as createInvokeId, h as getDelayedTransitions, i as formatInitialTransition, j as getCandidates, k as toInvokeConfig, l as getConfiguration, n as getStateNodes, r as resolveStateValue, o as isInFinalState, p as State, q as isErrorEvent, s as cloneState, u as macrostep, v as transitionNode, w as getInitialConfiguration, x as resolveActionsAndContext, y as assign, z as createInitEvent, A as microstep, B as isAtomicStateNode, C as isStateId, D as getStateNodeByPath, E as getPersistedState, F as resolveReferencedActor, G as createActor, H as matchesState } from './actions-7b182232.esm.js';
+export { M as Actor, O as ActorStatus, a7 as ConstantPrefix, P as InterpreterStatus, a8 as SpecialTargets, p as State, a5 as and, y as assign, R as cancel, T as choose, G as createActor, Q as doneInvoke, K as forwardTo, a0 as fromCallback, a1 as fromEventObservable, $ as fromObservable, _ as fromPromise, a2 as fromTransition, n as getStateNodes, L as interpret, U as log, H as matchesState, a4 as not, a6 as or, Y as pathToStateValue, V as pure, W as raise, J as sendParent, I as sendTo, a3 as stateIn, X as stop, Z as toObserver } from './actions-7b182232.esm.js';
 import '../dev/dist/xstate-dev.esm.js';
 
 const EMPTY_OBJECT = {};
@@ -267,7 +267,8 @@ class StateNode {
       try {
         guardPassed = !guard || evaluateGuard(guard, resolvedContext, event, state);
       } catch (err) {
-        throw new Error(`Unable to evaluate guard '${guard.type}' in transition for event '${eventType}' in state node '${this.id}':\n${err.message}`);
+        const guardType = typeof guard === 'string' ? guard : typeof guard === 'object' ? guard.type : undefined;
+        throw new Error(`Unable to evaluate guard ${guardType ? `'${guardType}' ` : ''}in transition for event '${eventType}' in state node '${this.id}':\n${err.message}`);
       }
       if (guardPassed) {
         actions.push(...candidate.actions);
@@ -359,8 +360,9 @@ class StateMachine {
     this.events = void 0;
     this.__TContext = void 0;
     this.__TEvent = void 0;
-    this.__TAction = void 0;
     this.__TActor = void 0;
+    this.__TAction = void 0;
+    this.__TGuard = void 0;
     this.__TInput = void 0;
     this.__TOutput = void 0;
     this.__TResolvedTypesMeta = void 0;