reactjrx 1.31.1 → 1.33.0

package/dist/index.cjs

@@ -509,8 +509,9 @@ function useMutation(query, mapOperatorOrOptions, options = {}) {
                 rxjs.first(),
                 rxjs.map((data) => ({ data, isError: false })),
                 rxjs.catchError((error) => {
+                  console.error(error);
                   if (optionsRef.current.onError != null) {
-                    optionsRef.current.onError(error);
+                    optionsRef.current.onError(error, args);
                   }
                   return rxjs.of({ data: error, isError: true });
                 })
@@ -520,7 +521,7 @@ function useMutation(query, mapOperatorOrOptions, options = {}) {
               rxjs.map(([{ data, isError }, isLastMutationCalled2]) => {
                 if (!isError) {
                   if (optionsRef.current.onSuccess != null)
-                    optionsRef.current.onSuccess(data);
+                    optionsRef.current.onSuccess(data, args);
                 }
                 if (isLastMutationCalled2) {
                   return isError ? {
@@ -683,6 +684,33 @@ const autoRefetch = (options = {}) => (source) => {
     })
   );
 };
+function isDefined(arg) {
+  return arg !== null && arg !== void 0;
+}
+const withKeyComparison = (stream) => stream.pipe(
+  rxjs.startWith(void 0),
+  rxjs.pairwise(),
+  rxjs.map(([previous, current]) => {
+    if (current) {
+      if (!previous) {
+        return {
+          ...current,
+          previousKey: void 0,
+          isUsingDifferentKey: true
+        };
+      }
+      const serializedKey = serializeKey(current.key);
+      const serializedPreviousKey = serializeKey(previous.key);
+      return {
+        ...current,
+        previousKey: (previous == null ? void 0 : previous.key) ?? current.key,
+        isUsingDifferentKey: serializedPreviousKey !== serializedKey
+      };
+    }
+    return void 0;
+  }),
+  rxjs.filter(isDefined)
+);
 function useQuery(keyOrQuery, queryOrOptionOrNothing, optionsOrNothing) {
   const query = Array.isArray(keyOrQuery) ? queryOrOptionOrNothing : keyOrQuery;
   const options = optionsOrNothing ?? (queryOrOptionOrNothing !== query ? queryOrOptionOrNothing : void 0) ?? {};
@@ -746,13 +774,15 @@ function useQuery(keyOrQuery, queryOrOptionOrNothing, optionsOrNothing) {
         options: options2,
         query: query2
       })),
+      withKeyComparison,
       rxjs.filter(({ enabled }) => enabled),
-      rxjs.switchMap(({ key: key2, options: options2, query: query2 }) => {
+      rxjs.switchMap(({ key: key2, options: options2, isUsingDifferentKey, query: query2 }) => {
         const serializedKey = serializeKey(key2);
         return rxjs.of(null).pipe(
           rxjs.tap(() => {
             data$.current.next({
               ...data$.current.getValue(),
+              data: isUsingDifferentKey ? void 0 : data$.current.getValue().data,
               error: void 0,
               isLoading: true
             });

package/dist/index.js

@@ -1,5 +1,5 @@
 import { useRef, useMemo, useCallback, useSyncExternalStore, useEffect, createContext, memo, useContext, useState } from "react";
-import { distinctUntilChanged, tap, finalize, catchError, EMPTY, Subject, identity, BehaviorSubject, of, zip, from, map, merge, throttleTime, switchMap, defer, iif, timer, throwError, take, startWith, combineLatest, first, takeUntil, filter, concatMap as concatMap$1, mergeMap, skip, interval, withLatestFrom, shareReplay, repeat, share, retry } from "rxjs";
+import { distinctUntilChanged, tap, finalize, catchError, EMPTY, Subject, identity, BehaviorSubject, of, zip, from, map, merge, throttleTime, switchMap, defer, iif, timer, throwError, take, startWith, combineLatest, first, takeUntil, filter, concatMap as concatMap$1, mergeMap, skip, interval, withLatestFrom, shareReplay, repeat, pairwise, share, retry } from "rxjs";
 import { jsx } from "react/jsx-runtime";
 import { retryWhen, concatMap, tap as tap$1 } from "rxjs/operators";
 const useLiveRef = (value) => {
@@ -507,8 +507,9 @@ function useMutation(query, mapOperatorOrOptions, options = {}) {
                 first(),
                 map((data) => ({ data, isError: false })),
                 catchError((error) => {
+                  console.error(error);
                   if (optionsRef.current.onError != null) {
-                    optionsRef.current.onError(error);
+                    optionsRef.current.onError(error, args);
                   }
                   return of({ data: error, isError: true });
                 })
@@ -518,7 +519,7 @@ function useMutation(query, mapOperatorOrOptions, options = {}) {
               map(([{ data, isError }, isLastMutationCalled2]) => {
                 if (!isError) {
                   if (optionsRef.current.onSuccess != null)
-                    optionsRef.current.onSuccess(data);
+                    optionsRef.current.onSuccess(data, args);
                 }
                 if (isLastMutationCalled2) {
                   return isError ? {
@@ -681,6 +682,33 @@ const autoRefetch = (options = {}) => (source) => {
     })
   );
 };
+function isDefined(arg) {
+  return arg !== null && arg !== void 0;
+}
+const withKeyComparison = (stream) => stream.pipe(
+  startWith(void 0),
+  pairwise(),
+  map(([previous, current]) => {
+    if (current) {
+      if (!previous) {
+        return {
+          ...current,
+          previousKey: void 0,
+          isUsingDifferentKey: true
+        };
+      }
+      const serializedKey = serializeKey(current.key);
+      const serializedPreviousKey = serializeKey(previous.key);
+      return {
+        ...current,
+        previousKey: (previous == null ? void 0 : previous.key) ?? current.key,
+        isUsingDifferentKey: serializedPreviousKey !== serializedKey
+      };
+    }
+    return void 0;
+  }),
+  filter(isDefined)
+);
 function useQuery(keyOrQuery, queryOrOptionOrNothing, optionsOrNothing) {
   const query = Array.isArray(keyOrQuery) ? queryOrOptionOrNothing : keyOrQuery;
   const options = optionsOrNothing ?? (queryOrOptionOrNothing !== query ? queryOrOptionOrNothing : void 0) ?? {};
@@ -744,13 +772,15 @@ function useQuery(keyOrQuery, queryOrOptionOrNothing, optionsOrNothing) {
         options: options2,
         query: query2
       })),
+      withKeyComparison,
       filter(({ enabled }) => enabled),
-      switchMap(({ key: key2, options: options2, query: query2 }) => {
+      switchMap(({ key: key2, options: options2, isUsingDifferentKey, query: query2 }) => {
         const serializedKey = serializeKey(key2);
         return of(null).pipe(
           tap(() => {
             data$.current.next({
               ...data$.current.getValue(),
+              data: isUsingDifferentKey ? void 0 : data$.current.getValue().data,
               error: void 0,
               isLoading: true
             });

package/dist/lib/queries/keys/withKeyComparison.d.ts

@@ -0,0 +1,16 @@
+import type { Observable } from "rxjs";
+export declare const withKeyComparison: <T extends {
+    key: any[];
+}>(stream: Observable<T>) => Observable<(T & {
+    previousKey: undefined;
+    isUsingDifferentKey: boolean;
+} extends infer T_1 ? T_1 extends T & {
+    previousKey: undefined;
+    isUsingDifferentKey: boolean;
+} ? T_1 extends null | undefined ? never : T_1 : never : never) | (T & {
+    previousKey: any[];
+    isUsingDifferentKey: boolean;
+} extends infer T_2 ? T_2 extends T & {
+    previousKey: any[];
+    isUsingDifferentKey: boolean;
+} ? T_2 extends null | undefined ? never : T_2 : never : never)>;

package/dist/lib/queries/useMutation.d.ts

@@ -4,20 +4,20 @@ interface QueryState<R> {
     status: "idle" | "loading" | "error" | "success";
     error: unknown;
 }
-export interface MutationOptions<R> {
+export interface MutationOptions<Result, Params> {
     retry?: false | number | ((attempt: number, error: unknown) => boolean);
     /**
      * Called for every mutation on error.
      * `merge` mapping will run callback as they happen.
      * Use `concat` if you need to run callbacks in order of calling.
      */
-    onError?: (error: unknown) => void;
+    onError?: (error: unknown, params: Params) => void;
     /**
      * Called for every mutation on success.
      * `merge` mapping will run callback as they happen.
      * Use `concat` if you need to run callbacks in order of calling.
      */
-    onSuccess?: (data: R) => void;
+    onSuccess?: (data: Result, params: Params) => void;
     /**
      * When true, any running mutation will be cancelled (when possible) on unmount.
      * You need to handle it yourself for promises if needed.
@@ -33,7 +33,7 @@ export interface MutationOptions<R> {
      * Only use for debugging.
      * It is not the main subscription hook, only the one following the trigger.
      */
-    triggerHook?: MonoTypeOperatorFunction<Partial<QueryState<R>> | undefined>;
+    triggerHook?: MonoTypeOperatorFunction<Partial<QueryState<Result>> | undefined>;
 }
 interface Result<A, R> {
     status: "idle" | "loading" | "error" | "success";
@@ -77,6 +77,6 @@ interface Result<A, R> {
  * Result correspond to the current running mutation.
  */
 type MapOperator = "switch" | "concat" | "merge";
-export declare function useMutation<A = void, R = undefined>(query: (args: A) => Promise<R> | Observable<R>, mapOperatorOrOptions?: MapOperator, options?: MutationOptions<R>): Result<A, R>;
-export declare function useMutation<A = void, R = undefined>(query: (args: A) => Promise<R> | Observable<R>, mapOperatorOrOptions?: MutationOptions<R>): Result<A, R>;
+export declare function useMutation<A = void, R = undefined>(query: (args: A) => Promise<R> | Observable<R>, mapOperatorOrOptions?: MapOperator, options?: MutationOptions<R, A>): Result<A, R>;
+export declare function useMutation<A = void, R = undefined>(query: (args: A) => Promise<R> | Observable<R>, mapOperatorOrOptions?: MutationOptions<R, A>): Result<A, R>;
 export {};

package/dist/lib/utils/isDefined.d.ts

@@ -0,0 +1 @@
+export declare function isDefined<T>(arg: T | null | undefined): arg is T extends null | undefined ? never : T;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reactjrx",
   "private": false,
-  "version": "1.31.1",
+  "version": "1.33.0",
   "type": "module",
   "files": [
     "dist"