@openapi-qraft/react 1.3.2 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @openapi-qraft/react
 
+## 1.5.0
+
+### Minor Changes
+
+- 5c965ab: Unified QueryKey for Infinite and regular Queries: `[TSchema & { infinite: boolean}, TParams]`
+- 8db4067: Added support for `QueryClient.getQueriesData(...)` method
+
+### Patch Changes
+
+- c761191: Added support for `QueryClient.setQueriesData(...)` method
+- bf43192: feature: add support for `QueryClient.getQueryState(...)` method
+
+## 1.4.0
+
+### Minor Changes
+
+- 6343a8d: Added support for `QueryClient.isMutating(...)` method
+- b297c10: Unified `composeMutationKey(...)` to return the same key structure as `composeQueryKey(...)` if no parameters are passed
+- 42a0b11: Added support for `QueryClient.removeQueries(...)` method
+
+### Patch Changes
+
+- 34fd459: Fixed `fetchQuery(...)` documentation
+
 ## 1.3.2
 
 ### Patch Changes
@@ -16,7 +40,7 @@
 
 ### Minor Changes
 
-- 7c81509: Add support for `QueryClinet.fetchInfiniteQuery(...)` and `QueryClinet.prefetchInfiniteQuery(...)` methods
+- 7c81509: Add support for `QueryClient.fetchInfiniteQuery(...)` and `QueryClient.prefetchInfiniteQuery(...)` methods
 - 8e47c05: Simplified `QueryClient.setQueryData(...)` API
 - 48e662d: Added support for `QueryClient.fetchQuery(...)` method
 - 315883b: Changed `requestFn(...)` API to simplify the usage

package/README.md

@@ -2,7 +2,7 @@
 
 `@openapi-qraft/react` is a modular TypeScript client designed to facilitate type-safe API requests in React
 applications,
-leveraging the power of **Tanstack Query v5**. It utilizes a Proxy-based architecture to dynamically generate
+leveraging the power of **TanStack Query v5**. It utilizes a Proxy-based architecture to dynamically generate
 hooks with typed parameters, ensuring that your API requests are both type-safe and efficient.
 
 ## Features
@@ -11,7 +11,7 @@ hooks with typed parameters, ensuring that your API requests are both type-safe
   developer experience.
 - **Modular Design:** Customize the utility with a set of callbacks to handle API calls according to your project's
   needs.
