react-rx 4.1.2-canary.10 → 4.1.2-canary.12

package/dist/index.cjs

@@ -1,72 +1,67 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: !0 });
 var reactCompilerRuntime = require("react-compiler-runtime"), react = require("react"), rxjs = require("rxjs"), operators = require("rxjs/operators"), observableCallback = require("observable-callback"), useEffectEvent = require("use-effect-event");
+function getValue(value) {
+  return typeof value == "function" ? value() : value;
+}
 const cache = /* @__PURE__ */ new WeakMap();
-function getOrCreateObservable(observable, debug) {
+function useObservable(observable, initialValue) {
+  const $ = reactCompilerRuntime.c(9);
   if (!cache.has(observable)) {
-    const entry = {};
-    entry.observable = observable.pipe(
-      operators.map((value) => ({
-        snapshot: value,
-        error: void 0
-      })),
-      rxjs.catchError((error) => rxjs.of({
-        snapshot: void 0,
-        error
+    const state = {
+      snapshot: void 0,
+      error: void 0
+    }, entry = {
+      state,
+      observable: observable.pipe(operators.map(_temp$1), rxjs.catchError(_temp2), operators.tap((t02) => {
+        const {
+          snapshot,
+          error: error_0
+        } = t02;
+        state.snapshot = snapshot, state.error = error_0;
+      }), operators.map(_temp3), rxjs.finalize(() => cache.delete(observable)), rxjs.share({
+        resetOnRefCountZero: _temp4
       })),
-      operators.tap(({
-        snapshot,
-        error
-      }) => {
-        debug && console.log("tap", snapshot, error), entry.snapshot = snapshot, entry.error = error;
-      }),
-      // Note: any value or error emitted by the provided observable will be mapped to the cache entry's mutable state
-      // and the observable is thereafter only used as a notifier to call `onStoreChange`, hence the `void` return type.
-      operators.map((value) => {
-      }),
-      // Ensure that the cache entry is deleted when the observable completes or errors.
-      rxjs.finalize(() => cache.delete(observable)),
-      rxjs.share({
-        resetOnRefCountZero: () => rxjs.timer(0, rxjs.asapScheduler)
-      })
-    ), entry.observable.subscribe().unsubscribe(), cache.set(observable, entry);
+      getSnapshot: (initialValue_0) => {
+        if (state.error)
+          throw state.error;
+        return state.snapshot ?? getValue(initialValue_0);
+      }
+    };
+    entry.observable.subscribe().unsubscribe(), cache.set(observable, entry);
   }
-  return cache.get(observable);
-}
-function getValue(value) {
-  return typeof value == "function" ? value() : value;
-}
-function useObservable(observable, initialValue, debug) {
-  const $ = reactCompilerRuntime.c(19);
-  let t0, t1;
-  $[0] !== observable || $[1] !== debug ? (t1 = getOrCreateObservable(observable, debug), $[0] = observable, $[1] = debug, $[2] = t1) : t1 = $[2];
-  const instance = t1;
-  let t2;
-  $[3] !== debug || $[4] !== observable || $[5] !== instance.observable ? (t2 = (onStoreChange) => {
-    debug && console.log("subscribe", observable);
-    const subscription = instance.observable.subscribe(() => {
-      debug && console.log("onStoreChange", observable), onStoreChange();
-    });
+  let t0;
+  $[0] !== observable ? (t0 = cache.get(observable), $[0] = observable, $[1] = t0) : t0 = $[1];
+  const instance = t0;
+  let t1;
+  $[2] !== instance.observable ? (t1 = (onStoreChange) => {
+    const subscription_0 = instance.observable.subscribe(onStoreChange);
     return () => {
-      debug && console.log("unsubscribe", observable), subscription.unsubscribe();
+      subscription_0.unsubscribe();
     };
-  }, $[3] = debug, $[4] = observable, $[5] = instance.observable, $[6] = t2) : t2 = $[6];
+  }, $[2] = instance.observable, $[3] = t1) : t1 = $[3];
+  const subscribe = t1;
+  let t2;
+  $[4] !== instance || $[5] !== initialValue ? (t2 = () => instance.getSnapshot(initialValue), $[4] = instance, $[5] = initialValue, $[6] = t2) : t2 = $[6];
   let t3;
-  $[7] !== debug || $[8] !== instance.snapshot || $[9] !== instance.error ? (t3 = () => {
-    if (debug && console.log("getSnapshot", instance.snapshot, instance.error), instance.error)
-      throw instance.error;
-    return instance.snapshot;
-  }, $[7] = debug, $[8] = instance.snapshot, $[9] = instance.error, $[10] = t3) : t3 = $[10];
-  let t4;
-  $[11] !== t2 || $[12] !== t3 ? (t4 = {
-    subscribe: t2,
-    getSnapshot: t3
-  }, $[11] = t2, $[12] = t3, $[13] = t4) : t4 = $[13], t0 = t4;
-  const store = t0;
-  let t5;
-  $[14] !== store || $[15] !== initialValue ? (t5 = () => store.getSnapshot() ?? getValue(initialValue), $[14] = store, $[15] = initialValue, $[16] = t5) : t5 = $[16];
-  let t6;
-  return $[17] !== initialValue ? (t6 = typeof initialValue > "u" ? void 0 : () => getValue(initialValue), $[17] = initialValue, $[18] = t6) : t6 = $[18], react.useSyncExternalStore(store.subscribe, t5, t6);
+  return $[7] !== initialValue ? (t3 = typeof initialValue > "u" ? void 0 : () => getValue(initialValue), $[7] = initialValue, $[8] = t3) : t3 = $[8], react.useSyncExternalStore(subscribe, t2, t3);
+}
+function _temp4() {
+  return rxjs.timer(0, rxjs.asapScheduler);
+}
+function _temp3(value_0) {
+}
+function _temp2(error) {
+  return rxjs.of({
+    snapshot: void 0,
+    error
+  });
+}
+function _temp$1(value) {
+  return {
+    snapshot: value,
+    error: void 0
+  };
 }
 function useObservableEvent(handleEvent) {
   const $ = reactCompilerRuntime.c(6), [t0] = react.useState(_temp), [calls$, call] = t0;

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../src/utils.ts","../src/useObservable.ts","../src/useObservableEvent.ts"],"sourcesContent":["import {\n  asapScheduler,\n  catchError,\n  finalize,\n  type Observable,\n  type ObservedValueOf,\n  of,\n  share,\n  timer,\n} from 'rxjs'\nimport {map, tap} from 'rxjs/operators'\n\ninterface CacheRecord<T> {\n  observable: Observable<void>\n  snapshot: T\n  error?: unknown\n}\n\nconst cache = new WeakMap<Observable<any>, CacheRecord<any>>()\n\n/** @internal */\nexport function getOrCreateObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n  debug?: boolean,\n): CacheRecord<ObservedValueOf<ObservableType>> {\n  if (!cache.has(observable)) {\n    const entry: Partial<CacheRecord<ObservedValueOf<ObservableType>>> = {}\n    entry.observable = observable.pipe(\n      map((value) => ({snapshot: value, error: undefined})),\n      catchError((error) => of({snapshot: undefined, error})),\n      tap(({snapshot, error}) => {\n        if (debug) {\n          console.log('tap', snapshot, error)\n        }\n        entry.snapshot = snapshot\n        entry.error = error\n      }),\n      // Note: any value or error emitted by the provided observable will be mapped to the cache entry's mutable state\n      // and the observable is thereafter only used as a notifier to call `onStoreChange`, hence the `void` return type.\n      map((value) => void value),\n      // Ensure that the cache entry is deleted when the observable completes or errors.\n      finalize(() => cache.delete(observable)),\n      share({resetOnRefCountZero: () => timer(0, asapScheduler)}),\n    )\n\n    // Eagerly subscribe to sync set `entry.currentValue` to what the observable returns, and keep the observable alive until the component unmounts.\n    const subscription = entry.observable.subscribe()\n    subscription.unsubscribe()\n\n    cache.set(observable, entry as CacheRecord<ObservedValueOf<ObservableType>>)\n  }\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n  return cache.get(observable)!\n}\n","import {useMemo, useSyncExternalStore} from 'react'\nimport {type Observable, type ObservedValueOf} from 'rxjs'\n\nimport {getOrCreateObservable} from './utils'\n\nfunction getValue<T>(value: T): T extends () => infer U ? U : T {\n  return typeof value === 'function' ? value() : value\n}\n\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n  initialValue: ObservedValueOf<ObservableType> | (() => ObservedValueOf<ObservableType>),\n  debug?: boolean,\n): ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n): undefined | ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>, InitialValue>(\n  observable: ObservableType,\n  initialValue: InitialValue | (() => InitialValue),\n  debug?: boolean,\n): InitialValue | ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>, InitialValue>(\n  observable: ObservableType,\n  initialValue?: InitialValue | (() => InitialValue),\n  debug?: boolean,\n): InitialValue | ObservedValueOf<ObservableType> {\n  const store = useMemo(() => {\n    const instance = getOrCreateObservable(observable, debug)\n\n    return {\n      subscribe: (onStoreChange: () => void) => {\n        if (debug) {\n          console.log('subscribe', observable)\n        }\n        const subscription = instance.observable.subscribe(() => {\n          if (debug) {\n            console.log('onStoreChange', observable)\n          }\n          onStoreChange()\n        })\n        return () => {\n          if (debug) {\n            console.log('unsubscribe', observable)\n          }\n          subscription.unsubscribe()\n        }\n      },\n      getSnapshot: () => {\n        if (debug) {\n          console.log('getSnapshot', instance.snapshot, instance.error)\n        }\n        if (instance.error) {\n          throw instance.error\n        }\n        return instance.snapshot\n      },\n    }\n  }, [debug, observable])\n\n  return useSyncExternalStore<ObservedValueOf<ObservableType>>(\n    store.subscribe,\n    () => store.getSnapshot() ?? (getValue(initialValue) as ObservedValueOf<ObservableType>),\n    typeof initialValue === 'undefined'\n      ? undefined\n      : () => getValue(initialValue) as ObservedValueOf<ObservableType>,\n  )\n}\n","import {observableCallback} from 'observable-callback'\nimport {useEffect, useState} from 'react'\nimport {type Observable} from 'rxjs'\nimport {useEffectEvent} from 'use-effect-event'\n\n/** @public */\nexport function useObservableEvent<T, U>(\n  handleEvent: (arg: Observable<T>) => Observable<U>,\n): (arg: T) => void {\n  const [[calls$, call]] = useState(() => observableCallback<T>())\n\n  const onEvent = useEffectEvent((observable: Observable<T>) => handleEvent(observable))\n\n  useEffect(() => {\n    const subscription = calls$.pipe((observable) => onEvent(observable)).subscribe()\n    return () => subscription.unsubscribe()\n  }, [calls$, onEvent])\n\n  return call\n}\n"],"names":["cache","WeakMap","getOrCreateObservable","observable","debug","has","entry","pipe","map","value","snapshot","error","undefined","catchError","of","tap","console","log","finalize","delete","share","resetOnRefCountZero","timer","asapScheduler","subscribe","unsubscribe","set","get","getValue","useObservable","initialValue","$","_c","t0","t1","instance","t2","onStoreChange","subscription","t3","t4","getSnapshot","store","t5","t6","useSyncExternalStore","useObservableEvent","handleEvent","useState","_temp","calls$","call","onEvent","useEffectEvent","observable_0","useEffect","observableCallback"],"mappings":"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"}
+{"version":3,"file":"index.cjs","sources":["../src/useObservable.ts","../src/useObservableEvent.ts"],"sourcesContent":["import {useCallback, useSyncExternalStore} from 'react'\nimport {\n  asapScheduler,\n  catchError,\n  finalize,\n  type Observable,\n  type ObservedValueOf,\n  of,\n  share,\n  timer,\n} from 'rxjs'\nimport {map, tap} from 'rxjs/operators'\n\nfunction getValue<T>(value: T): T extends () => infer U ? U : T {\n  return typeof value === 'function' ? value() : value\n}\n\ninterface CacheRecord<T> {\n  observable: Observable<void>\n  state: {\n    snapshot: T\n    error?: unknown\n  }\n  getSnapshot: (initialValue: unknown) => T\n}\n\nconst cache = new WeakMap<Observable<any>, CacheRecord<any>>()\n\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n  initialValue: ObservedValueOf<ObservableType> | (() => ObservedValueOf<ObservableType>),\n): ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n): undefined | ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>, InitialValue>(\n  observable: ObservableType,\n  initialValue: InitialValue | (() => InitialValue),\n): InitialValue | ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>, InitialValue>(\n  observable: ObservableType,\n  initialValue?: InitialValue | (() => InitialValue),\n): InitialValue | ObservedValueOf<ObservableType> {\n  if (!cache.has(observable)) {\n    const state = {\n      snapshot: undefined as ObservedValueOf<ObservableType>,\n      error: undefined,\n    }\n    const entry: CacheRecord<ObservedValueOf<ObservableType>> = {\n      // snapshot: getValue(initialValue) as ObservedValueOf<ObservableType>,\n      state,\n      observable: observable.pipe(\n        map((value) => ({snapshot: value, error: undefined})),\n        catchError((error) => of({snapshot: undefined, error})),\n        tap(({snapshot, error}) => {\n          state.snapshot = snapshot\n          state.error = error\n        }),\n        // Note: any value or error emitted by the provided observable will be mapped to the cache entry's mutable state\n        // and the observable is thereafter only used as a notifier to call `onStoreChange`, hence the `void` return type.\n        map((value) => void value),\n        // Ensure that the cache entry is deleted when the observable completes or errors.\n        finalize(() => cache.delete(observable)),\n        share({resetOnRefCountZero: () => timer(0, asapScheduler)}),\n      ),\n      getSnapshot: (initialValue) => {\n        if (state.error) {\n          throw state.error\n        }\n        return state.snapshot ?? (getValue(initialValue) as ObservedValueOf<ObservableType>)\n      },\n    }\n\n    // Eagerly subscribe to sync set `state.snapshot` to what the observable returns, and keep the observable alive until the component unmounts.\n    const subscription = entry.observable.subscribe()\n    subscription.unsubscribe()\n\n    cache.set(observable, entry as CacheRecord<ObservedValueOf<ObservableType>>)\n  }\n  const instance = cache.get(observable)!\n\n  const subscribe = useCallback(\n    (onStoreChange: () => void) => {\n      const subscription = instance.observable.subscribe(onStoreChange)\n      return () => {\n        subscription.unsubscribe()\n      }\n    },\n    [instance.observable],\n  )\n\n  return useSyncExternalStore<ObservedValueOf<ObservableType>>(\n    subscribe,\n    () => {\n      return instance.getSnapshot(initialValue)\n    },\n    typeof initialValue === 'undefined'\n      ? undefined\n      : () => getValue(initialValue) as ObservedValueOf<ObservableType>,\n  )\n}\n","import {observableCallback} from 'observable-callback'\nimport {useEffect, useState} from 'react'\nimport {type Observable} from 'rxjs'\nimport {useEffectEvent} from 'use-effect-event'\n\n/** @public */\nexport function useObservableEvent<T, U>(\n  handleEvent: (arg: Observable<T>) => Observable<U>,\n): (arg: T) => void {\n  const [[calls$, call]] = useState(() => observableCallback<T>())\n\n  const onEvent = useEffectEvent((observable: Observable<T>) => handleEvent(observable))\n\n  useEffect(() => {\n    const subscription = calls$.pipe((observable) => onEvent(observable)).subscribe()\n    return () => subscription.unsubscribe()\n  }, [calls$, onEvent])\n\n  return call\n}\n"],"names":["getValue","value","cache","WeakMap","useObservable","observable","initialValue","$","_c","has","state","snapshot","undefined","error","entry","pipe","map","_temp","catchError","_temp2","tap","t0","error_0","_temp3","finalize","delete","share","resetOnRefCountZero","_temp4","getSnapshot","initialValue_0","subscribe","unsubscribe","set","get","instance","t1","onStoreChange","subscription_0","subscription","t2","t3","useSyncExternalStore","timer","asapScheduler","value_0","of","useObservableEvent","handleEvent","useState","calls$","call","onEvent","useEffectEvent","observable_0","useEffect","observableCallback"],"mappings":"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"}

package/dist/index.d.cts

@@ -5,7 +5,6 @@ import {ObservedValueOf} from 'rxjs'
 export declare function useObservable<ObservableType extends Observable<any>>(
   observable: ObservableType,
   initialValue: ObservedValueOf<ObservableType> | (() => ObservedValueOf<ObservableType>),
-  debug?: boolean,
 ): ObservedValueOf<ObservableType>
 
 /** @public */
@@ -17,7 +16,6 @@ export declare function useObservable<ObservableType extends Observable<any>>(
 export declare function useObservable<ObservableType extends Observable<any>, InitialValue>(
   observable: ObservableType,
   initialValue: InitialValue | (() => InitialValue),
-  debug?: boolean,
 ): InitialValue | ObservedValueOf<ObservableType>
 
 /** @public */

package/dist/index.d.ts

@@ -5,7 +5,6 @@ import {ObservedValueOf} from 'rxjs'
 export declare function useObservable<ObservableType extends Observable<any>>(
   observable: ObservableType,
   initialValue: ObservedValueOf<ObservableType> | (() => ObservedValueOf<ObservableType>),
-  debug?: boolean,
 ): ObservedValueOf<ObservableType>
 
 /** @public */
@@ -17,7 +16,6 @@ export declare function useObservable<ObservableType extends Observable<any>>(
 export declare function useObservable<ObservableType extends Observable<any>, InitialValue>(
   observable: ObservableType,
   initialValue: InitialValue | (() => InitialValue),
-  debug?: boolean,
 ): InitialValue | ObservedValueOf<ObservableType>
 
 /** @public */

package/dist/index.js

@@ -1,75 +1,70 @@
 import { c } from "react-compiler-runtime";
 import { useSyncExternalStore, useState, useEffect } from "react";
-import { catchError, of, finalize, share, timer, asapScheduler } from "rxjs";
+import { catchError, finalize, share, timer, asapScheduler, of } from "rxjs";
 import { map, tap } from "rxjs/operators";
 import { observableCallback } from "observable-callback";
 import { useEffectEvent } from "use-effect-event";
+function getValue(value) {
+  return typeof value == "function" ? value() : value;
+}
 const cache = /* @__PURE__ */ new WeakMap();
-function getOrCreateObservable(observable, debug) {
+function useObservable(observable, initialValue) {
+  const $ = c(9);
   if (!cache.has(observable)) {
-    const entry = {};
-    entry.observable = observable.pipe(
-      map((value) => ({
-        snapshot: value,
-        error: void 0
-      })),
-      catchError((error) => of({
-        snapshot: void 0,
-        error
+    const state = {
+      snapshot: void 0,
+      error: void 0
+    }, entry = {
+      state,
+      observable: observable.pipe(map(_temp$1), catchError(_temp2), tap((t02) => {
+        const {
+          snapshot,
+          error: error_0
+        } = t02;
+        state.snapshot = snapshot, state.error = error_0;
+      }), map(_temp3), finalize(() => cache.delete(observable)), share({
+        resetOnRefCountZero: _temp4
       })),
-      tap(({
-        snapshot,
-        error
-      }) => {
-        debug && console.log("tap", snapshot, error), entry.snapshot = snapshot, entry.error = error;
-      }),
-      // Note: any value or error emitted by the provided observable will be mapped to the cache entry's mutable state
-      // and the observable is thereafter only used as a notifier to call `onStoreChange`, hence the `void` return type.
-      map((value) => {
-      }),
-      // Ensure that the cache entry is deleted when the observable completes or errors.
-      finalize(() => cache.delete(observable)),
-      share({
-        resetOnRefCountZero: () => timer(0, asapScheduler)
-      })
-    ), entry.observable.subscribe().unsubscribe(), cache.set(observable, entry);
+      getSnapshot: (initialValue_0) => {
+        if (state.error)
+          throw state.error;
+        return state.snapshot ?? getValue(initialValue_0);
+      }
+    };
+    entry.observable.subscribe().unsubscribe(), cache.set(observable, entry);
   }
-  return cache.get(observable);
-}
-function getValue(value) {
-  return typeof value == "function" ? value() : value;
-}
-function useObservable(observable, initialValue, debug) {
-  const $ = c(19);
-  let t0, t1;
-  $[0] !== observable || $[1] !== debug ? (t1 = getOrCreateObservable(observable, debug), $[0] = observable, $[1] = debug, $[2] = t1) : t1 = $[2];
-  const instance = t1;
-  let t2;
-  $[3] !== debug || $[4] !== observable || $[5] !== instance.observable ? (t2 = (onStoreChange) => {
-    debug && console.log("subscribe", observable);
-    const subscription = instance.observable.subscribe(() => {
-      debug && console.log("onStoreChange", observable), onStoreChange();
-    });
+  let t0;
+  $[0] !== observable ? (t0 = cache.get(observable), $[0] = observable, $[1] = t0) : t0 = $[1];
+  const instance = t0;
+  let t1;
+  $[2] !== instance.observable ? (t1 = (onStoreChange) => {
+    const subscription_0 = instance.observable.subscribe(onStoreChange);
     return () => {
-      debug && console.log("unsubscribe", observable), subscription.unsubscribe();
+      subscription_0.unsubscribe();
     };
-  }, $[3] = debug, $[4] = observable, $[5] = instance.observable, $[6] = t2) : t2 = $[6];
+  }, $[2] = instance.observable, $[3] = t1) : t1 = $[3];
+  const subscribe = t1;
+  let t2;
+  $[4] !== instance || $[5] !== initialValue ? (t2 = () => instance.getSnapshot(initialValue), $[4] = instance, $[5] = initialValue, $[6] = t2) : t2 = $[6];
   let t3;
-  $[7] !== debug || $[8] !== instance.snapshot || $[9] !== instance.error ? (t3 = () => {
-    if (debug && console.log("getSnapshot", instance.snapshot, instance.error), instance.error)
-      throw instance.error;
-    return instance.snapshot;
-  }, $[7] = debug, $[8] = instance.snapshot, $[9] = instance.error, $[10] = t3) : t3 = $[10];
-  let t4;
-  $[11] !== t2 || $[12] !== t3 ? (t4 = {
-    subscribe: t2,
-    getSnapshot: t3
-  }, $[11] = t2, $[12] = t3, $[13] = t4) : t4 = $[13], t0 = t4;
-  const store = t0;
-  let t5;
-  $[14] !== store || $[15] !== initialValue ? (t5 = () => store.getSnapshot() ?? getValue(initialValue), $[14] = store, $[15] = initialValue, $[16] = t5) : t5 = $[16];
-  let t6;
-  return $[17] !== initialValue ? (t6 = typeof initialValue > "u" ? void 0 : () => getValue(initialValue), $[17] = initialValue, $[18] = t6) : t6 = $[18], useSyncExternalStore(store.subscribe, t5, t6);
+  return $[7] !== initialValue ? (t3 = typeof initialValue > "u" ? void 0 : () => getValue(initialValue), $[7] = initialValue, $[8] = t3) : t3 = $[8], useSyncExternalStore(subscribe, t2, t3);
+}
+function _temp4() {
+  return timer(0, asapScheduler);
+}
+function _temp3(value_0) {
+}
+function _temp2(error) {
+  return of({
+    snapshot: void 0,
+    error
+  });
+}
+function _temp$1(value) {
+  return {
+    snapshot: value,
+    error: void 0
+  };
 }
 function useObservableEvent(handleEvent) {
   const $ = c(6), [t0] = useState(_temp), [calls$, call] = t0;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/utils.ts","../src/useObservable.ts","../src/useObservableEvent.ts"],"sourcesContent":["import {\n  asapScheduler,\n  catchError,\n  finalize,\n  type Observable,\n  type ObservedValueOf,\n  of,\n  share,\n  timer,\n} from 'rxjs'\nimport {map, tap} from 'rxjs/operators'\n\ninterface CacheRecord<T> {\n  observable: Observable<void>\n  snapshot: T\n  error?: unknown\n}\n\nconst cache = new WeakMap<Observable<any>, CacheRecord<any>>()\n\n/** @internal */\nexport function getOrCreateObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n  debug?: boolean,\n): CacheRecord<ObservedValueOf<ObservableType>> {\n  if (!cache.has(observable)) {\n    const entry: Partial<CacheRecord<ObservedValueOf<ObservableType>>> = {}\n    entry.observable = observable.pipe(\n      map((value) => ({snapshot: value, error: undefined})),\n      catchError((error) => of({snapshot: undefined, error})),\n      tap(({snapshot, error}) => {\n        if (debug) {\n          console.log('tap', snapshot, error)\n        }\n        entry.snapshot = snapshot\n        entry.error = error\n      }),\n      // Note: any value or error emitted by the provided observable will be mapped to the cache entry's mutable state\n      // and the observable is thereafter only used as a notifier to call `onStoreChange`, hence the `void` return type.\n      map((value) => void value),\n      // Ensure that the cache entry is deleted when the observable completes or errors.\n      finalize(() => cache.delete(observable)),\n      share({resetOnRefCountZero: () => timer(0, asapScheduler)}),\n    )\n\n    // Eagerly subscribe to sync set `entry.currentValue` to what the observable returns, and keep the observable alive until the component unmounts.\n    const subscription = entry.observable.subscribe()\n    subscription.unsubscribe()\n\n    cache.set(observable, entry as CacheRecord<ObservedValueOf<ObservableType>>)\n  }\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n  return cache.get(observable)!\n}\n","import {useMemo, useSyncExternalStore} from 'react'\nimport {type Observable, type ObservedValueOf} from 'rxjs'\n\nimport {getOrCreateObservable} from './utils'\n\nfunction getValue<T>(value: T): T extends () => infer U ? U : T {\n  return typeof value === 'function' ? value() : value\n}\n\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n  initialValue: ObservedValueOf<ObservableType> | (() => ObservedValueOf<ObservableType>),\n  debug?: boolean,\n): ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n): undefined | ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>, InitialValue>(\n  observable: ObservableType,\n  initialValue: InitialValue | (() => InitialValue),\n  debug?: boolean,\n): InitialValue | ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>, InitialValue>(\n  observable: ObservableType,\n  initialValue?: InitialValue | (() => InitialValue),\n  debug?: boolean,\n): InitialValue | ObservedValueOf<ObservableType> {\n  const store = useMemo(() => {\n    const instance = getOrCreateObservable(observable, debug)\n\n    return {\n      subscribe: (onStoreChange: () => void) => {\n        if (debug) {\n          console.log('subscribe', observable)\n        }\n        const subscription = instance.observable.subscribe(() => {\n          if (debug) {\n            console.log('onStoreChange', observable)\n          }\n          onStoreChange()\n        })\n        return () => {\n          if (debug) {\n            console.log('unsubscribe', observable)\n          }\n          subscription.unsubscribe()\n        }\n      },\n      getSnapshot: () => {\n        if (debug) {\n          console.log('getSnapshot', instance.snapshot, instance.error)\n        }\n        if (instance.error) {\n          throw instance.error\n        }\n        return instance.snapshot\n      },\n    }\n  }, [debug, observable])\n\n  return useSyncExternalStore<ObservedValueOf<ObservableType>>(\n    store.subscribe,\n    () => store.getSnapshot() ?? (getValue(initialValue) as ObservedValueOf<ObservableType>),\n    typeof initialValue === 'undefined'\n      ? undefined\n      : () => getValue(initialValue) as ObservedValueOf<ObservableType>,\n  )\n}\n","import {observableCallback} from 'observable-callback'\nimport {useEffect, useState} from 'react'\nimport {type Observable} from 'rxjs'\nimport {useEffectEvent} from 'use-effect-event'\n\n/** @public */\nexport function useObservableEvent<T, U>(\n  handleEvent: (arg: Observable<T>) => Observable<U>,\n): (arg: T) => void {\n  const [[calls$, call]] = useState(() => observableCallback<T>())\n\n  const onEvent = useEffectEvent((observable: Observable<T>) => handleEvent(observable))\n\n  useEffect(() => {\n    const subscription = calls$.pipe((observable) => onEvent(observable)).subscribe()\n    return () => subscription.unsubscribe()\n  }, [calls$, onEvent])\n\n  return call\n}\n"],"names":["cache","WeakMap","getOrCreateObservable","observable","debug","has","entry","pipe","map","value","snapshot","error","undefined","catchError","of","tap","console","log","finalize","delete","share","resetOnRefCountZero","timer","asapScheduler","subscribe","unsubscribe","set","get","getValue","useObservable","initialValue","$","_c","t0","t1","instance","t2","onStoreChange","subscription","t3","t4","getSnapshot","store","t5","t6","useSyncExternalStore","useObservableEvent","handleEvent","useState","_temp","calls$","call","onEvent","useEffectEvent","observable_0","useEffect","observableCallback"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../src/useObservable.ts","../src/useObservableEvent.ts"],"sourcesContent":["import {useCallback, useSyncExternalStore} from 'react'\nimport {\n  asapScheduler,\n  catchError,\n  finalize,\n  type Observable,\n  type ObservedValueOf,\n  of,\n  share,\n  timer,\n} from 'rxjs'\nimport {map, tap} from 'rxjs/operators'\n\nfunction getValue<T>(value: T): T extends () => infer U ? U : T {\n  return typeof value === 'function' ? value() : value\n}\n\ninterface CacheRecord<T> {\n  observable: Observable<void>\n  state: {\n    snapshot: T\n    error?: unknown\n  }\n  getSnapshot: (initialValue: unknown) => T\n}\n\nconst cache = new WeakMap<Observable<any>, CacheRecord<any>>()\n\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n  initialValue: ObservedValueOf<ObservableType> | (() => ObservedValueOf<ObservableType>),\n): ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>>(\n  observable: ObservableType,\n): undefined | ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>, InitialValue>(\n  observable: ObservableType,\n  initialValue: InitialValue | (() => InitialValue),\n): InitialValue | ObservedValueOf<ObservableType>\n/** @public */\nexport function useObservable<ObservableType extends Observable<any>, InitialValue>(\n  observable: ObservableType,\n  initialValue?: InitialValue | (() => InitialValue),\n): InitialValue | ObservedValueOf<ObservableType> {\n  if (!cache.has(observable)) {\n    const state = {\n      snapshot: undefined as ObservedValueOf<ObservableType>,\n      error: undefined,\n    }\n    const entry: CacheRecord<ObservedValueOf<ObservableType>> = {\n      // snapshot: getValue(initialValue) as ObservedValueOf<ObservableType>,\n      state,\n      observable: observable.pipe(\n        map((value) => ({snapshot: value, error: undefined})),\n        catchError((error) => of({snapshot: undefined, error})),\n        tap(({snapshot, error}) => {\n          state.snapshot = snapshot\n          state.error = error\n        }),\n        // Note: any value or error emitted by the provided observable will be mapped to the cache entry's mutable state\n        // and the observable is thereafter only used as a notifier to call `onStoreChange`, hence the `void` return type.\n        map((value) => void value),\n        // Ensure that the cache entry is deleted when the observable completes or errors.\n        finalize(() => cache.delete(observable)),\n        share({resetOnRefCountZero: () => timer(0, asapScheduler)}),\n      ),\n      getSnapshot: (initialValue) => {\n        if (state.error) {\n          throw state.error\n        }\n        return state.snapshot ?? (getValue(initialValue) as ObservedValueOf<ObservableType>)\n      },\n    }\n\n    // Eagerly subscribe to sync set `state.snapshot` to what the observable returns, and keep the observable alive until the component unmounts.\n    const subscription = entry.observable.subscribe()\n    subscription.unsubscribe()\n\n    cache.set(observable, entry as CacheRecord<ObservedValueOf<ObservableType>>)\n  }\n  const instance = cache.get(observable)!\n\n  const subscribe = useCallback(\n    (onStoreChange: () => void) => {\n      const subscription = instance.observable.subscribe(onStoreChange)\n      return () => {\n        subscription.unsubscribe()\n      }\n    },\n    [instance.observable],\n  )\n\n  return useSyncExternalStore<ObservedValueOf<ObservableType>>(\n    subscribe,\n    () => {\n      return instance.getSnapshot(initialValue)\n    },\n    typeof initialValue === 'undefined'\n      ? undefined\n      : () => getValue(initialValue) as ObservedValueOf<ObservableType>,\n  )\n}\n","import {observableCallback} from 'observable-callback'\nimport {useEffect, useState} from 'react'\nimport {type Observable} from 'rxjs'\nimport {useEffectEvent} from 'use-effect-event'\n\n/** @public */\nexport function useObservableEvent<T, U>(\n  handleEvent: (arg: Observable<T>) => Observable<U>,\n): (arg: T) => void {\n  const [[calls$, call]] = useState(() => observableCallback<T>())\n\n  const onEvent = useEffectEvent((observable: Observable<T>) => handleEvent(observable))\n\n  useEffect(() => {\n    const subscription = calls$.pipe((observable) => onEvent(observable)).subscribe()\n    return () => subscription.unsubscribe()\n  }, [calls$, onEvent])\n\n  return call\n}\n"],"names":["getValue","value","cache","WeakMap","useObservable","observable","initialValue","$","_c","has","state","snapshot","undefined","error","entry","pipe","map","_temp","catchError","_temp2","tap","t0","error_0","_temp3","finalize","delete","share","resetOnRefCountZero","_temp4","getSnapshot","initialValue_0","subscribe","unsubscribe","set","get","instance","t1","onStoreChange","subscription_0","subscription","t2","t3","useSyncExternalStore","timer","asapScheduler","value_0","of","useObservableEvent","handleEvent","useState","calls$","call","onEvent","useEffectEvent","observable_0","useEffect","observableCallback"],"mappings":";;;;;;AAaA,SAASA,SAAYC,OAA2C;AAC9D,SAAO,OAAOA,SAAU,aAAaA,MAAUA,IAAAA;AACjD;AAWA,MAAMC,4BAAYC,QAA2C;AAiBtDC,SAAAA,cAAAC,YAAAC,cAAA;AAAAC,QAAAA,IAAAC,EAAA,CAAA;AAAA,MAAA,CAIAN,MAAAO,IAAUJ,UAAU,GAAC;AACxB,UAAAK,QAAA;AAAA,MAAAC,UAAAC;AAAAA,MAAAC,OAAAD;AAAAA,OAIAE,QAAA;AAAA,MAAAJ;AAAAA,MAAAL,YAGcA,WAAUU,KACpBC,IAAAC,OAAoD,GACpDC,WAAAC,MAAsD,GACtDC,IAAAC,CAAAA,QAAA;AAAK,cAAA;AAAA,UAAAV;AAAAA,UAAAE,OAAAS;AAAAA,QAAAA,IAAAD;AACEV,cAAAA,WAAYA,UACjBD,MAAKG,QAASA;AAAAA,MAAAA,CACf,GAGDG,IAAAO,MAAyB,GAEzBC,SAAetB,MAAAA,MAAAuB,OAAapB,UAAU,CAAC,GACvCqB,MAAA;AAAA,QAAAC,qBAAAC;AAAAA,MAAAA,CAA0D,CAC5D;AAAA,MAACC,aAAAC,CAAA,mBAAA;AAAA,YAEKpB,MAAKG;AAAA,gBACDH,MAAKG;AAENH,eAAAA,MAAKC,YAAcX,SAASM,cAAY;AAAA,MAAA;AAAA,IAAqC;AAKnEQ,UAAKT,WAAA0B,YACdC,YAEZ9B,GAAAA,MAAA+B,IAAU5B,YAAYS,KAAqD;AAAA,EAAA;AAACO,MAAAA;AAAAd,WAAAF,cAE7DgB,KAAAnB,MAAAgC,IAAU7B,UAAU,GAACE,OAAAF,YAAAE,OAAAc,MAAAA,KAAAd,EAAA,CAAA;AAAtC,QAAA4B,WAAiBd;AAAsBe,MAAAA;AAAA7B,IAAA,CAAA,MAAA4B,SAAA9B,cAGrC+B,KAAAC,CAAA,kBAAA;AACE,UAAAC,iBAAqBH,SAAQ9B,WAAA0B,UAAsBM,aAAa;AAAC,WAAA,MAAA;AAE/DE,qBAAYP,YAAa;AAAA,IAAC;AAAA,EAE7BzB,GAAAA,EAAA,CAAA,IAAA4B,SAAA9B,YAAAE,OAAA6B,MAAAA,KAAA7B,EAAA,CAAA;AANH,QAAAwB,YAAkBK;AAQjBI,MAAAA;AAAAjC,IAAA4B,CAAAA,MAAAA,YAAA5B,SAAAD,gBAICkC,KAAAA,MACSL,SAAQN,YAAavB,YAAY,GACzCC,OAAA4B,UAAA5B,OAAAD,cAAAC,OAAAiC,MAAAA,KAAAjC,EAAA,CAAA;AAAAkC,MAAAA;AAAA,SAAAlC,SAAAD,gBACDmC,KAAA,OAAOnC,eAAiB,MAAWM,SAEzBZ,MAAAA,SAASM,YAAY,GAAoCC,OAAAD,cAAAC,OAAAkC,MAAAA,KAAAlC,EAAA,CAAA,GAP9DmC,qBACLX,WACAS,IAGAC,EAGF;AAAC;AA5DI,SAAAb,SAAA;AAwBmCe,SAAAA,MAAAC,GAAAA,aAAsB;AAAC;AAxB1D,SAAArB,OAAAsB,SAAA;AAqB0B;AArB1B,SAAA1B,OAAAN,OAAA;AAAA,SAcuBiC,GAAA;AAAA,IAAAnC,UAAAC;AAAAA,IAAAC;AAAAA,EAAAA,CAA+B;AAAC;AAdvD,SAAAI,QAAAhB,OAAA;AAAA,SAAA;AAAA,IAAAU,UAa4BV;AAAAA,IAAKY,OAAAD;AAAAA,EAAA;AAAA;AClDjC,SAAAmC,mBAAAC,aAAA;AAAA,QAAAzC,IAAAC,EAAA,CAAA,GAGL,CAAAa,EAAA,IAAyB4B,SAAAhC,KAAsC,GAAxD,CAAAiC,QAAAC,IAAA,IAAA9B;AAAce,MAAAA;AAAA7B,WAAAyC,eAEUZ,KAAA/B,CAAAA,eAA+B2C,YAAY3C,UAAU,GAACE,OAAAyC,aAAAzC,OAAA6B,MAAAA,KAAA7B,EAAA,CAAA;AAArF6C,QAAAA,UAAgBC,eAAejB,EAAsD;AAAC,MAAAI,IAAAC;AAAAlC,SAAAA,EAAA2C,CAAAA,MAAAA,UAAA3C,SAAA6C,WAE5EZ,KAAAA,MAAA;AACRD,UAAAA,eAAqBW,OAAMnC,KAAAuC,CAAAA,iBAAsBF,QAAQ/C,YAAU,CAAC,EAAC0B,UAAW;AAAC,WAAA,MACpEQ,aAAYP,YAAa;AAAA,EACrCS,GAAAA,KAAA,CAACS,QAAQE,OAAO,GAAC7C,OAAA2C,QAAA3C,OAAA6C,SAAA7C,OAAAiC,IAAAjC,OAAAkC,OAAAD,KAAAjC,EAAA,CAAA,GAAAkC,KAAAlC,EAAA,CAAA,IAHpBgD,UAAUf,IAGPC,EAAiB,GAEbU;AAAI;AAZN,SAAAlC,QAAA;AAAA,SAGmCuC,mBAAsB;AAAC;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-rx",
-  "version": "4.1.2-canary.10",
+  "version": "4.1.2-canary.12",
   "description": "React + RxJS = <3",
   "keywords": [
     "action",

package/src/useObservable.ts

@@ -1,17 +1,35 @@
-import {useMemo, useSyncExternalStore} from 'react'
-import {type Observable, type ObservedValueOf} from 'rxjs'
-
-import {getOrCreateObservable} from './utils'
+import {useCallback, useSyncExternalStore} from 'react'
+import {
+  asapScheduler,
+  catchError,
+  finalize,
+  type Observable,
+  type ObservedValueOf,
+  of,
+  share,
+  timer,
+} from 'rxjs'
+import {map, tap} from 'rxjs/operators'
 
 function getValue<T>(value: T): T extends () => infer U ? U : T {
   return typeof value === 'function' ? value() : value
 }
 
+interface CacheRecord<T> {
+  observable: Observable<void>
+  state: {
+    snapshot: T
+    error?: unknown
+  }
+  getSnapshot: (initialValue: unknown) => T
+}
+
+const cache = new WeakMap<Observable<any>, CacheRecord<any>>()
+
 /** @public */
 export function useObservable<ObservableType extends Observable<any>>(
   observable: ObservableType,
   initialValue: ObservedValueOf<ObservableType> | (() => ObservedValueOf<ObservableType>),
-  debug?: boolean,
 ): ObservedValueOf<ObservableType>
 /** @public */
 export function useObservable<ObservableType extends Observable<any>>(
@@ -21,50 +39,65 @@ export function useObservable<ObservableType extends Observable<any>>(
 export function useObservable<ObservableType extends Observable<any>, InitialValue>(
   observable: ObservableType,
   initialValue: InitialValue | (() => InitialValue),
-  debug?: boolean,
 ): InitialValue | ObservedValueOf<ObservableType>
 /** @public */
 export function useObservable<ObservableType extends Observable<any>, InitialValue>(
   observable: ObservableType,
   initialValue?: InitialValue | (() => InitialValue),
-  debug?: boolean,
 ): InitialValue | ObservedValueOf<ObservableType> {
-  const store = useMemo(() => {
-    const instance = getOrCreateObservable(observable, debug)
-
-    return {
-      subscribe: (onStoreChange: () => void) => {
-        if (debug) {
-          console.log('subscribe', observable)
-        }
-        const subscription = instance.observable.subscribe(() => {
-          if (debug) {
-            console.log('onStoreChange', observable)
-          }
-          onStoreChange()
-        })
-        return () => {
-          if (debug) {
-            console.log('unsubscribe', observable)
-          }
-          subscription.unsubscribe()
-        }
-      },
-      getSnapshot: () => {
-        if (debug) {
-          console.log('getSnapshot', instance.snapshot, instance.error)
-        }
-        if (instance.error) {
-          throw instance.error
+  if (!cache.has(observable)) {
+    const state = {
+      snapshot: undefined as ObservedValueOf<ObservableType>,
+      error: undefined,
+    }
+    const entry: CacheRecord<ObservedValueOf<ObservableType>> = {
+      // snapshot: getValue(initialValue) as ObservedValueOf<ObservableType>,
+      state,
+      observable: observable.pipe(
+        map((value) => ({snapshot: value, error: undefined})),
+        catchError((error) => of({snapshot: undefined, error})),
+        tap(({snapshot, error}) => {
+          state.snapshot = snapshot
+          state.error = error
+        }),
+        // Note: any value or error emitted by the provided observable will be mapped to the cache entry's mutable state
+        // and the observable is thereafter only used as a notifier to call `onStoreChange`, hence the `void` return type.
+        map((value) => void value),
+        // Ensure that the cache entry is deleted when the observable completes or errors.
+        finalize(() => cache.delete(observable)),
+        share({resetOnRefCountZero: () => timer(0, asapScheduler)}),
+      ),
+      getSnapshot: (initialValue) => {
+        if (state.error) {
+          throw state.error
         }
-        return instance.snapshot
+        return state.snapshot ?? (getValue(initialValue) as ObservedValueOf<ObservableType>)
       },
     }
-  }, [debug, observable])
+
+    // Eagerly subscribe to sync set `state.snapshot` to what the observable returns, and keep the observable alive until the component unmounts.
+    const subscription = entry.observable.subscribe()
+    subscription.unsubscribe()
+
+    cache.set(observable, entry as CacheRecord<ObservedValueOf<ObservableType>>)
+  }
+  const instance = cache.get(observable)!
+
+  const subscribe = useCallback(
+    (onStoreChange: () => void) => {
+      const subscription = instance.observable.subscribe(onStoreChange)
+      return () => {
+        subscription.unsubscribe()
+      }
+    },
+    [instance.observable],
+  )
 
   return useSyncExternalStore<ObservedValueOf<ObservableType>>(
-    store.subscribe,
-    () => store.getSnapshot() ?? (getValue(initialValue) as ObservedValueOf<ObservableType>),
+    subscribe,
+    () => {
+      return instance.getSnapshot(initialValue)
+    },
     typeof initialValue === 'undefined'
       ? undefined
       : () => getValue(initialValue) as ObservedValueOf<ObservableType>,

package/src/utils.ts

@@ -1,54 +0,0 @@
-import {
-  asapScheduler,
-  catchError,
-  finalize,
-  type Observable,
-  type ObservedValueOf,
-  of,
-  share,
-  timer,
-} from 'rxjs'
-import {map, tap} from 'rxjs/operators'
-
-interface CacheRecord<T> {
-  observable: Observable<void>
-  snapshot: T
-  error?: unknown
-}
-
-const cache = new WeakMap<Observable<any>, CacheRecord<any>>()
-
-/** @internal */
-export function getOrCreateObservable<ObservableType extends Observable<any>>(
-  observable: ObservableType,
-  debug?: boolean,
-): CacheRecord<ObservedValueOf<ObservableType>> {
-  if (!cache.has(observable)) {
-    const entry: Partial<CacheRecord<ObservedValueOf<ObservableType>>> = {}
-    entry.observable = observable.pipe(
-      map((value) => ({snapshot: value, error: undefined})),
-      catchError((error) => of({snapshot: undefined, error})),
-      tap(({snapshot, error}) => {
-        if (debug) {
-          console.log('tap', snapshot, error)
-        }
-        entry.snapshot = snapshot
-        entry.error = error
-      }),
-      // Note: any value or error emitted by the provided observable will be mapped to the cache entry's mutable state
-      // and the observable is thereafter only used as a notifier to call `onStoreChange`, hence the `void` return type.
-      map((value) => void value),
-      // Ensure that the cache entry is deleted when the observable completes or errors.
-      finalize(() => cache.delete(observable)),
-      share({resetOnRefCountZero: () => timer(0, asapScheduler)}),
-    )
-
-    // Eagerly subscribe to sync set `entry.currentValue` to what the observable returns, and keep the observable alive until the component unmounts.
-    const subscription = entry.observable.subscribe()
-    subscription.unsubscribe()
-
-    cache.set(observable, entry as CacheRecord<ObservedValueOf<ObservableType>>)
-  }
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  return cache.get(observable)!
-}