@openapi-qraft/tanstack-query-react-types 2.1.1 → 2.2.0

package/dist/types/shared/ServiceOperationFetchInfiniteQueryOptions.d.ts

@@ -2,6 +2,7 @@ import type { DefaultError, FetchQueryOptions, GetNextPageParamFunction, Initial
 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<TSchema extends {
     url: string;
@@ -24,7 +25,7 @@ type FetchInfiniteQueryPages<TQueryFnData = unknown, TPageParam = unknown> = {
 type FetchInfiniteQueryOptionsBase<TSchema extends {
     url: string;
     method: string;
-}, TQueryFnData, TParams, TPageParam = unknown, TError = DefaultError> = Omit<FetchQueryOptions<TQueryFnData, TError, OperationInfiniteData<TQueryFnData, TParams>, ServiceOperationInfiniteQueryKey<TSchema, TParams>, TPageParam>, 'queryKey' | 'initialPageParam'> & InitialPageParam<PartialParameters<TPageParam>> & FetchInfiniteQueryPages<TQueryFnData, TPageParam>;
+}, TQueryFnData, TParams, TPageParam = unknown, TError = DefaultError> = Omit<FetchQueryOptions<TQueryFnData, TError, OperationInfiniteData<TQueryFnData, TParams>, ServiceOperationInfiniteQueryKey<TSchema, TParams>, TPageParam>, 'queryKey' | 'initialPageParam'> & (AreAllOptional<TParams> extends true ? Partial<InitialPageParam<PartialParameters<TPageParam>>> : InitialPageParam<PartialParameters<TPageParam>>) & FetchInfiniteQueryPages<TQueryFnData, TPageParam>;
 type FetchInfiniteQueryOptionsByQueryKey<TSchema extends {
     url: string;
     method: string;

package/dist/types/shared/ServiceOperationFetchInfiniteQueryOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceOperationFetchInfiniteQueryOptions.d.ts","sourceRoot":"","sources":["../../../src/shared/ServiceOperationFetchInfiniteQueryOptions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServiceOperationFetchInfiniteQueryOptions.d.ts","sourceRoot":"","sources":["../../../src/shared/ServiceOperationFetchInfiniteQueryOptions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/tanstack-query-react-types",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "scripts": {
     "build": "yarn clean && NODE_ENV=production rollup --config rollup.config.mjs && tsc --project tsconfig.build.json --emitDeclarationOnly",
     "dev": "yarn clean && tsc --project tsconfig.build.json --watch --outDir ./dist/esm --noEmitOnError false",

package/src/service-operation/ServiceOperation.ts

@@ -85,14 +85,14 @@ export interface ServiceOperationMutation<
 
 export interface ServiceOperationQuerySchema<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
   schema: TSchema;
   types: {
     parameters: TParams;
-    data: TQueryFnData;
+    data: TOperationQueryFnData;
     error: TError;
   };
 }

package/src/service-operation/ServiceOperationCancelQueries.ts

@@ -6,7 +6,7 @@ import type { CancelOptions } from '@tanstack/query-core';
 
 export interface ServiceOperationCancelQueries<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -14,14 +14,14 @@ export interface ServiceOperationCancelQueries<
     filters?:
       | QueryFiltersByParameters<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError
         >
       | QueryFiltersByQueryKey<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError

package/src/service-operation/ServiceOperationFetchInfiniteQuery.ts

@@ -6,24 +6,24 @@ import type {
 
 export interface ServiceOperationFetchInfiniteQuery<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
   fetchInfiniteQuery<TPageParam extends TParams>(
     options: ServiceOperationFetchInfiniteQueryOptions<
       TSchema,
-      TQueryFnData,
+      TOperationQueryFnData,
       TParams,
       TPageParam,
       TError
     >
-  ): Promise<OperationInfiniteData<TQueryFnData, TParams>>;
+  ): Promise<OperationInfiniteData<TOperationQueryFnData, TParams>>;
 
   prefetchInfiniteQuery<TPageParam extends TParams>(
     options: ServiceOperationFetchInfiniteQueryOptions<
       TSchema,
-      TQueryFnData,
+      TOperationQueryFnData,
       TParams,
       TPageParam,
       TError
@@ -33,10 +33,10 @@ export interface ServiceOperationFetchInfiniteQuery<
   ensureInfiniteQueryData<TPageParam extends TParams>(
     options: ServiceOperationEnsureInfiniteQueryDataOptions<
       TSchema,
-      TQueryFnData,
+      TOperationQueryFnData,
       TParams,
       TPageParam,
       TError
     >
-  ): Promise<OperationInfiniteData<TQueryFnData, TParams>>;
+  ): Promise<OperationInfiniteData<TOperationQueryFnData, TParams>>;
 }

package/src/service-operation/ServiceOperationFetchQuery.ts

@@ -6,7 +6,7 @@ import type {
 
 export interface ServiceOperationFetchQuery<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -14,29 +14,29 @@ export interface ServiceOperationFetchQuery<
     options: AreAllOptional<TParams> extends true
       ? ServiceOperationFetchQueryOptions<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TParams,
           TError
         > | void
       : ServiceOperationFetchQueryOptions<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TParams,
           TError
         >
-  ): Promise<TQueryFnData>;
+  ): Promise<TOperationQueryFnData>;
 
   prefetchQuery(
     options: AreAllOptional<TParams> extends true
       ? ServiceOperationFetchQueryOptions<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TParams,
           TError
         > | void
       : ServiceOperationFetchQueryOptions<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TParams,
           TError
         >
@@ -46,15 +46,15 @@ export interface ServiceOperationFetchQuery<
     options: AreAllOptional<TParams> extends true
       ? ServiceOperationEnsureQueryDataOptions<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TParams,
           TError
         > | void
       : ServiceOperationEnsureQueryDataOptions<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TParams,
           TError
         >
-  ): Promise<TQueryFnData>;
+  ): Promise<TOperationQueryFnData>;
 }

