xstate 5.0.0-alpha.1 → 5.0.0-alpha.3

package/dist/xstate.esm.js

@@ -1,6 +1,6 @@
-import { c as createDynamicAction, p as pure$1, t as toArray, _ as _createClass, f as formatTransitions, a as toTransitionConfigArray, N as NULL_EVENT, b as formatTransition, m as mapValues, d as memo, e as _createForOfIteratorHelper, g as evaluateGuard, h as _toConsumableArray, i as flatten, j as _classCallCheck, k as _defineProperty, l as toActionObjects, n as createInvokeId, o as toInvokeConfig, q as _objectSpread2, r as invoke, s as _objectWithoutProperties, u as getDelayedTransitions, v as formatInitialTransition, w as getCandidates, x as toInvokeSource, y as isString, z as createSpawner, A as getConfiguration, B as getStateNodes, C as resolveStateValue, D as isInFinalState, S as State, E as toSCXMLEvent, F as isSCXMLErrorEvent, G as macrostep, H as transitionNode, I as _slicedToArray, J as getInitialConfiguration, K as initEvent, L as resolveActionsAndContext, M as microstep, O as isStateId, P as isStateConfig, Q as isFunction, R as STATE_DELIMITER, T as matchesState, U as raise, V as send, W as sendParent, X as sendTo, Y as log, Z as cancel, $ as stop, a0 as assign, a1 as after, a2 as done, a3 as respond, a4 as forwardTo, a5 as escalate, a6 as choose } from './actions-b673cb13.esm.js';
-export { ad as ActionTypes, a8 as Interpreter, a9 as InterpreterStatus, ae as SpecialTargets, S as State, a0 as assign, aa as doneInvoke, a4 as forwardTo, B as getStateNodes, a7 as interpret, T as matchesState, ab as pathToStateValue, V as send, W as sendParent, ac as toObserver, E as toSCXMLEvent } from './actions-b673cb13.esm.js';
-import './index-20b364c4.esm.js';
+import { c as createDynamicAction, p as pure$1, t as toArray, a as toActionObjects, _ as _createClass, f as formatTransitions, b as toTransitionConfigArray, N as NULL_EVENT, d as formatTransition, m as mapValues, e as memo, g as _createForOfIteratorHelper, h as evaluateGuard, i as _toConsumableArray, j as flatten, k as _classCallCheck, l as _defineProperty, n as createInvokeId, o as toInvokeConfig, q as _objectSpread2, r as invoke, s as _objectWithoutProperties, u as getDelayedTransitions, v as formatInitialTransition, w as getCandidates, x as isString, y as createSpawner, z as createInitEvent, A as getConfiguration, B as getStateNodes, C as resolveStateValue, D as isInFinalState, S as State, E as toSCXMLEvent, F as isSCXMLErrorEvent, G as macrostep, H as transitionNode, I as _slicedToArray, J as getInitialConfiguration, K as resolveActionsAndContext, L as microstep, M as error, O as isStateId, P as getPersistedState, Q as resolveReferencedActor, R as interpret, T as STATE_DELIMITER, U as initEvent, V as matchesState, W as raise, X as send, Y as sendParent, Z as sendTo, $ as log, a0 as cancel, a1 as stop, a2 as assign, a3 as after, a4 as done, a5 as respond, a6 as forwardTo, a7 as escalate, a8 as choose } from './actions-4fe4ada8.esm.js';
+export { ae as ActionTypes, a9 as Interpreter, aa as InterpreterStatus, af as SpecialTargets, S as State, a2 as assign, ab as doneInvoke, a6 as forwardTo, B as getStateNodes, R as interpret, V as matchesState, ac as pathToStateValue, X as send, Y as sendParent, Z as sendTo, ad as toObserver, E as toSCXMLEvent } from './actions-4fe4ada8.esm.js';
+import './index-50bd0aff.esm.js';
 
 function pure(getActions) {
   return createDynamicAction({
@@ -10,12 +10,14 @@ function pure(getActions) {
     }
   }, function (_event, _ref) {
     var _toArray;
-
     var state = _ref.state;
     return [state, {
       type: pure$1,
       params: {
-        actions: (_toArray = toArray(getActions(state.context, _event.data))) !== null && _toArray !== void 0 ? _toArray : []
+        actions: (_toArray = toArray(toActionObjects(getActions({
+          context: state.context,
+          event: _event.data
+        })))) !== null && _toArray !== void 0 ? _toArray : []
       }
     }];
   });
@@ -84,51 +86,32 @@ var StateNode = /*#__PURE__*/function () {
   /**
    * The order this state node appears. Corresponds to the implicit SCXML document order.
    */
+
   function StateNode(
   /**
    * The raw config used to create the machine.
    */
   config, options) {
     var _this = this;
-
     _classCallCheck(this, StateNode);
-
     this.config = config;
-
     _defineProperty(this, "key", void 0);
-
     _defineProperty(this, "id", void 0);
-
     _defineProperty(this, "type", void 0);
-
     _defineProperty(this, "path", void 0);
-
     _defineProperty(this, "states", void 0);
-
     _defineProperty(this, "history", void 0);
-
     _defineProperty(this, "entry", void 0);
-
     _defineProperty(this, "exit", void 0);
-
     _defineProperty(this, "parent", void 0);
-
     _defineProperty(this, "machine", void 0);
-
     _defineProperty(this, "meta", void 0);
-
     _defineProperty(this, "doneData", void 0);
-
     _defineProperty(this, "order", -1);
-
     _defineProperty(this, "description", void 0);
-
     _defineProperty(this, "tags", []);
-
     _defineProperty(this, "transitions", void 0);
-
     _defineProperty(this, "always", void 0);
-
     this.parent = options._parent;
     this.key = options._key;
     this.machine = options._machine;
@@ -146,12 +129,11 @@ var StateNode = /*#__PURE__*/function () {
       });
       return stateNode;
     }) : EMPTY_OBJECT;
