xstate 4.10.0 → 4.14.0

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, TStateSchema extends StateSchema<TContext> = any, TTypestate extends Typestate<TContext> = any> = (state: State<TContext, TEvent, TStateSchema, 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,15 @@ 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, TStateSchema, TTypestate>, TEvent> {
+export declare enum InterpreterStatus {
+    NotStarted = 0,
+    Running = 1,
+    Stopped = 2
+}
+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:
@@ -46,7 +57,7 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      * Whether the service is started.
      */
     initialized: boolean;
-    private _status;
+    status: InterpreterStatus;
     parent?: Interpreter<any>;
     id: string;
     /**
@@ -81,32 +92,32 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      * 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
      */
@@ -121,7 +132,7 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      *
      * 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,7 +142,7 @@ 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, TStateSchema, TTypestate>;
+    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.
@@ -171,7 +182,7 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
         id: string;
     };
 }
-export declare function spawn<TC, TE extends EventObject>(entity: StateMachine<TC, any, TE>, nameOrOptions?: string | SpawnOptions): Interpreter<TC, any, TE>;
+export declare function spawn<TC, TE extends EventObject>(entity: StateMachine<TC, any, TE>, nameOrOptions?: string | SpawnOptions): Actor<State<TC, TE>, TE>;
 export declare function spawn(entity: Spawnable, nameOrOptions?: string | SpawnOptions): Actor;
 /**
  * Creates a new Interpreter instance for the given machine with the provided options, if any.
@@ -179,6 +190,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 = exports.InterpreterStatus = void 0;
 var types_1 = require("./types");
 var State_1 = require("./State");
 var actionTypes = require("./actionTypes");
@@ -53,28 +54,14 @@ 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";
     InterpreterStatus[InterpreterStatus["Running"] = 1] = "Running";
     InterpreterStatus[InterpreterStatus["Stopped"] = 2] = "Stopped";
-})(InterpreterStatus || (InterpreterStatus = {}));
+})(InterpreterStatus = exports.InterpreterStatus || (exports.InterpreterStatus = {}));
 var Interpreter = /** @class */ (function () {
     /**
      * Creates a new Interpreter instance (i.e., service) for the given machine with the provided options, if any.
@@ -98,7 +85,7 @@ var Interpreter = /** @class */ (function () {
          * Whether the service is started.
          */
         this.initialized = false;
-        this._status = InterpreterStatus.NotStarted;
+        this.status = InterpreterStatus.NotStarted;
         this.children = new Map();
         this.forwardTo = new Set();
         /**
@@ -120,21 +107,15 @@ var Interpreter = /** @class */ (function () {
                 return _this.state;
             }
             var _event = utils_1.toSCXMLEvent(utils_1.toEventObject(event, payload));
-            if (_this._status === InterpreterStatus.Stopped) {
+            if (_this.status === InterpreterStatus.Stopped) {
                 // do nothing
                 if (!environment_1.IS_PRODUCTION) {
                     utils_1.warn(false, "Event \"" + _event.name + "\" was sent to stopped service \"" + _this.machine.id + "\". This service has already reached its final state, and will not transition.\nEvent: " + JSON.stringify(_event.data));
                 }
                 return _this.state;
             }
-            if (_this._status === InterpreterStatus.NotStarted &&
-                _this.options.deferEvents) {
-                // tslint:disable-next-line:no-console
-                if (!environment_1.IS_PRODUCTION) {
-                    utils_1.warn(false, "Event \"" + _event.name + "\" was sent to uninitialized service \"" + _this.machine.id + "\" and is deferred. Make sure .start() is called for this service.\nEvent: " + JSON.stringify(_event.data));
-                }
-            }
-            else if (_this._status !== InterpreterStatus.Running) {
+            if (_this.status !== InterpreterStatus.Running &&
+                !_this.options.deferEvents) {
                 throw new Error("Event \"" + _event.name + "\" was sent to uninitialized service \"" + _this.machine.id + "\". Make sure .start() is called for this service, or set { deferEvents: true } in the service options.\nEvent: " + JSON.stringify(_event.data));
             }
             _this.scheduler.schedule(function () {
@@ -191,22 +172,22 @@ 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", {
         get: function () {
             if (!environment_1.IS_PRODUCTION) {
-                utils_1.warn(this._status !== InterpreterStatus.NotStarted, "Attempted to read state from uninitialized service '" + this.id + "'. Make sure the service is started first.");
+                utils_1.warn(this.status !== InterpreterStatus.NotStarted, "Attempted to read state from uninitialized service '" + this.id + "'. Make sure the service is started first.");
             }
             return this._state;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     /**
@@ -242,6 +223,10 @@ var Interpreter = /** @class */ (function () {
         if (this.options.execute) {
             this.execute(this.state);
         }
+        // Update children
+        this.children.forEach(function (child) {
+            _this.state.children[child.id] = child;
+        });
         // Dev tools
         if (this.devTools) {
             this.devTools.send(_event.data, state);
@@ -290,10 +275,27 @@ var Interpreter = /** @class */ (function () {
         }
         var isDone = stateUtils_1.isInFinalState(state.configuration || [], this.machine);
         if (this.state.configuration && isDone) {
+            // exit interpreter procedure: https://www.w3.org/TR/scxml/#exitInterpreter
+            this.state.configuration.forEach(function (stateNode) {
+                var e_6, _a;
+                try {
+                    for (var _b = __values(stateNode.definition.exit), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var action = _c.value;
+                        _this.exec(action, state);
+                    }
+                }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                finally {
+                    try {
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    }
+                    finally { if (e_6) throw e_6.error; }
+                }
+            });
             // 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()) {
@@ -320,14 +322,13 @@ var Interpreter = /** @class */ (function () {
     Interpreter.prototype.onTransition = function (listener) {
         this.listeners.add(listener);
         // Send current state to listener
-        if (this._status === InterpreterStatus.Running) {
+        if (this.status === InterpreterStatus.Running) {
             listener(this.state, this.state.event);
         }
         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; } };
@@ -343,7 +344,7 @@ var Interpreter = /** @class */ (function () {
         }
         this.listeners.add(listener);
         // Send current state to listener
-        if (this._status === InterpreterStatus.Running) {
+        if (this.status === InterpreterStatus.Running) {
             listener(this.state);
         }
         if (resolvedCompleteListener) {
@@ -416,16 +417,16 @@ var Interpreter = /** @class */ (function () {
      */
     Interpreter.prototype.start = function (initialState) {
         var _this = this;
-        if (this._status === InterpreterStatus.Running) {
+        if (this.status === InterpreterStatus.Running) {
             // Do not restart the service if it is already started
             return this;
         }
         registry_1.registry.register(this.sessionId, this);
         this.initialized = true;
-        this._status = InterpreterStatus.Running;
+        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));
@@ -444,19 +445,19 @@ var Interpreter = /** @class */ (function () {
      * This will also notify the `onStop` listeners.
      */
     Interpreter.prototype.stop = function () {
-        var e_6, _a, e_7, _b, e_8, _c, e_9, _d, e_10, _e;
+        var e_7, _a, e_8, _b, e_9, _c, e_10, _d, e_11, _e;
         try {
             for (var _f = __values(this.listeners), _g = _f.next(); !_g.done; _g = _f.next()) {
                 var listener = _g.value;
                 this.listeners.delete(listener);
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         try {
             for (var _h = __values(this.stopListeners), _j = _h.next(); !_j.done; _j = _h.next()) {
@@ -466,12 +467,12 @@ var Interpreter = /** @class */ (function () {
                 this.stopListeners.delete(listener);
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         try {
             for (var _k = __values(this.contextListeners), _l = _k.next(); !_l.done; _l = _k.next()) {
@@ -479,12 +480,12 @@ var Interpreter = /** @class */ (function () {
                 this.contextListeners.delete(listener);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_9) throw e_9.error; }
         }
         try {
             for (var _m = __values(this.doneListeners), _o = _m.next(); !_o.done; _o = _m.next()) {
@@ -492,12 +493,12 @@ var Interpreter = /** @class */ (function () {
                 this.doneListeners.delete(listener);
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (_o && !_o.done && (_d = _m.return)) _d.call(_m);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         // Stop all children
         this.children.forEach(function (child) {
@@ -512,42 +513,42 @@ var Interpreter = /** @class */ (function () {
                 this.clock.clearTimeout(this.delayedEventsMap[key]);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (_q && !_q.done && (_e = _p.return)) _e.call(_p);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         this.scheduler.clear();
         this.initialized = false;
-        this._status = InterpreterStatus.Stopped;
+        this.status = InterpreterStatus.Stopped;
         registry_1.registry.free(this.sessionId);
         return this;
     };
     Interpreter.prototype.batch = function (events) {
         var _this = this;
-        if (this._status === InterpreterStatus.NotStarted &&
+        if (this.status === InterpreterStatus.NotStarted &&
             this.options.deferEvents) {
             // tslint:disable-next-line:no-console
             if (!environment_1.IS_PRODUCTION) {
                 utils_1.warn(false, events.length + " event(s) were sent to uninitialized service \"" + this.machine.id + "\" and are deferred. Make sure .start() is called for this service.\nEvent: " + JSON.stringify(event));
             }
         }
-        else if (this._status !== InterpreterStatus.Running) {
+        else if (this.status !== InterpreterStatus.Running) {
             throw new Error(
             // tslint:disable-next-line:max-line-length
             events.length + " event(s) were sent to uninitialized service \"" + this.machine.id + "\". Make sure .start() is called for this service, or set { deferEvents: true } in the service options.");
         }
         this.scheduler.schedule(function () {
-            var e_11, _a;
+            var e_12, _a;
             var nextState = _this.state;
             var batchChanged = false;
             var batchedActions = [];
             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) {
@@ -561,12 +562,12 @@ var Interpreter = /** @class */ (function () {
                     _loop_1(event_1);
                 }
             }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+            catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
                     if (events_1_1 && !events_1_1.done && (_a = events_1.return)) _a.call(events_1);
                 }
-                finally { if (e_11) throw e_11.error; }
+                finally { if (e_12) throw e_12.error; }
             }
             nextState.changed = batchChanged;
             nextState.actions = batchedActions;
@@ -595,13 +596,13 @@ 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;
     };
     Interpreter.prototype.forward = function (event) {
-        var e_12, _a;
+        var e_13, _a;
         try {
             for (var _b = __values(this.forwardTo), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var id = _c.value;
@@ -612,12 +613,12 @@ var Interpreter = /** @class */ (function () {
                 child.send(event);
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_13) throw e_13.error; }
         }
     };
     Interpreter.prototype.defer = function (sendAction) {
@@ -693,9 +694,9 @@ var Interpreter = /** @class */ (function () {
                 }
                 // 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) {
@@ -714,23 +715,27 @@ 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);
+                        this.spawnPromise(Promise.resolve(source), id);
                     }
                     else if (utils_1.isFunction(source)) {
-                        this.state.children[id] = this.spawnCallback(source, id);
+                        this.spawnCallback(source, id);
                     }
                     else if (utils_1.isObservable(source)) {
-                        this.state.children[id] = this.spawnObservable(source, id);
+                        this.spawnObservable(source, id);
                     }
                     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.spawnMachine(resolvedData ? source.withContext(resolvedData) : source, {
                             id: id,
                             autoForward: autoForward
                         });
@@ -1046,23 +1051,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 });
@@ -1071,15 +1064,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.d.ts

@@ -1,6 +1,9 @@
 import { State } from './State';
 import { StateValue, EventObject } from './types';
 export declare type ValueFromStateGetter<T, TContext, TEvent extends EventObject> = (state: State<TContext, TEvent>) => T;
-export declare type StatePatternTuple<T, TContext, TEvent extends EventObject> = [StateValue, ValueFromStateGetter<T, TContext, TEvent>];
+export declare type StatePatternTuple<T, TContext, TEvent extends EventObject> = [
+    StateValue,
+    ValueFromStateGetter<T, TContext, TEvent>
+];
 export declare function matchState<T, TContext, TEvent extends EventObject>(state: State<TContext, TEvent> | StateValue, patterns: Array<StatePatternTuple<T, TContext, TEvent>>, defaultValue: ValueFromStateGetter<T, TContext, TEvent>): T;
 //# sourceMappingURL=match.d.ts.map

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;