xstate 5.0.0-beta.15 → 5.0.0-beta.16

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

@@ -1,7 +1,7 @@
 import { State } from "./State.js";
 import { StateNode } from "./StateNode.js";
 import type { AreAllImplementationsAssumedToBeProvided, MarkAllImplementationsAsProvided, ResolveTypegenMeta, TypegenDisabled } from "./typegenTypes.js";
-import type { ActorContext, ActorLogic, ActorMap, EventObject, InternalMachineImplementations, MachineConfig, MachineContext, MachineImplementationsSimplified, MachineTypes, NoInfer, StateConfig, StateMachineDefinition, StateValue, TransitionDefinition, PersistedMachineState, ParameterizedObject, AnyActorContext } from "./types.js";
+import type { ActorContext, ActorLogic, ActorMap, EventObject, InternalMachineImplementations, MachineConfig, MachineContext, MachineImplementationsSimplified, MachineTypes, NoInfer, StateConfig, StateMachineDefinition, StateValue, TransitionDefinition, PersistedMachineState, ParameterizedObject, AnyActorContext, Equals } from "./types.js";
 export declare const STATE_IDENTIFIER = "#";
 export declare const WILDCARD = "*";
 export declare class StateMachine<TContext extends MachineContext, TEvent extends EventObject = EventObject, TAction extends ParameterizedObject = ParameterizedObject, TActorMap extends ActorMap = ActorMap, TResolvedTypesMeta = ResolveTypegenMeta<TypegenDisabled, NoInfer<TEvent>, TAction, TActorMap>> implements ActorLogic<TEvent, State<TContext, TEvent, TResolvedTypesMeta>, State<TContext, TEvent, TResolvedTypesMeta>, PersistedMachineState<State<TContext, TEvent, TResolvedTypesMeta>>> {
@@ -9,8 +9,6 @@ export declare class StateMachine<TContext extends MachineContext, TEvent extend
      * The raw config used to create the machine.
      */
     config: MachineConfig<TContext, TEvent, any, any, any>;
-    getContext(input?: any): TContext;
-    private getContextAndActions;
     /**
      * The machine's own version.
      */
@@ -46,7 +44,7 @@ export declare class StateMachine<TContext extends MachineContext, TEvent extend
      * @param state The state to resolve
      */
     resolveState(state: State<TContext, TEvent, TResolvedTypesMeta>): typeof state;
-    resolveStateValue(stateValue: StateValue): State<TContext, TEvent, TResolvedTypesMeta>;
+    resolveStateValue(stateValue: StateValue, ...[context]: Equals<TContext, MachineContext> extends true ? [] : [TContext]): State<TContext, TEvent, TResolvedTypesMeta>;
     /**
      * Determines the next state given the current `state` and received `event`.
      * Calculates a full macrostep from all microsteps.

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

@@ -1,7 +1,7 @@
 import { ActionTypes } from "./types.js";
 export declare const stop = ActionTypes.Stop;
 export declare const raise = ActionTypes.Raise;
-export declare const send = ActionTypes.Send;
+export declare const sendTo = ActionTypes.SendTo;
 export declare const cancel = ActionTypes.Cancel;
 export declare const assign = ActionTypes.Assign;
 export declare const after = ActionTypes.After;

package/dist/declarations/src/actions/assign.d.ts

@@ -1,7 +1,7 @@
-import type { EventObject, Assigner, PropertyAssigner, MachineContext, DynamicAssignAction, LowInfer } from "../types.js";
+import type { Assigner, DynamicAssignAction, EventObject, LowInfer, MachineContext, PropertyAssigner } from "../types.js";
 /**
  * Updates the current context of the machine.
  *
  * @param assignment An object that represents the partial context to update.
  */
-export declare function assign<TContext extends MachineContext, TExpressionEvent extends EventObject = EventObject, TEvent extends EventObject = TExpressionEvent>(assignment: Assigner<LowInfer<TContext>, TExpressionEvent, TEvent> | PropertyAssigner<LowInfer<TContext>, TExpressionEvent, TEvent>): DynamicAssignAction<TContext, TExpressionEvent, TEvent>;
+export declare function assign<TContext extends MachineContext, TExpressionEvent extends EventObject = EventObject, TEvent extends EventObject = TExpressionEvent>(assignment: Assigner<LowInfer<TContext>, TExpressionEvent> | PropertyAssigner<LowInfer<TContext>, TExpressionEvent>): DynamicAssignAction<TContext, TExpressionEvent, TEvent>;

package/dist/declarations/src/actions/cancel.d.ts

@@ -1,4 +1,4 @@
-import { EventObject, ExprWithMeta, MachineContext } from "../types.js";
+import { EventObject, MachineContext, UnifiedArg } from "../types.js";
 import { BaseDynamicActionObject, CancelActionObject, DynamicCancelActionObject } from "../index.js";
 /**
  * Cancels an in-flight `send(...)` action. A canceled sent action will not
@@ -7,4 +7,4 @@ import { BaseDynamicActionObject, CancelActionObject, DynamicCancelActionObject
  *
  * @param sendId The `id` of the `send(...)` action to cancel.
  */
-export declare function cancel<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject>(sendId: string | ExprWithMeta<TContext, TExpressionEvent, string>): BaseDynamicActionObject<TContext, TExpressionEvent, TEvent, CancelActionObject, DynamicCancelActionObject<TContext, TExpressionEvent>['params']>;
+export declare function cancel<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject>(sendId: string | ((args: UnifiedArg<TContext, TExpressionEvent>) => string)): BaseDynamicActionObject<TContext, TExpressionEvent, TEvent, CancelActionObject, DynamicCancelActionObject<TContext, TExpressionEvent>['params']>;

package/dist/declarations/src/actions/send.d.ts

@@ -1,32 +1,30 @@
-import { EventObject, SendActionParams, SendExpr, AnyEventObject, MachineContext } from "../types.js";
-import { AnyActorRef, BaseDynamicActionObject, Cast, EventFrom, ExprWithMeta, InferEvent, SendActionObject, SendActionOptions } from "../index.js";
+import { EventObject, SendToActionParams, SendExpr, AnyEventObject, MachineContext } from "../types.js";
+import { ActorRef, AnyActorRef, BaseDynamicActionObject, Cast, EventFrom, InferEvent, SendToActionObject, SendToActionOptions, UnifiedArg } from "../index.js";
 /**
- * Sends an event. This returns an action that will be read by an interpreter to
- * send the event in the next step, after the current step is finished executing.
- *
- * @deprecated Use the `sendTo(...)` action creator instead.
+ * Sends an event to an actor.
  *
- * @param eventOrExpr The event to send.
- * @param options Options to pass into the send event:
+ * @param actor The `ActorRef` to send the event to.
+ * @param event The event to send, or an expression that evaluates to the event to send
+ * @param options Send action options
  *  - `id` - The unique send event identifier (used with `cancel()`).
  *  - `delay` - The number of milliseconds to delay the sending of the event.
- *  - `to` - The target of this event (by default, the machine the event was sent from).
  */
-export declare function send<TContext extends MachineContext, TEvent extends EventObject, TSentEvent extends EventObject = AnyEventObject>(eventOrExpr: TSentEvent | SendExpr<TContext, TEvent, AnyEventObject>, options?: SendActionOptions<TContext, TEvent>): BaseDynamicActionObject<TContext, TEvent, TEvent, SendActionObject<AnyEventObject>, SendActionParams<TContext, TEvent>>;
+export declare function sendTo<TContext extends MachineContext, TEvent extends EventObject, TActor extends AnyActorRef>(actor: TActor | string | ((args: UnifiedArg<TContext, TEvent>) => TActor | string), eventOrExpr: EventFrom<TActor> | SendExpr<TContext, TEvent, InferEvent<Cast<EventFrom<TActor>, EventObject>>>, options?: SendToActionOptions<TContext, TEvent>): BaseDynamicActionObject<TContext, TEvent, TEvent, SendToActionObject<AnyEventObject>, SendToActionParams<TContext, TEvent>>;
 /**
  * Sends an event to this machine's parent.
  *
  * @param event The event to send to the parent machine.
  * @param options Options to pass into the send event.
  */
-export declare function sendParent<TContext extends MachineContext, TEvent extends EventObject, TSentEvent extends EventObject = AnyEventObject>(event: TSentEvent | SendExpr<TContext, TEvent, TSentEvent>, options?: SendActionOptions<TContext, TEvent>): BaseDynamicActionObject<TContext, TEvent, TEvent, SendActionObject<AnyEventObject>, SendActionParams<TContext, TEvent, EventObject>>;
+export declare function sendParent<TContext extends MachineContext, TEvent extends EventObject, TSentEvent extends EventObject = AnyEventObject>(event: TSentEvent | SendExpr<TContext, TEvent, TSentEvent>, options?: SendToActionOptions<TContext, TEvent>): BaseDynamicActionObject<TContext, TEvent, TEvent, SendToActionObject<AnyEventObject>, SendToActionParams<TContext, TEvent, EventObject>>;
+type Target<TContext extends MachineContext, TEvent extends EventObject> = string | ActorRef<any, any> | ((args: UnifiedArg<TContext, TEvent>) => string | ActorRef<any, any>);
 /**
  * Forwards (sends) an event to a specified service.
  *
  * @param target The target service to forward the event to.
  * @param options Options to pass into the send action creator.
  */
-export declare function forwardTo<TContext extends MachineContext, TEvent extends EventObject>(target: Required<SendActionParams<TContext, TEvent>>['to'], options?: SendActionOptions<TContext, TEvent>): BaseDynamicActionObject<TContext, TEvent, TEvent, SendActionObject<AnyEventObject>, SendActionParams<TContext, TEvent, EventObject>>;
+export declare function forwardTo<TContext extends MachineContext, TEvent extends EventObject>(target: Target<TContext, TEvent>, options?: SendToActionOptions<TContext, TEvent>): BaseDynamicActionObject<TContext, TEvent, TEvent, SendToActionObject<AnyEventObject>, SendToActionParams<TContext, TEvent, EventObject>>;
 /**
  * Escalates an error by sending it as an event to this machine's parent.
  *
@@ -34,13 +32,5 @@ export declare function forwardTo<TContext extends MachineContext, TEvent extend
  * takes in the `context`, `event`, and `meta`, and returns the error data to send.
  * @param options Options to pass into the send action creator.
  */
-export declare function escalate<TContext extends MachineContext, TEvent extends EventObject, TErrorData = any>(errorData: TErrorData | ExprWithMeta<TContext, TEvent, TErrorData>, options?: SendActionParams<TContext, TEvent>): BaseDynamicActionObject<TContext, TEvent, TEvent, SendActionObject<AnyEventObject>, SendActionParams<TContext, TEvent, EventObject>>;
-/**
- * Sends an event to an actor.
- *
- * @param actor The `ActorRef` to send the event to.
- * @param event The event to send, or an expression that evaluates to the event to send
- * @param options Send action options
- * @returns An XState send action object
- */
-export declare function sendTo<TContext extends MachineContext, TEvent extends EventObject, TActor extends AnyActorRef>(actor: TActor | string | ExprWithMeta<TContext, TEvent, TActor | string>, event: EventFrom<TActor> | SendExpr<TContext, TEvent, InferEvent<Cast<EventFrom<TActor>, EventObject>>>, options?: SendActionOptions<TContext, TEvent>): BaseDynamicActionObject<TContext, TEvent, TEvent, SendActionObject<AnyEventObject>, SendActionParams<TContext, TEvent, EventObject>>;
+export declare function escalate<TContext extends MachineContext, TEvent extends EventObject, TErrorData = any>(errorData: TErrorData | ((args: UnifiedArg<TContext, TEvent>) => TErrorData), options?: SendToActionParams<TContext, TEvent>): BaseDynamicActionObject<TContext, TEvent, TEvent, SendToActionObject<AnyEventObject>, SendToActionParams<TContext, TEvent, EventObject>>;
+export {};

package/dist/declarations/src/actions/stop.d.ts

@@ -1,7 +1,7 @@
-import { ActorRef, BaseDynamicActionObject, DynamicStopActionObject, EventObject, Expr, MachineContext, StopActionObject } from "../types.js";
+import { ActorRef, BaseDynamicActionObject, DynamicStopActionObject, EventObject, MachineContext, StopActionObject, UnifiedArg } from "../types.js";
 /**
  * Stops an actor.
  *
  * @param actorRef The actor to stop.
  */
-export declare function stop<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject>(actorRef: string | ActorRef<any> | Expr<TContext, TExpressionEvent, ActorRef<any> | string>): BaseDynamicActionObject<TContext, TExpressionEvent, TEvent, StopActionObject, DynamicStopActionObject<TContext, TExpressionEvent>['params']>;
+export declare function stop<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject>(actorRef: string | ActorRef<any> | ((args: UnifiedArg<TContext, TExpressionEvent>) => ActorRef<any> | string)): BaseDynamicActionObject<TContext, TExpressionEvent, TEvent, StopActionObject, DynamicStopActionObject<TContext, TExpressionEvent>['params']>;

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

@@ -1,6 +1,6 @@
 import { Action, EventObject, SingleOrArray, ActionFunction, ActionFunctionMap, ActionTypes, DoneEvent, ErrorPlatformEvent, DoneEventObject, MachineContext, BaseActionObject } from "./types.js";
 import * as actionTypes from "./actionTypes.js";
-export { send, sendTo, sendParent, forwardTo, escalate } from "./actions/send.js";
+export { sendTo, sendParent, forwardTo, escalate } from "./actions/send.js";
 export { stop } from "./actions/stop.js";
 export { log } from "./actions/log.js";
 export { cancel } from "./actions/cancel.js";
@@ -9,9 +9,6 @@ export { raise } from "./actions/raise.js";
 export { choose } from "./actions/choose.js";
 export { pure } from "./actions/pure.js";
 export { actionTypes };
-export declare const initEvent: {
-    type: ActionTypes;
-};
 export declare function resolveActionObject(actionObject: BaseActionObject, actionFunctionMap: ActionFunctionMap<any, any>): BaseActionObject;
 export declare function toActionObject<TContext extends MachineContext, TEvent extends EventObject>(action: BaseActionObject | ActionFunction<TContext, TEvent> | string): BaseActionObject;
 export declare const toActionObjects: <TContext extends MachineContext, TEvent extends EventObject>(action?: SingleOrArray<Action<TContext, TEvent>> | undefined) => BaseActionObject[];

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

@@ -1,7 +1,7 @@
 import { symbolObservable } from "./symbolObservable.js";
 import { AreAllImplementationsAssumedToBeProvided, MissingImplementationsError } from "./typegenTypes.js";
 import type { ActorSystem, AnyActorLogic, AnyStateMachine, EventFromLogic, InterpreterFrom, PersistedStateFrom, RaiseActionObject, SnapshotFrom } from "./types.js";
-import { ActorRef, EventObject, InteropSubscribable, InterpreterOptions, Observer, SendActionObject, Subscription } from "./types.js";
+import { ActorRef, EventObject, InteropSubscribable, InterpreterOptions, Observer, SendToActionObject, Subscription } from "./types.js";
 export type SnapshotListener<TLogic extends AnyActorLogic> = (state: SnapshotFrom<TLogic>) => void;
 export type EventListener<TEvent extends EventObject = EventObject> = (event: TEvent) => void;
 export type Listener = () => void;
@@ -80,7 +80,7 @@ export declare class Interpreter<TLogic extends AnyActorLogic, TEvent extends Ev
      * @param event The event to send
      */
     send(event: TEvent): void;
-    delaySend(sendAction: SendActionObject | RaiseActionObject<any, any, any>): void;
+    delaySend(sendAction: SendToActionObject | RaiseActionObject<any, any, any>): void;
     cancel(sendId: string | number): void;
     private attachDevTools;
     toJSON(): {

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

@@ -54,7 +54,7 @@ export declare function removeConflictingTransitions(enabledTransitions: Array<A
  * @param mutConfiguration
  */
 export declare function microstep<TContext extends MachineContext, TEvent extends EventObject>(transitions: Array<TransitionDefinition<TContext, TEvent>>, currentState: State<TContext, TEvent, any>, actorCtx: AnyActorContext, event: TEvent, isInitial: boolean): State<TContext, TEvent, any>;
-export declare function resolveActionsAndContext<TContext extends MachineContext, TEvent extends EventObject>(actions: BaseActionObject[], event: TEvent, currentState: State<TContext, TEvent, any>, actorCtx: AnyActorContext | undefined): AnyState;
+export declare function resolveActionsAndContext<TContext extends MachineContext, TEvent extends EventObject>(actions: BaseActionObject[], event: TEvent, currentState: State<TContext, TEvent, any>, actorCtx: AnyActorContext): AnyState;
 export declare function macrostep(state: AnyState, event: EventObject, actorCtx: AnyActorContext): {
     state: typeof state;
     microstates: Array<typeof state>;

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

@@ -54,6 +54,8 @@ export interface BuiltInActionObject extends ParameterizedObject {
 export interface UnifiedArg<TContext extends MachineContext, TEvent extends EventObject> {
     context: TContext;
     event: TEvent;
+    self: ActorRef<TEvent>;
+    system: ActorSystem<any>;
 }
 export interface BaseDynamicActionObject<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TResolvedAction extends BaseActionObject, TDynamicParams extends Record<string, any>> {
     type: `xstate.${string}`;
@@ -64,16 +66,13 @@ export interface BaseDynamicActionObject<TContext extends MachineContext, TExpre
          * The original action object
          */
         action: ParameterizedObject;
-        actorContext: AnyActorContext | undefined;
+        actorContext: AnyActorContext;
     }) => [AnyState, TResolvedAction];
     /** @deprecated an internal signature that doesn't exist at runtime. Its existence helps TS to choose a better code path in the inference algorithm  */
-    (args: {
-        context: TContext;
-        event: TExpressionEvent;
-    } & ActionMeta<TEvent, ParameterizedObject>): void;
+    (args: ActionArgs<TContext, TExpressionEvent, ParameterizedObject>): void;
 }
 export type MachineContext = Record<string, any>;
-export interface ActionMeta<TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> extends StateMeta<TEvent> {
+export interface ActionArgs<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> extends UnifiedArg<TContext, TEvent> {
     action: TAction;
 }
 export type Spawner = <T extends ActorLogic<any, any> | string>(// TODO: read string from machine logic keys
@@ -82,26 +81,23 @@ logic: T, options?: Partial<{
     systemId?: string;
     input: any;
 }>) => T extends ActorLogic<infer TActorEvent, infer TActorEmitted, infer _, infer __, infer ___> ? ActorRef<TActorEvent, TActorEmitted> : ActorRef<any, any>;
-export interface AssignMeta<TExpressionEvent extends EventObject, _TEvent extends EventObject> extends StateMeta<TExpressionEvent> {
+export interface AssignArgs<TContext extends MachineContext, TExpressionEvent extends EventObject> extends ActionArgs<TContext, TExpressionEvent> {
     action: BaseActionObject;
     event: TExpressionEvent;
     spawn: Spawner;
 }
-export type ActionFunction<TContext extends MachineContext, TExpressionEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject, TEvent extends EventObject = TExpressionEvent> = (args: {
-    context: TContext;
-    event: TExpressionEvent;
-} & ActionMeta<TEvent, TAction>) => void;
+export type ActionFunction<TContext extends MachineContext, TExpressionEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> = (args: ActionArgs<TContext, TExpressionEvent, TAction>) => void;
 export interface ChooseCondition<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, ParameterizedObject, TEvent> | BaseDynamicActionObject<TContext, TExpressionEvent, TEvent, any, any>;
+export type Action<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent> = ActionType | ParameterizedObject | ActionFunction<TContext, TExpressionEvent, ParameterizedObject> | BaseDynamicActionObject<TContext, TExpressionEvent, TEvent, any, any>;
 /**
  * Extracts action objects that have no extra properties.
  */
 type SimpleActionsFrom<T extends ParameterizedObject> = ParameterizedObject extends T ? T : ExtractWithSimpleSupport<T>;
 export type BaseAction<TContext extends MachineContext, TExpressionEvent extends EventObject, TAction extends ParameterizedObject, TEvent extends EventObject> = BaseDynamicActionObject<TContext, TExpressionEvent, TEvent, any, // TODO: at the very least this should include TAction, but probably at a covariant position or something, we really need to rethink how action objects are typed
-any> | TAction | SimpleActionsFrom<TAction>['type'] | ActionFunction<TContext, TExpressionEvent, TAction, TEvent>;
+any> | TAction | SimpleActionsFrom<TAction>['type'] | ActionFunction<TContext, TExpressionEvent, TAction>;
 export type BaseActions<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TAction extends ParameterizedObject> = SingleOrArray<BaseAction<TContext, TExpressionEvent, TAction, TEvent>>;
 export type Actions<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent> = SingleOrArray<Action<TContext, TEvent>>;
 export type StateKey = string | AnyState;
@@ -118,7 +114,7 @@ export type StateValue = string | StateValueMap;
 export type GuardPredicate<TContext extends MachineContext, TEvent extends EventObject> = (args: {
     context: TContext;
     event: TEvent;
-} & GuardMeta<TContext, TEvent>) => boolean;
+} & GuardArgs<TContext, TEvent>) => boolean;
 export interface DefaultGuardObject<TContext extends MachineContext, TEvent extends EventObject> extends ParameterizedObject {
     /**
      * Nested guards
@@ -127,7 +123,7 @@ export interface DefaultGuardObject<TContext extends MachineContext, TEvent exte
     predicate?: GuardPredicate<TContext, TEvent>;
 }
 export type GuardEvaluator<TContext extends MachineContext, TEvent extends EventObject> = (guard: GuardDefinition<TContext, TEvent>, context: TContext, event: TEvent, state: State<TContext, TEvent>) => boolean;
-export interface GuardMeta<TContext extends MachineContext, TEvent extends EventObject> {
+export interface GuardArgs<TContext extends MachineContext, TEvent extends EventObject> {
     state: State<TContext, TEvent, any>;
     guard: GuardDefinition<TContext, TEvent>;
     evaluate: GuardEvaluator<TContext, TEvent>;
@@ -218,7 +214,7 @@ 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> & {
-    delay: number | string | Expr<TContext, TEvent, number>;
+    delay: number | string | ((args: UnifiedArg<TContext, TEvent>) => number);
 }>;
 export type StateTypes = 'atomic' | 'compound' | 'parallel' | 'final' | 'history' | string;
 export type SingleOrArray<T> = T[] | T;
@@ -381,7 +377,6 @@ export interface StateNodeDefinition<TContext extends MachineContext, TEvent ext
     tags: string[];
 }
 export interface StateMachineDefinition<TContext extends MachineContext, TEvent extends EventObject> extends StateNodeDefinition<TContext, TEvent> {
-    context: TContext;
 }
 export type AnyStateNode = StateNode<any, any>;
 export type AnyStateNodeDefinition = StateNodeDefinition<any, any>;
@@ -425,8 +420,7 @@ export interface MachineImplementationsSimplified<TContext extends MachineContex
 }
 type MachineImplementationsActions<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingActions = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingActions'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>> = {
     [K in keyof TEventsCausingActions]?: BaseDynamicActionObject<TContext, Cast<Prop<TIndexedEvents, TEventsCausingActions[K]>, EventObject>, Cast<Prop<TIndexedEvents, keyof TIndexedEvents>, EventObject>, any, // TODO: this should receive something like `Cast<Prop<TIndexedActions, K>, ParameterizedObject>`, but at the moment builtin actions expect Resolved*Action here and this should be simplified somehow
-    any> | ActionFunction<TContext, Cast<Prop<TIndexedEvents, TEventsCausingActions[K]>, EventObject>, ParameterizedObject, // TODO: when bringing back parametrized actions this should accept something like `Cast<Prop<TIndexedActions, K>, ParameterizedObject>`. At the moment we need to keep this type argument consistent with what is provided to the fake callable signature within `BaseDynamicActionObject`
-    Cast<Prop<TIndexedEvents, keyof TIndexedEvents>, EventObject>>;
+    any> | ActionFunction<TContext, Cast<Prop<TIndexedEvents, TEventsCausingActions[K]>, EventObject>, ParameterizedObject>;
 };
 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>>;
@@ -504,7 +498,7 @@ export type Transitions<TContext extends MachineContext, TEvent extends EventObj
 export declare enum ActionTypes {
     Stop = "xstate.stop",
     Raise = "xstate.raise",
-    Send = "xstate.send",
+    SendTo = "xstate.sendTo",
     Cancel = "xstate.cancel",
     Assign = "xstate.assign",
     After = "xstate.after",
@@ -577,7 +571,7 @@ export interface InvokeActionObject extends BaseActionObject {
 export interface DynamicStopActionObject<TContext extends MachineContext, TExpressionEvent extends EventObject> {
     type: ActionTypes.Stop;
     params: {
-        actor: string | ActorRef<any> | Expr<TContext, TExpressionEvent, ActorRef<any> | string>;
+        actor: string | ActorRef<any> | ((args: UnifiedArg<TContext, TExpressionEvent>) => ActorRef<any> | string);
     };
 }
 export interface StopActionObject {
@@ -586,8 +580,8 @@ export interface StopActionObject {
         actor: ActorRef<any>;
     };
 }
-export type DelayExpr<TContext extends MachineContext, TEvent extends EventObject> = ExprWithMeta<TContext, TEvent, number>;
-export type LogExpr<TContext extends MachineContext, TEvent extends EventObject> = ExprWithMeta<TContext, TEvent, any>;
+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 interface DynamicLogAction<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject> extends BaseDynamicActionObject<TContext, TExpressionEvent, TEvent, LogActionObject, {
     label: string | undefined;
     expr: string | LogExpr<TContext, TExpressionEvent>;
@@ -601,25 +595,21 @@ export interface LogActionObject extends BuiltInActionObject {
         value: any;
     };
 }
-export interface SendActionObject<TSentEvent extends EventObject = AnyEventObject> extends BaseActionObject {
-    type: 'xstate.send';
+export interface SendToActionObject<TSentEvent extends EventObject = AnyEventObject> extends BaseActionObject {
+    type: 'xstate.sendTo';
     params: {
-        to: ActorRef<TSentEvent> | undefined;
+        to: ActorRef<TSentEvent>;
         event: TSentEvent;
         delay?: number;
         id: string | number;
-        internal: boolean;
     };
 }
-export type Expr<TContext extends MachineContext, TEvent extends EventObject, T> = (arg: UnifiedArg<TContext, TEvent>) => T;
-export type ExprWithMeta<TContext extends MachineContext, TEvent extends EventObject, T> = (args: UnifiedArg<TContext, TEvent> & StateMeta<TEvent>) => T;
-export type SendExpr<TContext extends MachineContext, TEvent extends EventObject, TSentEvent extends EventObject = AnyEventObject> = ExprWithMeta<TContext, TEvent, TSentEvent>;
+export type SendExpr<TContext extends MachineContext, TExpressionEvent extends EventObject, TSentEvent extends EventObject = AnyEventObject> = (args: UnifiedArg<TContext, TExpressionEvent>) => TSentEvent;
 export declare enum SpecialTargets {
     Parent = "#_parent",
     Internal = "#_internal"
 }
-export interface SendActionOptions<TContext extends MachineContext, TEvent extends EventObject> extends RaiseActionOptions<TContext, TEvent> {
-    to?: string | ActorRef<any, any> | ExprWithMeta<TContext, TEvent, string | ActorRef<any, any>>;
+export interface SendToActionOptions<TContext extends MachineContext, TEvent extends EventObject> extends RaiseActionOptions<TContext, TEvent> {
 }
 export interface RaiseActionOptions<TContext extends MachineContext, TEvent extends EventObject> {
     id?: string | number;
@@ -628,13 +618,13 @@ export interface RaiseActionOptions<TContext extends MachineContext, TEvent exte
 export interface RaiseActionParams<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject> extends RaiseActionOptions<TContext, TExpressionEvent> {
     event: TEvent | SendExpr<TContext, TExpressionEvent, TEvent>;
 }
-export interface SendActionParams<TContext extends MachineContext, TEvent extends EventObject, TSentEvent extends EventObject = EventObject> extends SendActionOptions<TContext, 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 DynamicCancelActionObject<TContext extends MachineContext, TExpressionEvent extends EventObject> {
     type: ActionTypes.Cancel;
     params: {
-        sendId: string | ExprWithMeta<TContext, TExpressionEvent, string>;
+        sendId: string | ((args: UnifiedArg<TContext, TExpressionEvent>) => string);
     };
 }
 export interface CancelActionObject extends BaseActionObject {
@@ -643,16 +633,10 @@ export interface CancelActionObject extends BaseActionObject {
         sendId: string;
     };
 }
-export type Assigner<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent> = (args: {
-    context: TContext;
-    event: TExpressionEvent;
-} & AssignMeta<TExpressionEvent, TEvent>) => Partial<TContext>;
-export type PartialAssigner<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TKey extends keyof TContext> = (args: {
-    context: TContext;
-    event: TExpressionEvent;
-} & AssignMeta<TExpressionEvent, TEvent>) => TContext[TKey];
-export type PropertyAssigner<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent> = {
-    [K in keyof TContext]?: PartialAssigner<TContext, TExpressionEvent, TEvent, K> | TContext[K];
+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 Mapper<TContext extends MachineContext, TEvent extends EventObject, TParams extends {}> = (args: {
     context: TContext;
@@ -669,7 +653,7 @@ export interface AnyAssignAction extends BaseActionObject {
     assignment: any;
 }
 export type DynamicAssignAction<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent> = BaseDynamicActionObject<TContext, TExpressionEvent, TEvent, AssignActionObject<TContext> | RaiseActionObject<TContext, TExpressionEvent>, {
-    assignment: Assigner<TContext, TExpressionEvent, TEvent> | PropertyAssigner<TContext, TExpressionEvent, TEvent>;
+    assignment: Assigner<TContext, TExpressionEvent> | PropertyAssigner<TContext, TExpressionEvent>;
 }>;
 export interface AssignActionObject<TContext extends MachineContext> extends BaseActionObject {
     type: ActionTypes.Assign;
@@ -759,10 +743,6 @@ export interface Segment<TContext extends MachineContext, TEvent extends EventOb
      */
     event: TEvent;
 }
-export interface StateMeta<TEvent extends EventObject> {
-    self: ActorRef<TEvent>;
-    system: ActorSystem<any>;
-}
 export interface StateLike<TContext extends MachineContext> {
     value: StateValue;
     context: TContext;

package/dist/xstate.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-81cc7f2b.cjs.js');
+var actors_dist_xstateActors = require('./actions-6b9073db.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 const EMPTY_OBJECT = {};
@@ -319,23 +319,6 @@ class StateNode {
 
 const STATE_IDENTIFIER = '#';
 class StateMachine {
-  // TODO: this getter should be removed
-  getContext(input) {
-    return this.getContextAndActions(undefined, input)[0];
-  }
-  getContextAndActions(actorCtx, input) {
-    const actions = [];
-    const {
-      context
-    } = this.config;
-    const resolvedContext = typeof context === 'function' ? context({
-      spawn: actors_dist_xstateActors.createSpawner(actorCtx?.self, this, undefined,
-      // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
-      actors_dist_xstateActors.createInitEvent(input), actions),
-      input
-    }) : context;
-    return [resolvedContext || {}, actions];
-  }
   /**
    * The machine's own version.
    */
@@ -432,10 +415,9 @@ class StateMachine {
       done: actors_dist_xstateActors.isInFinalState(configuration)
     });
   }
-  resolveStateValue(stateValue) {
+  resolveStateValue(stateValue, ...[context]) {
     const resolvedStateValue = actors_dist_xstateActors.resolveStateValue(this.root, stateValue);
-    const resolvedContext = this.getContext();
-    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, resolvedContext, this));
+    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -474,20 +456,27 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, input) {
-    const [context, actions] = this.getContextAndActions(actorCtx, input);
-    const config = actors_dist_xstateActors.getInitialConfiguration(this.root);
+  getPreInitialState(actorCtx, initEvent) {
+    const {
+      context
+    } = this.config;
     const preInitial = this.resolveState(this.createState({
       value: {},
       // TODO: this is computed in state constructor
-      context,
+      context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
-      configuration: config,
+      configuration: actors_dist_xstateActors.getInitialConfiguration(this.root),
       children: {}
     }));
-    if (actorCtx) {
-      const nextState = actors_dist_xstateActors.resolveActionsAndContext(actions, actors_dist_xstateActors.initEvent, preInitial, actorCtx);
-      preInitial.children = nextState.children;
+    if (typeof context === 'function') {
+      const assignment = ({
+        spawn,
+        event
+      }) => context({
+        spawn,
+        input: event.input
+      });
+      return actors_dist_xstateActors.resolveActionsAndContext([actors_dist_xstateActors.assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -498,7 +487,7 @@ class StateMachine {
   getInitialState(actorCtx, input) {
     const initEvent = actors_dist_xstateActors.createInitEvent(input); // TODO: fix;
 
-    const preInitialState = this.getPreInitialState(actorCtx, input);
+    const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = actors_dist_xstateActors.microstep([{
       target: [...preInitialState.configuration].filter(actors_dist_xstateActors.isAtomicStateNode),
       source: this.root,
@@ -535,10 +524,7 @@ class StateMachine {
     return actors_dist_xstateActors.getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
-    return {
-      context: this.getContext(),
-      ...this.root.definition
-    };
+    return this.root.definition;
   }
   toJSON() {
     return this.definition;

package/dist/xstate.development.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-d71ac253.development.cjs.js');
+var actors_dist_xstateActors = require('./actions-0f903c0d.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 const EMPTY_OBJECT = {};
@@ -319,23 +319,6 @@ class StateNode {
 
 const STATE_IDENTIFIER = '#';
 class StateMachine {
-  // TODO: this getter should be removed
-  getContext(input) {
-    return this.getContextAndActions(undefined, input)[0];
-  }
-  getContextAndActions(actorCtx, input) {
-    const actions = [];
-    const {
-      context
-    } = this.config;
-    const resolvedContext = typeof context === 'function' ? context({
-      spawn: actors_dist_xstateActors.createSpawner(actorCtx?.self, this, undefined,
-      // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
-      actors_dist_xstateActors.createInitEvent(input), actions),
-      input
-    }) : context;
-    return [resolvedContext || {}, actions];
-  }
   /**
    * The machine's own version.
    */
@@ -432,10 +415,9 @@ class StateMachine {
       done: actors_dist_xstateActors.isInFinalState(configuration)
     });
   }
-  resolveStateValue(stateValue) {
+  resolveStateValue(stateValue, ...[context]) {
     const resolvedStateValue = actors_dist_xstateActors.resolveStateValue(this.root, stateValue);
-    const resolvedContext = this.getContext();
-    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, resolvedContext, this));
+    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -474,20 +456,27 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, input) {
-    const [context, actions] = this.getContextAndActions(actorCtx, input);
-    const config = actors_dist_xstateActors.getInitialConfiguration(this.root);
+  getPreInitialState(actorCtx, initEvent) {
+    const {
+      context
+    } = this.config;
     const preInitial = this.resolveState(this.createState({
       value: {},
       // TODO: this is computed in state constructor
-      context,
+      context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
-      configuration: config,
+      configuration: actors_dist_xstateActors.getInitialConfiguration(this.root),
       children: {}
     }));
-    if (actorCtx) {
-      const nextState = actors_dist_xstateActors.resolveActionsAndContext(actions, actors_dist_xstateActors.initEvent, preInitial, actorCtx);
-      preInitial.children = nextState.children;
+    if (typeof context === 'function') {
+      const assignment = ({
+        spawn,
+        event
+      }) => context({
+        spawn,
+        input: event.input
+      });
+      return actors_dist_xstateActors.resolveActionsAndContext([actors_dist_xstateActors.assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -498,7 +487,7 @@ class StateMachine {
   getInitialState(actorCtx, input) {
     const initEvent = actors_dist_xstateActors.createInitEvent(input); // TODO: fix;
 
-    const preInitialState = this.getPreInitialState(actorCtx, input);
+    const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = actors_dist_xstateActors.microstep([{
       target: [...preInitialState.configuration].filter(actors_dist_xstateActors.isAtomicStateNode),
       source: this.root,
@@ -535,10 +524,7 @@ class StateMachine {
     return actors_dist_xstateActors.getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
-    return {
-      context: this.getContext(),
-      ...this.root.definition
-    };
+    return this.root.definition;
   }
   toJSON() {
     return this.definition;