@openapi-qraft/tanstack-query-react-types 2.1.0 → 2.1.2

package/src/service-operation/ServiceOperationUseInfiniteQuery.ts

@@ -14,7 +14,7 @@ import type {
 
 export interface ServiceOperationUseInfiniteQuery<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -22,7 +22,11 @@ export interface ServiceOperationUseInfiniteQuery<
     parameters: AreAllOptional<TParams> extends true ? TParams | void : TParams
   ): ServiceOperationInfiniteQueryKey<TSchema, TParams>;
 
-  useInfiniteQuery<TPageParam extends TParams, TData = TQueryFnData>(
+  useInfiniteQuery<
+    TPageParam extends TParams,
+    TQueryFnData = TOperationQueryFnData,
+    TData = OperationInfiniteData<TQueryFnData, TParams>,
+  >(
     parameters:
       | ServiceOperationInfiniteQueryKey<TSchema, TParams>
       | (AreAllOptional<TParams> extends true ? TParams | void : TParams),
@@ -30,7 +34,7 @@ export interface ServiceOperationUseInfiniteQuery<
       UndefinedInitialDataInfiniteOptions<
         TQueryFnData,
         TError,
-        OperationInfiniteData<TData, TParams>,
+        TData,
         ServiceOperationInfiniteQueryKey<TSchema, TParams>,
         PartialParameters<TPageParam>
       >,
@@ -43,12 +47,13 @@ export interface ServiceOperationUseInfiniteQuery<
         TQueryFnData,
         PartialParameters<TPageParam>
       >
-  ): UseInfiniteQueryResult<
-    OperationInfiniteData<TData, TParams>,
-    TError | Error
-  >;
+  ): UseInfiniteQueryResult<TData, TError | Error>;
 
-  useInfiniteQuery<TPageParam extends TParams, TData = TQueryFnData>(
+  useInfiniteQuery<
+    TPageParam extends TParams,
+    TQueryFnData = TOperationQueryFnData,
+    TData = OperationInfiniteData<TQueryFnData, TParams>,
+  >(
     parameters:
       | ServiceOperationInfiniteQueryKey<TSchema, TParams>
       | (AreAllOptional<TParams> extends true ? TParams | void : TParams),
@@ -56,7 +61,7 @@ export interface ServiceOperationUseInfiniteQuery<
       DefinedInitialDataInfiniteOptions<
         TQueryFnData,
         TError,
-        OperationInfiniteData<TData, TParams>,
+        TData,
         ServiceOperationInfiniteQueryKey<TSchema, TParams>,
         PartialParameters<TPageParam>
       >,
@@ -66,11 +71,8 @@ export interface ServiceOperationUseInfiniteQuery<
       | 'initialPageParam'
     > &
       InfiniteQueryPageParamsOptions<
-        TQueryFnData,
+        TOperationQueryFnData,
         PartialParameters<TPageParam>
       >
-  ): DefinedUseInfiniteQueryResult<
-    OperationInfiniteData<TData, TParams>,
-    TError | Error
-  >;
+  ): DefinedUseInfiniteQueryResult<TData, TError | Error>;
 }

package/src/service-operation/ServiceOperationUseIsFetchingQueries.ts

@@ -5,7 +5,7 @@ import type {
 
 export interface ServiceOperationUseIsFetchingQueries<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -13,14 +13,14 @@ export interface ServiceOperationUseIsFetchingQueries<
     filters?:
       | QueryFiltersByParameters<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError
         >
       | QueryFiltersByQueryKey<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError

package/src/service-operation/ServiceOperationUseIsMutating.ts

@@ -16,7 +16,7 @@ export interface ServiceOperationUseIsMutating<
           TBody,
           TMutationData,
           TParams,
-          TError,
+          TError | Error,
           TContext
         >
       | MutationFiltersByMutationKey<
@@ -24,7 +24,7 @@ export interface ServiceOperationUseIsMutating<
           TBody,
           TMutationData,
           TParams,
-          TError,
+          TError | Error,
           TContext
         >
   ): number;

package/src/service-operation/ServiceOperationUseMutation.ts

