xstate 5.0.0-beta.26 → 5.0.0-beta.28

package/dist/xstate.cjs.js

@@ -2,9 +2,61 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-319cefe7.cjs.js');
+var actors_dist_xstateActors = require('../actors/dist/xstate-actors.cjs.js');
+var interpreter = require('./interpreter-672794ae.cjs.js');
+var guards_dist_xstateGuards = require('./raise-436a57a2.cjs.js');
+var send = require('./send-35e1a689.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
+class SimulatedClock {
+  constructor() {
+    this.timeouts = new Map();
+    this._now = 0;
+    this._id = 0;
+  }
+  now() {
+    return this._now;
+  }
+  getId() {
+    return this._id++;
+  }
+  setTimeout(fn, timeout) {
+    const id = this.getId();
+    this.timeouts.set(id, {
+      start: this.now(),
+      timeout,
+      fn
+    });
+    return id;
+  }
+  clearTimeout(id) {
+    this.timeouts.delete(id);
+  }
+  set(time) {
+    if (this._now > time) {
+      throw new Error('Unable to travel back in time');
+    }
+    this._now = time;
+    this.flushTimeouts();
+  }
+  flushTimeouts() {
+    [...this.timeouts].sort(([_idA, timeoutA], [_idB, timeoutB]) => {
+      const endA = timeoutA.start + timeoutA.timeout;
+      const endB = timeoutB.start + timeoutB.timeout;
+      return endB > endA ? -1 : 1;
+    }).forEach(([id, timeout]) => {
+      if (this.now() - timeout.start >= timeout.timeout) {
+        this.timeouts.delete(id);
+        timeout.fn.call(null);
+      }
+    });
+  }
+  increment(ms) {
+    this._now += ms;
+    this.flushTimeouts();
+  }
+}
+
 const EMPTY_OBJECT = {};
 const toSerializableActon = action => {
   if (typeof action === 'string') {
@@ -79,7 +131,7 @@ class StateNode {
    */
 
   /**
-   * The output data sent with the "done.state._id_" event if this is a final state node.
+   * The output data sent with the "xstate.done.state._id_" event if this is a final state node.
    */
 
   /**
@@ -113,12 +165,12 @@ class StateNode {
     this.key = options._key;
     this.machine = options._machine;
     this.path = this.parent ? this.parent.path.concat(this.key) : [];
-    this.id = this.config.id || [this.machine.id, ...this.path].join(actors_dist_xstateActors.STATE_DELIMITER);
+    this.id = this.config.id || [this.machine.id, ...this.path].join(interpreter.STATE_DELIMITER);
     this.type = this.config.type || (this.config.states && Object.keys(this.config.states).length ? 'compound' : this.config.history ? 'history' : 'atomic');
     this.description = this.config.description;
     this.order = this.machine.idMap.size;
     this.machine.idMap.set(this.id, this);
-    this.states = this.config.states ? actors_dist_xstateActors.mapValues(this.config.states, (stateConfig, key) => {
+    this.states = this.config.states ? interpreter.mapValues(this.config.states, (stateConfig, key) => {
       const stateNode = new StateNode(stateConfig, {
         _parent: this,
         _key: key,
@@ -132,16 +184,16 @@ class StateNode {
 
     // History config
     this.history = this.config.history === true ? 'shallow' : this.config.history || false;
-    this.entry = actors_dist_xstateActors.toArray(this.config.entry).slice();
-    this.exit = actors_dist_xstateActors.toArray(this.config.exit).slice();
+    this.entry = interpreter.toArray(this.config.entry).slice();
+    this.exit = interpreter.toArray(this.config.exit).slice();
     this.meta = this.config.meta;
     this.output = this.type === 'final' ? this.config.output : undefined;
-    this.tags = actors_dist_xstateActors.toArray(config.tags).slice();
+    this.tags = interpreter.toArray(config.tags).slice();
   }
   _initialize() {
-    this.transitions = actors_dist_xstateActors.formatTransitions(this);
+    this.transitions = guards_dist_xstateGuards.formatTransitions(this);
     if (this.config.always) {
-      this.always = actors_dist_xstateActors.toTransitionConfigArray(this.config.always).map(t => actors_dist_xstateActors.formatTransition(this, actors_dist_xstateActors.NULL_EVENT, t));
+      this.always = interpreter.toTransitionConfigArray(this.config.always).map(t => guards_dist_xstateGuards.formatTransition(this, interpreter.NULL_EVENT, t));
     }
     Object.keys(this.states).forEach(key => {
       this.states[key]._initialize();
@@ -171,7 +223,7 @@ class StateNode {
         })
       } : undefined,
       history: this.history,
-      states: actors_dist_xstateActors.mapValues(this.states, state => {
+      states: interpreter.mapValues(this.states, state => {
         return state.definition;
       }),
       on: this.on,
@@ -197,15 +249,12 @@ class StateNode {
    * The logic invoked as actors by this state node.
    */
   get invoke() {
-    return actors_dist_xstateActors.memo(this, 'invoke', () => actors_dist_xstateActors.toArray(this.config.invoke).map((invocable, i) => {
-      const generatedId = actors_dist_xstateActors.createInvokeId(this.id, i);
-      const invokeConfig = actors_dist_xstateActors.toInvokeConfig(invocable, generatedId);
-      const resolvedId = invokeConfig.id || generatedId;
-      const src = invokeConfig.src;
+    return guards_dist_xstateGuards.memo(this, 'invoke', () => interpreter.toArray(this.config.invoke).map((invokeConfig, i) => {
       const {
+        src,
         systemId
       } = invokeConfig;
-
+      const resolvedId = invokeConfig.id || interpreter.createInvokeId(this.id, i);
       // TODO: resolving should not happen here
       const resolvedSrc = typeof src === 'string' ? src : !('type' in src) ? resolvedId : src;
       if (!this.machine.implementations.actors[resolvedId] && typeof src !== 'string' && !('type' in src)) {
@@ -241,7 +290,7 @@ class StateNode {
    * The mapping of events to transitions.
    */
   get on() {
-    return actors_dist_xstateActors.memo(this, 'on', () => {
+    return guards_dist_xstateGuards.memo(this, 'on', () => {
       const transitions = this.transitions;
       return [...transitions].flatMap(([descriptor, t]) => t.map(t => [descriptor, t])).reduce((map, [descriptor, transition]) => {
         map[descriptor] = map[descriptor] || [];
@@ -251,16 +300,16 @@ class StateNode {
     });
   }
   get after() {
-    return actors_dist_xstateActors.memo(this, 'delayedTransitions', () => actors_dist_xstateActors.getDelayedTransitions(this));
+    return guards_dist_xstateGuards.memo(this, 'delayedTransitions', () => guards_dist_xstateGuards.getDelayedTransitions(this));
   }
   get initial() {
-    return actors_dist_xstateActors.memo(this, 'initial', () => actors_dist_xstateActors.formatInitialTransition(this, this.config.initial || []));
+    return guards_dist_xstateGuards.memo(this, 'initial', () => guards_dist_xstateGuards.formatInitialTransition(this, this.config.initial || []));
   }
   next(state, event) {
     const eventType = event.type;
     const actions = [];
     let selectedTransition;
-    const candidates = actors_dist_xstateActors.memo(this, `candidates-${eventType}`, () => actors_dist_xstateActors.getCandidates(this, eventType));
+    const candidates = guards_dist_xstateGuards.memo(this, `candidates-${eventType}`, () => guards_dist_xstateGuards.getCandidates(this, eventType));
     for (const candidate of candidates) {
       const {
         guard
@@ -268,7 +317,7 @@ class StateNode {
       const resolvedContext = state.context;
       let guardPassed = false;
       try {
-        guardPassed = !guard || actors_dist_xstateActors.evaluateGuard(guard, resolvedContext, event, state);
+        guardPassed = !guard || guards_dist_xstateGuards.evaluateGuard(guard, resolvedContext, event, state);
       } catch (err) {
         const guardType = typeof guard === 'string' ? guard : typeof guard === 'object' ? guard.type : undefined;
         throw new Error(`Unable to evaluate guard ${guardType ? `'${guardType}' ` : ''}in transition for event '${eventType}' in state node '${this.id}':\n${err.message}`);
@@ -282,33 +331,11 @@ class StateNode {
     return selectedTransition ? [selectedTransition] : undefined;
   }
 
-  /**
-   * The target state value of the history state node, if it exists. This represents the
-   * default state value to transition to if no history value exists yet.
-   */
-  get target() {
-    if (this.type === 'history') {
-      const historyConfig = this.config;
-      return historyConfig.target;
-    }
-    return undefined;
-  }
-
-  /**
-   * All the state node IDs of this state node and its descendant state nodes.
-   */
-  get stateIds() {
-    const childStateIds = actors_dist_xstateActors.flatten(Object.keys(this.states).map(stateKey => {
-      return this.states[stateKey].stateIds;
-    }));
-    return [this.id].concat(childStateIds);
-  }
-
   /**
    * All the event types accepted by this state node and its descendants.
    */
   get events() {
-    return actors_dist_xstateActors.memo(this, 'events', () => {
+    return guards_dist_xstateGuards.memo(this, 'events', () => {
       const {
         states
       } = this;
@@ -434,18 +461,18 @@ class StateMachine {
    * @param state The state to resolve
    */
   resolveState(state) {
-    const configurationSet = actors_dist_xstateActors.getConfiguration(actors_dist_xstateActors.getStateNodes(this.root, state.value));
+    const configurationSet = guards_dist_xstateGuards.getConfiguration(guards_dist_xstateGuards.getStateNodes(this.root, state.value));
     const configuration = Array.from(configurationSet);
     return this.createState({
       ...state,
-      value: actors_dist_xstateActors.resolveStateValue(this.root, state.value),
+      value: guards_dist_xstateGuards.resolveStateValue(this.root, state.value),
       configuration,
-      done: actors_dist_xstateActors.isInFinalState(configuration)
+      done: guards_dist_xstateGuards.isInFinalState(configuration)
     });
   }
   resolveStateValue(stateValue, ...[context]) {
-    const resolvedStateValue = actors_dist_xstateActors.resolveStateValue(this.root, stateValue);
-    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, context, this));
+    const resolvedStateValue = guards_dist_xstateGuards.resolveStateValue(this.root, stateValue);
+    return this.resolveState(guards_dist_xstateGuards.State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -457,14 +484,14 @@ class StateMachine {
    */
   transition(state, event, actorCtx) {
     // TODO: handle error events in a better way
-    if (actors_dist_xstateActors.isErrorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
-      return actors_dist_xstateActors.cloneState(state, {
+    if (interpreter.isErrorActorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
+      return guards_dist_xstateGuards.cloneState(state, {
         error: event.data
       });
     }
     const {
       state: nextState
-    } = actors_dist_xstateActors.macrostep(state, event, actorCtx);
+    } = guards_dist_xstateGuards.macrostep(state, event, actorCtx);
     return nextState;
   }
 
@@ -476,10 +503,10 @@ class StateMachine {
    * @param event The received event
    */
   microstep(state, event, actorCtx) {
-    return actors_dist_xstateActors.macrostep(state, event, actorCtx).microstates;
+    return guards_dist_xstateGuards.macrostep(state, event, actorCtx).microstates;
   }
   getTransitionData(state, event) {
-    return actors_dist_xstateActors.transitionNode(this.root, state.value, state, event) || [];
+    return guards_dist_xstateGuards.transitionNode(this.root, state.value, state, event) || [];
   }
 
   /**
@@ -495,7 +522,7 @@ class StateMachine {
       // TODO: this is computed in state constructor
       context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
-      configuration: actors_dist_xstateActors.getInitialConfiguration(this.root),
+      configuration: guards_dist_xstateGuards.getInitialConfiguration(this.root),
       children: {}
     }));
     if (typeof context === 'function') {
@@ -506,7 +533,7 @@ class StateMachine {
         spawn,
         input: event.input
       });
-      return actors_dist_xstateActors.resolveActionsAndContext([actors_dist_xstateActors.assign(assignment)], initEvent, preInitial, actorCtx);
+      return guards_dist_xstateGuards.resolveActionsAndContext([send.assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -515,11 +542,11 @@ class StateMachine {
    * Returns the initial `State` instance, with reference to `self` as an `ActorRef`.
    */
   getInitialState(actorCtx, input) {
-    const initEvent = actors_dist_xstateActors.createInitEvent(input); // TODO: fix;
+    const initEvent = interpreter.createInitEvent(input); // TODO: fix;
 
     const preInitialState = this.getPreInitialState(actorCtx, initEvent);
-    const nextState = actors_dist_xstateActors.microstep([{
-      target: [...preInitialState.configuration].filter(actors_dist_xstateActors.isAtomicStateNode),
+    const nextState = guards_dist_xstateGuards.microstep([{
+      target: [...preInitialState.configuration].filter(guards_dist_xstateGuards.isAtomicStateNode),
       source: this.root,
       reenter: true,
       actions: [],
@@ -528,7 +555,7 @@ class StateMachine {
     }], preInitialState, actorCtx, initEvent, true);
     const {
       state: macroState
-    } = actors_dist_xstateActors.macrostep(nextState, initEvent, actorCtx);
+    } = guards_dist_xstateGuards.macrostep(nextState, initEvent, actorCtx);
     return macroState;
   }
   start(state) {
@@ -539,14 +566,14 @@ class StateMachine {
     });
   }
   getStateNodeById(stateId) {
-    const fullPath = stateId.split(actors_dist_xstateActors.STATE_DELIMITER);
+    const fullPath = stateId.split(interpreter.STATE_DELIMITER);
     const relativePath = fullPath.slice(1);
-    const resolvedStateId = actors_dist_xstateActors.isStateId(fullPath[0]) ? fullPath[0].slice(STATE_IDENTIFIER.length) : fullPath[0];
+    const resolvedStateId = guards_dist_xstateGuards.isStateId(fullPath[0]) ? fullPath[0].slice(STATE_IDENTIFIER.length) : fullPath[0];
     const stateNode = this.idMap.get(resolvedStateId);
     if (!stateNode) {
       throw new Error(`Child state node '#${resolvedStateId}' does not exist on machine '${this.id}'`);
     }
-    return actors_dist_xstateActors.getStateNodeByPath(stateNode, relativePath);
+    return guards_dist_xstateGuards.getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
     return this.root.definition;
@@ -555,10 +582,10 @@ class StateMachine {
     return this.definition;
   }
   getPersistedState(state) {
-    return actors_dist_xstateActors.getPersistedState(state);
+    return guards_dist_xstateGuards.getPersistedState(state);
   }
   createState(stateConfig) {
-    return stateConfig instanceof actors_dist_xstateActors.State ? stateConfig : new actors_dist_xstateActors.State(stateConfig, this);
+    return stateConfig instanceof guards_dist_xstateGuards.State ? stateConfig : new guards_dist_xstateGuards.State(stateConfig, this);
   }
   getStatus(state) {
     return state.error ? {
@@ -577,18 +604,18 @@ class StateMachine {
       const actorData = state.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const logic = src ? actors_dist_xstateActors.resolveReferencedActor(this.implementations.actors[src])?.src : undefined;
+      const logic = src ? interpreter.resolveReferencedActor(this.implementations.actors[src])?.src : undefined;
       if (!logic) {
         return;
       }
       const actorState = logic.restoreState?.(childState, _actorCtx);
-      const actorRef = actors_dist_xstateActors.createActor(logic, {
+      const actorRef = interpreter.createActor(logic, {
         id: actorId,
         state: actorState
       });
       children[actorId] = actorRef;
     });
-    const restoredState = this.createState(new actors_dist_xstateActors.State({
+    const restoredState = this.createState(new guards_dist_xstateGuards.State({
       ...state,
       children
     }, this));
@@ -604,9 +631,9 @@ class StateMachine {
           if (children[id]) {
             return;
           }
-          const referenced = actors_dist_xstateActors.resolveReferencedActor(this.implementations.actors[src]);
+          const referenced = interpreter.resolveReferencedActor(this.implementations.actors[src]);
           if (referenced) {
-            const actorRef = actors_dist_xstateActors.createActor(referenced.src, {
+            const actorRef = interpreter.createActor(referenced.src, {
               id,
               parent: _actorCtx?.self,
               input: 'input' in invokeConfig ? invokeConfig.input : referenced.input
@@ -622,69 +649,6 @@ class StateMachine {
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */
 }
 
-function createMachine(config, implementations) {
-  return new StateMachine(config, implementations);
-}
-
-function mapState(stateMap, stateId) {
-  let foundStateId;
-  for (const mappedStateId of Object.keys(stateMap)) {
-    if (actors_dist_xstateActors.matchesState(mappedStateId, stateId) && (!foundStateId || stateId.length > foundStateId.length)) {
-      foundStateId = mappedStateId;
-    }
-  }
-  return stateMap[foundStateId];
-}
-
-class SimulatedClock {
-  constructor() {
-    this.timeouts = new Map();
-    this._now = 0;
-    this._id = 0;
-  }
-  now() {
-    return this._now;
-  }
-  getId() {
-    return this._id++;
-  }
-  setTimeout(fn, timeout) {
-    const id = this.getId();
-    this.timeouts.set(id, {
-      start: this.now(),
-      timeout,
-      fn
-    });
-    return id;
-  }
-  clearTimeout(id) {
-    this.timeouts.delete(id);
-  }
-  set(time) {
-    if (this._now > time) {
-      throw new Error('Unable to travel back in time');
-    }
-    this._now = time;
-    this.flushTimeouts();
-  }
-  flushTimeouts() {
-    [...this.timeouts].sort(([_idA, timeoutA], [_idB, timeoutB]) => {
-      const endA = timeoutA.start + timeoutA.timeout;
-      const endB = timeoutB.start + timeoutB.timeout;
-      return endB > endA ? -1 : 1;
-    }).forEach(([id, timeout]) => {
-      if (this.now() - timeout.start >= timeout.timeout) {
-        this.timeouts.delete(id);
-        timeout.fn.call(null);
-      }
-    });
-  }
-  increment(ms) {
-    this._now += ms;
-    this.flushTimeouts();
-  }
-}
-
 const defaultWaitForOptions = {
   timeout: 10_000 // 10 seconds
 };
@@ -756,38 +720,54 @@ function waitFor(actorRef, predicate, options) {
   });
 }
 
-exports.Actor = actors_dist_xstateActors.Actor;
-exports.ActorStatus = actors_dist_xstateActors.ActorStatus;
-exports.ConstantPrefix = actors_dist_xstateActors.ConstantPrefix;
-exports.InterpreterStatus = actors_dist_xstateActors.InterpreterStatus;
-exports.SpecialTargets = actors_dist_xstateActors.SpecialTargets;
-exports.State = actors_dist_xstateActors.State;
-exports.and = actors_dist_xstateActors.and;
-exports.assign = actors_dist_xstateActors.assign;
-exports.cancel = actors_dist_xstateActors.cancel;
-exports.choose = actors_dist_xstateActors.choose;
-exports.createActor = actors_dist_xstateActors.createActor;
-exports.doneInvoke = actors_dist_xstateActors.doneInvoke;
-exports.forwardTo = actors_dist_xstateActors.forwardTo;
+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;
 exports.fromObservable = actors_dist_xstateActors.fromObservable;
 exports.fromPromise = actors_dist_xstateActors.fromPromise;
 exports.fromTransition = actors_dist_xstateActors.fromTransition;
-exports.getStateNodes = actors_dist_xstateActors.getStateNodes;
-exports.interpret = actors_dist_xstateActors.interpret;
-exports.log = actors_dist_xstateActors.log;
-exports.matchesState = actors_dist_xstateActors.matchesState;
-exports.not = actors_dist_xstateActors.not;
-exports.or = actors_dist_xstateActors.or;
-exports.pathToStateValue = actors_dist_xstateActors.pathToStateValue;
-exports.pure = actors_dist_xstateActors.pure;
-exports.raise = actors_dist_xstateActors.raise;
-exports.sendParent = actors_dist_xstateActors.sendParent;
-exports.sendTo = actors_dist_xstateActors.sendTo;
-exports.stateIn = actors_dist_xstateActors.stateIn;
-exports.stop = actors_dist_xstateActors.stop;
-exports.toObserver = actors_dist_xstateActors.toObserver;
+exports.isActorRef = actors_dist_xstateActors.isActorRef;
+exports.toActorRef = actors_dist_xstateActors.toActorRef;
+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;
+exports.not = guards_dist_xstateGuards.not;
+exports.or = guards_dist_xstateGuards.or;
+exports.raise = guards_dist_xstateGuards.raise;
+exports.stateIn = guards_dist_xstateGuards.stateIn;
+exports.stop = guards_dist_xstateGuards.stop;
+exports.SpecialTargets = send.SpecialTargets;
+exports.assign = send.assign;
+exports.choose = send.choose;
+exports.escalate = send.escalate;
+exports.forwardTo = send.forwardTo;
+exports.log = send.log;
+exports.pure = send.pure;
+exports.sendParent = send.sendParent;
+exports.sendTo = send.sendTo;
 exports.SimulatedClock = SimulatedClock;
 exports.StateMachine = StateMachine;
 exports.StateNode = StateNode;

package/dist/xstate.cjs.mjs

@@ -1,7 +1,6 @@
 export {
   Actor,
   ActorStatus,
-  ConstantPrefix,
   InterpreterStatus,
   SimulatedClock,
   SpecialTargets,
@@ -13,8 +12,9 @@ export {
   cancel,
   choose,
   createActor,
+  createEmptyActor,
   createMachine,
-  doneInvoke,
+  escalate,
   forwardTo,
   fromCallback,
   fromEventObservable,
@@ -23,6 +23,7 @@ export {
   fromTransition,
   getStateNodes,
   interpret,
+  isActorRef,
   log,
   mapState,
   matchesState,
@@ -35,6 +36,7 @@ export {
   sendTo,
   stateIn,
   stop,
+  toActorRef,
   toObserver,
   waitFor
 } from "./xstate.cjs.js";