xstate 5.0.0-beta.48 → 5.0.0-beta.49

package/actors/dist/xstate-actors.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var guards_dist_xstateGuards = require('../../dist/raise-cd0dde81.cjs.js');
+var guards_dist_xstateGuards = require('../../dist/raise-8f9c4a5a.cjs.js');
 require('../../dev/dist/xstate-dev.cjs.js');
 
 /**
@@ -87,6 +87,7 @@ function fromTransition(transition, initialContext) {
   };
 }
 
+const instanceStates = /* #__PURE__ */new WeakMap();
 /**
  * An actor logic creator which returns callback logic as defined by a callback function.
  *
@@ -147,51 +148,46 @@ function fromTransition(transition, initialContext) {
 function fromCallback(invokeCallback) {
   const logic = {
     config: invokeCallback,
-    start: (_state, {
-      self,
-      system
-    }) => {
-      system._relay(self, self, {
-        type: 'xstate.create'
-      });
-    },
-    transition: (state, event, {
-      self,
-      system
-    }) => {
-      if (event.type === 'xstate.create') {
-        const sendBack = eventForParent => {
-          if (state.status === 'stopped') {
+    start: (state, actorScope) => {
+      const {
+        self,
+        system
+      } = actorScope;
+      const callbackState = {
+        receivers: undefined,
+        dispose: undefined
+      };
+      instanceStates.set(self, callbackState);
+      callbackState.dispose = invokeCallback({
+        input: state.input,
+        system,
+        self,
+        sendBack: event => {
+          if (self.getSnapshot().status === 'stopped') {
             return;
           }
           if (self._parent) {
-            system._relay(self, self._parent, eventForParent);
+            system._relay(self, self._parent, event);
           }
-        };
-        const receive = newListener => {
-          state._receivers.add(newListener);
-        };
-        state._dispose = invokeCallback({
-          input: state.input,
-          system,
-          self: self,
-          sendBack,
-          receive
-        });
-        return state;
-      }
+        },
+        receive: listener => {
+          callbackState.receivers ??= new Set();
+          callbackState.receivers.add(listener);
+        }
+      });
+    },
+    transition: (state, event, actorScope) => {
+      const callbackState = instanceStates.get(actorScope.self);
       if (event.type === guards_dist_xstateGuards.XSTATE_STOP) {
         state = {
           ...state,
           status: 'stopped',
           error: undefined
         };
-        if (typeof state._dispose === 'function') {
-          state._dispose();
-        }
+        callbackState.dispose?.();
         return state;
       }
-      state._receivers.forEach(receiver => receiver(event));
+      callbackState.receivers?.forEach(receiver => receiver(event));
       return state;
     },
     getInitialState: (_, input) => {
@@ -199,25 +195,18 @@ function fromCallback(invokeCallback) {
         status: 'active',
         output: undefined,
         error: undefined,
-        input,
-        _receivers: new Set(),
-        _dispose: undefined
+        input
       };
     },
-    getPersistedState: ({
-      _dispose,
-      _receivers,
-      ...rest
-    }) => rest,
-    restoreState: state => ({
-      _receivers: new Set(),
-      _dispose: undefined,
-      ...state
-    })
+    getPersistedState: state => state,
+    restoreState: state => state
   };
   return logic;
 }
 
+const XSTATE_OBSERVABLE_NEXT = 'xstate.observable.next';
+const XSTATE_OBSERVABLE_ERROR = 'xstate.observable.error';
+const XSTATE_OBSERVABLE_COMPLETE = 'xstate.observable.complete';
 /**
  * Observable actor logic is described by an observable stream of values. Actors created from observable logic (“observable actors”) can:
  *
@@ -259,10 +248,6 @@ function fromCallback(invokeCallback) {
  * @see {@link Subscribable} interface in XState, which is based on and compatible with RxJS Observable.
  */
 function fromObservable(observableCreator) {
-  const nextEventType = '$$xstate.next';
-  const errorEventType = '$$xstate.error';
-  const completeEventType = '$$xstate.complete';
-
   // TODO: add event types
   const logic = {
     config: observableCreator,
@@ -276,7 +261,7 @@ function fromObservable(observableCreator) {
         return snapshot;
       }
       switch (event.type) {
-        case nextEventType:
+        case XSTATE_OBSERVABLE_NEXT:
           {
             const newSnapshot = {
               ...snapshot,
@@ -284,7 +269,7 @@ function fromObservable(observableCreator) {
             };
             return newSnapshot;
           }
-        case errorEventType:
+        case XSTATE_OBSERVABLE_ERROR:
           return {
             ...snapshot,
             status: 'error',
@@ -292,7 +277,7 @@ function fromObservable(observableCreator) {
             input: undefined,
             _subscription: undefined
           };
-        case completeEventType:
+        case XSTATE_OBSERVABLE_COMPLETE:
           return {
             ...snapshot,
             status: 'done',
@@ -336,19 +321,19 @@ function fromObservable(observableCreator) {
       }).subscribe({
         next: value => {
           system._relay(self, self, {
-            type: nextEventType,
+            type: XSTATE_OBSERVABLE_NEXT,
             data: value
           });
         },
         error: err => {
           system._relay(self, self, {
-            type: errorEventType,
+            type: XSTATE_OBSERVABLE_ERROR,
             data: err
           });
         },
         complete: () => {
           system._relay(self, self, {
-            type: completeEventType
+            type: XSTATE_OBSERVABLE_COMPLETE
           });
         }
       });
@@ -409,11 +394,7 @@ function fromObservable(observableCreator) {
  * canvasActor.start();
  * ```
  */
-
 function fromEventObservable(lazyObservable) {
-  const errorEventType = '$$xstate.error';
-  const completeEventType = '$$xstate.complete';
-
   // TODO: event types
   const logic = {
     config: lazyObservable,
@@ -422,7 +403,7 @@ function fromEventObservable(lazyObservable) {
         return state;
       }
       switch (event.type) {
-        case errorEventType:
+        case XSTATE_OBSERVABLE_ERROR:
           return {
             ...state,
             status: 'error',
@@ -430,7 +411,7 @@ function fromEventObservable(lazyObservable) {
             input: undefined,
             _subscription: undefined
           };
-        case completeEventType:
+        case XSTATE_OBSERVABLE_COMPLETE:
           return {
             ...state,
             status: 'done',
@@ -479,13 +460,13 @@ function fromEventObservable(lazyObservable) {
         },
         error: err => {
           system._relay(self, self, {
-            type: errorEventType,
+            type: XSTATE_OBSERVABLE_ERROR,
             data: err
           });
         },
         complete: () => {
           system._relay(self, self, {
-            type: completeEventType
+            type: XSTATE_OBSERVABLE_COMPLETE
           });
         }
       });
@@ -502,8 +483,8 @@ function fromEventObservable(lazyObservable) {
   return logic;
 }
 
-const resolveEventType = '$$xstate.resolve';
-const rejectEventType = '$$xstate.reject';
+const XSTATE_PROMISE_RESOLVE = 'xstate.promise.resolve';
+const XSTATE_PROMISE_REJECT = 'xstate.promise.reject';
 /**
  * An actor logic creator which returns promise logic as defined by an async process that resolves or rejects after some time.
  *
@@ -559,7 +540,7 @@ promiseCreator) {
         return state;
       }
       switch (event.type) {
-        case resolveEventType:
+        case XSTATE_PROMISE_RESOLVE:
           {
             const resolvedValue = event.data;
             return {
@@ -569,7 +550,7 @@ promiseCreator) {
               input: undefined
             };
           }
-        case rejectEventType:
+        case XSTATE_PROMISE_REJECT:
           return {
             ...state,
             status: 'error',
@@ -605,7 +586,7 @@ promiseCreator) {
           return;
         }
         system._relay(self, self, {
-          type: resolveEventType,
+          type: XSTATE_PROMISE_RESOLVE,
           data: response
         });
       }, errorData => {
@@ -613,7 +594,7 @@ promiseCreator) {
           return;
         }
         system._relay(self, self, {
-          type: rejectEventType,
+          type: XSTATE_PROMISE_REJECT,
           data: errorData
         });
       });

package/actors/dist/xstate-actors.development.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var guards_dist_xstateGuards = require('../../dist/raise-0eafc1df.development.cjs.js');
+var guards_dist_xstateGuards = require('../../dist/raise-495f4b9f.development.cjs.js');
 require('../../dev/dist/xstate-dev.development.cjs.js');
 
 /**
@@ -87,6 +87,7 @@ function fromTransition(transition, initialContext) {
   };
 }
 
+const instanceStates = /* #__PURE__ */new WeakMap();
 /**
  * An actor logic creator which returns callback logic as defined by a callback function.
  *
@@ -147,51 +148,46 @@ function fromTransition(transition, initialContext) {
 function fromCallback(invokeCallback) {
   const logic = {
     config: invokeCallback,
-    start: (_state, {
-      self,
-      system
-    }) => {
-      system._relay(self, self, {
-        type: 'xstate.create'
-      });
-    },
-    transition: (state, event, {
-      self,
-      system
-    }) => {
-      if (event.type === 'xstate.create') {
-        const sendBack = eventForParent => {
-          if (state.status === 'stopped') {
+    start: (state, actorScope) => {
+      const {
+        self,
+        system
+      } = actorScope;
+      const callbackState = {
+        receivers: undefined,
+        dispose: undefined
+      };
+      instanceStates.set(self, callbackState);
+      callbackState.dispose = invokeCallback({
+        input: state.input,
+        system,
+        self,
+        sendBack: event => {
+          if (self.getSnapshot().status === 'stopped') {
             return;
           }
           if (self._parent) {
-            system._relay(self, self._parent, eventForParent);
+            system._relay(self, self._parent, event);
           }
-        };
-        const receive = newListener => {
-          state._receivers.add(newListener);
-        };
-        state._dispose = invokeCallback({
-          input: state.input,
-          system,
-          self: self,
-          sendBack,
-          receive
-        });
-        return state;
-      }
+        },
+        receive: listener => {
+          callbackState.receivers ??= new Set();
+          callbackState.receivers.add(listener);
+        }
+      });
+    },
+    transition: (state, event, actorScope) => {
+      const callbackState = instanceStates.get(actorScope.self);
       if (event.type === guards_dist_xstateGuards.XSTATE_STOP) {
         state = {
           ...state,
           status: 'stopped',
           error: undefined
         };
-        if (typeof state._dispose === 'function') {
-          state._dispose();
-        }
+        callbackState.dispose?.();
         return state;
       }
-      state._receivers.forEach(receiver => receiver(event));
+      callbackState.receivers?.forEach(receiver => receiver(event));
       return state;
     },
     getInitialState: (_, input) => {
@@ -199,25 +195,18 @@ function fromCallback(invokeCallback) {
         status: 'active',
         output: undefined,
         error: undefined,
-        input,
-        _receivers: new Set(),
-        _dispose: undefined
+        input
       };
     },
-    getPersistedState: ({
-      _dispose,
-      _receivers,
-      ...rest
-    }) => rest,
-    restoreState: state => ({
-      _receivers: new Set(),
-      _dispose: undefined,
-      ...state
-    })
+    getPersistedState: state => state,
+    restoreState: state => state
   };
   return logic;
 }
 
+const XSTATE_OBSERVABLE_NEXT = 'xstate.observable.next';
+const XSTATE_OBSERVABLE_ERROR = 'xstate.observable.error';
+const XSTATE_OBSERVABLE_COMPLETE = 'xstate.observable.complete';
 /**
  * Observable actor logic is described by an observable stream of values. Actors created from observable logic (“observable actors”) can:
  *
@@ -259,10 +248,6 @@ function fromCallback(invokeCallback) {
  * @see {@link Subscribable} interface in XState, which is based on and compatible with RxJS Observable.
  */
 function fromObservable(observableCreator) {
-  const nextEventType = '$$xstate.next';
-  const errorEventType = '$$xstate.error';
-  const completeEventType = '$$xstate.complete';
-
   // TODO: add event types
   const logic = {
     config: observableCreator,
@@ -276,7 +261,7 @@ function fromObservable(observableCreator) {
         return snapshot;
       }
       switch (event.type) {
-        case nextEventType:
+        case XSTATE_OBSERVABLE_NEXT:
           {
             const newSnapshot = {
               ...snapshot,
@@ -284,7 +269,7 @@ function fromObservable(observableCreator) {
             };
             return newSnapshot;
           }
-        case errorEventType:
+        case XSTATE_OBSERVABLE_ERROR:
           return {
             ...snapshot,
             status: 'error',
@@ -292,7 +277,7 @@ function fromObservable(observableCreator) {
             input: undefined,
             _subscription: undefined
           };
-        case completeEventType:
+        case XSTATE_OBSERVABLE_COMPLETE:
           return {
             ...snapshot,
             status: 'done',
@@ -336,19 +321,19 @@ function fromObservable(observableCreator) {
       }).subscribe({
         next: value => {
           system._relay(self, self, {
-            type: nextEventType,
+            type: XSTATE_OBSERVABLE_NEXT,
             data: value
           });
         },
         error: err => {
           system._relay(self, self, {
-            type: errorEventType,
+            type: XSTATE_OBSERVABLE_ERROR,
             data: err
           });
         },
         complete: () => {
           system._relay(self, self, {
-            type: completeEventType
+            type: XSTATE_OBSERVABLE_COMPLETE
           });
         }
       });
@@ -409,11 +394,7 @@ function fromObservable(observableCreator) {
  * canvasActor.start();
  * ```
  */
-
 function fromEventObservable(lazyObservable) {
-  const errorEventType = '$$xstate.error';
-  const completeEventType = '$$xstate.complete';
-
   // TODO: event types
   const logic = {
     config: lazyObservable,
@@ -422,7 +403,7 @@ function fromEventObservable(lazyObservable) {
         return state;
       }
       switch (event.type) {
-        case errorEventType:
+        case XSTATE_OBSERVABLE_ERROR:
           return {
             ...state,
             status: 'error',
@@ -430,7 +411,7 @@ function fromEventObservable(lazyObservable) {
             input: undefined,
             _subscription: undefined
           };
-        case completeEventType:
+        case XSTATE_OBSERVABLE_COMPLETE:
           return {
             ...state,
             status: 'done',
@@ -479,13 +460,13 @@ function fromEventObservable(lazyObservable) {
         },
         error: err => {
           system._relay(self, self, {
-            type: errorEventType,
+            type: XSTATE_OBSERVABLE_ERROR,
             data: err
           });
         },
         complete: () => {
           system._relay(self, self, {
-            type: completeEventType
+            type: XSTATE_OBSERVABLE_COMPLETE
           });
         }
       });
@@ -502,8 +483,8 @@ function fromEventObservable(lazyObservable) {
   return logic;
 }
 
-const resolveEventType = '$$xstate.resolve';
-const rejectEventType = '$$xstate.reject';
+const XSTATE_PROMISE_RESOLVE = 'xstate.promise.resolve';
+const XSTATE_PROMISE_REJECT = 'xstate.promise.reject';
 /**
  * An actor logic creator which returns promise logic as defined by an async process that resolves or rejects after some time.
  *
@@ -559,7 +540,7 @@ promiseCreator) {
         return state;
       }
       switch (event.type) {
-        case resolveEventType:
+        case XSTATE_PROMISE_RESOLVE:
           {
             const resolvedValue = event.data;
             return {
@@ -569,7 +550,7 @@ promiseCreator) {
               input: undefined
             };
           }
-        case rejectEventType:
+        case XSTATE_PROMISE_REJECT:
           return {
             ...state,
             status: 'error',
@@ -605,7 +586,7 @@ promiseCreator) {
           return;
         }
         system._relay(self, self, {
-          type: resolveEventType,
+          type: XSTATE_PROMISE_RESOLVE,
           data: response
         });
       }, errorData => {
@@ -613,7 +594,7 @@ promiseCreator) {
           return;
         }
         system._relay(self, self, {
-          type: rejectEventType,
+          type: XSTATE_PROMISE_REJECT,
           data: errorData
         });
       });