@tanstack/react-query 5.8.2 → 5.8.4

package/src/useQueries.ts

@@ -57,68 +57,79 @@ type GetOptions<T> =
   }
     ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>
     : T extends { queryFnData: infer TQueryFnData; error?: infer TError }
-    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>
-    : T extends { data: infer TData; error?: infer TError }
-    ? UseQueryOptionsForUseQueries<unknown, TError, TData>
-    : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]
-    T extends [infer TQueryFnData, infer TError, infer TData]
-    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>
-    : T extends [infer TQueryFnData, infer TError]
-    ? UseQueryOptionsForUseQueries<TQueryFnData, TError>
-    : T extends [infer TQueryFnData]
-    ? UseQueryOptionsForUseQueries<TQueryFnData>
-    : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided
-    T extends {
-        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
-        select: (data: any) => infer TData
-        throwOnError?: ThrowOnError<any, infer TError, any, any>
-      }
-    ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>
-    : T extends {
-        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
-        throwOnError?: ThrowOnError<any, infer TError, any, any>
-      }
-    ? UseQueryOptionsForUseQueries<
-        TQueryFnData,
-        TError,
-        TQueryFnData,
-        TQueryKey
-      >
-    : // Fallback
-      UseQueryOptionsForUseQueries
+      ? UseQueryOptionsForUseQueries<TQueryFnData, TError>
+      : T extends { data: infer TData; error?: infer TError }
+        ? UseQueryOptionsForUseQueries<unknown, TError, TData>
+        : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]
+          T extends [infer TQueryFnData, infer TError, infer TData]
+          ? UseQueryOptionsForUseQueries<TQueryFnData, TError, TData>
+          : T extends [infer TQueryFnData, infer TError]
+            ? UseQueryOptionsForUseQueries<TQueryFnData, TError>
+            : T extends [infer TQueryFnData]
+              ? UseQueryOptionsForUseQueries<TQueryFnData>
+              : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided
+                T extends {
+                    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
+                    select: (data: any) => infer TData
+                    throwOnError?: ThrowOnError<any, infer TError, any, any>
+                  }
+                ? UseQueryOptionsForUseQueries<
+                    TQueryFnData,
+                    TError,
+                    TData,
+                    TQueryKey
+                  >
+                : T extends {
+                      queryFn?: QueryFunction<
+                        infer TQueryFnData,
+                        infer TQueryKey
+                      >
+                      throwOnError?: ThrowOnError<any, infer TError, any, any>
+                    }
+                  ? UseQueryOptionsForUseQueries<
+                      TQueryFnData,
+                      TError,
+                      TQueryFnData,
+                      TQueryKey
+                    >
+                  : // Fallback
+                    UseQueryOptionsForUseQueries
 
 type GetResults<T> =
   // Part 1: responsible for mapping explicit type parameter to function result, if object
   T extends { queryFnData: any; error?: infer TError; data: infer TData }
     ? UseQueryResult<TData, TError>
     : T extends { queryFnData: infer TQueryFnData; error?: infer TError }
