xstate 5.0.0-beta.34 → 5.0.0-beta.35

package/dist/{raise-05f8b2a6.development.esm.js → raise-cdcdf834.development.esm.js}

@@ -1,4 +1,4 @@
-import { r as resolveReferencedActor, d as createActor, f as ActorStatus, j as createErrorActorEvent, k as toStateValue, l as STATE_IDENTIFIER, n as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, o as toStatePath, q as createDoneStateEvent, s as resolveOutput, W as WILDCARD, X as XSTATE_STOP, u as XSTATE_INIT, v as isArray, w as createAfterEvent, x as flatten, e as matchesState } from './interpreter-dee56dc8.development.esm.js';
+import { r as resolveReferencedActor, d as createActor, f as ActorStatus, j as createErrorActorEvent, k as toStateValue, l as STATE_IDENTIFIER, n as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, o as toStatePath, q as createDoneStateEvent, s as resolveOutput, W as WILDCARD, X as XSTATE_STOP, u as XSTATE_INIT, v as createAfterEvent, w as flatten, e as matchesState, $ as $$ACTOR_TYPE } from './interpreter-5c4e6634.development.esm.js';
 
 const cache = new WeakMap();
 function memo(object, key, fn) {
@@ -297,20 +297,6 @@ function evaluateGuard(guard, context, event, state) {
   );
 }
 
