reactjrx 1.101.0 → 1.104.0

package/dist/index.cjs

@@ -14,6 +14,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
 const rxjs = require("rxjs");
 const operators = require("rxjs/operators");
+const reactQuery = require("@tanstack/react-query");
 const jsxRuntime = require("react/jsx-runtime");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -61,7 +62,8 @@ function makeObservable(something) {
 function useObserve(source$, optionsOrDeps, maybeDeps) {
   const options = optionsOrDeps != null && !Array.isArray(optionsOrDeps) ? optionsOrDeps : {
     defaultValue: void 0,
-    unsubscribeOnUnmount: true
+    unsubscribeOnUnmount: true,
+    compareFn: void 0
   };
   const deps = !maybeDeps && Array.isArray(optionsOrDeps) ? optionsOrDeps : typeof source$ === "function" ? maybeDeps ?? [] : [source$];
   const valueRef = React.useRef(
@@ -73,13 +75,15 @@ function useObserve(source$, optionsOrDeps, maybeDeps) {
     (next) => {
       const source = sourceRef.current;
       const sub = makeObservable(source).pipe(
+        optionsRef.current.defaultValue ? rxjs.startWith(optionsRef.current.defaultValue) : rxjs.identity,
         /**
-         * @important
-         * We only check primitives because underlying subscription might
-         * be using objects and keeping same reference but pushing new
-         * properties values
+         * @important there is already a Object.is comparison in place from react
+         * so we only add a custom compareFn if provided
          */
-        rxjs.distinctUntilChanged((a, b) => a === b),
+        optionsRef.current.compareFn ? rxjs.distinctUntilChanged((a, b) => {
+          if (a === void 0 || b === void 0) return false;
+          return optionsRef.current.compareFn(a, b);
+        }) : rxjs.identity,
         rxjs.tap((value) => {
           valueRef.current = value;
         }),
@@ -205,7 +209,7 @@ function signal(config = {}) {
     default: config.default,
     key: config.key
   };
-  const { default: defaultValue } = normalizedConfig ?? {};
+  const { default: defaultValue } = normalizedConfig;
   const subject = new rxjs.BehaviorSubject(defaultValue);
   const setValue = (arg) => {
     const update = (value) => {
@@ -476,6 +480,28 @@ function persistSignals({
     )
   );
 }
+function shallowEqual(objA, objB) {
+  if (objA === null || objA === void 0 || objB === void 0) {
+    return objA === objB;
+  }
+  if (typeof objA !== "object" || typeof objB !== "object") {
+    return objA === objB;
+  }
+  if (objA.constructor !== (objB == null ? void 0 : objB.constructor)) {
+    return false;
+  }
+  const keysA = Object.keys(objA);
+  const keysB = Object.keys(objB);
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+  for (const key of keysA) {
+    if (!objB.hasOwnProperty(key) || objA[key] !== objB[key]) {
+      return false;
+    }
+  }
+  return true;
+}
 function usePersistSignals({
   entries = [],
   onHydrated,
@@ -487,18 +513,21 @@ function usePersistSignals({
   return useObserve(
     () => {
       const persistence$ = adapterSubject.current.pipe(
-        rxjs.concatMap((adapter2) => {
-          if (!adapter2) return rxjs.NEVER;
-          return entriesSubject.current.pipe(
-            rxjs.concatMap(
-              (entries2) => persistSignals({
-                adapter: adapter2,
-                entries: entries2,
-                onHydrated: () => {
-                  var _a;
-                  (_a = onHydratedRef.current) == null ? void 0 : _a.call(onHydratedRef);
-                }
-              })
+        rxjs.switchMap((adapter2) => {
+          if (!adapter2) return rxjs.of({ type: "reset" });
+          return rxjs.merge(
+            rxjs.of({ type: "reset" }),
+            entriesSubject.current.pipe(
+              rxjs.concatMap(
+                (entries2) => persistSignals({
+                  adapter: adapter2,
+                  entries: entries2,
+                  onHydrated: () => {
+                    var _a;
+                    (_a = onHydratedRef.current) == null ? void 0 : _a.call(onHydratedRef);
+                  }
+                })
+              )
             )
           );
         })
@@ -506,6 +535,7 @@ function usePersistSignals({
       return persistence$.pipe(
         rxjs.scan(
           (acc, event) => {
+            if (event.type === "reset") return { isHydrated: false };
             if (event.type === "hydrated") return { isHydrated: true };
             return acc;
           },
@@ -513,8 +543,8 @@ function usePersistSignals({
         )
       );
     },
-    { defaultValue: { isHydrated: false } },
-    [adapterSubject]
+    { defaultValue: { isHydrated: false }, compareFn: shallowEqual },
+    [adapterSubject, entriesSubject]
   );
 }
 const useUnmountObservable = () => {
@@ -623,6 +653,90 @@ function isDefined(arg) {
 }
 const arrayEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
 const isServer = typeof window === "undefined" || "Deno" in window;
+function useQuery$(options, queryClient) {
+  const sub = React.useRef();
+  const _queryClient = reactQuery.useQueryClient(queryClient);
+  const queryFnAsync = (context) => {
+    let isResolved = false;
+    return new Promise((resolve, reject) => {
+      let lastData = void 0;
+      if (sub.current) {
+        sub.current.unsubscribe();
+        sub.current = void 0;
+      }
+      const unsub = _queryClient.getQueryCache().subscribe((d) => {
+        var _a;
+        if (d.type === "observerRemoved" && d.query.observers.length === 0) {
+          unsub();
+          _queryClient.cancelQueries({ queryKey: context.queryKey });
+          (_a = sub.current) == null ? void 0 : _a.unsubscribe();
+        }
+      });
+      const source = rxjs.defer(
+        () => typeof options.queryFn === "function" ? options.queryFn(context) : options.queryFn
+      );
+      sub.current = source.pipe(
+        rxjs.finalize(() => {
+          unsub();
+          isResolved = true;
+        })
+      ).subscribe({
+        next: (data) => {
+          lastData = data;
+          _queryClient == null ? void 0 : _queryClient.setQueryData(context.queryKey, data);
+        },
+        error: (error) => {
+          isResolved = true;
+          reject(error);
+        },
+        complete: () => {
+          if (lastData === void 0)
+            return reject(new Error("Stream completed without any data"));
+          if (isResolved) return;
+          isResolved = true;
+          resolve(lastData);
+        }
+      });
+    });
+  };
+  const result = reactQuery.useQuery(
+    {
+      ...options,
+      queryFn: queryFnAsync
+    },
+    queryClient
+  );
+  return result;
+}
+function useMutation$(options, queryClient) {
+  const mutationFnAsync = (variables) => {
+    let lastData;
+    return new Promise((resolve, reject) => {
+      const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+      source.pipe(rxjs.take(1)).subscribe({
+        next: (data) => {
+          lastData = data;
+        },
+        error: (error) => {
+          reject(error);
+        },
+        complete: () => {
+          if (lastData === void 0)
+            return reject(new Error("Stream completed without any data"));
+          resolve(lastData);
+        }
+      });
+    });
+  };
+  const result = reactQuery.useMutation(
+    {
+      ...options,
+      mutationFn: mutationFnAsync
+    },
+    queryClient
+  );
+  return result;
+}
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
 }
@@ -789,28 +903,6 @@ const matchKey = (keyA, keyB, { exact = false } = {}) => {
   }
   return partialMatchKey(keyA, keyB);
 };
-function shallowEqual(objA, objB) {
-  if (objA === null || objA === void 0 || objB === void 0) {
-    return objA === objB;
-  }
-  if (typeof objA !== "object" || typeof objB !== "object") {
-    return objA === objB;
-  }
-  if (objA.constructor !== (objB == null ? void 0 : objB.constructor)) {
-    return false;
-  }
-  const keysA = Object.keys(objA);
-  const keysB = Object.keys(objB);
-  if (keysA.length !== keysB.length) {
-    return false;
-  }
-  for (const key of keysA) {
-    if (!objB.hasOwnProperty(key) || objA[key] !== objB[key]) {
-      return false;
-    }
-  }
-  return true;
-}
 const distinctUntilStateChanged = (stream) => stream.pipe(
   rxjs.distinctUntilChanged(
     ({ data: prevData, ...prev }, { data: currData, ...curr }) => shallowEqual(prev, curr) && shallowEqual(prevData, currData)
@@ -1972,12 +2064,17 @@ const executeMutation = ({
   const isPaused = state.isPaused;
   const defaultFn = async () => await Promise.reject(new Error("No mutationFn found"));
   const mutationFn = options.mutationFn ?? defaultFn;
-  const contextFromOnMutate$ = makeObservable(
-    // eslint-disable-next-line @typescript-eslint/promise-function-async
-    () => {
-      var _a;
-      return ((_a = options.onMutate) == null ? void 0 : _a.call(options, variables)) ?? void 0;
-    }
+  const onMutateFactory = () => {
+    var _a;
+    return ((_a = options.onMutate) == null ? void 0 : _a.call(options, variables)) ?? void 0;
+  };
+  const contextFromOnMutate$ = makeObservable(onMutateFactory);
+  contextFromOnMutate$.pipe(
+    rxjs.tap((context) => {
+      if (context === void 0) {
+        throw new Error("onMutate returned undefined");
+      }
+    })
   );
   const rawContext$ = rxjs.of(state.context);
   const context$ = rxjs.iif(() => isPaused, rawContext$, contextFromOnMutate$).pipe(
@@ -2005,10 +2102,7 @@ const executeMutation = ({
   };
   const queryRunner$ = context$.pipe(
     rxjs.switchMap((context) => {
-      const fn$ = typeof mutationFn === "function" ? (
-        // eslint-disable-next-line @typescript-eslint/promise-function-async
-        makeObservable(() => mutationFn(variables))
-      ) : mutationFn;
+      const fn$ = typeof mutationFn === "function" ? makeObservable(() => mutationFn(variables)) : mutationFn;
       const sharedFn$ = fn$.pipe(rxjs.share());
       const completeWithoutValue$ = sharedFn$.pipe(
         rxjs.isEmpty(),
@@ -2185,6 +2279,7 @@ class Mutation {
                   return (_b = (_a = mutationCache.config).onMutate) == null ? void 0 : _b.call(
                     _a,
                     variables2,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2208,6 +2303,7 @@ class Mutation {
                     error,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2230,6 +2326,7 @@ class Mutation {
                     error,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2251,6 +2348,7 @@ class Mutation {
                     data,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -3406,11 +3504,13 @@ exports.useForeverQuery = useForeverQuery;
 exports.useLiveRef = useLiveRef;
 exports.useMount = useMount;
 exports.useMutation = useMutation;
+exports.useMutation$ = useMutation$;
 exports.useObservableState = useObservableState;
 exports.useObserve = useObserve;
 exports.useObserveCallback = useObserveCallback;
 exports.usePersistSignals = usePersistSignals;
 exports.useQuery = useQuery;
+exports.useQuery$ = useQuery$;
 exports.useQueryClient = useQueryClient;
 exports.useSignal = useSignal;
 exports.useSignalValue = useSignalValue;

package/dist/index.d.ts

@@ -13,6 +13,8 @@ export * from './lib/state/persistance/adapters/createLocalStorageAdapter';
 export * from './lib/state/react/usePersistSignals';
 export { type SignalPersistenceConfig } from './lib/state/persistance/types';
 export * from './lib/utils';
+export * from './lib/tmp/useQuery$';
+export * from './lib/tmp/useMutation$';
 export * from './lib/queries/react/mutations/useMutation';
 export * from './lib/queries/react/queries/useQuery';
 export * from './lib/queries/react/useQueryClient';

package/dist/index.js

@@ -11,8 +11,9 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 var _trigger$, _mutationRunner, _currentMutationSubject, _visibility$, _focusedSubject, _client, _currentQuery, _fetchSubject, _currentQueryInitialState, _lastResult, _lastQueryWithDefinedData, _observers, _observerCount, _cancelSubject, _executeSubject, _store, _defaultOptions, _initialState, _notifySubject, _store2, _mutationCache, _queryCache, _mutationDefaults, _queryDefaults, _defaultOptions2;
 import * as React from "react";
 import { useRef, useMemo, useCallback, useSyncExternalStore, useEffect, useState, createContext, memo, useContext } from "react";
-import { isObservable, from, of, defer, distinctUntilChanged, tap, catchError, EMPTY, Subject, BehaviorSubject, skip, first, map, switchMap, zip, share, merge, throttleTime, asyncScheduler, concatMap, NEVER, scan, throwError, timer, Observable, takeWhile, filter, last, mergeMap as mergeMap$1, takeUntil, identity, shareReplay, ignoreElements, fromEvent, noop as noop$1, startWith, pairwise, delay, interval, withLatestFrom, retry, iif, isEmpty, concat, toArray, take, combineLatest, endWith, lastValueFrom } from "rxjs";
+import { isObservable, from, of, defer, startWith, identity, distinctUntilChanged, tap, catchError, EMPTY, Subject, BehaviorSubject, skip, first, map, switchMap, zip, share, merge, throttleTime, asyncScheduler, concatMap, scan, throwError, timer, finalize, take, Observable, takeWhile, filter, last, mergeMap as mergeMap$1, takeUntil, shareReplay, ignoreElements, fromEvent, noop as noop$1, pairwise, NEVER, delay, interval, withLatestFrom, retry, iif, isEmpty, concat, toArray, combineLatest, endWith, lastValueFrom } from "rxjs";
 import { catchError as catchError$1, mergeMap, retryWhen, concatMap as concatMap$1, first as first$1, tap as tap$1 } from "rxjs/operators";
+import { useQueryClient as useQueryClient$1, useQuery as useQuery$1, useMutation as useMutation$1 } from "@tanstack/react-query";
 import { jsxs, jsx } from "react/jsx-runtime";
 const useLiveRef = (value) => {
   const ref = useRef(value);
@@ -43,7 +44,8 @@ function makeObservable(something) {
 function useObserve(source$, optionsOrDeps, maybeDeps) {
   const options = optionsOrDeps != null && !Array.isArray(optionsOrDeps) ? optionsOrDeps : {
     defaultValue: void 0,
-    unsubscribeOnUnmount: true
+    unsubscribeOnUnmount: true,
+    compareFn: void 0
   };
   const deps = !maybeDeps && Array.isArray(optionsOrDeps) ? optionsOrDeps : typeof source$ === "function" ? maybeDeps ?? [] : [source$];
   const valueRef = useRef(
@@ -55,13 +57,15 @@ function useObserve(source$, optionsOrDeps, maybeDeps) {
     (next) => {
       const source = sourceRef.current;
       const sub = makeObservable(source).pipe(
+        optionsRef.current.defaultValue ? startWith(optionsRef.current.defaultValue) : identity,
         /**
-         * @important
-         * We only check primitives because underlying subscription might
-         * be using objects and keeping same reference but pushing new
-         * properties values
+         * @important there is already a Object.is comparison in place from react
+         * so we only add a custom compareFn if provided
          */
-        distinctUntilChanged((a, b) => a === b),
+        optionsRef.current.compareFn ? distinctUntilChanged((a, b) => {
+          if (a === void 0 || b === void 0) return false;
+          return optionsRef.current.compareFn(a, b);
+        }) : identity,
         tap((value) => {
           valueRef.current = value;
         }),
@@ -187,7 +191,7 @@ function signal(config = {}) {
     default: config.default,
     key: config.key
   };
-  const { default: defaultValue } = normalizedConfig ?? {};
+  const { default: defaultValue } = normalizedConfig;
   const subject = new BehaviorSubject(defaultValue);
   const setValue = (arg) => {
     const update = (value) => {
@@ -458,6 +462,28 @@ function persistSignals({
     )
   );
 }
+function shallowEqual(objA, objB) {
+  if (objA === null || objA === void 0 || objB === void 0) {
+    return objA === objB;
+  }
+  if (typeof objA !== "object" || typeof objB !== "object") {
+    return objA === objB;
+  }
+  if (objA.constructor !== (objB == null ? void 0 : objB.constructor)) {
+    return false;
+  }
+  const keysA = Object.keys(objA);
+  const keysB = Object.keys(objB);
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+  for (const key of keysA) {
+    if (!objB.hasOwnProperty(key) || objA[key] !== objB[key]) {
+      return false;
+    }
+  }
+  return true;
+}
 function usePersistSignals({
   entries = [],
   onHydrated,
@@ -469,18 +495,21 @@ function usePersistSignals({
   return useObserve(
     () => {
       const persistence$ = adapterSubject.current.pipe(
-        concatMap((adapter2) => {
-          if (!adapter2) return NEVER;
-          return entriesSubject.current.pipe(
-            concatMap(
-              (entries2) => persistSignals({
-                adapter: adapter2,
-                entries: entries2,
-                onHydrated: () => {
-                  var _a;
-                  (_a = onHydratedRef.current) == null ? void 0 : _a.call(onHydratedRef);
-                }
-              })
+        switchMap((adapter2) => {
+          if (!adapter2) return of({ type: "reset" });
+          return merge(
+            of({ type: "reset" }),
+            entriesSubject.current.pipe(
+              concatMap(
+                (entries2) => persistSignals({
+                  adapter: adapter2,
+                  entries: entries2,
+                  onHydrated: () => {
+                    var _a;
+                    (_a = onHydratedRef.current) == null ? void 0 : _a.call(onHydratedRef);
+                  }
+                })
+              )
             )
           );
         })
@@ -488,6 +517,7 @@ function usePersistSignals({
       return persistence$.pipe(
         scan(
           (acc, event) => {
+            if (event.type === "reset") return { isHydrated: false };
             if (event.type === "hydrated") return { isHydrated: true };
             return acc;
           },
@@ -495,8 +525,8 @@ function usePersistSignals({
         )
       );
     },
-    { defaultValue: { isHydrated: false } },
-    [adapterSubject]
+    { defaultValue: { isHydrated: false }, compareFn: shallowEqual },
+    [adapterSubject, entriesSubject]
   );
 }
 const useUnmountObservable = () => {
@@ -605,6 +635,90 @@ function isDefined(arg) {
 }
 const arrayEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
 const isServer = typeof window === "undefined" || "Deno" in window;
+function useQuery$(options, queryClient) {
+  const sub = useRef();
+  const _queryClient = useQueryClient$1(queryClient);
+  const queryFnAsync = (context) => {
+    let isResolved = false;
+    return new Promise((resolve, reject) => {
+      let lastData = void 0;
+      if (sub.current) {
+        sub.current.unsubscribe();
+        sub.current = void 0;
+      }
+      const unsub = _queryClient.getQueryCache().subscribe((d) => {
+        var _a;
+        if (d.type === "observerRemoved" && d.query.observers.length === 0) {
+          unsub();
+          _queryClient.cancelQueries({ queryKey: context.queryKey });
+          (_a = sub.current) == null ? void 0 : _a.unsubscribe();
+        }
+      });
+      const source = defer(
+        () => typeof options.queryFn === "function" ? options.queryFn(context) : options.queryFn
+      );
+      sub.current = source.pipe(
+        finalize(() => {
+          unsub();
+          isResolved = true;
+        })
+      ).subscribe({
+        next: (data) => {
+          lastData = data;
+          _queryClient == null ? void 0 : _queryClient.setQueryData(context.queryKey, data);
+        },
+        error: (error) => {
+          isResolved = true;
+          reject(error);
+        },
+        complete: () => {
+          if (lastData === void 0)
+            return reject(new Error("Stream completed without any data"));
+          if (isResolved) return;
+          isResolved = true;
+          resolve(lastData);
+        }
+      });
+    });
+  };
+  const result = useQuery$1(
+    {
+      ...options,
+      queryFn: queryFnAsync
+    },
+    queryClient
+  );
+  return result;
+}
+function useMutation$(options, queryClient) {
+  const mutationFnAsync = (variables) => {
+    let lastData;
+    return new Promise((resolve, reject) => {
+      const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+      source.pipe(take(1)).subscribe({
+        next: (data) => {
+          lastData = data;
+        },
+        error: (error) => {
+          reject(error);
+        },
+        complete: () => {
+          if (lastData === void 0)
+            return reject(new Error("Stream completed without any data"));
+          resolve(lastData);
+        }
+      });
+    });
+  };
+  const result = useMutation$1(
+    {
+      ...options,
+      mutationFn: mutationFnAsync
+    },
+    queryClient
+  );
+  return result;
+}
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
 }
@@ -771,28 +885,6 @@ const matchKey = (keyA, keyB, { exact = false } = {}) => {
   }
   return partialMatchKey(keyA, keyB);
 };
-function shallowEqual(objA, objB) {
-  if (objA === null || objA === void 0 || objB === void 0) {
-    return objA === objB;
-  }
-  if (typeof objA !== "object" || typeof objB !== "object") {
-    return objA === objB;
-  }
-  if (objA.constructor !== (objB == null ? void 0 : objB.constructor)) {
-    return false;
-  }
-  const keysA = Object.keys(objA);
-  const keysB = Object.keys(objB);
-  if (keysA.length !== keysB.length) {
-    return false;
-  }
-  for (const key of keysA) {
-    if (!objB.hasOwnProperty(key) || objA[key] !== objB[key]) {
-      return false;
-    }
-  }
-  return true;
-}
 const distinctUntilStateChanged = (stream) => stream.pipe(
   distinctUntilChanged(
     ({ data: prevData, ...prev }, { data: currData, ...curr }) => shallowEqual(prev, curr) && shallowEqual(prevData, currData)
@@ -1954,12 +2046,17 @@ const executeMutation = ({
   const isPaused = state.isPaused;
   const defaultFn = async () => await Promise.reject(new Error("No mutationFn found"));
   const mutationFn = options.mutationFn ?? defaultFn;
-  const contextFromOnMutate$ = makeObservable(
-    // eslint-disable-next-line @typescript-eslint/promise-function-async
-    () => {
-      var _a;
-      return ((_a = options.onMutate) == null ? void 0 : _a.call(options, variables)) ?? void 0;
-    }
+  const onMutateFactory = () => {
+    var _a;
+    return ((_a = options.onMutate) == null ? void 0 : _a.call(options, variables)) ?? void 0;
+  };
+  const contextFromOnMutate$ = makeObservable(onMutateFactory);
+  contextFromOnMutate$.pipe(
+    tap((context) => {
+      if (context === void 0) {
+        throw new Error("onMutate returned undefined");
+      }
+    })
   );
   const rawContext$ = of(state.context);
   const context$ = iif(() => isPaused, rawContext$, contextFromOnMutate$).pipe(
@@ -1987,10 +2084,7 @@ const executeMutation = ({
   };
   const queryRunner$ = context$.pipe(
     switchMap((context) => {
-      const fn$ = typeof mutationFn === "function" ? (
-        // eslint-disable-next-line @typescript-eslint/promise-function-async
-        makeObservable(() => mutationFn(variables))
-      ) : mutationFn;
+      const fn$ = typeof mutationFn === "function" ? makeObservable(() => mutationFn(variables)) : mutationFn;
       const sharedFn$ = fn$.pipe(share());
       const completeWithoutValue$ = sharedFn$.pipe(
         isEmpty(),
@@ -2167,6 +2261,7 @@ class Mutation {
                   return (_b = (_a = mutationCache.config).onMutate) == null ? void 0 : _b.call(
                     _a,
                     variables2,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2190,6 +2285,7 @@ class Mutation {
                     error,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2212,6 +2308,7 @@ class Mutation {
                     error,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2233,6 +2330,7 @@ class Mutation {
                     data,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -3389,11 +3487,13 @@ export {
   useLiveRef,
   useMount,
   useMutation,
+  useMutation$,
   useObservableState,
   useObserve,
   useObserveCallback,
   usePersistSignals,
   useQuery,
+  useQuery$,
   useQueryClient,
   useSignal,
   useSignalValue,

package/dist/lib/binding/useObserve.d.ts

@@ -3,6 +3,7 @@ import { Observable, BehaviorSubject } from 'rxjs';
 interface Option<R = undefined> {
     defaultValue: R;
     unsubscribeOnUnmount?: boolean;
+    compareFn?: (a: R, b: R) => boolean;
 }
 export declare function useObserve<T>(source: BehaviorSubject<T>): T;
 export declare function useObserve<T>(source: Observable<T>): T | undefined;

package/dist/lib/logger.d.ts

@@ -9,18 +9,18 @@ export declare function createLogger(env: string): {
     namespace(name: string, style?: {
         backgroundColor: string;
         color: string;
-    }): any;
+    }): /*elided*/ any;
     printNamespaces(): {
         namespaces: string;
         styles: string[];
     };
-    print(method: "log" | "warn" | "error" | "group", ...message: any[]): any;
-    printWithoutNamespace(method: "log" | "warn" | "error" | "group", ...message: any[]): any;
-    log(...message: any): any;
-    warn(...message: any): any;
-    error(...message: any): any;
-    group(...message: any): any;
-    groupEnd(): any;
+    print(method: "log" | "warn" | "error" | "group", ...message: any[]): /*elided*/ any;
+    printWithoutNamespace(method: "log" | "warn" | "error" | "group", ...message: any[]): /*elided*/ any;
+    log(...message: any): /*elided*/ any;
+    warn(...message: any): /*elided*/ any;
+    error(...message: any): /*elided*/ any;
+    group(...message: any): /*elided*/ any;
+    groupEnd(): /*elided*/ any;
 };
 export declare const Logger: {
     namespaces: {
@@ -33,16 +33,16 @@ export declare const Logger: {
     namespace(name: string, style?: {
         backgroundColor: string;
         color: string;
-    }): any;
+    }): /*elided*/ any;
     printNamespaces(): {
         namespaces: string;
         styles: string[];
     };
-    print(method: "log" | "warn" | "error" | "group", ...message: any[]): any;
-    printWithoutNamespace(method: "log" | "warn" | "error" | "group", ...message: any[]): any;
-    log(...message: any): any;
-    warn(...message: any): any;
-    error(...message: any): any;
-    group(...message: any): any;
-    groupEnd(): any;
+    print(method: "log" | "warn" | "error" | "group", ...message: any[]): /*elided*/ any;
+    printWithoutNamespace(method: "log" | "warn" | "error" | "group", ...message: any[]): /*elided*/ any;
+    log(...message: any): /*elided*/ any;
+    warn(...message: any): /*elided*/ any;
+    error(...message: any): /*elided*/ any;
+    group(...message: any): /*elided*/ any;
+    groupEnd(): /*elided*/ any;
 };

package/dist/lib/queries/client/mutations/mutation/executeMutation.d.ts

@@ -1,4 +1,5 @@
 import { MutationOptions, MutationState } from './types';
+import { DefaultError } from '../../types';
 export declare const executeMutation: <TData = unknown, TError = Error, TVariables = void, TContext = unknown>({ variables, state, options }: {
     variables: TVariables;
     state: MutationState<TData, TError, TVariables, TContext>;

package/dist/lib/queries/client/mutations/utils/filters.d.ts

@@ -1,2 +1,3 @@
+import { DefaultError } from '../../types';
 import { MutationFilters } from '../types';
 export declare const createPredicateForFilters: <TData = unknown, TError = Error, TVariables = any, TContext = unknown>({ mutationKey, status, predicate, exact }?: MutationFilters<TData, TError, TVariables, TContext>) => (mutation: import('../mutation/Mutation').Mutation<TData, TError, TVariables, TContext>) => boolean;

package/dist/lib/queries/client/queries/query/execution/executeQuery.d.ts

@@ -1,5 +1,6 @@
 import { Observable } from 'rxjs';
 import { QueryKey } from '../../../keys/types';
+import { DefaultError } from '../../../types';
 import { QueryState } from '../types';
 import { QueryOptions } from '../../types';
 export declare const executeQuery: <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: QueryOptions<TQueryFnData, TError, TData, TQueryKey> & {

package/dist/lib/queries/client/queries/query/operators.d.ts

@@ -1,3 +1,4 @@
+import { DefaultError } from '../../types';
 import { Observable } from 'rxjs';
 import { QueryOptions } from '../types';
 import { QueryState } from './types';

package/dist/lib/queries/client/queries/query/state/whenNewData.d.ts

@@ -1,4 +1,5 @@
 import { Observable } from 'rxjs';
+import { DefaultError } from '../../../types';
 import { QueryState } from '../types';
 export declare const whenNewData: <TQueryFnData = unknown, TError = Error, TData = TQueryFnData>(source: Observable<Partial<QueryState<TData, TError>>>) => Observable<{
     data: TData | undefined;

package/dist/lib/queries/client/utils/makeObservable.d.ts

@@ -1,6 +1,20 @@
 import { Observable } from 'rxjs';
-export declare function makeObservable<Data>(fn: () => Observable<Data> | Data | Promise<Data>): Observable<Data>;
-export declare function makeObservable<Data>(fn: () => Data): Data extends Observable<infer ObservedData> ? Observable<ObservedData> : Data extends Promise<infer ThenData> ? Observable<ThenData> : Observable<Data>;
-export declare function makeObservable<Data>(fn: Data): Observable<Data>;
-export declare function makeObservable<Data>(fn: Promise<Data>): Observable<Data>;
+type FnReturnToObservable<T> = T extends Observable<infer ObservedData> ? ObservedData : T extends Promise<infer ThenData> ? ThenData : T;
 export declare function makeObservable<Data>(fn: Observable<Data>): Observable<Data>;
+export declare function makeObservable<Data>(fn: Promise<Data>): Observable<Data>;
+export declare function makeObservable<Data>(fn: Promise<Data> | Observable<Data>): Observable<Data>;
+export declare function makeObservable<Data>(fn: () => Promise<Data> | Observable<Data>): Observable<Data>;
+/**
+ * Generic factory
+ */
+export declare function makeObservable<TContext>(fn: () => Promise<TContext | undefined> | Observable<TContext | undefined> | TContext | undefined): Observable<undefined | TContext>;
+/**
+ * Generic factory
+ */
+export declare function makeObservable<Return>(fn: () => Return): Observable<FnReturnToObservable<Return>>;
+/**
+ * Generic factory OR Observable
+ */
+export declare function makeObservable<Data, Return>(fn: Observable<Data> | (() => Return)): Observable<Data | FnReturnToObservable<Return>>;
+export declare function makeObservable<Data>(fn: Data): Observable<Data>;
+export {};

package/dist/lib/state/react/usePersistSignals.d.ts

@@ -3,6 +3,9 @@ import { Adapter } from '../persistance/adapters/Adapter';
 /**
  * Make sure to pass stable reference of entries and adapter if you don't
  * intentionally want to start over the process.
+ *
+ * `isHydrated` will be `true` after the first successful hydration. This value
+ * will be reset as soon as the adapter reference changes.
  */
 export declare function usePersistSignals({ entries, onHydrated, adapter }: {
     /**

package/dist/lib/tmp/useMutation$.d.ts

@@ -0,0 +1,5 @@
+import { DefaultError, QueryClient, UseMutationOptions } from '@tanstack/react-query';
+import { Observable } from 'rxjs';
+export declare function useMutation$<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(options: Omit<UseMutationOptions<TData, TError, TVariables, TContext>, "mutationFn"> & {
+    mutationFn: ((variables: TVariables) => Observable<TData>) | Observable<TData>;
+}, queryClient?: QueryClient): import('@tanstack/react-query').UseMutationResult<TData, TError, TVariables, TContext>;

package/dist/lib/tmp/useMutation.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/tmp/useQuery$.d.ts

@@ -0,0 +1,5 @@
+import { DefaultError, QueryClient, QueryFunctionContext, QueryKey, UseQueryOptions } from '@tanstack/react-query';
+import { Observable } from 'rxjs';
+export declare function useQuery$<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: Omit<UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>, "queryFn"> & {
+    queryFn: ((context: QueryFunctionContext<TQueryKey>) => Observable<TQueryFnData>) | Observable<TQueryFnData>;
+}, queryClient?: QueryClient): import('@tanstack/react-query').UseQueryResult<TData, TError>;

package/dist/lib/tmp/useQuery.cleanup.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/tmp/useQuery.deduplication.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/tmp/useQuery.invalidation.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/tmp/useQuery.keys.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/tmp/useQuery.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reactjrx",
   "private": false,
-  "version": "1.101.0",
+  "version": "1.104.0",
   "type": "module",
   "files": [
     "dist"
@@ -14,9 +14,6 @@
       "require": "./dist/index.umd.cjs"
     }
   },
-  "engines": {
-    "node": "20"
-  },
   "types": "./dist/index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -37,10 +34,10 @@
   "peerDependencies": {
     "react": "18",
     "react-dom": "18",
-    "rxjs": "*"
+    "rxjs": "*",
+    "@tanstack/react-query": "^5.8.4"
   },
   "devDependencies": {
-    "@tanstack/react-query": "^5.8.4",
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/react": "^16.0.0",
     "@types/node": "^20.0.0",
@@ -61,7 +58,7 @@
     "rollup-plugin-node-externals": "^7.0.1",
     "rxjs": "^7.8.0",
     "semantic-release": "^24.1.1",
-    "typescript": "5.6.2",
+    "typescript": "^5.6.2",
     "vite": "^5.1.3",
     "vite-plugin-dts": "^4.2.1",
     "vitest": "^1.3.0"