xstate 5.0.0-beta.15 → 5.0.0-beta.17

package/dist/xstate.development.esm.js

@@ -1,8 +1,26 @@
-import { S as STATE_DELIMITER, m as mapValues, t as toActionObjects, a as toArray, f as formatTransitions, b as toTransitionConfigArray, N as NULL_EVENT, c as formatTransition, d as memo, e as evaluateGuard, g as flatten, h as createInvokeId, i as isString, j as invoke, k as getDelayedTransitions, l as formatInitialTransition, n as getCandidates, o as toInvokeConfig, p as createSpawner, q as getConfiguration, r as getStateNodes, s as resolveStateValue, u as isInFinalState, v as State, w as isErrorEvent, x as macrostep, y as transitionNode, z as getInitialConfiguration, A as resolveActionsAndContext, B as microstep, C as isAtomicStateNode, D as error, E as isStateId, F as getStateNodeByPath, G as getPersistedState, H as resolveReferencedActor, I as interpret, J as createInitEvent, K as initEvent, L as matchesState } from './actions-98f362b9.development.esm.js';
-export { aa as ActionTypes, Q as Interpreter, R as InterpreterStatus, ab as SpecialTargets, v as State, a8 as and, U as assign, V as cancel, W as choose, T as doneInvoke, P as forwardTo, a3 as fromCallback, a4 as fromEventObservable, a2 as fromObservable, a1 as fromPromise, a5 as fromTransition, r as getStateNodes, I as interpret, X as log, L as matchesState, a7 as not, a9 as or, $ as pathToStateValue, Y as pure, Z as raise, O as sendParent, M as sendTo, a6 as stateIn, _ as stop, a0 as toObserver } from './actions-98f362b9.development.esm.js';
+import { S as STATE_DELIMITER, m as mapValues, t as toArray, f as formatTransitions, a as toTransitionConfigArray, b as formatTransition, N as NULL_EVENT, c as memo, e as evaluateGuard, d as flatten, g as createInvokeId, h as getDelayedTransitions, i as formatInitialTransition, j as getCandidates, k as toInvokeConfig, l as getConfiguration, n as getStateNodes, r as resolveStateValue, o as isInFinalState, p as State, q as isErrorEvent, s as macrostep, u as transitionNode, v as getInitialConfiguration, w as resolveActionsAndContext, x as assign, y as createInitEvent, z as microstep, A as isAtomicStateNode, B as error, C as isStateId, D as getStateNodeByPath, E as getPersistedState, F as resolveReferencedActor, G as interpret, H as matchesState } from './actions-13190b25.development.esm.js';
+export { a5 as ConstantPrefix, L as Interpreter, M as InterpreterStatus, a6 as SpecialTargets, p as State, a3 as and, x as assign, P as cancel, Q as choose, O as doneInvoke, K as forwardTo, _ as fromCallback, $ as fromEventObservable, Z as fromObservable, Y as fromPromise, a0 as fromTransition, n as getStateNodes, G as interpret, R as log, H as matchesState, a2 as not, a4 as or, W as pathToStateValue, T as pure, U as raise, J as sendParent, I as sendTo, a1 as stateIn, V as stop, X as toObserver } from './actions-13190b25.development.esm.js';
 import '../dev/dist/xstate-dev.development.esm.js';
 
 const EMPTY_OBJECT = {};
