xstate 4.14.0 → 4.15.2

package/es/types.d.ts

@@ -1,7 +1,6 @@
 import { StateNode } from './StateNode';
 import { State } from './State';
 import { Interpreter, Clock } from './interpreter';
-import { Actor } from './Actor';
 export declare type EventType = string;
 export declare type ActionType = string;
 export declare type MetaObject = Record<string, any>;
@@ -223,7 +222,7 @@ export interface InvokeSourceDefinition {
     [key: string]: any;
     type: string;
 }
-export declare type InvokeConfig<TContext, TEvent extends EventObject> = {
+export interface InvokeConfig<TContext, TEvent extends EventObject> {
     /**
      * The unique identifier for the invoked machine. If not specified, this
      * will be the machine's own `id`, or the URL (from `src`).
@@ -260,7 +259,7 @@ export declare type 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>>>;
-};
+}
 export interface StateNodeConfig<TContext, TStateSchema extends StateSchema, TEvent extends EventObject> {
     /**
      * The relative key of the state node, which represents its location in the overall state value.
@@ -575,13 +574,13 @@ export interface LogActionObject<TContext, TEvent extends EventObject> extends L
     value: any;
 }
 export interface SendAction<TContext, TEvent extends EventObject, TSentEvent extends EventObject> extends ActionObject<TContext, TEvent> {
-    to: string | number | Actor | ExprWithMeta<TContext, TEvent, string | number | Actor> | undefined;
+    to: string | number | ActorRef<any> | ExprWithMeta<TContext, TEvent, string | number | ActorRef<any>> | undefined;
     event: TSentEvent | SendExpr<TContext, TEvent, TSentEvent>;
     delay?: number | string | DelayExpr<TContext, TEvent>;
     id: string | number;
 }
 export interface SendActionObject<TContext, TEvent extends EventObject, TSentEvent extends EventObject = AnyEventObject> extends SendAction<TContext, TEvent, TSentEvent> {
-    to: string | number | Actor | undefined;
+    to: string | number | ActorRef<any> | undefined;
     _event: SCXML.Event<TSentEvent>;
     event: TSentEvent;
     delay?: number;
@@ -611,7 +610,7 @@ export declare enum SpecialTargets {
 export interface SendActionOptions<TContext, TEvent extends EventObject> {
     id?: string | number;
     delay?: number | string | DelayExpr<TContext, TEvent>;
-    to?: string | ExprWithMeta<TContext, TEvent, string | number | Actor>;
+    to?: string | ExprWithMeta<TContext, TEvent, string | number | ActorRef<any>>;
 }
 export interface CancelAction extends ActionObject<any, any> {
     sendId: string | number;
@@ -652,6 +651,7 @@ export interface TransitionDefinition<TContext, TEvent extends EventObject> exte
         actions: Array<ActionObject<TContext, TEvent>>;
         cond?: Guard<TContext, TEvent>;
         eventType: TEvent['type'] | NullEvent['type'] | '*';
+        meta?: Record<string, any>;
     };
 }
 export declare type TransitionDefinitionMap<TContext, TEvent extends EventObject> = {
@@ -741,7 +741,7 @@ export interface StateConfig<TContext, TEvent extends EventObject> {
     events?: TEvent[];
     configuration: Array<StateNode<TContext, any, TEvent>>;
     transitions: Array<TransitionDefinition<TContext, TEvent>>;
-    children: Record<string, Actor>;
+    children: Record<string, ActorRef<any>>;
     done?: boolean;
 }
 export interface StateSchema<TC = any> {
@@ -841,17 +841,29 @@ export declare namespace SCXML {
         $$type: 'scxml';
     }
 }
-export interface Unsubscribable {
-    unsubscribe(): void;
-}
-export interface Subscribable<T> {
-    subscribe(next?: (value: T) => void, error?: (error: any) => void, complete?: () => void): Unsubscribable;
-}
 export interface Observer<T> {
     next: (value: T) => void;
     error: (err: any) => void;
     complete: () => void;
 }
+export interface Subscription {
+    unsubscribe(): void;
+}
+export interface Subscribable<T> {
+    subscribe(observer: Observer<T>): Subscription;
+    subscribe(next: (value: T) => void, error?: (error: any) => void, complete?: () => void): Subscription;
+}
 export declare type Spawnable = StateMachine<any, any, any> | Promise<any> | InvokeCallback | Subscribable<any>;
+export interface ActorRef<TEvent extends EventObject, TEmitted = any> extends Subscribable<TEmitted> {
+    send: Sender<TEvent>;
+}
+export interface SpawnedActorRef<TEvent extends EventObject, TEmitted = any> extends ActorRef<TEvent, TEmitted> {
+    id: string;
+    stop?: () => void;
+    toJSON?: () => any;
+}
+export declare type ActorRefFrom<T extends StateMachine<any, any, any>> = T extends StateMachine<infer TContext, any, infer TEvent, infer TTypestate> ? SpawnedActorRef<TEvent, State<TContext, TEvent, any, TTypestate>> & {
+    state: State<TContext, TEvent, any, TTypestate>;
+} : never;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/es/utils.d.ts

@@ -1,6 +1,6 @@
 import { Event, StateValue, ActionType, Action, EventObject, PropertyMapper, Mapper, EventType, HistoryValue, AssignAction, Condition, Subscribable, StateMachine, ConditionPredicate, SCXML, StateLike, EventData, TransitionConfig, TransitionConfigTarget, NullEvent, SingleOrArray, Guard, InvokeSourceDefinition } from './types';
 import { StateNode } from './StateNode';
-import { State } from '.';
+import { Observer, State } from '.';
 import { Actor } from './Actor';
 export declare function keys<T extends object>(value: T): Array<keyof T & string>;
 export declare function matchesState(parentStateId: StateValue, childStateId: StateValue, delimiter?: string): boolean;
@@ -66,4 +66,5 @@ export declare function normalizeTarget<TContext, TEvent extends EventObject>(ta
 export declare function reportUnhandledExceptionOnInvocation(originalError: any, currentError: any, id: string): void;
 export declare function evaluateGuard<TContext, TEvent extends EventObject>(machine: StateNode<TContext, any, TEvent>, 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/es/utils.js

@@ -494,6 +494,10 @@ function isMachine(value) {
   }
 }
 
+function isActor(value) {
+  return !!value && typeof value.send === 'function';
+}
+
 var uniqueId = /*#__PURE__*/function () {
   var currentId = 0;
   return function () {
@@ -597,4 +601,20 @@ function toInvokeSource(src) {
   return src;
 }
 
-export { evaluateGuard, flatten, getEventType, isArray, isBuiltInEvent, isFunction, isMachine, isObservable, isPromiseLike, isStateLike, isString, keys, mapContext, mapFilterValues, mapValues, matchesState, nestedPath, normalizeTarget, partition, path, pathToStateValue, reportUnhandledExceptionOnInvocation, symbolObservable, toArray, toArrayStrict, toEventObject, toGuard, toInvokeSource, toSCXMLEvent, toStatePath, toStatePaths, toStateValue, toTransitionConfigArray, uniqueId, updateContext, updateHistoryStates, updateHistoryValue, warn };
+function toObserver(nextHandler, errorHandler, completionHandler) {
+  if (typeof nextHandler === 'object') {
+    return nextHandler;
+  }
+
+  var noop = function () {
+    return void 0;
+  };
+
+  return {
+    next: nextHandler,
+    error: errorHandler || noop,
+    complete: completionHandler || noop
+  };
+}
+
+export { evaluateGuard, flatten, getEventType, isActor, isArray, isBuiltInEvent, isFunction, isMachine, isObservable, isPromiseLike, isStateLike, isString, keys, mapContext, mapFilterValues, mapValues, matchesState, nestedPath, normalizeTarget, partition, path, pathToStateValue, reportUnhandledExceptionOnInvocation, symbolObservable, toArray, toArrayStrict, toEventObject, toGuard, toInvokeSource, toObserver, toSCXMLEvent, toStatePath, toStatePaths, toStateValue, toTransitionConfigArray, uniqueId, updateContext, updateHistoryStates, updateHistoryValue, warn };

package/lib/Actor.d.ts

@@ -1,4 +1,5 @@
 import { EventObject, Subscribable, InvokeDefinition, AnyEventObject, StateMachine, Spawnable, SCXML } from './types';
+import { ActorRef, SpawnedActorRef } from '.';
 export interface Actor<TContext = any, TEvent extends EventObject = AnyEventObject> extends Subscribable<TContext> {
     id: string;
     send: (event: TEvent) => any;
@@ -19,5 +20,6 @@ export declare function createNullActor(id: string): Actor;
  */
 export declare function createInvocableActor<TC, TE extends EventObject>(invokeDefinition: InvokeDefinition<TC, TE>, machine: StateMachine<TC, any, TE>, context: TC, _event: SCXML.Event<TE>): Actor;
 export declare function createDeferredActor(entity: Spawnable, id: string, data?: any): Actor;
-export declare function isActor(item: any): item is Actor;
+export declare function isActor(item: any): item is ActorRef<any>;
+export declare function isSpawnedActor(item: any): item is SpawnedActorRef<any>;
 //# sourceMappingURL=Actor.d.ts.map

package/lib/Actor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isActor = exports.createDeferredActor = exports.createInvocableActor = exports.createNullActor = void 0;
+exports.isSpawnedActor = exports.isActor = exports.createDeferredActor = exports.createInvocableActor = exports.createNullActor = void 0;
 var utils_1 = require("./utils");
 var serviceScope = require("./serviceScope");
 function createNullActor(id) {
@@ -55,3 +55,7 @@ function isActor(item) {
     }
 }
 exports.isActor = isActor;
+function isSpawnedActor(item) {
+    return isActor(item) && 'id' in item;
+}
+exports.isSpawnedActor = isSpawnedActor;

package/lib/State.d.ts

@@ -1,6 +1,5 @@
-import { StateValue, ActivityMap, EventObject, HistoryValue, ActionObject, EventType, StateConfig, SCXML, StateSchema, TransitionDefinition, Typestate } from './types';
+import { StateValue, ActivityMap, EventObject, HistoryValue, ActionObject, EventType, StateConfig, SCXML, StateSchema, TransitionDefinition, Typestate, ActorRef } from './types';
 import { StateNode } from './StateNode';
-import { Actor } from './Actor';
 export declare function stateValuesEqual(a: StateValue | undefined, b: StateValue | undefined): boolean;
 export declare function isState<TContext, TEvent extends EventObject, TStateSchema extends StateSchema<TContext> = any, TTypestate extends Typestate<TContext> = {
     value: any;
@@ -50,7 +49,7 @@ export declare class State<TContext, TEvent extends EventObject = EventObject, T
     /**
      * An object mapping actor IDs to spawned actors/invoked services.
      */
-    children: Record<string, Actor>;
+    children: Record<string, ActorRef<any>>;
     /**
      * Creates a new State instance for the given `stateValue` and `context`.
      * @param stateValue

package/lib/StateNode.js

@@ -883,7 +883,6 @@ var StateNode = /** @class */ (function () {
                 : undefined);
         maybeNextState.changed = changed;
         // Preserve original history after raised events
-        maybeNextState.historyValue = nextState.historyValue;
         maybeNextState.history = history;
         return maybeNextState;
     };

package/lib/actions.js

@@ -85,7 +85,7 @@ function toActionObject(action, actionFunctionMap) {
     return actionObject;
 }
 exports.toActionObject = toActionObject;
-exports.toActionObjects = function (action, actionFunctionMap) {
+var toActionObjects = function (action, actionFunctionMap) {
     if (!action) {
         return [];
     }
@@ -94,6 +94,7 @@ exports.toActionObjects = function (action, actionFunctionMap) {
         return toActionObject(subAction, actionFunctionMap);
     });
 };
+exports.toActionObjects = toActionObjects;
 function toActivityDefinition(action) {
     var actionObject = toActionObject(action);
     return __assign(__assign({ id: utils_1.isString(action) ? action : actionObject.id }, actionObject), { type: actionObject.type });
@@ -223,11 +224,12 @@ function log(expr, label) {
     };
 }
 exports.log = log;
-exports.resolveLog = function (action, ctx, _event) { return (__assign(__assign({}, action), { value: utils_1.isString(action.expr)
+var resolveLog = function (action, ctx, _event) { return (__assign(__assign({}, action), { value: utils_1.isString(action.expr)
         ? action.expr
         : action.expr(ctx, _event.data, {
             _event: _event
         }) })); };
+exports.resolveLog = resolveLog;
 /**
  * Cancels an in-flight `send(...)` action. A canceled sent action will not
  * be executed, nor will its event be sent, unless it has already been sent
@@ -235,12 +237,13 @@ exports.resolveLog = function (action, ctx, _event) { return (__assign(__assign(
  *
  * @param sendId The `id` of the `send(...)` action to cancel.
  */
-exports.cancel = function (sendId) {
+var cancel = function (sendId) {
     return {
         type: actionTypes.cancel,
         sendId: sendId
     };
 };
+exports.cancel = cancel;
 /**
  * Starts an activity.
  *
@@ -290,12 +293,13 @@ exports.resolveStop = resolveStop;
  *
  * @param assignment An object that represents the partial context to update.
  */
-exports.assign = function (assignment) {
+var assign = function (assignment) {
     return {
         type: actionTypes.assign,
         assignment: assignment
     };
 };
+exports.assign = assign;
 function isActionObject(action) {
     return typeof action === 'object' && 'type' in action;
 }

package/lib/devTools.d.ts

@@ -1,5 +1,14 @@
 import { Interpreter } from '.';
 declare type AnyInterpreter = Interpreter<any, any, any>;
+declare type ServiceListener = (service: AnyInterpreter) => void;
+export interface XStateDevInterface {
+    register: (service: Interpreter<any>) => void;
+    unregister: (service: Interpreter<any>) => void;
+    onRegister: (listener: ServiceListener) => {
+        unsubscribe: () => void;
+    };
+    services: Set<Interpreter<any>>;
+}
 export declare function registerService(service: AnyInterpreter): void;
 export {};
 //# sourceMappingURL=devTools.d.ts.map

package/lib/devTools.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerService = void 0;
 var environment_1 = require("./environment");
 function getDevTools() {
-    var w = window;
-    if (!!w.__xstate__) {
-        return w.__xstate__;
+    if (!!window.__xstate__) {
+        return window.__xstate__;
     }
     return undefined;
 }

package/lib/interpreter.d.ts

@@ -1,6 +1,7 @@
-import { StateMachine, Event, EventObject, DefaultContext, StateSchema, StateValue, InterpreterOptions, SingleOrArray, DoneEvent, Unsubscribable, MachineOptions, SCXML, EventData, Observer, Spawnable, Typestate } from './types';
+import { StateMachine, Event, EventObject, DefaultContext, StateSchema, StateValue, InterpreterOptions, SingleOrArray, DoneEvent, MachineOptions, SCXML, EventData, Observer, Spawnable, Typestate } from './types';
 import { State } from './State';
 import { Actor } from './Actor';
+import { ActorRefFrom, SpawnedActorRef, Subscription } from '.';
 export declare type StateListener<TContext, TEvent extends EventObject, TStateSchema extends StateSchema<TContext> = any, TTypestate extends Typestate<TContext> = {
     value: any;
     context: TContext;
@@ -64,7 +65,7 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
      * The globally unique process ID for this invocation.
      */
     sessionId: string;
-    children: Map<string | number, Actor>;
+    children: Map<string | number, SpawnedActorRef<any>>;
     private forwardTo;
     private devTools?;
     /**
@@ -86,8 +87,8 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
     execute(state: State<TContext, TEvent, TStateSchema, TTypestate>, actionsConfig?: MachineOptions<TContext, TEvent>['actions']): void;
     private update;
     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;
+    subscribe(observer: Observer<State<TContext, TEvent, any, TTypestate>>): Subscription;
+    subscribe(nextListener?: (state: State<TContext, TEvent, any, TTypestate>) => void, errorListener?: (error: any) => void, completeListener?: () => void): Subscription;
     /**
      * Adds an event listener that is notified whenever an event is sent to the running interpreter.
      * @param listener The event listener
@@ -165,12 +166,12 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
     private exec;
     private removeChild;
     private stopChild;
-    spawn(entity: Spawnable, name: string, options?: SpawnOptions): Actor;
+    spawn(entity: Spawnable, name: string, options?: SpawnOptions): SpawnedActorRef<any>;
     spawnMachine<TChildContext, TChildStateSchema, TChildEvent extends EventObject>(machine: StateMachine<TChildContext, TChildStateSchema, TChildEvent>, options?: {
         id?: string;
         autoForward?: boolean;
         sync?: boolean;
-    }): Interpreter<TChildContext, TChildStateSchema, TChildEvent>;
+    }): SpawnedActorRef<TChildEvent, State<TChildContext, TChildEvent>>;
     private spawnPromise;
     private spawnCallback;
     private spawnObservable;
@@ -182,8 +183,8 @@ 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): Actor<State<TC, TE>, TE>;
-export declare function spawn(entity: Spawnable, nameOrOptions?: string | SpawnOptions): Actor;
+export declare function spawn<TC, TE extends EventObject>(entity: StateMachine<TC, any, TE>, nameOrOptions?: string | SpawnOptions): ActorRefFrom<StateMachine<TC, any, TE>>;
+export declare function spawn(entity: Spawnable, nameOrOptions?: string | SpawnOptions): SpawnedActorRef<any>;
 /**
  * Creates a new Interpreter instance for the given machine with the provided options, if any.
  *

package/lib/interpreter.js

@@ -131,9 +131,11 @@ var Interpreter = /** @class */ (function () {
             var isParent = _this.parent && (to === types_1.SpecialTargets.Parent || _this.parent.id === to);
             var target = isParent
                 ? _this.parent
-                : Actor_1.isActor(to)
-                    ? to
-                    : _this.children.get(to) || registry_1.registry.get(to);
+                : utils_1.isString(to)
+                    ? _this.children.get(to) || registry_1.registry.get(to)
+                    : utils_1.isActor(to)
+                        ? to
+                        : undefined;
             if (!target) {
                 if (!isParent) {
                     throw new Error("Unable to send event to child '" + to + "' from service '" + _this.id + "'.");
@@ -275,23 +277,6 @@ 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.doneData
@@ -445,19 +430,20 @@ var Interpreter = /** @class */ (function () {
      * This will also notify the `onStop` listeners.
      */
     Interpreter.prototype.stop = function () {
-        var e_7, _a, e_8, _b, e_9, _c, e_10, _d, e_11, _e;
+        var e_6, _a, e_7, _b, e_8, _c, e_9, _d, e_10, _e;
+        var _this = this;
         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_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         try {
             for (var _h = __values(this.stopListeners), _j = _h.next(); !_j.done; _j = _h.next()) {
@@ -467,12 +453,12 @@ var Interpreter = /** @class */ (function () {
                 this.stopListeners.delete(listener);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         try {
             for (var _k = __values(this.contextListeners), _l = _k.next(); !_l.done; _l = _k.next()) {
@@ -480,12 +466,12 @@ var Interpreter = /** @class */ (function () {
                 this.contextListeners.delete(listener);
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         try {
             for (var _m = __values(this.doneListeners), _o = _m.next(); !_o.done; _o = _m.next()) {
@@ -493,13 +479,29 @@ var Interpreter = /** @class */ (function () {
                 this.doneListeners.delete(listener);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (_o && !_o.done && (_d = _m.return)) _d.call(_m);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_9) throw e_9.error; }
         }
+        this.state.configuration.forEach(function (stateNode) {
+            var e_11, _a;
+            try {
+                for (var _b = __values(stateNode.definition.exit), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var action = _c.value;
+                    _this.exec(action, _this.state);
+                }
+            }
+            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_11) throw e_11.error; }
+            }
+        });
         // Stop all children
         this.children.forEach(function (child) {
             if (utils_1.isFunction(child.stop)) {
@@ -513,12 +515,12 @@ var Interpreter = /** @class */ (function () {
                 this.clock.clearTimeout(this.delayedEventsMap[key]);
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (_q && !_q.done && (_e = _p.return)) _e.call(_p);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         this.scheduler.clear();
         this.initialized = false;
@@ -792,7 +794,7 @@ var Interpreter = /** @class */ (function () {
         else if (utils_1.isFunction(entity)) {
             return this.spawnCallback(entity, name);
         }
-        else if (Actor_1.isActor(entity)) {
+        else if (Actor_1.isSpawnedActor(entity)) {
             return this.spawnActor(entity);
         }
         else if (utils_1.isObservable(entity)) {
@@ -866,21 +868,22 @@ var Interpreter = /** @class */ (function () {
             id: id,
             send: function () { return void 0; },
             subscribe: function (next, handleError, complete) {
+                var observer = utils_1.toObserver(next, handleError, complete);
                 var unsubscribed = false;
                 promise.then(function (response) {
                     if (unsubscribed) {
                         return;
                     }
-                    next && next(response);
+                    observer.next(response);
                     if (unsubscribed) {
                         return;
                     }
-                    complete && complete();
+                    observer.complete();
                 }, function (err) {
                     if (unsubscribed) {
                         return;
                     }
-                    handleError(err);
+                    observer.error(err);
                 });
                 return {
                     unsubscribe: function () { return (unsubscribed = true); }
@@ -906,7 +909,7 @@ var Interpreter = /** @class */ (function () {
             if (canceled) {
                 return;
             }
-            _this.send(e);
+            _this.send(utils_1.toSCXMLEvent(e, { origin: id }));
         };
         var callbackStop;
         try {
@@ -1043,10 +1046,10 @@ var Interpreter = /** @class */ (function () {
         deferEvents: true,
         clock: {
             setTimeout: function (fn, ms) {
-                return global.setTimeout.call(null, fn, ms);
+                return setTimeout(fn, ms);
             },
             clearTimeout: function (id) {
-                return global.clearTimeout.call(null, id);
+                return clearTimeout(id);
             }
         },
         logger: global.console.log.bind(console),

package/lib/serviceScope.js

@@ -6,10 +6,12 @@ exports.consume = exports.provide = void 0;
  * This is used to provide the correct service to spawn().
  */
 var serviceStack = [];
-exports.provide = function (service, fn) {
+var provide = function (service, fn) {
     serviceStack.push(service);
     var result = fn(service);
     serviceStack.pop();
     return result;
 };
-exports.consume = function (fn) { return fn(serviceStack[serviceStack.length - 1]); };
+exports.provide = provide;
+var consume = function (fn) { return fn(serviceStack[serviceStack.length - 1]); };
+exports.consume = consume;

package/lib/stateUtils.js

@@ -33,9 +33,10 @@ var __spread = (this && this.__spread) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isInFinalState = exports.nextEvents = exports.has = exports.getValue = exports.getAdjList = exports.getConfiguration = exports.getAllStateNodes = exports.getChildren = exports.isLeafNode = void 0;
 var utils_1 = require("./utils");
-exports.isLeafNode = function (stateNode) {
+var isLeafNode = function (stateNode) {
     return stateNode.type === 'atomic' || stateNode.type === 'final';
 };
+exports.isLeafNode = isLeafNode;
 function getChildren(stateNode) {
     return utils_1.keys(stateNode.states).map(function (key) { return stateNode.states[key]; });
 }