xstate 4.13.0 → 4.15.1

package/es/interpreter.js

@@ -1,13 +1,13 @@
 import { __values, __assign, __spread } from './_virtual/_tslib.js';
 import { IS_PRODUCTION } from './environment.js';
-import { warn, mapContext, isFunction, keys, toSCXMLEvent, toInvokeSource, isPromiseLike, isObservable, isMachine, reportUnhandledExceptionOnInvocation, symbolObservable, isArray, toEventObject, isString, uniqueId } from './utils.js';
+import { warn, mapContext, isFunction, keys, toSCXMLEvent, toInvokeSource, isPromiseLike, isObservable, isMachine, reportUnhandledExceptionOnInvocation, symbolObservable, isArray, toEventObject, isString, isActor, uniqueId, toObserver } from './utils.js';
 import { ActionTypes, SpecialTargets } from './types.js';
 import { isInFinalState } from './stateUtils.js';
 import { errorPlatform, log, stop, start, cancel, send, update, error as error$1 } from './actionTypes.js';
 import { doneInvoke, initEvent, getActionFunction, error } from './actions.js';
 import { isState, State, bindActionToState } from './State.js';
 import { provide, consume } from './serviceScope.js';
-import { isActor, createDeferredActor } from './Actor.js';
+import { isSpawnedActor, createDeferredActor } from './Actor.js';
 import { Scheduler } from './scheduler.js';
 import { registry } from './registry.js';
 import { registerService } from './devTools.js';