+const toSerializableActon = action => {
+  if (typeof action === 'string') {
+    return {
+      type: action
+    };
+  }
+  if (typeof action === 'function') {
+    if ('resolve' in action) {
+      return {
+        type: action.type
+      };
+    }
+    return {
+      type: action.name
+    };
+  }
+  return action;
+};
 class StateNode {
   /**
    * The relative key of the state node, which represents its location in the overall state value.
@@ -111,8 +129,8 @@ class StateNode {
 
     // History config
     this.history = this.config.history === true ? 'shallow' : this.config.history || false;
-    this.entry = toActionObjects(this.config.entry);
-    this.exit = toActionObjects(this.config.exit);
+    this.entry = toArray(this.config.entry);
+    this.exit = toArray(this.config.exit);
     this.meta = this.config.meta;
     this.output = this.type === 'final' ? this.config.output : undefined;
     this.tags = toArray(config.tags);
@@ -120,7 +138,7 @@ class StateNode {
   _initialize() {
     this.transitions = formatTransitions(this);
     if (this.config.always) {
-      this.always = toTransitionConfigArray(NULL_EVENT, this.config.always).map(t => formatTransition(this, t));
+      this.always = toTransitionConfigArray(this.config.always).map(t => formatTransition(this, NULL_EVENT, t));
     }
     Object.keys(this.states).forEach(key => {
       this.states[key]._initialize();
@@ -139,13 +157,13 @@ class StateNode {
       initial: this.initial ? {
         target: this.initial.target,
         source: this,
-        actions: this.initial.actions,
+        actions: this.initial.actions.map(toSerializableActon),
         eventType: null,
         reenter: false,
         toJSON: () => ({
           target: this.initial.target.map(t => `#${t.id}`),
           source: `#${this.id}`,
-          actions: this.initial.actions,
+          actions: this.initial.actions.map(toSerializableActon),
           eventType: null
         })
       } : undefined,
@@ -154,9 +172,12 @@ class StateNode {
         return state.definition;
       }),
       on: this.on,
-      transitions: this.transitions,
-      entry: this.entry,
-      exit: this.exit,
+      transitions: [...this.transitions.values()].flat().map(t => ({
+        ...t,
+        actions: t.actions.map(toSerializableActon)
+      })),
+      entry: this.entry.map(toSerializableActon),
+      exit: this.exit.map(toSerializableActon),
       meta: this.meta,
       order: this.order || -1,
       output: this.output,
@@ -181,7 +202,9 @@ class StateNode {
       const {
         systemId
       } = invokeConfig;
-      const resolvedSrc = isString(src) ? src : !('type' in src) ? resolvedId : src;
+
+      // 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)) {
         this.machine.implementations.actors = {
           ...this.machine.implementations.actors,
@@ -190,7 +213,7 @@ class StateNode {
         };
       }
       return {
-        type: invoke,
+        type: 'xstate.invoke',
         ...invokeConfig,
         src: resolvedSrc,
         id: resolvedId,
@@ -203,7 +226,7 @@ class StateNode {
           } = invokeConfig;
           return {
             ...invokeDefValues,
-            type: invoke,
+            type: 'xstate.invoke',
             src: resolvedSrc,
             id: resolvedId
           };
@@ -218,9 +241,9 @@ class StateNode {
   get on() {
     return memo(this, 'on', () => {
       const transitions = this.transitions;
-      return transitions.reduce((map, transition) => {
-        map[transition.eventType] = map[transition.eventType] || [];
-        map[transition.eventType].push(transition);
+      return [...transitions].flatMap(([descriptor, t]) => t.map(t => [descriptor, t])).reduce((map, [descriptor, transition]) => {
+        map[descriptor] = map[descriptor] || [];
+        map[descriptor].push(transition);
         return map;
       }, {});
     });
@@ -307,32 +330,15 @@ class StateNode {
    * Excludes any inert events.
    */
   get ownEvents() {
-    const events = new Set(this.transitions.filter(transition => {
-      return !(!transition.target && !transition.actions.length && !transition.reenter);
-    }).map(transition => transition.eventType));
+    const events = new Set([...this.transitions.keys()].filter(descriptor => {
+      return this.transitions.get(descriptor).some(transition => !(!transition.target && !transition.actions.length && !transition.reenter));
+    }));
     return Array.from(events);
   }
 }
 
 const STATE_IDENTIFIER = '#';
 class StateMachine {
-  // TODO: this getter should be removed
-  getContext(input) {
-    return this.getContextAndActions(undefined, input)[0];
-  }
-  getContextAndActions(actorCtx, input) {
-    const actions = [];
-    const {
-      context
-    } = this.config;
-    const resolvedContext = typeof context === 'function' ? context({
-      spawn: createSpawner(actorCtx?.self, this, undefined,
-      // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
-      createInitEvent(input), actions),
-      input
-    }) : context;
-    return [resolvedContext || {}, actions];
-  }
   /**
    * The machine's own version.
    */
@@ -429,10 +435,9 @@ class StateMachine {
       done: isInFinalState(configuration)
     });
   }
