xstate 4.30.1 → 4.30.2

package/lib/State.d.ts

@@ -71,7 +71,7 @@ export declare class State<TContext, TEvent extends EventObject = EventObject, T
      * @param stateValue
      * @param context
      */
-    static inert<TC, TE extends EventObject = EventObject>(stateValue: State<TC, TE> | StateValue, context: TC): State<TC, TE>;
+    static inert<TC, TE extends EventObject = EventObject>(stateValue: State<TC, TE, any, any, any> | StateValue, context: TC): State<TC, TE>;
     /**
      * Creates a new State instance.
      * @param value The state value
@@ -98,7 +98,8 @@ export declare class State<TContext, TEvent extends EventObject = EventObject, T
      * Whether the current state value is a subset of the given parent state value.
      * @param parentStateValue
      */
-    matches<TSV extends TResolvedTypesMeta extends TypegenEnabled ? Prop<TResolvedTypesMeta, 'matchesStates'> : TTypestate['value']>(parentStateValue: TSV): this is State<(TTypestate extends any ? {
+    matches<TSV extends TResolvedTypesMeta extends TypegenEnabled ? Prop<TResolvedTypesMeta, 'matchesStates'> : never>(parentStateValue: TSV): boolean;
+    matches<TSV extends TResolvedTypesMeta extends TypegenDisabled ? TTypestate['value'] : never>(parentStateValue: TSV): this is State<(TTypestate extends any ? {
         value: TSV;
         context: any;
     } extends TTypestate ? TTypestate : never : never)['context'], TEvent, TStateSchema, TTypestate, TResolvedTypesMeta> & {

package/lib/State.js

@@ -230,11 +230,6 @@ function () {
       tags: Array.from(tags)
     });
   };
-  /**
-   * Whether the current state value is a subset of the given parent state value.
-   * @param parentStateValue
-   */
-
 
   State.prototype.matches = function (parentStateValue) {
     return utils.matchesState(parentStateValue, this.value);

package/lib/index.d.ts

@@ -3,13 +3,13 @@ import { mapState } from './mapState';
 import { StateNode } from './StateNode';
 import { State } from './State';
 import { Machine, createMachine } from './Machine';
-import { Actor } from './Actor';
+import { Actor, toActorRef } from './Actor';
 import * as actions from './actions';
 import { interpret, Interpreter, spawn, InterpreterStatus } from './interpreter';
 import { matchState } from './match';
 import { createSchema, t } from './schema';
 declare const assign: <TContext, TEvent extends import("./types").EventObject = import("./types").EventObject>(assignment: import("./types").Assigner<TContext, TEvent> | import("./types").PropertyAssigner<TContext, TEvent>) => import("./types").AssignAction<TContext, TEvent>, send: typeof actions.send, sendParent: typeof actions.sendParent, sendUpdate: typeof actions.sendUpdate, forwardTo: typeof actions.forwardTo, doneInvoke: typeof actions.doneInvoke;
-export { Actor, Machine, StateNode, State, matchesState, mapState, actions, assign, send, sendParent, sendUpdate, forwardTo, interpret, Interpreter, InterpreterStatus, matchState, spawn, doneInvoke, createMachine, createSchema, t };
+export { Actor, toActorRef, Machine, StateNode, State, matchesState, mapState, actions, assign, send, sendParent, sendUpdate, forwardTo, interpret, Interpreter, InterpreterStatus, matchState, spawn, doneInvoke, createMachine, createSchema, t };
 export * from './types';
 export * from './typegenTypes';
 declare global {

package/lib/index.js

@@ -7,6 +7,7 @@ var mapState = require('./mapState.js');
 var types = require('./types.js');
 var actions = require('./actions.js');
 var State = require('./State.js');
+var Actor = require('./Actor.js');
 var StateNode = require('./StateNode.js');
 var Machine = require('./Machine.js');
 var interpreter = require('./interpreter.js');
@@ -36,6 +37,7 @@ Object.defineProperty(exports, 'SpecialTargets', {
 });
 exports.actions = actions;
 exports.State = State.State;
+exports.toActorRef = Actor.toActorRef;
 exports.StateNode = StateNode.StateNode;
 exports.Machine = Machine.Machine;
 exports.createMachine = Machine.createMachine;

package/lib/interpreter.d.ts

@@ -1,5 +1,6 @@
-import { StateMachine, Event, EventObject, DefaultContext, StateSchema, StateValue, InterpreterOptions, SingleOrArray, Subscribable, DoneEvent, MachineOptions, SCXML, EventData, Observer, Spawnable, Typestate, ActorRef, ActorRefFrom, Behavior, Subscription, StateConfig } from './types';
+import { StateMachine, Event, EventObject, DefaultContext, StateSchema, StateValue, InterpreterOptions, SingleOrArray, DoneEvent, MachineOptions, SCXML, EventData, Observer, Spawnable, Typestate, ActorRef, ActorRefFrom, Behavior, Subscription, StateConfig, InteropSubscribable } from './types';
 import { State } from './State';
+import { symbolObservable } from './utils';
 import { AreAllImplementationsAssumedToBeProvided, TypegenDisabled } from './typegenTypes';
 export declare type StateListener<TContext, TEvent extends EventObject, TStateSchema extends StateSchema<TContext> = any, TTypestate extends Typestate<TContext> = {
     value: any;
@@ -92,8 +93,8 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
     execute(state: State<TContext, TEvent, TStateSchema, TTypestate, TResolvedTypesMeta>, actionsConfig?: MachineOptions<TContext, TEvent>['actions']): void;
     private update;
     onTransition(listener: StateListener<TContext, TEvent, TStateSchema, TTypestate, TResolvedTypesMeta>): this;
-    subscribe(nextListener?: (state: State<TContext, TEvent, any, TTypestate, TResolvedTypesMeta>) => void, errorListener?: (error: any) => void, completeListener?: () => void): Subscription;
     subscribe(observer: Observer<State<TContext, TEvent, any, TTypestate, TResolvedTypesMeta>>): Subscription;
+    subscribe(nextListener?: (state: State<TContext, TEvent, any, TTypestate, TResolvedTypesMeta>) => 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
@@ -188,7 +189,7 @@ export declare class Interpreter<TContext, TStateSchema extends StateSchema = an
     toJSON(): {
         id: string;
     };
-    [Symbol.observable](): Subscribable<State<TContext, TEvent, TStateSchema, TTypestate, TResolvedTypesMeta>>;
+    [symbolObservable](): InteropSubscribable<State<TContext, TEvent, TStateSchema, TTypestate, TResolvedTypesMeta>>;
     getSnapshot(): State<TContext, TEvent, TStateSchema, TTypestate, TResolvedTypesMeta>;
 }
 export declare function spawn<T extends Behavior<any, any>>(entity: T, nameOrOptions?: string | SpawnOptions): ActorRefFrom<T>;

package/lib/interpreter.js

@@ -1000,6 +1000,8 @@ function () {
   };
 
   Interpreter.prototype.spawnPromise = function (promise, id) {
+    var _a;
+
     var _this = this;
 
     var canceled = false;
@@ -1042,8 +1044,7 @@ function () {
         }
       }
     });
-
-    var actor = _tslib.__assign({
+    var actor = (_a = {
       id: id,
       send: function () {
         return void 0;
@@ -1087,13 +1088,16 @@ function () {
       getSnapshot: function () {
         return resolvedData;
       }
-    }, utils.interopSymbols);
-
+    }, _a[utils.symbolObservable] = function () {
+      return this;
+    }, _a);
     this.children.set(id, actor);
     return actor;
   };
 
   Interpreter.prototype.spawnCallback = function (callback, id) {
+    var _a;
+
     var _this = this;
 
     var canceled = false;
@@ -1132,7 +1136,7 @@ function () {
       return this.spawnPromise(callbackStop, id);
     }
 
-    var actor = _tslib.__assign({
+    var actor = (_a = {
       id: id,
       send: function (event) {
         return receivers.forEach(function (receiver) {
@@ -1140,10 +1144,11 @@ function () {
         });
       },
       subscribe: function (next) {
-        listeners.add(next);
+        var observer = utils.toObserver(next);
+        listeners.add(observer.next);
         return {
           unsubscribe: function () {
-            listeners.delete(next);
+            listeners.delete(observer.next);
           }
         };
       },
@@ -1162,13 +1167,16 @@ function () {
       getSnapshot: function () {
         return emitted;
       }
-    }, utils.interopSymbols);
-
+    }, _a[utils.symbolObservable] = function () {
+      return this;
+    }, _a);
     this.children.set(id, actor);
     return actor;
   };
 
   Interpreter.prototype.spawnObservable = function (source, id) {
+    var _a;
+
     var _this = this;
 
     var emitted;
@@ -1191,8 +1199,7 @@ function () {
         origin: id
       }));
     });
-
-    var actor = _tslib.__assign({
+    var actor = (_a = {
       id: id,
       send: function () {
         return void 0;
@@ -1211,8 +1218,9 @@ function () {
           id: id
         };
       }
-    }, utils.interopSymbols);
-
+    }, _a[utils.symbolObservable] = function () {
+      return this;
+    }, _a);
     this.children.set(id, actor);
     return actor;
   };
@@ -1240,7 +1248,9 @@ function () {
   };
 
   Interpreter.prototype.spawnEffect = function (id, dispose) {
-    this.children.set(id, _tslib.__assign({
+    var _a;
+
+    this.children.set(id, (_a = {
       id: id,
       send: function () {
         return void 0;
@@ -1261,7 +1271,9 @@ function () {
           id: id
         };
       }
-    }, utils.interopSymbols));
+    }, _a[utils.symbolObservable] = function () {
+      return this;
+    }, _a));
   };
 
   Interpreter.prototype.attachDev = function () {
@@ -1302,9 +1314,7 @@ function () {
 
   Interpreter.prototype[utils.symbolObservable] = function () {
     return this;
-  }; // this gets stripped by Babel to avoid having "undefined" property in environments without this non-standard Symbol
-  // it has to be here to be included in the generated .d.ts
-
+  };
 
   Interpreter.prototype.getSnapshot = function () {
     if (this.status === exports.InterpreterStatus.NotStarted) {

package/lib/types.d.ts

@@ -570,7 +570,7 @@ export interface HistoryStateNode<TContext> extends StateNode<TContext> {
 export interface StateMachine<TContext, TStateSchema extends StateSchema, TEvent extends EventObject, TTypestate extends Typestate<TContext> = {
     value: any;
     context: TContext;
-}, TAction extends BaseActionObject = BaseActionObject, TServiceMap extends ServiceMap = ServiceMap, TResolvedTypesMeta = TypegenDisabled> extends StateNode<TContext, TStateSchema, TEvent, TTypestate, TServiceMap, TResolvedTypesMeta> {
+}, TAction extends BaseActionObject = BaseActionObject, TServiceMap extends ServiceMap = ServiceMap, TResolvedTypesMeta = ResolveTypegenMeta<TypegenDisabled, TEvent, TAction, TServiceMap>> extends StateNode<TContext, TStateSchema, TEvent, TTypestate, TServiceMap, TResolvedTypesMeta> {
     id: string;
     states: StateNode<TContext, TStateSchema, TEvent, TTypestate, TServiceMap, TResolvedTypesMeta>['states'];
     withConfig(options: InternalMachineOptions<TContext, TEvent, TResolvedTypesMeta, true>, context?: TContext | (() => TContext)): StateMachine<TContext, TStateSchema, TEvent, TTypestate, TAction, TServiceMap, AreAllImplementationsAssumedToBeProvided<TResolvedTypesMeta> extends false ? MarkAllImplementationsAsProvided<TResolvedTypesMeta> : TResolvedTypesMeta>;
@@ -976,11 +976,14 @@ export interface Subscription {
     unsubscribe(): void;
 }
 export interface InteropObservable<T> {
-    [Symbol.observable]: () => Subscribable<T>;
+    [Symbol.observable]: () => InteropSubscribable<T>;
 }
-export interface Subscribable<T> {
-    subscribe(next: (value: T) => void, error?: (error: any) => void, complete?: () => void): Subscription;
+export interface InteropSubscribable<T> {
+    subscribe(observer: Observer<T>): Subscription;
+}
+export interface Subscribable<T> extends InteropSubscribable<T> {
     subscribe(observer: Observer<T>): Subscription;
+    subscribe(next: (value: T) => void, error?: (error: any) => void, complete?: () => void): Subscription;
 }
 export declare type Spawnable = AnyStateMachine | PromiseLike<any> | InvokeCallback | InteropObservable<any> | Subscribable<any> | Behavior<any>;
 export declare type ExtractEvent<TEvent extends EventObject, TEventType extends TEvent['type']> = TEvent extends {

package/lib/utils.d.ts

@@ -53,9 +53,8 @@ export declare function isFunction(value: any): value is Function;
 export declare function isString(value: any): value is string;
 export declare function toGuard<TContext, TEvent extends EventObject>(condition?: Condition<TContext, TEvent>, guardMap?: Record<string, ConditionPredicate<TContext, TEvent>>): Guard<TContext, TEvent> | undefined;
 export declare function isObservable<T>(value: any): value is Subscribable<T>;
-export declare const symbolObservable: string | typeof Symbol.observable;
+export declare const symbolObservable: typeof Symbol.observable;
 export declare const interopSymbols: {
-    [x: string]: () => any;
     [Symbol.observable]: () => any;
 };
 export declare function isMachine(value: any): value is AnyStateMachine;

package/lib/utils.js

@@ -464,9 +464,12 @@ function isObservable(value) {
 }
 var symbolObservable = /*#__PURE__*/function () {
   return typeof Symbol === 'function' && Symbol.observable || '@@observable';
-}();
+}(); // TODO: to be removed in v5, left it out just to minimize the scope of the change and maintain compatibility with older versions of integration paackages
+
 var interopSymbols = (_a = {}, _a[symbolObservable] = function () {
   return this;
+}, _a[Symbol.observable] = function () {
+  return this;
 }, _a);
 function isMachine(value) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xstate",
-  "version": "4.30.1",
+  "version": "4.30.2",
   "description": "Finite State Machines and Statecharts for the Modern Web.",
   "main": "lib/index.js",
   "module": "es/index.js",