reactjrx 1.32.0 → 1.33.0

package/dist/index.cjs

@@ -684,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) ?? {};
@@ -747,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) => {
@@ -682,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) ?? {};
@@ -745,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/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.32.0",
+  "version": "1.33.0",
   "type": "module",
   "files": [
     "dist"