@xstate/react 4.0.0-alpha.0 → 4.0.0-alpha.2

package/dist/xstate-react.esm.js

@@ -1,8 +1,8 @@
-import { useEffect, useState, useCallback } from 'react';
-import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector';
-import { toObserver, State, InterpreterStatus, interpret, ObservableActorRef } from 'xstate';
-import { u as useConstant, _ as _slicedToArray } from './useConstant-94bfdbb5.esm.js';
+import { u as useConstant, _ as _slicedToArray } from './useConstant-0013a606.esm.js';
+import { useEffect, useState, useCallback, createContext, createElement, useContext } from 'react';
 import useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect';
+import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector';
+import { toObserver, InterpreterStatus, interpret } from 'xstate';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 function _objectWithoutPropertiesLoose(source, excluded) {
@@ -10,13 +10,11 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   var target = {};
   var sourceKeys = Object.keys(source);
   var key, i;
-
   for (i = 0; i < sourceKeys.length; i++) {
     key = sourceKeys[i];
     if (excluded.indexOf(key) >= 0) continue;
     target[key] = source[key];
   }
-
   return target;
 }
 
@@ -24,10 +22,8 @@ function _objectWithoutProperties(source, excluded) {
   if (source == null) return {};
   var target = _objectWithoutPropertiesLoose(source, excluded);
   var key, i;
-
   if (Object.getOwnPropertySymbols) {
     var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
     for (i = 0; i < sourceSymbolKeys.length; i++) {
       key = sourceSymbolKeys[i];
       if (excluded.indexOf(key) >= 0) continue;
@@ -35,37 +31,29 @@ function _objectWithoutProperties(source, excluded) {
       target[key] = source[key];
     }
   }
-
   return target;
 }
 
-var _excluded = ["context", "actors", "guards", "actions", "delays", "state"];
+var _excluded = ["actors", "guards", "actions", "delays"];
 function useIdleInterpreter(getMachine, options) {
   var machine = useConstant(function () {
     return typeof getMachine === 'function' ? getMachine() : getMachine;
   });
-
   if (process.env.NODE_ENV !== 'production' && typeof getMachine !== 'function') {
     var _useState = useState(machine),
-        _useState2 = _slicedToArray(_useState, 1),
-        initialMachine = _useState2[0];
-
+      _useState2 = _slicedToArray(_useState, 1),
+      initialMachine = _useState2[0];
     if (getMachine !== initialMachine) {
       console.warn('Machine given to `useMachine` has changed between renders. This is not supported and might lead to unexpected results.\n' + 'Please make sure that you pass the same Machine as argument each time.');
     }
   }
-
-  var context = options.context,
-      actors = options.actors,
-      guards = options.guards,
-      actions = options.actions,
-      delays = options.delays,
-      rehydratedState = options.state,
-      interpreterOptions = _objectWithoutProperties(options, _excluded);
-
+  var actors = options.actors,
+    guards = options.guards,
+    actions = options.actions,
+    delays = options.delays,
+    interpreterOptions = _objectWithoutProperties(options, _excluded);
   var service = useConstant(function () {
     var machineConfig = {
-      context: context,
       guards: guards,
       actions: actions,
       actors: actors,
@@ -73,15 +61,16 @@ function useIdleInterpreter(getMachine, options) {
     };
     var machineWithConfig = machine.provide(machineConfig);
     return interpret(machineWithConfig, interpreterOptions);
-  }); // Make sure options are kept updated when they change.
+  });
+
+  // Make sure options are kept updated when they change.
   // This mutation assignment is safe because the service instance is only used
   // in one place -- this hook's caller.
-
   useIsomorphicLayoutEffect(function () {
-    Object.assign(service.machine.options.actions, actions);
-    Object.assign(service.machine.options.guards, guards);
-    Object.assign(service.machine.options.actors, actors);
-    Object.assign(service.machine.options.delays, delays);
+    Object.assign(service.behavior.options.actions, actions);
+    Object.assign(service.behavior.options.guards, guards);
+    Object.assign(service.behavior.options.actors, actors);
+    Object.assign(service.behavior.options.delays, delays);
   }, [actions, guards, actors, delays]);
   return service;
 }
