@openapi-qraft/react 1.4.0 → 1.6.0

package/src/ServiceOperation.ts

@@ -20,6 +20,7 @@ import {
   QueryFunction,
   InitialPageParam,
   GetNextPageParamFunction,
+  QueryState,
 } from '@tanstack/query-core';
 import type {
   DefinedInitialDataInfiniteOptions,
@@ -41,15 +42,21 @@ import type {
 
 import type { RequestFn } from './lib/requestFn.js';
 
+type ServiceOperationBaseQueryKey<
+  S extends { url: string; method: string },
+  Infinite extends boolean,
+  T,
+> = [S & { infinite: Infinite }, T];
+
 export type ServiceOperationQueryKey<
   S extends { url: string; method: string },
   T,
-> = [S, T];
+> = ServiceOperationBaseQueryKey<S, false, T>;
 
 export type ServiceOperationInfiniteQueryKey<
   S extends { url: string; method: string },
   T,
-> = [S & { infinite: true }, T];
+> = ServiceOperationBaseQueryKey<S, true, T>;
 
 export type ServiceOperationMutationKey<
   S extends Record<'url' | 'method', string>,
@@ -72,8 +79,11 @@ export interface ServiceOperationQuery<
     ServiceOperationFetchQuery<TSchema, TData, TParams, TError>,
     ServiceOperationFetchInfiniteQuery<TSchema, TData, TParams, TError>,
     ServiceOperationGetQueryData<TSchema, TData, TParams>,
+    ServiceOperationGetQueryState<TSchema, TData, TParams, TError>,
+    ServiceOperationGetQueriesData<TSchema, TData, TParams, TError>,
     ServiceOperationGetInfiniteQueryData<TSchema, TData, TParams>,
     ServiceOperationSetQueryData<TSchema, TData, TParams>,
+    ServiceOperationSetQueriesData<TSchema, TData, TParams, TError>,
     ServiceOperationSetInfiniteQueryData<TSchema, TData, TParams>,
     ServiceOperationInvalidateQueries<TSchema, TData, TParams, TError>,
     ServiceOperationCancelQueries<TSchema, TData, TParams, TError>,
@@ -390,9 +400,18 @@ type QueryTypeFilter = 'all' | 'active' | 'inactive';
 interface QueryFiltersBase<
   TSchema extends { url: string; method: string },
   TData,
+  TInfinite extends boolean,
   TParams = {},
   TError = DefaultError,
 > {
+  /**
+   * Include queries matching this predicate function
+   */
+  predicate?: TInfinite extends true
+    ? QueryFilterInfinitePredicate<TSchema, TData, TParams, TError>
+    : TInfinite extends false
+      ? QueryFilterRegularPredicate<TSchema, TData, TParams, TError>
+      : (query: string) => boolean;
   /**
    * Filter to active queries, inactive queries or all queries
    */
@@ -401,18 +420,6 @@ interface QueryFiltersBase<
    * Match query key exactly
    */
   exact?: boolean;
-  /**
-   * Include queries matching this predicate function
-   */
-  predicate?: (
-    query: Query<
-      TData,
-      TError,
-      TData,
-      | ServiceOperationQueryKey<TSchema, TParams>
-      | ServiceOperationInfiniteQueryKey<TSchema, TParams>
-    >
-  ) => boolean;
   /**
    * Include or exclude stale queries
    */
@@ -426,35 +433,86 @@ interface QueryFiltersBase<
 interface QueryFiltersByQueryKey<
   TSchema extends { url: string; method: string },
   TData,
+  TInfinite extends boolean,
   TParams = {},
   TError = DefaultError,
-> extends QueryFiltersBase<TSchema, TData, TParams, TError> {
+> extends QueryFiltersBase<TSchema, TData, TInfinite, TParams, TError> {
   /**
    * Include queries matching this query key
    */
-  queryKey?: ServiceOperationQueryKey<TSchema, TParams>;
+  queryKey?: ServiceOperationBaseQueryKey<TSchema, TInfinite, TParams>;
+
+  infinite?: never;
+  parameters?: never;
 }
 
 interface QueryFiltersByParameters<
   TSchema extends { url: string; method: string },
   TData,
+  TInfinite extends boolean,
   TParams = {},
   TError = DefaultError,
-> extends QueryFiltersBase<TSchema, TData, TParams, TError> {
+> extends QueryFiltersBase<TSchema, TData, TInfinite, TParams, TError> {
+  /**
+   * Is the query infinite
+   */
+  infinite?: TInfinite;
+
   /**
    * Include queries matching parameters
    */
   parameters?: TParams;
+
+  queryKey?: never;
+}
+
+interface QueryFilterInfinitePredicate<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> {
+  /**
+   * Include queries matching this predicate function
+   */
+  (
+    query: Query<
+      InfiniteData<TData, TParams>,
+      TError,
+      InfiniteData<TData, TParams>,
+      ServiceOperationInfiniteQueryKey<TSchema, TParams>
+    >
+  ): boolean;
+}
+
+interface QueryFilterRegularPredicate<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> {
+  /**
+   * Include queries matching this predicate function
+   */
+  (
+    query: Query<
+      TData,
+      TError,
+      TData,
+      ServiceOperationQueryKey<TSchema, TParams>
+    >
+  ): boolean;
 }
 
 type InvalidateQueryFilters<
   TSchema extends { url: string; method: string },
   TData,
+  TInfinite extends boolean,
   TParams = {},
   TError = DefaultError,
 > = (
-  | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-  | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+  | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+  | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
 ) & {
   refetchType?: QueryTypeFilter | 'none';
 };
@@ -465,13 +523,13 @@ interface ServiceOperationInvalidateQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  invalidateQueries(
-    filters: InvalidateQueryFilters<TSchema, TData, TParams, TError>,
+  invalidateQueries<TInfinite extends boolean>(
+    filters: InvalidateQueryFilters<TSchema, TData, TInfinite, TParams, TError>,
     options: InvalidateOptions,
     queryClient: QueryClient
   ): Promise<void>;
-  invalidateQueries(
-    filters: InvalidateQueryFilters<TSchema, TData, TParams, TError>,
+  invalidateQueries<TInfinite extends boolean>(
+    filters: InvalidateQueryFilters<TSchema, TData, TInfinite, TParams, TError>,
     queryClient: QueryClient
   ): Promise<void>;
   invalidateQueries(queryClient: QueryClient): Promise<void>;
@@ -486,10 +544,9 @@ export interface ServiceOperationInvalidateQueriesCallback<
   TParams = {},
   TError = DefaultError,
 > extends ServiceOperationInvalidateQueries<TSchema, TData, TParams, TError> {
-  invalidateQueries(
+  invalidateQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | InvalidateQueryFilters<TSchema, TData, TInfinite, TParams, TError>
       | QueryClient,
     options?: InvalidateOptions | QueryClient,
     queryClient?: QueryClient
@@ -502,17 +559,17 @@ interface ServiceOperationCancelQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  cancelQueries(
+  cancelQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     options: CancelOptions,
     queryClient: QueryClient
   ): Promise<void>;
-  cancelQueries(
+  cancelQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     queryClient: QueryClient
   ): Promise<void>;
   cancelQueries(queryClient: QueryClient): Promise<void>;
@@ -527,10 +584,10 @@ export interface ServiceOperationCancelQueriesCallback<
   TParams = {},
   TError = DefaultError,
 > extends ServiceOperationCancelQueries<TSchema, TData, TParams, TError> {
-  cancelQueries(
+  cancelQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
       | QueryClient,
     options?: CancelOptions | QueryClient,
     queryClient?: QueryClient
@@ -543,10 +600,10 @@ interface ServiceOperationRemoveQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  removeQueries(
+  removeQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     queryClient: QueryClient
   ): void;
   removeQueries(queryClient: QueryClient): void;
@@ -561,10 +618,10 @@ export interface ServiceOperationRemoveQueriesCallback<
   TParams = {},
   TError = DefaultError,
 > extends ServiceOperationRemoveQueries<TSchema, TData, TParams, TError> {
-  removeQueries(
+  removeQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
       | QueryClient,
     queryClient?: QueryClient
   ): void;
@@ -576,17 +633,17 @@ interface ServiceOperationResetQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  resetQueries(
+  resetQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     options: ResetOptions,
     queryClient: QueryClient
   ): Promise<void>;
-  resetQueries(
+  resetQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     queryClient: QueryClient
   ): Promise<void>;
   resetQueries(queryClient: QueryClient): Promise<void>;
@@ -601,10 +658,10 @@ export interface ServiceOperationResetQueriesCallback<
   TParams = {},
   TError = DefaultError,
 > extends ServiceOperationResetQueries<TSchema, TData, TParams, TError> {
-  resetQueries(
+  resetQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
       | QueryClient,
     options?: ResetOptions | QueryClient,
     queryClient?: QueryClient
@@ -617,17 +674,17 @@ interface ServiceOperationRefetchQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  refetchQueries(
+  refetchQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     options: RefetchOptions,
     queryClient: QueryClient
   ): Promise<void>;
-  refetchQueries(
+  refetchQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     queryClient: QueryClient
   ): Promise<void>;
   refetchQueries(queryClient: QueryClient): Promise<void>;
@@ -642,10 +699,10 @@ export interface ServiceOperationResetQueriesCallback<
   TParams = {},
   TError = DefaultError,
 > extends ServiceOperationRefetchQueries<TSchema, TData, TParams, TError> {
-  refetchQueries(
+  refetchQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
       | QueryClient,
     options?: RefetchOptions | QueryClient,
     queryClient?: QueryClient
@@ -658,10 +715,10 @@ interface ServiceOperationIsFetchingQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  isFetching(
+  isFetching<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     queryClient: QueryClient
   ): number;
   isFetching(queryClient: QueryClient): number;
@@ -676,10 +733,10 @@ export interface ServiceOperationIsFetchingQueriesCallback<
   TParams = {},
   TError = DefaultError,
 > extends ServiceOperationIsFetchingQueries<TSchema, TData, TParams, TError> {
-  refetchQueries(
+  refetchQueries<TInfinite extends boolean>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>
       | QueryClient,
     queryClient?: QueryClient
   ): number;
@@ -691,10 +748,10 @@ interface ServiceOperationUseIsFetchingQueries<
   TParams = {},
   TError = DefaultError,
 > {
-  useIsFetching(
+  useIsFetching<TInfinite extends boolean>(
     filters?:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
     queryClient?: QueryClient
   ): number;
 }
@@ -748,7 +805,7 @@ interface ServiceOperationUseInfiniteQuery<
       UndefinedInitialDataInfiniteOptions<
         TData,
         TError,
-        InfiniteData<TData>,
+        InfiniteData<TData, TParams>,
         ServiceOperationInfiniteQueryKey<TSchema, TParams>,
         PartialParameters<TPageParam>
       >,
@@ -759,14 +816,14 @@ interface ServiceOperationUseInfiniteQuery<
     > &
       InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>,
     queryClient?: QueryClient
-  ): UseInfiniteQueryResult<InfiniteData<TData>, TError | Error>;
+  ): UseInfiniteQueryResult<InfiniteData<TData, TParams>, TError | Error>;
   useInfiniteQuery<TPageParam extends TParams>(
     parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     options: Omit<
       DefinedInitialDataInfiniteOptions<
         TData,
         TError,
-        InfiniteData<TData>,
+        InfiniteData<TData, TParams>,
         ServiceOperationInfiniteQueryKey<TSchema, TParams>,
         PartialParameters<TPageParam>
       >,
@@ -777,7 +834,10 @@ interface ServiceOperationUseInfiniteQuery<
     > &
       InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>,
     queryClient?: QueryClient
-  ): DefinedUseInfiniteQueryResult<InfiniteData<TData>, TError | Error>;
+  ): DefinedUseInfiniteQueryResult<
+    InfiniteData<TData, TParams>,
+    TError | Error
+  >;
 }
 
 interface ServiceOperationUseSuspenseInfiniteQuery<
@@ -792,7 +852,7 @@ interface ServiceOperationUseSuspenseInfiniteQuery<
       UseSuspenseInfiniteQueryOptions<
         TData,
         TError,
-        InfiniteData<TData>,
+        InfiniteData<TData, TParams>,
         TData,
         ServiceOperationInfiniteQueryKey<TSchema, TParams>,
         PartialParameters<TPageParam>
@@ -804,7 +864,10 @@ interface ServiceOperationUseSuspenseInfiniteQuery<
     > &
       InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>,
     queryClient?: QueryClient
-  ): UseSuspenseInfiniteQueryResult<InfiniteData<TData>, TError | Error>;
+  ): UseSuspenseInfiniteQueryResult<
+    InfiniteData<TData, TParams>,
+    TError | Error
+  >;
 }
 
 interface ServiceOperationUseSuspenseQueryQuery<
@@ -837,7 +900,7 @@ export interface ServiceOperationMutation<
 > extends ServiceOperationUseMutation<TSchema, TBody, TData, TParams, TError>,
     ServiceOperationUseIsMutating<TSchema, TBody, TData, TParams, TError>,
     ServiceOperationUseMutationState<TSchema, TBody, TData, TParams, TError>,
-    ServiceOperationIsMutatingQueries<TSchema, TData, TParams, TError>,
+    ServiceOperationIsMutatingQueries<TSchema, TBody, TData, TParams, TError>,
     ServiceOperationMutationFn<TSchema, TBody, TData, TParams> {
   schema: TSchema;
   types: {
@@ -912,7 +975,7 @@ interface UseMutationStateFiltersBase<
   status?: MutationStatus;
 }
 
-interface UseMutationStateFiltersByParameters<
+interface MutationFiltersByParameters<
   TBody,
   TData,
   TParams,
@@ -923,9 +986,10 @@ interface UseMutationStateFiltersByParameters<
    * Include mutations matching these parameters
    */
   parameters?: PartialParameters<TParams>;
+  mutationKey?: never;
 }
 
-interface UseMutationStateFiltersByMutationKey<
+interface MutationFiltersByMutationKey<
   TSchema extends { url: string; method: string },
   TBody,
   TData,
@@ -940,6 +1004,7 @@ interface UseMutationStateFiltersByMutationKey<
     TSchema,
     PartialParameters<TParams>
   >;
+  parameters?: never;
 }
 
 type MutationVariables<TBody, TParams> = {
@@ -964,14 +1029,8 @@ interface ServiceOperationUseMutationState<
   >(
     options?: {
       filters?:
-        | UseMutationStateFiltersByParameters<
-            TBody,
-            TData,
-            TParams,
-            TError,
-            TContext
-          >
-        | UseMutationStateFiltersByMutationKey<
+        | MutationFiltersByParameters<TBody, TData, TParams, TError, TContext>
+        | MutationFiltersByMutationKey<
             TSchema,
             TBody,
             TData,
@@ -1001,14 +1060,8 @@ interface ServiceOperationUseIsMutating<
 > {
   useIsMutating<TContext = unknown>(
     filters?:
-      | UseMutationStateFiltersByParameters<
-          TBody,
-          TData,
-          TParams,
-          TError,
-          TContext
-        >
-      | UseMutationStateFiltersByMutationKey<
+      | MutationFiltersByParameters<TBody, TData, TParams, TError, TContext>
+      | MutationFiltersByMutationKey<
           TSchema,
           TBody,
           TData,
@@ -1121,6 +1174,75 @@ export interface ServiceOperationSetQueryDataCallback<
   ): TData | undefined;
 }
 
+interface ServiceOperationSetQueriesData<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {}, // todo::try to replace `TParams = {}` with `TParams = undefined`
+  TError = DefaultError,
+> {
+  setQueriesData<TInfinite extends boolean>(
+    filters:
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
+    updater: Updater<NoInfer<TData> | undefined, NoInfer<TData> | undefined>,
+    options: SetDataOptions,
+    queryClient: QueryClient
+  ): Array<TData | undefined>;
+
+  setQueriesData<TInfinite extends boolean>(
+    filters:
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
+    updater: Updater<NoInfer<TData> | undefined, NoInfer<TData> | undefined>,
+    queryClient: QueryClient
+  ): Array<TData | undefined>;
+}
+
+/**
+ * @internal
+ */
+export interface ServiceOperationSetQueriesDataCallback<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> extends ServiceOperationSetQueriesData<TSchema, TData, TParams, TError> {
+  setQueriesData<TInfinite extends boolean>(
+    filters:
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
+    updater: Updater<NoInfer<TData> | undefined, NoInfer<TData> | undefined>,
+    options: SetDataOptions | QueryClient,
+    queryClient?: QueryClient
+  ): Array<TData | undefined>;
+}
+
+interface ServiceOperationGetQueriesData<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {}, // todo::try to replace `TParams = {}` with `TParams = undefined`
+  TError = DefaultError,
+> {
+  getQueriesData<TInfinite extends boolean>(
+    filters:
+      | QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError>
+      | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>,
+    queryClient: QueryClient
+  ): TInfinite extends true
+    ? Array<
+        [
+          queryKey: ServiceOperationInfiniteQueryKey<TSchema, TParams>,
+          data: NoInfer<InfiniteData<TData, TParams>> | undefined,
+        ]
+      >
+    : Array<
+        [
+          queryKey: ServiceOperationQueryKey<TSchema, TParams>,
+          data: TData | undefined,
+        ]
+      >;
+}
+
 interface ServiceOperationSetInfiniteQueryData<
   TSchema extends { url: string; method: string },
   TData,
@@ -1129,12 +1251,12 @@ interface ServiceOperationSetInfiniteQueryData<
   setInfiniteQueryData(
     parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     updater: Updater<
-      NoInfer<InfiniteData<TData>> | undefined,
-      NoInfer<InfiniteData<TData>> | undefined
+      NoInfer<InfiniteData<TData, TParams>> | undefined,
+      NoInfer<InfiniteData<TData, TParams>> | undefined
     >,
     queryClient: QueryClient,
     options?: SetDataOptions
-  ): InfiniteData<TData> | undefined;
+  ): InfiniteData<TData, TParams> | undefined;
 }
 
 interface ServiceOperationGetQueryData<
@@ -1156,7 +1278,26 @@ interface ServiceOperationGetInfiniteQueryData<
   getInfiniteQueryData(
     parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
     queryClient: QueryClient
-  ): InfiniteData<TData> | undefined;
+  ): InfiniteData<TData, TParams> | undefined;
+}
+
+interface ServiceOperationGetQueryState<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams = {},
+  TError = DefaultError,
+> {
+  getQueryState(
+    parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
+    queryClient: QueryClient
+  ): QueryState<TData, TError> | undefined;
+
+  getInfiniteQueryState(
+    parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>,
+    queryClient: QueryClient
+  ):
+    | QueryState<InfiniteData<TData, PartialParameters<TParams>>, TError>
+    | undefined;
 }
 
 export interface ServiceOperationMutationFn<
@@ -1196,14 +1337,22 @@ export interface ServiceOperationMutationFn<
 
 interface ServiceOperationIsMutatingQueries<
   TSchema extends { url: string; method: string },
+  TBody,
   TData,
   TParams = {},
   TError = DefaultError,
 > {
-  isMutating(
+  isMutating<TContext>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>,
+      | MutationFiltersByParameters<TBody, TData, TParams, TError, TContext>
+      | MutationFiltersByMutationKey<
+          TSchema,
+          TBody,
+          TData,
+          TParams,
+          TError,
+          TContext
+        >,
     queryClient: QueryClient
   ): number;
   isMutating(queryClient: QueryClient): number;
@@ -1214,14 +1363,28 @@ interface ServiceOperationIsMutatingQueries<
  */
 export interface ServiceOperationIsMutatingQueriesCallback<
   TSchema extends { url: string; method: string },
+  TBody,
   TData,
   TParams = {},
   TError = DefaultError,
-> extends ServiceOperationIsMutatingQueries<TSchema, TData, TParams, TError> {
-  isMutating(
+> extends ServiceOperationIsMutatingQueries<
+    TSchema,
+    TBody,
+    TData,
+    TParams,
+    TError
+  > {
+  isMutating<TContext>(
     filters:
-      | QueryFiltersByParameters<TSchema, TData, TParams, TError>
-      | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>
+      | MutationFiltersByParameters<TBody, TData, TParams, TError, TContext>
+      | MutationFiltersByMutationKey<
+          TSchema,
+          TBody,
+          TData,
+          TParams,
+          TError,
+          TContext
+        >
       | QueryClient,
     queryClient?: QueryClient
   ): number;