xstate 4.23.1 → 4.24.0

package/lib/model.d.ts

@@ -1,5 +1,5 @@
-import type { EventObject } from './types';
-import { Cast, EventFromEventCreators, FinalModelCreators, Model, ModelCreators, Prop } from './model.types';
-export declare function createModel<TContext, TEvent extends EventObject>(initialContext: TContext): Model<TContext, TEvent, void>;
-export declare function createModel<TContext, TModelCreators extends ModelCreators<TModelCreators>, TFinalModelCreators = FinalModelCreators<TModelCreators>>(initialContext: TContext, creators: TModelCreators): Model<TContext, Cast<EventFromEventCreators<Prop<TFinalModelCreators, 'events'>>, EventObject>, TFinalModelCreators>;
+import type { EventObject, BaseActionObject } from './types';
+import { Cast, UnionFromCreatorsReturnTypes, FinalModelCreators, Model, ModelCreators } from './model.types';
+export declare function createModel<TContext, TEvent extends EventObject, TAction extends BaseActionObject = BaseActionObject>(initialContext: TContext): Model<TContext, TEvent, TAction, void>;
+export declare function createModel<TContext, TModelCreators extends ModelCreators<TModelCreators>, TFinalModelCreators = FinalModelCreators<TModelCreators>, TComputedEvent = 'events' extends keyof TFinalModelCreators ? UnionFromCreatorsReturnTypes<TFinalModelCreators['events']> : never, TComputedAction = 'actions' extends keyof TModelCreators ? 'actions' extends keyof TFinalModelCreators ? UnionFromCreatorsReturnTypes<TFinalModelCreators['actions']> : any : any>(initialContext: TContext, creators: TModelCreators): Model<TContext, Cast<TComputedEvent, EventObject>, Cast<TComputedAction, BaseActionObject>, TFinalModelCreators>;
 //# sourceMappingURL=model.d.ts.map

package/lib/model.js

@@ -38,6 +38,7 @@ var Machine_1 = require("./Machine");
 var utils_1 = require("./utils");
 function createModel(initialContext, creators) {
     var eventCreators = creators === null || creators === void 0 ? void 0 : creators.events;
+    var actionCreators = creators === null || creators === void 0 ? void 0 : creators.actions;
     var model = {
         initialContext: initialContext,
         assign: actions_1.assign,
@@ -50,6 +51,15 @@ function createModel(initialContext, creators) {
                 return (__assign(__assign({}, fn.apply(void 0, __spreadArray([], __read(args)))), { type: eventType }));
             }; })
             : undefined),
