xstate 5.0.0-beta.29 → 5.0.0-beta.31

package/dist/{interpreter-e2c6a579.development.cjs.js → interpreter-a2236840.development.cjs.js}

@@ -271,7 +271,7 @@ function toArray(value) {
   }
   return toArrayStrict(value);
 }
-function mapContext(mapper, context, event, self) {
+function resolveOutput(mapper, context, event, self) {
   if (typeof mapper === 'function') {
     return mapper({
       context,
@@ -279,7 +279,7 @@ function mapContext(mapper, context, event, self) {
       self
     });
   }
-  if (typeof mapper === 'object' && Object.values(mapper).some(val => typeof val === 'function')) {
+  if (!!mapper && typeof mapper === 'object' && Object.values(mapper).some(val => typeof val === 'function')) {
     console.warn(`Dynamically mapping values to individual properties is deprecated. Use a single function that returns the mapped object instead.\nFound object containing properties whose values are possibly mapping functions: ${Object.entries(mapper).filter(([key, value]) => typeof value === 'function').map(([key, value]) => `\n - ${key}: ${value.toString().replace(/\n\s*/g, '')}`).join('')}`);
   }
   return mapper;
@@ -452,10 +452,9 @@ class Actor {
 
   // array of functions to defer
 
-  update(state) {
+  update(snapshot) {
     // Update state
-    this._state = state;
-    const snapshot = this.getSnapshot();
+    this._state = snapshot;
 
     // Execute deferred effects
     let deferredFn;
@@ -470,18 +469,17 @@ class Actor {
         reportUnhandledError(err);
       }
     }
-    const status = this.logic.getStatus?.(state);
-    switch (status?.status) {
+    switch (this._state.status) {
       case 'done':
         this._stopProcedure();
         this._complete();
-        this._doneEvent = createDoneActorEvent(this.id, status.data);
+        this._doneEvent = createDoneActorEvent(this.id, this._state.output);
         this._parent?.send(this._doneEvent);
         break;
       case 'error':
         this._stopProcedure();
-        this._error(status.data);
-        this._parent?.send(createErrorActorEvent(this.id, status.data));
+        this._error(this._state.error);
+        this._parent?.send(createErrorActorEvent(this.id, this._state.error));
         break;
     }
   }
@@ -516,8 +514,8 @@ class Actor {
       this.system._set(this._systemId, this);
     }
     this.status = ActorStatus.Running;
-    const status = this.logic.getStatus?.(this._state);
-    switch (status?.status) {
+    const status = this._state.status;
+    switch (status) {
       case 'done':
         // a state machine can be "done" upon intialization (it could reach a final state using initial microsteps)
         // we still need to complete observers, flush deferreds etc
@@ -721,7 +719,7 @@ class Actor {
     return this;
   }
   getSnapshot() {
-    return this.logic.getSnapshot ? this.logic.getSnapshot(this._state) : this._state;
+    return this._state;
   }
 }
 
@@ -768,11 +766,11 @@ exports.flatten = flatten;
 exports.interpret = interpret;
 exports.isArray = isArray;
 exports.isErrorActorEvent = isErrorActorEvent;
-exports.mapContext = mapContext;
 exports.mapValues = mapValues;
 exports.matchesState = matchesState;
 exports.normalizeTarget = normalizeTarget;
 exports.pathToStateValue = pathToStateValue;
+exports.resolveOutput = resolveOutput;
 exports.resolveReferencedActor = resolveReferencedActor;
 exports.toArray = toArray;
 exports.toObserver = toObserver;

package/dist/{interpreter-498891b2.esm.js → interpreter-d5fa7ce0.esm.js}

@@ -269,7 +269,7 @@ function toArray(value) {
   }
   return toArrayStrict(value);
 }
-function mapContext(mapper, context, event, self) {
+function resolveOutput(mapper, context, event, self) {
   if (typeof mapper === 'function') {
     return mapper({
       context,
@@ -447,10 +447,9 @@ class Actor {
 
   // array of functions to defer
 
-  update(state) {
+  update(snapshot) {
     // Update state
-    this._state = state;
-    const snapshot = this.getSnapshot();
+    this._state = snapshot;
 
     // Execute deferred effects
     let deferredFn;
@@ -465,18 +464,17 @@ class Actor {
         reportUnhandledError(err);
       }
     }
-    const status = this.logic.getStatus?.(state);
-    switch (status?.status) {
+    switch (this._state.status) {
       case 'done':
         this._stopProcedure();
         this._complete();
-        this._doneEvent = createDoneActorEvent(this.id, status.data);
+        this._doneEvent = createDoneActorEvent(this.id, this._state.output);
         this._parent?.send(this._doneEvent);
         break;
       case 'error':
         this._stopProcedure();
-        this._error(status.data);
-        this._parent?.send(createErrorActorEvent(this.id, status.data));
+        this._error(this._state.error);
+        this._parent?.send(createErrorActorEvent(this.id, this._state.error));
         break;
     }
   }
@@ -511,8 +509,8 @@ class Actor {
       this.system._set(this._systemId, this);
     }
     this.status = ActorStatus.Running;
-    const status = this.logic.getStatus?.(this._state);
-    switch (status?.status) {
+    const status = this._state.status;
+    switch (status) {
       case 'done':
         // a state machine can be "done" upon intialization (it could reach a final state using initial microsteps)
         // we still need to complete observers, flush deferreds etc
@@ -711,7 +709,7 @@ class Actor {
     return this;
   }
   getSnapshot() {
-    return this.logic.getSnapshot ? this.logic.getSnapshot(this._state) : this._state;
+    return this._state;
   }
 }
 
@@ -738,4 +736,4 @@ const interpret = createActor;
  * @deprecated Use `Actor` instead.
  */
 
-export { Actor as A, InterpreterStatus as I, NULL_EVENT as N, STATE_DELIMITER as S, WILDCARD as W, XSTATE_INIT 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, XSTATE_STOP as j, createErrorActorEvent as k, toStateValue as l, mapValues as m, STATE_IDENTIFIER as n, normalizeTarget as o, pathToStateValue as p, toStatePath as q, resolveReferencedActor as r, createDoneStateEvent as s, toArray as t, mapContext as u, isArray as v, createAfterEvent as w, flatten as x, XSTATE_ERROR as y };
+export { Actor as A, InterpreterStatus as I, NULL_EVENT as N, STATE_DELIMITER as S, WILDCARD as W, XSTATE_INIT 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, XSTATE_STOP as j, createErrorActorEvent as k, toStateValue as l, mapValues as m, STATE_IDENTIFIER as n, normalizeTarget as o, pathToStateValue as p, toStatePath as q, resolveReferencedActor as r, createDoneStateEvent as s, toArray as t, resolveOutput as u, isArray as v, createAfterEvent as w, flatten as x, XSTATE_ERROR as y };

package/dist/{interpreter-6e7909c8.development.esm.js → interpreter-e4d2487f.development.esm.js}

@@ -269,7 +269,7 @@ function toArray(value) {
   }
   return toArrayStrict(value);
 }
-function mapContext(mapper, context, event, self) {
+function resolveOutput(mapper, context, event, self) {
   if (typeof mapper === 'function') {
     return mapper({
       context,
@@ -277,7 +277,7 @@ function mapContext(mapper, context, event, self) {
       self
     });
   }
-  if (typeof mapper === 'object' && Object.values(mapper).some(val => typeof val === 'function')) {
+  if (!!mapper && typeof mapper === 'object' && Object.values(mapper).some(val => typeof val === 'function')) {
     console.warn(`Dynamically mapping values to individual properties is deprecated. Use a single function that returns the mapped object instead.\nFound object containing properties whose values are possibly mapping functions: ${Object.entries(mapper).filter(([key, value]) => typeof value === 'function').map(([key, value]) => `\n - ${key}: ${value.toString().replace(/\n\s*/g, '')}`).join('')}`);
   }
   return mapper;
@@ -450,10 +450,9 @@ class Actor {
 
   // array of functions to defer
 
-  update(state) {
+  update(snapshot) {
     // Update state
-    this._state = state;
-    const snapshot = this.getSnapshot();
+    this._state = snapshot;
 
     // Execute deferred effects
     let deferredFn;
@@ -468,18 +467,17 @@ class Actor {
         reportUnhandledError(err);
       }
     }
-    const status = this.logic.getStatus?.(state);
-    switch (status?.status) {
+    switch (this._state.status) {
       case 'done':
         this._stopProcedure();
         this._complete();
-        this._doneEvent = createDoneActorEvent(this.id, status.data);
+        this._doneEvent = createDoneActorEvent(this.id, this._state.output);
         this._parent?.send(this._doneEvent);
         break;
       case 'error':
         this._stopProcedure();
-        this._error(status.data);
-        this._parent?.send(createErrorActorEvent(this.id, status.data));
+        this._error(this._state.error);
+        this._parent?.send(createErrorActorEvent(this.id, this._state.error));
         break;
     }
   }
@@ -514,8 +512,8 @@ class Actor {
       this.system._set(this._systemId, this);
     }
     this.status = ActorStatus.Running;
-    const status = this.logic.getStatus?.(this._state);
-    switch (status?.status) {
+    const status = this._state.status;
+    switch (status) {
       case 'done':
         // a state machine can be "done" upon intialization (it could reach a final state using initial microsteps)
         // we still need to complete observers, flush deferreds etc
@@ -719,7 +717,7 @@ class Actor {
     return this;
   }
   getSnapshot() {
-    return this.logic.getSnapshot ? this.logic.getSnapshot(this._state) : this._state;
+    return this._state;
   }
 }
 
@@ -746,4 +744,4 @@ const interpret = createActor;
  * @deprecated Use `Actor` instead.
  */
 
-export { Actor as A, InterpreterStatus as I, NULL_EVENT as N, STATE_DELIMITER as S, WILDCARD as W, XSTATE_INIT 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, XSTATE_STOP as j, createErrorActorEvent as k, toStateValue as l, mapValues as m, STATE_IDENTIFIER as n, normalizeTarget as o, pathToStateValue as p, toStatePath as q, resolveReferencedActor as r, createDoneStateEvent as s, toArray as t, mapContext as u, isArray as v, createAfterEvent as w, flatten as x, XSTATE_ERROR as y };
+export { Actor as A, InterpreterStatus as I, NULL_EVENT as N, STATE_DELIMITER as S, WILDCARD as W, XSTATE_INIT 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, XSTATE_STOP as j, createErrorActorEvent as k, toStateValue as l, mapValues as m, STATE_IDENTIFIER as n, normalizeTarget as o, pathToStateValue as p, toStatePath as q, resolveReferencedActor as r, createDoneStateEvent as s, toArray as t, resolveOutput as u, isArray as v, createAfterEvent as w, flatten as x, XSTATE_ERROR as y };

package/dist/{raise-59f2c242.esm.js → raise-6a68d0cc.esm.js}

@@ -1,4 +1,4 @@
-import { r as resolveReferencedActor, d as createActor, f as ActorStatus, k as createErrorActorEvent, l as toStateValue, n as STATE_IDENTIFIER, o as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, q as toStatePath, s as createDoneStateEvent, u as mapContext, j as XSTATE_STOP, X as XSTATE_INIT, W as WILDCARD, v as isArray, w as createAfterEvent, x as flatten, e as matchesState } from './interpreter-498891b2.esm.js';
+import { r as resolveReferencedActor, d as createActor, f as ActorStatus, k as createErrorActorEvent, l as toStateValue, n as STATE_IDENTIFIER, o as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, q as toStatePath, s as createDoneStateEvent, u as resolveOutput, j as XSTATE_STOP, X as XSTATE_INIT, W as WILDCARD, v as isArray, w as createAfterEvent, x as flatten, e as matchesState } from './interpreter-d5fa7ce0.esm.js';
 
 const cache = new WeakMap();
 function memo(object, key, fn) {
@@ -14,13 +14,13 @@ function memo(object, key, fn) {
   return memoizedData[key];
 }
 
-function resolve$3(_, state, actionArgs, {
+function resolveCancel(_, state, actionArgs, {
   sendId
 }) {
   const resolvedSendId = typeof sendId === 'function' ? sendId(actionArgs) : sendId;
   return [state, resolvedSendId];
 }
-function execute$3(actorContext, resolvedSendId) {
+function executeCancel(actorContext, resolvedSendId) {
   actorContext.self.cancel(resolvedSendId);
 }
 /**
@@ -35,16 +35,17 @@ function cancel(sendId) {
   }
   cancel.type = 'xstate.cancel';
   cancel.sendId = sendId;
-  cancel.resolve = resolve$3;
-  cancel.execute = execute$3;
+  cancel.resolve = resolveCancel;
+  cancel.execute = executeCancel;
   return cancel;
 }
 
-function resolve$2(actorContext, state, actionArgs, {
+function resolveInvoke(actorContext, state, actionArgs, {
   id,
   systemId,
   src,
-  input
+  input,
+  syncSnapshot
 }) {
   const referenced = resolveReferencedActor(state.machine.implementations.actors[src]);
   let actorRef;
@@ -62,6 +63,21 @@ function resolve$2(actorContext, state, actionArgs, {
         self: actorContext?.self
       }) : configuredInput
     });
+    if (syncSnapshot) {
+      actorRef.subscribe({
+        next: snapshot => {
+          if (snapshot.status === 'active') {
+            actorContext.self.send({
+              type: `xstate.snapshot.${id}`,
+              snapshot
+            });
+          }
+        },
+        error: () => {
+          /* TODO */
+        }
+      });
+    }
   }
   return [cloneState(state, {
     children: {
@@ -73,7 +89,7 @@ function resolve$2(actorContext, state, actionArgs, {
     actorRef
   }];
 }
-function execute$2(actorContext, {
+function executeInvoke(actorContext, {
   id,
   actorRef
 }) {
@@ -99,7 +115,8 @@ function invoke({
   id,
   systemId,
   src,
-  input
+  input,
+  onSnapshot
 }) {
   function invoke(_) {
   }
@@ -108,12 +125,13 @@ function invoke({
   invoke.systemId = systemId;
   invoke.src = src;
   invoke.input = input;
-  invoke.resolve = resolve$2;
-  invoke.execute = execute$2;
+  invoke.syncSnapshot = !!onSnapshot;
+  invoke.resolve = resolveInvoke;
+  invoke.execute = executeInvoke;
   return invoke;
 }
 
-function resolve$1(_, state, args, {
+function resolveStop(_, state, args, {
   actorRef
 }) {
   const actorRefOrString = typeof actorRef === 'function' ? actorRef(args) : actorRef;
@@ -129,7 +147,7 @@ function resolve$1(_, state, args, {
     children
   }), resolvedActorRef];
 }
-function execute$1(actorContext, actorRef) {
+function executeStop(actorContext, actorRef) {
   if (!actorRef) {
     return;
   }
@@ -152,8 +170,8 @@ function stop(actorRef) {
   }
   stop.type = 'xstate.stop';
   stop.actorRef = actorRef;
-  stop.resolve = resolve$1;
-  stop.execute = execute$1;
+  stop.resolve = resolveStop;
+  stop.execute = executeStop;
   return stop;
 }
 
@@ -260,9 +278,18 @@ function evaluateGuard(guard, context, event, state) {
 }
 
 function getOutput(configuration, context, event, self) {
-  const machine = configuration[0].machine;
+  const {
+    machine
+  } = configuration[0];
+  const {
+    root
+  } = machine;
+  if (!root.output) {
+    return undefined;
+  }
   const finalChildStateNode = configuration.find(stateNode => stateNode.type === 'final' && stateNode.parent === machine.root);
-  return finalChildStateNode && finalChildStateNode.output ? mapContext(finalChildStateNode.output, context, event, self) : undefined;
+  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) {
@@ -890,7 +917,7 @@ function microstepProcedure(transitions, currentState, mutConfiguration, event,
       historyValue,
       _internalQueue: internalQueue,
       context: nextState.context,
-      done,
+      status: done ? 'done' : currentState.status,
       output,
       children: nextState.children
     });
@@ -928,7 +955,7 @@ function enterStates(event, filteredTransitions, mutConfiguration, actions, inte
       if (!parent.parent) {
         continue;
       }
-      internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output ? mapContext(stateNodeToEnter.output, currentState.context, event, actorContext.self) : undefined));
+      internalQueue.push(createDoneStateEvent(parent.id, stateNodeToEnter.output ? resolveOutput(stateNodeToEnter.output, currentState.context, event, actorContext.self) : undefined));
       if (parent.parent) {
         const grandparent = parent.parent;
         if (grandparent.type === 'parallel') {
@@ -1119,7 +1146,7 @@ function macrostep(state, event, actorCtx) {
     nextState = microstep(transitions, state, actorCtx, nextEvent, false);
     states.push(nextState);
   }
-  while (!nextState.done) {
+  while (nextState.status === 'active') {
     let enabledTransitions = selectEventlessTransitions(nextState, nextEvent);
     if (!enabledTransitions.length) {
       if (!nextState._internalQueue.length) {
@@ -1136,7 +1163,7 @@ function macrostep(state, event, actorCtx) {
       states.push(nextState);
     }
   }
-  if (nextState.done) {
+  if (nextState.status !== 'active') {
     // Perform the stop step to ensure that child actors are stopped
     stopStep(nextEvent, nextState, actorCtx);
   }
@@ -1229,7 +1256,8 @@ class State {
           meta: {},
           configuration: [],
           // TODO: fix,
-          children: {}
+          children: {},
+          status: 'active'
         }, machine);
       }
       return stateValue;
@@ -1240,7 +1268,8 @@ class State {
       context,
       meta: undefined,
       configuration: Array.from(configuration),
-      children: {}
+      children: {},
+      status: 'active'
     }, machine);
   }
 
@@ -1253,8 +1282,7 @@ class State {
     this.machine = machine;
     this.tags = void 0;
     this.value = void 0;
-    this.done = void 0;
-    this.output = void 0;
+    this.status = void 0;
     this.error = void 0;
     this.context = void 0;
     this.historyValue = {};
@@ -1270,7 +1298,7 @@ class State {
     this.children = config.children;
     this.value = getStateValue(machine.root, this.configuration);
     this.tags = new Set(flatten(this.configuration.map(sn => sn.tags)));
-    this.done = config.done ?? false;
+    this.status = config.status;
     this.output = config.output;
     this.error = config.error;
   }
@@ -1365,9 +1393,10 @@ function getPersistedState(state) {
   } = state;
   const childrenJson = {};
   for (const id in children) {
+    const child = children[id];
     childrenJson[id] = {
-      state: children[id].getPersistedState?.(),
-      src: children[id].src
+      state: child.getPersistedState?.(),
+      src: child.src
     };
   }
   return {
@@ -1376,7 +1405,7 @@ function getPersistedState(state) {
   };
 }
 
-function resolve(_, state, args, {
+function resolveRaise(_, state, args, {
   event: eventOrExpr,
   id,
   delay
@@ -1401,7 +1430,7 @@ function resolve(_, state, args, {
     delay: resolvedDelay
   }];
 }
-function execute(actorContext, params) {
+function executeRaise(actorContext, params) {
   if (typeof params.delay === 'number') {
     actorContext.self.delaySend(params);
     return;
@@ -1420,8 +1449,8 @@ function raise(eventOrExpr, options) {
   raise.event = eventOrExpr;
   raise.id = options?.id;
   raise.delay = options?.delay;
-  raise.resolve = resolve;
-  raise.execute = execute;
+  raise.resolve = resolveRaise;
+  raise.execute = executeRaise;
   return raise;
 }