xstate 5.0.0-beta.40 → 5.0.0-beta.42

package/dist/xstate.cjs.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var actors_dist_xstateActors = require('../actors/dist/xstate-actors.cjs.js');
-var interpreter = require('./interpreter-586abde4.cjs.js');
-var guards_dist_xstateGuards = require('./raise-27909189.cjs.js');
-var send = require('./send-4fdf275e.cjs.js');
+var interpreter = require('./interpreter-b6bdd134.cjs.js');
+var guards_dist_xstateGuards = require('./raise-6b64c553.cjs.js');
+var send = require('./send-85b562d8.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 class SimulatedClock {
@@ -403,7 +403,6 @@ class StateMachine {
     this.getInitialState = this.getInitialState.bind(this);
     this.restoreState = this.restoreState.bind(this);
     this.start = this.start.bind(this);
-    this.getPersistedState = this.getPersistedState.bind(this);
     this.root = new StateNode(config, {
       _key: this.id,
       _machine: this
@@ -448,27 +447,18 @@ class StateMachine {
       }
     });
   }
-
-  /**
-   * Resolves the given `state` to a new `State` instance relative to this machine.
-   *
-   * This ensures that `.nextEvents` represent the correct values.
-   *
-   * @param state The state to resolve
-   */
-  resolveState(state) {
-    const configurationSet = guards_dist_xstateGuards.getConfiguration(guards_dist_xstateGuards.getStateNodes(this.root, state.value));
-    const configuration = Array.from(configurationSet);
-    return this.createState({
-      ...state,
-      value: guards_dist_xstateGuards.resolveStateValue(this.root, state.value),
-      configuration,
-      status: guards_dist_xstateGuards.isInFinalState(configurationSet, this.root) ? 'done' : state.status
-    });
-  }
-  resolveStateValue(stateValue, ...[context]) {
-    const resolvedStateValue = guards_dist_xstateGuards.resolveStateValue(this.root, stateValue);
-    return this.resolveState(guards_dist_xstateGuards.State.from(resolvedStateValue, context, this));
+  resolveState(config) {
+    const resolvedStateValue = guards_dist_xstateGuards.resolveStateValue(this.root, config.value);
+    const configurationSet = guards_dist_xstateGuards.getConfiguration(guards_dist_xstateGuards.getStateNodes(this.root, resolvedStateValue));
+    return guards_dist_xstateGuards.createMachineSnapshot({
+      configuration: [...configurationSet],
+      context: config.context || {},
+      children: {},
+      status: guards_dist_xstateGuards.isInFinalState(configurationSet, this.root) ? 'done' : config.status || 'active',
+      output: config.output,
+      error: config.error,
+      historyValue: config.historyValue
+    }, this);
   }
 
   /**
@@ -481,7 +471,7 @@ class StateMachine {
   transition(state, event, actorScope) {
     // TODO: handle error events in a better way
     if (interpreter.isErrorActorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
-      return guards_dist_xstateGuards.cloneState(state, {
+      return guards_dist_xstateGuards.cloneMachineSnapshot(state, {
         status: 'error',
         error: event.data
       });
@@ -514,15 +504,12 @@ class StateMachine {
     const {
       context
     } = this.config;
-    const preInitial = this.resolveState(this.createState({
-      value: {},
-      // TODO: this is computed in state constructor
+    const preInitial = guards_dist_xstateGuards.createMachineSnapshot({
       context: typeof context !== 'function' && context ? context : {},
-      meta: undefined,
-      configuration: guards_dist_xstateGuards.getInitialConfiguration(this.root),
+      configuration: [this.root],
       children: {},
       status: 'active'
-    }));
+    }, this);
     if (typeof context === 'function') {
       const assignment = ({
         spawn,
@@ -579,11 +566,8 @@ class StateMachine {
   toJSON() {
     return this.definition;
   }
-  getPersistedState(state) {
-    return guards_dist_xstateGuards.getPersistedState(state);
-  }
-  createState(stateConfig) {
-    return stateConfig instanceof guards_dist_xstateGuards.State ? stateConfig : new guards_dist_xstateGuards.State(stateConfig, this);
+  getPersistedState(state, options) {
+    return guards_dist_xstateGuards.getPersistedState(state, options);
   }
   restoreState(snapshot, _actorScope) {
     const children = {};
@@ -592,7 +576,7 @@ class StateMachine {
       const actorData = snapshotChildren[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const logic = src ? interpreter.resolveReferencedActor(this, src)?.src : undefined;
+      const logic = typeof src === 'string' ? interpreter.resolveReferencedActor(this, src)?.src : src;
       if (!logic) {
         return;
       }
@@ -606,10 +590,11 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
+    const restoredSnapshot = guards_dist_xstateGuards.createMachineSnapshot({
       ...snapshot,
-      children
-    }, this));
+      children,
+      configuration: Array.from(guards_dist_xstateGuards.getConfiguration(guards_dist_xstateGuards.getStateNodes(this.root, snapshot.value)))
+    }, this);
     let seen = new Set();
     function reviveContext(contextPart, children) {
       if (seen.has(contextPart)) {
@@ -635,7 +620,7 @@ class StateMachine {
 }
 
 const defaultWaitForOptions = {
-  timeout: 10_000 // 10 seconds
+  timeout: Infinity // much more than 10 seconds
 };
 
 /**
@@ -709,16 +694,6 @@ function createMachine(config, implementations) {
   return new StateMachine(config, implementations);
 }
 
-function mapState(stateMap, stateId) {
-  let foundStateId;
-  for (const mappedStateId of Object.keys(stateMap)) {
-    if (interpreter.matchesState(mappedStateId, stateId) && (!foundStateId || stateId.length > foundStateId.length)) {
-      foundStateId = mappedStateId;
-    }
-  }
-  return stateMap[foundStateId];
-}
-
 exports.createEmptyActor = actors_dist_xstateActors.createEmptyActor;
 exports.fromCallback = actors_dist_xstateActors.fromCallback;
 exports.fromEventObservable = actors_dist_xstateActors.fromEventObservable;
@@ -726,14 +701,11 @@ exports.fromObservable = actors_dist_xstateActors.fromObservable;
 exports.fromPromise = actors_dist_xstateActors.fromPromise;
 exports.fromTransition = actors_dist_xstateActors.fromTransition;
 exports.Actor = interpreter.Actor;
-exports.ActorStatus = interpreter.ActorStatus;
-exports.InterpreterStatus = interpreter.InterpreterStatus;
 exports.createActor = interpreter.createActor;
 exports.interpret = interpreter.interpret;
 exports.matchesState = interpreter.matchesState;
 exports.pathToStateValue = interpreter.pathToStateValue;
 exports.toObserver = interpreter.toObserver;
-exports.State = guards_dist_xstateGuards.State;
 exports.and = guards_dist_xstateGuards.and;
 exports.cancel = guards_dist_xstateGuards.cancel;
 exports.getStateNodes = guards_dist_xstateGuards.getStateNodes;
@@ -756,5 +728,4 @@ exports.SimulatedClock = SimulatedClock;
 exports.StateMachine = StateMachine;
 exports.StateNode = StateNode;
 exports.createMachine = createMachine;
-exports.mapState = mapState;
 exports.waitFor = waitFor;

package/dist/xstate.cjs.mjs

@@ -1,10 +1,7 @@
 export {
   Actor,
-  ActorStatus,
-  InterpreterStatus,
   SimulatedClock,
   SpecialTargets,
-  State,
   StateMachine,
   StateNode,
   and,
@@ -24,7 +21,6 @@ export {
   getStateNodes,
   interpret,
   log,
-  mapState,
   matchesState,
   not,
   or,

package/dist/xstate.development.cjs.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var actors_dist_xstateActors = require('../actors/dist/xstate-actors.development.cjs.js');
-var interpreter = require('./interpreter-bae5c279.development.cjs.js');
-var guards_dist_xstateGuards = require('./raise-8325e2df.development.cjs.js');
-var send = require('./send-c45d0d2c.development.cjs.js');
+var interpreter = require('./interpreter-23e4041c.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-8f482ce9.development.cjs.js');
+var send = require('./send-cc8f864e.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 class SimulatedClock {
@@ -403,7 +403,6 @@ class StateMachine {
     this.getInitialState = this.getInitialState.bind(this);
     this.restoreState = this.restoreState.bind(this);
     this.start = this.start.bind(this);
-    this.getPersistedState = this.getPersistedState.bind(this);
     this.root = new StateNode(config, {
       _key: this.id,
       _machine: this
@@ -451,27 +450,18 @@ class StateMachine {
       }
     });
   }
-
-  /**
-   * Resolves the given `state` to a new `State` instance relative to this machine.
-   *
-   * This ensures that `.nextEvents` represent the correct values.
-   *
-   * @param state The state to resolve
-   */
-  resolveState(state) {
-    const configurationSet = guards_dist_xstateGuards.getConfiguration(guards_dist_xstateGuards.getStateNodes(this.root, state.value));
-    const configuration = Array.from(configurationSet);
-    return this.createState({
-      ...state,
-      value: guards_dist_xstateGuards.resolveStateValue(this.root, state.value),
-      configuration,
-      status: guards_dist_xstateGuards.isInFinalState(configurationSet, this.root) ? 'done' : state.status
-    });
-  }
-  resolveStateValue(stateValue, ...[context]) {
-    const resolvedStateValue = guards_dist_xstateGuards.resolveStateValue(this.root, stateValue);
-    return this.resolveState(guards_dist_xstateGuards.State.from(resolvedStateValue, context, this));
+  resolveState(config) {
+    const resolvedStateValue = guards_dist_xstateGuards.resolveStateValue(this.root, config.value);
+    const configurationSet = guards_dist_xstateGuards.getConfiguration(guards_dist_xstateGuards.getStateNodes(this.root, resolvedStateValue));
+    return guards_dist_xstateGuards.createMachineSnapshot({
+      configuration: [...configurationSet],
+      context: config.context || {},
+      children: {},
+      status: guards_dist_xstateGuards.isInFinalState(configurationSet, this.root) ? 'done' : config.status || 'active',
+      output: config.output,
+      error: config.error,
+      historyValue: config.historyValue
+    }, this);
   }
 
   /**
@@ -484,7 +474,7 @@ class StateMachine {
   transition(state, event, actorScope) {
     // TODO: handle error events in a better way
     if (interpreter.isErrorActorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
-      return guards_dist_xstateGuards.cloneState(state, {
+      return guards_dist_xstateGuards.cloneMachineSnapshot(state, {
         status: 'error',
         error: event.data
       });
@@ -517,15 +507,12 @@ class StateMachine {
     const {
       context
     } = this.config;
-    const preInitial = this.resolveState(this.createState({
-      value: {},
-      // TODO: this is computed in state constructor
+    const preInitial = guards_dist_xstateGuards.createMachineSnapshot({
       context: typeof context !== 'function' && context ? context : {},
-      meta: undefined,
-      configuration: guards_dist_xstateGuards.getInitialConfiguration(this.root),
+      configuration: [this.root],
       children: {},
       status: 'active'
-    }));
+    }, this);
     if (typeof context === 'function') {
       const assignment = ({
         spawn,
@@ -582,11 +569,8 @@ class StateMachine {
   toJSON() {
     return this.definition;
   }
-  getPersistedState(state) {
-    return guards_dist_xstateGuards.getPersistedState(state);
-  }
-  createState(stateConfig) {
-    return stateConfig instanceof guards_dist_xstateGuards.State ? stateConfig : new guards_dist_xstateGuards.State(stateConfig, this);
+  getPersistedState(state, options) {
+    return guards_dist_xstateGuards.getPersistedState(state, options);
   }
   restoreState(snapshot, _actorScope) {
     const children = {};
@@ -595,7 +579,7 @@ class StateMachine {
       const actorData = snapshotChildren[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const logic = src ? interpreter.resolveReferencedActor(this, src)?.src : undefined;
+      const logic = typeof src === 'string' ? interpreter.resolveReferencedActor(this, src)?.src : src;
       if (!logic) {
         return;
       }
@@ -609,10 +593,11 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
+    const restoredSnapshot = guards_dist_xstateGuards.createMachineSnapshot({
       ...snapshot,
-      children
-    }, this));
+      children,
+      configuration: Array.from(guards_dist_xstateGuards.getConfiguration(guards_dist_xstateGuards.getStateNodes(this.root, snapshot.value)))
+    }, this);
     let seen = new Set();
     function reviveContext(contextPart, children) {
       if (seen.has(contextPart)) {
@@ -638,7 +623,7 @@ class StateMachine {
 }
 
 const defaultWaitForOptions = {
-  timeout: 10_000 // 10 seconds
+  timeout: Infinity // much more than 10 seconds
 };
 
 /**
@@ -715,16 +700,6 @@ function createMachine(config, implementations) {
   return new StateMachine(config, implementations);
 }
 
-function mapState(stateMap, stateId) {
-  let foundStateId;
-  for (const mappedStateId of Object.keys(stateMap)) {
-    if (interpreter.matchesState(mappedStateId, stateId) && (!foundStateId || stateId.length > foundStateId.length)) {
-      foundStateId = mappedStateId;
-    }
-  }
-  return stateMap[foundStateId];
-}
-
 exports.createEmptyActor = actors_dist_xstateActors.createEmptyActor;
 exports.fromCallback = actors_dist_xstateActors.fromCallback;
 exports.fromEventObservable = actors_dist_xstateActors.fromEventObservable;
@@ -732,14 +707,11 @@ exports.fromObservable = actors_dist_xstateActors.fromObservable;
 exports.fromPromise = actors_dist_xstateActors.fromPromise;
 exports.fromTransition = actors_dist_xstateActors.fromTransition;
 exports.Actor = interpreter.Actor;
-exports.ActorStatus = interpreter.ActorStatus;
-exports.InterpreterStatus = interpreter.InterpreterStatus;
 exports.createActor = interpreter.createActor;
 exports.interpret = interpreter.interpret;
 exports.matchesState = interpreter.matchesState;
 exports.pathToStateValue = interpreter.pathToStateValue;
 exports.toObserver = interpreter.toObserver;
-exports.State = guards_dist_xstateGuards.State;
 exports.and = guards_dist_xstateGuards.and;
 exports.cancel = guards_dist_xstateGuards.cancel;
 exports.getStateNodes = guards_dist_xstateGuards.getStateNodes;
@@ -762,5 +734,4 @@ exports.SimulatedClock = SimulatedClock;
 exports.StateMachine = StateMachine;
 exports.StateNode = StateNode;
 exports.createMachine = createMachine;
-exports.mapState = mapState;
 exports.waitFor = waitFor;

package/dist/xstate.development.cjs.mjs

@@ -1,10 +1,7 @@
 export {
   Actor,
-  ActorStatus,
-  InterpreterStatus,
   SimulatedClock,
   SpecialTargets,
-  State,
   StateMachine,
   StateNode,
   and,
@@ -24,7 +21,6 @@ export {
   getStateNodes,
   interpret,
   log,
-  mapState,
   matchesState,
   not,
   or,

package/dist/xstate.development.esm.js

@@ -1,10 +1,10 @@
 export { createEmptyActor, fromCallback, fromEventObservable, fromObservable, fromPromise, fromTransition } from '../actors/dist/xstate-actors.development.esm.js';
-import { S as STATE_DELIMITER, m as mapValues, t as toArray, a as toTransitionConfigArray, N as NULL_EVENT, c as createInvokeId, i as isErrorActorEvent, b as createInitEvent, r as resolveReferencedActor, d as createActor, $ as $$ACTOR_TYPE, e as matchesState } from './interpreter-410d7ca9.development.esm.js';
-export { A as Actor, f as ActorStatus, I as InterpreterStatus, d as createActor, g as interpret, e as matchesState, p as pathToStateValue, h as toObserver } from './interpreter-410d7ca9.development.esm.js';
-import { f as formatTransitions, a as formatTransition, m as memo, e as evaluateGuard, g as getDelayedTransitions, b as formatInitialTransition, c as getCandidates, d as getConfiguration, h as getStateNodes, r as resolveStateValue, i as isInFinalState, S as State, j as cloneState, k as macrostep, t as transitionNode, l as getInitialConfiguration, n as resolveActionsAndContext, o as microstep, p as getInitialStateNodes, q as isStateId, s as getStateNodeByPath, u as getPersistedState } from './raise-37f9f3b8.development.esm.js';
-export { S as State, v as and, z as cancel, h as getStateNodes, w as not, x as or, A as raise, C as spawn, y as stateIn, B as stop } from './raise-37f9f3b8.development.esm.js';
-import { a as assign } from './send-f6b49072.development.esm.js';
-export { S as SpecialTargets, a as assign, c as choose, e as escalate, f as forwardTo, l as log, p as pure, s as sendParent, b as sendTo } from './send-f6b49072.development.esm.js';
+import { S as STATE_DELIMITER, m as mapValues, t as toArray, a as toTransitionConfigArray, N as NULL_EVENT, c as createInvokeId, i as isErrorActorEvent, b as createInitEvent, r as resolveReferencedActor, d as createActor, $ as $$ACTOR_TYPE } from './interpreter-f2620ea7.development.esm.js';
+export { A as Actor, d as createActor, e as interpret, f as matchesState, p as pathToStateValue, g as toObserver } from './interpreter-f2620ea7.development.esm.js';
+import { f as formatTransitions, a as formatTransition, m as memo, e as evaluateGuard, g as getDelayedTransitions, b as formatInitialTransition, c as getCandidates, r as resolveStateValue, d as getConfiguration, h as getStateNodes, i as createMachineSnapshot, j as isInFinalState, k as cloneMachineSnapshot, l as macrostep, t as transitionNode, n as resolveActionsAndContext, o as microstep, p as getInitialStateNodes, q as isStateId, s as getStateNodeByPath, u as getPersistedState } from './raise-51ae36e5.development.esm.js';
+export { v as and, z as cancel, h as getStateNodes, w as not, x as or, A as raise, C as spawn, y as stateIn, B as stop } from './raise-51ae36e5.development.esm.js';
+import { a as assign } from './send-7a350091.development.esm.js';
+export { S as SpecialTargets, a as assign, c as choose, e as escalate, f as forwardTo, l as log, p as pure, s as sendParent, b as sendTo } from './send-7a350091.development.esm.js';
 import '../dev/dist/xstate-dev.development.esm.js';
 
 class SimulatedClock {
@@ -402,7 +402,6 @@ class StateMachine {
     this.getInitialState = this.getInitialState.bind(this);
     this.restoreState = this.restoreState.bind(this);
     this.start = this.start.bind(this);
-    this.getPersistedState = this.getPersistedState.bind(this);
     this.root = new StateNode(config, {
       _key: this.id,
       _machine: this
@@ -450,27 +449,18 @@ class StateMachine {
       }
     });
   }
-
-  /**
-   * Resolves the given `state` to a new `State` instance relative to this machine.
-   *
-   * This ensures that `.nextEvents` represent the correct values.
-   *
-   * @param state The state to resolve
-   */
-  resolveState(state) {
-    const configurationSet = getConfiguration(getStateNodes(this.root, state.value));
-    const configuration = Array.from(configurationSet);
-    return this.createState({
-      ...state,
-      value: resolveStateValue(this.root, state.value),
-      configuration,
-      status: isInFinalState(configurationSet, this.root) ? 'done' : state.status
-    });
-  }
-  resolveStateValue(stateValue, ...[context]) {
-    const resolvedStateValue = resolveStateValue(this.root, stateValue);
-    return this.resolveState(State.from(resolvedStateValue, context, this));
+  resolveState(config) {
+    const resolvedStateValue = resolveStateValue(this.root, config.value);
+    const configurationSet = getConfiguration(getStateNodes(this.root, resolvedStateValue));
+    return createMachineSnapshot({
+      configuration: [...configurationSet],
+      context: config.context || {},
+      children: {},
+      status: isInFinalState(configurationSet, this.root) ? 'done' : config.status || 'active',
+      output: config.output,
+      error: config.error,
+      historyValue: config.historyValue
+    }, this);
   }
 
   /**
@@ -483,7 +473,7 @@ class StateMachine {
   transition(state, event, actorScope) {
     // TODO: handle error events in a better way
     if (isErrorActorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
-      return cloneState(state, {
+      return cloneMachineSnapshot(state, {
         status: 'error',
         error: event.data
       });
@@ -516,15 +506,12 @@ class StateMachine {
     const {
       context
     } = this.config;
-    const preInitial = this.resolveState(this.createState({
-      value: {},
-      // TODO: this is computed in state constructor
+    const preInitial = createMachineSnapshot({
       context: typeof context !== 'function' && context ? context : {},
-      meta: undefined,
-      configuration: getInitialConfiguration(this.root),
+      configuration: [this.root],
       children: {},
       status: 'active'
-    }));
+    }, this);
     if (typeof context === 'function') {
       const assignment = ({
         spawn,
@@ -581,11 +568,8 @@ class StateMachine {
   toJSON() {
     return this.definition;
   }
-  getPersistedState(state) {
-    return getPersistedState(state);
-  }
-  createState(stateConfig) {
-    return stateConfig instanceof State ? stateConfig : new State(stateConfig, this);
+  getPersistedState(state, options) {
+    return getPersistedState(state, options);
   }
   restoreState(snapshot, _actorScope) {
     const children = {};
@@ -594,7 +578,7 @@ class StateMachine {
       const actorData = snapshotChildren[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const logic = src ? resolveReferencedActor(this, src)?.src : undefined;
+      const logic = typeof src === 'string' ? resolveReferencedActor(this, src)?.src : src;
       if (!logic) {
         return;
       }
@@ -608,10 +592,11 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    const restoredSnapshot = this.createState(new State({
+    const restoredSnapshot = createMachineSnapshot({
       ...snapshot,
-      children
-    }, this));
+      children,
+      configuration: Array.from(getConfiguration(getStateNodes(this.root, snapshot.value)))
+    }, this);
     let seen = new Set();
     function reviveContext(contextPart, children) {
       if (seen.has(contextPart)) {
@@ -637,7 +622,7 @@ class StateMachine {
 }
 
 const defaultWaitForOptions = {
-  timeout: 10_000 // 10 seconds
+  timeout: Infinity // much more than 10 seconds
 };
 
 /**
@@ -714,14 +699,4 @@ function createMachine(config, implementations) {
   return new StateMachine(config, implementations);
 }
 
-function mapState(stateMap, stateId) {
-  let foundStateId;
-  for (const mappedStateId of Object.keys(stateMap)) {
-    if (matchesState(mappedStateId, stateId) && (!foundStateId || stateId.length > foundStateId.length)) {
-      foundStateId = mappedStateId;
-    }
-  }
-  return stateMap[foundStateId];
-}
-
-export { SimulatedClock, StateMachine, StateNode, createMachine, mapState, waitFor };
+export { SimulatedClock, StateMachine, StateNode, createMachine, waitFor };