REVERT IF OPUS FUCKED UP

Author: DogPawHat

packages/query-core/src/queryClient.ts

@@ -428,7 +428,7 @@ export class QueryClient {
   infiniteQuery<
     TQueryFnData,
     TError = DefaultError,
-    TData = TQueryFnData,
+    TData = InfiniteData<TQueryFnData>,
     TQueryKey extends QueryKey = QueryKey,
     TPageParam = unknown,
   >(
@@ -439,11 +439,15 @@ export class QueryClient {
       TQueryKey,
       TPageParam
     >,
-  ): Promise<InfiniteData<TData, TPageParam>> {
+  ): Promise<
+    Array<TData> extends Array<InfiniteData<TQueryFnData>>
+      ? InfiniteData<TQueryFnData, TPageParam>
+      : TData
+  > {
     options.behavior = infiniteQueryBehavior<
       TQueryFnData,
       TError,
-      TData,
+      TQueryFnData,
       TPageParam
     >(options.pages)
     return this.query(options as any)
@@ -464,6 +468,12 @@ export class QueryClient {
       TPageParam
     >,
   ): Promise<InfiniteData<TData, TPageParam>> {
+    options.behavior = infiniteQueryBehavior<
+      TQueryFnData,
+      TError,
+      TData,
+      TPageParam
+    >(options.pages)
     return this.fetchQuery(options as any)
   }
 

packages/query-core/src/types.ts

@@ -568,7 +568,7 @@ type InfiniteQueryPages<TQueryFnData = unknown, TPageParam = unknown> =
 export type InfiniteQueryExecuteOptions<
   TQueryFnData = unknown,
   TError = DefaultError,
-  TData = TQueryFnData,
+  TData = InfiniteData<TQueryFnData>,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
 > = Omit<

packages/vue-query/src/queryClient.ts

@@ -316,7 +316,7 @@ export class QueryClient extends QC {
   infiniteQuery<
     TQueryFnData,
     TError = DefaultError,
-    TData = TQueryFnData,
+    TData = InfiniteData<TQueryFnData>,
     TQueryKey extends QueryKey = QueryKey,
     TPageParam = unknown,
   >(
@@ -327,11 +327,15 @@ export class QueryClient extends QC {
       TQueryKey,
       TPageParam
     >,
-  ): Promise<InfiniteData<TData, TPageParam>>
+  ): Promise<
+    Array<TData> extends Array<InfiniteData<TQueryFnData>>
+      ? InfiniteData<TQueryFnData, TPageParam>
+      : TData
+  >
   infiniteQuery<
     TQueryFnData,
     TError = DefaultError,
-    TData = TQueryFnData,
+    TData = InfiniteData<TQueryFnData>,
     TQueryKey extends QueryKey = QueryKey,
     TPageParam = unknown,
   >(
@@ -344,11 +348,15 @@ export class QueryClient extends QC {
         TPageParam
       >
     >,
-  ): Promise<InfiniteData<TData, TPageParam>>
+  ): Promise<
+    Array<TData> extends Array<InfiniteData<TQueryFnData>>
+      ? InfiniteData<TQueryFnData, TPageParam>
+      : TData
+  >
   infiniteQuery<
     TQueryFnData,
     TError = DefaultError,
-    TData = TQueryFnData,
+    TData = InfiniteData<TQueryFnData>,
     TQueryKey extends QueryKey = QueryKey,
     TPageParam = unknown,
   >(
@@ -361,7 +369,11 @@ export class QueryClient extends QC {
         TPageParam
       >
     >,
-  ): Promise<InfiniteData<TData, TPageParam>> {
+  ): Promise<
+    Array<TData> extends Array<InfiniteData<TQueryFnData>>
+      ? InfiniteData<TQueryFnData, TPageParam>
+      : TData
+  > {
     return super.infiniteQuery(cloneDeepUnref(options))
   }