reactjrx 1.101.0 → 1.101.1

package/dist/index.cjs

@@ -61,7 +61,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 +74,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;
         }),
@@ -476,6 +479,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 +512,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 +534,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 +542,8 @@ function usePersistSignals({
         )
       );
     },
-    { defaultValue: { isHydrated: false } },
-    [adapterSubject]
+    { defaultValue: { isHydrated: false }, compareFn: shallowEqual },
+    [adapterSubject, entriesSubject]
   );
 }
 const useUnmountObservable = () => {
@@ -789,28 +818,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 +1979,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 +2017,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 +2194,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 +2218,7 @@ class Mutation {
                     error,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2230,6 +2241,7 @@ class Mutation {
                     error,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2251,6 +2263,7 @@ class Mutation {
                     data,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }

package/dist/index.js

@@ -11,7 +11,7 @@ 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, 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, take, 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 { jsxs, jsx } from "react/jsx-runtime";
 const useLiveRef = (value) => {
@@ -43,7 +43,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 +56,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;
         }),
@@ -458,6 +461,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 +494,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 +516,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 +524,8 @@ function usePersistSignals({
         )
       );
     },
-    { defaultValue: { isHydrated: false } },
-    [adapterSubject]
+    { defaultValue: { isHydrated: false }, compareFn: shallowEqual },
+    [adapterSubject, entriesSubject]
   );
 }
 const useUnmountObservable = () => {
@@ -771,28 +800,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 +1961,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 +1999,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 +2176,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 +2200,7 @@ class Mutation {
                     error,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2212,6 +2223,7 @@ class Mutation {
                     error,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }
@@ -2233,6 +2245,7 @@ class Mutation {
                     data,
                     variables2,
                     context,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     this
                   );
                 }

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/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reactjrx",
   "private": false,
-  "version": "1.101.0",
+  "version": "1.101.1",
   "type": "module",
   "files": [
     "dist"
@@ -61,7 +61,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"