-function getOutput(configuration, context, event, self) {
-  const {
-    machine
-  } = configuration[0];
-  const {
-    root
-  } = machine;
-  if (!root.output) {
-    return undefined;
-  }
-  const finalChildStateNode = configuration.find(stateNode => stateNode.type === 'final' && stateNode.parent === machine.root);
-  const doneStateEvent = createDoneStateEvent(finalChildStateNode.id, finalChildStateNode.output ? resolveOutput(finalChildStateNode.output, context, event, self) : undefined);
-  return resolveOutput(root.output, context, doneStateEvent, self);
-}
 const isAtomicStateNode = stateNode => stateNode.type === 'atomic' || stateNode.type === 'final';
 function getChildren(stateNode) {
   return Object.values(stateNode.states).filter(sn => sn.type !== 'history');
@@ -335,7 +321,7 @@ function getConfiguration(stateNodes) {
   for (const s of configuration) {
     // if previously active, add existing child nodes
     if (s.type === 'compound' && (!adjList.get(s) || !adjList.get(s).length)) {
-      getInitialStateNodes(s).forEach(sn => configurationSet.add(sn));
+      getInitialStateNodesWithTheirAncestors(s).forEach(sn => configurationSet.add(sn));
     } else {
       if (s.type === 'parallel') {
         for (const child of getChildren(s)) {
@@ -343,7 +329,8 @@ function getConfiguration(stateNodes) {
             continue;
           }
           if (!configurationSet.has(child)) {
-            for (const initialStateNode of getInitialStateNodes(child)) {
+            const initialStates = getInitialStateNodesWithTheirAncestors(child);
+            for (const initialStateNode of initialStates) {
               configurationSet.add(initialStateNode);
             }
           }
@@ -403,14 +390,14 @@ function getStateValue(rootNode, configuration) {
   const config = getConfiguration(configuration);
   return getValueFromAdj(rootNode, getAdjList(config));
 }
-function isInFinalState(configuration, stateNode = configuration[0].machine.root) {
+function isInFinalState(configuration, stateNode) {
   if (stateNode.type === 'compound') {
-    return getChildren(stateNode).some(s => s.type === 'final' && configuration.includes(s));
+    return getChildren(stateNode).some(s => s.type === 'final' && configuration.has(s));
   }
   if (stateNode.type === 'parallel') {
     return getChildren(stateNode).every(sn => isInFinalState(configuration, sn));
   }
-  return false;
+  return stateNode.type === 'final';
 }
 const isStateId = str => str[0] === STATE_IDENTIFIER;
 function getCandidates(stateNode, receivedEventType) {
@@ -466,13 +453,7 @@ function getDelayedTransitions(stateNode) {
     stateNode.exit.push(cancel(eventType));
     return eventType;
   };
-  const delayedTransitions = isArray(afterConfig) ? afterConfig.map((transition, i) => {
-    const eventType = mutateEntryExit(transition.delay, i);
-    return {
-      ...transition,
-      event: eventType
-    };
-  }) : Object.keys(afterConfig).flatMap((delay, i) => {
+  const delayedTransitions = Object.keys(afterConfig).flatMap((delay, i) => {
     const configTransition = afterConfig[delay];
     const resolvedTransition = typeof configTransition === 'string' ? {
       target: configTransition
@@ -560,43 +541,23 @@ function formatTransitions(stateNode) {
   return transitions;
 }
 function formatInitialTransition(stateNode, _target) {
-  if (typeof _target === 'string' || isArray(_target)) {
-    const targets = toArray(_target).map(t => {
-      // Resolve state string keys (which represent children)
-      // to their state node
-      const descStateNode = typeof t === 'string' ? isStateId(t) ? stateNode.machine.getStateNodeById(t) : stateNode.states[t] : t;
-      if (!descStateNode) {
-        throw new Error(`Initial state node "${t}" not found on parent state node #${stateNode.id}`);
-      }
-      if (!isDescendant(descStateNode, stateNode)) {
-        throw new Error(`Invalid initial target: state node #${descStateNode.id} is not a descendant of #${stateNode.id}`);
-      }
-      return descStateNode;
-    });
-    const resolvedTarget = resolveTarget(stateNode, targets);
-    const transition = {
-      source: stateNode,
-      actions: [],
-      eventType: null,
-      reenter: false,
-      target: resolvedTarget,
-      toJSON: () => ({
-        ...transition,
-        source: `#${stateNode.id}`,
-        target: resolvedTarget ? resolvedTarget.map(t => `#${t.id}`) : undefined
-      })
-    };
-    return transition;
+  const resolvedTarget = typeof _target === 'string' ? stateNode.states[_target] : _target ? stateNode.states[_target.target] : undefined;
+  if (!resolvedTarget && _target) {
+    throw new Error(`Initial state node "${_target}" not found on parent state node #${stateNode.id}`);
   }
-  return formatTransition(stateNode, '__INITIAL__', {
-    target: toArray(_target.target).map(t => {
-      if (typeof t === 'string') {
-        return isStateId(t) ? t : `${STATE_DELIMITER}${t}`;
-      }
-      return t;
-    }),
-    actions: _target.actions
-  });
+  const transition = {
+    source: stateNode,
+    actions: !_target || typeof _target === 'string' ? [] : toArray(_target.actions),
+    eventType: null,
+    reenter: false,
+    target: resolvedTarget ? [resolvedTarget] : [],
+    toJSON: () => ({
+      ...transition,
+      source: `#${stateNode.id}`,
+      target: resolvedTarget ? [`#${resolvedTarget.id}`] : []
+    })
+  };
+  return transition;
 }
 function resolveTarget(stateNode, targets) {
   if (targets === undefined) {
@@ -639,6 +600,15 @@ function resolveHistoryTarget(stateNode) {
 function isHistoryNode(stateNode) {
   return stateNode.type === 'history';
 }
+function getInitialStateNodesWithTheirAncestors(stateNode) {
+  const states = getInitialStateNodes(stateNode);
+  for (const initialState of states) {
+    for (const ancestor of getProperAncestors(initialState, stateNode)) {
+      states.add(ancestor);
+    }
+  }
+  return states;
+}
 function getInitialStateNodes(stateNode) {
   const set = new Set();
   function iter(descStateNode) {
@@ -647,12 +617,7 @@ function getInitialStateNodes(stateNode) {
     }
     set.add(descStateNode);
     if (descStateNode.type === 'compound') {
-      for (const targetStateNode of descStateNode.initial.target) {
-        for (const a of getProperAncestors(targetStateNode, stateNode)) {
-          set.add(a);
-        }
-        iter(targetStateNode);
-      }
+      iter(descStateNode.initial.target[0]);
     } else if (descStateNode.type === 'parallel') {
       for (const child of getChildren(descStateNode)) {
         iter(child);
@@ -660,7 +625,7 @@ function getInitialStateNodes(stateNode) {
     }
   }
   iter(stateNode);
-  return [...set];
+  return set;
 }
 /**
  * Returns the child state node from its relative `stateKey`, or throws.
@@ -938,21 +903,15 @@ function microstepProcedure(transitions, currentState, mutConfiguration, event,
   // Enter states
   nextState = enterStates(nextState, event, actorCtx, filteredTransitions, mutConfiguration, internalQueue, historyValue, isInitial);
   const nextConfiguration = [...mutConfiguration];
-  const done = isInFinalState(nextConfiguration);
-  if (done) {
+  if (nextState.status === 'done') {
     nextState = resolveActionsAndContext(nextState, event, actorCtx, nextConfiguration.sort((a, b) => b.order - a.order).flatMap(state => state.exit));
   }
   try {
-    const output = done ? getOutput(nextConfiguration, nextState.context, event, actorCtx.self) : undefined;
     internalQueue.push(...nextState._internalQueue);
-    return cloneState(currentState, {
+    return cloneState(nextState, {
       configuration: nextConfiguration,
       historyValue,
-      _internalQueue: internalQueue,
-      context: nextState.context,
-      status: done ? 'done' : currentState.status,
-      output,
-      children: nextState.children
+      _internalQueue: internalQueue
     });
   } catch (e) {
     // TODO: Refactor this once proper error handling is implemented.
@@ -960,6 +919,13 @@ function microstepProcedure(transitions, currentState, mutConfiguration, event,
     throw e;
   }
 }
+function getMachineOutput(state, event, actorCtx, rootNode, rootCompletionNode) {
+  if (!rootNode.output) {
+    return;
+  }
+  const doneStateEvent = createDoneStateEvent(rootCompletionNode.id, rootCompletionNode.output && rootCompletionNode.parent ? resolveOutput(rootCompletionNode.output, state.context, event, actorCtx.self) : undefined);
+  return resolveOutput(rootNode.output, state.context, doneStateEvent, actorCtx.self);
+}
 function enterStates(currentState, event, actorCtx, filteredTransitions, mutConfiguration, internalQueue, historyValue, isInitial) {
   let nextState = currentState;
   const statesToEnter = new Set();
@@ -970,6 +936,7 @@ function enterStates(currentState, event, actorCtx, filteredTransitions, mutConf
   if (isInitial) {
     statesForDefaultEntry.add(currentState.machine.root);
   }
+  const completedNodes = new Set();
   for (const stateNodeToEnter of [...statesToEnter].sort((a, b) => a.order - b.order)) {
     mutConfiguration.add(stateNodeToEnter);
     const actions = [];
@@ -980,26 +947,34 @@ function enterStates(currentState, event, actorCtx, filteredTransitions, mutConf
       actions.push(invoke(invokeDef));
     }
     if (statesForDefaultEntry.has(stateNodeToEnter)) {
-      for (const stateNode of statesForDefaultEntry) {
-        const initialActions = stateNode.initial.actions;
-        actions.push(...initialActions);
-      }
+      const initialActions = stateNodeToEnter.initial.actions;
+      actions.push(...initialActions);
     }
     nextState = resolveActionsAndContext(nextState, event, actorCtx, actions, stateNodeToEnter.invoke.map(invokeDef => invokeDef.id));
     if (stateNodeToEnter.type === 'final') {
       const parent = stateNodeToEnter.parent;
-      if (!parent.parent) {
+      if (completedNodes.has(parent)) {
         continue;
       }
-      internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output ? resolveOutput(stateNodeToEnter.output, nextState.context, event, actorCtx.self) : undefined));
-      if (parent.parent) {
-        const grandparent = parent.parent;
-        if (grandparent.type === 'parallel') {
-          if (getChildren(grandparent).every(parentNode => isInFinalState([...mutConfiguration], parentNode))) {
-            internalQueue.push(createDoneStateEvent(grandparent.id));
-          }
+      completedNodes.add(parent);
+      let rootCompletionNode = parent?.type === 'parallel' ? parent : stateNodeToEnter;
+      let ancestorMarker = parent?.parent;
+      if (ancestorMarker) {
+        internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output ? resolveOutput(stateNodeToEnter.output, nextState.context, event, actorCtx.self) : undefined));
+        while (ancestorMarker?.type === 'parallel' && !completedNodes.has(ancestorMarker) && isInFinalState(mutConfiguration, ancestorMarker)) {
+          completedNodes.add(ancestorMarker);
+          internalQueue.push(createDoneStateEvent(ancestorMarker.id));
+          rootCompletionNode = ancestorMarker;
+          ancestorMarker = ancestorMarker.parent;
         }
       }
+      if (ancestorMarker) {
+        continue;
+      }
+      nextState = cloneState(nextState, {
+        status: 'done',
+        output: getMachineOutput(nextState, event, actorCtx, currentState.configuration[0].machine.root, rootCompletionNode)
+      });
     }
   }
   return nextState;
@@ -1045,13 +1020,9 @@ function addDescendantStatesToEnter(stateNode, historyValue, statesForDefaultEnt
     statesToEnter.add(stateNode);
     if (stateNode.type === 'compound') {
       statesForDefaultEntry.add(stateNode);
-      const initialStates = stateNode.initial.target;
-      for (const initialState of initialStates) {
-        addDescendantStatesToEnter(initialState, historyValue, statesForDefaultEntry, statesToEnter);
-      }
-      for (const initialState of initialStates) {
-        addAncestorStatesToEnter(initialState, stateNode, statesToEnter, historyValue, statesForDefaultEntry);
-      }
+      const [initialState] = stateNode.initial.target;
+      addDescendantStatesToEnter(initialState, historyValue, statesForDefaultEntry, statesToEnter);
+      addAncestorStatesToEnter(initialState, stateNode, statesToEnter, historyValue, statesForDefaultEntry);
     } else {
       if (stateNode.type === 'parallel') {
         for (const child of getChildren(stateNode).filter(sn => !isHistoryNode(sn))) {
@@ -1445,11 +1416,15 @@ function getPersistedState(state) {
     tags,
     machine,
     children,
+    context,
     ...jsonValues
   } = state;
   const childrenJson = {};
   for (const id in children) {
     const child = children[id];
+    if (typeof child.src !== 'string') {
+      throw new Error('An inline child actor cannot be persisted.');
+    }
     childrenJson[id] = {
       state: child.getPersistedState?.(),
       src: child.src
@@ -1457,9 +1432,38 @@ function getPersistedState(state) {
   }
   return {
     ...jsonValues,
+    // TODO: this makes `PersistedMachineState`'s type kind of a lie
+    // it doesn't truly use `TContext` but rather some kind of a derived form of it
+    context: persistContext(context),
     children: childrenJson
   };
 }
+function persistContext(contextPart) {
+  let copy;
+  for (const key in contextPart) {
+    const value = contextPart[key];
+    if (value && typeof value === 'object') {
+      if ('sessionId' in value && 'send' in value && 'ref' in value) {
+        copy ??= Array.isArray(contextPart) ? contextPart.slice() : {
+          ...contextPart
+        };
+        copy[key] = {
+          xstate$$type: $$ACTOR_TYPE,
+          id: value.id
+        };
+      } else {
+        const result = persistContext(value);
+        if (result !== value) {
+          copy ??= Array.isArray(contextPart) ? contextPart.slice() : {
+            ...contextPart
+          };
+          copy[key] = result;
+        }
+      }
+    }
+  }
+  return copy ?? contextPart;
+}
 
 function resolveRaise(_, state, args, {
   event: eventOrExpr,
@@ -1513,4 +1517,4 @@ function raise(eventOrExpr, options) {
   return raise;
 }
 
-export { raise as A, stop as B, State as S, formatTransition as a, formatInitialTransition as b, getCandidates as c, getConfiguration as d, evaluateGuard as e, formatTransitions as f, getDelayedTransitions as g, getStateNodes as h, isInFinalState as i, cloneState as j, macrostep as k, getInitialConfiguration as l, memo as m, resolveActionsAndContext as n, microstep as o, isAtomicStateNode as p, isStateId as q, resolveStateValue as r, getStateNodeByPath as s, transitionNode as t, getPersistedState as u, and as v, not as w, or as x, stateIn as y, cancel as z };
+export { raise as A, stop as B, State as S, formatTransition as a, formatInitialTransition as b, getCandidates as c, getConfiguration as d, evaluateGuard as e, formatTransitions as f, getDelayedTransitions as g, getStateNodes as h, isInFinalState as i, cloneState as j, macrostep as k, getInitialConfiguration as l, memo as m, resolveActionsAndContext as n, microstep as o, getInitialStateNodes as p, isStateId as q, resolveStateValue as r, getStateNodeByPath as s, transitionNode as t, getPersistedState as u, and as v, not as w, or as x, stateIn as y, cancel as z };

package/dist/{send-fe94de2b.cjs.js → send-19ffc568.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var guards_dist_xstateGuards = require('./raise-1dd65455.cjs.js');
-var interpreter = require('./interpreter-1301970f.cjs.js');
+var guards_dist_xstateGuards = require('./raise-0ff57677.cjs.js');
+var interpreter = require('./interpreter-69605bf0.cjs.js');
 
 function createSpawner(actorContext, {
   machine,
@@ -27,6 +27,7 @@ function createSpawner(actorContext, {
           event,
           self: actorContext.self
         }) : input,
+        src,
         systemId
       });
       spawnedChildren[actorRef.id] = actorRef;
@@ -52,6 +53,7 @@ function createSpawner(actorContext, {
         id: options.id,
         parent: actorContext.self,
         input: options.input,
+        src: undefined,
         systemId
       });
       if (options.syncSnapshot) {

package/dist/{send-9526366e.development.esm.js → send-1de74f4d.development.esm.js}

@@ -1,5 +1,5 @@
-import { j as cloneState, e as evaluateGuard } from './raise-05f8b2a6.development.esm.js';
-import { f as ActorStatus, j as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, y as XSTATE_ERROR } from './interpreter-dee56dc8.development.esm.js';
+import { j as cloneState, e as evaluateGuard } from './raise-cdcdf834.development.esm.js';
+import { f as ActorStatus, j as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, x as XSTATE_ERROR } from './interpreter-5c4e6634.development.esm.js';
 
 function createSpawner(actorContext, {
   machine,
@@ -25,6 +25,7 @@ function createSpawner(actorContext, {
           event,
           self: actorContext.self
         }) : input,
+        src,
         systemId
       });
       spawnedChildren[actorRef.id] = actorRef;
@@ -50,6 +51,7 @@ function createSpawner(actorContext, {
         id: options.id,
         parent: actorContext.self,
         input: options.input,
+        src: undefined,
         systemId
       });
       if (options.syncSnapshot) {

package/dist/{send-0b5eda0c.esm.js → send-211a2a94.esm.js}

@@ -1,5 +1,5 @@
-import { j as cloneState, e as evaluateGuard } from './raise-b5cfe1bb.esm.js';
-import { f as ActorStatus, j as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, y as XSTATE_ERROR } from './interpreter-83f7f2d4.esm.js';
+import { j as cloneState, e as evaluateGuard } from './raise-511399cc.esm.js';
+import { f as ActorStatus, j as createErrorActorEvent, r as resolveReferencedActor, d as createActor, t as toArray, x as XSTATE_ERROR } from './interpreter-de5217bc.esm.js';
 
 function createSpawner(actorContext, {
   machine,
@@ -25,6 +25,7 @@ function createSpawner(actorContext, {
           event,
           self: actorContext.self
         }) : input,
+        src,
         systemId
       });
       spawnedChildren[actorRef.id] = actorRef;
@@ -50,6 +51,7 @@ function createSpawner(actorContext, {
         id: options.id,
         parent: actorContext.self,
         input: options.input,
+        src: undefined,
         systemId
       });
       if (options.syncSnapshot) {

package/dist/{send-3764c866.development.cjs.js → send-894c4b18.development.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var guards_dist_xstateGuards = require('./raise-38b707c0.development.cjs.js');
-var interpreter = require('./interpreter-70ed62f2.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-26e4d83c.development.cjs.js');
+var interpreter = require('./interpreter-d3567419.development.cjs.js');
 
 function createSpawner(actorContext, {
   machine,
@@ -27,6 +27,7 @@ function createSpawner(actorContext, {
           event,
           self: actorContext.self
         }) : input,
+        src,
         systemId
       });
       spawnedChildren[actorRef.id] = actorRef;
@@ -52,6 +53,7 @@ function createSpawner(actorContext, {
         id: options.id,
         parent: actorContext.self,
         input: options.input,
+        src: undefined,
         systemId
       });
       if (options.syncSnapshot) {

package/dist/xstate.cjs.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var actors_dist_xstateActors = require('../actors/dist/xstate-actors.cjs.js');
-var interpreter = require('./interpreter-1301970f.cjs.js');
-var guards_dist_xstateGuards = require('./raise-1dd65455.cjs.js');
-var send = require('./send-fe94de2b.cjs.js');
+var interpreter = require('./interpreter-69605bf0.cjs.js');
+var guards_dist_xstateGuards = require('./raise-0ff57677.cjs.js');
+var send = require('./send-19ffc568.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 class SimulatedClock {
@@ -303,7 +303,7 @@ class StateNode {
     return guards_dist_xstateGuards.memo(this, 'delayedTransitions', () => guards_dist_xstateGuards.getDelayedTransitions(this));
   }
   get initial() {
-    return guards_dist_xstateGuards.memo(this, 'initial', () => guards_dist_xstateGuards.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;
@@ -471,7 +471,7 @@ class StateMachine {
       ...state,
       value: guards_dist_xstateGuards.resolveStateValue(this.root, state.value),
       configuration,
-      status: guards_dist_xstateGuards.isInFinalState(configuration) ? 'done' : state.status
+      status: guards_dist_xstateGuards.isInFinalState(configurationSet, this.root) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -552,7 +552,7 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = guards_dist_xstateGuards.microstep([{
-      target: [...preInitialState.configuration].filter(guards_dist_xstateGuards.isAtomicStateNode),
+      target: [...guards_dist_xstateGuards.getInitialStateNodes(this.root)],
       source: this.root,
       reenter: true,
       actions: [],
@@ -611,10 +611,29 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    return this.createState(new guards_dist_xstateGuards.State({
+    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
       ...snapshot,
       children
     }, this));
+    let seen = new Set();
+    function reviveContext(contextPart, children) {
+      if (seen.has(contextPart)) {
+        return;
+      }
+      seen.add(contextPart);
+      for (let key in contextPart) {
+        const value = contextPart[key];
+        if (value && typeof value === 'object') {
+          if ('xstate$$type' in value && value.xstate$$type === interpreter.$$ACTOR_TYPE) {
+            contextPart[key] = children[value.id];
+            continue;
+          }
+          reviveContext(value, children);
+        }
+      }
+    }
+    reviveContext(restoredSnapshot.context, children);
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */

package/dist/xstate.development.cjs.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var actors_dist_xstateActors = require('../actors/dist/xstate-actors.development.cjs.js');
-var interpreter = require('./interpreter-70ed62f2.development.cjs.js');
-var guards_dist_xstateGuards = require('./raise-38b707c0.development.cjs.js');
-var send = require('./send-3764c866.development.cjs.js');
+var interpreter = require('./interpreter-d3567419.development.cjs.js');
+var guards_dist_xstateGuards = require('./raise-26e4d83c.development.cjs.js');
+var send = require('./send-894c4b18.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 class SimulatedClock {
@@ -303,7 +303,7 @@ class StateNode {
     return guards_dist_xstateGuards.memo(this, 'delayedTransitions', () => guards_dist_xstateGuards.getDelayedTransitions(this));
   }
   get initial() {
-    return guards_dist_xstateGuards.memo(this, 'initial', () => guards_dist_xstateGuards.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;
@@ -474,7 +474,7 @@ class StateMachine {
       ...state,
       value: guards_dist_xstateGuards.resolveStateValue(this.root, state.value),
       configuration,
-      status: guards_dist_xstateGuards.isInFinalState(configuration) ? 'done' : state.status
+      status: guards_dist_xstateGuards.isInFinalState(configurationSet, this.root) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -555,7 +555,7 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = guards_dist_xstateGuards.microstep([{
-      target: [...preInitialState.configuration].filter(guards_dist_xstateGuards.isAtomicStateNode),
+      target: [...guards_dist_xstateGuards.getInitialStateNodes(this.root)],
       source: this.root,
       reenter: true,
       actions: [],
@@ -614,10 +614,29 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    return this.createState(new guards_dist_xstateGuards.State({
+    const restoredSnapshot = this.createState(new guards_dist_xstateGuards.State({
       ...snapshot,
       children
     }, this));
+    let seen = new Set();
+    function reviveContext(contextPart, children) {
+      if (seen.has(contextPart)) {
+        return;
+      }
+      seen.add(contextPart);
+      for (let key in contextPart) {
+        const value = contextPart[key];
+        if (value && typeof value === 'object') {
+          if ('xstate$$type' in value && value.xstate$$type === interpreter.$$ACTOR_TYPE) {
+            contextPart[key] = children[value.id];
+            continue;
+          }
+          reviveContext(value, children);
+        }
+      }
+    }
+    reviveContext(restoredSnapshot.context, children);
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */

package/dist/xstate.development.esm.js

@@ -1,10 +1,10 @@
 export { createEmptyActor, fromCallback, fromEventObservable, fromObservable, fromPromise, fromTransition } from '../actors/dist/xstate-actors.development.esm.js';
-import { S as STATE_DELIMITER, m as mapValues, t as toArray, a as toTransitionConfigArray, N as NULL_EVENT, c as createInvokeId, i as isErrorActorEvent, b as createInitEvent, r as resolveReferencedActor, d as createActor, e as matchesState } from './interpreter-dee56dc8.development.esm.js';
-export { A as Actor, f as ActorStatus, I as InterpreterStatus, d as createActor, g as interpret, e as matchesState, p as pathToStateValue, h as toObserver } from './interpreter-dee56dc8.development.esm.js';
-import { f as formatTransitions, a as formatTransition, m as memo, e as evaluateGuard, g as getDelayedTransitions, b as formatInitialTransition, c as getCandidates, d as getConfiguration, h as getStateNodes, r as resolveStateValue, i as isInFinalState, S as State, j as cloneState, k as macrostep, t as transitionNode, l as getInitialConfiguration, n as resolveActionsAndContext, o as microstep, p as isAtomicStateNode, q as isStateId, s as getStateNodeByPath, u as getPersistedState } from './raise-05f8b2a6.development.esm.js';
-export { S as State, v as and, z as cancel, h as getStateNodes, w as not, x as or, A as raise, y as stateIn, B as stop } from './raise-05f8b2a6.development.esm.js';
-import { a as assign } from './send-9526366e.development.esm.js';
-export { S as SpecialTargets, a as assign, c as choose, e as escalate, f as forwardTo, l as log, p as pure, s as sendParent, b as sendTo } from './send-9526366e.development.esm.js';
+import { S as STATE_DELIMITER, m as mapValues, t as toArray, a as toTransitionConfigArray, N as NULL_EVENT, c as createInvokeId, i as isErrorActorEvent, b as createInitEvent, r as resolveReferencedActor, d as createActor, $ as $$ACTOR_TYPE, e as matchesState } from './interpreter-5c4e6634.development.esm.js';
+export { A as Actor, f as ActorStatus, I as InterpreterStatus, d as createActor, g as interpret, e as matchesState, p as pathToStateValue, h as toObserver } from './interpreter-5c4e6634.development.esm.js';
+import { f as formatTransitions, a as formatTransition, m as memo, e as evaluateGuard, g as getDelayedTransitions, b as formatInitialTransition, c as getCandidates, d as getConfiguration, h as getStateNodes, r as resolveStateValue, i as isInFinalState, S as State, j as cloneState, k as macrostep, t as transitionNode, l as getInitialConfiguration, n as resolveActionsAndContext, o as microstep, p as getInitialStateNodes, q as isStateId, s as getStateNodeByPath, u as getPersistedState } from './raise-cdcdf834.development.esm.js';
+export { S as State, v as and, z as cancel, h as getStateNodes, w as not, x as or, A as raise, y as stateIn, B as stop } from './raise-cdcdf834.development.esm.js';
+import { a as assign } from './send-1de74f4d.development.esm.js';
+export { S as SpecialTargets, a as assign, c as choose, e as escalate, f as forwardTo, l as log, p as pure, s as sendParent, b as sendTo } from './send-1de74f4d.development.esm.js';
 import '../dev/dist/xstate-dev.development.esm.js';
 
 class SimulatedClock {
@@ -302,7 +302,7 @@ class StateNode {
     return memo(this, 'delayedTransitions', () => getDelayedTransitions(this));
   }
   get initial() {
-    return memo(this, 'initial', () => formatInitialTransition(this, this.config.initial || []));
+    return memo(this, 'initial', () => formatInitialTransition(this, this.config.initial));
   }
   next(state, event) {
     const eventType = event.type;
@@ -473,7 +473,7 @@ class StateMachine {
       ...state,
       value: resolveStateValue(this.root, state.value),
       configuration,
-      status: isInFinalState(configuration) ? 'done' : state.status
+      status: isInFinalState(configurationSet, this.root) ? 'done' : state.status
     });
   }
   resolveStateValue(stateValue, ...[context]) {
@@ -554,7 +554,7 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, initEvent);
     const nextState = microstep([{
-      target: [...preInitialState.configuration].filter(isAtomicStateNode),
+      target: [...getInitialStateNodes(this.root)],
       source: this.root,
       reenter: true,
       actions: [],
@@ -613,10 +613,29 @@ class StateMachine {
       });
       children[actorId] = actorRef;
     });
-    return this.createState(new State({
+    const restoredSnapshot = this.createState(new State({
       ...snapshot,
       children
     }, this));
+    let seen = new Set();
+    function reviveContext(contextPart, children) {
+      if (seen.has(contextPart)) {
+        return;
+      }
+      seen.add(contextPart);
+      for (let key in contextPart) {
+        const value = contextPart[key];
+        if (value && typeof value === 'object') {
+          if ('xstate$$type' in value && value.xstate$$type === $$ACTOR_TYPE) {
+            contextPart[key] = children[value.id];
+            continue;
+          }
+          reviveContext(value, children);
+        }
+      }
+    }
+    reviveContext(restoredSnapshot.context, children);
+    return restoredSnapshot;
   }
 
   /**@deprecated an internal property acting as a "phantom" type, not meant to be used at runtime */