xstate 6.0.0-alpha.19 → 6.0.0-alpha.20

package/dist/{StateMachine-bb722e90.esm.js → StateMachine-42f1d26c.esm.js}

@@ -1,4 +1,4 @@
-import { P as ProcessingStatus, G as resolveReferencedActor, d as createActor, S as STATE_DELIMITER, H as mapValues, t as toArray, I as createInvokeId, J as getDelayedTransitions, K as evaluateCandidate, L as formatTransition, N as NULL_EVENT, M as toTransitionConfigArray, O as createInvokeTimeoutEvent, Q as getCandidates, R as formatRouteTransitions, U as resolveStateValue, V as getAllStateNodes, k as getStateNodes, W as createMachineSnapshot, Y as isInFinalState, e as macrostep, Z as cloneMachineSnapshot, _ as transitionNode, m as matchesEventDescriptor, $ as getTransitionResult, a0 as hasEffect, a1 as createErrorPlatformEvent, r as resolveActionsWithContext, f as createInitEvent, g as initialMicrostep, a2 as toStatePath, a3 as isStateId, a4 as getStateNodeByPath, a5 as getPersistedSnapshot, a6 as $$ACTOR_TYPE } from './index-0842e9fd.esm.js';
+import { P as ProcessingStatus, H as resolveReferencedActor, e as createActor, S as STATE_DELIMITER, I as mapValues, t as toArray, J as createInvokeId, K as getDelayedTransitions, L as evaluateCandidate, M as formatTransition, N as NULL_EVENT, O as toTransitionConfigArray, Q as createInvokeTimeoutEvent, R as getCandidates, U as formatRouteTransitions, V as resolveStateValue, W as getAllStateNodes, l as getStateNodes, Y as createMachineSnapshot, Z as isInFinalState, f as macrostep, d as deriveDeferredStarts, _ as cloneMachineSnapshot, $ as transitionNode, m as matchesEventDescriptor, a0 as getTransitionResult, a1 as hasEffect, a2 as createErrorPlatformEvent, r as resolveActionsWithContext, g as createInitEvent, h as initialMicrostep, a3 as toStatePath, a4 as isStateId, a5 as getStateNodeByPath, a6 as getPersistedSnapshot, a7 as $$ACTOR_TYPE } from './index-d88b0c55.esm.js';
 
 function createSpawner(actorScope, {
   machine,
@@ -549,7 +549,11 @@ class StateMachine {
       snapshot: nextSnapshot,
       microsteps
     } = macrostep(snapshot, event, actorScope, []);
-    return [nextSnapshot, microsteps.flatMap(([, actions]) => actions)];
+    return [nextSnapshot, this._collectEffects(microsteps)];
+  }
+  _collectEffects(microsteps, initialActions = []) {
+    const effects = [...initialActions, ...microsteps.flatMap(([, actions]) => actions)];
+    return [...effects, ...deriveDeferredStarts(effects)];
   }
   _transitionFast(snapshot, event, actorScope) {
     if (snapshot.status !== 'active' || typeof snapshot.value !== 'string' || this.root.always?.length) {
@@ -732,7 +736,7 @@ class StateMachine {
       microsteps = errorMacrostep.microsteps;
       initialActions = [];
     }
-    return [macroState, [...initialActions, ...microsteps.flatMap(([, actions]) => actions)]];
+    return [macroState, this._collectEffects(microsteps, initialActions)];
   }
   start(snapshot) {
     // Start rehydrated children that were active when persisted. Freshly
@@ -830,7 +834,8 @@ class StateMachine {
       children,
       _nodes: nodes,
       value: snapshotData.value,
-      historyValue: revivedHistoryValue
+      historyValue: revivedHistoryValue,
+      _stateInputs: snapshotData.stateInputs ?? {}
     }, this);
     const seen = new WeakSet();
     function reviveContext(contextPart) {

package/dist/{StateMachine-9e72e36d.development.cjs.js → StateMachine-6661eb0d.development.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var dist_xstateActors = require('./index-792d3638.development.cjs.js');
+var dist_xstateActors = require('./index-49293864.development.cjs.js');
 
 function createSpawner(actorScope, {
   machine,
@@ -580,7 +580,11 @@ class StateMachine {
       snapshot: nextSnapshot,
       microsteps
     } = dist_xstateActors.macrostep(snapshot, event, actorScope, []);
-    return [nextSnapshot, microsteps.flatMap(([, actions]) => actions)];
+    return [nextSnapshot, this._collectEffects(microsteps)];
+  }
+  _collectEffects(microsteps, initialActions = []) {
+    const effects = [...initialActions, ...microsteps.flatMap(([, actions]) => actions)];
+    return [...effects, ...dist_xstateActors.deriveDeferredStarts(effects)];
   }
   _transitionFast(snapshot, event, actorScope) {
     if (snapshot.status !== 'active' || typeof snapshot.value !== 'string' || this.root.always?.length) {
@@ -763,7 +767,7 @@ class StateMachine {
       microsteps = errorMacrostep.microsteps;
       initialActions = [];
     }
-    return [macroState, [...initialActions, ...microsteps.flatMap(([, actions]) => actions)]];
+    return [macroState, this._collectEffects(microsteps, initialActions)];
   }
   start(snapshot) {
     // Start rehydrated children that were active when persisted. Freshly
@@ -864,7 +868,8 @@ class StateMachine {
       children,
       _nodes: nodes,
       value: snapshotData.value,
-      historyValue: revivedHistoryValue
+      historyValue: revivedHistoryValue,
+      _stateInputs: snapshotData.stateInputs ?? {}
     }, this);
     const seen = new WeakSet();
     function reviveContext(contextPart) {

package/dist/{StateMachine-f777a374.development.esm.js → StateMachine-ba3ccedf.development.esm.js}

@@ -1,4 +1,4 @@
-import { P as ProcessingStatus, G as resolveReferencedActor, d as createActor, S as STATE_DELIMITER, H as mapValues, t as toArray, I as createInvokeId, J as getDelayedTransitions, K as evaluateCandidate, L as formatTransition, N as NULL_EVENT, M as toTransitionConfigArray, O as createInvokeTimeoutEvent, Q as getCandidates, R as formatRouteTransitions, U as resolveStateValue, V as getAllStateNodes, k as getStateNodes, W as createMachineSnapshot, Y as isInFinalState, e as macrostep, Z as cloneMachineSnapshot, _ as transitionNode, m as matchesEventDescriptor, $ as getTransitionResult, a0 as hasEffect, a1 as createErrorPlatformEvent, r as resolveActionsWithContext, f as createInitEvent, g as initialMicrostep, a2 as toStatePath, a3 as isStateId, a4 as getStateNodeByPath, a5 as getPersistedSnapshot, a6 as $$ACTOR_TYPE } from './index-b5a6f830.development.esm.js';
+import { P as ProcessingStatus, H as resolveReferencedActor, e as createActor, S as STATE_DELIMITER, I as mapValues, t as toArray, J as createInvokeId, K as getDelayedTransitions, L as evaluateCandidate, M as formatTransition, N as NULL_EVENT, O as toTransitionConfigArray, Q as createInvokeTimeoutEvent, R as getCandidates, U as formatRouteTransitions, V as resolveStateValue, W as getAllStateNodes, l as getStateNodes, Y as createMachineSnapshot, Z as isInFinalState, f as macrostep, d as deriveDeferredStarts, _ as cloneMachineSnapshot, $ as transitionNode, m as matchesEventDescriptor, a0 as getTransitionResult, a1 as hasEffect, a2 as createErrorPlatformEvent, r as resolveActionsWithContext, g as createInitEvent, h as initialMicrostep, a3 as toStatePath, a4 as isStateId, a5 as getStateNodeByPath, a6 as getPersistedSnapshot, a7 as $$ACTOR_TYPE } from './index-dc3443b6.development.esm.js';
 
 function createSpawner(actorScope, {
   machine,
@@ -578,7 +578,11 @@ class StateMachine {
       snapshot: nextSnapshot,
       microsteps
     } = macrostep(snapshot, event, actorScope, []);
-    return [nextSnapshot, microsteps.flatMap(([, actions]) => actions)];
+    return [nextSnapshot, this._collectEffects(microsteps)];
+  }
+  _collectEffects(microsteps, initialActions = []) {
+    const effects = [...initialActions, ...microsteps.flatMap(([, actions]) => actions)];
+    return [...effects, ...deriveDeferredStarts(effects)];
   }
   _transitionFast(snapshot, event, actorScope) {
     if (snapshot.status !== 'active' || typeof snapshot.value !== 'string' || this.root.always?.length) {
@@ -761,7 +765,7 @@ class StateMachine {
       microsteps = errorMacrostep.microsteps;
       initialActions = [];
     }
-    return [macroState, [...initialActions, ...microsteps.flatMap(([, actions]) => actions)]];
+    return [macroState, this._collectEffects(microsteps, initialActions)];
   }
   start(snapshot) {
     // Start rehydrated children that were active when persisted. Freshly
@@ -862,7 +866,8 @@ class StateMachine {
       children,
       _nodes: nodes,
       value: snapshotData.value,
-      historyValue: revivedHistoryValue
+      historyValue: revivedHistoryValue,
+      _stateInputs: snapshotData.stateInputs ?? {}
     }, this);
     const seen = new WeakSet();
     function reviveContext(contextPart) {

package/dist/{StateMachine-20b7d63b.cjs.js → StateMachine-f2b70732.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var dist_xstateActors = require('./index-626fe0b0.cjs.js');
+var dist_xstateActors = require('./index-42956779.cjs.js');
 
 function createSpawner(actorScope, {
   machine,
@@ -551,7 +551,11 @@ class StateMachine {
       snapshot: nextSnapshot,
       microsteps
     } = dist_xstateActors.macrostep(snapshot, event, actorScope, []);
-    return [nextSnapshot, microsteps.flatMap(([, actions]) => actions)];
+    return [nextSnapshot, this._collectEffects(microsteps)];
+  }
+  _collectEffects(microsteps, initialActions = []) {
+    const effects = [...initialActions, ...microsteps.flatMap(([, actions]) => actions)];
+    return [...effects, ...dist_xstateActors.deriveDeferredStarts(effects)];
   }
   _transitionFast(snapshot, event, actorScope) {
     if (snapshot.status !== 'active' || typeof snapshot.value !== 'string' || this.root.always?.length) {
@@ -734,7 +738,7 @@ class StateMachine {
       microsteps = errorMacrostep.microsteps;
       initialActions = [];
     }
-    return [macroState, [...initialActions, ...microsteps.flatMap(([, actions]) => actions)]];
+    return [macroState, this._collectEffects(microsteps, initialActions)];
   }
   start(snapshot) {
     // Start rehydrated children that were active when persisted. Freshly
@@ -832,7 +836,8 @@ class StateMachine {
       children,
       _nodes: nodes,
       value: snapshotData.value,
-      historyValue: revivedHistoryValue
+      historyValue: revivedHistoryValue,
+      _stateInputs: snapshotData.stateInputs ?? {}
     }, this);
     const seen = new WeakSet();
     function reviveContext(contextPart) {

package/dist/declarations/src/StateMachine.d.ts

@@ -63,6 +63,7 @@ export declare class StateMachine<TContext extends MachineContext, TEvent extend
      * @param event The received event
      */
     transition(snapshot: MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>, event: TEvent, actorScope: ActorScope<typeof snapshot, TEvent, AnyActorSystem, TEmitted>): ActorLogicTransitionResult<MachineSnapshot<TContext, TEvent, TChildren, TStateValue, TTag, TOutput, TMeta, TConfig>, ExecutableActionObjectFromLogic<this>>;
+    private _collectEffects;
     private _transitionFast;
     /**
      * Determines the next state given the current `state` and `event`. Calculates

package/dist/declarations/src/actions.d.ts

@@ -1,5 +1,6 @@
 import { AnyActor, AnyActorScope, EventObject } from "./types.js";
 export declare const builtInActions: {
+    "@xstate.spawn": (_actor: AnyActor) => void;
     "@xstate.start": (actor: AnyActor) => void;
     "@xstate.raise": (actorScope: AnyActorScope, event: EventObject, options: {
         id?: string;

package/dist/declarations/src/transitionActions.d.ts

@@ -1,6 +1,12 @@
-import type { AnyAction, AnyActorScope, AnyEventObject, AnyMachineSnapshot, EnqueueObject, EventObject, ExecutableActionObject, MachineContext, SpecialExecutableAction } from "./types.js";
+import type { AnyAction, AnyActorScope, AnyEventObject, AnyMachineSnapshot, EnqueueObject, EventObject, ExecutableActionObject, MachineContext, SpecialExecutableAction, StartExecutableActionObject } from "./types.js";
 export declare function mergeContextPatch(context: MachineContext, patch: MachineContext): MachineContext;
 export declare function createTransitionEnqueue(actorScope: AnyActorScope, actions: any[], internalEvents: EventObject[], actorSubscriptions?: boolean, createActors?: boolean): EnqueueObject<any, any>;
+/**
+ * Attached (listener/subscription) starts are ordered before child starts so
+ * that a listener/subscription captures events emitted synchronously as its
+ * target actor starts.
+ */
+export declare function deriveDeferredStarts(effects: ReadonlyArray<ExecutableActionObject>): StartExecutableActionObject[];
 export declare function isBuiltInExecutableAction(action: ExecutableActionObject): action is SpecialExecutableAction;
 export declare function resolveActionsWithContext(currentSnapshot: AnyMachineSnapshot, event: AnyEventObject, actorScope: AnyActorScope, actions: AnyAction[]): [AnyMachineSnapshot, ExecutableActionObject[]];
 export declare function createEnqueueObject(props: Partial<EnqueueObject<any, any>>, action: <T extends (...args: any[]) => any>(fn: T, ...args: Parameters<T>) => void): EnqueueObject<any, any>;

package/dist/declarations/src/types.d.ts

@@ -1052,13 +1052,19 @@ export interface BaseExecutableActionObject {
 export interface CustomExecutableActionObject<TType extends string = string & {}> extends BaseExecutableActionObject {
     type: TType;
 }
-export interface StartExecutableActionObject extends BaseExecutableActionObject {
-    type: '@xstate.start';
+export interface SpawnExecutableActionObject extends BaseExecutableActionObject {
+    type: '@xstate.spawn';
     actor: AnyActor;
     id: string;
     logic: AnyActorLogic;
     src: string | AnyActorLogic;
     input: unknown;
+    args: Parameters<(typeof builtInActions)['@xstate.spawn']>;
+}
+export interface StartExecutableActionObject extends BaseExecutableActionObject {
+    type: '@xstate.start';
+    actor: AnyActor;
+    id: string;
     args: Parameters<(typeof builtInActions)['@xstate.start']>;
 }
 export interface RaiseExecutableActionObject extends BaseExecutableActionObject {
@@ -1087,6 +1093,7 @@ export interface StopExecutableActionObject extends BaseExecutableActionObject {
     args: Parameters<(typeof builtInActions)['@xstate.stop']>;
 }
 export type BuiltInExecutableActionObject = Values<{
+    '@xstate.spawn': SpawnExecutableActionObject;
     '@xstate.start': StartExecutableActionObject;
     '@xstate.raise': RaiseExecutableActionObject;
     '@xstate.sendTo': SendToExecutableActionObject;
@@ -1150,9 +1157,7 @@ export type EnqueueObject<TEvent extends EventObject, TEmittedEvent extends Even
      * @param mappers - Object with done/error/snapshot mappers, or a single
      *   snapshot mapper function
      */
-    subscribeTo: {
-        <TSnapshot extends Snapshot<unknown>, TOutput, TMappedEvent extends TEvent>(actor: AnyActor, mappers: SubscribeToMappers<TSnapshot, TOutput, TMappedEvent> | ((snapshot: TSnapshot) => TMappedEvent)): AnyActor;
-    };
+    subscribeTo: <TActor extends AnyActor, TMappedEvent extends TEvent>(actor: TActor, mappers: SubscribeToMappers<SnapshotFrom<TActor>, OutputFrom<TActor>, TMappedEvent> | ((snapshot: SnapshotFrom<TActor>) => TMappedEvent)) => AnyActor;
 };
 export type Action<TContext extends MachineContext, TEvent extends EventObject, TEmittedEvent extends EventObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actorSources'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TParams = Record<string, unknown> | undefined, _TCtx = [TContext] extends [never] ? any : TContext> = (_: {
     context: _TCtx;

package/dist/{index-626fe0b0.cjs.js → index-42956779.cjs.js}

@@ -53,6 +53,8 @@ const NULL_EVENT = '';
 const STATE_IDENTIFIER = '#';
 const WILDCARD = '*';
 const XSTATE_INIT = '@xstate.init';
+const XSTATE_START = '@xstate.start';
+const XSTATE_SPAWN = '@xstate.spawn';
 const XSTATE_STOP = '@xstate.stop';
 
 /**
@@ -159,6 +161,9 @@ function reportUnhandledError(err) {
 const symbolObservable = (() => typeof Symbol === 'function' && Symbol.observable || '@@observable')();
 
 const builtInActions = {
+  // No-op: creation/registration are eager and pure; the start is a separate
+  // deferred `@xstate.start` effect (see `deriveDeferredStarts`).
+  ['@xstate.spawn']: _actor => {},
   ['@xstate.start']: actor => {
     actor.start();
   },
@@ -386,8 +391,8 @@ function unregisterChild(actor) {
     _special: true
   });
 }
-function pushStartedChild(actions, actor, id) {
-  pushBuiltInAction(actions, builtInActions['@xstate.start'], actor);
+function pushSpawnedChild(actions, actor, id) {
+  pushBuiltInAction(actions, builtInActions['@xstate.spawn'], actor);
   actions.push(registerSpawnedChild(actor, id ?? actor.id));
 }
 function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubscriptions = false, createActors = true) {
@@ -422,7 +427,7 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
         ...options,
         parent: actorScope.self
       });
-      pushStartedChild(actions, actor, options?.id);
+      pushSpawnedChild(actions, actor, options?.id);
       return actor;
     },
     sendTo: (actor, event, options) => {
@@ -454,7 +459,7 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
           input,
           parent: actorScope.self
         });
-        pushBuiltInAction(actions, builtInActions['@xstate.start'], listenerActor);
+        pushBuiltInAction(actions, builtInActions['@xstate.spawn'], listenerActor);
         return listenerActor;
       },
       subscribeTo: (actor, mappers) => {
@@ -469,7 +474,7 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
           input,
           parent: actorScope.self
         });
-        pushBuiltInAction(actions, builtInActions['@xstate.start'], subscriptionActor);
+        pushBuiltInAction(actions, builtInActions['@xstate.spawn'], subscriptionActor);
         return subscriptionActor;
       }
     });
@@ -480,7 +485,7 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
 }
 function getBuiltInActionFields(action, args) {
   switch (action) {
-    case builtInActions['@xstate.start']:
+    case builtInActions['@xstate.spawn']:
       {
         const [actor] = args;
         return {
@@ -528,8 +533,65 @@ function getBuiltInActionFields(action, args) {
       return undefined;
   }
 }
+function createStartEffect(actor) {
+  const action = builtInActions['@xstate.start'];
+  const args = [actor];
+  return {
+    type: XSTATE_START,
+    params: {
+      action,
+      args
+    },
+    args,
+    exec: action.bind(null, actor),
+    actor,
+    id: actor.id
+  };
+}
+
+/**
+ * Attached (listener/subscription) starts are ordered before child starts so
+ * that a listener/subscription captures events emitted synchronously as its
+ * target actor starts.
+ */
+function deriveDeferredStarts(effects) {
+  const attachedStarts = [];
+  const childStarts = [];
+  for (const effect of effects) {
+    if (!isBuiltInExecutableAction(effect) || effect.type !== XSTATE_SPAWN) {
+      continue;
+    }
+    const {
+      actor,
+      logic
+    } = effect;
+    const start = createStartEffect(actor);
+    if (logic === listenerLogic || logic === subscriptionLogic) {
+      attachedStarts.push(start);
+    } else {
+      childStarts.push(start);
+    }
+  }
+  return [...attachedStarts, ...childStarts];
+}
 function isBuiltInExecutableAction(action) {
-  return Object.prototype.hasOwnProperty.call(builtInActions, action.type);
+  if (!Object.prototype.hasOwnProperty.call(builtInActions, action.type)) {
+    return false;
+  }
+  switch (action.type) {
+    case '@xstate.spawn':
+      return 'actor' in action && 'logic' in action && 'src' in action && 'input' in action;
+    case '@xstate.start':
+    case '@xstate.stop':
+      return 'actor' in action;
+    case '@xstate.raise':
+    case '@xstate.sendTo':
+      return 'event' in action;
+    case '@xstate.cancel':
+      return 'id' in action;
+    default:
+      return false;
+  }
 }
 function resolveActionsWithContext(currentSnapshot, event, actorScope, actions) {
   let intermediateSnapshot = currentSnapshot;
@@ -1612,7 +1674,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             syncSnapshot: !!invokeDef.onSnapshot
           });
           actions.push({
-            action: builtInActions['@xstate.start'],
+            action: builtInActions['@xstate.spawn'],
             args: [actor]
           });
           if (invokeDef.id) {
@@ -2160,6 +2222,9 @@ function getPersistedSnapshot(snapshot, options) {
     children: childrenJson,
     historyValue: serializeHistoryValue(jsonValues.historyValue)
   };
+  if (_stateInputs && Object.keys(_stateInputs).length > 0) {
+    persisted.stateInputs = _stateInputs;
+  }
   if (machine.version !== undefined) {
     persisted.version = machine.version;
   }
@@ -3104,6 +3169,9 @@ class Actor {
       // Do not restart the service if it is already started
       return this;
     }
+    if (this._processingStatus === ProcessingStatus.Stopped) {
+      return this;
+    }
     if (this._syncSnapshot) {
       this.subscribe({
         next: snapshot => {
@@ -4420,6 +4488,7 @@ exports.createMachineSnapshot = createMachineSnapshot;
 exports.createObservableLogic = createObservableLogic;
 exports.createSubscriptionLogic = createSubscriptionLogic;
 exports.createTransitionEnqueue = createTransitionEnqueue;
+exports.deriveDeferredStarts = deriveDeferredStarts;
 exports.evaluateCandidate = evaluateCandidate;
 exports.formatRouteTransitions = formatRouteTransitions;
 exports.formatTransition = formatTransition;

package/dist/{index-792d3638.development.cjs.js → index-49293864.development.cjs.js}

@@ -53,6 +53,8 @@ const NULL_EVENT = '';
 const STATE_IDENTIFIER = '#';
 const WILDCARD = '*';
 const XSTATE_INIT = '@xstate.init';
+const XSTATE_START = '@xstate.start';
+const XSTATE_SPAWN = '@xstate.spawn';
 const XSTATE_STOP = '@xstate.stop';
 
 /**
@@ -159,6 +161,9 @@ function reportUnhandledError(err) {
 const symbolObservable = (() => typeof Symbol === 'function' && Symbol.observable || '@@observable')();
 
 const builtInActions = {
+  // No-op: creation/registration are eager and pure; the start is a separate
+  // deferred `@xstate.start` effect (see `deriveDeferredStarts`).
+  ['@xstate.spawn']: _actor => {},
   ['@xstate.start']: actor => {
     actor.start();
   },
@@ -387,8 +392,8 @@ function unregisterChild(actor) {
     _special: true
   });
 }
-function pushStartedChild(actions, actor, id) {
-  pushBuiltInAction(actions, builtInActions['@xstate.start'], actor);
+function pushSpawnedChild(actions, actor, id) {
+  pushBuiltInAction(actions, builtInActions['@xstate.spawn'], actor);
   actions.push(registerSpawnedChild(actor, id ?? actor.id));
 }
 function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubscriptions = false, createActors = true) {
@@ -423,7 +428,7 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
         ...options,
         parent: actorScope.self
       });
-      pushStartedChild(actions, actor, options?.id);
+      pushSpawnedChild(actions, actor, options?.id);
       return actor;
     },
     sendTo: (actor, event, options) => {
@@ -455,7 +460,7 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
           input,
           parent: actorScope.self
         });
-        pushBuiltInAction(actions, builtInActions['@xstate.start'], listenerActor);
+        pushBuiltInAction(actions, builtInActions['@xstate.spawn'], listenerActor);
         return listenerActor;
       },
       subscribeTo: (actor, mappers) => {
@@ -470,7 +475,7 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
           input,
           parent: actorScope.self
         });
-        pushBuiltInAction(actions, builtInActions['@xstate.start'], subscriptionActor);
+        pushBuiltInAction(actions, builtInActions['@xstate.spawn'], subscriptionActor);
         return subscriptionActor;
       }
     });
@@ -481,7 +486,7 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
 }
 function getBuiltInActionFields(action, args) {
   switch (action) {
-    case builtInActions['@xstate.start']:
+    case builtInActions['@xstate.spawn']:
       {
         const [actor] = args;
         return {
@@ -529,8 +534,65 @@ function getBuiltInActionFields(action, args) {
       return undefined;
   }
 }
+function createStartEffect(actor) {
+  const action = builtInActions['@xstate.start'];
+  const args = [actor];
+  return {
+    type: XSTATE_START,
+    params: {
+      action,
+      args
+    },
+    args,
+    exec: action.bind(null, actor),
+    actor,
+    id: actor.id
+  };
+}
+
+/**
+ * Attached (listener/subscription) starts are ordered before child starts so
+ * that a listener/subscription captures events emitted synchronously as its
+ * target actor starts.
+ */
+function deriveDeferredStarts(effects) {
+  const attachedStarts = [];
+  const childStarts = [];
+  for (const effect of effects) {
+    if (!isBuiltInExecutableAction(effect) || effect.type !== XSTATE_SPAWN) {
+      continue;
+    }
+    const {
+      actor,
+      logic
+    } = effect;
+    const start = createStartEffect(actor);
+    if (logic === listenerLogic || logic === subscriptionLogic) {
+      attachedStarts.push(start);
+    } else {
+      childStarts.push(start);
+    }
+  }
+  return [...attachedStarts, ...childStarts];
+}
 function isBuiltInExecutableAction(action) {
-  return Object.prototype.hasOwnProperty.call(builtInActions, action.type);
+  if (!Object.prototype.hasOwnProperty.call(builtInActions, action.type)) {
+    return false;
+  }
+  switch (action.type) {
+    case '@xstate.spawn':
+      return 'actor' in action && 'logic' in action && 'src' in action && 'input' in action;
+    case '@xstate.start':
+    case '@xstate.stop':
+      return 'actor' in action;
+    case '@xstate.raise':
+    case '@xstate.sendTo':
+      return 'event' in action;
+    case '@xstate.cancel':
+      return 'id' in action;
+    default:
+      return false;
+  }
 }
 function resolveActionsWithContext(currentSnapshot, event, actorScope, actions) {
   let intermediateSnapshot = currentSnapshot;
@@ -1623,7 +1685,7 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             syncSnapshot: !!invokeDef.onSnapshot
           });
           actions.push({
-            action: builtInActions['@xstate.start'],
+            action: builtInActions['@xstate.spawn'],
             args: [actor]
           });
           if (invokeDef.id) {
@@ -2177,6 +2239,9 @@ function getPersistedSnapshot(snapshot, options) {
     children: childrenJson,
     historyValue: serializeHistoryValue(jsonValues.historyValue)
   };
+  if (_stateInputs && Object.keys(_stateInputs).length > 0) {
+    persisted.stateInputs = _stateInputs;
+  }
   if (machine.version !== undefined) {
     persisted.version = machine.version;
   }
@@ -3130,6 +3195,9 @@ class Actor {
       // Do not restart the service if it is already started
       return this;
     }
+    if (this._processingStatus === ProcessingStatus.Stopped) {
+      return this;
+    }
     if (this._syncSnapshot) {
       this.subscribe({
         next: snapshot => {
@@ -4459,6 +4527,7 @@ exports.createMachineSnapshot = createMachineSnapshot;
 exports.createObservableLogic = createObservableLogic;
 exports.createSubscriptionLogic = createSubscriptionLogic;
 exports.createTransitionEnqueue = createTransitionEnqueue;
+exports.deriveDeferredStarts = deriveDeferredStarts;
 exports.evaluateCandidate = evaluateCandidate;
 exports.formatRouteTransitions = formatRouteTransitions;
 exports.formatTransition = formatTransition;