xstate 4.7.5 → 4.8.0

package/es/Machine.d.ts

@@ -1,5 +1,5 @@
 import { StateMachine, MachineOptions, DefaultContext, MachineConfig, StateSchema, EventObject, AnyEventObject, Typestate } from './types';
 export declare function Machine<TContext = any, TEvent extends EventObject = AnyEventObject>(config: MachineConfig<TContext, any, TEvent>, options?: Partial<MachineOptions<TContext, TEvent>>, initialContext?: TContext): StateMachine<TContext, any, TEvent>;
 export declare function Machine<TContext = DefaultContext, TStateSchema extends StateSchema = any, TEvent extends EventObject = AnyEventObject>(config: MachineConfig<TContext, TStateSchema, TEvent>, options?: Partial<MachineOptions<TContext, TEvent>>, initialContext?: TContext): StateMachine<TContext, TStateSchema, TEvent>;
-export declare function createMachine<TContext, TEvent extends EventObject = AnyEventObject, TState extends Typestate<TContext> = any>(config: MachineConfig<TContext, any, TEvent>, options?: Partial<MachineOptions<TContext, TEvent>>): StateMachine<TContext, any, TEvent, TState>;
+export declare function createMachine<TContext, TEvent extends EventObject = AnyEventObject, TTypestate extends Typestate<TContext> = any>(config: MachineConfig<TContext, any, TEvent>, options?: Partial<MachineOptions<TContext, TEvent>>): StateMachine<TContext, any, TEvent, TTypestate>;
 //# sourceMappingURL=Machine.d.ts.map

package/es/State.d.ts

@@ -4,7 +4,7 @@ import { Actor } from './Actor';
 export declare function stateValuesEqual(a: StateValue | undefined, b: StateValue | undefined): boolean;
 export declare function isState<TContext, TEvent extends EventObject>(state: object | string): state is State<TContext, TEvent>;
 export declare function bindActionToState<TC, TE extends EventObject>(action: ActionObject<TC, TE>, state: State<TC, TE>): ActionObject<TC, TE>;