-    ? UseQueryResult<TQueryFnData, TError>
-    : T extends { data: infer TData; error?: infer TError }
-    ? UseQueryResult<TData, TError>
-    : // Part 2: responsible for mapping explicit type parameter to function result, if tuple
-    T extends [any, infer TError, infer TData]
-    ? UseQueryResult<TData, TError>
-    : T extends [infer TQueryFnData, infer TError]
-    ? UseQueryResult<TQueryFnData, TError>
-    : T extends [infer TQueryFnData]
-    ? UseQueryResult<TQueryFnData>
-    : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided
-    T extends {
-        queryFn?: QueryFunction<unknown, any>
-        select: (data: any) => infer TData
-        throwOnError?: ThrowOnError<any, infer TError, any, any>
-      }
-    ? UseQueryResult<TData, unknown extends TError ? DefaultError : TError>
-    : T extends {
-        queryFn?: QueryFunction<infer TQueryFnData, any>
-        throwOnError?: ThrowOnError<any, infer TError, any, any>
-      }
-    ? UseQueryResult<
-        TQueryFnData,
-        unknown extends TError ? DefaultError : TError
-      >
-    : // Fallback
-      UseQueryResult
+      ? UseQueryResult<TQueryFnData, TError>
+      : T extends { data: infer TData; error?: infer TError }
+        ? UseQueryResult<TData, TError>
+        : // Part 2: responsible for mapping explicit type parameter to function result, if tuple
+          T extends [any, infer TError, infer TData]
+          ? UseQueryResult<TData, TError>
+          : T extends [infer TQueryFnData, infer TError]
+            ? UseQueryResult<TQueryFnData, TError>
+            : T extends [infer TQueryFnData]
+              ? UseQueryResult<TQueryFnData>
+              : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided
+                T extends {
+                    queryFn?: QueryFunction<unknown, any>
+                    select: (data: any) => infer TData
+                    throwOnError?: ThrowOnError<any, infer TError, any, any>
+                  }
+                ? UseQueryResult<
+                    TData,
+                    unknown extends TError ? DefaultError : TError
+                  >
+                : T extends {
+                      queryFn?: QueryFunction<infer TQueryFnData, any>
+                      throwOnError?: ThrowOnError<any, infer TError, any, any>
+                    }
+                  ? UseQueryResult<
+                      TQueryFnData,
+                      unknown extends TError ? DefaultError : TError
+                    >
+                  : // Fallback
+                    UseQueryResult
 
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
@@ -130,26 +141,37 @@ export type QueriesOptions<
 > = Depth['length'] extends MAXIMUM_DEPTH
   ? Array<UseQueryOptionsForUseQueries>
   : T extends []
