xstate 4.9.1 → 4.13.0

package/lib/actions.js

@@ -10,17 +10,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -38,11 +27,11 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveActions = exports.choose = exports.escalate = exports.forwardTo = exports.pure = exports.error = exports.doneInvoke = exports.done = exports.after = exports.isActionObject = exports.assign = exports.stop = exports.start = exports.cancel = exports.resolveLog = exports.log = exports.respond = exports.sendUpdate = exports.sendParent = exports.resolveSend = exports.send = exports.resolveRaise = exports.raise = exports.toActivityDefinition = exports.toActionObjects = exports.toActionObject = exports.getActionFunction = exports.initEvent = exports.actionTypes = void 0;
 var types_1 = require("./types");
 var actionTypes = require("./actionTypes");
 exports.actionTypes = actionTypes;
 var utils_1 = require("./utils");
-var utils_2 = require("./utils");
 var environment_1 = require("./environment");
 exports.initEvent = utils_1.toSCXMLEvent({ type: actionTypes.init });
 function getActionFunction(actionType, actionFunctionMap) {
@@ -81,8 +70,8 @@ function toActionObject(action, actionFunctionMap) {
             actionObject = __assign(__assign({}, action), { exec: exec });
         }
         else if (exec) {
-            var type = action.type, other = __rest(action, ["type"]);
-            actionObject = __assign(__assign({ type: type }, exec), other);
+            var actionType = exec.type || action.type;
+            actionObject = __assign(__assign(__assign({}, exec), action), { type: actionType });
         }
         else {
             actionObject = action;
@@ -100,7 +89,7 @@ exports.toActionObjects = function (action, actionFunctionMap) {
     if (!action) {
         return [];
     }
-    var actions = utils_2.isArray(action) ? action : [action];
+    var actions = utils_1.isArray(action) ? action : [action];
     return actions.map(function (subAction) {
         return toActionObject(subAction, actionFunctionMap);
     });
@@ -426,7 +415,7 @@ function resolveActions(machine, currentState, currentContext, _event, actions)
                 if (!matchedActions) {
                     return [];
                 }
-                var resolved = resolveActions(machine, currentState, updatedContext, _event, exports.toActionObjects(utils_1.toArray(matchedActions)));
+                var resolved = resolveActions(machine, currentState, updatedContext, _event, exports.toActionObjects(utils_1.toArray(matchedActions), machine.options.actions));
                 updatedContext = resolved[1];
                 return resolved[0];
             }
@@ -435,7 +424,7 @@ function resolveActions(machine, currentState, currentContext, _event, actions)
                 if (!matchedActions) {
                     return [];
                 }
-                var resolved = resolveActions(machine, currentState, updatedContext, _event, exports.toActionObjects(utils_1.toArray(matchedActions)));
+                var resolved = resolveActions(machine, currentState, updatedContext, _event, exports.toActionObjects(utils_1.toArray(matchedActions), machine.options.actions));
                 updatedContext = resolved[1];
                 return resolved[0];
             }

package/lib/constants.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TARGETLESS_KEY = exports.DEFAULT_GUARD_TYPE = exports.EMPTY_ACTIVITY_MAP = exports.STATE_DELIMITER = void 0;
 exports.STATE_DELIMITER = '.';
 exports.EMPTY_ACTIVITY_MAP = {};
 exports.DEFAULT_GUARD_TYPE = 'xstate.guard';

package/lib/devTools.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerService = void 0;
 var environment_1 = require("./environment");
 function getDevTools() {
     var w = window;

package/lib/each.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.each = void 0;
 function each(collection, item, indexOrActions, maybeActions) {
     var actions = maybeActions || indexOrActions;
     var index = maybeActions ? indexOrActions : undefined;

package/lib/environment.js

@@ -1,3 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.IS_PRODUCTION = void 0;
 exports.IS_PRODUCTION = process.env.NODE_ENV === 'production';

package/lib/index.js

@@ -1,32 +1,40 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMachine = exports.doneInvoke = exports.spawn = exports.matchState = exports.Interpreter = exports.interpret = exports.forwardTo = exports.sendUpdate = exports.sendParent = exports.send = exports.assign = exports.actions = exports.mapState = exports.matchesState = exports.State = exports.StateNode = exports.Machine = void 0;
 var utils_1 = require("./utils");
-exports.matchesState = utils_1.matchesState;
+Object.defineProperty(exports, "matchesState", { enumerable: true, get: function () { return utils_1.matchesState; } });
 var mapState_1 = require("./mapState");
-exports.mapState = mapState_1.mapState;
+Object.defineProperty(exports, "mapState", { enumerable: true, get: function () { return mapState_1.mapState; } });
 var StateNode_1 = require("./StateNode");
-exports.StateNode = StateNode_1.StateNode;
+Object.defineProperty(exports, "StateNode", { enumerable: true, get: function () { return StateNode_1.StateNode; } });
 var State_1 = require("./State");
-exports.State = State_1.State;
+Object.defineProperty(exports, "State", { enumerable: true, get: function () { return State_1.State; } });
 var Machine_1 = require("./Machine");
-exports.Machine = Machine_1.Machine;
-exports.createMachine = Machine_1.createMachine;
+Object.defineProperty(exports, "Machine", { enumerable: true, get: function () { return Machine_1.Machine; } });
+Object.defineProperty(exports, "createMachine", { enumerable: true, get: function () { return Machine_1.createMachine; } });
 var actions_1 = require("./actions");
-exports.send = actions_1.send;
-exports.sendParent = actions_1.sendParent;
-exports.sendUpdate = actions_1.sendUpdate;
-exports.assign = actions_1.assign;
-exports.doneInvoke = actions_1.doneInvoke;
-exports.forwardTo = actions_1.forwardTo;
+Object.defineProperty(exports, "send", { enumerable: true, get: function () { return actions_1.send; } });
+Object.defineProperty(exports, "sendParent", { enumerable: true, get: function () { return actions_1.sendParent; } });
+Object.defineProperty(exports, "sendUpdate", { enumerable: true, get: function () { return actions_1.sendUpdate; } });
+Object.defineProperty(exports, "assign", { enumerable: true, get: function () { return actions_1.assign; } });
+Object.defineProperty(exports, "doneInvoke", { enumerable: true, get: function () { return actions_1.doneInvoke; } });
+Object.defineProperty(exports, "forwardTo", { enumerable: true, get: function () { return actions_1.forwardTo; } });
 var interpreter_1 = require("./interpreter");
-exports.interpret = interpreter_1.interpret;
-exports.Interpreter = interpreter_1.Interpreter;
-exports.spawn = interpreter_1.spawn;
+Object.defineProperty(exports, "interpret", { enumerable: true, get: function () { return interpreter_1.interpret; } });
+Object.defineProperty(exports, "Interpreter", { enumerable: true, get: function () { return interpreter_1.Interpreter; } });
+Object.defineProperty(exports, "spawn", { enumerable: true, get: function () { return interpreter_1.spawn; } });
 var match_1 = require("./match");
-exports.matchState = match_1.matchState;
+Object.defineProperty(exports, "matchState", { enumerable: true, get: function () { return match_1.matchState; } });
 var actions = {
     raise: actions_1.raise,
     send: actions_1.send,
@@ -46,4 +54,4 @@ var actions = {
     pure: actions_1.pure
 };
 exports.actions = actions;
-__export(require("./types"));
+__exportStar(require("./types"), exports);

package/lib/interpreter.d.ts

@@ -1,7 +1,10 @@
-import { StateMachine, Event, EventObject, DefaultContext, StateSchema, StateValue, InterpreterOptions, DoneEvent, Unsubscribable, MachineOptions, SCXML, EventData, Observer, Spawnable, Typestate } from './types';
+import { StateMachine, Event, EventObject, DefaultContext, StateSchema, StateValue, InterpreterOptions, SingleOrArray, 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, TTypestate extends Typestate<TContext> = any> = (state: State<TContext, TEvent, any, TTypestate>, event: TEvent) => void;
+export declare type StateListener<TContext, TEvent extends EventObject, TStateSchema extends StateSchema<TContext> = any, TTypestate extends Typestate<TContext> = {
+    value: any;
+    context: TContext;
+}> = (state: State<TContext, TEvent, TStateSchema, 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,7 +17,10 @@ interface SpawnOptions {
     autoForward?: boolean;
     sync?: boolean;
 }
-export declare class Interpreter<TContext, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject, TTypestate extends Typestate<TContext> = any> implements Actor<State<TContext, TEvent>, TEvent> {
+export declare class Interpreter<TContext, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject, TTypestate extends Typestate<TContext> = {
+    value: any;
+    context: TContext;
+}> implements Actor<State<TContext, TEvent, TStateSchema, TTypestate>, TEvent> {
     machine: StateMachine<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * The default interpreter options:
@@ -63,8 +69,8 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      * @param options Interpreter options
      */
     constructor(machine: StateMachine<TContext, TStateSchema, TEvent, TTypestate>, options?: Partial<InterpreterOptions>);
-    get initialState(): State<TContext, TEvent>;
-    get state(): State<TContext, TEvent, any, TTypestate>;
+    get initialState(): State<TContext, TEvent, TStateSchema, TTypestate>;
+    get state(): State<TContext, TEvent, TStateSchema, TTypestate>;
     static interpret: typeof interpret;
     /**
      * Executes the actions of the given state, with that state's `context` and `event`.
@@ -72,56 +78,56 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      * @param state The state whose actions will be executed
      * @param actionsConfig The action implementations to use
      */
-    execute(state: State<TContext, TEvent>, actionsConfig?: MachineOptions<TContext, TEvent>['actions']): void;
+    execute(state: State<TContext, TEvent, TStateSchema, TTypestate>, actionsConfig?: MachineOptions<TContext, TEvent>['actions']): void;
     private update;
-    onTransition(listener: StateListener<TContext, TEvent, TTypestate>): this;
+    onTransition(listener: StateListener<TContext, TEvent, TStateSchema, 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
      */
-    onEvent(listener: EventListener): Interpreter<TContext, TStateSchema, TEvent>;
+    onEvent(listener: EventListener): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * Adds an event listener that is notified whenever a `send` event occurs.
      * @param listener The event listener
      */
-    onSend(listener: EventListener): Interpreter<TContext, TStateSchema, TEvent>;
+    onSend(listener: EventListener): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * Adds a context listener that is notified whenever the state context changes.
      * @param listener The context listener
      */
-    onChange(listener: ContextListener<TContext>): Interpreter<TContext, TStateSchema, TEvent>;
+    onChange(listener: ContextListener<TContext>): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * Adds a listener that is notified when the machine is stopped.
      * @param listener The listener
      */
-    onStop(listener: Listener): Interpreter<TContext, TStateSchema, TEvent>;
+    onStop(listener: Listener): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * Adds a state listener that is notified when the statechart has reached its final state.
      * @param listener The state listener
      */
-    onDone(listener: EventListener<DoneEvent>): Interpreter<TContext, TStateSchema, TEvent>;
+    onDone(listener: EventListener<DoneEvent>): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * Removes a listener.
      * @param listener The listener to remove
      */
-    off(listener: (...args: any[]) => void): Interpreter<TContext, TStateSchema, TEvent>;
+    off(listener: (...args: any[]) => void): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * Alias for Interpreter.prototype.start
      */
-    init: (initialState?: string | import("./types").StateValueMap | State<TContext, TEvent, any, any> | undefined) => Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
+    init: (initialState?: string | import("./types").StateValueMap | State<TContext, TEvent, TStateSchema, TTypestate> | undefined) => Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * Starts the interpreter from the given state, or the initial state.
      * @param initialState The state to start the statechart from
      */
-    start(initialState?: State<TContext, TEvent> | StateValue): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
+    start(initialState?: State<TContext, TEvent, TStateSchema, TTypestate> | StateValue): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * Stops the interpreter and unsubscribe all listeners.
      *
      * This will also notify the `onStop` listeners.
      */
-    stop(): Interpreter<TContext, TStateSchema, TEvent>;
+    stop(): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
     /**
      * Sends an event to the running interpreter to trigger a transition.
      *
@@ -131,14 +137,14 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      *
      * @param event The event(s) to send
      */
-    send: (event: TEvent | TEvent["type"] | Event<TEvent>[] | SCXML.Event<TEvent>, payload?: EventData | undefined) => State<TContext, TEvent, any, any>;
+    send: (event: SingleOrArray<Event<TEvent>> | SCXML.Event<TEvent>, payload?: EventData | undefined) => State<TContext, TEvent, TStateSchema, TTypestate>;
     private batch;
     /**
      * Returns a send function bound to this interpreter instance.
      *
      * @param event The event to be sent by the sender.
      */
-    sender(event: Event<TEvent>): () => State<TContext, TEvent>;
+    sender(event: Event<TEvent>): () => State<TContext, TEvent, TStateSchema, TTypestate>;
     private sendTo;
     /**
      * Returns the next state given the interpreter's current state and the event.
@@ -147,7 +153,7 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      *
      * @param event The event to determine the next state
      */
-    nextState(event: Event<TEvent> | SCXML.Event<TEvent>): State<TContext, TEvent>;
+    nextState(event: Event<TEvent> | SCXML.Event<TEvent>): State<TContext, TEvent, TStateSchema, TTypestate>;
     private forward;
     private defer;
     private cancel;
@@ -179,6 +185,9 @@ 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, TTypestate extends Typestate<TContext> = any>(machine: StateMachine<TContext, TStateSchema, TEvent, TTypestate>, options?: Partial<InterpreterOptions>): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
+export declare function interpret<TContext = DefaultContext, TStateSchema extends StateSchema = any, TEvent extends EventObject = EventObject, TTypestate extends Typestate<TContext> = {
+    value: any;
+    context: TContext;
+}>(machine: StateMachine<TContext, TStateSchema, TEvent, TTypestate>, options?: Partial<InterpreterOptions>): Interpreter<TContext, TStateSchema, TEvent, TTypestate>;
 export {};
 //# sourceMappingURL=interpreter.d.ts.map

package/lib/interpreter.js

@@ -42,6 +42,7 @@ var __spread = (this && this.__spread) || function () {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.interpret = exports.spawn = exports.Interpreter = void 0;
 var types_1 = require("./types");
 var State_1 = require("./State");
 var actionTypes = require("./actionTypes");
@@ -53,22 +54,8 @@ var Actor_1 = require("./Actor");
 var stateUtils_1 = require("./stateUtils");
 var registry_1 = require("./registry");
 var devTools_1 = require("./devTools");
+var serviceScope = require("./serviceScope");
 var DEFAULT_SPAWN_OPTIONS = { sync: false, autoForward: false };
-/**
- * Maintains a stack of the current service in scope.
- * This is used to provide the correct service to spawn().
- *
- * @private
- */
-var withServiceScope = (function () {
-    var serviceStack = [];
-    return function (service, fn) {
-        service && serviceStack.push(service);
-        var result = fn(service || serviceStack[serviceStack.length - 1]);
-        service && serviceStack.pop();
-        return result;
-    };
-})();
 var InterpreterStatus;
 (function (InterpreterStatus) {
     InterpreterStatus[InterpreterStatus["NotStarted"] = 0] = "NotStarted";
@@ -191,12 +178,12 @@ var Interpreter = /** @class */ (function () {
             if (this._initialState) {
                 return this._initialState;
             }
-            return withServiceScope(this, function () {
+            return serviceScope.provide(this, function () {
                 _this._initialState = _this.machine.initialState;
                 return _this._initialState;
             });
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(Interpreter.prototype, "state", {
@@ -206,7 +193,7 @@ var Interpreter = /** @class */ (function () {
             }
             return this._state;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     /**
@@ -292,8 +279,8 @@ var Interpreter = /** @class */ (function () {
         if (this.state.configuration && isDone) {
             // get final child state node
             var finalChildStateNode = state.configuration.find(function (sn) { return sn.type === 'final' && sn.parent === _this.machine; });
-            var doneData = finalChildStateNode && finalChildStateNode.data
-                ? utils_1.mapContext(finalChildStateNode.data, state.context, _event)
+            var doneData = finalChildStateNode && finalChildStateNode.doneData
+                ? utils_1.mapContext(finalChildStateNode.doneData, state.context, _event)
                 : undefined;
             try {
                 for (var _l = __values(this.doneListeners), _m = _l.next(); !_m.done; _m = _l.next()) {
@@ -325,9 +312,8 @@ var Interpreter = /** @class */ (function () {
         }
         return this;
     };
-    Interpreter.prototype.subscribe = function (nextListenerOrObserver, 
-    // @ts-ignore
-    errorListener, completeListener) {
+    Interpreter.prototype.subscribe = function (nextListenerOrObserver, _, // TODO: error listener
+    completeListener) {
         var _this = this;
         if (!nextListenerOrObserver) {
             return { unsubscribe: function () { return void 0; } };
@@ -425,7 +411,7 @@ var Interpreter = /** @class */ (function () {
         this._status = InterpreterStatus.Running;
         var resolvedState = initialState === undefined
             ? this.initialState
-            : withServiceScope(this, function () {
+            : serviceScope.provide(this, function () {
                 return State_1.isState(initialState)
                     ? _this.machine.resolveState(initialState)
                     : _this.machine.resolveState(State_1.State.from(initialState, _this.machine.context));
@@ -547,7 +533,7 @@ var Interpreter = /** @class */ (function () {
             var _loop_1 = function (event_1) {
                 var _event = utils_1.toSCXMLEvent(event_1);
                 _this.forward(_event);
-                nextState = withServiceScope(_this, function () {
+                nextState = serviceScope.provide(_this, function () {
                     return _this.machine.transition(nextState, _event);
                 });
                 batchedActions.push.apply(batchedActions, __spread(nextState.actions.map(function (a) {
@@ -595,7 +581,7 @@ var Interpreter = /** @class */ (function () {
             !this.state.nextEvents.some(function (nextEvent) { return nextEvent.indexOf(actionTypes.errorPlatform) === 0; })) {
             throw _event.data.data;
         }
-        var nextState = withServiceScope(this, function () {
+        var nextState = serviceScope.provide(this, function () {
             return _this.machine.transition(_this.state, _event);
         });
         return nextState;
@@ -636,8 +622,10 @@ var Interpreter = /** @class */ (function () {
         delete this.delayedEventsMap[sendId];
     };
     Interpreter.prototype.exec = function (action, state, actionFunctionMap) {
+        if (actionFunctionMap === void 0) { actionFunctionMap = this.machine
+            .options.actions; }
         var context = state.context, _event = state._event;
-        var actionOrExec = actions_1.getActionFunction(action.type, actionFunctionMap) || action.exec;
+        var actionOrExec = action.exec || actions_1.getActionFunction(action.type, actionFunctionMap);
         var exec = utils_1.isFunction(actionOrExec)
             ? actionOrExec
             : actionOrExec
@@ -686,14 +674,14 @@ var Interpreter = /** @class */ (function () {
                 // If the activity will be stopped right after it's started
                 // (such as in transient states)
                 // don't bother starting the activity.
-                if (!this.state.activities[activity.type]) {
+                if (!this.state.activities[activity.id || activity.type]) {
                     break;
                 }
                 // Invoked services
                 if (activity.type === types_1.ActionTypes.Invoke) {
-                    var serviceCreator = this
-                        .machine.options.services
-                        ? this.machine.options.services[activity.src]
+                    var invokeSource = utils_1.toInvokeSource(activity.src);
+                    var serviceCreator = this.machine.options.services
+                        ? this.machine.options.services[invokeSource.type]
                         : undefined;
                     var id = activity.id, data = activity.data;
                     if (!environment_1.IS_PRODUCTION) {
@@ -712,8 +700,14 @@ var Interpreter = /** @class */ (function () {
                         }
                         return;
                     }
+                    var resolvedData = data
+                        ? utils_1.mapContext(data, context, _event)
+                        : undefined;
                     var source = utils_1.isFunction(serviceCreator)
-                        ? serviceCreator(context, _event.data)
+                        ? serviceCreator(context, _event.data, {
+                            data: resolvedData,
+                            src: invokeSource
+                        })
                         : serviceCreator;
                     if (utils_1.isPromiseLike(source)) {
                         this.state.children[id] = this.spawnPromise(Promise.resolve(source), id);
@@ -726,9 +720,7 @@ var Interpreter = /** @class */ (function () {
                     }
                     else if (utils_1.isMachine(source)) {
                         // TODO: try/catch here
-                        this.state.children[id] = this.spawnMachine(data
-                            ? source.withContext(utils_1.mapContext(data, context, _event))
-                            : source, {
+                        this.state.children[id] = this.spawnMachine(resolvedData ? source.withContext(resolvedData) : source, {
                             id: id,
                             autoForward: autoForward
                         });
@@ -1044,23 +1036,11 @@ var Interpreter = /** @class */ (function () {
         },
         logger: global.console.log.bind(console),
         devTools: false
-    }); })(typeof window === 'undefined' ? global : window);
+    }); })(typeof self !== 'undefined' ? self : global);
     Interpreter.interpret = interpret;
     return Interpreter;
 }());
 exports.Interpreter = Interpreter;
-var createNullActor = function (name) {
-    if (name === void 0) { name = 'null'; }
-    return ({
-        id: name,
-        send: function () { return void 0; },
-        subscribe: function () {
-            // tslint:disable-next-line:no-empty
-            return { unsubscribe: function () { } };
-        },
-        toJSON: function () { return ({ id: name }); }
-    });
-};
 var resolveSpawnOptions = function (nameOrOptions) {
     if (utils_1.isString(nameOrOptions)) {
         return __assign(__assign({}, DEFAULT_SPAWN_OPTIONS), { name: nameOrOptions });
@@ -1069,15 +1049,16 @@ var resolveSpawnOptions = function (nameOrOptions) {
 };
 function spawn(entity, nameOrOptions) {
     var resolvedOptions = resolveSpawnOptions(nameOrOptions);
-    return withServiceScope(undefined, function (service) {
+    return serviceScope.consume(function (service) {
         if (!environment_1.IS_PRODUCTION) {
-            utils_1.warn(!!service, "Attempted to spawn an Actor (ID: \"" + (utils_1.isMachine(entity) ? entity.id : 'undefined') + "\") outside of a service. This will have no effect.");
+            var isLazyEntity = utils_1.isMachine(entity) || utils_1.isFunction(entity);
+            utils_1.warn(!!service || isLazyEntity, "Attempted to spawn an Actor (ID: \"" + (utils_1.isMachine(entity) ? entity.id : 'undefined') + "\") outside of a service. This will have no effect.");
         }
         if (service) {
             return service.spawn(entity, resolvedOptions.name, resolvedOptions);
         }
         else {
-            return createNullActor(resolvedOptions.name);
+            return Actor_1.createDeferredActor(entity, resolvedOptions.name);
         }
     });
 }

package/lib/invokeUtils.d.ts

@@ -0,0 +1,7 @@
+import { EventObject, InvokeConfig, InvokeDefinition, InvokeSourceDefinition } from './types';
+export declare function toInvokeSource(src: string | InvokeSourceDefinition): InvokeSourceDefinition;
+export declare function toInvokeDefinition<TContext, TEvent extends EventObject>(invokeConfig: InvokeConfig<TContext, TEvent> & {
+    src: string | InvokeSourceDefinition;
+    id: string;
+}): InvokeDefinition<TContext, TEvent>;
+//# sourceMappingURL=invokeUtils.d.ts.map

package/lib/invokeUtils.js

@@ -0,0 +1,42 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toInvokeDefinition = exports.toInvokeSource = void 0;
+var actions_1 = require("./actions");
+function toInvokeSource(src) {
+    if (typeof src === 'string') {
+        var simpleSrc = { type: src };
+        simpleSrc.toString = function () { return src; }; // v4 compat - TODO: remove in v5
+        return simpleSrc;
+    }
+    return src;
+}
+exports.toInvokeSource = toInvokeSource;
+function toInvokeDefinition(invokeConfig) {
+    return __assign(__assign({ type: actions_1.actionTypes.invoke }, invokeConfig), { toJSON: function () {
+            var onDone = invokeConfig.onDone, onError = invokeConfig.onError, invokeDef = __rest(invokeConfig, ["onDone", "onError"]);
+            return __assign(__assign({}, invokeDef), { type: actions_1.actionTypes.invoke, src: toInvokeSource(invokeConfig.src) });
+        } });
+}
+exports.toInvokeDefinition = toInvokeDefinition;

package/lib/json.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.jsonify = exports.parse = exports.stringify = exports.machineToJSON = exports.stringifyFunction = void 0;
 var utils_1 = require("./utils");
 // tslint:disable-next-line:ban-types
 function stringifyFunction(fn) {

package/lib/mapState.js

@@ -11,6 +11,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapState = void 0;
 var utils_1 = require("./utils");
 function mapState(stateMap, stateId) {
     var e_1, _a;

package/lib/match.js

@@ -27,6 +27,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchState = void 0;
 var State_1 = require("./State");
 function matchState(state, patterns, defaultValue) {
     var e_1, _a;

package/lib/patterns.js

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sequence = exports.toggle = void 0;
 var utils_1 = require("./utils");
 function toggle(onState, offState, eventType) {
     var _a, _b, _c;

package/lib/registry.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.registry = void 0;
 var children = new Map();
 var sessionIdIndex = 0;
 exports.registry = {

package/lib/scheduler.js

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Scheduler = void 0;
 var defaultOptions = {
     deferEvents: false
 };

package/lib/scxml.js

@@ -42,6 +42,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toMachine = void 0;
 var xml_js_1 = require("xml-js");
 var index_1 = require("./index");
 var utils_1 = require("./utils");

package/lib/serviceScope.d.ts

@@ -0,0 +1,10 @@
+import { Interpreter } from './interpreter';
+export declare const provide: <T, TService extends Interpreter<any, any, any, {
+    value: any;
+    context: any;
+}>>(service: TService | undefined, fn: (service: TService | undefined) => T) => T;
+export declare const consume: <T, TService extends Interpreter<any, any, any, {
+    value: any;
+    context: any;
+}>>(fn: (service: TService) => T) => T;
+//# sourceMappingURL=serviceScope.d.ts.map