xstate 5.0.2 → 5.2.0

package/dist/{raise-8bc422d1.esm.js → raise-5d7ae4b7.esm.js}

@@ -126,13 +126,56 @@ function reportUnhandledError(err) {
 
 const symbolObservable = (() => typeof Symbol === 'function' && Symbol.observable || '@@observable')();
 
+function createScheduledEventId(actorRef, id) {
+  return `${actorRef.sessionId}.${id}`;
+}
 let idCounter = 0;
-function createSystem(rootActor) {
+function createSystem(rootActor, options) {
   const children = new Map();
   const keyedActors = new Map();
   const reverseKeyedActors = new WeakMap();
   const observers = new Set();
+  const timerMap = {};
+  const clock = options.clock;
+  const scheduler = {
+    schedule: (source, target, event, delay, id = Math.random().toString(36).slice(2)) => {
+      const scheduledEvent = {
+        source,
+        target,
+        event,
+        delay,
+        id,
+        startedAt: Date.now()
+      };
+      const scheduledEventId = createScheduledEventId(source, id);
+      system._snapshot._scheduledEvents[scheduledEventId] = scheduledEvent;
+      const timeout = clock.setTimeout(() => {
+        delete timerMap[scheduledEventId];
+        delete system._snapshot._scheduledEvents[scheduledEventId];
+        system._relay(source, target, event);
+      }, delay);
+      timerMap[scheduledEventId] = timeout;
+    },
+    cancel: (source, id) => {
+      const scheduledEventId = createScheduledEventId(source, id);
+      const timeout = timerMap[scheduledEventId];
+      delete timerMap[scheduledEventId];
+      delete system._snapshot._scheduledEvents[scheduledEventId];
+      clock.clearTimeout(timeout);
+    },
+    cancelAll: actorRef => {
+      for (const scheduledEventId in system._snapshot._scheduledEvents) {
+        const scheduledEvent = system._snapshot._scheduledEvents[scheduledEventId];
+        if (scheduledEvent.source === actorRef) {
+          scheduler.cancel(actorRef, scheduledEvent.id);
+        }
+      }
+    }
+  };
   const system = {
+    _snapshot: {
+      _scheduledEvents: (options?.snapshot && options.snapshot.scheduler) ?? {}
+    },
     _bookId: () => `x:${idCounter++}`,
     _register: (sessionId, actorRef) => {
       children.set(sessionId, actorRef);
@@ -175,6 +218,28 @@ function createSystem(rootActor) {
         event
       });
       target._send(event);
+    },
+    scheduler,
+    getSnapshot: () => {
+      return {
+        _scheduledEvents: {
+          ...system._snapshot._scheduledEvents
+        }
+      };
+    },
+    start: () => {
+      const scheduledEvets = system._snapshot._scheduledEvents;
+      system._snapshot._scheduledEvents = {};
+      for (const scheduledId in scheduledEvets) {
+        const {
+          source,
+          target,
+          event,
+          delay,
+          id
+        } = scheduledEvets[scheduledId];
+        scheduler.schedule(source, target, event, delay, id);
+      }
     }
   };
   return system;
@@ -360,7 +425,6 @@ class Actor {
      */
     this.id = void 0;
     this.mailbox = new Mailbox(this._process.bind(this));
-    this.delayedEventsMap = {};
     this.observers = new Set();
     this.logger = void 0;
     /** @internal */
@@ -397,7 +461,9 @@ class Actor {
       systemId,
       inspect
     } = resolvedOptions;
-    this.system = parent?.system ?? createSystem(this);
+    this.system = parent ? parent.system : createSystem(this, {
+      clock
+    });
     if (inspect && !parent) {
       // Always inspect at the system-level
       this.system.inspect(toObserver(inspect));
@@ -578,10 +644,28 @@ class Actor {
     if (this._processingStatus !== ProcessingStatus.Stopped) {
       this.observers.add(observer);
     } else {
-      try {
-        observer.complete?.();
-      } catch (err) {
-        reportUnhandledError(err);
+      switch (this._snapshot.status) {
+        case 'done':
+          try {
+            observer.complete?.();
+          } catch (err) {
+            reportUnhandledError(err);
+          }
+          break;
+        case 'error':
+          {
+            const err = this._snapshot.error;
+            if (!observer.error) {
+              reportUnhandledError(err);
+            } else {
+              try {
+                observer.error(err);
+              } catch (err) {
+                reportUnhandledError(err);
+              }
+            }
+            break;
+          }
       }
     }
     return {
@@ -638,6 +722,9 @@ class Actor {
         this._error(this._snapshot.error);
         return this;
     }
+    if (!this._parent) {
+      this.system.start();
+    }
     if (this.logic.start) {
       try {
         this.logic.start(this._snapshot, this._actorScope);
@@ -766,9 +853,7 @@ class Actor {
     }
 
     // Cancel all delayed events
-    for (const key of Object.keys(this.delayedEventsMap)) {
-      this.clock.clearTimeout(this.delayedEventsMap[key]);
-    }
+    this.system.scheduler.cancelAll(this);
 
     // TODO: mailbox.reset
     this.mailbox.clear();
@@ -800,35 +885,6 @@ class Actor {
   send(event) {
     this.system._relay(undefined, this, event);
   }
-
-  /**
-   * TODO: figure out a way to do this within the machine
-   * @internal
-   */
-  delaySend(params) {
-    const {
-      event,
-      id,
-      delay
-    } = params;
-    const timerId = this.clock.setTimeout(() => {
-      this.system._relay(this, params.to ?? this, event);
-    }, delay);
-
-    // TODO: consider the rehydration story here
-    if (id) {
-      this.delayedEventsMap[id] = timerId;
-    }
-  }
-
-  /**
-   * TODO: figure out a way to do this within the machine
-   * @internal
-   */
-  cancel(sendId) {
-    this.clock.clearTimeout(this.delayedEventsMap[sendId]);
-    delete this.delayedEventsMap[sendId];
-  }
   attachDevTools() {
     const {
       devTools
@@ -940,7 +996,9 @@ function resolveCancel(_, snapshot, actionArgs, actionParams, {
   return [snapshot, resolvedSendId];
 }
 function executeCancel(actorScope, resolvedSendId) {
-  actorScope.self.cancel(resolvedSendId);
+  actorScope.defer(() => {
+    actorScope.system.scheduler.cancel(actorScope.self, resolvedSendId);
+  });
 }
 /**
  * Cancels an in-flight `send(...)` action. A canceled sent action will not
@@ -2291,8 +2349,16 @@ function resolveRaise(_, snapshot, args, actionParams, {
   }];
 }
 function executeRaise(actorScope, params) {
-  if (typeof params.delay === 'number') {
-    actorScope.self.delaySend(params);
+  const {
+    event,
+    delay,
+    id
+  } = params;
+  if (typeof delay === 'number') {
+    actorScope.defer(() => {
+      const self = actorScope.self;
+      actorScope.system.scheduler.schedule(self, self, event, delay, id);
+    });
     return;
   }
 }
@@ -2314,4 +2380,4 @@ function raise(eventOrExpr, options) {
   return raise;
 }
 
-export { $$ACTOR_TYPE as $, Actor as A, interpret as B, isMachineSnapshot as C, matchesState as D, pathToStateValue as E, toObserver as F, getAllOwnEventDescriptors as G, and as H, not as I, or as J, stateIn as K, cancel as L, raise as M, NULL_EVENT as N, spawnChild as O, stop as P, stopChild as Q, ProcessingStatus as R, STATE_DELIMITER as S, cloneMachineSnapshot as T, XSTATE_ERROR as U, createErrorActorEvent as V, XSTATE_STOP as X, toTransitionConfigArray as a, formatTransition as b, createInvokeId as c, formatInitialTransition as d, evaluateGuard as e, formatTransitions as f, getDelayedTransitions as g, getCandidates as h, getAllStateNodes as i, getStateNodes as j, createMachineSnapshot as k, isInFinalState as l, mapValues as m, macrostep as n, transitionNode as o, resolveActionsAndContext as p, createInitEvent as q, resolveStateValue as r, microstep as s, toArray as t, getInitialStateNodes as u, isStateId as v, getStateNodeByPath as w, getPersistedSnapshot as x, resolveReferencedActor as y, createActor as z };
+export { $$ACTOR_TYPE as $, Actor as A, interpret as B, isMachineSnapshot as C, and as D, not as E, or as F, stateIn as G, getAllOwnEventDescriptors as H, matchesState as I, pathToStateValue as J, toObserver as K, cancel as L, raise as M, NULL_EVENT as N, spawnChild as O, stop as P, stopChild as Q, ProcessingStatus as R, STATE_DELIMITER as S, cloneMachineSnapshot as T, XSTATE_ERROR as U, createErrorActorEvent as V, XSTATE_STOP as X, toTransitionConfigArray as a, formatTransition as b, createInvokeId as c, formatInitialTransition as d, evaluateGuard as e, formatTransitions as f, getDelayedTransitions as g, getCandidates as h, getAllStateNodes as i, getStateNodes as j, createMachineSnapshot as k, isInFinalState as l, mapValues as m, macrostep as n, transitionNode as o, resolveActionsAndContext as p, createInitEvent as q, resolveStateValue as r, microstep as s, toArray as t, getInitialStateNodes as u, isStateId as v, getStateNodeByPath as w, getPersistedSnapshot as x, resolveReferencedActor as y, createActor as z };

package/dist/{raise-62704519.development.cjs.js → raise-6fb30f8b.development.cjs.js}

@@ -128,13 +128,56 @@ function reportUnhandledError(err) {
 
 const symbolObservable = (() => typeof Symbol === 'function' && Symbol.observable || '@@observable')();
 
+function createScheduledEventId(actorRef, id) {
+  return `${actorRef.sessionId}.${id}`;
+}
 let idCounter = 0;
-function createSystem(rootActor) {
+function createSystem(rootActor, options) {
   const children = new Map();
   const keyedActors = new Map();
   const reverseKeyedActors = new WeakMap();
   const observers = new Set();
+  const timerMap = {};
+  const clock = options.clock;
+  const scheduler = {
+    schedule: (source, target, event, delay, id = Math.random().toString(36).slice(2)) => {
+      const scheduledEvent = {
+        source,
+        target,
+        event,
+        delay,
+        id,
+        startedAt: Date.now()
+      };
+      const scheduledEventId = createScheduledEventId(source, id);
+      system._snapshot._scheduledEvents[scheduledEventId] = scheduledEvent;
+      const timeout = clock.setTimeout(() => {
+        delete timerMap[scheduledEventId];
+        delete system._snapshot._scheduledEvents[scheduledEventId];
+        system._relay(source, target, event);
+      }, delay);
+      timerMap[scheduledEventId] = timeout;
+    },
+    cancel: (source, id) => {
+      const scheduledEventId = createScheduledEventId(source, id);
+      const timeout = timerMap[scheduledEventId];
+      delete timerMap[scheduledEventId];
+      delete system._snapshot._scheduledEvents[scheduledEventId];
+      clock.clearTimeout(timeout);
+    },
+    cancelAll: actorRef => {
+      for (const scheduledEventId in system._snapshot._scheduledEvents) {
+        const scheduledEvent = system._snapshot._scheduledEvents[scheduledEventId];
+        if (scheduledEvent.source === actorRef) {
+          scheduler.cancel(actorRef, scheduledEvent.id);
+        }
+      }
+    }
+  };
   const system = {
+    _snapshot: {
+      _scheduledEvents: (options?.snapshot && options.snapshot.scheduler) ?? {}
+    },
     _bookId: () => `x:${idCounter++}`,
     _register: (sessionId, actorRef) => {
       children.set(sessionId, actorRef);
@@ -177,6 +220,28 @@ function createSystem(rootActor) {
         event
       });
       target._send(event);
+    },
+    scheduler,
+    getSnapshot: () => {
+      return {
+        _scheduledEvents: {
+          ...system._snapshot._scheduledEvents
+        }
+      };
+    },
+    start: () => {
+      const scheduledEvets = system._snapshot._scheduledEvents;
+      system._snapshot._scheduledEvents = {};
+      for (const scheduledId in scheduledEvets) {
+        const {
+          source,
+          target,
+          event,
+          delay,
+          id
+        } = scheduledEvets[scheduledId];
+        scheduler.schedule(source, target, event, delay, id);
+      }
     }
   };
   return system;
@@ -365,7 +430,6 @@ class Actor {
      */
     this.id = void 0;
     this.mailbox = new Mailbox(this._process.bind(this));
-    this.delayedEventsMap = {};
     this.observers = new Set();
     this.logger = void 0;
     /** @internal */
@@ -402,7 +466,9 @@ class Actor {
       systemId,
       inspect
     } = resolvedOptions;
-    this.system = parent?.system ?? createSystem(this);
+    this.system = parent ? parent.system : createSystem(this, {
+      clock
+    });
     if (inspect && !parent) {
       // Always inspect at the system-level
       this.system.inspect(toObserver(inspect));
@@ -583,10 +649,28 @@ class Actor {
     if (this._processingStatus !== ProcessingStatus.Stopped) {
       this.observers.add(observer);
     } else {
-      try {
-        observer.complete?.();
-      } catch (err) {
-        reportUnhandledError(err);
+      switch (this._snapshot.status) {
+        case 'done':
+          try {
+            observer.complete?.();
+          } catch (err) {
+            reportUnhandledError(err);
+          }
+          break;
+        case 'error':
+          {
+            const err = this._snapshot.error;
+            if (!observer.error) {
+              reportUnhandledError(err);
+            } else {
+              try {
+                observer.error(err);
+              } catch (err) {
+                reportUnhandledError(err);
+              }
+            }
+            break;
+          }
       }
     }
     return {
@@ -643,6 +727,9 @@ class Actor {
         this._error(this._snapshot.error);
         return this;
     }
+    if (!this._parent) {
+      this.system.start();
+    }
     if (this.logic.start) {
       try {
         this.logic.start(this._snapshot, this._actorScope);
@@ -771,9 +858,7 @@ class Actor {
     }
 
     // Cancel all delayed events
-    for (const key of Object.keys(this.delayedEventsMap)) {
-      this.clock.clearTimeout(this.delayedEventsMap[key]);
-    }
+    this.system.scheduler.cancelAll(this);
 
     // TODO: mailbox.reset
     this.mailbox.clear();
@@ -813,35 +898,6 @@ class Actor {
     }
     this.system._relay(undefined, this, event);
   }
-
-  /**
-   * TODO: figure out a way to do this within the machine
-   * @internal
-   */
-  delaySend(params) {
-    const {
-      event,
-      id,
-      delay
-    } = params;
-    const timerId = this.clock.setTimeout(() => {
-      this.system._relay(this, params.to ?? this, event);
-    }, delay);
-
-    // TODO: consider the rehydration story here
-    if (id) {
-      this.delayedEventsMap[id] = timerId;
-    }
-  }
-
-  /**
-   * TODO: figure out a way to do this within the machine
-   * @internal
-   */
-  cancel(sendId) {
-    this.clock.clearTimeout(this.delayedEventsMap[sendId]);
-    delete this.delayedEventsMap[sendId];
-  }
   attachDevTools() {
     const {
       devTools
@@ -953,7 +1009,9 @@ function resolveCancel(_, snapshot, actionArgs, actionParams, {
   return [snapshot, resolvedSendId];
 }
 function executeCancel(actorScope, resolvedSendId) {
-  actorScope.self.cancel(resolvedSendId);
+  actorScope.defer(() => {
+    actorScope.system.scheduler.cancel(actorScope.self, resolvedSendId);
+  });
 }
 /**
  * Cancels an in-flight `send(...)` action. A canceled sent action will not
@@ -2344,8 +2402,16 @@ function resolveRaise(_, snapshot, args, actionParams, {
   }];
 }
 function executeRaise(actorScope, params) {
-  if (typeof params.delay === 'number') {
-    actorScope.self.delaySend(params);
+  const {
+    event,
+    delay,
+    id
+  } = params;
+  if (typeof delay === 'number') {
+    actorScope.defer(() => {
+      const self = actorScope.self;
+      actorScope.system.scheduler.schedule(self, self, event, delay, id);
+    });
     return;
   }
 }

package/dist/{raise-34e25c2c.cjs.js → raise-746abff7.cjs.js}

@@ -128,13 +128,56 @@ function reportUnhandledError(err) {
 
 const symbolObservable = (() => typeof Symbol === 'function' && Symbol.observable || '@@observable')();
 
+function createScheduledEventId(actorRef, id) {
+  return `${actorRef.sessionId}.${id}`;
+}
 let idCounter = 0;
-function createSystem(rootActor) {
+function createSystem(rootActor, options) {
   const children = new Map();
   const keyedActors = new Map();
   const reverseKeyedActors = new WeakMap();
   const observers = new Set();
+  const timerMap = {};
+  const clock = options.clock;
+  const scheduler = {
+    schedule: (source, target, event, delay, id = Math.random().toString(36).slice(2)) => {
+      const scheduledEvent = {
+        source,
+        target,
+        event,
+        delay,
+        id,
+        startedAt: Date.now()
+      };
+      const scheduledEventId = createScheduledEventId(source, id);
+      system._snapshot._scheduledEvents[scheduledEventId] = scheduledEvent;
+      const timeout = clock.setTimeout(() => {
+        delete timerMap[scheduledEventId];
+        delete system._snapshot._scheduledEvents[scheduledEventId];
+        system._relay(source, target, event);
+      }, delay);
+      timerMap[scheduledEventId] = timeout;
+    },
+    cancel: (source, id) => {
+      const scheduledEventId = createScheduledEventId(source, id);
+      const timeout = timerMap[scheduledEventId];
+      delete timerMap[scheduledEventId];
+      delete system._snapshot._scheduledEvents[scheduledEventId];
+      clock.clearTimeout(timeout);
+    },
+    cancelAll: actorRef => {
+      for (const scheduledEventId in system._snapshot._scheduledEvents) {
+        const scheduledEvent = system._snapshot._scheduledEvents[scheduledEventId];
+        if (scheduledEvent.source === actorRef) {
+          scheduler.cancel(actorRef, scheduledEvent.id);
+        }
+      }
+    }
+  };
   const system = {
+    _snapshot: {
+      _scheduledEvents: (options?.snapshot && options.snapshot.scheduler) ?? {}
+    },
     _bookId: () => `x:${idCounter++}`,
     _register: (sessionId, actorRef) => {
       children.set(sessionId, actorRef);
@@ -177,6 +220,28 @@ function createSystem(rootActor) {
         event
       });
       target._send(event);
+    },
+    scheduler,
+    getSnapshot: () => {
+      return {
+        _scheduledEvents: {
+          ...system._snapshot._scheduledEvents
+        }
+      };
+    },
+    start: () => {
+      const scheduledEvets = system._snapshot._scheduledEvents;
+      system._snapshot._scheduledEvents = {};
+      for (const scheduledId in scheduledEvets) {
+        const {
+          source,
+          target,
+          event,
+          delay,
+          id
+        } = scheduledEvets[scheduledId];
+        scheduler.schedule(source, target, event, delay, id);
+      }
     }
   };
   return system;
@@ -362,7 +427,6 @@ class Actor {
      */
     this.id = void 0;
     this.mailbox = new Mailbox(this._process.bind(this));
-    this.delayedEventsMap = {};
     this.observers = new Set();
     this.logger = void 0;
     /** @internal */
@@ -399,7 +463,9 @@ class Actor {
       systemId,
       inspect
     } = resolvedOptions;
-    this.system = parent?.system ?? createSystem(this);
+    this.system = parent ? parent.system : createSystem(this, {
+      clock
+    });
     if (inspect && !parent) {
       // Always inspect at the system-level
       this.system.inspect(toObserver(inspect));
@@ -580,10 +646,28 @@ class Actor {
     if (this._processingStatus !== ProcessingStatus.Stopped) {
       this.observers.add(observer);
     } else {
-      try {
-        observer.complete?.();
-      } catch (err) {
-        reportUnhandledError(err);
+      switch (this._snapshot.status) {
+        case 'done':
+          try {
+            observer.complete?.();
+          } catch (err) {
+            reportUnhandledError(err);
+          }
+          break;
+        case 'error':
+          {
+            const err = this._snapshot.error;
+            if (!observer.error) {
+              reportUnhandledError(err);
+            } else {
+              try {
+                observer.error(err);
+              } catch (err) {
+                reportUnhandledError(err);
+              }
+            }
+            break;
+          }
       }
     }
     return {
@@ -640,6 +724,9 @@ class Actor {
         this._error(this._snapshot.error);
         return this;
     }
+    if (!this._parent) {
+      this.system.start();
+    }
     if (this.logic.start) {
       try {
         this.logic.start(this._snapshot, this._actorScope);
@@ -768,9 +855,7 @@ class Actor {
     }
 
     // Cancel all delayed events
-    for (const key of Object.keys(this.delayedEventsMap)) {
-      this.clock.clearTimeout(this.delayedEventsMap[key]);
-    }
+    this.system.scheduler.cancelAll(this);
 
     // TODO: mailbox.reset
     this.mailbox.clear();
@@ -802,35 +887,6 @@ class Actor {
   send(event) {
     this.system._relay(undefined, this, event);
   }
-
-  /**
-   * TODO: figure out a way to do this within the machine
-   * @internal
-   */
-  delaySend(params) {
-    const {
-      event,
-      id,
-      delay
-    } = params;
-    const timerId = this.clock.setTimeout(() => {
-      this.system._relay(this, params.to ?? this, event);
-    }, delay);
-
-    // TODO: consider the rehydration story here
-    if (id) {
-      this.delayedEventsMap[id] = timerId;
-    }
-  }
-
-  /**
-   * TODO: figure out a way to do this within the machine
-   * @internal
-   */
-  cancel(sendId) {
-    this.clock.clearTimeout(this.delayedEventsMap[sendId]);
-    delete this.delayedEventsMap[sendId];
-  }
   attachDevTools() {
     const {
       devTools
@@ -942,7 +998,9 @@ function resolveCancel(_, snapshot, actionArgs, actionParams, {
   return [snapshot, resolvedSendId];
 }
 function executeCancel(actorScope, resolvedSendId) {
-  actorScope.self.cancel(resolvedSendId);
+  actorScope.defer(() => {
+    actorScope.system.scheduler.cancel(actorScope.self, resolvedSendId);
+  });
 }
 /**
  * Cancels an in-flight `send(...)` action. A canceled sent action will not
@@ -2293,8 +2351,16 @@ function resolveRaise(_, snapshot, args, actionParams, {
   }];
 }
 function executeRaise(actorScope, params) {
-  if (typeof params.delay === 'number') {
-    actorScope.self.delaySend(params);
+  const {
+    event,
+    delay,
+    id
+  } = params;
+  if (typeof delay === 'number') {
+    actorScope.defer(() => {
+      const self = actorScope.self;
+      actorScope.system.scheduler.schedule(self, self, event, delay, id);
+    });
     return;
   }
 }