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

package/dist/xstate.cjs.js

@@ -2,10 +2,28 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-81cc7f2b.cjs.js');
+var actors_dist_xstateActors = require('./actions-5fb9f10d.cjs.js');
 require('../dev/dist/xstate-dev.cjs.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.
@@ -114,8 +132,8 @@ class StateNode {
 
     // History config
     this.history = this.config.history === true ? 'shallow' : this.config.history || false;
-    this.entry = actors_dist_xstateActors.toActionObjects(this.config.entry);
-    this.exit = actors_dist_xstateActors.toActionObjects(this.config.exit);
+    this.entry = actors_dist_xstateActors.toArray(this.config.entry);
+    this.exit = actors_dist_xstateActors.toArray(this.config.exit);
     this.meta = this.config.meta;
     this.output = this.type === 'final' ? this.config.output : undefined;
     this.tags = actors_dist_xstateActors.toArray(config.tags);
@@ -123,7 +141,7 @@ class StateNode {
   _initialize() {
     this.transitions = actors_dist_xstateActors.formatTransitions(this);
     if (this.config.always) {
-      this.always = actors_dist_xstateActors.toTransitionConfigArray(actors_dist_xstateActors.NULL_EVENT, this.config.always).map(t => actors_dist_xstateActors.formatTransition(this, t));
+      this.always = actors_dist_xstateActors.toTransitionConfigArray(this.config.always).map(t => actors_dist_xstateActors.formatTransition(this, actors_dist_xstateActors.NULL_EVENT, t));
     }
     Object.keys(this.states).forEach(key => {
       this.states[key]._initialize();
@@ -142,13 +160,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,
@@ -157,9 +175,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,
@@ -184,7 +205,9 @@ class StateNode {
       const {
         systemId
       } = invokeConfig;
-      const resolvedSrc = actors_dist_xstateActors.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,
@@ -193,7 +216,7 @@ class StateNode {
         };
       }
       return {
-        type: actors_dist_xstateActors.invoke,
+        type: 'xstate.invoke',
         ...invokeConfig,
         src: resolvedSrc,
         id: resolvedId,
@@ -206,7 +229,7 @@ class StateNode {
           } = invokeConfig;
           return {
             ...invokeDefValues,
-            type: actors_dist_xstateActors.invoke,
+            type: 'xstate.invoke',
             src: resolvedSrc,
             id: resolvedId
           };
@@ -221,9 +244,9 @@ class StateNode {
   get on() {
     return actors_dist_xstateActors.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;
       }, {});
     });
@@ -310,32 +333,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: actors_dist_xstateActors.createSpawner(actorCtx?.self, this, undefined,
-      // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
-      actors_dist_xstateActors.createInitEvent(input), actions),
-      input
-    }) : context;
-    return [resolvedContext || {}, actions];
-  }
   /**
    * The machine's own version.
    */
@@ -432,10 +438,9 @@ class StateMachine {
       done: actors_dist_xstateActors.isInFinalState(configuration)
     });
   }
-  resolveStateValue(stateValue) {
+  resolveStateValue(stateValue, ...[context]) {
     const resolvedStateValue = actors_dist_xstateActors.resolveStateValue(this.root, stateValue);
-    const resolvedContext = this.getContext();
-    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, resolvedContext, this));
+    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -474,20 +479,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 = actors_dist_xstateActors.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: actors_dist_xstateActors.getInitialConfiguration(this.root),
       children: {}
     }));
