xstate 5.0.1 → 5.1.0

package/dist/{raise-8bc422d1.esm.js → raise-525f78b5.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));
@@ -638,6 +704,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 +835,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 +867,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 +978,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 +2331,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-9f420f96.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));
@@ -640,6 +706,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 +837,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 +869,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 +980,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 +2333,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-89c581c4.development.esm.js → raise-dd0e6cd2.development.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;
@@ -363,7 +428,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 */
@@ -400,7 +464,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));
@@ -641,6 +707,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);
@@ -769,9 +838,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();
@@ -811,35 +878,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
@@ -951,7 +989,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
@@ -2342,8 +2382,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/xstate.cjs.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var actors_dist_xstateActors = require('../actors/dist/xstate-actors.cjs.js');
-var guards_dist_xstateGuards = require('./raise-34e25c2c.cjs.js');
-var log = require('./log-5e226275.cjs.js');
+var guards_dist_xstateGuards = require('./raise-9f420f96.cjs.js');
+var log = require('./log-dca6710c.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 class SimulatedClock {
@@ -12,6 +12,8 @@ class SimulatedClock {
     this.timeouts = new Map();
     this._now = 0;
     this._id = 0;
+    this._flushing = false;
+    this._flushingInvalidated = false;
   }
   now() {
     return this._now;
@@ -20,6 +22,7 @@ class SimulatedClock {
     return this._id++;
   }
   setTimeout(fn, timeout) {
+    this._flushingInvalidated = this._flushing;
     const id = this.getId();
     this.timeouts.set(id, {
       start: this.now(),
@@ -29,6 +32,7 @@ class SimulatedClock {
     return id;
   }
   clearTimeout(id) {
+    this._flushingInvalidated = this._flushing;
     this.timeouts.delete(id);
   }
   set(time) {
@@ -39,16 +43,29 @@ class SimulatedClock {
     this.flushTimeouts();
   }
   flushTimeouts() {
-    [...this.timeouts].sort(([_idA, timeoutA], [_idB, timeoutB]) => {
+    if (this._flushing) {
+      this._flushingInvalidated = true;
+      return;
+    }
+    this._flushing = true;
+    const sorted = [...this.timeouts].sort(([_idA, timeoutA], [_idB, timeoutB]) => {
       const endA = timeoutA.start + timeoutA.timeout;
       const endB = timeoutB.start + timeoutB.timeout;
       return endB > endA ? -1 : 1;
-    }).forEach(([id, timeout]) => {
+    });
+    for (const [id, timeout] of sorted) {
+      if (this._flushingInvalidated) {
+        this._flushingInvalidated = false;
+        this._flushing = false;
+        this.flushTimeouts();
+        return;
+      }
       if (this.now() - timeout.start >= timeout.timeout) {
         this.timeouts.delete(id);
         timeout.fn.call(null);
       }
-    });
+    }
+    this._flushing = false;
   }
   increment(ms) {
     this._now += ms;
@@ -390,6 +407,7 @@ class StateMachine {
     this.version = this.config.version;
     this.transition = this.transition.bind(this);
     this.getInitialSnapshot = this.getInitialSnapshot.bind(this);
+    this.getPersistedSnapshot = this.getPersistedSnapshot.bind(this);
     this.restoreSnapshot = this.restoreSnapshot.bind(this);
     this.start = this.start.bind(this);
     this.root = new StateNode(config, {