@tanstack/react-query 5.17.19 → 5.18.1

package/src/__tests__/useMutationState.test.tsx

@@ -14,12 +14,12 @@ import type { MutationState, MutationStatus } from '@tanstack/query-core'
 
 describe('useIsMutating', () => {
   it('should return the number of fetching mutations', async () => {
-    const isMutatings: Array<number> = []
+    const isMutatingArray: Array<number> = []
     const queryClient = createQueryClient()
 
     function IsMutating() {
       const isMutating = useIsMutating()
-      isMutatings.push(isMutating)
+      isMutatingArray.push(isMutating)
       return null
     }
 
@@ -59,16 +59,16 @@ describe('useIsMutating', () => {
     }
 
     renderWithClient(queryClient, <Page />)
-    await waitFor(() => expect(isMutatings).toEqual([0, 1, 2, 1, 0]))
+    await waitFor(() => expect(isMutatingArray).toEqual([0, 1, 2, 1, 0]))
   })
 
   it('should filter correctly by mutationKey', async () => {
-    const isMutatings: Array<number> = []
+    const isMutatingArray: Array<number> = []
     const queryClient = createQueryClient()
 
     function IsMutating() {
       const isMutating = useIsMutating({ mutationKey: ['mutation1'] })
-      isMutatings.push(isMutating)
+      isMutatingArray.push(isMutating)
       return null
     }
 
@@ -97,11 +97,11 @@ describe('useIsMutating', () => {
     }
 
     renderWithClient(queryClient, <Page />)
-    await waitFor(() => expect(isMutatings).toEqual([0, 1, 0]))
+    await waitFor(() => expect(isMutatingArray).toEqual([0, 1, 0]))
   })
 
   it('should filter correctly by predicate', async () => {
-    const isMutatings: Array<number> = []
+    const isMutatingArray: Array<number> = []
     const queryClient = createQueryClient()
 
     function IsMutating() {
@@ -109,7 +109,7 @@ describe('useIsMutating', () => {
         predicate: (mutation) =>
           mutation.options.mutationKey?.[0] === 'mutation1',
       })
-      isMutatings.push(isMutating)
+      isMutatingArray.push(isMutating)
       return null
     }
 
@@ -138,7 +138,7 @@ describe('useIsMutating', () => {
     }
 
     renderWithClient(queryClient, <Page />)
-    await waitFor(() => expect(isMutatings).toEqual([0, 1, 0]))
+    await waitFor(() => expect(isMutatingArray).toEqual([0, 1, 0]))
   })
 
   it('should use provided custom queryClient', async () => {

package/src/__tests__/useQuery.test.tsx

@@ -1183,7 +1183,7 @@ describe('useQuery', () => {
     )
   })
 
-  it('should not update disabled query when refetched with refetchQueries', async () => {
+  it('should not update disabled query when refetching with refetchQueries', async () => {
     const key = queryKey()
     const states: Array<UseQueryResult<number>> = []
     let count = 0
@@ -2722,7 +2722,7 @@ describe('useQuery', () => {
     await waitFor(() => rendered.getByText('data: 1, isFetching: false'))
   })
 
-  it('should calculate focus behaviour for `refetchOnWindowFocus` depending on function', async () => {
+  it('should calculate focus behavior for `refetchOnWindowFocus` depending on function', async () => {
     const key = queryKey()
     const states: Array<UseQueryResult<number>> = []
     let count = 0
@@ -2859,7 +2859,7 @@ describe('useQuery', () => {
       const { status, error } = useQuery({
         queryKey: key,
         queryFn: () => {
-          return Promise.reject(new Error('Error test jaylen'))
+          return Promise.reject(new Error('Error test'))
         },
         retry: false,
       })
@@ -2875,7 +2875,7 @@ describe('useQuery', () => {
     const rendered = renderWithClient(queryClient, <Page />)
 
     await waitFor(() => rendered.getByText('error'))
-    await waitFor(() => rendered.getByText('Error test jaylen'))
+    await waitFor(() => rendered.getByText('Error test'))
 
     consoleMock.mockRestore()
   })
@@ -2889,7 +2889,7 @@ describe('useQuery', () => {
     function Page() {
       const { status, error } = useQuery<unknown, string>({
         queryKey: key,
-        queryFn: () => Promise.reject(new Error('Error test jaylen')),
+        queryFn: () => Promise.reject(new Error('Error test')),
         retry: false,
         throwOnError: true,
       })

package/src/__tests__/utils.tsx

@@ -78,9 +78,9 @@ export function setActTimeout(fn: () => void, ms?: number) {
   }, ms)
 }
 
-export type Equal<X, Y> = (<T>() => T extends X ? 1 : 2) extends <
-  T,
->() => T extends Y ? 1 : 2
+export type Equal<TTargetA, TTargetB> = (<T>() => T extends TTargetA
+  ? 1
+  : 2) extends <T>() => T extends TTargetB ? 1 : 2
   ? true
   : false
 

package/src/types.ts

@@ -168,4 +168,8 @@ export type UseMutationResult<
   TContext = unknown,
 > = UseBaseMutationResult<TData, TError, TVariables, TContext>
 
-type Override<A, B> = { [K in keyof A]: K extends keyof B ? B[K] : A[K] }
+type Override<TTargetA, TTargetB> = {
+  [AKey in keyof TTargetA]: AKey extends keyof TTargetB
+    ? TTargetB[AKey]
+    : TTargetA[AKey]
+}

package/src/useQueries.ts

@@ -159,19 +159,19 @@ type GetResults<T> =
  */
 export type QueriesOptions<
   T extends Array<any>,
-  Result extends Array<any> = [],
-  Depth extends ReadonlyArray<number> = [],
-> = Depth['length'] extends MAXIMUM_DEPTH
+  TResult extends Array<any> = [],
+  TDepth extends ReadonlyArray<number> = [],
+> = TDepth['length'] extends MAXIMUM_DEPTH
   ? Array<UseQueryOptionsForUseQueries>
   : T extends []
     ? []
     : T extends [infer Head]
-      ? [...Result, GetOptions<Head>]
+      ? [...TResult, GetOptions<Head>]
       : T extends [infer Head, ...infer Tail]
         ? QueriesOptions<
             [...Tail],
-            [...Result, GetOptions<Head>],
-            [...Depth, 1]
+            [...TResult, GetOptions<Head>],
+            [...TDepth, 1]
           >
         : Array<unknown> extends T
           ? T
@@ -201,19 +201,19 @@ export type QueriesOptions<
  */
 export type QueriesResults<
   T extends Array<any>,
-  Result extends Array<any> = [],
-  Depth extends ReadonlyArray<number> = [],
-> = Depth['length'] extends MAXIMUM_DEPTH
+  TResult extends Array<any> = [],
+  TDepth extends ReadonlyArray<number> = [],
+> = TDepth['length'] extends MAXIMUM_DEPTH
   ? Array<UseQueryResult>
   : T extends []
     ? []
     : T extends [infer Head]
-      ? [...Result, GetResults<Head>]
+      ? [...TResult, GetResults<Head>]
       : T extends [infer Head, ...infer Tail]
         ? QueriesResults<
             [...Tail],
-            [...Result, GetResults<Head>],
-            [...Depth, 1]
+            [...TResult, GetResults<Head>],
+            [...TDepth, 1]
           >
         : T extends Array<
               UseQueryOptionsForUseQueries<

package/src/useSuspenseQueries.ts

@@ -100,19 +100,19 @@ type GetSuspenseResults<T> =
  */
 export type SuspenseQueriesOptions<
   T extends Array<any>,
-  Result extends Array<any> = [],
-  Depth extends ReadonlyArray<number> = [],
-> = Depth['length'] extends MAXIMUM_DEPTH
+  TResult extends Array<any> = [],
+  TDepth extends ReadonlyArray<number> = [],
+> = TDepth['length'] extends MAXIMUM_DEPTH
   ? Array<UseSuspenseQueryOptions>
   : T extends []
     ? []
     : T extends [infer Head]
-      ? [...Result, GetSuspenseOptions<Head>]
+      ? [...TResult, GetSuspenseOptions<Head>]
       : T extends [infer Head, ...infer Tail]
         ? SuspenseQueriesOptions<
             [...Tail],
-            [...Result, GetSuspenseOptions<Head>],
-            [...Depth, 1]
+            [...TResult, GetSuspenseOptions<Head>],
+            [...TDepth, 1]
           >
         : Array<unknown> extends T
           ? T
@@ -137,19 +137,19 @@ export type SuspenseQueriesOptions<
  */
 export type SuspenseQueriesResults<
   T extends Array<any>,
-  Result extends Array<any> = [],
-  Depth extends ReadonlyArray<number> = [],
-> = Depth['length'] extends MAXIMUM_DEPTH
+  TResult extends Array<any> = [],
+  TDepth extends ReadonlyArray<number> = [],
+> = TDepth['length'] extends MAXIMUM_DEPTH
   ? Array<UseSuspenseQueryResult>
   : T extends []
     ? []
     : T extends [infer Head]
-      ? [...Result, GetSuspenseResults<Head>]
+      ? [...TResult, GetSuspenseResults<Head>]
       : T extends [infer Head, ...infer Tail]
         ? SuspenseQueriesResults<
             [...Tail],
-            [...Result, GetSuspenseResults<Head>],
-            [...Depth, 1]
+            [...TResult, GetSuspenseResults<Head>],
+            [...TDepth, 1]
           >
         : T extends Array<
               UseSuspenseQueryOptions<