-    if (actorCtx) {
-      const nextState = actors_dist_xstateActors.resolveActionsAndContext(actions, actors_dist_xstateActors.initEvent, preInitial, actorCtx);
-      preInitial.children = nextState.children;
+    if (typeof context === 'function') {
+      const assignment = ({
+        spawn,
+        event
+      }) => context({
+        spawn,
+        input: event.input
+      });
+      return actors_dist_xstateActors.resolveActionsAndContext([actors_dist_xstateActors.assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -498,7 +510,7 @@ class StateMachine {
   getInitialState(actorCtx, input) {
     const initEvent = actors_dist_xstateActors.createInitEvent(input); // TODO: fix;
 
-    const preInitialState = this.getPreInitialState(actorCtx, input);
+    const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = actors_dist_xstateActors.microstep([{
       target: [...preInitialState.configuration].filter(actors_dist_xstateActors.isAtomicStateNode),
       source: this.root,
@@ -535,10 +547,7 @@ class StateMachine {
     return actors_dist_xstateActors.getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
-    return {
-      context: this.getContext(),
-      ...this.root.definition
-    };
+    return this.root.definition;
   }
   toJSON() {
     return this.definition;
@@ -742,7 +751,7 @@ function waitFor(actorRef, predicate, options) {
   });
 }
 
-exports.ActionTypes = actors_dist_xstateActors.ActionTypes;
+exports.ConstantPrefix = actors_dist_xstateActors.ConstantPrefix;
 exports.Interpreter = actors_dist_xstateActors.Interpreter;
 exports.InterpreterStatus = actors_dist_xstateActors.ActorStatus;
 exports.SpecialTargets = actors_dist_xstateActors.SpecialTargets;

package/dist/xstate.cjs.mjs

@@ -1,5 +1,5 @@
 export {
-  ActionTypes,
+  ConstantPrefix,
   Interpreter,
   InterpreterStatus,
   SimulatedClock,

package/dist/xstate.development.cjs.js

@@ -2,10 +2,28 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-d71ac253.development.cjs.js');
+var actors_dist_xstateActors = require('./actions-40bd643f.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.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.
@@ -114,8 +132,8 @@ class StateNode {
 
     // History config
     this.history = this.config.history === true ? 'shallow' : this.config.history || false;
-    this.entry = actors_dist_xstateActors.toActionObjects(this.config.entry);
-    this.exit = actors_dist_xstateActors.toActionObjects(this.config.exit);
+    this.entry = actors_dist_xstateActors.toArray(this.config.entry);
+    this.exit = actors_dist_xstateActors.toArray(this.config.exit);
     this.meta = this.config.meta;
     this.output = this.type === 'final' ? this.config.output : undefined;
     this.tags = actors_dist_xstateActors.toArray(config.tags);
@@ -123,7 +141,7 @@ class StateNode {
   _initialize() {
     this.transitions = actors_dist_xstateActors.formatTransitions(this);
     if (this.config.always) {
-      this.always = actors_dist_xstateActors.toTransitionConfigArray(actors_dist_xstateActors.NULL_EVENT, this.config.always).map(t => actors_dist_xstateActors.formatTransition(this, t));
+      this.always = actors_dist_xstateActors.toTransitionConfigArray(this.config.always).map(t => actors_dist_xstateActors.formatTransition(this, actors_dist_xstateActors.NULL_EVENT, t));
     }
     Object.keys(this.states).forEach(key => {
       this.states[key]._initialize();
@@ -142,13 +160,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,
@@ -157,9 +175,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,
@@ -184,7 +205,9 @@ class StateNode {
       const {
         systemId
       } = invokeConfig;
-      const resolvedSrc = actors_dist_xstateActors.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,
@@ -193,7 +216,7 @@ class StateNode {
         };
       }
       return {
-        type: actors_dist_xstateActors.invoke,
+        type: 'xstate.invoke',
         ...invokeConfig,
         src: resolvedSrc,
         id: resolvedId,
@@ -206,7 +229,7 @@ class StateNode {
           } = invokeConfig;
           return {
             ...invokeDefValues,
-            type: actors_dist_xstateActors.invoke,
+            type: 'xstate.invoke',
             src: resolvedSrc,
             id: resolvedId
           };
@@ -221,9 +244,9 @@ class StateNode {
   get on() {
     return actors_dist_xstateActors.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;
       }, {});
     });
@@ -310,32 +333,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: actors_dist_xstateActors.createSpawner(actorCtx?.self, this, undefined,
-      // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
-      actors_dist_xstateActors.createInitEvent(input), actions),
-      input
-    }) : context;
-    return [resolvedContext || {}, actions];
-  }
   /**
    * The machine's own version.
    */
@@ -432,10 +438,9 @@ class StateMachine {
       done: actors_dist_xstateActors.isInFinalState(configuration)
     });
   }
-  resolveStateValue(stateValue) {
+  resolveStateValue(stateValue, ...[context]) {
     const resolvedStateValue = actors_dist_xstateActors.resolveStateValue(this.root, stateValue);
-    const resolvedContext = this.getContext();
-    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, resolvedContext, this));
+    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -474,20 +479,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 = actors_dist_xstateActors.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: actors_dist_xstateActors.getInitialConfiguration(this.root),
       children: {}
     }));
-    if (actorCtx) {
-      const nextState = actors_dist_xstateActors.resolveActionsAndContext(actions, actors_dist_xstateActors.initEvent, preInitial, actorCtx);
-      preInitial.children = nextState.children;
+    if (typeof context === 'function') {
+      const assignment = ({
+        spawn,
+        event
+      }) => context({
+        spawn,
+        input: event.input
+      });
+      return actors_dist_xstateActors.resolveActionsAndContext([actors_dist_xstateActors.assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -498,7 +510,7 @@ class StateMachine {
   getInitialState(actorCtx, input) {
     const initEvent = actors_dist_xstateActors.createInitEvent(input); // TODO: fix;
 
-    const preInitialState = this.getPreInitialState(actorCtx, input);
+    const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = actors_dist_xstateActors.microstep([{
       target: [...preInitialState.configuration].filter(actors_dist_xstateActors.isAtomicStateNode),
       source: this.root,
@@ -535,10 +547,7 @@ class StateMachine {
     return actors_dist_xstateActors.getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
-    return {
-      context: this.getContext(),
-      ...this.root.definition
-    };
+    return this.root.definition;
   }
   toJSON() {
     return this.definition;
@@ -745,7 +754,7 @@ function waitFor(actorRef, predicate, options) {
   });
 }
 
-exports.ActionTypes = actors_dist_xstateActors.ActionTypes;
+exports.ConstantPrefix = actors_dist_xstateActors.ConstantPrefix;
 exports.Interpreter = actors_dist_xstateActors.Interpreter;
 exports.InterpreterStatus = actors_dist_xstateActors.ActorStatus;
 exports.SpecialTargets = actors_dist_xstateActors.SpecialTargets;