-
     if (this.type === 'compound' && !this.config.initial) {
       throw new Error("No initial state specified for compound state node \"#".concat(this.id, "\". Try adding { initial: \"").concat(Object.keys(this.states)[0], "\" } to the state config."));
-    } // History config
-
+    }
 
+    // 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);
@@ -159,33 +141,28 @@ var StateNode = /*#__PURE__*/function () {
     this.doneData = this.type === 'final' ? this.config.data : undefined;
     this.tags = toArray(config.tags);
   }
-
   _createClass(StateNode, [{
     key: "_initialize",
     value: function _initialize() {
       var _this2 = this;
-
       this.transitions = formatTransitions(this);
-
       if (this.config.always) {
         this.always = toTransitionConfigArray(NULL_EVENT, this.config.always).map(function (t) {
           return formatTransition(_this2, t);
         });
       }
-
       Object.keys(this.states).forEach(function (key) {
         _this2.states[key]._initialize();
       });
     }
+
     /**
      * The well-structured state node definition.
      */
-
   }, {
     key: "definition",
     get: function get() {
       var _this3 = this;
-
       return {
         id: this.id,
         key: this.key,
@@ -196,6 +173,7 @@ var StateNode = /*#__PURE__*/function () {
           source: this,
           actions: this.initial.actions,
           eventType: null,
+          external: false,
           toJSON: function toJSON() {
             return {
               target: _this3.initial.target.map(function (t) {
@@ -228,39 +206,35 @@ var StateNode = /*#__PURE__*/function () {
     value: function toJSON() {
       return this.definition;
     }
+
     /**
      * The behaviors invoked as actors by this state node.
      */
-
   }, {
     key: "invoke",
     get: function get() {
       var _this4 = this;
-
       return memo(this, 'invoke', function () {
         return toArray(_this4.config.invoke).map(function (invocable, i) {
           var generatedId = createInvokeId(_this4.id, i);
           var invokeConfig = toInvokeConfig(invocable, generatedId);
           var resolvedId = invokeConfig.id || generatedId;
-          var src = invokeConfig.src;
-          var resolvedSrc = toInvokeSource(isString(src) ? src : !('type' in src) ? resolvedId : src);
-
+          var src = invokeConfig.src,
+            systemId = invokeConfig.systemId;
+          var resolvedSrc = isString(src) ? src : !('type' in src) ? resolvedId : src;
           if (!_this4.machine.options.actors[resolvedId] && typeof src !== 'string' && !('type' in src)) {
-            _this4.machine.options.actors = _objectSpread2(_objectSpread2({}, _this4.machine.options.actors), {}, _defineProperty({}, resolvedId, typeof src === 'function' ? src : function () {
-              return src;
-            }));
+            _this4.machine.options.actors = _objectSpread2(_objectSpread2({}, _this4.machine.options.actors), {}, _defineProperty({}, resolvedId, src));
           }
-
           return _objectSpread2(_objectSpread2({
             type: invoke
           }, invokeConfig), {}, {
             src: resolvedSrc,
             id: resolvedId,
+            systemId: systemId,
             toJSON: function toJSON() {
               var onDone = invokeConfig.onDone,
-                  onError = invokeConfig.onError,
-                  invokeDefValues = _objectWithoutProperties(invokeConfig, _excluded);
-
+                onError = invokeConfig.onError,
+                invokeDefValues = _objectWithoutProperties(invokeConfig, _excluded);
               return _objectSpread2(_objectSpread2({}, invokeDefValues), {}, {
                 type: invoke,
                 src: resolvedSrc,
@@ -271,15 +245,14 @@ var StateNode = /*#__PURE__*/function () {
         });
       });
     }
+
     /**
      * The mapping of events to transitions.
      */
-
   }, {
     key: "on",
     get: function get() {
       var _this5 = this;
-
       return memo(this, 'on', function () {
         var transitions = _this5.transitions;
         return transitions.reduce(function (map, transition) {
@@ -293,7 +266,6 @@ var StateNode = /*#__PURE__*/function () {
     key: "after",
     get: function get() {
       var _this6 = this;
-
       return memo(this, 'delayedTransitions', function () {
         return getDelayedTransitions(_this6);
       });
@@ -302,17 +274,16 @@ var StateNode = /*#__PURE__*/function () {
     key: "initial",
     get: function get() {
       var _this7 = this;
-
       return memo(this, 'initial', function () {
         return formatInitialTransition(_this7, _this7.config.initial || []);
       });
     }
+
     /**
      * Returns `true` if this state node explicitly handles the given event.
      *
      * @param event The event in question
      */
-
   }, {
     key: "handles",
     value: function handles(event) {
@@ -322,7 +293,6 @@ var StateNode = /*#__PURE__*/function () {
     key: "next",
     value: function next(state, _event) {
       var _this8 = this;
-
       var eventName = _event.name;
       var actions = [];
       var selectedTransition;
@@ -330,23 +300,19 @@ var StateNode = /*#__PURE__*/function () {
         return getCandidates(_this8, eventName, _this8.machine.config.scxml // Whether token matching should be used
         );
       });
-
       var _iterator = _createForOfIteratorHelper(candidates),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var candidate = _step.value;
           var guard = candidate.guard;
           var resolvedContext = state.context;
           var guardPassed = false;
-
           try {
             guardPassed = !guard || evaluateGuard(guard, resolvedContext, _event, state);
           } catch (err) {
             throw new Error("Unable to evaluate guard '".concat(guard.type, "' in transition for event '").concat(eventName, "' in state node '").concat(this.id, "':\n").concat(err.message));
           }
-
           if (guardPassed) {
             actions.push.apply(actions, _toConsumableArray(candidate.actions));
             selectedTransition = candidate;
@@ -358,14 +324,13 @@ var StateNode = /*#__PURE__*/function () {
       } finally {
         _iterator.f();
       }
-
       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.
      */
-
   }, {
     key: "target",
     get: function get() {
@@ -373,45 +338,39 @@ var StateNode = /*#__PURE__*/function () {
         var historyConfig = this.config;
         return historyConfig.target;
       }
-
       return undefined;
     }
+
     /**
      * All the state node IDs of this state node and its descendant state nodes.
      */
-
   }, {
     key: "stateIds",
     get: function get() {
       var _this9 = this;
-
       var childStateIds = flatten(Object.keys(this.states).map(function (stateKey) {
         return _this9.states[stateKey].stateIds;
       }));
       return [this.id].concat(childStateIds);
     }
+
     /**
      * All the event types accepted by this state node and its descendants.
      */
-
   }, {
     key: "events",
     get: function get() {
       var _this10 = this;
-
       return memo(this, 'events', function () {
         var states = _this10.states;
         var events = new Set(_this10.ownEvents);
-
         if (states) {
           for (var _i = 0, _Object$keys = Object.keys(states); _i < _Object$keys.length; _i++) {
             var stateId = _Object$keys[_i];
             var state = states[stateId];
-
             if (state.states) {
               var _iterator2 = _createForOfIteratorHelper(state.events),
-                  _step2;
-
+                _step2;
               try {
                 for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
                   var event = _step2.value;
@@ -425,33 +384,30 @@ var StateNode = /*#__PURE__*/function () {
             }
           }
         }
-
         return Array.from(events);
       });
     }
+
     /**
      * All the events that have transitions directly from this state node.
      *
      * Excludes any inert events.
      */
-
   }, {
     key: "ownEvents",
     get: function get() {
       var events = new Set(this.transitions.filter(function (transition) {
-        return !(!transition.target && !transition.actions.length && transition.internal);
+        return !(!transition.target && !transition.actions.length && !transition.external);
       }).map(function (transition) {
         return transition.eventType;
       }));
       return Array.from(events);
     }
   }]);
-
   return StateNode;
 }();
 
 var STATE_IDENTIFIER = '#';
-
 function createDefaultOptions() {
   return {
     actions: {},
@@ -461,15 +417,6 @@ function createDefaultOptions() {
     context: {}
   };
 }
-
-function resolveContext(context, partialContext) {
-  if (isFunction(partialContext)) {
-    return _objectSpread2(_objectSpread2({}, context), partialContext);
-  }
-
-  return _objectSpread2(_objectSpread2({}, context), partialContext);
-}
-
 var StateMachine = /*#__PURE__*/function () {
   function StateMachine(
   /**
@@ -477,51 +424,25 @@ var StateMachine = /*#__PURE__*/function () {
    */
   config, options) {
     var _this$config$schema;
-
     _classCallCheck(this, StateMachine);
-
     this.config = config;
-
-    _defineProperty(this, "_contextFactory", void 0);
-
     _defineProperty(this, "version", void 0);
-
     _defineProperty(this, "delimiter", void 0);
-
     _defineProperty(this, "options", void 0);
-
     _defineProperty(this, "schema", void 0);
-
     _defineProperty(this, "__xstatenode", true);
-
     _defineProperty(this, "idMap", new Map());
-
     _defineProperty(this, "root", void 0);
-
     _defineProperty(this, "id", void 0);
-
     _defineProperty(this, "states", void 0);
-
     _defineProperty(this, "events", void 0);
-
     _defineProperty(this, "__TContext", void 0);
-
     _defineProperty(this, "__TEvent", void 0);
-
     _defineProperty(this, "__TAction", void 0);
-
     _defineProperty(this, "__TActorMap", void 0);
-
     _defineProperty(this, "__TResolvedTypesMeta", void 0);
-
     this.id = config.id || '(machine)';
     this.options = Object.assign(createDefaultOptions(), options);
-    this._contextFactory = isFunction(config.context) ? config.context : function (stuff) {
-      var partialContext = typeof (options === null || options === void 0 ? void 0 : options.context) === 'function' ? options.context(stuff) : options === null || options === void 0 ? void 0 : options.context;
-      return resolveContext(config.context, partialContext);
-    }; // TODO: fix types
-    // this.context = resolveContext(config.context, options?.context);
-
     this.delimiter = this.config.delimiter || STATE_DELIMITER;
     this.version = this.config.version;
     this.schema = (_this$config$schema = this.config.schema) !== null && _this$config$schema !== void 0 ? _this$config$schema : {};
@@ -530,13 +451,11 @@ var StateMachine = /*#__PURE__*/function () {
       _key: this.id,
       _machine: this
     });
-
     this.root._initialize();
-
     this.states = this.root.states; // TODO: remove!
-
     this.events = this.root.events;
   }
+
   /**
    * Clones this state machine with the provided implementations
    * and merges the `context` (if provided).
@@ -546,60 +465,45 @@ var StateMachine = /*#__PURE__*/function () {
    *
    * @returns A new `StateMachine` instance with the provided implementations.
    */
-
-
   _createClass(StateMachine, [{
-    key: "context",
-    get: function get() {
-      return this.getContextAndActions()[0];
+    key: "getContext",
+    value:
+    // TODO: this getter should be removed
+    function getContext(input) {
+      return this.getContextAndActions(undefined, input)[0];
     }
   }, {
     key: "getContextAndActions",
-    value: function getContextAndActions() {
-      var actions = []; // TODO: merge with this.options.context
-
-      var context = this._contextFactory({
-        spawn: createSpawner(this, null, null, actions) // TODO: fix types
-
-      });
-
-      return [context, actions];
+    value: function getContextAndActions(actorCtx, input) {
+      var actions = [];
+      var context = this.config.context;
+      var resolvedContext = typeof context === 'function' ? context({
+        spawn: createSpawner(actorCtx === null || actorCtx === void 0 ? void 0 : actorCtx.self, this, undefined,
+        // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
+        createInitEvent(input), actions),
+        input: input
+      }) : context;
+      return [resolvedContext || {}, actions];
     }
     /**
      * The machine's own version.
      */
-
   }, {
     key: "provide",
     value: function provide(implementations) {
       var _this$options = this.options,
-          actions = _this$options.actions,
-          guards = _this$options.guards,
-          actors = _this$options.actors,
-          delays = _this$options.delays;
+        actions = _this$options.actions,
+        guards = _this$options.guards,
+        actors = _this$options.actors,
+        delays = _this$options.delays;
       return new StateMachine(this.config, {
         actions: _objectSpread2(_objectSpread2({}, actions), implementations.actions),
         guards: _objectSpread2(_objectSpread2({}, guards), implementations.guards),
         actors: _objectSpread2(_objectSpread2({}, actors), implementations.actors),
-        delays: _objectSpread2(_objectSpread2({}, delays), implementations.delays),
-        context: implementations.context
+        delays: _objectSpread2(_objectSpread2({}, delays), implementations.delays)
       });
     }
-    /**
-     * Clones this state machine with custom `context`.
-     *
-     * The `context` provided can be partial `context`, which will be combined with the original `context`.
-     *
-     * @param context Custom context (will override predefined context, not recursive)
-     */
 
-  }, {
-    key: "withContext",
-    value: function withContext(context) {
-      return this.provide({
-        context: context
-      });
-    }
     /**
      * Resolves the given `state` to a new `State` instance relative to this machine.
      *
@@ -607,7 +511,6 @@ var StateMachine = /*#__PURE__*/function () {
      *
      * @param state The state to resolve
      */
-
   }, {
     key: "resolveState",
     value: function resolveState(state) {
@@ -623,10 +526,10 @@ var StateMachine = /*#__PURE__*/function () {
     key: "resolveStateValue",
     value: function resolveStateValue$1(stateValue) {
       var resolvedStateValue = resolveStateValue(this.root, stateValue);
-
-      var resolvedContext = this.context;
+      var resolvedContext = this.getContext();
       return this.resolveState(State.from(resolvedStateValue, resolvedContext, this));
     }
+
     /**
      * Determines the next state given the current `state` and received `event`.
      * Calculates a full macrostep from all microsteps.
@@ -634,28 +537,25 @@ var StateMachine = /*#__PURE__*/function () {
      * @param state The current State instance or state value
      * @param event The received event
      */
-
   }, {
     key: "transition",
     value: function transition() {
       var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.initialState;
       var event = arguments.length > 1 ? arguments[1] : undefined;
       var actorCtx = arguments.length > 2 ? arguments[2] : undefined;
-      var currentState = state instanceof State ? state : this.resolveStateValue(state); // TODO: handle error events in a better way
-
+      var currentState = state instanceof State ? state : this.resolveStateValue(state);
+      // TODO: handle error events in a better way
       var scxmlEvent = toSCXMLEvent(event);
-
       if (isSCXMLErrorEvent(scxmlEvent) && !currentState.nextEvents.some(function (nextEvent) {
         return nextEvent === scxmlEvent.name;
       })) {
         throw scxmlEvent.data.data;
       }
-
       var _macrostep = macrostep(currentState, scxmlEvent, actorCtx),
-          nextState = _macrostep.state;
-
+        nextState = _macrostep.state;
       return nextState;
     }
+
     /**
      * Determines the next state given the current `state` and `event`.
      * Calculates a microstep.
@@ -663,7 +563,6 @@ var StateMachine = /*#__PURE__*/function () {
      * @param state The current state
      * @param event The received event
      */
-
   }, {
     key: "microstep",
     value: function microstep() {
@@ -671,10 +570,8 @@ var StateMachine = /*#__PURE__*/function () {
       var event = arguments.length > 1 ? arguments[1] : undefined;
       var actorCtx = arguments.length > 2 ? arguments[2] : undefined;
       var scxmlEvent = toSCXMLEvent(event);
-
       var _macrostep2 = macrostep(state, scxmlEvent, actorCtx),
-          microstates = _macrostep2.microstates;
-
+        microstates = _macrostep2.microstates;
       return microstates;
     }
   }, {
@@ -682,28 +579,25 @@ var StateMachine = /*#__PURE__*/function () {
     value: function getTransitionData(state, _event) {
       return transitionNode(this.root, state.value, state, _event) || [];
     }
+
     /**
      * The initial state _before_ evaluating any microsteps.
      * This "pre-initial" state is provided to initial actions executed in the initial state.
      */
-
   }, {
     key: "getPreInitialState",
-    value: function getPreInitialState(actorCtx) {
-      var _actorCtx$sessionId, _preInitial$actions;
-
-      var _this$getContextAndAc = this.getContextAndActions(),
-          _this$getContextAndAc2 = _slicedToArray(_this$getContextAndAc, 2),
-          context = _this$getContextAndAc2[0],
-          actions = _this$getContextAndAc2[1];
-
+    value: function getPreInitialState(actorCtx, input) {
+      var _preInitial$actions;
+      var _this$getContextAndAc = this.getContextAndActions(actorCtx, input),
+        _this$getContextAndAc2 = _slicedToArray(_this$getContextAndAc, 2),
+        context = _this$getContextAndAc2[0],
+        actions = _this$getContextAndAc2[1];
       var config = getInitialConfiguration(this.root);
       var preInitial = this.resolveState(this.createState({
         value: {},
         // TODO: this is computed in state constructor
         context: context,
-        _event: initEvent,
-        _sessionid: (_actorCtx$sessionId = actorCtx === null || actorCtx === void 0 ? void 0 : actorCtx.sessionId) !== null && _actorCtx$sessionId !== void 0 ? _actorCtx$sessionId : undefined,
+        _event: createInitEvent({}),
         actions: [],
         meta: undefined,
         configuration: config,
@@ -711,76 +605,76 @@ var StateMachine = /*#__PURE__*/function () {
         children: {}
       }));
       preInitial._initial = true;
-
       (_preInitial$actions = preInitial.actions).unshift.apply(_preInitial$actions, _toConsumableArray(actions));
-
       if (actorCtx) {
         var _resolveActionsAndCon = resolveActionsAndContext(actions, initEvent, preInitial, actorCtx),
-            nextState = _resolveActionsAndCon.nextState;
-
+          nextState = _resolveActionsAndCon.nextState;
         preInitial.children = nextState.children;
         preInitial.actions = nextState.actions;
       }
-
       return preInitial;
     }
+
     /**
      * The initial State instance, which includes all actions to be executed from
      * entering the initial state.
      */
-
   }, {
     key: "initialState",
     get: function get() {
       return this.getInitialState();
     }
+
     /**
      * Returns the initial `State` instance, with reference to `self` as an `ActorRef`.
      */
-
   }, {
     key: "getInitialState",
-    value: function getInitialState(actorCtx) {
+    value: function getInitialState(actorCtx, input) {
       var _nextState$actions;
+      var initEvent = createInitEvent(input); // TODO: fix;
 
-      var preInitialState = this.getPreInitialState(actorCtx);
+      var preInitialState = this.getPreInitialState(actorCtx, input);
       var nextState = microstep([], preInitialState, actorCtx, initEvent);
-
       (_nextState$actions = nextState.actions).unshift.apply(_nextState$actions, _toConsumableArray(preInitialState.actions));
-
       var _macrostep3 = macrostep(nextState, initEvent, actorCtx),
-          macroState = _macrostep3.state;
-
+        macroState = _macrostep3.state;
       return macroState;
     }
   }, {
     key: "start",
     value: function start(state, actorCtx) {
-      // When starting from a restored state, execute the actions
       state.actions.forEach(function (action) {
         var _action$execute;
-
         (_action$execute = action.execute) === null || _action$execute === void 0 ? void 0 : _action$execute.call(action, actorCtx);
       });
-      return state;
+      Object.values(state.children).forEach(function (child) {
+        if (child.status === 0) {
+          try {
+            var _child$start;
+            (_child$start = child.start) === null || _child$start === void 0 ? void 0 : _child$start.call(child);
+          } catch (err) {
+            // TODO: unify error handling when child starts
+            actorCtx.self.send(error(child.id, err));
+          }
+        }
+      });
     }
   }, {
     key: "getStateNodeById",
     value: function getStateNodeById(stateId) {
       var resolvedStateId = isStateId(stateId) ? stateId.slice(STATE_IDENTIFIER.length) : stateId;
       var stateNode = this.idMap.get(resolvedStateId);
-
       if (!stateNode) {
         throw new Error("Child state node '#".concat(resolvedStateId, "' does not exist on machine '").concat(this.id, "'"));
       }
-
       return stateNode;
     }
   }, {
     key: "definition",
     get: function get() {
       return _objectSpread2({
-        context: this.context
+        context: this.getContext()
       }, this.root.definition);
     }
   }, {
@@ -788,14 +682,17 @@ var StateMachine = /*#__PURE__*/function () {
     value: function toJSON() {
       return this.definition;
     }
+  }, {
+    key: "getPersistedState",
+    value: function getPersistedState$1(state) {
+      return getPersistedState(state);
+    }
   }, {
     key: "createState",
     value: function createState(stateConfig) {
       var state = stateConfig instanceof State ? stateConfig : new State(stateConfig, this);
-
       var _resolveActionsAndCon2 = resolveActionsAndContext(state.actions, state._event, state, undefined),
-          resolvedState = _resolveActionsAndCon2.nextState;
-
+        resolvedState = _resolveActionsAndCon2.nextState;
       return resolvedState;
     }
   }, {
@@ -811,13 +708,54 @@ var StateMachine = /*#__PURE__*/function () {
   }, {
     key: "restoreState",
     value: function restoreState(state, _actorCtx) {
-      var restoredState = isStateConfig(state) ? this.resolveState(state) : this.resolveState(State.from(state, this.context, this));
+      var _this = this;
+      var children = {};
+      Object.keys(state.children).forEach(function (actorId) {
+        var _resolveReferencedAct, _behavior$restoreStat;
+        var actorData = state.children[actorId];
+        var childState = actorData.state;
+        var src = actorData.src;
+        var behavior = src ? (_resolveReferencedAct = resolveReferencedActor(_this.options.actors[src])) === null || _resolveReferencedAct === void 0 ? void 0 : _resolveReferencedAct.src : undefined;
+        if (!behavior) {
+          return;
+        }
+        var actorState = (_behavior$restoreStat = behavior.restoreState) === null || _behavior$restoreStat === void 0 ? void 0 : _behavior$restoreStat.call(behavior, childState, _actorCtx);
+        var actorRef = interpret(behavior, {
+          id: actorId,
+          state: actorState
+        });
+        children[actorId] = actorRef;
+      });
+      var restoredState = this.createState(new State(_objectSpread2(_objectSpread2({}, state), {}, {
+        children: children
+      }), this));
+
+      // TODO: DRY this up
+      restoredState.configuration.forEach(function (stateNode) {
+        if (stateNode.invoke) {
+          stateNode.invoke.forEach(function (invokeConfig) {
+            var id = invokeConfig.id,
+              src = invokeConfig.src;
+            if (children[id]) {
+              return;
+            }
+            var referenced = resolveReferencedActor(_this.options.actors[src]);
+            if (referenced) {
+              var actorRef = interpret(referenced.src, {
+                id: id,
+                parent: _actorCtx === null || _actorCtx === void 0 ? void 0 : _actorCtx.self,
+                input: 'input' in invokeConfig ? invokeConfig.input : referenced.input
+              });
+              children[id] = actorRef;
+            }
+          });
+        }
+      });
       return restoredState;
     }
-    /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */
 
+    /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */
   }]);
-
   return StateMachine;
 }();
 
@@ -827,15 +765,12 @@ function createMachine(config, implementations) {
 
 function mapState(stateMap, stateId) {
   var foundStateId;
-
   for (var _i = 0, _Object$keys = Object.keys(stateMap); _i < _Object$keys.length; _i++) {
     var mappedStateId = _Object$keys[_i];
-
     if (matchesState(mappedStateId, stateId) && (!foundStateId || stateId.length > foundStateId.length)) {
       foundStateId = mappedStateId;
     }
   }
-
   return stateMap[foundStateId];
 }
 
@@ -847,14 +782,10 @@ var t = createSchema;
 var SimulatedClock = /*#__PURE__*/function () {
   function SimulatedClock() {
     _classCallCheck(this, SimulatedClock);
-
     _defineProperty(this, "timeouts", new Map());
-
     _defineProperty(this, "_now", 0);
-
     _defineProperty(this, "_id", 0);
   }
-
   _createClass(SimulatedClock, [{
     key: "now",
     value: function now() {
@@ -887,7 +818,6 @@ var SimulatedClock = /*#__PURE__*/function () {
       if (this._now > time) {
         throw new Error('Unable to travel back in time');
       }
-
       this._now = time;
       this.flushTimeouts();
     }
@@ -895,27 +825,22 @@ var SimulatedClock = /*#__PURE__*/function () {
     key: "flushTimeouts",
     value: function flushTimeouts() {
       var _this = this;
-
       _toConsumableArray(this.timeouts).sort(function (_ref, _ref2) {
         var _ref3 = _slicedToArray(_ref, 2),
-            _idA = _ref3[0],
-            timeoutA = _ref3[1];
-
+          _idA = _ref3[0],
+          timeoutA = _ref3[1];
         var _ref4 = _slicedToArray(_ref2, 2),
-            _idB = _ref4[0],
-            timeoutB = _ref4[1];
-
+          _idB = _ref4[0],
+          timeoutB = _ref4[1];
         var endA = timeoutA.start + timeoutA.timeout;
         var endB = timeoutB.start + timeoutB.timeout;
         return endB > endA ? -1 : 1;
       }).forEach(function (_ref5) {
         var _ref6 = _slicedToArray(_ref5, 2),
-            id = _ref6[0],
-            timeout = _ref6[1];
-
+          id = _ref6[0],
+          timeout = _ref6[1];
         if (_this.now() - timeout.start >= timeout.timeout) {
           _this.timeouts["delete"](id);
-
           timeout.fn.call(null);
         }
       });
@@ -927,7 +852,6 @@ var SimulatedClock = /*#__PURE__*/function () {
       this.flushTimeouts();
     }
   }]);
-
   return SimulatedClock;
 }();