package/src/service-operation/ServiceOperationGetInfiniteQueryData.ts

@@ -6,12 +6,12 @@ import type {
 
 export interface ServiceOperationGetInfiniteQueryData<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
 > {
   getInfiniteQueryData(
     parameters:
       | ServiceOperationInfiniteQueryKey<TSchema, TParams>
       | (AreAllOptional<TParams> extends true ? TParams | void : TParams)
-  ): OperationInfiniteData<TQueryFnData, TParams> | undefined;
+  ): OperationInfiniteData<TOperationQueryFnData, TParams> | undefined;
 }

package/src/service-operation/ServiceOperationGetQueriesData.ts

@@ -9,7 +9,7 @@ import type { NoInfer } from '@tanstack/query-core';
 
 export interface ServiceOperationGetQueriesData<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -17,14 +17,14 @@ export interface ServiceOperationGetQueriesData<
     filters?:
       | QueryFiltersByParameters<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError
         >
       | QueryFiltersByQueryKey<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError
@@ -34,14 +34,14 @@ export interface ServiceOperationGetQueriesData<
         [
           queryKey: ServiceOperationInfiniteQueryKey<TSchema, TParams>,
           data:
-            | NoInfer<OperationInfiniteData<TQueryFnData, TParams>>
+            | NoInfer<OperationInfiniteData<TOperationQueryFnData, TParams>>
             | undefined,
         ]
       >
     : Array<
         [
           queryKey: ServiceOperationQueryKey<TSchema, TParams>,
-          data: TQueryFnData | undefined,
+          data: TOperationQueryFnData | undefined,
         ]
       >;
 }

package/src/service-operation/ServiceOperationGetQueryData.ts

@@ -5,12 +5,12 @@ import type {
 
 export interface ServiceOperationGetQueryData<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
 > {
   getQueryData(
     parameters:
       | ServiceOperationQueryKey<TSchema, TParams>
       | (AreAllOptional<TParams> extends true ? TParams | void : TParams)
-  ): TQueryFnData | undefined;
+  ): TOperationQueryFnData | undefined;
 }

package/src/service-operation/ServiceOperationGetQueryState.ts

@@ -8,7 +8,7 @@ import type { QueryState } from '@tanstack/query-core';
 
 export interface ServiceOperationGetQueryState<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -16,13 +16,13 @@ export interface ServiceOperationGetQueryState<
     parameters:
       | ServiceOperationQueryKey<TSchema, TParams>
       | (AreAllOptional<TParams> extends true ? TParams | void : TParams)
-  ): QueryState<TQueryFnData, TError> | undefined;
+  ): QueryState<TOperationQueryFnData, TError> | undefined;
 
   getInfiniteQueryState(
     parameters: AreAllOptional<TParams> extends true
       ? TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams> | void
       : TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>
   ):
-    | QueryState<OperationInfiniteData<TQueryFnData, TParams>, TError>
+    | QueryState<OperationInfiniteData<TOperationQueryFnData, TParams>, TError>
     | undefined;
 }

package/src/service-operation/ServiceOperationInvalidateQueries.ts

