fix: swap overload order for useQuery and useInfiniteQuery to fix return types

Author: radist2s

packages/tanstack-query-react-types/src/service-operation/ServiceOperationUseInfiniteQuery.ts

@@ -37,7 +37,7 @@ export interface ServiceOperationUseInfiniteQuery<
           ? DeepReadonly<TQueryParams> | void
           : DeepReadonly<TQueryParams>),
     options: Omit<
-      UndefinedInitialDataInfiniteOptions<
+      DefinedInitialDataInfiniteOptions<
         TQueryFnData,
         TError,
         TData,
@@ -53,7 +53,7 @@ export interface ServiceOperationUseInfiniteQuery<
         TQueryFnData,
         PartialParameters<DeepReadonly<TPageParam>>
       >
-  ): UseInfiniteQueryResult<TData, OperationError<TError>>;
+  ): DefinedUseInfiniteQueryResult<TData, OperationError<TError>>;
 
   useInfiniteQuery<
     TPageParam extends TQueryParams,
@@ -66,7 +66,7 @@ export interface ServiceOperationUseInfiniteQuery<
           ? DeepReadonly<TQueryParams> | void
           : DeepReadonly<TQueryParams>),
     options: Omit<
-      DefinedInitialDataInfiniteOptions<
+      UndefinedInitialDataInfiniteOptions<
         TQueryFnData,
         TError,
         TData,
@@ -79,8 +79,8 @@ export interface ServiceOperationUseInfiniteQuery<
       | 'initialPageParam'
     > &
       InfiniteQueryPageParamsOptions<
-        TOperationQueryFnData,
+        TQueryFnData,
         PartialParameters<DeepReadonly<TPageParam>>
       >
-  ): DefinedUseInfiniteQueryResult<TData, OperationError<TError>>;
+  ): UseInfiniteQueryResult<TData, OperationError<TError>>;
 }

packages/tanstack-query-react-types/src/service-operation/ServiceOperationUseQuery.ts

@@ -29,31 +29,31 @@ export interface ServiceOperationUseQuery<
       | (AreAllOptional<TQueryParams> extends true
           ? DeepReadonly<TQueryParams> | void
           : DeepReadonly<TQueryParams>),
-    options?: Omit<
-      UndefinedInitialDataOptions<
+    options: Omit<
+      DefinedInitialDataOptions<
         TOperationQueryFnData,
         TError,
         TData,
         ServiceOperationQueryKey<TSchema, TQueryParams>
       >,
       'queryKey'
     >
-  ): UseQueryResult<TData, OperationError<TError>>;
+  ): DefinedUseQueryResult<TData, OperationError<TError>>;
 
   useQuery<TData = TOperationQueryFnData>(
     parameters:
       | ServiceOperationQueryKey<TSchema, TQueryParams>
       | (AreAllOptional<TQueryParams> extends true
           ? DeepReadonly<TQueryParams> | void
           : DeepReadonly<TQueryParams>),
-    options: Omit<
-      DefinedInitialDataOptions<
+    options?: Omit<
+      UndefinedInitialDataOptions<
         TOperationQueryFnData,
         TError,
         TData,
         ServiceOperationQueryKey<TSchema, TQueryParams>
       >,
       'queryKey'
     >
-  ): DefinedUseQueryResult<TData, OperationError<TError>>;
+  ): UseQueryResult<TData, OperationError<TError>>;
 }