@webkrafters/react-eagleeye 1.1.0-alpha.5 → 1.1.0-alpha.7

package/dist/main/index.js

@@ -123,7 +123,6 @@ var ObservableContext = exports.ObservableContext = /*#__PURE__*/function (_Abst
     get: function get() {
       var stream = this.stream;
       return function (selectorMap) {
-        var strictMode = (0, _react.useRef)(true);
         var _useState = (0, _react.useState)(function () {
             return stream(selectorMap);
           }),
@@ -139,20 +138,15 @@ var ObservableContext = exports.ObservableContext = /*#__PURE__*/function (_Abst
           channel.selectorMap = selectorMap;
         }, [selectorMap]);
         (0, _react.useEffect)(function () {
-          if (!strictMode.current) {
-            return;
-          }
           channel.addListener('data-changed', function () {
             return setStore(_objectSpread(_objectSpread({}, store), {}, {
               data: channel.data
             }));
           });
-          strictMode.current = false;
           return function () {
-            channel.endStream();
-            strictMode.current = true;
+            return channel.endStream();
           };
-        }, []);
+        }, [channel]);
         return store;
       };
     }

package/dist/main/universal/index.d.ts

@@ -33,7 +33,6 @@ export type WithChildren<P extends IProviderProps<TemplateType<P>>> = P & {
 export interface ChannelEntry {
     channel: WeakRef<Channel>;
     numConnections: number;
-    useStore: () => Store;
 }
 export interface Entry {
     channels: ChsResource<Channel>;
@@ -56,7 +55,6 @@ declare class ChsResource<W extends Channel> implements IResource<W> {
         readonly isValid: boolean;
         readonly resource: W;
         readonly size: number;
-        readonly useStore: () => Store;
         dec: () => void;
         inc(): void;
     };
@@ -65,7 +63,6 @@ declare class ChsResource<W extends Channel> implements IResource<W> {
         readonly isValid: boolean;
         readonly resource: W;
         readonly size: number;
-        readonly useStore: () => Store;
         dec: () => void;
         inc(): void;
     };
@@ -83,7 +80,6 @@ declare class ObsResource<W extends AbstractObservable<TemplateType2<W>>> implem
             readonly isValid: boolean;
             readonly resource: W_1;
             readonly size: number;
-            readonly useStore: () => Store;
             dec: () => void;
             inc(): void;
         };
@@ -92,7 +88,6 @@ declare class ObsResource<W extends AbstractObservable<TemplateType2<W>>> implem
             readonly isValid: boolean;
             readonly resource: W_1;
             readonly size: number;
-            readonly useStore: () => Store;
             dec: () => void;
             inc(): void;
         };
@@ -105,7 +100,6 @@ declare class ObsResource<W extends AbstractObservable<TemplateType2<W>>> implem
             readonly isValid: boolean;
             readonly resource: W_1;
             readonly size: number;
-            readonly useStore: () => Store;
             dec: () => void;
             inc(): void;
         };
@@ -114,7 +108,6 @@ declare class ObsResource<W extends AbstractObservable<TemplateType2<W>>> implem
             readonly isValid: boolean;
             readonly resource: W_1;
             readonly size: number;
-            readonly useStore: () => Store;
             dec: () => void;
             inc(): void;
         };

package/dist/main/universal/index.js

@@ -13,6 +13,14 @@ var _ = require("..");
 var _2 = require("../../");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
 function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