@@ -24,7 +24,7 @@ export interface ServiceOperationUseMutation<
       TMutationData,
       TParams,
       TVariables,
-      TError,
+      TError | Error,
       TContext
     >
   ): UseMutationResult<
@@ -44,7 +44,7 @@ export interface ServiceOperationUseMutation<
       TMutationData,
       TParams,
       TVariables,
-      TError,
+      TError | Error,
       TContext
     >
   ): UseMutationResult<TMutationData, TError | Error, TVariables, TContext>;

package/src/service-operation/ServiceOperationUseMutationState.ts

@@ -16,7 +16,7 @@ export interface ServiceOperationUseMutationState<
     TContext = unknown,
     TResult = MutationState<
       TMutationData,
-      TError,
+      TError | Error,
       MutationVariables<TBody, TParams>,
       TContext
     >,
@@ -26,7 +26,7 @@ export interface ServiceOperationUseMutationState<
           TBody,
           TMutationData,
           TParams,
-          TError,
+          TError | Error,
           TContext
         >
       | MutationFiltersByMutationKey<
@@ -34,13 +34,13 @@ export interface ServiceOperationUseMutationState<
           TBody,
           TMutationData,
           TParams,
-          TError,
+          TError | Error,
           TContext
         >;
     select?: (
       mutation: Mutation<
         TMutationData,
-        TError,
+        TError | Error,
         MutationVariables<TBody, TParams>,
         TContext
       >

package/src/service-operation/ServiceOperationUseQueries.ts

@@ -3,19 +3,24 @@ import type { UseQueryResult } from '@tanstack/react-query';
 
 export interface ServiceOperationUseQueries<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
   useQueries<
     T extends Array<
-      UseQueryOptionsForUseQueries<TSchema, TParams, TQueryFnData, TError>
+      UseQueryOptionsForUseQueries<
+        TSchema,
+        TParams,
+        TOperationQueryFnData,
+        TError
+      >
     >,
-    TCombinedResult = Array<UseQueryResult<TQueryFnData, TError>>,
+    TCombinedResult = Array<UseQueryResult<TOperationQueryFnData, TError>>,
   >(options: {
     queries: T;
     combine?: (
-      results: Array<UseQueryResult<TQueryFnData, TError>>
+      results: Array<UseQueryResult<TOperationQueryFnData, TError>>
     ) => TCombinedResult;
   }): TCombinedResult;
 }

package/src/service-operation/ServiceOperationUseQuery.ts

@@ -11,7 +11,7 @@ import type {
 
 export interface ServiceOperationUseQuery<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -19,13 +19,13 @@ export interface ServiceOperationUseQuery<
     parameters: AreAllOptional<TParams> extends true ? TParams | void : TParams
   ): ServiceOperationQueryKey<TSchema, TParams>;
 