+        actions: actionCreators
+            ? utils_1.mapValues(actionCreators, function (fn, actionType) { return function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return (__assign(__assign({}, fn.apply(void 0, __spreadArray([], __read(args)))), { type: actionType }));
+            }; })
+            : undefined,
         reset: function () { return actions_1.assign(initialContext); },
         createMachine: function (config, implementations) {
             return Machine_1.createMachine('context' in config ? config : __assign(__assign({}, config), { context: initialContext }), implementations);

package/lib/model.types.d.ts

@@ -1,37 +1,53 @@
-import { EventObject, Assigner, ExtractEvent, PropertyAssigner, AssignAction, MachineConfig, MachineOptions, StateMachine } from './types';
+import { EventObject, Assigner, ExtractEvent, PropertyAssigner, AssignAction, MachineConfig, MachineOptions, StateMachine, BaseActionObject } from './types';
 export declare type AnyFunction = (...args: any[]) => any;
-export declare type Cast<A1 extends any, A2 extends any> = A1 extends A2 ? A1 : A2;
+export declare type IsNever<T> = [T] extends [never] ? true : false;
+export declare type Cast<T extends any, TCastType extends any> = T extends TCastType ? T : TCastType;
 export declare type Compute<A extends any> = {
     [K in keyof A]: A[K];
 } & unknown;
 export declare type Prop<T, K> = K extends keyof T ? T[K] : never;
-export interface Model<TContext, TEvent extends EventObject, TModelCreators = void> {
+export interface Model<TContext, TEvent extends EventObject, TAction extends BaseActionObject = BaseActionObject, TModelCreators = void> {
     initialContext: TContext;
     assign: <TEventType extends TEvent['type'] = TEvent['type']>(assigner: Assigner<TContext, ExtractEvent<TEvent, TEventType>> | PropertyAssigner<TContext, ExtractEvent<TEvent, TEventType>>, eventType?: TEventType) => AssignAction<TContext, ExtractEvent<TEvent, TEventType>>;
     events: Prop<TModelCreators, 'events'>;
+    actions: Prop<TModelCreators, 'actions'>;
     reset: () => AssignAction<TContext, any>;
-    createMachine: (config: MachineConfig<TContext, any, TEvent>, implementations?: Partial<MachineOptions<TContext, TEvent>>) => StateMachine<TContext, any, TEvent>;
+    createMachine: (config: MachineConfig<TContext, any, TEvent, TAction>, implementations?: Partial<MachineOptions<TContext, TEvent, TAction>>) => StateMachine<TContext, any, TEvent>;
 }
-export declare type ModelContextFrom<TModel extends Model<any, any, any>> = TModel extends Model<infer TContext, any, any> ? TContext : never;
-export declare type ModelEventsFrom<TModel extends Model<any, any, any>> = TModel extends Model<any, infer TEvent, any> ? TEvent : never;
+export declare type ModelContextFrom<TModel extends Model<any, any, any, any>> = TModel extends Model<infer TContext, any, any, any> ? TContext : never;
+export declare type ModelEventsFrom<TModel extends Model<any, any, any, any> | undefined> = TModel extends Model<any, infer TEvent, any, any> ? TEvent : EventObject;
+export declare type ModelActionsFrom<TModel extends Model<any, any, any, any>> = TModel extends Model<any, any, infer TAction, any> ? TAction : never;
 export declare type EventCreator<Self extends AnyFunction, Return = ReturnType<Self>> = Return extends object ? Return extends {
     type: any;
 } ? "An event creator can't return an object with a type property" : Self : 'An event creator must return an object';
 export declare type EventCreators<Self> = {
     [K in keyof Self]: Self[K] extends AnyFunction ? EventCreator<Self[K]> : 'An event creator must be a function';
 };
-export declare type ModelCreators<Self> = {
-    events: EventCreators<Prop<Self, 'events'>>;
-};
 export declare type FinalEventCreators<Self> = {
     [K in keyof Self]: Self[K] extends AnyFunction ? (...args: Parameters<Self[K]>) => Compute<ReturnType<Self[K]> & {
         type: K;
     }> : never;
 };
-export declare type FinalModelCreators<Self> = {
-    events: FinalEventCreators<Prop<Self, 'events'>>;
+export declare type ActionCreator<Self extends AnyFunction, Return = ReturnType<Self>> = Return extends object ? Return extends {
+    type: any;
+} ? "An action creator can't return an object with a type property" : Self : 'An action creator must return an object';
+export declare type ActionCreators<Self> = {
+    [K in keyof Self]: Self[K] extends AnyFunction ? ActionCreator<Self[K]> : 'An action creator must be a function';
+};
+export declare type FinalActionCreators<Self> = {
+    [K in keyof Self]: Self[K] extends AnyFunction ? (...args: Parameters<Self[K]>) => Compute<ReturnType<Self[K]> & {
+        type: K;
+    }> : never;
 };
-export declare type EventFromEventCreators<EventCreators> = {
-    [K in keyof EventCreators]: EventCreators[K] extends AnyFunction ? ReturnType<EventCreators[K]> : never;
-}[keyof EventCreators];
+export interface ModelCreators<Self> {
+    events?: EventCreators<Prop<Self, 'events'>>;
+    actions?: ActionCreators<Prop<Self, 'actions'>>;
+}
+export interface FinalModelCreators<Self> {
+    events: FinalEventCreators<Prop<Self, 'events'>>;
+    actions: FinalActionCreators<Prop<Self, 'actions'>>;
+}
+export declare type UnionFromCreatorsReturnTypes<TCreators> = {
+    [K in keyof TCreators]: TCreators[K] extends AnyFunction ? ReturnType<TCreators[K]> : never;
+}[keyof TCreators];
 //# sourceMappingURL=model.types.d.ts.map

package/lib/types.d.ts

@@ -2,6 +2,8 @@ import { StateNode } from './StateNode';
 import { State } from './State';
 import { Interpreter, Clock } from './interpreter';
 import { Model } from './model.types';
+declare type AnyFunction = (...args: any[]) => any;
+declare type ReturnTypeOrValue<T> = T extends AnyFunction ? ReturnType<T> : T;
 export declare type EventType = string;
 export declare type ActionType = string;
 export declare type MetaObject = Record<string, any>;
@@ -17,20 +19,22 @@ export interface EventObject {
 export interface AnyEventObject extends EventObject {
     [key: string]: any;
 }
-/**
- * The full definition of an action, with a string `type` and an
- * `exec` implementation function.
- */
-export interface ActionObject<TContext, TEvent extends EventObject> {
+export interface BaseActionObject {
     /**
      * The type of action that is executed.
      */
     type: string;
+    [other: string]: any;
+}
+/**
+ * The full definition of an action, with a string `type` and an
+ * `exec` implementation function.
+ */
+export interface ActionObject<TContext, TEvent extends EventObject> extends BaseActionObject {
     /**
      * The implementation for executing the action.
      */
     exec?: ActionFunction<TContext, TEvent>;
-    [other: string]: any;
 }
 export declare type DefaultContext = Record<string, any> | undefined;
 export declare type EventData = Record<string, any> & {
@@ -40,8 +44,8 @@ export declare type EventData = Record<string, any> & {
  * The specified string event types or the specified event objects.
  */
 export declare type Event<TEvent extends EventObject> = TEvent['type'] | TEvent;
-export interface ActionMeta<TContext, TEvent extends EventObject> extends StateMeta<TContext, TEvent> {
-    action: ActionObject<TContext, TEvent>;
+export interface ActionMeta<TContext, TEvent extends EventObject, TAction extends ActionObject<TContext, TEvent> = ActionObject<TContext, TEvent>> extends StateMeta<TContext, TEvent> {
+    action: TAction;
     _event: SCXML.Event<TEvent>;
 }
 export interface AssignMeta<TContext, TEvent extends EventObject> {
@@ -49,12 +53,22 @@ export interface AssignMeta<TContext, TEvent extends EventObject> {
     action: AssignAction<TContext, TEvent>;
     _event: SCXML.Event<TEvent>;
 }
-export declare type ActionFunction<TContext, TEvent extends EventObject> = (context: TContext, event: TEvent, meta: ActionMeta<TContext, TEvent>) => void;
+export declare type ActionFunction<TContext, TEvent extends EventObject, TAction extends ActionObject<TContext, TEvent> = ActionObject<TContext, TEvent>> = (context: TContext, event: TEvent, meta: ActionMeta<TContext, TEvent, TAction>) => void;
 export interface ChooseConditon<TContext, TEvent extends EventObject> {
     cond?: Condition<TContext, TEvent>;
     actions: Actions<TContext, TEvent>;
 }
 export declare type Action<TContext, TEvent extends EventObject> = ActionType | ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent>;
+/**
+ * Extracts action objects that have no extra properties.
+ */
+declare type SimpleActionsOf<T extends BaseActionObject> = ActionObject<any, any> extends T ? T : ExtractWithSimpleSupport<T>;
+/**
+ * Events that do not require payload
+ */
+export declare type SimpleEventsOf<TEvent extends EventObject> = ExtractWithSimpleSupport<TEvent>;
+export declare type BaseAction<TContext, TEvent extends EventObject, TAction extends BaseActionObject> = SimpleActionsOf<TAction>['type'] | TAction | RaiseAction<any> | SendAction<TContext, TEvent, any> | AssignAction<TContext, TEvent> | LogAction<TContext, TEvent> | CancelAction | StopAction<TContext, TEvent> | ChooseAction<TContext, TEvent> | ActionFunction<TContext, TEvent>;
+export declare type BaseActions<TContext, TEvent extends EventObject, TAction extends BaseActionObject> = SingleOrArray<BaseAction<TContext, TEvent, TAction>>;
 export declare type Actions<TContext, TEvent extends EventObject> = SingleOrArray<Action<TContext, TEvent>>;
 export declare type StateKey = string | State<any>;
 export interface StateValueMap {
@@ -122,13 +136,17 @@ declare type ExcludeType<A> = {
 declare type ExtractExtraParameters<A, T> = A extends {
     type: T;
 } ? ExcludeType<A> : never;
-declare type ExtractSimple<A> = A extends any ? {} extends ExcludeType<A> ? A : never : never;
+declare type ExtractWithSimpleSupport<T extends {
+    type: string;
+}> = T extends any ? {
+    type: T['type'];
+} extends T ? T : never : never;
 declare type NeverIfEmpty<T> = {} extends T ? never : T;
 export interface PayloadSender<TEvent extends EventObject> {
     /**
      * Send an event object or just the event type, if the event has no other payload
      */
-    (event: TEvent | ExtractSimple<TEvent>['type']): void;
+    (event: TEvent | ExtractWithSimpleSupport<TEvent>['type']): void;
     /**
      * Send an event type and its payload
      */
@@ -194,8 +212,8 @@ export declare type SingleOrArray<T> = T[] | T;
 export declare type StateNodesConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject> = {
     [K in keyof TStateSchema['states']]: StateNode<TContext, TStateSchema['states'][K], TEvent>;
 };
-export declare type StatesConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject> = {
-    [K in keyof TStateSchema['states']]: StateNodeConfig<TContext, TStateSchema['states'][K], TEvent>;
+export declare type StatesConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject, TAction extends BaseActionObject = BaseActionObject> = {
+    [K in keyof TStateSchema['states']]: StateNodeConfig<TContext, TStateSchema['states'][K], TEvent, TAction>;
 };
 export declare type StatesDefinition<TContext, TStateSchema extends StateSchema, TEvent extends EventObject> = {
     [K in keyof TStateSchema['states']]: StateNodeDefinition<TContext, TStateSchema['states'][K], TEvent>;
@@ -261,7 +279,7 @@ export interface InvokeConfig<TContext, TEvent extends EventObject> {
      */
     onError?: string | SingleOrArray<TransitionConfig<TContext, DoneInvokeEvent<any>>>;
 }
-export interface StateNodeConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject> {
+export interface StateNodeConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject, TAction extends BaseActionObject = BaseActionObject> {
     /**
      * The relative key of the state node, which represents its location in the overall state value.
      * This is automatically determined by the configuration shape via the key where it was defined.
@@ -285,12 +303,6 @@ export interface StateNodeConfig<TContext, TStateSchema extends StateSchema, TEv
      *  - `'final'` - final state node
      */
     type?: 'atomic' | 'compound' | 'parallel' | 'final' | 'history';
-    /**
-     * The initial context (extended state) of the machine.
-     *
-     * Can be an object or a function that returns an object.
-     */
-    context?: TContext | (() => TContext);
     /**
      * Indicates whether the state node is a history state node, and what
      * type of history:
@@ -300,7 +312,7 @@ export interface StateNodeConfig<TContext, TStateSchema extends StateSchema, TEv
     /**
      * The mapping of state node keys to their state node configurations (recursive).
      */
-    states?: StatesConfig<TContext, TStateSchema, TEvent> | undefined;
+    states?: StatesConfig<TContext, TStateSchema, TEvent, TAction> | undefined;
     /**
      * The services to invoke upon entering this state node. These services will be stopped upon exiting this state node.
      */
@@ -318,7 +330,7 @@ export interface StateNodeConfig<TContext, TStateSchema extends StateSchema, TEv
     /**
      * The action(s) to be executed upon entering the state node.
      */
-    entry?: Actions<TContext, TEvent>;
+    entry?: BaseActions<TContext, TEvent, TAction>;
     /**
      * The action(s) to be executed upon exiting the state node.
      *
@@ -328,7 +340,7 @@ export interface StateNodeConfig<TContext, TStateSchema extends StateSchema, TEv
     /**
      * The action(s) to be executed upon exiting the state node.
      */
-    exit?: Actions<TContext, TEvent>;
+    exit?: BaseActions<TContext, TEvent, TAction>;
     /**
      * The potential transition(s) to be taken upon reaching a final child state node.
      *
@@ -348,6 +360,8 @@ export interface StateNodeConfig<TContext, TStateSchema extends StateSchema, TEv
     /**
      * The activities to be started upon entering the state node,
      * and stopped upon exiting the state node.
+     *
+     * @deprecated Use `invoke` instead.
      */
     activities?: SingleOrArray<Activity<TContext, TEvent>>;
     /**
@@ -406,6 +420,9 @@ export interface StateNodeDefinition<TContext, TStateSchema extends StateSchema,
     transitions: Array<TransitionDefinition<TContext, TEvent>>;
     entry: Array<ActionObject<TContext, TEvent>>;
     exit: Array<ActionObject<TContext, TEvent>>;
+    /**
+     * @deprecated
+     */
     activities: Array<ActivityDefinition<TContext, TEvent>>;
     meta: any;
     order: number;
@@ -432,13 +449,20 @@ export interface FinalStateNodeConfig<TContext, TEvent extends EventObject> exte
     data?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
 }
 export declare type SimpleOrStateNodeConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject> = AtomicStateNodeConfig<TContext, TEvent> | StateNodeConfig<TContext, TStateSchema, TEvent>;
-export declare type ActionFunctionMap<TContext, TEvent extends EventObject> = Record<string, ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent>>;
+export declare type ActionFunctionMap<TContext, TEvent extends EventObject, TAction extends ActionObject<TContext, TEvent> = ActionObject<TContext, TEvent>> = {
+    [K in TAction['type']]?: ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent, TAction extends {
+        type: K;
+    } ? TAction : never>;
+};
 export declare type DelayFunctionMap<TContext, TEvent extends EventObject> = Record<string, DelayConfig<TContext, TEvent>>;
 export declare type ServiceConfig<TContext, TEvent extends EventObject = AnyEventObject> = string | StateMachine<any, any, any> | InvokeCreator<TContext, TEvent>;
 export declare type DelayConfig<TContext, TEvent extends EventObject> = number | DelayExpr<TContext, TEvent>;
-export interface MachineOptions<TContext, TEvent extends EventObject> {
+export interface MachineOptions<TContext, TEvent extends EventObject, TAction extends ActionObject<TContext, TEvent> = ActionObject<TContext, TEvent>> {
     guards: Record<string, ConditionPredicate<TContext, TEvent>>;
-    actions: ActionFunctionMap<TContext, TEvent>;
+    actions: ActionFunctionMap<TContext, TEvent, TAction>;
+    /**
+     * @deprecated Use `services` instead.
+     */
     activities: Record<string, ActivityConfig<TContext, TEvent>>;
     services: Record<string, ServiceConfig<TContext, TEvent>>;
     delays: DelayFunctionMap<TContext, TEvent>;
@@ -451,7 +475,7 @@ export interface MachineOptions<TContext, TEvent extends EventObject> {
      */
     _key?: string;
 }
-export interface MachineConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject> extends StateNodeConfig<TContext, TStateSchema, TEvent> {
+export interface MachineConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject, TAction extends BaseActionObject = ActionObject<TContext, TEvent>> extends StateNodeConfig<TContext, TStateSchema, TEvent, TAction> {
     /**
      * The initial context (extended state)
      */
@@ -495,13 +519,13 @@ export interface HistoryStateNode<TContext> extends StateNode<TContext> {
 export interface StateMachine<TContext, TStateSchema extends StateSchema, TEvent extends EventObject, TTypestate extends Typestate<TContext> = {
     value: any;
     context: TContext;
-}> extends StateNode<TContext, TStateSchema, TEvent, TTypestate> {
+}, _TAction extends ActionObject<TContext, TEvent> = ActionObject<TContext, TEvent>> extends StateNode<TContext, TStateSchema, TEvent, TTypestate> {
     id: string;
     states: StateNode<TContext, TStateSchema, TEvent>['states'];
-    withConfig(options: Partial<MachineOptions<TContext, TEvent>>, context?: TContext): StateMachine<TContext, TStateSchema, TEvent, TTypestate>;
-    withContext(context: TContext): StateMachine<TContext, TStateSchema, TEvent, TTypestate>;
+    withConfig(options: Partial<MachineOptions<TContext, TEvent>>, context?: TContext | (() => TContext)): StateMachine<TContext, TStateSchema, TEvent, TTypestate>;
+    withContext(context: TContext | (() => TContext)): StateMachine<TContext, TStateSchema, TEvent, TTypestate>;
 }
-export declare type StateFrom<TMachine extends StateMachine<any, any, any>> = ReturnType<TMachine['transition']>;
+export declare type StateFrom<T extends StateMachine<any, any, any, any> | ((...args: any[]) => StateMachine<any, any, any, any>)> = T extends StateMachine<any, any, any> ? ReturnType<T['transition']> : T extends (...args: any[]) => StateMachine<any, any, any> ? ReturnType<ReturnType<T>['transition']> : never;
 export interface ActionMap<TContext, TEvent extends EventObject> {
     onEntry: Array<Action<TContext, TEvent>>;
     actions: Array<Action<TContext, TEvent>>;
@@ -768,6 +792,9 @@ export interface StateConfig<TContext, TEvent extends EventObject> {
     historyValue?: HistoryValue | undefined;
     history?: State<TContext, TEvent>;
     actions?: Array<ActionObject<TContext, TEvent>>;
+    /**
+     * @deprecated
+     */
     activities?: ActivityMap;
     meta?: any;
     events?: TEvent[];
@@ -776,6 +803,7 @@ export interface StateConfig<TContext, TEvent extends EventObject> {
     children: Record<string, ActorRef<any>>;
     done?: boolean;
     tags?: Set<string>;
+    machine?: StateMachine<TContext, any, TEvent, any>;
 }
 export interface StateSchema<TC = any> {
     meta?: any;
@@ -904,14 +932,15 @@ export interface ActorRef<TEvent extends EventObject, TEmitted = any> extends Su
  * @deprecated Use `ActorRef` instead.
  */
 export declare type SpawnedActorRef<TEvent extends EventObject, TEmitted = any> = ActorRef<TEvent, TEmitted>;
-export declare type ActorRefFrom<T extends StateMachine<any, any, any> | Promise<any> | Behavior<any>> = T extends StateMachine<infer TContext, any, infer TEvent, infer TTypestate> ? ActorRef<TEvent, State<TContext, TEvent, any, TTypestate>> & {
+export declare type ActorRefWithDeprecatedState<TContext, TEvent extends EventObject, TTypestate extends Typestate<TContext>> = ActorRef<TEvent, State<TContext, TEvent, any, TTypestate>> & {
     /**
      * @deprecated Use `.getSnapshot()` instead.
      */
     state: State<TContext, TEvent, any, TTypestate>;
-} : T extends Promise<infer U> ? ActorRef<never, U> : T extends Behavior<infer TEvent1, infer TEmitted> ? ActorRef<TEvent1, TEmitted> : never;
+};
+export declare type ActorRefFrom<T> = T extends StateMachine<infer TContext, any, infer TEvent, infer TTypestate> ? ActorRefWithDeprecatedState<TContext, TEvent, TTypestate> : T extends (...args: any[]) => StateMachine<infer TContext, any, infer TEvent, infer TTypestate> ? ActorRefWithDeprecatedState<TContext, TEvent, TTypestate> : T extends Promise<infer U> ? ActorRef<never, U> : T extends Behavior<infer TEvent1, infer TEmitted> ? ActorRef<TEvent1, TEmitted> : T extends (...args: any[]) => Behavior<infer TEvent1, infer TEmitted> ? ActorRef<TEvent1, TEmitted> : never;
 export declare type AnyInterpreter = Interpreter<any, any, any, any>;
-export declare type InterpreterFrom<T extends StateMachine<any, any, any, any>> = T extends StateMachine<infer TContext, infer TStateSchema, infer TEvent, infer TTypestate> ? Interpreter<TContext, TStateSchema, TEvent, TTypestate> : never;
+export declare type InterpreterFrom<T extends StateMachine<any, any, any, any> | ((...args: any[]) => StateMachine<any, any, any, any>)> = T extends StateMachine<infer TContext, infer TStateSchema, infer TEvent, infer TTypestate> ? Interpreter<TContext, TStateSchema, TEvent, TTypestate> : T extends (...args: any[]) => StateMachine<infer TContext, infer TStateSchema, infer TEvent, infer TTypestate> ? Interpreter<TContext, TStateSchema, TEvent, TTypestate> : never;
 export interface ActorContext<TEvent extends EventObject, TEmitted> {
     parent?: ActorRef<any, any>;
     self: ActorRef<TEvent, TEmitted>;
@@ -923,7 +952,8 @@ export interface Behavior<TEvent extends EventObject, TEmitted = any> {
     initialState: TEmitted;
     start?: (actorCtx: ActorContext<TEvent, TEmitted>) => TEmitted;
 }
-export declare type EventFrom<T> = T extends StateMachine<any, any, infer TEvent, any> ? TEvent : T extends Model<any, infer TEvent, any> ? TEvent : T extends State<any, infer TEvent, any, any> ? TEvent : T extends Interpreter<any, any, infer TEvent, any> ? TEvent : never;
-export declare type ContextFrom<T> = T extends StateMachine<infer TContext, any, any, any> ? TContext : T extends Model<infer TContext, any, any> ? TContext : T extends State<infer TContext, any, any, any> ? TContext : T extends Interpreter<infer TContext, any, any, any> ? TContext : never;
+export declare type EmittedFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends ActorRef<infer _, infer TEmitted> ? TEmitted : R extends Behavior<infer _, infer TEmitted> ? TEmitted : R extends ActorContext<infer _, infer TEmitted> ? TEmitted : never : never;
+export declare type EventFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer _, infer __, infer TEvent, infer ____> ? TEvent : R extends Model<infer _, infer TEvent, infer ___, infer ____> ? TEvent : R extends State<infer _, infer TEvent, infer ___, infer ____> ? TEvent : R extends Interpreter<infer _, infer __, infer TEvent, infer ____> ? TEvent : never : never;
+export declare type ContextFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer _, infer __, infer ___> ? TContext : R extends Model<infer TContext, infer _, infer __, infer ___> ? TContext : R extends State<infer TContext, infer _, infer __, infer ___> ? TContext : R extends Interpreter<infer TContext, infer _, infer __, infer ___> ? TContext : never : never;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/lib/utils.js

@@ -549,7 +549,7 @@ function evaluateGuard(machine, guard, context, _event, state) {
   }; // TODO: do not hardcode!
 
   if (guard.type === constants.DEFAULT_GUARD_TYPE) {
-    return guard.predicate(context, _event.data, guardMeta);
+    return ((guards === null || guards === void 0 ? void 0 : guards[guard.name]) || guard.predicate)(context, _event.data, guardMeta);
   }
 
   var condFn = guards[guard.type];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xstate",
-  "version": "4.23.1",
+  "version": "4.24.0",
   "description": "Finite State Machines and Statecharts for the Modern Web.",
   "main": "lib/index.js",
   "module": "es/index.js",