@effect-rx/rx-react 0.1.27 → 0.1.28

package/index.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @since 1.0.0
+ */
 import * as Registry from "@effect-rx/rx/Registry";
 import * as Result from "@effect-rx/rx/Result";
 import * as Rx from "@effect-rx/rx/Rx";

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,KAAK,KAAK,MAAM,qBAAqB,CAAA;AAGjD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAA;AAE5C;;;GAGG;AACH,eAAO,MAAM,eAAe,kCAA0D,CAAA;AA8BtF;;;GAGG;AACH,eAAO,MAAM,UAAU,wBAItB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,6DAA4D,IAUhF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,wCAAuC,MAAM,IAKrE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,8FAA6F,IAAI,CAIvG,CAAA;AA8CZ;;;GAGG;AACH,eAAO,MAAM,aAAa,mDAEd;IAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE;wBAE7B,OAAO;;CA2B5B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,mDAErB;IAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE;wBAE7B,OAAO;;CAW5B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,qCAIpB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,KAAK,KAAK,MAAM,qBAAqB,CAAA;AAGjD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,qBAAqB,CAAA;AAE5C;;;GAGG;AACH,eAAO,MAAM,eAAe,kCAA0D,CAAA;AA8BtF;;;GAGG;AACH,eAAO,MAAM,UAAU,wBAItB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,6DAA4D,IAUhF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,wCAAuC,MAAM,IAKrE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,8FAA6F,IAAI,CAIvG,CAAA;AA2CZ;;;GAGG;AACH,eAAO,MAAM,aAAa,mDAEd;IAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE;wBAE7B,OAAO;;CAuB5B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,mDAErB;IAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE;wBAE7B,OAAO;;CAW5B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,qCAIpB,CAAA"}

package/index.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useSetRx = exports.useRxValue = exports.useRxSuspenseSuccess = exports.useRxSuspense = exports.useRxRef = exports.useRx = exports.useRefreshRx = exports.RxRef = exports.Rx = exports.Result = exports.RegistryContext = exports.Registry = void 0;
-var _finalizationRegistry = /*#__PURE__*/require("@effect-rx/rx/internal/finalizationRegistry");
 var Registry = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect-rx/rx/Registry"));
 var Registry_1 = Registry;
 exports.Registry = Registry;
