@openapi-qraft/react 1.11.0-beta.5 → 1.12.0-beta.2

package/src/service-operation/ServiceOperationUseInfiniteQuery.ts

@@ -16,7 +16,7 @@ import type { ServiceOperationInfiniteQueryKey } from './ServiceOperationKey.js'
 
 export interface ServiceOperationUseInfiniteQuery<
   TSchema extends { url: string; method: string },
-  TData,
+  TQueryFnData,
   TParams = {},
   TError = DefaultError,
 > {
@@ -24,11 +24,11 @@ export interface ServiceOperationUseInfiniteQuery<
     parameters: TQueryKeyParams
   ): ServiceOperationInfiniteQueryKey<TSchema, TQueryKeyParams>;
 
-  useInfiniteQuery<TPageParam extends TParams>(
+  useInfiniteQuery<TPageParam extends TParams, TData = TQueryFnData>(
     parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     options: Omit<
       UndefinedInitialDataInfiniteOptions<
-        TData,
+        TQueryFnData,
         TError,
         OperationInfiniteData<TData, TParams>,
         ServiceOperationInfiniteQueryKey<TSchema, TParams>,
@@ -39,18 +39,21 @@ export interface ServiceOperationUseInfiniteQuery<
       | 'getNextPageParam'
       | 'initialPageParam'
     > &
-      InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>,
+      InfiniteQueryPageParamsOptions<
+        TQueryFnData,
+        PartialParameters<TPageParam>
+      >,
     queryClient?: QueryClient
   ): UseInfiniteQueryResult<
     OperationInfiniteData<TData, TParams>,
     TError | Error
   >;
 
-  useInfiniteQuery<TPageParam extends TParams>(
+  useInfiniteQuery<TPageParam extends TParams, TData = TQueryFnData>(
     parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     options: Omit<
       DefinedInitialDataInfiniteOptions<
-        TData,
+        TQueryFnData,
         TError,
         OperationInfiniteData<TData, TParams>,
         ServiceOperationInfiniteQueryKey<TSchema, TParams>,
@@ -61,7 +64,10 @@ export interface ServiceOperationUseInfiniteQuery<
       | 'getNextPageParam'
       | 'initialPageParam'
     > &
-      InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>,
+      InfiniteQueryPageParamsOptions<
+        TQueryFnData,
+        PartialParameters<TPageParam>
+      >,
     queryClient?: QueryClient
   ): DefinedUseInfiniteQueryResult<
     OperationInfiniteData<TData, TParams>,

package/src/service-operation/ServiceOperationUseQueries.ts

@@ -1,4 +1,4 @@
-import type {
+import {
   DefaultError,
   QueriesPlaceholderDataFunction,
   QueryClient,
@@ -7,32 +7,54 @@ import type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query';
 
 import type { ServiceOperationQueryKey } from './ServiceOperationKey.js';
 
+type UseQueryOptionsForUseQueries<
+  TSchema extends { url: string; method: string },
+  TParams,
+  TQueryFnData,
+  TError,
+  TData = TQueryFnData,
+> = Omit<
+  UseQueryOptions<
+    TQueryFnData,
+    TError,
+    TData,
+    ServiceOperationQueryKey<TSchema, TParams>
+  >,
+  'placeholderData' | 'suspense' | 'queryKey'
+> &
+  (
+    | {
+        parameters: TParams;
+        placeholderData?:
+          | TQueryFnData
+          | QueriesPlaceholderDataFunction<TQueryFnData>;
+        queryKey?: never;
+      }
+    | {
+        queryKey: ServiceOperationQueryKey<TSchema, TParams>;
+        placeholderData?:
+          | TQueryFnData
+          | QueriesPlaceholderDataFunction<TQueryFnData>;
+        parameters?: never;
+      }
+  );
+
 export interface ServiceOperationUseQueries<
   TSchema extends { url: string; method: string },
-  TData,
+  TQueryFnData,
   TParams = {},
   TError = DefaultError,
 > {
-  useQueries<TCombinedResult = Array<UseQueryResult<TData, TError>>>(
+  useQueries<
+    T extends Array<
+      UseQueryOptionsForUseQueries<TSchema, TParams, TQueryFnData, TError>
+    >,
+    TCombinedResult = Array<UseQueryResult<TQueryFnData, TError>>,
+  >(
     options: {
-      queries: ReadonlyArray<
-        Omit<
-          UseQueryOptions<
-            TData,
-            TError,
-            TData,
-            ServiceOperationQueryKey<TSchema, TParams>
-          >,
-          'placeholderData' | 'suspense' | 'queryKey'
-        > & {
-          placeholderData?: TData | QueriesPlaceholderDataFunction<TData>;
-        } & (
-            | { parameters: TParams; queryKey?: never }
-            | { queryKey: ServiceOperationQueryKey<TSchema, TParams> }
-          )
-      >;
+      queries: T;
       combine?: (
-        results: Array<UseQueryResult<TData, TError>>
+        results: Array<UseQueryResult<TQueryFnData, TError>>
       ) => TCombinedResult;
     },
     queryClient?: QueryClient

package/src/service-operation/ServiceOperationUseQuery.ts

@@ -10,7 +10,7 @@ import type { ServiceOperationQueryKey } from './ServiceOperationKey.js';
 
 export interface ServiceOperationUseQuery<
   TSchema extends { url: string; method: string },
-  TData,
+  TQueryFnData,
   TParams = {},
   TError = DefaultError,
 > {
@@ -18,11 +18,11 @@ export interface ServiceOperationUseQuery<
     parameters?: QueryKeyParams
   ): ServiceOperationQueryKey<TSchema, QueryKeyParams>;
 
-  useQuery(
+  useQuery<TData = TQueryFnData>(
     parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
     options?: Omit<
       UndefinedInitialDataOptions<
-        TData,
+        TQueryFnData,
         TError,
         TData,
         ServiceOperationQueryKey<TSchema, TParams>
@@ -32,11 +32,11 @@ export interface ServiceOperationUseQuery<
     queryClient?: QueryClient
   ): UseQueryResult<TData, TError | Error>;
 
-  useQuery(
+  useQuery<TData = TQueryFnData>(
     parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
     options: Omit<
       DefinedInitialDataOptions<
-        TData,
+        TQueryFnData,
         TError,
         TData,
         ServiceOperationQueryKey<TSchema, TParams>

package/src/service-operation/ServiceOperationUseSuspenseInfiniteQuery.ts

@@ -14,18 +14,18 @@ import type { ServiceOperationInfiniteQueryKey } from './ServiceOperationKey.js'
 
 export interface ServiceOperationUseSuspenseInfiniteQuery<
   TSchema extends { url: string; method: string },
-  TData,
+  TQueryFnData,
   TParams = {},
   TError = DefaultError,
 > {
-  useSuspenseInfiniteQuery<TPageParam extends TParams>(
+  useSuspenseInfiniteQuery<TPageParam extends TParams, TData = TQueryFnData>(
     parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     options: Omit<
       UseSuspenseInfiniteQueryOptions<
-        TData,
+        TQueryFnData,
         TError,
         OperationInfiniteData<TData, TParams>,
-        TData,
+        TQueryFnData,
         ServiceOperationInfiniteQueryKey<TSchema, TParams>,
         PartialParameters<TPageParam>
       >,
@@ -34,7 +34,10 @@ export interface ServiceOperationUseSuspenseInfiniteQuery<
       | 'getNextPageParam'
       | 'initialPageParam'
     > &
-      InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>,
+      InfiniteQueryPageParamsOptions<
+        TQueryFnData,
+        PartialParameters<TPageParam>
+      >,
     queryClient?: QueryClient
   ): UseSuspenseInfiniteQueryResult<
     OperationInfiniteData<TData, TParams>,

package/src/service-operation/ServiceOperationUseSuspenseQueries.ts

@@ -1,40 +1,59 @@
 import type { DefaultError, QueryClient } from '@tanstack/query-core';
 import type {
-  UseSuspenseQueryOptions,
+  UseQueryOptions,
   UseSuspenseQueryResult,
 } from '@tanstack/react-query';
 
 import type { ServiceOperationQueryKey } from './ServiceOperationKey.js';
 
+type UseQueryOptionsForUseSuspenseQuery<
+  TSchema extends { url: string; method: string },
+  TParams,
+  TQueryFnData,
+  TError,
+  TData = TQueryFnData,
+> = Omit<
+  UseQueryOptions<
+    TQueryFnData,
+    TError,
+    TData,
+    ServiceOperationQueryKey<TSchema, TParams>
+  >,
+  'enabled' | 'throwOnError' | 'placeholderData' | 'queryKey'
+> &
+  (
+    | {
+        parameters: TParams;
+        queryKey?: never;
+      }
+    | {
+        queryKey: ServiceOperationQueryKey<TSchema, TParams>;
+        parameters?: never;
+      }
+  );
+
 export interface ServiceOperationUseSuspenseQueries<
   TSchema extends { url: string; method: string },
-  TData,
+  TQueryFnData,
   TParams = {},
   TError = DefaultError,
 > {
   useSuspenseQueries<
-    TCombinedResult = Array<UseSuspenseQueryResult<TData, TError>>,
+    T extends Array<
+      UseQueryOptionsForUseSuspenseQuery<TSchema, TParams, TQueryFnData, TError>
+    >,
+    TCombinedResult = Array<UseSuspenseQueryResult<TQueryFnData, TError>>,
   >(
     options: {
-      queries: ReadonlyArray<
-        Omit<
-          UseSuspenseQueryOptions<
-            TData,
-            TError,
-            TData,
-            ServiceOperationQueryKey<TSchema, TParams>
-          >,
-          'queryKey'
-        > &
-          (
-            | { parameters: TParams; queryKey?: never }
-            | { queryKey: ServiceOperationQueryKey<TSchema, TParams> }
-          )
-      >;
+      queries: T;
       combine?: (
-        results: Array<UseSuspenseQueryResult<TData, TError>>
+        results: Array<
+          WithOptional<UseSuspenseQueryResult<TQueryFnData, TError>, 'data'>
+        >
       ) => TCombinedResult;
     },
     queryClient?: QueryClient
   ): TCombinedResult;
 }
+
+type WithOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;

package/src/service-operation/{ServiceOperationUseSuspenseQueryQuery.ts → ServiceOperationUseSuspenseQuery.ts}

@@ -6,17 +6,17 @@ import type {
 
 import type { ServiceOperationQueryKey } from './ServiceOperationKey.js';
 
-export interface ServiceOperationUseSuspenseQueryQuery<
+export interface ServiceOperationUseSuspenseQuery<
   TSchema extends { url: string; method: string },
-  TData,
+  TQueryFnData,
   TParams = {},
   TError = DefaultError,
 > {
-  useSuspenseQuery(
+  useSuspenseQuery<TData = TQueryFnData>(
     parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
     options?: Omit<
       UseSuspenseQueryOptions<
-        TData,
+        TQueryFnData,
         TError,
         TData,
         ServiceOperationQueryKey<TSchema, TParams>

package/dist/types/service-operation/ServiceOperationUseSuspenseQueryQuery.d.ts

@@ -1,10 +0,0 @@
-import type { DefaultError, QueryClient } from '@tanstack/query-core';
-import type { UseSuspenseQueryOptions, UseSuspenseQueryResult } from '@tanstack/react-query';
-import type { ServiceOperationQueryKey } from './ServiceOperationKey.js';
-export interface ServiceOperationUseSuspenseQueryQuery<TSchema extends {
-    url: string;
-    method: string;
-}, TData, TParams = {}, TError = DefaultError> {
-    useSuspenseQuery(parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>, options?: Omit<UseSuspenseQueryOptions<TData, TError, TData, ServiceOperationQueryKey<TSchema, TParams>>, 'queryKey'>, queryClient?: QueryClient): UseSuspenseQueryResult<TData, TError | Error>;
-}
-//# sourceMappingURL=ServiceOperationUseSuspenseQueryQuery.d.ts.map

package/dist/types/service-operation/ServiceOperationUseSuspenseQueryQuery.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServiceOperationUseSuspenseQueryQuery.d.ts","sourceRoot":"","sources":["../../../src/service-operation/ServiceOperationUseSuspenseQueryQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,KAAK,EACV,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEzE,MAAM,WAAW,qCAAqC,CACpD,OAAO,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,KAAK,EACL,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,YAAY;IAErB,gBAAgB,CACd,UAAU,EAAE,OAAO,GAAG,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,EAChE,OAAO,CAAC,EAAE,IAAI,CACZ,uBAAuB,CACrB,KAAK,EACL,MAAM,EACN,KAAK,EACL,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAC3C,EACD,UAAU,CACX,EACD,WAAW,CAAC,EAAE,WAAW,GACxB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;CAClD"}