-  resolveStateValue(stateValue) {
+  resolveStateValue(stateValue, ...[context]) {
     const resolvedStateValue = resolveStateValue(this.root, stateValue);
-    const resolvedContext = this.getContext();
-    return this.resolveState(State.from(resolvedStateValue, resolvedContext, this));
+    return this.resolveState(State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -471,20 +476,27 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, input) {
-    const [context, actions] = this.getContextAndActions(actorCtx, input);
-    const config = getInitialConfiguration(this.root);
+  getPreInitialState(actorCtx, initEvent) {
+    const {
+      context
+    } = this.config;
     const preInitial = this.resolveState(this.createState({
       value: {},
       // TODO: this is computed in state constructor
-      context,
+      context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
-      configuration: config,
+      configuration: getInitialConfiguration(this.root),
       children: {}
     }));
-    if (actorCtx) {
-      const nextState = resolveActionsAndContext(actions, initEvent, preInitial, actorCtx);
-      preInitial.children = nextState.children;
+    if (typeof context === 'function') {
+      const assignment = ({
+        spawn,
+        event
+      }) => context({
+        spawn,
+        input: event.input
+      });
+      return resolveActionsAndContext([assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -495,7 +507,7 @@ class StateMachine {
   getInitialState(actorCtx, input) {
     const initEvent = createInitEvent(input); // TODO: fix;
 
-    const preInitialState = this.getPreInitialState(actorCtx, input);
+    const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = microstep([{
       target: [...preInitialState.configuration].filter(isAtomicStateNode),
       source: this.root,
@@ -532,10 +544,7 @@ class StateMachine {
     return getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
-    return {
-      context: this.getContext(),
-      ...this.root.definition
-    };
+    return this.root.definition;
   }
   toJSON() {
     return this.definition;

package/dist/xstate.esm.js

@@ -1,8 +1,26 @@
-import { S as STATE_DELIMITER, m as mapValues, t as toActionObjects, a as toArray, f as formatTransitions, b as toTransitionConfigArray, N as NULL_EVENT, c as formatTransition, d as memo, e as evaluateGuard, g as flatten, h as createInvokeId, i as isString, j as invoke, k as getDelayedTransitions, l as formatInitialTransition, n as getCandidates, o as toInvokeConfig, p as createSpawner, q as getConfiguration, r as getStateNodes, s as resolveStateValue, u as isInFinalState, v as State, w as isErrorEvent, x as macrostep, y as transitionNode, z as getInitialConfiguration, A as resolveActionsAndContext, B as microstep, C as isAtomicStateNode, D as error, E as isStateId, F as getStateNodeByPath, G as getPersistedState, H as resolveReferencedActor, I as interpret, J as createInitEvent, K as initEvent, L as matchesState } from './actions-6884fae8.esm.js';
-export { aa as ActionTypes, Q as Interpreter, R as InterpreterStatus, ab as SpecialTargets, v as State, a8 as and, U as assign, V as cancel, W as choose, T as doneInvoke, P as forwardTo, a3 as fromCallback, a4 as fromEventObservable, a2 as fromObservable, a1 as fromPromise, a5 as fromTransition, r as getStateNodes, I as interpret, X as log, L as matchesState, a7 as not, a9 as or, $ as pathToStateValue, Y as pure, Z as raise, O as sendParent, M as sendTo, a6 as stateIn, _ as stop, a0 as toObserver } from './actions-6884fae8.esm.js';
+import { S as STATE_DELIMITER, m as mapValues, t as toArray, f as formatTransitions, a as toTransitionConfigArray, b as formatTransition, N as NULL_EVENT, c as memo, e as evaluateGuard, d as flatten, g as createInvokeId, h as getDelayedTransitions, i as formatInitialTransition, j as getCandidates, k as toInvokeConfig, l as getConfiguration, n as getStateNodes, r as resolveStateValue, o as isInFinalState, p as State, q as isErrorEvent, s as macrostep, u as transitionNode, v as getInitialConfiguration, w as resolveActionsAndContext, x as assign, y as createInitEvent, z as microstep, A as isAtomicStateNode, B as error, C as isStateId, D as getStateNodeByPath, E as getPersistedState, F as resolveReferencedActor, G as interpret, H as matchesState } from './actions-4d6514d2.esm.js';
+export { a5 as ConstantPrefix, L as Interpreter, M as InterpreterStatus, a6 as SpecialTargets, p as State, a3 as and, x as assign, P as cancel, Q as choose, O as doneInvoke, K as forwardTo, _ as fromCallback, $ as fromEventObservable, Z as fromObservable, Y as fromPromise, a0 as fromTransition, n as getStateNodes, G as interpret, R as log, H as matchesState, a2 as not, a4 as or, W as pathToStateValue, T as pure, U as raise, J as sendParent, I as sendTo, a1 as stateIn, V as stop, X as toObserver } from './actions-4d6514d2.esm.js';
 import '../dev/dist/xstate-dev.esm.js';
 
 const EMPTY_OBJECT = {};
+const toSerializableActon = action => {
+  if (typeof action === 'string') {
+    return {
+      type: action
+    };
+  }
+  if (typeof action === 'function') {
+    if ('resolve' in action) {
+      return {
+        type: action.type
+      };
+    }
+    return {
+      type: action.name
+    };
+  }
+  return action;
+};
 class StateNode {
   /**
    * The relative key of the state node, which represents its location in the overall state value.
@@ -111,8 +129,8 @@ class StateNode {
 
     // History config
     this.history = this.config.history === true ? 'shallow' : this.config.history || false;
-    this.entry = toActionObjects(this.config.entry);
-    this.exit = toActionObjects(this.config.exit);
+    this.entry = toArray(this.config.entry);
+    this.exit = toArray(this.config.exit);
     this.meta = this.config.meta;
     this.output = this.type === 'final' ? this.config.output : undefined;
     this.tags = toArray(config.tags);
@@ -120,7 +138,7 @@ class StateNode {
   _initialize() {
     this.transitions = formatTransitions(this);
     if (this.config.always) {
-      this.always = toTransitionConfigArray(NULL_EVENT, this.config.always).map(t => formatTransition(this, t));
+      this.always = toTransitionConfigArray(this.config.always).map(t => formatTransition(this, NULL_EVENT, t));
     }
     Object.keys(this.states).forEach(key => {
       this.states[key]._initialize();
@@ -139,13 +157,13 @@ class StateNode {
       initial: this.initial ? {
         target: this.initial.target,
         source: this,
-        actions: this.initial.actions,
+        actions: this.initial.actions.map(toSerializableActon),
         eventType: null,
         reenter: false,
         toJSON: () => ({
           target: this.initial.target.map(t => `#${t.id}`),
           source: `#${this.id}`,
-          actions: this.initial.actions,
+          actions: this.initial.actions.map(toSerializableActon),
           eventType: null
         })
       } : undefined,
@@ -154,9 +172,12 @@ class StateNode {
         return state.definition;
       }),
       on: this.on,
-      transitions: this.transitions,
-      entry: this.entry,
-      exit: this.exit,
+      transitions: [...this.transitions.values()].flat().map(t => ({
+        ...t,
+        actions: t.actions.map(toSerializableActon)
+      })),
+      entry: this.entry.map(toSerializableActon),
+      exit: this.exit.map(toSerializableActon),
       meta: this.meta,
       order: this.order || -1,
       output: this.output,
@@ -181,7 +202,9 @@ class StateNode {
       const {
         systemId
       } = invokeConfig;
-      const resolvedSrc = isString(src) ? src : !('type' in src) ? resolvedId : src;
+
+      // 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)) {
         this.machine.implementations.actors = {
           ...this.machine.implementations.actors,
@@ -190,7 +213,7 @@ class StateNode {
         };
       }
       return {
-        type: invoke,
+        type: 'xstate.invoke',
         ...invokeConfig,
         src: resolvedSrc,
         id: resolvedId,
@@ -203,7 +226,7 @@ class StateNode {
           } = invokeConfig;
           return {
             ...invokeDefValues,
-            type: invoke,
+            type: 'xstate.invoke',
             src: resolvedSrc,
             id: resolvedId
           };
@@ -218,9 +241,9 @@ class StateNode {
   get on() {
     return memo(this, 'on', () => {
       const transitions = this.transitions;
-      return transitions.reduce((map, transition) => {
-        map[transition.eventType] = map[transition.eventType] || [];
-        map[transition.eventType].push(transition);
+      return [...transitions].flatMap(([descriptor, t]) => t.map(t => [descriptor, t])).reduce((map, [descriptor, transition]) => {
+        map[descriptor] = map[descriptor] || [];
+        map[descriptor].push(transition);
         return map;
       }, {});
     });
@@ -307,32 +330,15 @@ class StateNode {
    * Excludes any inert events.
    */
   get ownEvents() {
-    const events = new Set(this.transitions.filter(transition => {
-      return !(!transition.target && !transition.actions.length && !transition.reenter);
-    }).map(transition => transition.eventType));
+    const events = new Set([...this.transitions.keys()].filter(descriptor => {
+      return this.transitions.get(descriptor).some(transition => !(!transition.target && !transition.actions.length && !transition.reenter));
+    }));
     return Array.from(events);
   }
 }
 
 const STATE_IDENTIFIER = '#';
 class StateMachine {
-  // TODO: this getter should be removed
-  getContext(input) {
-    return this.getContextAndActions(undefined, input)[0];
-  }
-  getContextAndActions(actorCtx, input) {
-    const actions = [];
-    const {
-      context
-    } = this.config;
-    const resolvedContext = typeof context === 'function' ? context({
-      spawn: createSpawner(actorCtx?.self, this, undefined,
-      // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
-      createInitEvent(input), actions),
-      input
-    }) : context;
-    return [resolvedContext || {}, actions];
-  }
   /**
    * The machine's own version.
    */
@@ -429,10 +435,9 @@ class StateMachine {
       done: isInFinalState(configuration)
     });
   }
-  resolveStateValue(stateValue) {
+  resolveStateValue(stateValue, ...[context]) {
     const resolvedStateValue = resolveStateValue(this.root, stateValue);
-    const resolvedContext = this.getContext();
-    return this.resolveState(State.from(resolvedStateValue, resolvedContext, this));
+    return this.resolveState(State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -471,20 +476,27 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, input) {
-    const [context, actions] = this.getContextAndActions(actorCtx, input);
-    const config = getInitialConfiguration(this.root);
+  getPreInitialState(actorCtx, initEvent) {
+    const {
+      context
+    } = this.config;
     const preInitial = this.resolveState(this.createState({
       value: {},
       // TODO: this is computed in state constructor
-      context,
+      context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
-      configuration: config,
+      configuration: getInitialConfiguration(this.root),
       children: {}
     }));
-    if (actorCtx) {
-      const nextState = resolveActionsAndContext(actions, initEvent, preInitial, actorCtx);
-      preInitial.children = nextState.children;
+    if (typeof context === 'function') {
+      const assignment = ({
+        spawn,
+        event
+      }) => context({
+        spawn,
+        input: event.input
+      });
+      return resolveActionsAndContext([assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -495,7 +507,7 @@ class StateMachine {
   getInitialState(actorCtx, input) {
     const initEvent = createInitEvent(input); // TODO: fix;
 
-    const preInitialState = this.getPreInitialState(actorCtx, input);
+    const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = microstep([{
       target: [...preInitialState.configuration].filter(isAtomicStateNode),
       source: this.root,
@@ -532,10 +544,7 @@ class StateMachine {
     return getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
-    return {
-      context: this.getContext(),
-      ...this.root.definition
-    };
+    return this.root.definition;
   }
   toJSON() {
     return this.definition;