@@ -92,10 +91,6 @@ const useRefreshRx = rx => {
 exports.useRefreshRx = useRefreshRx;
 const useRx = rx => [useRxValue(rx), useSetRx(rx)];
 exports.useRx = useRx;
-const suspenseCache = /*#__PURE__*/(0, _GlobalValue.globalValue)("@effect-rx/rx-react/suspenseCache", () => new WeakMap());
-const suspenseRegistry = /*#__PURE__*/new _finalizationRegistry.UniversalFinalizationRegistry(unmount => {
-  unmount();
-});
 const suspenseRx = /*#__PURE__*/Rx.family(rx => Rx.readable(get => {
   const result = get(rx);
   const value = Result.noWaiting(result);
@@ -126,6 +121,7 @@ const suspenseRxWaiting = /*#__PURE__*/Rx.family(rx => Rx.readable(get => {
     value: result
   };
 }));
+const suspenseMounts = /*#__PURE__*/(0, _GlobalValue.globalValue)("@effect-rx/rx-react/suspenseMounts", () => new Set());
 /**
  * @since 1.0.0
  * @category hooks
@@ -136,19 +132,15 @@ const useRxSuspense = (rx, options) => {
   const store = makeStore(registry, resultRx);
   const result = React.useSyncExternalStore(store.subscribe, store.snapshot);
   if (result._tag === "Suspended") {
-    if (!suspenseCache.has(resultRx)) {
+    if (!suspenseMounts.has(resultRx)) {
+      suspenseMounts.add(resultRx);
       const unmount = registry.mount(resultRx);
-      suspenseCache.set(resultRx, unmount);
-      suspenseRegistry.register(result.promise, unmount, resultRx);
+      result.promise.then(function () {
+        unmount();
+        suspenseMounts.delete(resultRx);
+      });
     }
     throw result.promise;
-  } else if (suspenseCache.has(resultRx)) {
-    const unmount = suspenseCache.get(resultRx);
-    if (unmount) {
-      suspenseCache.delete(resultRx);
-      suspenseRegistry.unregister(resultRx);
-      unmount();
-    }
   }
   return result;
 };

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_finalizationRegistry","require","Registry","_interopRequireWildcard","Registry_1","exports","Result","Result_1","Rx","Rx_1","_GlobalValue","Cause","React","RxRef","RxRef_1","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RegistryContext","createContext","make","storeRegistry","globalValue","makeStore","registry","rx","stores","store","newStore","subscribe","f","snapshot","useRxValue","useContext","useSyncExternalStore","useSetRx","useCallback","value","useRefreshRx","refresh","useRx","suspenseCache","suspenseRegistry","UniversalFinalizationRegistry","unmount","suspenseRx","family","readable","result","noWaiting","_tag","promise","Promise","resolve","addFinalizer","isWaiting","suspenseRxWaiting","useRxSuspense","options","resultRx","useMemo","suspendOnWaiting","mount","register","delete","unregister","useRxSuspenseSuccess","squash","cause","useRxRef","ref","setValue","useState","useEffect"],"sources":["./src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;AAGA,IAAAA,qBAAA,gBAAAC,OAAA;AACA,IAAAC,QAAA,gBAAAC,uBAAA,eAAAF,OAAA;AAAkD,IAAAG,UAAA,GAAAF,QAAA;AAAAG,OAAA,CAAAH,QAAA,GAAAA,QAAA;AAClD,IAAAI,MAAA,gBAAAH,uBAAA,eAAAF,OAAA;AAA8C,IAAAM,QAAA,GAAAD,MAAA;AAAAD,OAAA,CAAAC,MAAA,GAAAA,MAAA;AAC9C,IAAAE,EAAA,gBAAAL,uBAAA,eAAAF,OAAA;AAAsC,IAAAQ,IAAA,GAAAD,EAAA;AAAAH,OAAA,CAAAG,EAAA,GAAAA,EAAA;AAEtC,IAAAE,YAAA,gBAAAT,OAAA;AACA,IAAAU,KAAA,gBAAAR,uBAAA,eAAAF,OAAA;AACA,IAAAW,KAAA,gBAAAT,uBAAA,eAAAF,OAAA;;AAK4CI,OAAA,CAAAQ,KAAA,GAAAC,OAAA;AAAA,SAAAC,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAb,wBAAAiB,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAf5C;;;;AAiBA;;;;AAIO,MAAMW,eAAe,gBAAGzB,KAAK,CAAC0B,aAAa,eAAoBpC,QAAQ,CAACqC,IAAI,EAAE,CAAC;AAAAlC,OAAA,CAAAgC,eAAA,GAAAA,eAAA;AAOtF,MAAMG,aAAa,gBAAG,IAAAC,wBAAW,EAC/B,mCAAmC,EACnC,MAAM,IAAIxB,OAAO,EAAwD,CAC1E;AAED,SAASyB,SAASA,CAAIC,QAA2B,EAAEC,EAAY;EAC7D,MAAMC,MAAM,GAAGL,aAAa,CAACf,GAAG,CAACkB,QAAQ,CAAC,IAAIH,aAAa,CAACJ,GAAG,CAACO,QAAQ,EAAE,IAAI1B,OAAO,EAAE,CAAC,CAACQ,GAAG,CAACkB,QAAQ,CAAE;EACvG,MAAMG,KAAK,GAAGD,MAAM,CAACpB,GAAG,CAACmB,EAAE,CAAC;EAC5B,IAAIE,KAAK,EAAE;IACT,OAAOA,KAAK;;EAEd,MAAMC,QAAQ,GAAe;IAC3BC,SAASA,CAACC,CAAC;MACT,OAAON,QAAQ,CAACK,SAAS,CAACJ,EAAE,EAAEK,CAAC,CAAC;IAClC,CAAC;IACDC,QAAQA,CAAA;MACN,OAAOP,QAAQ,CAAClB,GAAG,CAACmB,EAAE,CAAC;IACzB;GACD;EACDC,MAAM,CAACT,GAAG,CAACQ,EAAE,EAAEG,QAAQ,CAAC;EACxB,OAAOA,QAAQ;AACjB;AAEA;;;;AAIO,MAAMI,UAAU,GAAOP,EAAY,IAAO;EAC/C,MAAMD,QAAQ,GAAG/B,KAAK,CAACwC,UAAU,CAACf,eAAe,CAAC;EAClD,MAAMS,KAAK,GAAGJ,SAAS,CAACC,QAAQ,EAAEC,EAAE,CAAC;EACrC,OAAOhC,KAAK,CAACyC,oBAAoB,CAACP,KAAK,CAACE,SAAS,EAAEF,KAAK,CAACI,QAAQ,CAAC;AACpE,CAAC;AAED;;;;AAAA7C,OAAA,CAAA8C,UAAA,GAAAA,UAAA;AAIO,MAAMG,QAAQ,GAAUV,EAAqB,IAAoC;EACtF,MAAMD,QAAQ,GAAG/B,KAAK,CAACwC,UAAU,CAACf,eAAe,CAAC;EAClD,OAAOzB,KAAK,CAAC2C,WAAW,CAAEC,KAAK,IAAI;IACjC,IAAI,OAAOA,KAAK,KAAK,UAAU,EAAE;MAC/Bb,QAAQ,CAACP,GAAG,CAACQ,EAAE,EAAGY,KAAa,CAACb,QAAQ,CAAClB,GAAG,CAACmB,EAAE,CAAC,CAAC,CAAC;MAClD;KACD,MAAM;MACLD,QAAQ,CAACP,GAAG,CAACQ,EAAE,EAAEY,KAAK,CAAC;;EAE3B,CAAC,EAAE,CAACb,QAAQ,EAAEC,EAAE,CAAC,CAAC;AACpB,CAAC;AAED;;;;AAAAvC,OAAA,CAAAiD,QAAA,GAAAA,QAAA;AAIO,MAAMG,YAAY,GAAOb,EAA6B,IAAgB;EAC3E,MAAMD,QAAQ,GAAG/B,KAAK,CAACwC,UAAU,CAACf,eAAe,CAAC;EAClD,OAAOzB,KAAK,CAAC2C,WAAW,CAAC,MAAK;IAC5BZ,QAAQ,CAACe,OAAO,CAACd,EAAE,CAAC;EACtB,CAAC,EAAE,CAACD,QAAQ,EAAEC,EAAE,CAAC,CAAC;AACpB,CAAC;AAED;;;;AAAAvC,OAAA,CAAAoD,YAAA,GAAAA,YAAA;AAIO,MAAME,KAAK,GAAUf,EAAqB,IAC/C,CACEO,UAAU,CAACP,EAAE,CAAC,EACdU,QAAQ,CAACV,EAAE,CAAC,CACJ;AAAAvC,OAAA,CAAAsD,KAAA,GAAAA,KAAA;AAaZ,MAAMC,aAAa,gBAAG,IAAAnB,wBAAW,EAAC,mCAAmC,EAAE,MAAM,IAAIxB,OAAO,EAA0B,CAAC;AACnH,MAAM4C,gBAAgB,gBAAG,IAAIC,mDAA6B,CAAEC,OAAmB,IAAI;EACjFA,OAAO,EAAE;AACX,CAAC,CAAC;AAEF,MAAMC,UAAU,gBAAGxD,EAAE,CAACyD,MAAM,CAAErB,EAAkC,IAC9DpC,EAAE,CAAC0D,QAAQ,CAAEzC,GAAG,IAA8B;EAC5C,MAAM0C,MAAM,GAAG1C,GAAG,CAACmB,EAAE,CAAC;EACtB,MAAMY,KAAK,GAAGlD,MAAM,CAAC8D,SAAS,CAACD,MAAM,CAAC;EACtC,IAAIX,KAAK,CAACa,IAAI,KAAK,SAAS,EAAE;IAC5B,OAAO;MACLA,IAAI,EAAE,WAAW;MACjBC,OAAO,EAAE,IAAIC,OAAO,CAAQC,OAAO,IAAK/C,GAAG,CAACgD,YAAY,CAACD,OAAO,CAAC;KACzD;;EAEZ,MAAME,SAAS,GAAGpE,MAAM,CAACoE,SAAS,CAACP,MAAM,CAAC;EAC1C,OAAO;IAAEE,IAAI,EAAE,OAAO;IAAEK,SAAS;IAAElB;EAAK,CAAW;AACrD,CAAC,CAAC,CACH;AAED,MAAMmB,iBAAiB,gBAAGnE,EAAE,CAACyD,MAAM,CAAErB,EAAkC,IACrEpC,EAAE,CAAC0D,QAAQ,CAAEzC,GAAG,IAA8B;EAC5C,MAAM0C,MAAM,GAAG1C,GAAG,CAACmB,EAAE,CAAC;EACtB,IAAIuB,MAAM,CAACE,IAAI,KAAK,SAAS,IAAIF,MAAM,CAACE,IAAI,KAAK,SAAS,EAAE;IAC1D,OAAO;MACLA,IAAI,EAAE,WAAW;MACjBC,OAAO,EAAE,IAAIC,OAAO,CAAQC,OAAO,IAAK/C,GAAG,CAACgD,YAAY,CAACD,OAAO,CAAC;KACzD;;EAEZ,OAAO;IAAEH,IAAI,EAAE,OAAO;IAAEK,SAAS,EAAE,KAAK;IAAElB,KAAK,EAAEW;EAAM,CAAW;AACpE,CAAC,CAAC,CACH;AAED;;;;AAIO,MAAMS,aAAa,GAAGA,CAC3BhC,EAA8B,EAC9BiC,OAAiD,KAI/C;EACF,MAAMlC,QAAQ,GAAG/B,KAAK,CAACwC,UAAU,CAACf,eAAe,CAAC;EAClD,MAAMyC,QAAQ,GAAGlE,KAAK,CAACmE,OAAO,CAC5B,MAAOF,OAAO,EAAEG,gBAAgB,GAAGL,iBAAiB,CAAC/B,EAAE,CAAC,GAAGoB,UAAU,CAACpB,EAAE,CAAE,EAC1E,CAACiC,OAAO,EAAEG,gBAAgB,EAAEpC,EAAE,CAAC,CAChC;EACD,MAAME,KAAK,GAAGJ,SAAS,CAACC,QAAQ,EAAEmC,QAAQ,CAAC;EAC3C,MAAMX,MAAM,GAAGvD,KAAK,CAACyC,oBAAoB,CAACP,KAAK,CAACE,SAAS,EAAEF,KAAK,CAACI,QAAQ,CAAC;EAC1E,IAAIiB,MAAM,CAACE,IAAI,KAAK,WAAW,EAAE;IAC/B,IAAI,CAACT,aAAa,CAACpC,GAAG,CAACsD,QAAQ,CAAC,EAAE;MAChC,MAAMf,OAAO,GAAGpB,QAAQ,CAACsC,KAAK,CAACH,QAAQ,CAAC;MACxClB,aAAa,CAACxB,GAAG,CAAC0C,QAAQ,EAAEf,OAAO,CAAC;MACpCF,gBAAgB,CAACqB,QAAQ,CAACf,MAAM,CAACG,OAAO,EAAEP,OAAO,EAAEe,QAAQ,CAAC;;IAE9D,MAAMX,MAAM,CAACG,OAAO;GACrB,MAAM,IAAIV,aAAa,CAACpC,GAAG,CAACsD,QAAQ,CAAC,EAAE;IACtC,MAAMf,OAAO,GAAGH,aAAa,CAACnC,GAAG,CAACqD,QAAQ,CAAC;IAC3C,IAAIf,OAAO,EAAE;MACXH,aAAa,CAACuB,MAAM,CAACL,QAAQ,CAAC;MAC9BjB,gBAAgB,CAACuB,UAAU,CAACN,QAAQ,CAAC;MACrCf,OAAO,EAAE;;;EAIb,OAAOI,MAAM;AACf,CAAC;AAED;;;;AAAA9D,OAAA,CAAAuE,aAAA,GAAAA,aAAA;AAIO,MAAMS,oBAAoB,GAAGA,CAClCzC,EAA8B,EAC9BiC,OAAiD,KAI/C;EACF,MAAMV,MAAM,GAAGS,aAAa,CAAChC,EAAE,EAAEiC,OAAO,CAAC;EACzC,IAAIV,MAAM,CAACX,KAAK,CAACa,IAAI,KAAK,SAAS,EAAE;IACnC,MAAM1D,KAAK,CAAC2E,MAAM,CAACnB,MAAM,CAACX,KAAK,CAAC+B,KAAK,CAAC;;EAExC,OAAO;IACLb,SAAS,EAAEP,MAAM,CAACO,SAAS;IAC3BlB,KAAK,EAAEW,MAAM,CAACX,KAAK,CAACA;GACrB;AACH,CAAC;AAED;;;;AAAAnD,OAAA,CAAAgF,oBAAA,GAAAA,oBAAA;AAIO,MAAMG,QAAQ,GAAOC,GAAyB,IAAO;EAC1D,MAAM,GAAGC,QAAQ,CAAC,GAAG9E,KAAK,CAAC+E,QAAQ,CAACF,GAAG,CAACjC,KAAK,CAAC;EAC9C5C,KAAK,CAACgF,SAAS,CAAC,MAAMH,GAAG,CAACzC,SAAS,CAAC0C,QAAQ,CAAC,EAAE,CAACD,GAAG,CAAC,CAAC;EACrD,OAAOA,GAAG,CAACjC,KAAK;AAClB,CAAC;AAAAnD,OAAA,CAAAmF,QAAA,GAAAA,QAAA"}
+{"version":3,"file":"index.js","names":["Registry","_interopRequireWildcard","require","Registry_1","exports","Result","Result_1","Rx","Rx_1","_GlobalValue","Cause","React","RxRef","RxRef_1","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RegistryContext","createContext","make","storeRegistry","globalValue","makeStore","registry","rx","stores","store","newStore","subscribe","f","snapshot","useRxValue","useContext","useSyncExternalStore","useSetRx","useCallback","value","useRefreshRx","refresh","useRx","suspenseRx","family","readable","result","noWaiting","_tag","promise","Promise","resolve","addFinalizer","isWaiting","suspenseRxWaiting","suspenseMounts","Set","useRxSuspense","options","resultRx","useMemo","suspendOnWaiting","add","unmount","mount","then","delete","useRxSuspenseSuccess","squash","cause","useRxRef","ref","setValue","useState","useEffect"],"sources":["./src/index.ts"],"sourcesContent":[null],"mappings":"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"}

package/mjs/index.mjs

@@ -1,7 +1,6 @@
 /**
  * @since 1.0.0
  */
-import { UniversalFinalizationRegistry } from "@effect-rx/rx/internal/finalizationRegistry";
 import * as Registry from "@effect-rx/rx/Registry";
 import * as Result from "@effect-rx/rx/Result";
 import * as Rx from "@effect-rx/rx/Rx";
@@ -78,10 +77,6 @@ export const useRefreshRx = rx => {
  * @category hooks
  */
 export const useRx = rx => [useRxValue(rx), useSetRx(rx)];
-const suspenseCache = /*#__PURE__*/globalValue("@effect-rx/rx-react/suspenseCache", () => new WeakMap());
-const suspenseRegistry = /*#__PURE__*/new UniversalFinalizationRegistry(unmount => {
-  unmount();
-});
 const suspenseRx = /*#__PURE__*/Rx.family(rx => Rx.readable(get => {
   const result = get(rx);
   const value = Result.noWaiting(result);
@@ -112,6 +107,7 @@ const suspenseRxWaiting = /*#__PURE__*/Rx.family(rx => Rx.readable(get => {
     value: result
   };
 }));
+const suspenseMounts = /*#__PURE__*/globalValue("@effect-rx/rx-react/suspenseMounts", () => new Set());
 /**
  * @since 1.0.0
  * @category hooks
@@ -122,19 +118,15 @@ export const useRxSuspense = (rx, options) => {
   const store = makeStore(registry, resultRx);
   const result = React.useSyncExternalStore(store.subscribe, store.snapshot);
   if (result._tag === "Suspended") {
-    if (!suspenseCache.has(resultRx)) {
+    if (!suspenseMounts.has(resultRx)) {
+      suspenseMounts.add(resultRx);
       const unmount = registry.mount(resultRx);
-      suspenseCache.set(resultRx, unmount);
-      suspenseRegistry.register(result.promise, unmount, resultRx);
+      result.promise.then(function () {
+        unmount();
+        suspenseMounts.delete(resultRx);
+      });
     }
     throw result.promise;
-  } else if (suspenseCache.has(resultRx)) {
-    const unmount = suspenseCache.get(resultRx);
-    if (unmount) {
-      suspenseCache.delete(resultRx);
-      suspenseRegistry.unregister(resultRx);
-      unmount();
-    }
   }
   return result;
 };

package/mjs/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["UniversalFinalizationRegistry","Registry","Result","Rx","globalValue","Cause","React","RxRef","RegistryContext","createContext","make","storeRegistry","WeakMap","makeStore","registry","rx","stores","get","set","store","newStore","subscribe","f","snapshot","useRxValue","useContext","useSyncExternalStore","useSetRx","useCallback","value","useRefreshRx","refresh","useRx","suspenseCache","suspenseRegistry","unmount","suspenseRx","family","readable","result","noWaiting","_tag","promise","Promise","resolve","addFinalizer","isWaiting","suspenseRxWaiting","useRxSuspense","options","resultRx","useMemo","suspendOnWaiting","has","mount","register","delete","unregister","useRxSuspenseSuccess","squash","cause","useRxRef","ref","setValue","useState","useEffect"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"index.mjs","names":["Registry","Result","Rx","globalValue","Cause","React","RxRef","RegistryContext","createContext","make","storeRegistry","WeakMap","makeStore","registry","rx","stores","get","set","store","newStore","subscribe","f","snapshot","useRxValue","useContext","useSyncExternalStore","useSetRx","useCallback","value","useRefreshRx","refresh","useRx","suspenseRx","family","readable","result","noWaiting","_tag","promise","Promise","resolve","addFinalizer","isWaiting","suspenseRxWaiting","suspenseMounts","Set","useRxSuspense","options","resultRx","useMemo","suspendOnWaiting","has","add","unmount","mount","then","delete","useRxSuspenseSuccess","squash","cause","useRxRef","ref","setValue","useState","useEffect"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-rx/rx-react",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "description": "Reactive toolkit for Effect",
   "license": "MIT",
   "repository": {
@@ -35,7 +35,7 @@
   "sideEffects": [],
   "author": "Effect contributors",
   "dependencies": {
-    "@effect-rx/rx": "^0.1.23"
+    "@effect-rx/rx": "^0.1.24"
   },
   "peerDependencies": {
     "@effect/data": "^0.18.5",

package/src/index.ts

@@ -1,7 +1,6 @@
 /**
  * @since 1.0.0
  */
-import { UniversalFinalizationRegistry } from "@effect-rx/rx/internal/finalizationRegistry"
 import * as Registry from "@effect-rx/rx/Registry"
 import * as Result from "@effect-rx/rx/Result"
 import * as Rx from "@effect-rx/rx/Rx"
@@ -107,11 +106,6 @@ type SuspenseResult<E, A> =
     readonly value: Result.Success<E, A> | Result.Failure<E, A>
   }
 
-const suspenseCache = globalValue("@effect-rx/rx-react/suspenseCache", () => new WeakMap<Rx.Rx<any>, () => void>())
-const suspenseRegistry = new UniversalFinalizationRegistry((unmount: () => void) => {
-  unmount()
-})
-
 const suspenseRx = Rx.family((rx: Rx.Rx<Result.Result<any, any>>) =>
   Rx.readable((get): SuspenseResult<any, any> => {
     const result = get(rx)
@@ -140,6 +134,8 @@ const suspenseRxWaiting = Rx.family((rx: Rx.Rx<Result.Result<any, any>>) =>
   })
 )
 
+const suspenseMounts = globalValue("@effect-rx/rx-react/suspenseMounts", () => new Set<Rx.Rx<any>>())
+
 /**
  * @since 1.0.0
  * @category hooks
@@ -159,19 +155,15 @@ export const useRxSuspense = <E, A>(
   const store = makeStore(registry, resultRx)
   const result = React.useSyncExternalStore(store.subscribe, store.snapshot)
   if (result._tag === "Suspended") {
-    if (!suspenseCache.has(resultRx)) {
+    if (!suspenseMounts.has(resultRx)) {
+      suspenseMounts.add(resultRx)
       const unmount = registry.mount(resultRx)
-      suspenseCache.set(resultRx, unmount)
-      suspenseRegistry.register(result.promise, unmount, resultRx)
+      result.promise.then(function() {
+        unmount()
+        suspenseMounts.delete(resultRx)
+      })
     }
     throw result.promise
-  } else if (suspenseCache.has(resultRx)) {
-    const unmount = suspenseCache.get(resultRx)
-    if (unmount) {
-      suspenseCache.delete(resultRx)
-      suspenseRegistry.unregister(resultRx)
-      unmount()
-    }
   }
 
   return result