@webkrafters/react-eagleeye 1.1.0-alpha.17 → 1.1.0-alpha.19

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

@@ -40,6 +40,7 @@ interface Entry {
 }
 interface Handle<W extends WeakKey> {
     readonly resource: W;
+    release(force: boolean): void;
 }
 declare class ObserverHandle<W extends AbstractObservable<ObservableTemplate<W>>> implements Handle<W> {
     private _wObs;
@@ -63,6 +64,7 @@ declare class StreamerHandle<W extends Channel> implements Handle<W> {
     get size(): number;
     dec(): void;
     inc(): void;
+    release(force?: boolean): void;
 }
 interface IResource<W extends WeakKey> {
     acquire(desc: string, resource: W): Handle<W>;

package/dist/main/universe/index.js

@@ -123,27 +123,24 @@ var StreamerHandle = /*#__PURE__*/function () {
   }, {
     key: "dec",
     value: function dec() {
-      if (!this.isValid) {
-        return;
-      }
-      this._entry.numConnections--;
-      if (this.size) {
+      this.size > 0 && this._entry.numConnections--;
+    }
+  }, {
+    key: "inc",
+    value: function inc() {
+      this.isValid && this._entry.numConnections++;
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      if (!force && this.size > 0) {
         return;
       }
       this.resource.endStream();
       this._chs.finalizer.unregister(this.resource);
-      var channel = this._entry.channel;
       this._entry.channel = null;
       this._chs.finalize(this._sMapHash);
-      setTimeout(function () {
-        var _channel$deref;
-        return (_channel$deref = channel.deref()) === null || _channel$deref === void 0 ? void 0 : _channel$deref.endStream();
-      }, 0);
-    }
-  }, {
-    key: "inc",
-    value: function inc() {
-      this.isValid && this._entry.numConnections++;
     }
   }]);
 }();
@@ -419,16 +416,18 @@ var ObservableUniverse = exports.ObservableUniverse = /*#__PURE__*/function () {
             ctxHandle.addChannelAt(sMapHash, ctxHandle.resource.stream(selectorMap));
             streamHandle = ctxHandle.getChannelHandleAt(sMapHash);
           }
-          streamHandle.inc();
           return streamHandle;
         }, [sMapHash, targetId]);
         var mounted = (0, _react.useRef)(false);
-        var _useState3 = (0, _react.useState)(function () {
+        var _useState3 = (0, _react.useState)(getCurrentUri),
+          _useState4 = _slicedToArray(_useState3, 1),
+          currentUri = _useState4[0];
+        var _useState5 = (0, _react.useState)(function () {
             return (0, _.makeStore)(handle.resource);
           }),
-          _useState4 = _slicedToArray(_useState3, 2),
-          store = _useState4[0],
-          setStore = _useState4[1];
+          _useState6 = _slicedToArray(_useState5, 2),
+          store = _useState6[0],
+          setStore = _useState6[1];
         (0, _react.useEffect)(function () {
           var channel = handle.resource;
           if (mounted.current) {
@@ -442,9 +441,13 @@ var ObservableUniverse = exports.ObservableUniverse = /*#__PURE__*/function () {
             }));
           };
           channel.addListener('data-changed', fn);
+          handle.inc();
           return function () {
             channel.removeListener('data-changed', fn);
             handle.dec();
+            var uri = getCurrentUri();
+            currentUri === uri && handle.release();
+            currentUri = uri;
           };
         }, [handle.resource]);
         return store;
@@ -452,6 +455,10 @@ var ObservableUniverse = exports.ObservableUniverse = /*#__PURE__*/function () {
     }
   }]);
 }();
+function getCurrentUri() {
+  var _globalThis$location;
+  return (_globalThis$location = globalThis.location) === null || _globalThis$location === void 0 ? void 0 : _globalThis$location.pathname;
+}
 var Utility = exports.Utility = /*#__PURE__*/function () {
   function Utility(context) {
     _classCallCheck(this, Utility);

package/package.json

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