-export declare class State<TContext, TEvent extends EventObject = EventObject, TStateSchema extends StateSchema<TContext> = any, TState extends Typestate<TContext> = any> {
+export declare class State<TContext, TEvent extends EventObject = EventObject, TStateSchema extends StateSchema<TContext> = any, TTypestate extends Typestate<TContext> = any> {
     value: StateValue;
     context: TContext;
     historyValue?: HistoryValue | undefined;
@@ -86,8 +86,8 @@ export declare class State<TContext, TEvent extends EventObject = EventObject, T
      * Whether the current state value is a subset of the given parent state value.
      * @param parentStateValue
      */
-    matches<TSV extends TState['value']>(parentStateValue: TSV): this is TState extends {
+    matches<TSV extends TTypestate['value']>(parentStateValue: TSV): this is TTypestate extends {
         value: TSV;
-    } ? State<TState['context'], TEvent, TStateSchema, TState> : never;
+    } ? State<TTypestate['context'], TEvent, TStateSchema, TTypestate> : never;
 }
 //# sourceMappingURL=State.d.ts.map

package/es/State.js

@@ -66,6 +66,8 @@ function () {
    * @param configuration
    */
   function State(config) {
+    var _this = this;
+
     this.actions = [];
     this.activities = EMPTY_ACTIVITY_MAP;
     this.meta = {};
@@ -89,7 +91,7 @@ function () {
     this.done = !!config.done;
     Object.defineProperty(this, 'nextEvents', {
       get: function () {
-        return nextEvents(config.configuration);
+        return nextEvents(_this.configuration);
       }
     });
   }

package/es/StateNode.d.ts

@@ -1,6 +1,6 @@
 import { Event, StateValue, StateValueMap, MachineOptions, EventObject, HistoryValue, StateNodeDefinition, TransitionDefinition, DelayedTransitionDefinition, ActivityDefinition, StateNodeConfig, StateSchema, StateNodesConfig, InvokeDefinition, ActionObject, Mapper, PropertyMapper, SCXML, Typestate, TransitionDefinitionMap } from './types';
 import { State } from './State';
-declare class StateNode<TContext = any, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject, TState extends Typestate<TContext> = any> {
+declare class StateNode<TContext = any, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject, TTypestate extends Typestate<TContext> = any> {
     /**
      * The raw config used to create the machine.
      */
@@ -191,7 +191,7 @@ declare class StateNode<TContext = any, TStateSchema extends StateSchema = any,
      * @param event The event that was sent at the current state
      * @param context The current context (extended state) of the current state
      */
-    transition(state: string | StateValueMap | State<TContext, TEvent, any, any> | undefined, event: Event<TEvent> | SCXML.Event<TEvent>, context?: TContext): State<TContext, TEvent, TStateSchema, TState>;
+    transition(state: string | StateValueMap | State<TContext, TEvent, any, any> | undefined, event: Event<TEvent> | SCXML.Event<TEvent>, context?: TContext): State<TContext, TEvent, TStateSchema, TTypestate>;
     private resolveRaisedTransition;
     private resolveTransition;
     /**
@@ -218,12 +218,12 @@ declare class StateNode<TContext = any, TStateSchema extends StateSchema = any,
     resolve(stateValue: StateValue): StateValue;
     private getResolvedPath;
     private get initialStateValue();
-    getInitialState(stateValue: StateValue, context?: TContext): State<TContext, TEvent, TStateSchema, TState>;
+    getInitialState(stateValue: StateValue, context?: TContext): State<TContext, TEvent, TStateSchema, TTypestate>;
     /**
      * The initial State instance, which includes all actions to be executed from
      * entering the initial state.
      */
-    get initialState(): State<TContext, TEvent, TStateSchema, TState>;
+    get initialState(): State<TContext, TEvent, TStateSchema, TTypestate>;
     /**
      * The target state value of the history state node, if it exists. This represents the
      * default state value to transition to if no history value exists yet.

package/es/StateNode.js

@@ -229,6 +229,7 @@ function () {
         id: this.id,
         key: this.key,
         version: this.version,
+        context: this.context,
         type: this.type,
         initial: this.initial,
         history: this.history,
@@ -237,8 +238,8 @@ function () {
         }),
         on: this.on,
         transitions: this.transitions,
-        onEntry: this.onEntry,
-        onExit: this.onExit,
+        entry: this.onEntry,
+        exit: this.onExit,
         activities: this.activities || [],
         meta: this.meta,
         order: this.order || -1,
@@ -1475,7 +1476,8 @@ function () {
     }) : true;
     var guards = this.machine.options.guards;
     var target = this.resolveTarget(normalizedTarget);
-    return __assign(__assign({}, transitionConfig), {
+
+    var transition = __assign(__assign({}, transitionConfig), {
       actions: toActionObjects(toArray(transitionConfig.actions)),
       cond: toGuard(transitionConfig.cond, guards),
       target: target,
@@ -1483,6 +1485,18 @@ function () {
       internal: internal,
       eventType: transitionConfig.event
     });
+
+    Object.defineProperty(transition, 'toJSON', {
+      value: function () {
+        return __assign(__assign({}, transition), {
+          target: transition.target ? transition.target.map(function (t) {
+            return "#" + t.id;
+          }) : undefined,
+          source: "#{this.id}"
+        });
+      }
+    });
+    return transition;
   };
 
   StateNode.prototype.formatTransitions = function () {

package/es/actions.d.ts

@@ -1,4 +1,4 @@
-import { Action, Event, EventObject, SingleOrArray, SendAction, SendActionOptions, CancelAction, ActionObject, ActionType, Assigner, PropertyAssigner, AssignAction, ActionFunction, ActionFunctionMap, ActivityActionObject, ActionTypes, ActivityDefinition, RaiseAction, RaiseActionObject, DoneEvent, ErrorPlatformEvent, DoneEventObject, SendExpr, SendActionObject, PureAction, LogExpr, LogAction, LogActionObject, DelayFunctionMap, SCXML } from './types';
+import { Action, Event, EventObject, SingleOrArray, SendAction, SendActionOptions, CancelAction, ActionObject, ActionType, Assigner, PropertyAssigner, AssignAction, ActionFunction, ActionFunctionMap, ActivityActionObject, ActionTypes, ActivityDefinition, RaiseAction, RaiseActionObject, DoneEvent, ErrorPlatformEvent, DoneEventObject, SendExpr, SendActionObject, PureAction, LogExpr, LogAction, LogActionObject, DelayFunctionMap, SCXML, ExprWithMeta } from './types';
 import * as actionTypes from './actionTypes';
 export { actionTypes };
 export declare const initEvent: SCXML.Event<{
@@ -6,7 +6,7 @@ export declare const initEvent: SCXML.Event<{
 }>;
 export declare function getActionFunction<TContext, TEvent extends EventObject>(actionType: ActionType, actionFunctionMap?: ActionFunctionMap<TContext, TEvent>): ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent> | undefined;
 export declare function toActionObject<TContext, TEvent extends EventObject>(action: Action<TContext, TEvent>, actionFunctionMap?: ActionFunctionMap<TContext, TEvent>): ActionObject<TContext, TEvent>;
-export declare const toActionObjects: <TContext, TEvent extends EventObject>(action?: string | ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent> | AssignAction<Required<TContext>, TEvent> | SendAction<TContext, TEvent> | RaiseAction<TEvent> | Action<TContext, TEvent>[] | undefined, actionFunctionMap?: Record<string, ActionFunction<TContext, TEvent> | ActionObject<TContext, TEvent>> | undefined) => ActionObject<TContext, TEvent>[];
+export declare const toActionObjects: <TContext, TEvent extends EventObject>(action?: string | RaiseAction<import("./types").AnyEventObject> | ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent> | AssignAction<Required<TContext>, TEvent> | SendAction<TContext, TEvent> | Action<TContext, TEvent>[] | undefined, actionFunctionMap?: Record<string, ActionFunction<TContext, TEvent> | ActionObject<TContext, TEvent>> | undefined) => ActionObject<TContext, TEvent>[];
 export declare function toActivityDefinition<TContext, TEvent extends EventObject>(action: string | ActivityDefinition<TContext, TEvent>): ActivityDefinition<TContext, TEvent>;
 /**
  * Raises an event. This places the event in the internal event queue, so that
@@ -121,8 +121,9 @@ export declare function forwardTo<TContext, TEvent extends EventObject>(target:
 /**
  * Escalates an error by sending it as an event to this machine's parent.
  *
- * @param errorData The error data to send.
+ * @param errorData The error data to send, or the expression function that
+ * 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, TEvent extends EventObject>(errorData: any, options?: SendActionOptions<TContext, TEvent>): SendAction<TContext, TEvent>;
+export declare function escalate<TContext, TEvent extends EventObject, TErrorData = any>(errorData: TErrorData | ExprWithMeta<TContext, TEvent, TErrorData>, options?: SendActionOptions<TContext, TEvent>): SendAction<TContext, TEvent>;
 //# sourceMappingURL=actions.d.ts.map

package/es/actions.js

@@ -379,15 +379,18 @@ function forwardTo(target, options) {
 /**
  * Escalates an error by sending it as an event to this machine's parent.
  *
- * @param errorData The error data to send.
+ * @param errorData The error data to send, or the expression function that
+ * takes in the `context`, `event`, and `meta`, and returns the error data to send.
  * @param options Options to pass into the send action creator.
  */
 
 
 function escalate(errorData, options) {
-  return sendParent({
-    type: error$1,
-    data: errorData
+  return sendParent(function (context, event, meta) {
+    return {
+      type: error$1,
+      data: isFunction(errorData) ? errorData(context, event, meta) : errorData
+    };
   }, __assign(__assign({}, options), {
     to: SpecialTargets.Parent
   }));

package/es/interpreter.d.ts

@@ -1,7 +1,7 @@
-import { StateMachine, Event, EventObject, DefaultContext, StateSchema, StateValue, InterpreterOptions, DoneEvent, Unsubscribable, MachineOptions, SCXML, EventData, Observer, Spawnable } from './types';
+import { StateMachine, Event, EventObject, DefaultContext, StateSchema, StateValue, InterpreterOptions, DoneEvent, Unsubscribable, MachineOptions, SCXML, EventData, Observer, Spawnable, Typestate } from './types';
 import { State } from './State';
 import { Actor } from './Actor';
-export declare type StateListener<TContext, TEvent extends EventObject> = (state: State<TContext, TEvent>, event: TEvent) => void;
+export declare type StateListener<TContext, TEvent extends EventObject, TTypestate extends Typestate<TContext> = any> = (state: State<TContext, TEvent, any, TTypestate>, event: TEvent) => void;
 export declare type ContextListener<TContext = DefaultContext> = (context: TContext, prevContext: TContext | undefined) => void;
 export declare type EventListener<TEvent extends EventObject = EventObject> = (event: TEvent) => void;
 export declare type Listener = () => void;
@@ -14,8 +14,8 @@ interface SpawnOptions {
     autoForward?: boolean;
     sync?: boolean;
 }
-export declare class Interpreter<TContext, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject> implements Actor<State<TContext, TEvent>, TEvent> {
-    machine: StateMachine<TContext, TStateSchema, TEvent>;
+export declare class Interpreter<TContext, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject, TTypestate extends Typestate<TContext> = any> implements Actor<State<TContext, TEvent>, TEvent> {
+    machine: StateMachine<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * The default interpreter options:
      *
@@ -62,7 +62,7 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      * @param machine The machine to be interpreted
      * @param options Interpreter options
      */
-    constructor(machine: StateMachine<TContext, TStateSchema, TEvent>, options?: Partial<InterpreterOptions>, sessionId?: string);
+    constructor(machine: StateMachine<TContext, TStateSchema, TEvent, TTypestate>, options?: Partial<InterpreterOptions>);
     get initialState(): State<TContext, TEvent>;
     get state(): State<TContext, TEvent>;
     static interpret: typeof interpret;
@@ -74,9 +74,9 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      */
     execute(state: State<TContext, TEvent>, actionsConfig?: MachineOptions<TContext, TEvent>['actions']): void;
     private update;
-    onTransition(listener: StateListener<TContext, TEvent>): Interpreter<TContext, TStateSchema, TEvent>;
-    subscribe(observer: Observer<State<TContext, TEvent>>): Unsubscribable;
-    subscribe(nextListener?: (state: State<TContext, TEvent>) => void, errorListener?: (error: any) => void, completeListener?: () => void): Unsubscribable;
+    onTransition(listener: StateListener<TContext, TEvent, TTypestate>): this;
+    subscribe(observer: Observer<State<TContext, TEvent, any, TTypestate>>): Unsubscribable;
+    subscribe(nextListener?: (state: State<TContext, TEvent, any, TTypestate>) => void, errorListener?: (error: any) => void, completeListener?: () => void): Unsubscribable;
     /**
      * Adds an event listener that is notified whenever an event is sent to the running interpreter.
      * @param listener The event listener
@@ -110,7 +110,7 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
     /**
      * Alias for Interpreter.prototype.start
      */
-    init: (initialState?: string | State<TContext, TEvent, any, any> | import("./types").StateValueMap | undefined) => Interpreter<TContext, TStateSchema, TEvent>;
+    init: (initialState?: string | State<TContext, TEvent, any, any> | import("./types").StateValueMap | undefined) => Interpreter<TContext, TStateSchema, TEvent, any>;
     /**
      * Starts the interpreter from the given state, or the initial state.
      * @param initialState The state to start the statechart from
@@ -178,6 +178,6 @@ export declare function spawn(entity: Spawnable, nameOrOptions?: string | SpawnO
  * @param machine The machine to interpret
  * @param options Interpreter options
  */
-export declare function interpret<TContext = DefaultContext, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject>(machine: StateMachine<TContext, TStateSchema, TEvent>, options?: Partial<InterpreterOptions>): Interpreter<TContext, TStateSchema, TEvent>;
+export declare function interpret<TContext = DefaultContext, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject, TTypestate extends Typestate<TContext> = any>(machine: StateMachine<TContext, TStateSchema, TEvent, TTypestate>, options?: Partial<InterpreterOptions>): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
 export {};
 //# sourceMappingURL=interpreter.d.ts.map

package/es/interpreter.js

@@ -52,7 +52,7 @@ function () {
    * @param machine The machine to be interpreted
    * @param options Interpreter options
    */
-  function Interpreter(machine, options, sessionId) {
+  function Interpreter(machine, options) {
     var _this = this;
 
     if (options === void 0) {
@@ -175,7 +175,7 @@ function () {
     this.scheduler = new Scheduler({
       deferEvents: this.options.deferEvents
     });
-    this.sessionId = sessionId !== undefined ? sessionId : registry.register(this);
+    this.sessionId = registry.bookId();
   }
 
   Object.defineProperty(Interpreter.prototype, "initialState", {
@@ -471,6 +471,7 @@ function () {
       return this;
     }
 
+    registry.register(this.sessionId, this);
     this.initialized = true;
     this._status = InterpreterStatus.Running;
     var resolvedState = initialState === undefined ? this.initialState : withServiceScope(this, function () {
@@ -594,6 +595,7 @@ function () {
     this.scheduler.clear();
     this.initialized = false;
     this._status = InterpreterStatus.Stopped;
+    registry.free(this.sessionId);
     return this;
   };
 

package/es/json.d.ts

@@ -0,0 +1,31 @@
+import { StateNode, ActionObject, Guard, InvokeDefinition } from './';
+interface JSONFunction {
+    $function: string;
+}
+export declare function stringifyFunction(fn: Function): JSONFunction;
+interface TransitionConfig {
+    target: string[];
+    source: string;
+    actions: Array<ActionObject<any, any>>;
+    cond: Guard<any, any> | undefined;
+    eventType: string;
+}
+interface StateNodeConfig {
+    type: StateNode['type'];
+    id: string;
+    key: string;
+    initial?: string;
+    entry: Array<ActionObject<any, any>>;
+    exit: Array<ActionObject<any, any>>;
+    on: {
+        [key: string]: TransitionConfig[];
+    };
+    invoke: Array<InvokeDefinition<any, any>>;
+    states: Record<string, StateNodeConfig>;
+}
+export declare function machineToJSON(stateNode: StateNode): StateNodeConfig;
+export declare function stringify(machine: StateNode): string;
+export declare function parse(machineString: string): StateNodeConfig;
+export declare function jsonify<T extends Record<string, any>>(value: T): T;
+export {};
+//# sourceMappingURL=json.d.ts.map

package/es/registry.d.ts

@@ -1,8 +1,9 @@
 import { Actor } from './Actor';
 export interface Registry {
-    register(actor: Actor): string;
+    bookId(): string;
+    register(id: string, actor: Actor): string;
     get(id: string): Actor | undefined;
-    lookup(actor: Actor): string | undefined;
+    free(id: string): void;
 }
 export declare const registry: Registry;
 //# sourceMappingURL=registry.d.ts.map

package/es/registry.js

@@ -1,22 +1,20 @@
 var children =
 /*#__PURE__*/
 new Map();
-var idMap =
-/*#__PURE__*/
-new Map();
 var sessionIdIndex = 0;
 var registry = {
-  register: function (actor) {
-    var id = "x:" + sessionIdIndex++;
+  bookId: function () {
+    return "x:" + sessionIdIndex++;
+  },
+  register: function (id, actor) {
     children.set(id, actor);
-    idMap.set(actor, id);
     return id;
   },
   get: function (id) {
     return children.get(id);
   },
-  lookup: function (actorRef) {
-    return idMap.get(actorRef);
+  free: function (id) {
+    children.delete(id);
   }
 };
 export { registry };

package/es/types.d.ts

@@ -50,7 +50,7 @@ export interface AssignMeta<TContext, TEvent extends EventObject> {
     _event: SCXML.Event<TEvent>;
 }
 export declare type ActionFunction<TContext, TEvent extends EventObject> = (context: TContext, event: TEvent, meta: ActionMeta<TContext, TEvent>) => any | void;
-export declare type Action<TContext, TEvent extends EventObject> = ActionType | ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent> | AssignAction<Required<TContext>, TEvent> | SendAction<TContext, TEvent> | RaiseAction<TEvent>;
+export declare type Action<TContext, TEvent extends EventObject> = ActionType | ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent> | AssignAction<Required<TContext>, TEvent> | SendAction<TContext, TEvent> | RaiseAction<AnyEventObject>;
 export declare type Actions<TContext, TEvent extends EventObject> = SingleOrArray<Action<TContext, TEvent>>;
 export declare type StateKey = string | State<any>;
 export interface StateValueMap {
@@ -124,7 +124,7 @@ export declare type InvokeCallback = (callback: Sender<any>, onReceive: Receiver
  * @param context The current machine `context`
  * @param event The event that invoked the service
  */
-export declare type InvokeCreator<TContext, TFinalContext = any> = (context: TContext, event: AnyEventObject) => PromiseLike<TFinalContext> | StateMachine<TFinalContext, any, any> | Subscribable<any> | InvokeCallback;
+export declare type InvokeCreator<TContext, TEvent = AnyEventObject, TFinalContext = any> = (context: TContext, event: TEvent) => PromiseLike<TFinalContext> | StateMachine<TFinalContext, any, any> | Subscribable<any> | InvokeCallback;
 export interface InvokeDefinition<TContext, TEvent extends EventObject> extends ActivityDefinition<TContext, TEvent> {
     /**
      * The source of the machine to be invoked, or the machine itself.
@@ -196,7 +196,7 @@ export declare type InvokeConfig<TContext, TEvent extends EventObject> = {
     /**
      * The source of the machine to be invoked, or the machine itself.
      */
-    src: string | StateMachine<any, any, any> | InvokeCreator<any, any>;
+    src: string | StateMachine<any, any, any> | InvokeCreator<TContext, TEvent, any>;
     /**
      * If `true`, events sent to the parent service will be forwarded to the invoked service.
      *
@@ -345,14 +345,15 @@ export interface StateNodeDefinition<TContext, TStateSchema extends StateSchema,
     id: string;
     version: string | undefined;
     key: string;
+    context: TContext;
     type: 'atomic' | 'compound' | 'parallel' | 'final' | 'history';
     initial: StateNodeConfig<TContext, TStateSchema, TEvent>['initial'];
     history: boolean | 'shallow' | 'deep' | undefined;
     states: StatesDefinition<TContext, TStateSchema, TEvent>;
     on: TransitionDefinitionMap<TContext, TEvent>;
     transitions: Array<TransitionDefinition<TContext, TEvent>>;
-    onEntry: Array<ActionObject<TContext, TEvent>>;
-    onExit: Array<ActionObject<TContext, TEvent>>;
+    entry: Array<ActionObject<TContext, TEvent>>;
+    exit: Array<ActionObject<TContext, TEvent>>;
     activities: Array<ActivityDefinition<TContext, TEvent>>;
     meta: any;
     order: number;
@@ -422,7 +423,7 @@ export interface HistoryStateNode<TContext> extends StateNode<TContext> {
     history: 'shallow' | 'deep';
     target: StateValue | undefined;
 }
-export interface StateMachine<TContext, TStateSchema extends StateSchema, TEvent extends EventObject, TState extends Typestate<TContext> = Typestate<TContext>> extends StateNode<TContext, TStateSchema, TEvent, TState> {
+export interface StateMachine<TContext, TStateSchema extends StateSchema, TEvent extends EventObject, TTypestate extends Typestate<TContext> = any> extends StateNode<TContext, TStateSchema, TEvent, TTypestate> {
     id: string;
     states: StateNode<TContext, TStateSchema, TEvent>['states'];
 }

package/lib/Machine.d.ts

@@ -1,5 +1,5 @@
 import { StateMachine, MachineOptions, DefaultContext, MachineConfig, StateSchema, EventObject, AnyEventObject, Typestate } from './types';
 export declare function Machine<TContext = any, TEvent extends EventObject = AnyEventObject>(config: MachineConfig<TContext, any, TEvent>, options?: Partial<MachineOptions<TContext, TEvent>>, initialContext?: TContext): StateMachine<TContext, any, TEvent>;
 export declare function Machine<TContext = DefaultContext, TStateSchema extends StateSchema = any, TEvent extends EventObject = AnyEventObject>(config: MachineConfig<TContext, TStateSchema, TEvent>, options?: Partial<MachineOptions<TContext, TEvent>>, initialContext?: TContext): StateMachine<TContext, TStateSchema, TEvent>;
-export declare function createMachine<TContext, TEvent extends EventObject = AnyEventObject, TState extends Typestate<TContext> = any>(config: MachineConfig<TContext, any, TEvent>, options?: Partial<MachineOptions<TContext, TEvent>>): StateMachine<TContext, any, TEvent, TState>;
+export declare function createMachine<TContext, TEvent extends EventObject = AnyEventObject, TTypestate extends Typestate<TContext> = any>(config: MachineConfig<TContext, any, TEvent>, options?: Partial<MachineOptions<TContext, TEvent>>): StateMachine<TContext, any, TEvent, TTypestate>;
 //# sourceMappingURL=Machine.d.ts.map

package/lib/State.d.ts

@@ -4,7 +4,7 @@ import { Actor } from './Actor';
 export declare function stateValuesEqual(a: StateValue | undefined, b: StateValue | undefined): boolean;
 export declare function isState<TContext, TEvent extends EventObject>(state: object | string): state is State<TContext, TEvent>;
 export declare function bindActionToState<TC, TE extends EventObject>(action: ActionObject<TC, TE>, state: State<TC, TE>): ActionObject<TC, TE>;
-export declare class State<TContext, TEvent extends EventObject = EventObject, TStateSchema extends StateSchema<TContext> = any, TState extends Typestate<TContext> = any> {
+export declare class State<TContext, TEvent extends EventObject = EventObject, TStateSchema extends StateSchema<TContext> = any, TTypestate extends Typestate<TContext> = any> {
     value: StateValue;
     context: TContext;
     historyValue?: HistoryValue | undefined;
@@ -86,8 +86,8 @@ export declare class State<TContext, TEvent extends EventObject = EventObject, T
      * Whether the current state value is a subset of the given parent state value.
      * @param parentStateValue
      */
-    matches<TSV extends TState['value']>(parentStateValue: TSV): this is TState extends {
+    matches<TSV extends TTypestate['value']>(parentStateValue: TSV): this is TTypestate extends {
         value: TSV;
-    } ? State<TState['context'], TEvent, TStateSchema, TState> : never;
+    } ? State<TTypestate['context'], TEvent, TStateSchema, TTypestate> : never;
 }
 //# sourceMappingURL=State.d.ts.map

package/lib/State.js

@@ -97,6 +97,7 @@ var State = /** @class */ (function () {
      * @param configuration
      */
     function State(config) {
+        var _this = this;
         this.actions = [];
         this.activities = constants_1.EMPTY_ACTIVITY_MAP;
         this.meta = {};
@@ -120,7 +121,7 @@ var State = /** @class */ (function () {
         this.done = !!config.done;
         Object.defineProperty(this, 'nextEvents', {
             get: function () {
-                return stateUtils_1.nextEvents(config.configuration);
+                return stateUtils_1.nextEvents(_this.configuration);
             }
         });
     }

package/lib/StateNode.d.ts

@@ -1,6 +1,6 @@
 import { Event, StateValue, StateValueMap, MachineOptions, EventObject, HistoryValue, StateNodeDefinition, TransitionDefinition, DelayedTransitionDefinition, ActivityDefinition, StateNodeConfig, StateSchema, StateNodesConfig, InvokeDefinition, ActionObject, Mapper, PropertyMapper, SCXML, Typestate, TransitionDefinitionMap } from './types';
 import { State } from './State';
-declare class StateNode<TContext = any, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject, TState extends Typestate<TContext> = any> {
+declare class StateNode<TContext = any, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject, TTypestate extends Typestate<TContext> = any> {
     /**
      * The raw config used to create the machine.
      */
@@ -191,7 +191,7 @@ declare class StateNode<TContext = any, TStateSchema extends StateSchema = any,
      * @param event The event that was sent at the current state
      * @param context The current context (extended state) of the current state
      */
-    transition(state: string | StateValueMap | State<TContext, TEvent, any, any> | undefined, event: Event<TEvent> | SCXML.Event<TEvent>, context?: TContext): State<TContext, TEvent, TStateSchema, TState>;
+    transition(state: string | StateValueMap | State<TContext, TEvent, any, any> | undefined, event: Event<TEvent> | SCXML.Event<TEvent>, context?: TContext): State<TContext, TEvent, TStateSchema, TTypestate>;
     private resolveRaisedTransition;
     private resolveTransition;
     /**
@@ -218,12 +218,12 @@ declare class StateNode<TContext = any, TStateSchema extends StateSchema = any,
     resolve(stateValue: StateValue): StateValue;
     private getResolvedPath;
     private get initialStateValue();
-    getInitialState(stateValue: StateValue, context?: TContext): State<TContext, TEvent, TStateSchema, TState>;
+    getInitialState(stateValue: StateValue, context?: TContext): State<TContext, TEvent, TStateSchema, TTypestate>;
     /**
      * The initial State instance, which includes all actions to be executed from
      * entering the initial state.
      */
-    get initialState(): State<TContext, TEvent, TStateSchema, TState>;
+    get initialState(): State<TContext, TEvent, TStateSchema, TTypestate>;
     /**
      * The target state value of the history state node, if it exists. This represents the
      * default state value to transition to if no history value exists yet.

package/lib/StateNode.js

@@ -263,14 +263,15 @@ var StateNode = /** @class */ (function () {
                 id: this.id,
                 key: this.key,
                 version: this.version,
+                context: this.context,
                 type: this.type,
                 initial: this.initial,
                 history: this.history,
                 states: utils_1.mapValues(this.states, function (state) { return state.definition; }),
                 on: this.on,
                 transitions: this.transitions,
-                onEntry: this.onEntry,
-                onExit: this.onExit,
+                entry: this.onEntry,
+                exit: this.onExit,
                 activities: this.activities || [],
                 meta: this.meta,
                 order: this.order || -1,
@@ -1326,7 +1327,13 @@ var StateNode = /** @class */ (function () {
                 : true;
         var guards = this.machine.options.guards;
         var target = this.resolveTarget(normalizedTarget);
-        return __assign(__assign({}, transitionConfig), { actions: actions_1.toActionObjects(utils_1.toArray(transitionConfig.actions)), cond: utils_1.toGuard(transitionConfig.cond, guards), target: target, source: this, internal: internal, eventType: transitionConfig.event });
+        var transition = __assign(__assign({}, transitionConfig), { actions: actions_1.toActionObjects(utils_1.toArray(transitionConfig.actions)), cond: utils_1.toGuard(transitionConfig.cond, guards), target: target, source: this, internal: internal, eventType: transitionConfig.event });
+        Object.defineProperty(transition, 'toJSON', {
+            value: function () { return (__assign(__assign({}, transition), { target: transition.target
+                    ? transition.target.map(function (t) { return "#" + t.id; })
+                    : undefined, source: "#{this.id}" })); }
+        });
+        return transition;
     };
     StateNode.prototype.formatTransitions = function () {
         var e_9, _a;

package/lib/actions.d.ts

@@ -1,4 +1,4 @@
-import { Action, Event, EventObject, SingleOrArray, SendAction, SendActionOptions, CancelAction, ActionObject, ActionType, Assigner, PropertyAssigner, AssignAction, ActionFunction, ActionFunctionMap, ActivityActionObject, ActionTypes, ActivityDefinition, RaiseAction, RaiseActionObject, DoneEvent, ErrorPlatformEvent, DoneEventObject, SendExpr, SendActionObject, PureAction, LogExpr, LogAction, LogActionObject, DelayFunctionMap, SCXML } from './types';
+import { Action, Event, EventObject, SingleOrArray, SendAction, SendActionOptions, CancelAction, ActionObject, ActionType, Assigner, PropertyAssigner, AssignAction, ActionFunction, ActionFunctionMap, ActivityActionObject, ActionTypes, ActivityDefinition, RaiseAction, RaiseActionObject, DoneEvent, ErrorPlatformEvent, DoneEventObject, SendExpr, SendActionObject, PureAction, LogExpr, LogAction, LogActionObject, DelayFunctionMap, SCXML, ExprWithMeta } from './types';
 import * as actionTypes from './actionTypes';
 export { actionTypes };
 export declare const initEvent: SCXML.Event<{
@@ -6,7 +6,7 @@ export declare const initEvent: SCXML.Event<{
 }>;
 export declare function getActionFunction<TContext, TEvent extends EventObject>(actionType: ActionType, actionFunctionMap?: ActionFunctionMap<TContext, TEvent>): ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent> | undefined;
 export declare function toActionObject<TContext, TEvent extends EventObject>(action: Action<TContext, TEvent>, actionFunctionMap?: ActionFunctionMap<TContext, TEvent>): ActionObject<TContext, TEvent>;
-export declare const toActionObjects: <TContext, TEvent extends EventObject>(action?: string | ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent> | AssignAction<Required<TContext>, TEvent> | SendAction<TContext, TEvent> | RaiseAction<TEvent> | Action<TContext, TEvent>[] | undefined, actionFunctionMap?: Record<string, ActionFunction<TContext, TEvent> | ActionObject<TContext, TEvent>> | undefined) => ActionObject<TContext, TEvent>[];
+export declare const toActionObjects: <TContext, TEvent extends EventObject>(action?: string | RaiseAction<import("./types").AnyEventObject> | ActionObject<TContext, TEvent> | ActionFunction<TContext, TEvent> | AssignAction<Required<TContext>, TEvent> | SendAction<TContext, TEvent> | Action<TContext, TEvent>[] | undefined, actionFunctionMap?: Record<string, ActionFunction<TContext, TEvent> | ActionObject<TContext, TEvent>> | undefined) => ActionObject<TContext, TEvent>[];
 export declare function toActivityDefinition<TContext, TEvent extends EventObject>(action: string | ActivityDefinition<TContext, TEvent>): ActivityDefinition<TContext, TEvent>;
 /**
  * Raises an event. This places the event in the internal event queue, so that
@@ -121,8 +121,9 @@ export declare function forwardTo<TContext, TEvent extends EventObject>(target:
 /**
  * Escalates an error by sending it as an event to this machine's parent.
  *
- * @param errorData The error data to send.
+ * @param errorData The error data to send, or the expression function that
+ * 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, TEvent extends EventObject>(errorData: any, options?: SendActionOptions<TContext, TEvent>): SendAction<TContext, TEvent>;
+export declare function escalate<TContext, TEvent extends EventObject, TErrorData = any>(errorData: TErrorData | ExprWithMeta<TContext, TEvent, TErrorData>, options?: SendActionOptions<TContext, TEvent>): SendAction<TContext, TEvent>;
 //# sourceMappingURL=actions.d.ts.map

package/lib/actions.js

@@ -351,13 +351,18 @@ exports.forwardTo = forwardTo;
 /**
  * Escalates an error by sending it as an event to this machine's parent.
  *
- * @param errorData The error data to send.
+ * @param errorData The error data to send, or the expression function that
+ * takes in the `context`, `event`, and `meta`, and returns the error data to send.
  * @param options Options to pass into the send action creator.
  */
 function escalate(errorData, options) {
-    return sendParent({
-        type: actionTypes.error,
-        data: errorData
+    return sendParent(function (context, event, meta) {
+        return {
+            type: actionTypes.error,
+            data: utils_1.isFunction(errorData)
+                ? errorData(context, event, meta)
+                : errorData
+        };
     }, __assign(__assign({}, options), { to: types_1.SpecialTargets.Parent }));
 }
 exports.escalate = escalate;