@@ -55,7 +55,7 @@ function () {
      */
 
     this.initialized = false;
-    this._status = InterpreterStatus.NotStarted;
+    this.status = InterpreterStatus.NotStarted;
     this.children = new Map();
     this.forwardTo = new Set();
     /**
@@ -82,7 +82,7 @@ function () {
 
       var _event = toSCXMLEvent(toEventObject(event, payload));
 
-      if (_this._status === InterpreterStatus.Stopped) {
+      if (_this.status === InterpreterStatus.Stopped) {
         // do nothing
         if (!IS_PRODUCTION) {
           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));
@@ -91,12 +91,7 @@ function () {
         return _this.state;
       }
 
-      if (_this._status === InterpreterStatus.NotStarted && _this.options.deferEvents) {
-        // tslint:disable-next-line:no-console
-        if (!IS_PRODUCTION) {
-          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));
       }
 
@@ -115,7 +110,7 @@ function () {
 
     this.sendTo = function (event, to) {
       var isParent = _this.parent && (to === SpecialTargets.Parent || _this.parent.id === to);
-      var target = isParent ? _this.parent : isActor(to) ? to : _this.children.get(to) || registry.get(to);
+      var target = isParent ? _this.parent : isString(to) ? _this.children.get(to) || registry.get(to) : isActor(to) ? to : undefined;
 
       if (!target) {
         if (!isParent) {
@@ -179,7 +174,7 @@ function () {
   Object.defineProperty(Interpreter.prototype, "state", {
     get: function () {
       if (!IS_PRODUCTION) {
-        warn(this._status !== InterpreterStatus.NotStarted, "Attempted to read state from uninitialized service '" + this.id + "'. Make sure the service is started first.");
+        warn(this.status !== InterpreterStatus.NotStarted, "Attempted to read state from uninitialized service '" + this.id + "'. Make sure the service is started first.");
       }
 
       return this._state;
@@ -227,9 +222,13 @@ function () {
 
     if (this.options.execute) {
       this.execute(this.state);
-    } // Dev tools
+    } // Update children
 
 
+    this.children.forEach(function (child) {
+      _this.state.children[child.id] = child;
+    }); // Dev tools
+
     if (this.devTools) {
       this.devTools.send(_event.data, state);
     } // Execute listeners
@@ -328,7 +327,7 @@ 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);
     }
 
@@ -359,7 +358,7 @@ function () {
 
     this.listeners.add(listener); // Send current state to listener
 
-    if (this._status === InterpreterStatus.Running) {
+    if (this.status === InterpreterStatus.Running) {
       listener(this.state);
     }
 
@@ -448,14 +447,14 @@ 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.register(this.sessionId, this);
     this.initialized = true;
-    this._status = InterpreterStatus.Running;
+    this.status = InterpreterStatus.Running;
     var resolvedState = initialState === undefined ? this.initialState : provide(this, function () {
       return isState(initialState) ? _this.machine.resolveState(initialState) : _this.machine.resolveState(State.from(initialState, _this.machine.context));
     });
@@ -479,6 +478,8 @@ function () {
   Interpreter.prototype.stop = function () {
     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;
@@ -547,8 +548,29 @@ function () {
       } finally {
         if (e_9) throw e_9.error;
       }
-    } // Stop all children
+    }
 
+    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 (isFunction(child.stop)) {
@@ -576,7 +598,7 @@ function () {
 
     this.scheduler.clear();
     this.initialized = false;
-    this._status = InterpreterStatus.Stopped;
+    this.status = InterpreterStatus.Stopped;
     registry.free(this.sessionId);
     return this;
   };
@@ -584,18 +606,18 @@ function () {
   Interpreter.prototype.batch = function (events) {
     var _this = this;
 
-    if (this._status === InterpreterStatus.NotStarted && this.options.deferEvents) {
+    if (this.status === InterpreterStatus.NotStarted && this.options.deferEvents) {
       // tslint:disable-next-line:no-console
       if (!IS_PRODUCTION) {
         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;
@@ -621,15 +643,15 @@ 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;
+          if (e_12) throw e_12.error;
         }
       }
 
@@ -676,7 +698,7 @@ function () {
   };
 
   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()) {
@@ -689,15 +711,15 @@ 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;
+        if (e_13) throw e_13.error;
       }
     }
   };
@@ -809,14 +831,14 @@ function () {
             }) : serviceCreator;
 
             if (isPromiseLike(source)) {
-              this.state.children[id] = this.spawnPromise(Promise.resolve(source), id);
+              this.spawnPromise(Promise.resolve(source), id);
             } else if (isFunction(source)) {
-              this.state.children[id] = this.spawnCallback(source, id);
+              this.spawnCallback(source, id);
             } else if (isObservable(source)) {
-              this.state.children[id] = this.spawnObservable(source, id);
+              this.spawnObservable(source, id);
             } else if (isMachine(source)) {
               // TODO: try/catch here
-              this.state.children[id] = this.spawnMachine(resolvedData ? source.withContext(resolvedData) : source, {
+              this.spawnMachine(resolvedData ? source.withContext(resolvedData) : source, {
                 id: id,
                 autoForward: autoForward
               });
@@ -882,7 +904,7 @@ function () {
       return this.spawnPromise(Promise.resolve(entity), name);
     } else if (isFunction(entity)) {
       return this.spawnCallback(entity, name);
-    } else if (isActor(entity)) {
+    } else if (isSpawnedActor(entity)) {
       return this.spawnActor(entity);
     } else if (isObservable(entity)) {
       return this.spawnObservable(entity, name);
@@ -981,25 +1003,26 @@ function () {
         return void 0;
       },
       subscribe: function (next, handleError, complete) {
+        var observer = 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 () {
@@ -1223,10 +1246,10 @@ 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),
@@ -1278,4 +1301,4 @@ function interpret(machine, options) {
   return interpreter;
 }
 
-export { Interpreter, interpret, spawn };
+export { Interpreter, InterpreterStatus, interpret, spawn };

package/es/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/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>;
@@ -116,6 +115,24 @@ export interface ActivityDefinition<TContext, TEvent extends EventObject> extend
     type: string;
 }
 export declare type Sender<TEvent extends EventObject> = (event: Event<TEvent>) => void;
+declare type ExcludeType<A> = {
+    [K in Exclude<keyof A, 'type'>]: A[K];
+};
+declare type ExtractExtraParameters<A, T> = A extends {
+    type: T;
+} ? ExcludeType<A> : never;
+declare type ExtractSimple<A> = A extends any ? {} extends ExcludeType<A> ? A : never : never;
+declare type NeverIfEmpty<T> = {} extends T ? never : T;
+export interface PayloadSender<TEvent extends EventObject> {
+    /**
+     * Send an event object or just the event type, if the event has no other payload
+     */
+    (event: TEvent | ExtractSimple<TEvent>['type']): void;
+    /**
+     * Send an event type and its payload
+     */
+    <K extends TEvent['type']>(eventType: K, payload: NeverIfEmpty<ExtractExtraParameters<TEvent, K>>): void;
+}
 export declare type Receiver<TEvent extends EventObject> = (listener: (event: TEvent) => void) => void;
 export declare type InvokeCallback = (callback: Sender<any>, onReceive: Receiver<EventObject>) => any;
 export interface InvokeMeta {
@@ -205,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`).
@@ -242,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.
@@ -541,7 +558,7 @@ export interface NullEvent {
 }
 export interface ActivityActionObject<TContext, TEvent extends EventObject> extends ActionObject<TContext, TEvent> {
     type: ActionTypes.Start | ActionTypes.Stop;
-    activity: ActivityDefinition<TContext, TEvent>;
+    activity: ActivityDefinition<TContext, TEvent> | undefined;
     exec: ActionFunction<TContext, TEvent> | undefined;
 }
 export interface InvokeActionObject<TContext, TEvent extends EventObject> extends ActivityActionObject<TContext, TEvent> {
@@ -557,18 +574,32 @@ 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;
     id: string | number;
 }
+export interface StopAction<TContext, TEvent extends EventObject> extends ActionObject<TContext, TEvent> {
+    type: ActionTypes.Stop;
+    activity: string | {
+        id: string;
+    } | Expr<TContext, TEvent, string | {
+        id: string;
+    }>;
+}
+export interface StopActionObject {
+    type: ActionTypes.Stop;
+    activity: {
+        id: string;
+    };
+}
 export declare type Expr<TContext, TEvent extends EventObject, T> = (context: TContext, event: TEvent) => T;
 export declare type ExprWithMeta<TContext, TEvent extends EventObject, T> = (context: TContext, event: TEvent, meta: SCXMLEventMeta<TEvent>) => T;
 export declare type SendExpr<TContext, TEvent extends EventObject, TSentEvent extends EventObject = AnyEventObject> = ExprWithMeta<TContext, TEvent, TSentEvent>;
@@ -579,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;
@@ -620,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> = {
@@ -709,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> {
@@ -809,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

@@ -792,8 +792,9 @@ var StateNode = /** @class */ (function () {
                         types_1.SpecialTargets.Internal);
         }), 2), raisedEvents = _c[0], nonRaisedActions = _c[1];
         var invokeActions = resolvedActions.filter(function (action) {
+            var _a;
             return (action.type === actionTypes.start &&
-                action.activity.type ===
+                ((_a = action.activity) === null || _a === void 0 ? void 0 : _a.type) ===
                     actionTypes.invoke);
         });
         var children = invokeActions.reduce(function (acc, action) {
@@ -882,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.d.ts

@@ -1,7 +1,8 @@
-import { Action, Event, EventObject, SingleOrArray, SendAction, SendActionOptions, CancelAction, ActionObject, ActionType, Assigner, PropertyAssigner, AssignAction, ActionFunction, ActionFunctionMap, ActivityActionObject, ActionTypes, ActivityDefinition, RaiseAction, RaiseActionObject, DoneEvent, ErrorPlatformEvent, DoneEventObject, SendExpr, SendActionObject, PureAction, LogExpr, LogAction, LogActionObject, DelayFunctionMap, SCXML, ExprWithMeta, ChooseConditon, ChooseAction, AnyEventObject } from './types';
+import { Action, Event, EventObject, SingleOrArray, SendAction, SendActionOptions, CancelAction, ActionObject, ActionType, Assigner, PropertyAssigner, AssignAction, ActionFunction, ActionFunctionMap, ActivityActionObject, ActionTypes, ActivityDefinition, RaiseAction, RaiseActionObject, DoneEvent, ErrorPlatformEvent, DoneEventObject, SendExpr, SendActionObject, PureAction, LogExpr, LogAction, LogActionObject, DelayFunctionMap, SCXML, ExprWithMeta, ChooseConditon, ChooseAction, AnyEventObject, Expr } from './types';
 import * as actionTypes from './actionTypes';
 import { State } from './State';
 import { StateNode } from './StateNode';
+import { StopAction, StopActionObject } from '.';
 export { actionTypes };
 export declare const initEvent: SCXML.Event<{
     type: ActionTypes;
@@ -77,9 +78,12 @@ export declare function start<TContext, TEvent extends EventObject>(activity: st
 /**
  * Stops an activity.
  *
- * @param activity The activity to stop.
+ * @param actorRef The activity to stop.
  */
-export declare function stop<TContext, TEvent extends EventObject>(activity: string | ActivityDefinition<TContext, TEvent>): ActivityActionObject<TContext, TEvent>;
+export declare function stop<TContext, TEvent extends EventObject>(actorRef: string | ActivityDefinition<TContext, TEvent> | Expr<TContext, TEvent, string | {
+    id: string;
+}>): StopAction<TContext, TEvent>;
+export declare function resolveStop<TContext, TEvent extends EventObject>(action: StopAction<TContext, TEvent>, context: TContext, _event: SCXML.Event<TEvent>): StopActionObject;
 /**
  * Updates the current context of the machine.
  *