-- **Integration with [Tanstack Query v5](https://tanstack.com/query/v5):** Seamlessly integrate with _Tanstack Query_
+- **Integration with [TanStack Query v5](https://tanstack.com/query/v5):** Seamlessly integrate with _TanStack Query_
   for handling server state, caching, and data synchronization.
 - **Dynamic Proxy-Based Hooks:** Automatically generate React Query hooks for your API endpoints without manual
   boilerplate.
@@ -56,7 +56,7 @@ npx openapi-typescript https://api.dev.monite.com/openapi.json?version=2023-09-0
 
 #### Generating Qraft Services
 
-Next, use `@openapi-qraft/cli` to generate the services and typed Tanstack Query React Hooks. Ensure to specify the path
+Next, use `@openapi-qraft/cli` to generate the services and typed TanStack Query React Hooks. Ensure to specify the path
 to the TypeScript definitions generated in the previous step.
 
 ```bash
@@ -274,7 +274,7 @@ useEffect(() => {
 const infiniteQuery = qraft.posts.getPosts.useInfiniteQuery(
   { query: { limit: 10 } },
   {
-    // * required by Tanstack Query
+    // * required by TanStack Query
     getNextPageParam: (lastPage, allPages, lastPageParams) => {
       if (lastPage.length < 10) return; // if less than 10 items, there are no more pages
       return {
@@ -283,7 +283,7 @@ const infiniteQuery = qraft.posts.getPosts.useInfiniteQuery(
         },
       };
     },
-    // * required by Tanstack Query
+    // * required by TanStack Query
     initialPageParam: {
       query: {
         page: 1, // will be used in initial request
@@ -316,11 +316,11 @@ const infiniteQuery = qraft.dataExports.getDataExports.useInfiniteQuery(
     },
   },
   {
-    // * required by Tanstack Query
+    // * required by TanStack Query
     initialPageParam: {
       query: { pagination_token: undefined }, // will be used in initial request
     },
-    // * required by Tanstack Query
+    // * required by TanStack Query
     getNextPageParam: (lastPage, allPages, lastPageParam) => ({
       query: { pagination_token: lastPage.next_pagination_token },
     }),
@@ -331,10 +331,10 @@ const infiniteQuery = qraft.dataExports.getDataExports.useInfiniteQuery(
   }
 );
 
-// ⬇︎ will execute GET /data_exports?pagination_token=...NEXT_PAGE_TOKEN....
+// ⬇︎ will execute GET /data_exports?pagination_token=<NEXT_PAGINATION_TOKEN>
 infiniteQuery.fetchNextPage();
 
-// ⬇︎ will execute GET /data_exports?pagination_token=...PREV_PAGE_TOKEN....
+// ⬇︎ will execute GET /data_exports?pagination_token=<PREV_PAGINATION_TOKEN>
 infiniteQuery.fetchPreviousPage();
 ```
 
@@ -382,10 +382,10 @@ qraft.entities.getEntities.useQueries({
 ```tsx
 function FetchStatus() {
   // Checks all queries `GET /entities`
-  const isFetchingTotal = qraft.entities.getEntities.useIsFetching();
+  const fetchingTotal = qraft.entities.getEntities.useIsFetching();
 
-  // Cechks all queries `GET /entities/3e3e-3e3e-3e3e` and `x-monite-version: 2023-09-01` header
-  const isSpecificQueryFetching = qraft.entities.getEntities.useIsFetching({
+  // Checks all queries `GET /entities/3e3e-3e3e-3e3e` and `x-monite-version: 2023-09-01` header
+  const specificQueryKeyTotal = qraft.entities.getEntities.useIsFetching({
     parameters: {
       header: {
         'x-monite-version': '2023-09-01',
@@ -398,8 +398,8 @@ function FetchStatus() {
 
   return (
     <>
-      {!!isFetchingTotal && <div>Number of queries: {isFetchingTotal}...</div>}
-      {!!isSpecificQueryFetching && <div>Loading specific query...</div>}
+      {!!fetchingTotal && <div>Number of queries: {fetchingTotal}...</div>}
+      {!!specificQueryKeyTotal && <div>Loading specific query...</div>}
     </>
   );
 }
@@ -542,7 +542,7 @@ import { QueryClient } from '@tanstack/react-query';
 
 const queryClient = new QueryClient();
 
-const posts = qraft.posts.getPosts.fetchInfiniteQuery(
+const posts = qraft.posts.getPosts.fetchQuery(
   {
     parameters: { query: { limit: 10 } },
     /**
@@ -622,8 +622,8 @@ Supported Suspense Queries are:
 - `getQueryData(parameters)`
 - `setQueryData(parameters, updater)`
 - `getInfiniteQueryKey(parameters)`
-- `getInfinityQueryData(parameters)`
-- `setInfinityQueryData(parameters, updater)`
+- `getInfiniteQueryData(parameters)`
+- `setInfiniteQueryData(parameters, updater)`
 - `schema` - object with schema: `{method, url, mediaType}`
 - `types` - object with types: `{parameters, data, error, body}`
 

package/dist/ServiceOperation.d.ts

@@ -1,21 +1,25 @@
-import { CancelOptions, DefaultError, FetchStatus, InfiniteData, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationState, MutationStatus, NoInfer, QueriesPlaceholderDataFunction, Query, QueryClient, FetchQueryOptions, RefetchOptions, ResetOptions, SetDataOptions, Updater, QueryFunction, InitialPageParam, GetNextPageParamFunction } from '@tanstack/query-core';
+import { CancelOptions, DefaultError, FetchStatus, InfiniteData, InfiniteQueryPageParamsOptions, InvalidateOptions, Mutation, MutationState, MutationStatus, NoInfer, QueriesPlaceholderDataFunction, Query, QueryClient, FetchQueryOptions, RefetchOptions, ResetOptions, SetDataOptions, Updater, QueryFunction, InitialPageParam, GetNextPageParamFunction, QueryState } from '@tanstack/query-core';
 import type { DefinedInitialDataInfiniteOptions, DefinedInitialDataOptions, DefinedUseInfiniteQueryResult, DefinedUseQueryResult, UndefinedInitialDataInfiniteOptions, UndefinedInitialDataOptions, UseInfiniteQueryResult, UseMutationOptions, UseMutationResult, UseQueryOptions, UseQueryResult, UseSuspenseInfiniteQueryOptions, UseSuspenseInfiniteQueryResult, UseSuspenseQueryOptions, UseSuspenseQueryResult } from '@tanstack/react-query';
 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];
+}, T> = ServiceOperationBaseQueryKey<S, false, T>;
 export type ServiceOperationInfiniteQueryKey<S extends {
     url: string;
     method: string;
-}, T> = [S & {
-    infinite: true;
-}, T];
+}, T> = ServiceOperationBaseQueryKey<S, true, T>;
 export type ServiceOperationMutationKey<S extends Record<'url' | 'method', string>, T extends unknown> = NonNullable<T> extends never ? [S] : [S, T];
 export interface ServiceOperationQuery<TSchema extends {
     url: string;
     method: string;
-}, TData, TParams, TError = DefaultError> extends ServiceOperationUseQuery<TSchema, TData, TParams, TError>, ServiceOperationUseQueries<TSchema, TData, TParams, TError>, ServiceOperationUseSuspenseQueries<TSchema, TData, TParams, TError>, ServiceOperationUseInfiniteQuery<TSchema, TData, TParams, TError>, ServiceOperationUseSuspenseQueryQuery<TSchema, TData, TParams, TError>, ServiceOperationUseSuspenseInfiniteQuery<TSchema, TData, TParams, TError>, ServiceOperationUseIsFetchingQueries<TSchema, TData, TParams, TError>, ServiceOperationQueryFn<TSchema, TData, TParams>, ServiceOperationFetchQuery<TSchema, TData, TParams, TError>, ServiceOperationFetchInfiniteQuery<TSchema, TData, TParams, TError>, ServiceOperationGetQueryData<TSchema, TData, TParams>, ServiceOperationGetInfiniteQueryData<TSchema, TData, TParams>, ServiceOperationSetQueryData<TSchema, TData, TParams>, ServiceOperationSetInfiniteQueryData<TSchema, TData, TParams>, ServiceOperationInvalidateQueries<TSchema, TData, TParams, TError>, ServiceOperationCancelQueries<TSchema, TData, TParams, TError>, ServiceOperationResetQueries<TSchema, TData, TParams, TError>, ServiceOperationRefetchQueries<TSchema, TData, TParams, TError>, ServiceOperationIsFetchingQueries<TSchema, TData, TParams, TError> {
+}, TData, TParams, TError = DefaultError> extends ServiceOperationUseQuery<TSchema, TData, TParams, TError>, ServiceOperationUseQueries<TSchema, TData, TParams, TError>, ServiceOperationUseSuspenseQueries<TSchema, TData, TParams, TError>, ServiceOperationUseInfiniteQuery<TSchema, TData, TParams, TError>, ServiceOperationUseSuspenseQueryQuery<TSchema, TData, TParams, TError>, ServiceOperationUseSuspenseInfiniteQuery<TSchema, TData, TParams, TError>, ServiceOperationUseIsFetchingQueries<TSchema, TData, TParams, TError>, ServiceOperationQueryFn<TSchema, TData, TParams>, 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>, ServiceOperationRemoveQueries<TSchema, TData, TParams, TError>, ServiceOperationResetQueries<TSchema, TData, TParams, TError>, ServiceOperationRefetchQueries<TSchema, TData, TParams, TError>, ServiceOperationIsFetchingQueries<TSchema, TData, TParams, TError> {
     schema: TSchema;
     types: {
         parameters: TParams;
@@ -146,7 +150,11 @@ type QueryTypeFilter = 'all' | 'active' | 'inactive';
 interface QueryFiltersBase<TSchema extends {
     url: string;
     method: string;
-}, TData, TParams = {}, TError = DefaultError> {
+}, 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
      */
@@ -155,10 +163,6 @@ interface QueryFiltersBase<TSchema extends {
      * 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
      */
@@ -171,33 +175,58 @@ interface QueryFiltersBase<TSchema extends {
 interface QueryFiltersByQueryKey<TSchema extends {
     url: string;
     method: string;
-}, TData, TParams = {}, TError = DefaultError> extends QueryFiltersBase<TSchema, TData, TParams, TError> {
+}, TData, TInfinite extends boolean, TParams = {}, TError = DefaultError> 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, TParams = {}, TError = DefaultError> extends QueryFiltersBase<TSchema, TData, TParams, TError> {
+}, TData, TInfinite extends boolean, TParams = {}, TError = DefaultError> 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, TParams = {}, TError = DefaultError> = (QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>) & {
+}, TData, TInfinite extends boolean, TParams = {}, TError = DefaultError> = (QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>) & {
     refetchType?: QueryTypeFilter | 'none';
 };
 interface ServiceOperationInvalidateQueries<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> {
-    invalidateQueries(filters: InvalidateQueryFilters<TSchema, TData, TParams, TError>, options: InvalidateOptions, queryClient: QueryClient): Promise<void>;
-    invalidateQueries(filters: InvalidateQueryFilters<TSchema, TData, TParams, TError>, queryClient: QueryClient): Promise<void>;
+    invalidateQueries<TInfinite extends boolean>(filters: InvalidateQueryFilters<TSchema, TData, TInfinite, TParams, TError>, options: InvalidateOptions, queryClient: QueryClient): Promise<void>;
+    invalidateQueries<TInfinite extends boolean>(filters: InvalidateQueryFilters<TSchema, TData, TInfinite, TParams, TError>, queryClient: QueryClient): Promise<void>;
     invalidateQueries(queryClient: QueryClient): Promise<void>;
 }
 /**
@@ -207,14 +236,14 @@ export interface ServiceOperationInvalidateQueriesCallback<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> extends ServiceOperationInvalidateQueries<TSchema, TData, TParams, TError> {
-    invalidateQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError> | QueryClient, options?: InvalidateOptions | QueryClient, queryClient?: QueryClient): Promise<void>;
+    invalidateQueries<TInfinite extends boolean>(filters: InvalidateQueryFilters<TSchema, TData, TInfinite, TParams, TError> | QueryClient, options?: InvalidateOptions | QueryClient, queryClient?: QueryClient): Promise<void>;
 }
 interface ServiceOperationCancelQueries<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> {
-    cancelQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>, options: CancelOptions, queryClient: QueryClient): Promise<void>;
-    cancelQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>, queryClient: QueryClient): Promise<void>;
+    cancelQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>, options: CancelOptions, queryClient: QueryClient): Promise<void>;
+    cancelQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>, queryClient: QueryClient): Promise<void>;
     cancelQueries(queryClient: QueryClient): Promise<void>;
 }
 /**
@@ -224,14 +253,30 @@ export interface ServiceOperationCancelQueriesCallback<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> extends ServiceOperationCancelQueries<TSchema, TData, TParams, TError> {
-    cancelQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError> | QueryClient, options?: CancelOptions | QueryClient, queryClient?: QueryClient): Promise<void>;
+    cancelQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError> | QueryClient, options?: CancelOptions | QueryClient, queryClient?: QueryClient): Promise<void>;
+}
+interface ServiceOperationRemoveQueries<TSchema extends {
+    url: string;
+    method: string;
+}, TData, TParams = {}, TError = DefaultError> {
+    removeQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>, queryClient: QueryClient): void;
+    removeQueries(queryClient: QueryClient): void;
+}
+/**
+ * @internal
+ */
+export interface ServiceOperationRemoveQueriesCallback<TSchema extends {
+    url: string;
+    method: string;
+}, TData, TParams = {}, TError = DefaultError> extends ServiceOperationRemoveQueries<TSchema, TData, TParams, TError> {
+    removeQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError> | QueryClient, queryClient?: QueryClient): void;
 }
 interface ServiceOperationResetQueries<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> {
-    resetQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>, options: ResetOptions, queryClient: QueryClient): Promise<void>;
-    resetQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>, queryClient: QueryClient): Promise<void>;
+    resetQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>, options: ResetOptions, queryClient: QueryClient): Promise<void>;
+    resetQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>, queryClient: QueryClient): Promise<void>;
     resetQueries(queryClient: QueryClient): Promise<void>;
 }
 /**
@@ -241,14 +286,14 @@ export interface ServiceOperationResetQueriesCallback<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> extends ServiceOperationResetQueries<TSchema, TData, TParams, TError> {
-    resetQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError> | QueryClient, options?: ResetOptions | QueryClient, queryClient?: QueryClient): Promise<void>;
+    resetQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError> | QueryClient, options?: ResetOptions | QueryClient, queryClient?: QueryClient): Promise<void>;
 }
 interface ServiceOperationRefetchQueries<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> {
-    refetchQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>, options: RefetchOptions, queryClient: QueryClient): Promise<void>;
-    refetchQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>, queryClient: QueryClient): Promise<void>;
+    refetchQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>, options: RefetchOptions, queryClient: QueryClient): Promise<void>;
+    refetchQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>, queryClient: QueryClient): Promise<void>;
     refetchQueries(queryClient: QueryClient): Promise<void>;
 }
 /**
@@ -258,13 +303,13 @@ export interface ServiceOperationResetQueriesCallback<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> extends ServiceOperationRefetchQueries<TSchema, TData, TParams, TError> {
-    refetchQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError> | QueryClient, options?: RefetchOptions | QueryClient, queryClient?: QueryClient): Promise<void>;
+    refetchQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError> | QueryClient, options?: RefetchOptions | QueryClient, queryClient?: QueryClient): Promise<void>;
 }
 interface ServiceOperationIsFetchingQueries<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> {
-    isFetching(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>, queryClient: QueryClient): number;
+    isFetching<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>, queryClient: QueryClient): number;
     isFetching(queryClient: QueryClient): number;
 }
 /**
@@ -274,13 +319,13 @@ export interface ServiceOperationIsFetchingQueriesCallback<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> extends ServiceOperationIsFetchingQueries<TSchema, TData, TParams, TError> {
-    refetchQueries(filters: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError> | QueryClient, queryClient?: QueryClient): number;
+    refetchQueries<TInfinite extends boolean>(filters: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError> | QueryClient, queryClient?: QueryClient): number;
 }
 interface ServiceOperationUseIsFetchingQueries<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> {
-    useIsFetching(filters?: QueryFiltersByParameters<TSchema, TData, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TParams, TError>, queryClient?: QueryClient): number;
+    useIsFetching<TInfinite extends boolean>(filters?: QueryFiltersByParameters<TSchema, TData, TInfinite, TParams, TError> | QueryFiltersByQueryKey<TSchema, TData, TInfinite, TParams, TError>, queryClient?: QueryClient): number;
 }
 interface ServiceOperationUseSuspenseQueries<TSchema extends {
     url: string;
@@ -301,14 +346,14 @@ interface ServiceOperationUseInfiniteQuery<TSchema extends {
     method: string;
 }, TData, TParams = {}, TError = DefaultError> {
     getInfiniteQueryKey<TQueryKeyParams extends TParams>(parameters: TQueryKeyParams): ServiceOperationInfiniteQueryKey<TSchema, TQueryKeyParams>;
-    useInfiniteQuery<TPageParam extends TParams>(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, options: Omit<UndefinedInitialDataInfiniteOptions<TData, TError, InfiniteData<TData>, ServiceOperationInfiniteQueryKey<TSchema, TParams>, PartialParameters<TPageParam>>, 'queryKey' | 'getPreviousPageParam' | 'getNextPageParam' | 'initialPageParam'> & InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>, queryClient?: QueryClient): UseInfiniteQueryResult<InfiniteData<TData>, TError | Error>;
-    useInfiniteQuery<TPageParam extends TParams>(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, options: Omit<DefinedInitialDataInfiniteOptions<TData, TError, InfiniteData<TData>, ServiceOperationInfiniteQueryKey<TSchema, TParams>, PartialParameters<TPageParam>>, 'queryKey' | 'getPreviousPageParam' | 'getNextPageParam' | 'initialPageParam'> & InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>, queryClient?: QueryClient): DefinedUseInfiniteQueryResult<InfiniteData<TData>, TError | Error>;
+    useInfiniteQuery<TPageParam extends TParams>(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, options: Omit<UndefinedInitialDataInfiniteOptions<TData, TError, InfiniteData<TData, TParams>, ServiceOperationInfiniteQueryKey<TSchema, TParams>, PartialParameters<TPageParam>>, 'queryKey' | 'getPreviousPageParam' | 'getNextPageParam' | 'initialPageParam'> & InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>, queryClient?: QueryClient): UseInfiniteQueryResult<InfiniteData<TData, TParams>, TError | Error>;
+    useInfiniteQuery<TPageParam extends TParams>(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, options: Omit<DefinedInitialDataInfiniteOptions<TData, TError, InfiniteData<TData, TParams>, ServiceOperationInfiniteQueryKey<TSchema, TParams>, PartialParameters<TPageParam>>, 'queryKey' | 'getPreviousPageParam' | 'getNextPageParam' | 'initialPageParam'> & InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>, queryClient?: QueryClient): DefinedUseInfiniteQueryResult<InfiniteData<TData, TParams>, TError | Error>;
 }
 interface ServiceOperationUseSuspenseInfiniteQuery<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}, TError = DefaultError> {
-    useSuspenseInfiniteQuery<TPageParam extends TParams>(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, options: Omit<UseSuspenseInfiniteQueryOptions<TData, TError, InfiniteData<TData>, TData, ServiceOperationInfiniteQueryKey<TSchema, TParams>, PartialParameters<TPageParam>>, 'queryKey' | 'getPreviousPageParam' | 'getNextPageParam' | 'initialPageParam'> & InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>, queryClient?: QueryClient): UseSuspenseInfiniteQueryResult<InfiniteData<TData>, TError | Error>;
+    useSuspenseInfiniteQuery<TPageParam extends TParams>(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, options: Omit<UseSuspenseInfiniteQueryOptions<TData, TError, InfiniteData<TData, TParams>, TData, ServiceOperationInfiniteQueryKey<TSchema, TParams>, PartialParameters<TPageParam>>, 'queryKey' | 'getPreviousPageParam' | 'getNextPageParam' | 'initialPageParam'> & InfiniteQueryPageParamsOptions<TData, PartialParameters<TPageParam>>, queryClient?: QueryClient): UseSuspenseInfiniteQueryResult<InfiniteData<TData, TParams>, TError | Error>;
 }
 interface ServiceOperationUseSuspenseQueryQuery<TSchema extends {
     url: string;
@@ -319,7 +364,7 @@ interface ServiceOperationUseSuspenseQueryQuery<TSchema extends {
 export interface ServiceOperationMutation<TSchema extends {
     url: string;
     method: string;
-}, TBody, TData, TParams, TError = DefaultError> extends ServiceOperationUseMutation<TSchema, TBody, TData, TParams, TError>, ServiceOperationUseMutationState<TSchema, TBody, TData, TParams, TError>, ServiceOperationMutationFn<TSchema, TBody, TData, TParams> {
+}, TBody, TData, TParams, TError = DefaultError> extends ServiceOperationUseMutation<TSchema, TBody, TData, TParams, TError>, ServiceOperationUseIsMutating<TSchema, TBody, TData, TParams, TError>, ServiceOperationUseMutationState<TSchema, TBody, TData, TParams, TError>, ServiceOperationIsMutatingQueries<TSchema, TBody, TData, TParams, TError>, ServiceOperationMutationFn<TSchema, TBody, TData, TParams> {
     schema: TSchema;
     types: {
         parameters: TParams;
@@ -332,7 +377,7 @@ interface ServiceOperationUseMutation<TSchema extends {
     url: string;
     method: string;
 }, TBody, TData, TParams, TError = DefaultError> {
-    getMutationKey<TMutationKeyParams extends TParams>(parameters: TMutationKeyParams | undefined): ServiceOperationMutationKey<TSchema, TMutationKeyParams>;
+    getMutationKey<TMutationKeyParams extends TParams | undefined = undefined>(parameters?: TMutationKeyParams): ServiceOperationMutationKey<TSchema, TMutationKeyParams>;
     useMutation<TVariables extends MutationVariables<TBody, TParams>, TContext = unknown>(parameters?: undefined, options?: Omit<UseMutationOptions<TData, TError, TVariables, TContext>, 'mutationKey'> & {
         mutationKey?: ServiceOperationMutationKey<TSchema, TParams>;
     }, queryClient?: QueryClient): UseMutationResult<TData, TError | Error, TVariables, TContext>;
@@ -352,13 +397,14 @@ interface UseMutationStateFiltersBase<TBody, TData, TParams, TError = DefaultErr
      */
     status?: MutationStatus;
 }
-interface UseMutationStateFiltersByParameters<TBody, TData, TParams, TError = DefaultError, TContext = unknown> extends UseMutationStateFiltersBase<TBody, TData, TParams, TError, TContext> {
+interface MutationFiltersByParameters<TBody, TData, TParams, TError = DefaultError, TContext = unknown> extends UseMutationStateFiltersBase<TBody, TData, TParams, TError, TContext> {
     /**
      * Include mutations matching these parameters
      */
     parameters?: PartialParameters<TParams>;
+    mutationKey?: never;
 }
-interface UseMutationStateFiltersByMutationKey<TSchema extends {
+interface MutationFiltersByMutationKey<TSchema extends {
     url: string;
     method: string;
 }, TBody, TData, TParams, TError = DefaultError, TContext = unknown> extends UseMutationStateFiltersBase<TBody, TData, TParams, TError, TContext> {
@@ -366,6 +412,7 @@ interface UseMutationStateFiltersByMutationKey<TSchema extends {
      * Include mutations matching this mutation key
      */
     mutationKey?: ServiceOperationMutationKey<TSchema, PartialParameters<TParams>>;
+    parameters?: never;
 }
 type MutationVariables<TBody, TParams> = {
     body: TBody;
@@ -375,10 +422,16 @@ interface ServiceOperationUseMutationState<TSchema extends {
     method: string;
 }, TBody, TData, TParams, TError = DefaultError> {
     useMutationState<TContext = unknown, TResult = MutationState<TData, TError, MutationVariables<TBody, TParams>, TContext>>(options?: {
-        filters?: UseMutationStateFiltersByParameters<TBody, TData, TParams, TError, TContext> | UseMutationStateFiltersByMutationKey<TSchema, TBody, TData, TParams, TError, TContext>;
+        filters?: MutationFiltersByParameters<TBody, TData, TParams, TError, TContext> | MutationFiltersByMutationKey<TSchema, TBody, TData, TParams, TError, TContext>;
         select?: (mutation: Mutation<TData, TError, MutationVariables<TBody, TParams>, TContext>) => TResult;
     }, queryClient?: QueryClient): Array<TResult>;
 }
+interface ServiceOperationUseIsMutating<TSchema extends {
+    url: string;
+    method: string;
+}, TBody, TData, TParams, TError = DefaultError> {
+    useIsMutating<TContext = unknown>(filters?: MutationFiltersByParameters<TBody, TData, TParams, TError, TContext> | MutationFiltersByMutationKey<TSchema, TBody, TData, TParams, TError, TContext>, queryClient?: QueryClient): number;
+}
 interface QueryFnOptionsBase<TMeta extends Record<string, any>, TSignal extends AbortSignal = AbortSignal> {
     signal?: TSignal;
     meta?: TMeta;
@@ -424,11 +477,41 @@ export interface ServiceOperationSetQueryDataCallback<TSchema extends {
 }, TData, TParams = {}> extends ServiceOperationSetQueryData<TSchema, TData, TParams> {
     setQueryData(parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>, updater: Updater<NoInfer<TData> | undefined, NoInfer<TData> | undefined>, options: SetDataOptions | QueryClient, queryClient?: QueryClient): 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, TParams = {}> {
-    setInfiniteQueryData(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, updater: Updater<NoInfer<InfiniteData<TData>> | undefined, NoInfer<InfiniteData<TData>> | undefined>, queryClient: QueryClient, options?: SetDataOptions): InfiniteData<TData> | undefined;
+    setInfiniteQueryData(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, updater: Updater<NoInfer<InfiniteData<TData, TParams>> | undefined, NoInfer<InfiniteData<TData, TParams>> | undefined>, queryClient: QueryClient, options?: SetDataOptions): InfiniteData<TData, TParams> | undefined;
 }
 interface ServiceOperationGetQueryData<TSchema extends {
     url: string;
@@ -440,7 +523,14 @@ interface ServiceOperationGetInfiniteQueryData<TSchema extends {
     url: string;
     method: string;
 }, TData, TParams = {}> {
-    getInfiniteQueryData(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, queryClient: QueryClient): InfiniteData<TData> | undefined;
+    getInfiniteQueryData(parameters: TParams | ServiceOperationInfiniteQueryKey<TSchema, TParams>, queryClient: QueryClient): 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<TSchema extends {
     url: string;
@@ -461,6 +551,22 @@ export interface ServiceOperationMutationFn<TSchema extends {
         body: TBody;
     }): Promise<TData>;
 }
+interface ServiceOperationIsMutatingQueries<TSchema extends {
+    url: string;
+    method: string;
+}, TBody, TData, TParams = {}, TError = DefaultError> {
+    isMutating<TContext>(filters: MutationFiltersByParameters<TBody, TData, TParams, TError, TContext> | MutationFiltersByMutationKey<TSchema, TBody, TData, TParams, TError, TContext>, queryClient: QueryClient): number;
+    isMutating(queryClient: QueryClient): number;
+}
+/**
+ * @internal
+ */
+export interface ServiceOperationIsMutatingQueriesCallback<TSchema extends {
+    url: string;
+    method: string;
+}, TBody, TData, TParams = {}, TError = DefaultError> extends ServiceOperationIsMutatingQueries<TSchema, TBody, TData, TParams, TError> {
+    isMutating<TContext>(filters: MutationFiltersByParameters<TBody, TData, TParams, TError, TContext> | MutationFiltersByMutationKey<TSchema, TBody, TData, TParams, TError, TContext> | QueryClient, queryClient?: QueryClient): number;
+}
 /**
  * Shallow partial 'parameters'.
  * @example