@@ -20,14 +28,6 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
 function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -46,30 +46,9 @@ var ChsResource = /*#__PURE__*/function () {
   return _createClass(ChsResource, [{
     key: "acquire",
     value: function acquire(sMapHash, resource) {
-      var useStore = function useStore() {
-        var _useState = (0, _react.useState)(function () {
-            return (0, _.makeStore)(resource);
-          }),
-          _useState2 = _slicedToArray(_useState, 2),
-          store = _useState2[0],
-          setStore = _useState2[1];
-        (0, _react.useEffect)(function () {
-          var fn = function fn() {
-            return setStore(_objectSpread(_objectSpread({}, store), {}, {
-              data: resource.data
-            }));
-          };
-          resource.addListener('data-changed', fn);
-          return function () {
-            return resource.removeListener('data-changed', fn);
-          };
-        }, [resource]);
-        return store;
-      };
       this._registry[sMapHash] = {
         channel: new WeakRef(resource),
-        numConnections: 0,
-        useStore: useStore
+        numConnections: 0
       };
       this._finalizer.register(resource, sMapHash, resource);
       return this.createHandleFor(sMapHash);
@@ -93,9 +72,6 @@ var ChsResource = /*#__PURE__*/function () {
         get size() {
           return handle.isValid ? entry.numConnections : -1;
         },
-        get useStore() {
-          return entry.useStore;
-        },
         dec: function dec() {
           if (!handle.isValid) {
             return;
@@ -303,14 +279,17 @@ var EagleEyeUniversal = exports.EagleEyeUniversal = /*#__PURE__*/function () {
     value: function defineStreamHook() {
       var _this4 = this;
       return function (selectorMap) {
-        var _useState3 = (0, _react.useState)(function () {
+        var _useState = (0, _react.useState)(function () {
             return _this4._util.hashSelectorMap(selectorMap);
           }),
-          _useState4 = _slicedToArray(_useState3, 2),
-          sMapHash = _useState4[0],
-          updateSMapHash = _useState4[1];
+          _useState2 = _slicedToArray(_useState, 2),
+          sMapHash = _useState2[0],
+          updateSMapHash = _useState2[1];
+        (0, _react.useEffect)(function () {
+          return updateSMapHash(_this4._util.hashSelectorMap(selectorMap));
+        }, [selectorMap]);
         var targetId = (0, _react.use)(_this4._context);
-        var getStoreHook = (0, _react.useCallback)(function () {
+        var channel = (0, _react.useMemo)(function () {
           var ctxHandle = _this4._obs.createHandleFor(targetId);
           var streamHandle = ctxHandle.getChannelHandleAt(sMapHash);
           if (!streamHandle.isValid) {
@@ -318,19 +297,26 @@ var EagleEyeUniversal = exports.EagleEyeUniversal = /*#__PURE__*/function () {
             streamHandle = ctxHandle.getChannelHandleAt(sMapHash);
           }
           streamHandle.inc();
-          return streamHandle.useStore;
-        }, [sMapHash, selectorMap, targetId]);
-        var _useState5 = (0, _react.useState)(getStoreHook),
-          _useState6 = _slicedToArray(_useState5, 2),
-          useStore = _useState6[0],
-          updateStoreHook = _useState6[1];
-        (0, _react.useEffect)(function () {
-          return updateSMapHash(_this4._util.hashSelectorMap(selectorMap));
-        }, [selectorMap]);
+          return streamHandle.resource;
+        }, [sMapHash, targetId]);
+        var _useState3 = (0, _react.useState)(function () {
+            return (0, _.makeStore)(channel);
+          }),
+          _useState4 = _slicedToArray(_useState3, 2),
+          store = _useState4[0],
+          setStore = _useState4[1];
         (0, _react.useEffect)(function () {
-          return updateStoreHook(getStoreHook());
-        }, [sMapHash]);
-        return useStore();
+          var fn = function fn() {
+            return setStore(_objectSpread(_objectSpread({}, store), {}, {
+              data: channel.data
+            }));
+          };
+          channel.addListener('data-changed', fn);
+          return function () {
+            return channel.removeListener('data-changed', fn);
+          };
+        }, [channel]);
+        return store;
       };
     }
   }]);

package/package.json

@@ -125,7 +125,7 @@
     "test:watch": "eslint --fix && jest --updateSnapshot --watchAll"
   },
   "types": "dist/index.d.ts",
-  "version": "1.1.0-alpha.5",
+  "version": "1.1.0-alpha.7",
   "dependencies": {
     "@webkrafters/eagleeye": "^1.0.8",
     "js-sha512": "^0.9.0",