xstate 4.26.0-pr2674-20219515814 → 4.26.1

package/lib/scxml.js

@@ -26,10 +26,14 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
@@ -53,7 +57,7 @@ function getAttribute(element, attribute) {
 }
 function indexedRecord(items, identifier) {
     var record = {};
-    var identifierFn = utils_1.isString(identifier)
+    var identifierFn = (0, utils_1.isString)(identifier)
         ? function (item) { return item[identifier]; }
         : identifier;
     items.forEach(function (item) {
@@ -71,7 +75,7 @@ function executableContent(elements) {
 function getTargets(targetAttr) {
     // return targetAttr ? [`#${targetAttr}`] : undefined;
     return targetAttr
-        ? ("" + targetAttr).split(/\s+/).map(function (target) { return "#" + target; })
+        ? "".concat(targetAttr).split(/\s+/).map(function (target) { return "#".concat(target); })
         : undefined;
 }
 function delayToMs(delay) {
@@ -96,29 +100,29 @@ function delayToMs(delay) {
             : 0;
         var millisecondsPart = parseInt(secondsMatch[3].padEnd(3, '0'), 10);
         if (millisecondsPart >= 1000) {
-            throw new Error("Can't parse \"" + delay + " delay.\"");
+            throw new Error("Can't parse \"".concat(delay, " delay.\""));
         }
         return secondsPart + millisecondsPart;
     }
-    throw new Error("Can't parse \"" + delay + " delay.\"");
+    throw new Error("Can't parse \"".concat(delay, " delay.\""));
 }
 var evaluateExecutableContent = function (context, _ev, meta, body) {
     var datamodel = context
-        ? utils_1.keys(context)
-            .map(function (key) { return "const " + key + " = context['" + key + "'];"; })
+        ? (0, utils_1.keys)(context)
+            .map(function (key) { return "const ".concat(key, " = context['").concat(key, "'];"); })
             .join('\n')
         : '';
     var scope = ['const _sessionid = "NOT_IMPLEMENTED";', datamodel]
         .filter(Boolean)
         .join('\n');
     var args = ['context', '_event'];
-    var fnBody = "\n    " + scope + "\n    " + body + "\n  ";
-    var fn = new (Function.bind.apply(Function, __spreadArray(__spreadArray([void 0], __read(args)), [fnBody])))();
+    var fnBody = "\n    ".concat(scope, "\n    ").concat(body, "\n  ");
+    var fn = new (Function.bind.apply(Function, __spreadArray(__spreadArray([void 0], __read(args), false), [fnBody], false)))();
     return fn(context, meta._event);
 };
 function createCond(cond) {
     return function (context, _event, meta) {
-        return evaluateExecutableContent(context, _event, meta, "return " + cond + ";");
+        return evaluateExecutableContent(context, _event, meta, "return ".concat(cond, ";"));
     };
 }
 function mapAction(element) {
@@ -129,7 +133,7 @@ function mapAction(element) {
         }
         case 'assign': {
             return actions.assign(function (context, e, meta) {
-                var fnBody = "\n            return {'" + element.attributes.location + "': " + element.attributes.expr + "};\n          ";
+                var fnBody = "\n            return {'".concat(element.attributes.location, "': ").concat(element.attributes.expr, "};\n          ");
                 return evaluateExecutableContent(context, e, meta, fnBody);
             });
         }
@@ -142,14 +146,14 @@ function mapAction(element) {
                     if (child.name === 'content') {
                         throw new Error('Conversion of <content/> inside <send/> not implemented.');
                     }
-                    return "" + acc + child.attributes.name + ":" + child.attributes.expr + ",\n";
+                    return "".concat(acc).concat(child.attributes.name, ":").concat(child.attributes.expr, ",\n");
                 }, '');
             if (event_1 && !params_1) {
                 convertedEvent = event_1;
             }
             else {
                 convertedEvent = function (context, _ev, meta) {
-                    var fnBody = "\n              return { type: " + (event_1 ? "\"" + event_1 + "\"" : eventexpr_1) + ", " + (params_1 ? params_1 : '') + " }\n            ";
+                    var fnBody = "\n              return { type: ".concat(event_1 ? "\"".concat(event_1, "\"") : eventexpr_1, ", ").concat(params_1 ? params_1 : '', " }\n            ");
                     return evaluateExecutableContent(context, _ev, meta, fnBody);
                 };
             }
@@ -158,7 +162,7 @@ function mapAction(element) {
             }
             else if (element.attributes.delayexpr) {
                 convertedDelay = function (context, _ev, meta) {
-                    var fnBody = "\n              return (" + delayToMs + ")(" + element.attributes.delayexpr + ");\n            ";
+                    var fnBody = "\n              return (".concat(delayToMs, ")(").concat(element.attributes.delayexpr, ");\n            ");
                     return evaluateExecutableContent(context, _ev, meta, fnBody);
                 };
             }
@@ -170,7 +174,7 @@ function mapAction(element) {
         case 'log': {
             var label = element.attributes.label;
             return actions.log(function (context, e, meta) {
-                var fnBody = "\n              return " + element.attributes.expr + ";\n            ";
+                var fnBody = "\n              return ".concat(element.attributes.expr, ";\n            ");
                 return evaluateExecutableContent(context, e, meta, fnBody);
             }, label !== undefined ? String(label) : undefined);
         }
@@ -215,7 +219,7 @@ function mapAction(element) {
             return actions.choose(conds);
         }
         default:
-            throw new Error("Conversion of \"" + element.name + "\" elements is not implemented yet.");
+            throw new Error("Conversion of \"".concat(element.name, "\" elements is not implemented yet."));
     }
 }
 function mapActions(elements) {
@@ -257,7 +261,7 @@ function toConfig(nodeJson, id, options) {
             return {
                 id: id,
                 history: history_1,
-                target: target ? "#" + target : undefined
+                target: target ? "#".concat(target) : undefined
             };
         }
         case 'final': {
@@ -277,7 +281,7 @@ function toConfig(nodeJson, id, options) {
         var invokeElements = nodeJson.elements.filter(function (element) { return element.name === 'invoke'; });
         var onEntryElement = nodeJson.elements.find(function (element) { return element.name === 'onentry'; });
         var onExitElement = nodeJson.elements.find(function (element) { return element.name === 'onexit'; });
-        var states = indexedRecord(stateElements, function (item) { return "" + item.attributes.id; });
+        var states = indexedRecord(stateElements, function (item) { return "".concat(item.attributes.id); });
         var initialElement = !initial
             ? nodeJson.elements.find(function (element) { return element.name === 'initial'; })
             : undefined;
@@ -312,7 +316,7 @@ function toConfig(nodeJson, id, options) {
         });
         return __assign(__assign(__assign(__assign(__assign(__assign(__assign({ id: id }, (initial ? { initial: initial } : undefined)), (parallel ? { type: 'parallel' } : undefined)), (stateElements.length
             ? {
-                states: utils_1.mapValues(states, function (state, key) {
+                states: (0, utils_1.mapValues)(states, function (state, key) {
                     return toConfig(state, key, options);
                 })
             }
@@ -332,15 +336,15 @@ function scxmlToMachine(scxmlJson, options) {
             }
             acc[element.attributes.id] = element.attributes.expr
                 ? // tslint:disable-next-line:no-eval
-                    eval("(" + element.attributes.expr + ")")
+                    eval("(".concat(element.attributes.expr, ")"))
                 : undefined;
             return acc;
         }, {})
         : undefined;
-    return index_1.Machine(__assign(__assign({}, toConfig(machineElement, '(machine)', options)), { context: extState, delimiter: options.delimiter }));
+    return (0, index_1.Machine)(__assign(__assign({}, toConfig(machineElement, '(machine)', options)), { context: extState, delimiter: options.delimiter }));
 }
 function toMachine(xml, options) {
-    var json = xml_js_1.xml2js(xml);
+    var json = (0, xml_js_1.xml2js)(xml);
     return scxmlToMachine(json, options);
 }
 exports.toMachine = toMachine;

package/lib/stateUtils.d.ts

@@ -1,16 +1,16 @@
-import { EventObject, StateValue } from './types';
-import { StateNode } from './StateNode';
+import { EventObject, StateNode, StateValue } from '.';
 declare type Configuration<TC, TE extends EventObject> = Iterable<StateNode<TC, any, TE>>;
 declare type AdjList<TC, TE extends EventObject> = Map<StateNode<TC, any, TE>, Array<StateNode<TC, any, TE>>>;
-export declare const isLeafNode: (stateNode: StateNode<any, any, any, any, any>) => boolean;
+export declare const isLeafNode: (stateNode: StateNode<any, any, any, any>) => boolean;
 export declare function getChildren<TC, TE extends EventObject>(stateNode: StateNode<TC, any, TE>): Array<StateNode<TC, any, TE>>;
-export declare function getAllStateNodes<TC, TE extends EventObject>(stateNode: StateNode<TC, any, TE, any, any>): Array<StateNode<TC, any, TE, any, any>>;
-export declare function getConfiguration<TC, TE extends EventObject>(prevStateNodes: Iterable<StateNode<TC, any, TE, any, any>>, stateNodes: Iterable<StateNode<TC, any, TE, any, any>>): Iterable<StateNode<TC, any, TE, any, any>>;
+export declare function getAllStateNodes<TC, TE extends EventObject>(stateNode: StateNode<TC, any, TE, any>): Array<StateNode<TC, any, TE, any>>;
+export declare function getConfiguration<TC, TE extends EventObject>(prevStateNodes: Iterable<StateNode<TC, any, TE, any>>, stateNodes: Iterable<StateNode<TC, any, TE, any>>): Iterable<StateNode<TC, any, TE, any>>;
 export declare function getAdjList<TC, TE extends EventObject>(configuration: Configuration<TC, TE>): AdjList<TC, TE>;
 export declare function getValue<TC, TE extends EventObject>(rootNode: StateNode<TC, any, TE, any>, configuration: Configuration<TC, TE>): StateValue;
 export declare function has<T>(iterable: Iterable<T>, item: T): boolean;
 export declare function nextEvents<TC, TE extends EventObject>(configuration: Array<StateNode<TC, any, TE>>): Array<TE['type']>;
-export declare function isInFinalState<TC, TE extends EventObject>(configuration: Array<StateNode<TC, any, TE, any, any>>, stateNode: StateNode<TC, any, TE, any, any>): boolean;
+export declare function isInFinalState<TC, TE extends EventObject>(configuration: Array<StateNode<TC, any, TE, any>>, stateNode: StateNode<TC, any, TE, any>): boolean;
 export declare function getMeta(configuration?: StateNode[]): Record<string, any>;
+export declare function getTagsFromConfiguration(configuration: StateNode<any, any, any, any>[]): Set<string>;
 export {};
 //# sourceMappingURL=stateUtils.d.ts.map

package/lib/stateUtils.js

@@ -226,7 +226,7 @@ function has(iterable, item) {
 function nextEvents(configuration) {
   return _tslib.__spreadArray([], _tslib.__read(new Set(utils.flatten(_tslib.__spreadArray([], _tslib.__read(configuration.map(function (sn) {
     return sn.ownEvents;
-  })))))));
+  })), false)))), false);
 }
 function isInFinalState(configuration, stateNode) {
   if (stateNode.type === 'compound') {
@@ -256,12 +256,18 @@ function getMeta(configuration) {
     return acc;
   }, {});
 }
+function getTagsFromConfiguration(configuration) {
+  return new Set(utils.flatten(configuration.map(function (sn) {
+    return sn.tags;
+  })));
+}
 
 exports.getAdjList = getAdjList;
 exports.getAllStateNodes = getAllStateNodes;
 exports.getChildren = getChildren;
 exports.getConfiguration = getConfiguration;
 exports.getMeta = getMeta;
+exports.getTagsFromConfiguration = getTagsFromConfiguration;
 exports.getValue = getValue;
 exports.has = has;
 exports.isInFinalState = isInFinalState;

package/lib/types.d.ts

@@ -1,25 +1,9 @@
-import { Clock, Interpreter } from './interpreter';
-import { Model } from './model.types';
-import { State } from './State';
 import { StateNode } from './StateNode';
-import { MarkAllImplementationsAsProvided, MaybeTypegenMachineOptions, TypegenDisabled } from './typegenTypes';
-export declare type AnyFunction = (...args: any[]) => any;
+import { State } from './State';
+import { Interpreter, Clock } from './interpreter';
+import { IsNever, Model, Prop } from './model.types';
+declare type AnyFunction = (...args: any[]) => any;
 declare type ReturnTypeOrValue<T> = T extends AnyFunction ? ReturnType<T> : T;
-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 declare type Values<T> = T[keyof T];
-export declare type Merge<M, N> = Omit<M, keyof N> & N;
-export declare type IndexByType<T extends {
-    type: string;
-}> = {
-    [K in T['type']]: Extract<T, {
-        type: K;
-    }>;
-};
 export declare type EventType = string;
 export declare type ActionType = string;
 export declare type MetaObject = Record<string, any>;
@@ -60,7 +44,7 @@ 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, TAction extends BaseActionObject = BaseActionObject> extends StateMeta<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>;
 }
@@ -69,8 +53,8 @@ export interface AssignMeta<TContext, TEvent extends EventObject> {
     action: AssignAction<TContext, TEvent>;
     _event: SCXML.Event<TEvent>;
 }
-export declare type ActionFunction<TContext, TEvent extends EventObject, TAction extends BaseActionObject = BaseActionObject> = (context: TContext, event: TEvent, meta: ActionMeta<TContext, TEvent, TAction>) => void;
-export interface ChooseConditon<TContext, TEvent extends EventObject> {
+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 ChooseCondition<TContext, TEvent extends EventObject> {
     cond?: Condition<TContext, TEvent>;
     actions: Actions<TContext, TEvent>;
 }
@@ -97,14 +81,6 @@ export interface StateValueMap {
  * - For complex state nodes, this is an object, e.g., `{ success: "someChildState" }`.
  */
 export declare type StateValue = string | StateValueMap;
-declare type KeysWithStates<TStates extends Record<string, StateSchema> | undefined> = TStates extends object ? {
-    [K in keyof TStates]-?: TStates[K] extends {
-        states: object;
-    } ? K : never;
-}[keyof TStates] : never;
-export declare type ExtractStateValue<TSchema extends Required<Pick<StateSchema<any>, 'states'>>> = keyof TSchema['states'] | (KeysWithStates<TSchema['states']> extends never ? never : {
-    [K in KeysWithStates<TSchema['states']>]?: ExtractStateValue<TSchema['states'][K]>;
-});
 export interface HistoryValue {
     states: Record<string, HistoryValue | undefined>;
     current: StateValue | undefined;
@@ -174,6 +150,7 @@ export declare type InvokeCallback<TEvent extends EventObject = AnyEventObject,
 export interface InvokeMeta {
     data: any;
     src: InvokeSourceDefinition;
+    meta?: MetaObject;
 }
 /**
  * Returns either a Promises or a callback handler (for streams of events) given the
@@ -213,6 +190,7 @@ export interface InvokeDefinition<TContext, TEvent extends EventObject> extends
      * Data should be mapped to match the child machine's context shape.
      */
     data?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
+    meta?: MetaObject;
 }
 export interface Delay {
     id: string;
@@ -295,6 +273,10 @@ export interface InvokeConfig<TContext, TEvent extends EventObject> {
      * The transition to take upon the invoked child machine sending an error event.
      */
     onError?: string | SingleOrArray<TransitionConfig<TContext, DoneInvokeEvent<any>>>;
+    /**
+     * Meta data related to this invocation
+     */
+    meta?: MetaObject;
 }
 export interface StateNodeConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject, TAction extends BaseActionObject = BaseActionObject> {
     /**
@@ -450,6 +432,7 @@ export interface StateNodeDefinition<TContext, TStateSchema extends StateSchema,
     data?: FinalStateNodeConfig<TContext, TEvent>['data'];
     invoke: Array<InvokeDefinition<TContext, TEvent>>;
     description?: string;
+    tags: string[];
 }
 export declare type AnyStateNodeDefinition = StateNodeDefinition<any, any, any>;
 export interface AtomicStateNodeConfig<TContext, TEvent extends EventObject> extends StateNodeConfig<TContext, StateSchema, TEvent> {
@@ -471,7 +454,7 @@ 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, TAction extends BaseActionObject = BaseActionObject> = {
+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>;
@@ -479,25 +462,25 @@ export declare type ActionFunctionMap<TContext, TEvent extends EventObject, TAct
 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, TAction extends BaseActionObject = BaseActionObject> {
-    guards?: Record<string, ConditionPredicate<TContext, TEvent>>;
-    actions?: ActionFunctionMap<TContext, TEvent, TAction>;
+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, TAction>;
     /**
      * @deprecated Use `services` instead.
      */
-    activities?: Record<string, ActivityConfig<TContext, TEvent>>;
-    services?: Record<string, ServiceConfig<TContext, TEvent>>;
-    delays?: DelayFunctionMap<TContext, TEvent>;
+    activities: Record<string, ActivityConfig<TContext, TEvent>>;
+    services: Record<string, ServiceConfig<TContext, TEvent>>;
+    delays: DelayFunctionMap<TContext, TEvent>;
     /**
      * @private
      */
-    _parent?: StateNode<TContext, any, TEvent, any, any>;
+    _parent?: StateNode<TContext, any, TEvent, any>;
     /**
      * @private
      */
     _key?: string;
 }
-export interface MachineConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject, TAction extends BaseActionObject = BaseActionObject, TTypesMeta = TypegenDisabled> extends StateNodeConfig<TContext, TStateSchema, TEvent, TAction> {
+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)
      */
@@ -507,7 +490,6 @@ export interface MachineConfig<TContext, TStateSchema extends StateSchema, TEven
      */
     version?: string;
     schema?: MachineSchema<TContext, TEvent>;
-    tsTypes?: TTypesMeta | true;
 }
 export interface MachineSchema<TContext, TEvent extends EventObject> {
     context?: TContext;
@@ -542,11 +524,11 @@ 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;
-}, TAction extends BaseActionObject = BaseActionObject, TResolvedTypesMeta = TypegenDisabled> extends StateNode<TContext, TStateSchema, TEvent, TTypestate, TResolvedTypesMeta> {
+}, _TAction extends ActionObject<TContext, TEvent> = ActionObject<TContext, TEvent>> extends StateNode<TContext, TStateSchema, TEvent, TTypestate> {
     id: string;
-    states: StateNode<TContext, TStateSchema, TEvent, TTypestate, TResolvedTypesMeta>['states'];
-    withConfig(options: MaybeTypegenMachineOptions<TContext, TEvent, TAction, TResolvedTypesMeta, true>, context?: TContext | (() => TContext)): StateMachine<TContext, TStateSchema, TEvent, TTypestate, TAction, MarkAllImplementationsAsProvided<TResolvedTypesMeta>>;
-    withContext(context: TContext | (() => TContext)): StateMachine<TContext, TStateSchema, TEvent, TTypestate, any, TResolvedTypesMeta>;
+    states: StateNode<TContext, TStateSchema, TEvent>['states'];
+    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<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> {
@@ -567,13 +549,13 @@ export interface ActivityMap {
 }
 export interface StateTransition<TContext, TEvent extends EventObject> {
     transitions: Array<TransitionDefinition<TContext, TEvent>>;
-    configuration: Array<StateNode<TContext, any, TEvent, any, any>>;
-    entrySet: Array<StateNode<TContext, any, TEvent, any, any>>;
-    exitSet: Array<StateNode<TContext, any, TEvent, any, any>>;
+    configuration: Array<StateNode<TContext, any, TEvent, any>>;
+    entrySet: Array<StateNode<TContext, any, TEvent, any>>;
+    exitSet: Array<StateNode<TContext, any, TEvent, any>>;
     /**
      * The source state that preceded the transition.
      */
-    source: State<TContext, any, any, any, any> | undefined;
+    source: State<TContext, any, any, any> | undefined;
     actions: Array<ActionObject<TContext, TEvent>>;
 }
 export interface TransitionData<TContext, TEvent extends EventObject> {
@@ -716,7 +698,7 @@ export interface PureAction<TContext, TEvent extends EventObject> extends Action
 }
 export interface ChooseAction<TContext, TEvent extends EventObject> extends ActionObject<TContext, TEvent> {
     type: ActionTypes.Choose;
-    conds: Array<ChooseConditon<TContext, TEvent>>;
+    conds: Array<ChooseCondition<TContext, TEvent>>;
 }
 export interface TransitionDefinition<TContext, TEvent extends EventObject> extends TransitionConfig<TContext, TEvent> {
     target: Array<StateNode<TContext, any, TEvent>> | undefined;
@@ -794,7 +776,7 @@ export interface SCXMLEventMeta<TEvent extends EventObject> {
     _event: SCXML.Event<TEvent>;
 }
 export interface StateMeta<TContext, TEvent extends EventObject> {
-    state: State<TContext, TEvent, any, any, any>;
+    state: State<TContext, TEvent, any, any>;
     _event: SCXML.Event<TEvent>;
 }
 export interface Typestate<TContext> {
@@ -813,7 +795,7 @@ export interface StateConfig<TContext, TEvent extends EventObject> {
     _event: SCXML.Event<TEvent>;
     _sessionid: string | null;
     historyValue?: HistoryValue | undefined;
-    history?: State<TContext, TEvent, any, any, any>;
+    history?: State<TContext, TEvent>;
     actions?: Array<ActionObject<TContext, TEvent>>;
     /**
      * @deprecated
@@ -826,7 +808,7 @@ export interface StateConfig<TContext, TEvent extends EventObject> {
     children: Record<string, ActorRef<any>>;
     done?: boolean;
     tags?: Set<string>;
-    machine?: StateMachine<TContext, any, TEvent, any, any, any>;
+    machine?: StateMachine<TContext, any, TEvent, any>;
 }
 export interface StateSchema<TC = any> {
     meta?: any;
@@ -839,9 +821,9 @@ export interface InterpreterOptions {
     /**
      * Whether state actions should be executed immediately upon transition. Defaults to `true`.
      */
-    execute?: boolean;
-    clock?: Clock;
-    logger?: (...args: any[]) => void;
+    execute: boolean;
+    clock: Clock;
+    logger: (...args: any[]) => void;
     parent?: AnyInterpreter;
     /**
      * If `true`, defers processing of sent events until the service
@@ -850,7 +832,7 @@ export interface InterpreterOptions {
      *
      * Default: `true`
      */
-    deferEvents?: boolean;
+    deferEvents: boolean;
     /**
      * The custom `id` for referencing this service.
      */
@@ -860,7 +842,8 @@ export interface InterpreterOptions {
      *
      * Default: `false`
      */
-    devTools?: boolean | object;
+    devTools: boolean | object;
+    [option: string]: any;
 }
 export declare namespace SCXML {
     interface Event<TEvent extends EventObject> {
@@ -961,7 +944,7 @@ export declare type ActorRefWithDeprecatedState<TContext, TEvent extends EventOb
     state: State<TContext, TEvent, any, TTypestate>;
 };
 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, any>;
+export declare type AnyInterpreter = Interpreter<any, any, any, any>;
 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>;
@@ -975,7 +958,10 @@ export interface Behavior<TEvent extends EventObject, TEmitted = any> {
     start?: (actorCtx: ActorContext<TEvent, TEmitted>) => TEmitted;
 }
 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;
+declare type ResolveEventType<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 EventFrom<T, K extends Prop<TEvent, 'type'> = never, TEvent = ResolveEventType<T>> = IsNever<K> extends true ? TEvent : Extract<TEvent, {
+    type: K;
+}>;
 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.d.ts

@@ -63,7 +63,7 @@ export declare function toTransitionConfigArray<TContext, TEvent extends EventOb
 }>;
 export declare function normalizeTarget<TContext, TEvent extends EventObject>(target: SingleOrArray<string | StateNode<TContext, any, TEvent>> | undefined): Array<string | StateNode<TContext, any, TEvent>> | undefined;
 export declare function reportUnhandledExceptionOnInvocation(originalError: any, currentError: any, id: string): void;
-export declare function evaluateGuard<TContext, TEvent extends EventObject>(machine: StateNode<TContext, any, TEvent, any, any>, guard: Guard<TContext, TEvent>, context: TContext, _event: SCXML.Event<TEvent>, state: State<TContext, TEvent>): boolean;
+export declare function evaluateGuard<TContext, TEvent extends EventObject>(machine: StateNode<TContext, any, TEvent, any>, guard: Guard<TContext, TEvent>, context: TContext, _event: SCXML.Event<TEvent>, state: State<TContext, TEvent>): boolean;
 export declare function toInvokeSource(src: string | InvokeSourceDefinition): InvokeSourceDefinition;
 export declare function toObserver<T>(nextHandler: Observer<T> | ((value: T) => void), errorHandler?: (error: any) => void, completionHandler?: () => void): Observer<T>;
 //# sourceMappingURL=utils.d.ts.map

package/lib/utils.js

@@ -40,7 +40,7 @@ function matchesState(parentStateId, childStateId, delimiter) {
 }
 function getEventType(event) {
   try {
-    return isString(event) || typeof event === 'number' ? "" + event : event.type;
+    return isString(event) || typeof event === 'number' ? "".concat(event) : event.type;
   } catch (e) {
     throw new Error('Events must be strings or objects with a string event.type property.');
   }
@@ -53,7 +53,7 @@ function toStatePath(stateId, delimiter) {
 
     return stateId.toString().split(delimiter);
   } catch (e) {
-    throw new Error("'" + stateId + "' is not a valid state path.");
+    throw new Error("'".concat(stateId, "' is not a valid state path."));
   }
 }
 function isStateLike(state) {
@@ -222,7 +222,7 @@ function toStatePaths(stateValue) {
 function flatten(array) {
   var _a;
 
-  return (_a = []).concat.apply(_a, _tslib.__spreadArray([], _tslib.__read(array)));
+  return (_a = []).concat.apply(_a, _tslib.__spreadArray([], _tslib.__read(array), false));
 }
 function toArrayStrict(value) {
   if (isArray(value)) {
@@ -399,7 +399,7 @@ if (!environment.IS_PRODUCTION) {
     }
 
     if (console !== undefined) {
-      var args = ["Warning: " + message];
+      var args = ["Warning: ".concat(message)];
 
       if (error) {
         args.push(error);
@@ -528,15 +528,15 @@ function normalizeTarget(target) {
 }
 function reportUnhandledExceptionOnInvocation(originalError, currentError, id) {
   if (!environment.IS_PRODUCTION) {
-    var originalStackTrace = originalError.stack ? " Stacktrace was '" + originalError.stack + "'" : '';
+    var originalStackTrace = originalError.stack ? " Stacktrace was '".concat(originalError.stack, "'") : '';
 
     if (originalError === currentError) {
       // tslint:disable-next-line:no-console
-      console.error("Missing onError handler for invocation '" + id + "', error was '" + originalError + "'." + originalStackTrace);
+      console.error("Missing onError handler for invocation '".concat(id, "', error was '").concat(originalError, "'.").concat(originalStackTrace));
     } else {
-      var stackTrace = currentError.stack ? " Stacktrace was '" + currentError.stack + "'" : ''; // tslint:disable-next-line:no-console
+      var stackTrace = currentError.stack ? " Stacktrace was '".concat(currentError.stack, "'") : ''; // tslint:disable-next-line:no-console
 
-      console.error("Missing onError handler and/or unhandled exception/promise rejection for invocation '" + id + "'. " + ("Original error: '" + originalError + "'. " + originalStackTrace + " Current error is '" + currentError + "'." + stackTrace));
+      console.error("Missing onError handler and/or unhandled exception/promise rejection for invocation '".concat(id, "'. ") + "Original error: '".concat(originalError, "'. ").concat(originalStackTrace, " Current error is '").concat(currentError, "'.").concat(stackTrace));
     }
   }
 }
@@ -552,10 +552,10 @@ function evaluateGuard(machine, guard, context, _event, state) {
     return ((guards === null || guards === void 0 ? void 0 : guards[guard.name]) || guard.predicate)(context, _event.data, guardMeta);
   }
 
-  var condFn = guards === null || guards === void 0 ? void 0 : guards[guard.type];
+  var condFn = guards[guard.type];
 
   if (!condFn) {
-    throw new Error("Guard '" + guard.type + "' is not implemented on machine '" + machine.id + "'.");
+    throw new Error("Guard '".concat(guard.type, "' is not implemented on machine '").concat(machine.id, "'."));
   }
 
   return condFn(context, _event.data, guardMeta);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xstate",
-  "version": "4.26.0-pr2674-20219515814",
+  "version": "4.26.1",
   "description": "Finite State Machines and Statecharts for the Modern Web.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -30,11 +30,7 @@
     "clean": "rm -rf lib es dist tsconfig.tsbuildinfo",
     "test": "jest",
     "build": "rollup -c",
-    "preversion": "npm run test",
-    "version": "npm run build",
-    "postversion": "git push --follow-tags",
-    "prepublishOnly": "npm run build",
-    "publish:next": "npm version prerelease && npm publish --tag next"
+    "prepublishOnly": "npm run build"
   },
   "repository": {
     "type": "git",
@@ -65,8 +61,8 @@
     "rollup-plugin-uglify": "^6.0.2",
     "rxjs": "^7.1.0",
     "ts-jest": "^26.5.6",
-    "tslib": "^2.2.0",
-    "typescript": "^4.3.5",
+    "tslib": "^2.3.1",
+    "typescript": "^4.5.2",
     "xml-js": "^1.6.11"
   }
 }

package/dist/xstate.cjs.d.ts

@@ -1,11 +0,0 @@
-// are you seeing an error that a default export doesn't exist but your source file has a default export?
-// you should run `yarn` or `yarn preconstruct dev` if preconstruct dev isn't in your postinstall hook
-
-// curious why you need to?
-// this file exists so that you can import from the entrypoint normally
-// except that it points to your source file and you don't need to run build constantly
-// which means we need to re-export all of the modules from your source file
-// and since export * doesn't include default exports, we need to read your source file
-// to check for a default export and re-export it if it exists
-// it's not ideal, but it works pretty well ¯\_(ツ)_/¯
-export * from "../src/index";

package/dist/xstate.cjs.js

@@ -1,16 +0,0 @@
-"use strict";
-// this file might look strange and you might be wondering what it's for
-// it's lets you import your source files by importing this entrypoint
-// as you would import it if it was built with preconstruct build
-// this file is slightly different to some others though
-// it has a require hook which compiles your code with Babel
-// this means that you don't have to set up @babel/register or anything like that
-// but you can still require this module and it'll be compiled
-
-// this bit of code imports the require hook and registers it
-let unregister = require("../../../node_modules/@preconstruct/hook").___internalHook(typeof __dirname === 'undefined' ? undefined : __dirname, "../../..", "..");
-
-// this re-exports the source file
-module.exports = require("../src/index.ts");
-
-unregister();