@@ -89,27 +78,25 @@ function useInterpret(getMachine) {
   for (var _len = arguments.length, _ref = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     _ref[_key - 1] = arguments[_key];
   }
-
   var _ref$ = _ref[0],
-      options = _ref$ === void 0 ? {} : _ref$,
-      observerOrListener = _ref[1];
+    options = _ref$ === void 0 ? {} : _ref$,
+    observerOrListener = _ref[1];
   var service = useIdleInterpreter(getMachine, options);
   useEffect(function () {
     if (!observerOrListener) {
       return;
     }
-
     var sub = service.subscribe(toObserver(observerOrListener));
     return function () {
       sub.unsubscribe();
     };
   }, [observerOrListener]);
   useEffect(function () {
-    var rehydratedState = options.state;
-    service.start(rehydratedState ? State.create(rehydratedState) : undefined);
+    service.start();
     return function () {
       service.stop();
       service.status = InterpreterStatus.NotStarted;
+      service._initState();
     };
   }, []);
   return service;
@@ -118,51 +105,33 @@ function useInterpret(getMachine) {
 function identity(a) {
   return a;
 }
-
 var isEqual = function isEqual(prevState, nextState) {
   return prevState === nextState || nextState.changed === false;
 };
-
-// TODO: rethink how we can do this better
-var cachedRehydratedStates = new WeakMap();
 function useMachine(getMachine) {
   for (var _len = arguments.length, _ref = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     _ref[_key - 1] = arguments[_key];
   }
-
   var _ref$ = _ref[0],
-      options = _ref$ === void 0 ? {} : _ref$;
+    options = _ref$ === void 0 ? {} : _ref$;
   // using `useIdleInterpreter` allows us to subscribe to the service *before* we start it
   // so we don't miss any notifications
   var service = useIdleInterpreter(getMachine, options);
   var getSnapshot = useCallback(function () {
-    if (service.status === InterpreterStatus.NotStarted && options.state) {
-      var cached = cachedRehydratedStates.get(options.state);
-
-      if (cached) {
-        return cached;
-      }
-
-      var created = State.create(options.state);
-      cachedRehydratedStates.set(options.state, created);
-      return created;
-    }
-
     return service.getSnapshot();
   }, [service]);
   var subscribe = useCallback(function (handleStoreChange) {
     var _service$subscribe = service.subscribe(handleStoreChange),
-        unsubscribe = _service$subscribe.unsubscribe;
-
+      unsubscribe = _service$subscribe.unsubscribe;
     return unsubscribe;
   }, [service]);
   var storeSnapshot = useSyncExternalStoreWithSelector(subscribe, getSnapshot, getSnapshot, identity, isEqual);
   useEffect(function () {
-    var rehydratedState = options.state;
-    service.start(rehydratedState ? State.create(rehydratedState) : undefined);
+    service.start();
     return function () {
       service.stop();
       service.status = InterpreterStatus.NotStarted;
+      service._initState();
     };
   }, []);
   return [storeSnapshot, service.send, service];
@@ -171,8 +140,7 @@ function useMachine(getMachine) {
 function useActor(actorRef) {
   var subscribe = useCallback(function (handleStoreChange) {
     var _actorRef$subscribe = actorRef.subscribe(handleStoreChange),
-        unsubscribe = _actorRef$subscribe.unsubscribe;
-
+      unsubscribe = _actorRef$subscribe.unsubscribe;
     return unsubscribe;
   }, [actorRef]);
   var boundGetSnapshot = useCallback(function () {
@@ -188,13 +156,11 @@ function useActor(actorRef) {
 function defaultCompare(a, b) {
   return a === b;
 }
-
 function useSelector(actor, selector) {
   var compare = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultCompare;
   var subscribe = useCallback(function (handleStoreChange) {
     var _actor$subscribe = actor.subscribe(handleStoreChange),
-        unsubscribe = _actor$subscribe.unsubscribe;
-
+      unsubscribe = _actor$subscribe.unsubscribe;
     return unsubscribe;
   }, [actor]);
   var boundGetSnapshot = useCallback(function () {
@@ -211,19 +177,145 @@ function useSelector(actor, selector) {
  * @param behavior The actor behavior to spawn
  * @returns An ActorRef with the specified `behavior`
  */
-
 function useSpawn(behavior) {
   var actorRef = useConstant(function () {
     // TODO: figure out what to do about the name argument
-    return new ObservableActorRef(behavior, '');
+    return interpret(behavior);
   });
   useEffect(function () {
-    actorRef.start();
+    var _actorRef$start;
+    (_actorRef$start = actorRef.start) === null || _actorRef$start === void 0 ? void 0 : _actorRef$start.call(actorRef);
     return function () {
-      actorRef.stop();
+      var _stop, _ref;
+      (_stop = (_ref = actorRef).stop) === null || _stop === void 0 ? void 0 : _stop.call(_ref);
     };
   }, []);
   return actorRef;
 }
 
-export { useActor, useInterpret, useMachine, useSelector, useSpawn };
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
+}
+
+// From https://github.com/reduxjs/react-redux/blob/720f0ba79236cdc3e1115f4ef9a7760a21784b48/src/utils/shallowEqual.ts
+function is(x, y) {
+  if (x === y) {
+    return x !== 0 || y !== 0 || 1 / x === 1 / y;
+  } else {
+    return x !== x && y !== y;
+  }
+}
+function shallowEqual(objA, objB) {
+  if (is(objA, objB)) return true;
+  if (_typeof(objA) !== 'object' || objA === null || _typeof(objB) !== 'object' || objB === null) {
+    return false;
+  }
+  var keysA = Object.keys(objA);
+  var keysB = Object.keys(objB);
+  if (keysA.length !== keysB.length) return false;
+  for (var i = 0; i < keysA.length; i++) {
+    if (!Object.prototype.hasOwnProperty.call(objB, keysA[i]) || !is(objA[keysA[i]], objB[keysA[i]])) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
+
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+  return keys;
+}
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
+}
+
+function createActorContext(machine, interpreterOptions, observerOrListener) {
+  var ReactContext = /*#__PURE__*/createContext(null);
+  var OriginalProvider = ReactContext.Provider;
+  function Provider(_ref) {
+    var children = _ref.children,
+      _ref$machine = _ref.machine,
+      providedMachine = _ref$machine === void 0 ? machine : _ref$machine,
+      options = _ref.options;
+    var actor = useInterpret(providedMachine, _objectSpread2(_objectSpread2({}, interpreterOptions), options), observerOrListener);
+    return /*#__PURE__*/createElement(OriginalProvider, {
+      value: actor,
+      children: children
+    });
+  }
+  Provider.displayName = "ActorProvider(".concat(machine.id, ")");
+  function useContext$1() {
+    var actor = useContext(ReactContext);
+    if (!actor) {
+      throw new Error("You used a hook from \"".concat(Provider.displayName, "\" but it's not inside a <").concat(Provider.displayName, "> component."));
+    }
+    return actor;
+  }
+  function useActor$1() {
+    var actor = useContext$1();
+    return useActor(actor);
+  }
+  function useSelector$1(selector, compare) {
+    var actor = useContext$1();
+    return useSelector(actor, selector, compare);
+  }
+  return {
+    Provider: Provider,
+    useActorRef: useContext$1,
+    useActor: useActor$1,
+    useSelector: useSelector$1
+  };
+}
+
+export { createActorContext, shallowEqual, useActor, useInterpret, useMachine, useSelector, useSpawn };

package/fsm/dist/xstate-react-fsm.cjs.dev.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var useConstant = require('../../dist/useConstant-ff65b597.cjs.dev.js');
+var fsm = require('@xstate/fsm');
 var React = require('react');
-var withSelector = require('use-sync-external-store/shim/with-selector');
-var useConstant = require('../../dist/useConstant-644f0e11.cjs.dev.js');
 var useIsomorphicLayoutEffect = require('use-isomorphic-layout-effect');
-var fsm = require('@xstate/fsm');
+var withSelector = require('use-sync-external-store/shim/with-selector');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -15,7 +15,6 @@ var useIsomorphicLayoutEffect__default = /*#__PURE__*/_interopDefault(useIsomorp
 function identity(a) {
   return a;
 }
-
 var getServiceState = function getServiceState(service) {
   var currentValue;
   service.subscribe(function (state) {
@@ -23,42 +22,35 @@ var getServiceState = function getServiceState(service) {
   }).unsubscribe();
   return currentValue;
 };
-
 function useMachine(stateMachine, options) {
   var persistedStateRef = React.useRef();
-
   if (process.env.NODE_ENV !== 'production') {
     var _useState = React.useState(stateMachine),
-        _useState2 = useConstant._slicedToArray(_useState, 1),
-        initialMachine = _useState2[0];
-
+      _useState2 = useConstant._slicedToArray(_useState, 1),
+      initialMachine = _useState2[0];
     if (stateMachine !== initialMachine) {
       console.warn('Machine given to `useMachine` has changed between renders. This is not supported and might lead to unexpected results.\n' + 'Please make sure that you pass the same Machine as argument each time.');
     }
   }
-
   var _useConstant = useConstant.useConstant(function () {
-    var queue = [];
-    var service = fsm.interpret(fsm.createMachine(stateMachine.config, options ? options : stateMachine._options));
-    var send = service.send;
-
-    service.send = function (event) {
-      if (service.status === fsm.InterpreterStatus.NotStarted) {
-        queue.push(event);
-        return;
-      }
-
-      send(event);
-      persistedStateRef.current = service.state;
-    };
-
-    return [service, queue];
-  }),
-      _useConstant2 = useConstant._slicedToArray(_useConstant, 2),
-      service = _useConstant2[0],
-      queue = _useConstant2[1]; // TODO: consider using `useInsertionEffect` if available
-
-
+      var queue = [];
+      var service = fsm.interpret(fsm.createMachine(stateMachine.config, options ? options : stateMachine._options));
+      var send = service.send;
+      service.send = function (event) {
+        if (service.status === fsm.InterpreterStatus.NotStarted) {
+          queue.push(event);
+          return;
+        }
+        send(event);
+        persistedStateRef.current = service.state;
+      };
+      return [service, queue];
+    }),
+    _useConstant2 = useConstant._slicedToArray(_useConstant, 2),
+    service = _useConstant2[0],
+    queue = _useConstant2[1];
+
+  // TODO: consider using `useInsertionEffect` if available
   useIsomorphicLayoutEffect__default['default'](function () {
     if (options) {
       service._machine._options = options;
@@ -75,19 +67,16 @@ function useMachine(stateMachine, options) {
   }, []);
   return useServiceResult;
 }
-
 var isEqual = function isEqual(_prevState, nextState) {
   return nextState.changed === false;
 };
-
 function useService(service) {
   var getSnapshot = React.useCallback(function () {
     return getServiceState(service);
   }, [service]);
   var subscribe = React.useCallback(function (handleStoreChange) {
     var _service$subscribe = service.subscribe(handleStoreChange),
-        unsubscribe = _service$subscribe.unsubscribe;
-
+      unsubscribe = _service$subscribe.unsubscribe;
     return unsubscribe;
   }, [service]);
   var storeSnapshot = withSelector.useSyncExternalStoreWithSelector(subscribe, getSnapshot, getSnapshot, identity, isEqual);

package/fsm/dist/xstate-react-fsm.cjs.prod.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var fsm = require('@xstate/fsm');
 var React = require('react');
-var withSelector = require('use-sync-external-store/shim/with-selector');
 var useIsomorphicLayoutEffect = require('use-isomorphic-layout-effect');
-var useConstant = require('../../dist/useConstant-eeb49d3f.cjs.prod.js');
-var fsm = require('@xstate/fsm');
+var withSelector = require('use-sync-external-store/shim/with-selector');
+var useConstant = require('../../dist/useConstant-c09b427a.cjs.prod.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -17,37 +17,36 @@ function _arrayWithHoles(arr) {
 }
 
 function _iterableToArrayLimit(arr, i) {
-  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
-  var _arr = [];
-  var _n = true;
-  var _d = false;
-  var _e = undefined;
-
-  try {
-    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
-      _arr.push(_s.value);
-
-      if (i && _arr.length === i) break;
-    }
-  } catch (err) {
-    _d = true;
-    _e = err;
-  } finally {
+  var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
+  if (null != _i) {
+    var _s,
+      _e,
+      _x,
+      _r,
+      _arr = [],
+      _n = !0,
+      _d = !1;
     try {
-      if (!_n && _i["return"] != null) _i["return"]();
+      if (_x = (_i = _i.call(arr)).next, 0 === i) {
+        if (Object(_i) !== _i) return;
+        _n = !1;
+      } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0);
+    } catch (err) {
+      _d = !0, _e = err;
     } finally {
-      if (_d) throw _e;
+      try {
+        if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return;
+      } finally {
+        if (_d) throw _e;
+      }
     }
+    return _arr;
   }
-
-  return _arr;
 }
 
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
-
   for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
   return arr2;
 }
 
@@ -71,7 +70,6 @@ function _slicedToArray(arr, i) {
 function identity(a) {
   return a;
 }
-
 var getServiceState = function getServiceState(service) {
   var currentValue;
   service.subscribe(function (state) {
@@ -79,32 +77,27 @@ var getServiceState = function getServiceState(service) {
   }).unsubscribe();
   return currentValue;
 };
-
 function useMachine(stateMachine, options) {
   var persistedStateRef = React.useRef();
-
   var _useConstant = useConstant.useConstant(function () {
-    var queue = [];
-    var service = fsm.interpret(fsm.createMachine(stateMachine.config, options ? options : stateMachine._options));
-    var send = service.send;
-
-    service.send = function (event) {
-      if (service.status === fsm.InterpreterStatus.NotStarted) {
-        queue.push(event);
-        return;
-      }
-
-      send(event);
-      persistedStateRef.current = service.state;
-    };
-
-    return [service, queue];
-  }),
-      _useConstant2 = _slicedToArray(_useConstant, 2),
-      service = _useConstant2[0],
-      queue = _useConstant2[1]; // TODO: consider using `useInsertionEffect` if available
-
-
+      var queue = [];
+      var service = fsm.interpret(fsm.createMachine(stateMachine.config, options ? options : stateMachine._options));
+      var send = service.send;
+      service.send = function (event) {
+        if (service.status === fsm.InterpreterStatus.NotStarted) {
+          queue.push(event);
+          return;
+        }
+        send(event);
+        persistedStateRef.current = service.state;
+      };
+      return [service, queue];
+    }),
+    _useConstant2 = _slicedToArray(_useConstant, 2),
+    service = _useConstant2[0],
+    queue = _useConstant2[1];
+
+  // TODO: consider using `useInsertionEffect` if available
   useIsomorphicLayoutEffect__default['default'](function () {
     if (options) {
       service._machine._options = options;
@@ -121,19 +114,16 @@ function useMachine(stateMachine, options) {
   }, []);
   return useServiceResult;
 }
-
 var isEqual = function isEqual(_prevState, nextState) {
   return nextState.changed === false;
 };
-
 function useService(service) {
   var getSnapshot = React.useCallback(function () {
     return getServiceState(service);
   }, [service]);
   var subscribe = React.useCallback(function (handleStoreChange) {
     var _service$subscribe = service.subscribe(handleStoreChange),
-        unsubscribe = _service$subscribe.unsubscribe;
-
+      unsubscribe = _service$subscribe.unsubscribe;
     return unsubscribe;
   }, [service]);
   var storeSnapshot = withSelector.useSyncExternalStoreWithSelector(subscribe, getSnapshot, getSnapshot, identity, isEqual);