xstate 5.0.0-beta.40 → 5.0.0-beta.41

package/dist/{interpreter-ed0fac7e.esm.js → interpreter-480db258.esm.js}

@@ -331,17 +331,13 @@ function resolveReferencedActor(machine, src) {
 }
 
 const $$ACTOR_TYPE = 1;
-let ActorStatus = /*#__PURE__*/function (ActorStatus) {
-  ActorStatus[ActorStatus["NotStarted"] = 0] = "NotStarted";
-  ActorStatus[ActorStatus["Running"] = 1] = "Running";
-  ActorStatus[ActorStatus["Stopped"] = 2] = "Stopped";
-  return ActorStatus;
+// those values are currently used by @xstate/react directly so it's important to keep the assigned values in sync
+let ProcessingStatus = /*#__PURE__*/function (ProcessingStatus) {
+  ProcessingStatus[ProcessingStatus["NotStarted"] = 0] = "NotStarted";
+  ProcessingStatus[ProcessingStatus["Running"] = 1] = "Running";
+  ProcessingStatus[ProcessingStatus["Stopped"] = 2] = "Stopped";
+  return ProcessingStatus;
 }({});
-
-/**
- * @deprecated Use `ActorStatus` instead.
- */
-const InterpreterStatus = ActorStatus;
 const defaultOptions = {
   clock: {
     setTimeout: (fn, ms) => {
@@ -371,9 +367,7 @@ class Actor {
    * The unique identifier for this actor relative to its parent.
    */
 
-  /**
-   * Whether the service is started.
-   */
+  /** @internal */
 
   // Actor Ref
 
@@ -403,7 +397,7 @@ class Actor {
     this.delayedEventsMap = {};
     this.observers = new Set();
     this.logger = void 0;
-    this.status = ActorStatus.NotStarted;
+    this._processingStatus = ProcessingStatus.NotStarted;
     this._parent = void 0;
     this.ref = void 0;
     this._actorScope = void 0;
@@ -436,7 +430,7 @@ class Actor {
     this.clock = clock;
     this._parent = parent;
     this.options = resolvedOptions;
-    this.src = resolvedOptions.src;
+    this.src = resolvedOptions.src ?? logic;
     this.ref = this;
     this._actorScope = {
       self: this,
@@ -462,14 +456,14 @@ class Actor {
       type: '@xstate.actor',
       actorRef: this
     });
-    this._initState();
+    this._initState(options?.state);
     if (systemId && this._state.status === 'active') {
       this._systemId = systemId;
       this.system._set(systemId, this);
     }
   }
-  _initState() {
-    this._state = this.options.state ? this.logic.restoreState ? this.logic.restoreState(this.options.state, this._actorScope) : this.options.state : this.logic.getInitialState(this._actorScope, this.options?.input);
+  _initState(persistedState) {
+    this._state = persistedState ? this.logic.restoreState ? this.logic.restoreState(persistedState, this._actorScope) : persistedState : this.logic.getInitialState(this._actorScope, this.options?.input);
   }
 
   // array of functions to defer
@@ -484,7 +478,6 @@ class Actor {
       deferredFn();
     }
     for (const observer of this.observers) {
-      // TODO: should observers be notified in case of the error?
       try {
         observer.next?.(snapshot);
       } catch (err) {
@@ -567,7 +560,7 @@ class Actor {
 
   subscribe(nextListenerOrObserver, errorListener, completeListener) {
     const observer = toObserver(nextListenerOrObserver, errorListener, completeListener);
-    if (this.status !== ActorStatus.Stopped) {
+    if (this._processingStatus !== ProcessingStatus.Stopped) {
       this.observers.add(observer);
     } else {
       try {
@@ -587,7 +580,7 @@ class Actor {
    * Starts the Actor from the initial state
    */
   start() {
-    if (this.status === ActorStatus.Running) {
+    if (this._processingStatus === ProcessingStatus.Running) {
       // Do not restart the service if it is already started
       return this;
     }
@@ -595,7 +588,9 @@ class Actor {
     if (this._systemId) {
       this.system._set(this._systemId, this);
     }
-    this.status = ActorStatus.Running;
+    this._processingStatus = ProcessingStatus.Running;
+
+    // TODO: this isn't correct when rehydrating
     const initEvent = createInitEvent(this.options.input);
     this.system._sendInspectionEvent({
       type: '@xstate.event',
@@ -663,12 +658,12 @@ class Actor {
     }
   }
   _stop() {
-    if (this.status === ActorStatus.Stopped) {
+    if (this._processingStatus === ProcessingStatus.Stopped) {
       return this;
     }
     this.mailbox.clear();
-    if (this.status === ActorStatus.NotStarted) {
-      this.status = ActorStatus.Stopped;
+    if (this._processingStatus === ProcessingStatus.NotStarted) {
+      this._processingStatus = ProcessingStatus.Stopped;
       return this;
     }
     this.mailbox.enqueue({
@@ -719,7 +714,7 @@ class Actor {
     }
   }
   _stopProcedure() {
-    if (this.status !== ActorStatus.Running) {
+    if (this._processingStatus !== ProcessingStatus.Running) {
       // Actor already stopped; do nothing
       return this;
     }
@@ -736,7 +731,7 @@ class Actor {
     // it seems like this should be the common behavior for all of our consumers
     // so perhaps this should be unified somehow for all of them
     this.mailbox = new Mailbox(this._process.bind(this));
-    this.status = ActorStatus.Stopped;
+    this._processingStatus = ProcessingStatus.Stopped;
     this.system._unregister(this);
     return this;
   }
@@ -745,7 +740,7 @@ class Actor {
    * @internal
    */
   _send(event) {
-    if (this.status === ActorStatus.Stopped) {
+    if (this._processingStatus === ProcessingStatus.Stopped) {
       return;
     }
     this.mailbox.enqueue(event);
@@ -803,8 +798,8 @@ class Actor {
       id: this.id
     };
   }
-  getPersistedState() {
-    return this.logic.getPersistedState(this._state);
+  getPersistedState(options) {
+    return this.logic.getPersistedState(this._state, options);
   }
   [symbolObservable]() {
     return this;
@@ -852,4 +847,4 @@ const interpret = createActor;
  * @deprecated Use `Actor` instead.
  */
 
-export { $$ACTOR_TYPE as $, Actor as A, InterpreterStatus as I, NULL_EVENT as N, STATE_DELIMITER as S, WILDCARD as W, XSTATE_STOP as X, toTransitionConfigArray as a, createInitEvent as b, createInvokeId as c, createActor as d, matchesState as e, ActorStatus as f, interpret as g, toObserver as h, isErrorActorEvent as i, createErrorActorEvent as j, toStateValue as k, STATE_IDENTIFIER as l, mapValues as m, normalizeTarget as n, toStatePath as o, pathToStateValue as p, createDoneStateEvent as q, resolveReferencedActor as r, resolveOutput as s, toArray as t, XSTATE_INIT as u, createAfterEvent as v, flatten as w, XSTATE_ERROR as x };
+export { $$ACTOR_TYPE as $, Actor as A, NULL_EVENT as N, ProcessingStatus as P, STATE_DELIMITER as S, WILDCARD as W, XSTATE_STOP as X, toTransitionConfigArray as a, createInitEvent as b, createInvokeId as c, createActor as d, matchesState as e, interpret as f, toObserver as g, createErrorActorEvent as h, isErrorActorEvent as i, toStateValue as j, STATE_IDENTIFIER as k, toStatePath as l, mapValues as m, normalizeTarget as n, createDoneStateEvent as o, pathToStateValue as p, resolveOutput as q, resolveReferencedActor as r, XSTATE_INIT as s, toArray as t, createAfterEvent as u, flatten as v, XSTATE_ERROR as w };

package/dist/{interpreter-bae5c279.development.cjs.js → interpreter-70ed981b.development.cjs.js}

@@ -336,17 +336,13 @@ function resolveReferencedActor(machine, src) {
 }
 
 const $$ACTOR_TYPE = 1;
-let ActorStatus = /*#__PURE__*/function (ActorStatus) {
-  ActorStatus[ActorStatus["NotStarted"] = 0] = "NotStarted";
-  ActorStatus[ActorStatus["Running"] = 1] = "Running";
-  ActorStatus[ActorStatus["Stopped"] = 2] = "Stopped";
-  return ActorStatus;
+// those values are currently used by @xstate/react directly so it's important to keep the assigned values in sync
+let ProcessingStatus = /*#__PURE__*/function (ProcessingStatus) {
+  ProcessingStatus[ProcessingStatus["NotStarted"] = 0] = "NotStarted";
+  ProcessingStatus[ProcessingStatus["Running"] = 1] = "Running";
+  ProcessingStatus[ProcessingStatus["Stopped"] = 2] = "Stopped";
+  return ProcessingStatus;
 }({});
-
-/**
- * @deprecated Use `ActorStatus` instead.
- */
-const InterpreterStatus = ActorStatus;
 const defaultOptions = {
   clock: {
     setTimeout: (fn, ms) => {
@@ -376,9 +372,7 @@ class Actor {
    * The unique identifier for this actor relative to its parent.
    */
 
-  /**
-   * Whether the service is started.
-   */
+  /** @internal */
 
   // Actor Ref
 
@@ -408,7 +402,7 @@ class Actor {
     this.delayedEventsMap = {};
     this.observers = new Set();
     this.logger = void 0;
-    this.status = ActorStatus.NotStarted;
+    this._processingStatus = ProcessingStatus.NotStarted;
     this._parent = void 0;
     this.ref = void 0;
     this._actorScope = void 0;
@@ -441,7 +435,7 @@ class Actor {
     this.clock = clock;
     this._parent = parent;
     this.options = resolvedOptions;
-    this.src = resolvedOptions.src;
+    this.src = resolvedOptions.src ?? logic;
     this.ref = this;
     this._actorScope = {
       self: this,
@@ -467,14 +461,14 @@ class Actor {
       type: '@xstate.actor',
       actorRef: this
     });
-    this._initState();
+    this._initState(options?.state);
     if (systemId && this._state.status === 'active') {
       this._systemId = systemId;
       this.system._set(systemId, this);
     }
   }
-  _initState() {
-    this._state = this.options.state ? this.logic.restoreState ? this.logic.restoreState(this.options.state, this._actorScope) : this.options.state : this.logic.getInitialState(this._actorScope, this.options?.input);
+  _initState(persistedState) {
+    this._state = persistedState ? this.logic.restoreState ? this.logic.restoreState(persistedState, this._actorScope) : persistedState : this.logic.getInitialState(this._actorScope, this.options?.input);
   }
 
   // array of functions to defer
@@ -489,7 +483,6 @@ class Actor {
       deferredFn();
     }
     for (const observer of this.observers) {
-      // TODO: should observers be notified in case of the error?
       try {
         observer.next?.(snapshot);
       } catch (err) {
@@ -572,7 +565,7 @@ class Actor {
 
   subscribe(nextListenerOrObserver, errorListener, completeListener) {
     const observer = toObserver(nextListenerOrObserver, errorListener, completeListener);
-    if (this.status !== ActorStatus.Stopped) {
+    if (this._processingStatus !== ProcessingStatus.Stopped) {
       this.observers.add(observer);
     } else {
       try {
@@ -592,7 +585,7 @@ class Actor {
    * Starts the Actor from the initial state
    */
   start() {
-    if (this.status === ActorStatus.Running) {
+    if (this._processingStatus === ProcessingStatus.Running) {
       // Do not restart the service if it is already started
       return this;
     }
@@ -600,7 +593,9 @@ class Actor {
     if (this._systemId) {
       this.system._set(this._systemId, this);
     }
-    this.status = ActorStatus.Running;
+    this._processingStatus = ProcessingStatus.Running;
+
+    // TODO: this isn't correct when rehydrating
     const initEvent = createInitEvent(this.options.input);
     this.system._sendInspectionEvent({
       type: '@xstate.event',
@@ -668,12 +663,12 @@ class Actor {
     }
   }
   _stop() {
-    if (this.status === ActorStatus.Stopped) {
+    if (this._processingStatus === ProcessingStatus.Stopped) {
       return this;
     }
     this.mailbox.clear();
-    if (this.status === ActorStatus.NotStarted) {
-      this.status = ActorStatus.Stopped;
+    if (this._processingStatus === ProcessingStatus.NotStarted) {
+      this._processingStatus = ProcessingStatus.Stopped;
       return this;
     }
     this.mailbox.enqueue({
@@ -724,7 +719,7 @@ class Actor {
     }
   }
   _stopProcedure() {
-    if (this.status !== ActorStatus.Running) {
+    if (this._processingStatus !== ProcessingStatus.Running) {
       // Actor already stopped; do nothing
       return this;
     }
@@ -741,7 +736,7 @@ class Actor {
     // it seems like this should be the common behavior for all of our consumers
     // so perhaps this should be unified somehow for all of them
     this.mailbox = new Mailbox(this._process.bind(this));
-    this.status = ActorStatus.Stopped;
+    this._processingStatus = ProcessingStatus.Stopped;
     this.system._unregister(this);
     return this;
   }
@@ -750,7 +745,7 @@ class Actor {
    * @internal
    */
   _send(event) {
-    if (this.status === ActorStatus.Stopped) {
+    if (this._processingStatus === ProcessingStatus.Stopped) {
       // do nothing
       {
         const eventString = JSON.stringify(event);
@@ -816,8 +811,8 @@ class Actor {
       id: this.id
     };
   }
-  getPersistedState() {
-    return this.logic.getPersistedState(this._state);
+  getPersistedState(options) {
+    return this.logic.getPersistedState(this._state, options);
   }
   [symbolObservable]() {
     return this;
@@ -867,9 +862,8 @@ const interpret = createActor;
 
 exports.$$ACTOR_TYPE = $$ACTOR_TYPE;
 exports.Actor = Actor;
-exports.ActorStatus = ActorStatus;
-exports.InterpreterStatus = InterpreterStatus;
 exports.NULL_EVENT = NULL_EVENT;
+exports.ProcessingStatus = ProcessingStatus;
 exports.STATE_DELIMITER = STATE_DELIMITER;
 exports.STATE_IDENTIFIER = STATE_IDENTIFIER;
 exports.WILDCARD = WILDCARD;

package/dist/{interpreter-410d7ca9.development.esm.js → interpreter-936da690.development.esm.js}

@@ -334,17 +334,13 @@ function resolveReferencedActor(machine, src) {
 }
 
 const $$ACTOR_TYPE = 1;
-let ActorStatus = /*#__PURE__*/function (ActorStatus) {
-  ActorStatus[ActorStatus["NotStarted"] = 0] = "NotStarted";
-  ActorStatus[ActorStatus["Running"] = 1] = "Running";
-  ActorStatus[ActorStatus["Stopped"] = 2] = "Stopped";
-  return ActorStatus;
+// those values are currently used by @xstate/react directly so it's important to keep the assigned values in sync
+let ProcessingStatus = /*#__PURE__*/function (ProcessingStatus) {
+  ProcessingStatus[ProcessingStatus["NotStarted"] = 0] = "NotStarted";
+  ProcessingStatus[ProcessingStatus["Running"] = 1] = "Running";
+  ProcessingStatus[ProcessingStatus["Stopped"] = 2] = "Stopped";
+  return ProcessingStatus;
 }({});
-
-/**
- * @deprecated Use `ActorStatus` instead.
- */
-const InterpreterStatus = ActorStatus;
 const defaultOptions = {
   clock: {
     setTimeout: (fn, ms) => {
@@ -374,9 +370,7 @@ class Actor {
    * The unique identifier for this actor relative to its parent.
    */
 
-  /**
-   * Whether the service is started.
-   */
+  /** @internal */
 
   // Actor Ref
 
@@ -406,7 +400,7 @@ class Actor {
     this.delayedEventsMap = {};
     this.observers = new Set();
     this.logger = void 0;
-    this.status = ActorStatus.NotStarted;
+    this._processingStatus = ProcessingStatus.NotStarted;
     this._parent = void 0;
     this.ref = void 0;
     this._actorScope = void 0;
@@ -439,7 +433,7 @@ class Actor {
     this.clock = clock;
     this._parent = parent;
     this.options = resolvedOptions;
-    this.src = resolvedOptions.src;
+    this.src = resolvedOptions.src ?? logic;
     this.ref = this;
     this._actorScope = {
       self: this,
@@ -465,14 +459,14 @@ class Actor {
       type: '@xstate.actor',
       actorRef: this
     });
-    this._initState();
+    this._initState(options?.state);
     if (systemId && this._state.status === 'active') {
       this._systemId = systemId;
       this.system._set(systemId, this);
     }
   }
-  _initState() {
-    this._state = this.options.state ? this.logic.restoreState ? this.logic.restoreState(this.options.state, this._actorScope) : this.options.state : this.logic.getInitialState(this._actorScope, this.options?.input);
+  _initState(persistedState) {
+    this._state = persistedState ? this.logic.restoreState ? this.logic.restoreState(persistedState, this._actorScope) : persistedState : this.logic.getInitialState(this._actorScope, this.options?.input);
   }
 
   // array of functions to defer
@@ -487,7 +481,6 @@ class Actor {
       deferredFn();
     }
     for (const observer of this.observers) {
-      // TODO: should observers be notified in case of the error?
       try {
         observer.next?.(snapshot);
       } catch (err) {
@@ -570,7 +563,7 @@ class Actor {
 
   subscribe(nextListenerOrObserver, errorListener, completeListener) {
     const observer = toObserver(nextListenerOrObserver, errorListener, completeListener);
-    if (this.status !== ActorStatus.Stopped) {
+    if (this._processingStatus !== ProcessingStatus.Stopped) {
       this.observers.add(observer);
     } else {
       try {
@@ -590,7 +583,7 @@ class Actor {
    * Starts the Actor from the initial state
    */
   start() {
-    if (this.status === ActorStatus.Running) {
+    if (this._processingStatus === ProcessingStatus.Running) {
       // Do not restart the service if it is already started
       return this;
     }
@@ -598,7 +591,9 @@ class Actor {
     if (this._systemId) {
       this.system._set(this._systemId, this);
     }
-    this.status = ActorStatus.Running;
+    this._processingStatus = ProcessingStatus.Running;
+
+    // TODO: this isn't correct when rehydrating
     const initEvent = createInitEvent(this.options.input);
     this.system._sendInspectionEvent({
       type: '@xstate.event',
@@ -666,12 +661,12 @@ class Actor {
     }
   }
   _stop() {
-    if (this.status === ActorStatus.Stopped) {
+    if (this._processingStatus === ProcessingStatus.Stopped) {
       return this;
     }
     this.mailbox.clear();
-    if (this.status === ActorStatus.NotStarted) {
-      this.status = ActorStatus.Stopped;
+    if (this._processingStatus === ProcessingStatus.NotStarted) {
+      this._processingStatus = ProcessingStatus.Stopped;
       return this;
     }
     this.mailbox.enqueue({
@@ -722,7 +717,7 @@ class Actor {
     }
   }
   _stopProcedure() {
-    if (this.status !== ActorStatus.Running) {
+    if (this._processingStatus !== ProcessingStatus.Running) {
       // Actor already stopped; do nothing
       return this;
     }
@@ -739,7 +734,7 @@ class Actor {
     // it seems like this should be the common behavior for all of our consumers
     // so perhaps this should be unified somehow for all of them
     this.mailbox = new Mailbox(this._process.bind(this));
-    this.status = ActorStatus.Stopped;
+    this._processingStatus = ProcessingStatus.Stopped;
     this.system._unregister(this);
     return this;
   }
@@ -748,7 +743,7 @@ class Actor {
    * @internal
    */
   _send(event) {
-    if (this.status === ActorStatus.Stopped) {
+    if (this._processingStatus === ProcessingStatus.Stopped) {
       // do nothing
       {
         const eventString = JSON.stringify(event);
@@ -814,8 +809,8 @@ class Actor {
       id: this.id
     };
   }
-  getPersistedState() {
-    return this.logic.getPersistedState(this._state);
+  getPersistedState(options) {
+    return this.logic.getPersistedState(this._state, options);
   }
   [symbolObservable]() {
     return this;
@@ -863,4 +858,4 @@ const interpret = createActor;
  * @deprecated Use `Actor` instead.
  */
 
-export { $$ACTOR_TYPE as $, Actor as A, InterpreterStatus as I, NULL_EVENT as N, STATE_DELIMITER as S, WILDCARD as W, XSTATE_STOP as X, toTransitionConfigArray as a, createInitEvent as b, createInvokeId as c, createActor as d, matchesState as e, ActorStatus as f, interpret as g, toObserver as h, isErrorActorEvent as i, createErrorActorEvent as j, toStateValue as k, STATE_IDENTIFIER as l, mapValues as m, normalizeTarget as n, toStatePath as o, pathToStateValue as p, createDoneStateEvent as q, resolveReferencedActor as r, resolveOutput as s, toArray as t, XSTATE_INIT as u, createAfterEvent as v, flatten as w, XSTATE_ERROR as x };
+export { $$ACTOR_TYPE as $, Actor as A, NULL_EVENT as N, ProcessingStatus as P, STATE_DELIMITER as S, WILDCARD as W, XSTATE_STOP as X, toTransitionConfigArray as a, createInitEvent as b, createInvokeId as c, createActor as d, matchesState as e, interpret as f, toObserver as g, createErrorActorEvent as h, isErrorActorEvent as i, toStateValue as j, STATE_IDENTIFIER as k, toStatePath as l, mapValues as m, normalizeTarget as n, createDoneStateEvent as o, pathToStateValue as p, resolveOutput as q, resolveReferencedActor as r, XSTATE_INIT as s, toArray as t, createAfterEvent as u, flatten as v, XSTATE_ERROR as w };

package/dist/{interpreter-586abde4.cjs.js → interpreter-fb2829f1.cjs.js}

@@ -333,17 +333,13 @@ function resolveReferencedActor(machine, src) {
 }
 
 const $$ACTOR_TYPE = 1;
-let ActorStatus = /*#__PURE__*/function (ActorStatus) {
-  ActorStatus[ActorStatus["NotStarted"] = 0] = "NotStarted";
-  ActorStatus[ActorStatus["Running"] = 1] = "Running";
-  ActorStatus[ActorStatus["Stopped"] = 2] = "Stopped";
-  return ActorStatus;
+// those values are currently used by @xstate/react directly so it's important to keep the assigned values in sync
+let ProcessingStatus = /*#__PURE__*/function (ProcessingStatus) {
+  ProcessingStatus[ProcessingStatus["NotStarted"] = 0] = "NotStarted";
+  ProcessingStatus[ProcessingStatus["Running"] = 1] = "Running";
+  ProcessingStatus[ProcessingStatus["Stopped"] = 2] = "Stopped";
+  return ProcessingStatus;
 }({});
-
-/**
- * @deprecated Use `ActorStatus` instead.
- */
-const InterpreterStatus = ActorStatus;
 const defaultOptions = {
   clock: {
     setTimeout: (fn, ms) => {
@@ -373,9 +369,7 @@ class Actor {
    * The unique identifier for this actor relative to its parent.
    */
 
-  /**
-   * Whether the service is started.
-   */
+  /** @internal */
 
   // Actor Ref
 
@@ -405,7 +399,7 @@ class Actor {
     this.delayedEventsMap = {};
     this.observers = new Set();
     this.logger = void 0;
-    this.status = ActorStatus.NotStarted;
+    this._processingStatus = ProcessingStatus.NotStarted;
     this._parent = void 0;
     this.ref = void 0;
     this._actorScope = void 0;
@@ -438,7 +432,7 @@ class Actor {
     this.clock = clock;
     this._parent = parent;
     this.options = resolvedOptions;
-    this.src = resolvedOptions.src;
+    this.src = resolvedOptions.src ?? logic;
     this.ref = this;
     this._actorScope = {
       self: this,
@@ -464,14 +458,14 @@ class Actor {
       type: '@xstate.actor',
       actorRef: this
     });
-    this._initState();
+    this._initState(options?.state);
     if (systemId && this._state.status === 'active') {
       this._systemId = systemId;
       this.system._set(systemId, this);
     }
   }
-  _initState() {
-    this._state = this.options.state ? this.logic.restoreState ? this.logic.restoreState(this.options.state, this._actorScope) : this.options.state : this.logic.getInitialState(this._actorScope, this.options?.input);
+  _initState(persistedState) {
+    this._state = persistedState ? this.logic.restoreState ? this.logic.restoreState(persistedState, this._actorScope) : persistedState : this.logic.getInitialState(this._actorScope, this.options?.input);
   }
 
   // array of functions to defer
@@ -486,7 +480,6 @@ class Actor {
       deferredFn();
     }
     for (const observer of this.observers) {
-      // TODO: should observers be notified in case of the error?
       try {
         observer.next?.(snapshot);
       } catch (err) {
@@ -569,7 +562,7 @@ class Actor {
 
   subscribe(nextListenerOrObserver, errorListener, completeListener) {
     const observer = toObserver(nextListenerOrObserver, errorListener, completeListener);
-    if (this.status !== ActorStatus.Stopped) {
+    if (this._processingStatus !== ProcessingStatus.Stopped) {
       this.observers.add(observer);
     } else {
       try {
@@ -589,7 +582,7 @@ class Actor {
    * Starts the Actor from the initial state
    */
   start() {
-    if (this.status === ActorStatus.Running) {
+    if (this._processingStatus === ProcessingStatus.Running) {
       // Do not restart the service if it is already started
       return this;
     }
@@ -597,7 +590,9 @@ class Actor {
     if (this._systemId) {
       this.system._set(this._systemId, this);
     }
-    this.status = ActorStatus.Running;
+    this._processingStatus = ProcessingStatus.Running;
+
+    // TODO: this isn't correct when rehydrating
     const initEvent = createInitEvent(this.options.input);
     this.system._sendInspectionEvent({
       type: '@xstate.event',
@@ -665,12 +660,12 @@ class Actor {
     }
   }
   _stop() {
-    if (this.status === ActorStatus.Stopped) {
+    if (this._processingStatus === ProcessingStatus.Stopped) {
       return this;
     }
     this.mailbox.clear();
-    if (this.status === ActorStatus.NotStarted) {
-      this.status = ActorStatus.Stopped;
+    if (this._processingStatus === ProcessingStatus.NotStarted) {
+      this._processingStatus = ProcessingStatus.Stopped;
       return this;
     }
     this.mailbox.enqueue({
@@ -721,7 +716,7 @@ class Actor {
     }
   }
   _stopProcedure() {
-    if (this.status !== ActorStatus.Running) {
+    if (this._processingStatus !== ProcessingStatus.Running) {
       // Actor already stopped; do nothing
       return this;
     }
@@ -738,7 +733,7 @@ class Actor {
     // it seems like this should be the common behavior for all of our consumers
     // so perhaps this should be unified somehow for all of them
     this.mailbox = new Mailbox(this._process.bind(this));
-    this.status = ActorStatus.Stopped;
+    this._processingStatus = ProcessingStatus.Stopped;
     this.system._unregister(this);
     return this;
   }
@@ -747,7 +742,7 @@ class Actor {
    * @internal
    */
   _send(event) {
-    if (this.status === ActorStatus.Stopped) {
+    if (this._processingStatus === ProcessingStatus.Stopped) {
       return;
     }
     this.mailbox.enqueue(event);
@@ -805,8 +800,8 @@ class Actor {
       id: this.id
     };
   }
-  getPersistedState() {
-    return this.logic.getPersistedState(this._state);
+  getPersistedState(options) {
+    return this.logic.getPersistedState(this._state, options);
   }
   [symbolObservable]() {
     return this;
@@ -856,9 +851,8 @@ const interpret = createActor;
 
 exports.$$ACTOR_TYPE = $$ACTOR_TYPE;
 exports.Actor = Actor;
-exports.ActorStatus = ActorStatus;
-exports.InterpreterStatus = InterpreterStatus;
 exports.NULL_EVENT = NULL_EVENT;
+exports.ProcessingStatus = ProcessingStatus;
 exports.STATE_DELIMITER = STATE_DELIMITER;
 exports.STATE_IDENTIFIER = STATE_IDENTIFIER;
 exports.WILDCARD = WILDCARD;