-  ? []
-  : T extends [infer Head]
-  ? [...Result, GetOptions<Head>]
-  : T extends [infer Head, ...infer Tail]
-  ? QueriesOptions<[...Tail], [...Result, GetOptions<Head>], [...Depth, 1]>
-  : Array<unknown> extends T
-  ? T
-  : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
-  // use this to infer the param types in the case of Array.map() argument
-  T extends Array<
-      UseQueryOptionsForUseQueries<
-        infer TQueryFnData,
-        infer TError,
-        infer TData,
-        infer TQueryKey
-      >
-    >
-  ? Array<UseQueryOptionsForUseQueries<TQueryFnData, TError, TData, TQueryKey>>
-  : // Fallback
-    Array<UseQueryOptionsForUseQueries>
+    ? []
+    : T extends [infer Head]
+      ? [...Result, GetOptions<Head>]
+      : T extends [infer Head, ...infer Tail]
+        ? QueriesOptions<
+            [...Tail],
+            [...Result, GetOptions<Head>],
+            [...Depth, 1]
+          >
+        : Array<unknown> extends T
+          ? T
+          : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
+            // use this to infer the param types in the case of Array.map() argument
+            T extends Array<
+                UseQueryOptionsForUseQueries<
+                  infer TQueryFnData,
+                  infer TError,
+                  infer TData,
+                  infer TQueryKey
+                >
+              >
+            ? Array<
+                UseQueryOptionsForUseQueries<
+                  TQueryFnData,
+                  TError,
+                  TData,
+                  TQueryKey
+                >
+              >
+            : // Fallback
+              Array<UseQueryOptionsForUseQueries>
 
 /**
  * QueriesResults reducer recursively maps type param to results
@@ -161,28 +183,32 @@ export type QueriesResults<
 > = Depth['length'] extends MAXIMUM_DEPTH
   ? Array<UseQueryResult>
   : T extends []
-  ? []
-  : T extends [infer Head]
-  ? [...Result, GetResults<Head>]
-  : T extends [infer Head, ...infer Tail]
-  ? QueriesResults<[...Tail], [...Result, GetResults<Head>], [...Depth, 1]>
-  : T extends Array<
-      UseQueryOptionsForUseQueries<
-        infer TQueryFnData,
-        infer TError,
-        infer TData,
-        any
-      >
-    >
-  ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
-    Array<
-      UseQueryResult<
-        unknown extends TData ? TQueryFnData : TData,
-        unknown extends TError ? DefaultError : TError
-      >
-    >
-  : // Fallback
-    Array<UseQueryResult>
+    ? []
+    : T extends [infer Head]
+      ? [...Result, GetResults<Head>]
+      : T extends [infer Head, ...infer Tail]
+        ? QueriesResults<
+            [...Tail],
+            [...Result, GetResults<Head>],
+            [...Depth, 1]
+          >
+        : T extends Array<
+              UseQueryOptionsForUseQueries<
+                infer TQueryFnData,
+                infer TError,
+                infer TData,
+                any
+              >
+            >
+          ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
+            Array<
+              UseQueryResult<
+                unknown extends TData ? TQueryFnData : TData,
+                unknown extends TError ? DefaultError : TError
+              >
+            >
+          : // Fallback
+            Array<UseQueryResult>
 
 export function useQueries<
   T extends Array<any>,
@@ -260,7 +286,7 @@ export function useQueries<
   }, [defaultedQueries, options, observer])
 
   const shouldAtLeastOneSuspend = optimisticResult.some((result, index) =>
-    shouldSuspend(defaultedQueries[index], result, isRestoring),
+    shouldSuspend(defaultedQueries[index], result),
   )
 
   const suspensePromises = shouldAtLeastOneSuspend
@@ -269,7 +295,7 @@ export function useQueries<
 
         if (opts) {
           const queryObserver = new QueryObserver(client, opts)
-          if (shouldSuspend(opts, result, isRestoring)) {
+          if (shouldSuspend(opts, result)) {
             return fetchOptimistic(opts, queryObserver, errorResetBoundary)
           } else if (willFetch(result, isRestoring)) {
             void fetchOptimistic(opts, queryObserver, errorResetBoundary)

package/src/useSuspenseQueries.ts

@@ -21,66 +21,79 @@ type GetSuspenseOptions<T> =
   }
     ? UseSuspenseQueryOptions<TQueryFnData, TError, TData>
     : T extends { queryFnData: infer TQueryFnData; error?: infer TError }
-    ? UseSuspenseQueryOptions<TQueryFnData, TError>
-    : T extends { data: infer TData; error?: infer TError }
-    ? UseSuspenseQueryOptions<unknown, TError, TData>
-    : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]
-    T extends [infer TQueryFnData, infer TError, infer TData]
-    ? UseSuspenseQueryOptions<TQueryFnData, TError, TData>
-    : T extends [infer TQueryFnData, infer TError]
-    ? UseSuspenseQueryOptions<TQueryFnData, TError>
-    : T extends [infer TQueryFnData]
-    ? UseSuspenseQueryOptions<TQueryFnData>
-    : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided
-    T extends {
-        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
-        select: (data: any) => infer TData
-        throwOnError?: ThrowOnError<any, infer TError, any, any>
-      }
-    ? UseSuspenseQueryOptions<TQueryFnData, TError, TData, TQueryKey>
-    : T extends {
-        queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
-        throwOnError?: ThrowOnError<any, infer TError, any, any>
-      }
-    ? UseSuspenseQueryOptions<TQueryFnData, TError, TQueryFnData, TQueryKey>
-    : // Fallback
-      UseSuspenseQueryOptions
+      ? UseSuspenseQueryOptions<TQueryFnData, TError>
+      : T extends { data: infer TData; error?: infer TError }
+        ? UseSuspenseQueryOptions<unknown, TError, TData>
+        : // Part 2: responsible for applying explicit type parameter to function arguments, if tuple [TQueryFnData, TError, TData]
+          T extends [infer TQueryFnData, infer TError, infer TData]
+          ? UseSuspenseQueryOptions<TQueryFnData, TError, TData>
+          : T extends [infer TQueryFnData, infer TError]
+            ? UseSuspenseQueryOptions<TQueryFnData, TError>
+            : T extends [infer TQueryFnData]
+              ? UseSuspenseQueryOptions<TQueryFnData>
+              : // Part 3: responsible for inferring and enforcing type if no explicit parameter was provided
+                T extends {
+                    queryFn?: QueryFunction<infer TQueryFnData, infer TQueryKey>
+                    select: (data: any) => infer TData
+                    throwOnError?: ThrowOnError<any, infer TError, any, any>
+                  }
+                ? UseSuspenseQueryOptions<
+                    TQueryFnData,
+                    TError,
+                    TData,
+                    TQueryKey
+                  >
+                : T extends {
+                      queryFn?: QueryFunction<
+                        infer TQueryFnData,
+                        infer TQueryKey
+                      >
+                      throwOnError?: ThrowOnError<any, infer TError, any, any>
+                    }
+                  ? UseSuspenseQueryOptions<
+                      TQueryFnData,
+                      TError,
+                      TQueryFnData,
+                      TQueryKey
+                    >
+                  : // Fallback
+                    UseSuspenseQueryOptions
 
 type GetSuspenseResults<T> =
   // Part 1: responsible for mapping explicit type parameter to function result, if object
   T extends { queryFnData: any; error?: infer TError; data: infer TData }
     ? UseSuspenseQueryResult<TData, TError>
     : T extends { queryFnData: infer TQueryFnData; error?: infer TError }
-    ? UseSuspenseQueryResult<TQueryFnData, TError>
-    : T extends { data: infer TData; error?: infer TError }
-    ? UseSuspenseQueryResult<TData, TError>
-    : // Part 2: responsible for mapping explicit type parameter to function result, if tuple
-    T extends [any, infer TError, infer TData]
-    ? UseSuspenseQueryResult<TData, TError>
-    : T extends [infer TQueryFnData, infer TError]
-    ? UseSuspenseQueryResult<TQueryFnData, TError>
-    : T extends [infer TQueryFnData]
-    ? UseSuspenseQueryResult<TQueryFnData>
-    : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided
-    T extends {
-        queryFn?: QueryFunction<unknown, any>
-        select: (data: any) => infer TData
-        throwOnError?: ThrowOnError<any, infer TError, any, any>
-      }
-    ? UseSuspenseQueryResult<
-        TData,
-        unknown extends TError ? DefaultError : TError
-      >
-    : T extends {
-        queryFn?: QueryFunction<infer TQueryFnData, any>
-        throwOnError?: ThrowOnError<any, infer TError, any, any>
-      }
-    ? UseSuspenseQueryResult<
-        TQueryFnData,
-        unknown extends TError ? DefaultError : TError
-      >
-    : // Fallback
-      UseSuspenseQueryResult
+      ? UseSuspenseQueryResult<TQueryFnData, TError>
+      : T extends { data: infer TData; error?: infer TError }
+        ? UseSuspenseQueryResult<TData, TError>
+        : // Part 2: responsible for mapping explicit type parameter to function result, if tuple
+          T extends [any, infer TError, infer TData]
+          ? UseSuspenseQueryResult<TData, TError>
+          : T extends [infer TQueryFnData, infer TError]
+            ? UseSuspenseQueryResult<TQueryFnData, TError>
+            : T extends [infer TQueryFnData]
+              ? UseSuspenseQueryResult<TQueryFnData>
+              : // Part 3: responsible for mapping inferred type to results, if no explicit parameter was provided
+                T extends {
+                    queryFn?: QueryFunction<unknown, any>
+                    select: (data: any) => infer TData
+                    throwOnError?: ThrowOnError<any, infer TError, any, any>
+                  }
+                ? UseSuspenseQueryResult<
+                    TData,
+                    unknown extends TError ? DefaultError : TError
+                  >
+                : T extends {
+                      queryFn?: QueryFunction<infer TQueryFnData, any>
+                      throwOnError?: ThrowOnError<any, infer TError, any, any>
+                    }
+                  ? UseSuspenseQueryResult<
+                      TQueryFnData,
+                      unknown extends TError ? DefaultError : TError
+                    >
+                  : // Fallback
+                    UseSuspenseQueryResult
 
 /**
  * SuspenseQueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
@@ -92,30 +105,32 @@ export type SuspenseQueriesOptions<
 > = Depth['length'] extends MAXIMUM_DEPTH
   ? Array<UseSuspenseQueryOptions>
   : T extends []
-  ? []
-  : T extends [infer Head]
-  ? [...Result, GetSuspenseOptions<Head>]
-  : T extends [infer Head, ...infer Tail]
-  ? SuspenseQueriesOptions<
-      [...Tail],
-      [...Result, GetSuspenseOptions<Head>],
-      [...Depth, 1]
-    >
-  : Array<unknown> extends T
-  ? T
-  : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
-  // use this to infer the param types in the case of Array.map() argument
-  T extends Array<
-      UseSuspenseQueryOptions<
-        infer TQueryFnData,
-        infer TError,
-        infer TData,
-        infer TQueryKey
-      >
-    >
-  ? Array<UseSuspenseQueryOptions<TQueryFnData, TError, TData, TQueryKey>>
-  : // Fallback
-    Array<UseSuspenseQueryOptions>
+    ? []
+    : T extends [infer Head]
+      ? [...Result, GetSuspenseOptions<Head>]
+      : T extends [infer Head, ...infer Tail]
+        ? SuspenseQueriesOptions<
+            [...Tail],
+            [...Result, GetSuspenseOptions<Head>],
+            [...Depth, 1]
+          >
+        : Array<unknown> extends T
+          ? T
+          : // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
+            // use this to infer the param types in the case of Array.map() argument
+            T extends Array<
+                UseSuspenseQueryOptions<
+                  infer TQueryFnData,
+                  infer TError,
+                  infer TData,
+                  infer TQueryKey
+                >
+              >
+            ? Array<
+                UseSuspenseQueryOptions<TQueryFnData, TError, TData, TQueryKey>
+              >
+            : // Fallback
+              Array<UseSuspenseQueryOptions>
 
 /**
  * SuspenseQueriesResults reducer recursively maps type param to results
@@ -127,32 +142,32 @@ export type SuspenseQueriesResults<
 > = Depth['length'] extends MAXIMUM_DEPTH
   ? Array<UseSuspenseQueryResult>
   : T extends []
-  ? []
-  : T extends [infer Head]
-  ? [...Result, GetSuspenseResults<Head>]
-  : T extends [infer Head, ...infer Tail]
-  ? SuspenseQueriesResults<
-      [...Tail],
-      [...Result, GetSuspenseResults<Head>],
-      [...Depth, 1]
-    >
-  : T extends Array<
-      UseSuspenseQueryOptions<
-        infer TQueryFnData,
-        infer TError,
-        infer TData,
-        any
-      >
-    >
-  ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
-    Array<
-      UseSuspenseQueryResult<
-        unknown extends TData ? TQueryFnData : TData,
-        unknown extends TError ? DefaultError : TError
-      >
-    >
-  : // Fallback
-    Array<UseSuspenseQueryResult>
+    ? []
+    : T extends [infer Head]
+      ? [...Result, GetSuspenseResults<Head>]
+      : T extends [infer Head, ...infer Tail]
+        ? SuspenseQueriesResults<
+            [...Tail],
+            [...Result, GetSuspenseResults<Head>],
+            [...Depth, 1]
+          >
+        : T extends Array<
+              UseSuspenseQueryOptions<
+                infer TQueryFnData,
+                infer TError,
+                infer TData,
+                any
+              >
+            >
+          ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
+            Array<
+              UseSuspenseQueryResult<
+                unknown extends TData ? TQueryFnData : TData,
+                unknown extends TError ? DefaultError : TError
+              >
+            >
+          : // Fallback
+            Array<UseSuspenseQueryResult>
 
 export function useSuspenseQueries<
   T extends Array<any>,