-  useQuery<TData = TQueryFnData>(
+  useQuery<TData = TOperationQueryFnData>(
     parameters:
       | ServiceOperationQueryKey<TSchema, TParams>
       | (AreAllOptional<TParams> extends true ? TParams | void : TParams),
     options?: Omit<
       UndefinedInitialDataOptions<
-        TQueryFnData,
+        TOperationQueryFnData,
         TError,
         TData,
         ServiceOperationQueryKey<TSchema, TParams>
@@ -34,13 +34,13 @@ export interface ServiceOperationUseQuery<
     >
   ): UseQueryResult<TData, TError | Error>;
 
-  useQuery<TData = TQueryFnData>(
+  useQuery<TData = TOperationQueryFnData>(
     parameters:
       | ServiceOperationQueryKey<TSchema, TParams>
       | (AreAllOptional<TParams> extends true ? TParams | void : TParams),
     options: Omit<
       DefinedInitialDataOptions<
-        TQueryFnData,
+        TOperationQueryFnData,
         TError,
         TData,
         ServiceOperationQueryKey<TSchema, TParams>

package/src/service-operation/ServiceOperationUseSuspenseInfiniteQuery.ts

@@ -12,20 +12,23 @@ import type {
 
 export interface ServiceOperationUseSuspenseInfiniteQuery<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
-  useSuspenseInfiniteQuery<TPageParam extends TParams, TData = TQueryFnData>(
+  useSuspenseInfiniteQuery<
+    TPageParam extends TParams,
+    TData = TOperationQueryFnData,
+  >(
     parameters:
       | ServiceOperationInfiniteQueryKey<TSchema, TParams>
       | (AreAllOptional<TParams> extends true ? TParams | void : TParams),
     options: Omit<
       UseSuspenseInfiniteQueryOptions<
-        TQueryFnData,
+        TOperationQueryFnData,
         TError,
         OperationInfiniteData<TData, TParams>,
-        TQueryFnData,
+        TOperationQueryFnData,
         ServiceOperationInfiniteQueryKey<TSchema, TParams>,
         PartialParameters<TPageParam>
       >,
@@ -35,7 +38,7 @@ export interface ServiceOperationUseSuspenseInfiniteQuery<
       | 'initialPageParam'
     > &
       InfiniteQueryPageParamsOptions<
-        TQueryFnData,
+        TOperationQueryFnData,
         PartialParameters<TPageParam>
       >
   ): UseSuspenseInfiniteQueryResult<

package/src/service-operation/ServiceOperationUseSuspenseQueries.ts

@@ -6,20 +6,30 @@ import type { UseSuspenseQueryResult } from '@tanstack/react-query';
 
 export interface ServiceOperationUseSuspenseQueries<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
   useSuspenseQueries<
     T extends Array<
-      UseQueryOptionsForUseSuspenseQuery<TSchema, TParams, TQueryFnData, TError>
+      UseQueryOptionsForUseSuspenseQuery<
+        TSchema,
+        TParams,
+        TOperationQueryFnData,
+        TError
+      >
+    >,
+    TCombinedResult = Array<
+      UseSuspenseQueryResult<TOperationQueryFnData, TError>
     >,
-    TCombinedResult = Array<UseSuspenseQueryResult<TQueryFnData, TError>>,
   >(options: {
     queries: T;
     combine?: (
       results: Array<
-        WithOptional<UseSuspenseQueryResult<TQueryFnData, TError>, 'data'>
+        WithOptional<
+          UseSuspenseQueryResult<TOperationQueryFnData, TError>,
+          'data'
+        >
       >
     ) => TCombinedResult;
   }): TCombinedResult;

package/src/service-operation/ServiceOperationUseSuspenseQuery.ts

@@ -9,17 +9,17 @@ import type {
 
 export interface ServiceOperationUseSuspenseQuery<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
-  useSuspenseQuery<TData = TQueryFnData>(
+  useSuspenseQuery<TData = TOperationQueryFnData>(
     parameters:
       | ServiceOperationQueryKey<TSchema, TParams>
       | (AreAllOptional<TParams> extends true ? TParams | void : TParams),
     options?: Omit<
       UseSuspenseQueryOptions<
-        TQueryFnData,
+        TOperationQueryFnData,
         TError,
         TData,
         ServiceOperationQueryKey<TSchema, TParams>

package/src/shared/ServiceOperationFetchInfiniteQueryOptions.ts

@@ -8,6 +8,7 @@ import type {
 import type { OperationInfiniteData } from './OperationInfiniteData.js';
 import type { PartialParameters } from './PartialParameters.js';
 import type { ServiceOperationInfiniteQueryKey } from './ServiceOperationKey.js';
+import { AreAllOptional } from './AreAllOptional.js';
 import { RequestFn } from './RequestFn.js';
 
 export type ServiceOperationFetchInfiniteQueryOptions<
@@ -96,7 +97,9 @@ type FetchInfiniteQueryOptionsBase<
   >,
   'queryKey' | 'initialPageParam'
 > &
-  InitialPageParam<PartialParameters<TPageParam>> &
+  (AreAllOptional<TParams> extends true
+    ? Partial<InitialPageParam<PartialParameters<TPageParam>>>
+    : InitialPageParam<PartialParameters<TPageParam>>) &
   FetchInfiniteQueryPages<TQueryFnData, TPageParam>;
 
 type FetchInfiniteQueryOptionsByQueryKey<