@@ -3,14 +3,14 @@ import type { InvalidateOptions } from '@tanstack/query-core';
 
 export interface ServiceOperationInvalidateQueries<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
   invalidateQueries<TInfinite extends boolean = false>(
     filters?: InvalidateQueryFilters<
       TSchema,
-      TQueryFnData,
+      TOperationQueryFnData,
       TInfinite,
       TParams,
       TError

package/src/service-operation/ServiceOperationIsFetchingQueries.ts

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

package/src/service-operation/ServiceOperationQueryFn.ts

@@ -7,7 +7,7 @@ import type {
 
 export interface ServiceOperationQueryFn<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -27,6 +27,6 @@ export interface ServiceOperationQueryFn<
         signal?: TSignal;
         meta?: TMeta;
       }
-    ) => Promise<RequestFnResponse<TQueryFnData, TError>>
-  ): Promise<RequestFnResponse<TQueryFnData, TError>>;
+    ) => Promise<RequestFnResponse<TOperationQueryFnData, TError>>
+  ): Promise<RequestFnResponse<TOperationQueryFnData, TError>>;
 }

package/src/service-operation/ServiceOperationRefetchQueries.ts

@@ -6,7 +6,7 @@ import type { RefetchOptions } from '@tanstack/query-core';
 
 export interface ServiceOperationRefetchQueries<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -14,14 +14,14 @@ export interface ServiceOperationRefetchQueries<
     filters?:
       | QueryFiltersByParameters<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError
         >
       | QueryFiltersByQueryKey<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError

package/src/service-operation/ServiceOperationRemoveQueries.ts

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

package/src/service-operation/ServiceOperationResetQueries.ts

@@ -6,7 +6,7 @@ import type { ResetOptions } from '@tanstack/query-core';
 
 export interface ServiceOperationResetQueries<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -14,14 +14,14 @@ export interface ServiceOperationResetQueries<
     filters?:
       | QueryFiltersByParameters<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError
         >
       | QueryFiltersByQueryKey<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError

package/src/service-operation/ServiceOperationSetInfiniteQueryData.ts

@@ -6,15 +6,16 @@ import type { NoInfer, SetDataOptions, Updater } from '@tanstack/query-core';
 
 export interface ServiceOperationSetInfiniteQueryData<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams = {},
 > {
   setInfiniteQueryData(
     parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     updater: Updater<
-      NoInfer<OperationInfiniteData<TQueryFnData, TParams>> | undefined,
-      NoInfer<OperationInfiniteData<TQueryFnData, TParams>> | undefined
+      | NoInfer<OperationInfiniteData<TOperationQueryFnData, TParams>>
+      | undefined,
+      NoInfer<OperationInfiniteData<TOperationQueryFnData, TParams>> | undefined
     >,
     options?: SetDataOptions
-  ): OperationInfiniteData<TQueryFnData, TParams> | undefined;
+  ): OperationInfiniteData<TOperationQueryFnData, TParams> | undefined;
 }

package/src/service-operation/ServiceOperationSetQueriesData.ts

@@ -6,7 +6,7 @@ import type { NoInfer, SetDataOptions, Updater } from '@tanstack/query-core';
 
 export interface ServiceOperationSetQueriesData<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
   TError,
 > {
@@ -14,22 +14,22 @@ export interface ServiceOperationSetQueriesData<
     filters:
       | QueryFiltersByParameters<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError
         >
       | QueryFiltersByQueryKey<
           TSchema,
-          TQueryFnData,
+          TOperationQueryFnData,
           TInfinite,
           TParams,
           TError
         >,
     updater: Updater<
-      NoInfer<TQueryFnData> | undefined,
-      NoInfer<TQueryFnData> | undefined
+      NoInfer<TOperationQueryFnData> | undefined,
+      NoInfer<TOperationQueryFnData> | undefined
     >,
     options?: SetDataOptions
-  ): Array<TQueryFnData | undefined>;
+  ): Array<TOperationQueryFnData | undefined>;
 }

package/src/service-operation/ServiceOperationSetQueryData.ts

@@ -6,7 +6,7 @@ import type { NoInfer, SetDataOptions, Updater } from '@tanstack/query-core';
 
 export interface ServiceOperationSetQueryData<
   TSchema extends { url: string; method: string },
-  TQueryFnData,
+  TOperationQueryFnData,
   TParams,
 > {
   setQueryData(
@@ -14,9 +14,9 @@ export interface ServiceOperationSetQueryData<
       | (AreAllOptional<TParams> extends true ? TParams | undefined : TParams)
       | ServiceOperationQueryKey<TSchema, TParams>,
     updater: Updater<
-      NoInfer<TQueryFnData> | undefined,
-      NoInfer<TQueryFnData> | undefined
+      NoInfer<TOperationQueryFnData> | undefined,
+      NoInfer<TOperationQueryFnData> | undefined
     >,
     options?: SetDataOptions
-  ): TQueryFnData | undefined;
+  ): TOperationQueryFnData | undefined;
 }

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/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;
 }