@openapi-qraft/react 2.7.2 → 2.9.0

package/src/callbacks/ensureQueryData.ts

@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 

package/src/callbacks/fetchInfiniteQuery.ts

@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchInfiniteQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 

package/src/callbacks/fetchQuery.ts

@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 

package/src/callbacks/getInfiniteQueryData.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationGetInfiniteQueryData,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { InfiniteData } from '@tanstack/query-core';
+import type { InfiniteData } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 

package/src/callbacks/getInfiniteQueryKey.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationUseInfiniteQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
 

package/src/callbacks/getInfiniteQueryState.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationGetQueryState,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 

package/src/callbacks/getMutationKey.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationUseMutation,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
 

package/src/callbacks/getQueriesData.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationGetQueriesData,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 

package/src/callbacks/getQueryKey.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationUseQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
 

package/src/callbacks/getQueryState.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationGetQueryState,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 

package/src/callbacks/invalidateQueries.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationInvalidateQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 

package/src/callbacks/isFetching.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationIsFetchingQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 

package/src/callbacks/isMutating.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationIsMutatingQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithMutationFilters } from '../lib/callQueryClientMethodWithMutationFilters.js';
 

package/src/callbacks/prefetchInfiniteQuery.ts

@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchInfiniteQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 

package/src/callbacks/prefetchQuery.ts

@@ -1,5 +1,5 @@
 import type { ServiceOperationFetchQuery } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 

package/src/callbacks/refetchQueries.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationRefetchQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 

package/src/callbacks/removeQueries.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationRemoveQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 

package/src/callbacks/resetQueries.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationResetQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 

package/src/callbacks/setInfiniteQueryData.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationSetInfiniteQueryData,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { InfiniteData } from '@tanstack/query-core';
+import type { InfiniteData } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 

package/src/callbacks/setQueriesData.ts

@@ -2,7 +2,7 @@ import type {
   OperationSchema,
   ServiceOperationSetQueriesData,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
+import type { DefaultError } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 

package/src/callbacks/useInfiniteQuery.ts

@@ -4,8 +4,11 @@ import type {
   OperationSchema,
   ServiceOperationUseInfiniteQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError, InfiniteData } from '@tanstack/query-core';
-import type { UseInfiniteQueryResult } from '@tanstack/react-query';
+import type {
+  DefaultError,
+  InfiniteData,
+  UseInfiniteQueryResult,
+} from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useInfiniteQuery as useInfiniteQueryBase } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';

package/src/callbacks/useIsFetching.ts

@@ -9,7 +9,7 @@ import { useIsFetching as useIsFetchingTanstack } from '@tanstack/react-query';
 import { composeQueryFilters } from '../lib/composeQueryFilters.js';
 
 export const useIsFetching: <TVariables = unknown>(
-  qraftOptions: CreateAPIQueryClientOptions,
+  qraftOptions: CreateAPIQueryClientOptions | undefined,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationUseIsFetchingQueries<
@@ -24,6 +24,6 @@ export const useIsFetching: <TVariables = unknown>(
 
   return useIsFetchingTanstack(
     composeQueryFilters(schema, filters as never) as never,
-    qraftOptions.queryClient
+    qraftOptions?.queryClient
   ) as never;
 };

package/src/callbacks/useIsMutating.ts

@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseIsMutating,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseMutationResult } from '@tanstack/react-query';
+import type { DefaultError, UseMutationResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useIsMutating as useIsMutatingStateTanstack } from '@tanstack/react-query';
 import { composeMutationFilters } from '../lib/composeMutationFilters.js';
@@ -16,7 +15,7 @@ export const useIsMutating: <
   TVariables = unknown,
   TContext = unknown,
 >(
-  qraftOptions: CreateAPIQueryClientOptions,
+  qraftOptions: CreateAPIQueryClientOptions | undefined,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationUseIsMutating<
@@ -36,6 +35,6 @@ export const useIsMutating: <
 
   return useIsMutatingStateTanstack(
     composeMutationFilters(schema, filters) as never,
-    qraftOptions.queryClient
+    qraftOptions?.queryClient
   ) as never;
 };

package/src/callbacks/useMutation.ts

@@ -5,8 +5,7 @@ import type {
   ServiceOperationMutationKey,
   ServiceOperationUseMutation,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseMutationResult } from '@tanstack/react-query';
+import type { DefaultError, UseMutationResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useMutation as useMutationBase } from '@tanstack/react-query';
 import { composeMutationKey } from '../lib/composeMutationKey.js';

package/src/callbacks/useMutationState.ts

@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseMutationState,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseMutationResult } from '@tanstack/react-query';
+import type { DefaultError, UseMutationResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useMutationState as useMutationStateTanstack } from '@tanstack/react-query';
 import { composeMutationFilters } from '../lib/composeMutationFilters.js';
@@ -16,7 +15,7 @@ export const useMutationState: <
   TVariables = unknown,
   TContext = unknown,
 >(
-  qraftOptions: CreateAPIQueryClientOptions,
+  qraftOptions: CreateAPIQueryClientOptions | undefined,
   schema: OperationSchema,
   args: Parameters<
     ServiceOperationUseMutationState<
@@ -39,6 +38,6 @@ export const useMutationState: <
       ...options,
       filters: composeMutationFilters(schema, options?.filters),
     } as never,
-    qraftOptions.queryClient
+    qraftOptions?.queryClient
   ) as never;
 };

package/src/callbacks/useQueries.ts

@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { QueriesResults } from '@tanstack/react-query';
+import type { DefaultError, QueriesResults } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useQueries as useQueriesTanstack } from '@tanstack/react-query';
 import { composeQueryKey } from '../lib/composeQueryKey.js';

package/src/callbacks/useQuery.ts

@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseQueryResult } from '@tanstack/react-query';
+import type { DefaultError, UseQueryResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useQuery as useQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';

package/src/callbacks/useSuspenseInfiniteQuery.ts

@@ -4,8 +4,11 @@ import type {
   OperationSchema,
   ServiceOperationUseSuspenseInfiniteQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError, InfiniteData } from '@tanstack/query-core';
-import type { UseSuspenseInfiniteQueryResult } from '@tanstack/react-query';
+import type {
+  DefaultError,
+  InfiniteData,
+  UseSuspenseInfiniteQueryResult,
+} from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useSuspenseInfiniteQuery as useSuspenseInfiniteQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';

package/src/callbacks/useSuspenseQueries.ts

@@ -4,8 +4,10 @@ import type {
   OperationSchema,
   ServiceOperationUseSuspenseQueries,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { SuspenseQueriesResults } from '@tanstack/react-query';
+import type {
+  DefaultError,
+  SuspenseQueriesResults,
+} from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useSuspenseQueries as useSuspenseQueriesTanstack } from '@tanstack/react-query';
 import { composeQueryKey } from '../lib/composeQueryKey.js';

package/src/callbacks/useSuspenseQuery.ts

@@ -4,8 +4,7 @@ import type {
   OperationSchema,
   ServiceOperationUseSuspenseQuery,
 } from '@openapi-qraft/tanstack-query-react-types';
-import type { DefaultError } from '@tanstack/query-core';
-import type { UseQueryResult } from '@tanstack/react-query';
+import type { DefaultError, UseQueryResult } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import { useSuspenseQuery as useSuspenseQueryTanstack } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';

package/src/lib/callQueryClientFetchMethod.ts

@@ -1,4 +1,4 @@
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema, RequestFn } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';

package/src/lib/callQueryClientMethodWithMutationFilters.ts

@@ -1,4 +1,4 @@
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeMutationFilters } from './composeMutationFilters.js';

package/src/lib/callQueryClientMethodWithQueryFilters.ts

@@ -1,4 +1,4 @@
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeQueryFilters } from './composeQueryFilters.js';

package/src/lib/callQueryClientMethodWithQueryKey.ts

@@ -1,4 +1,4 @@
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';

package/src/lib/useComposeUseQueryOptions.ts

@@ -1,8 +1,7 @@
 'use client';
 
 import type { ServiceOperationQueryKey } from '@openapi-qraft/tanstack-query-react-types';
-import type { QueryClient } from '@tanstack/query-core';
-import type { UseQueryOptions } from '@tanstack/react-query';
+import type { QueryClient, UseQueryOptions } from '@tanstack/react-query';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
 import type { OperationSchema } from './requestFn.js';
 import { composeInfiniteQueryKey } from './composeInfiniteQueryKey.js';

package/src/qraftAPIClient.ts

@@ -1,5 +1,5 @@
 import type { QraftServiceOperationsToken } from '@openapi-qraft/tanstack-query-react-types';
-import type { QueryClient } from '@tanstack/query-core';
+import type { QueryClient } from '@tanstack/react-query';
 import type * as callbacks from './callbacks/index.js';
 import type * as operationInvokeModule from './callbacks/operationInvokeFn.js';
 import type {
@@ -115,8 +115,23 @@ export function qraftAPIClient<
 ): APIBasicQueryClientServices<Services, Callbacks>;
 
 /**
- * Creates a basic API Client which contains only "fetch" like
- * operations without any state management using QueryClient.
+ * Creates a basic API Client which contains all hooks and methods
+ * that don't require an explicitly provided QueryClient.
+ * Hooks like `useQuery` and `useMutation` will automatically retrieve
+ * the QueryClient from the `<QueryClientProvider />` context.
+ *
+ * @example Fetching data with QueryClient from context
+ * ```ts
+ * const api = qraftAPIClient(services, callbacks, {
+ *   requestFn: requestFn,
+ *   baseUrl: 'https://api.example.com',
+ * });
+ *
+ * // QueryClient will be retrieved from React context
+ * api.service.operation.useQuery({
+ *   parameters: { path: { id: 1 } },
+ * });
+ * ```
  *
  * @example Fetching data without QueryClient
  * ```ts
@@ -140,8 +155,17 @@ export function qraftAPIClient<
 ): APIBasicClientServices<Services, Callbacks>;
 
 /**
- * Creates a utility API Client which contains only utility operations
- * such as `getQueryKey`, `getInfiniteQueryKey` and `getMutationKey`.
+ * Creates a utility API Client which contains utility operations
+ * such as `getQueryKey`, `getInfiniteQueryKey`, `getMutationKey` and state hooks
+ * like `useIsFetching` and `useMutationData`.
+ *
+ * @example Using state hooks
+ * ```ts
+ * const api = qraftAPIClient(services, callbacks);
+ *
+ * // Check if any query is currently fetching
+ * const isFetching = api.service.operation.useIsFetching();
+ * ```
  *
  * @example Getting query keys with utility client
  * ```ts
@@ -241,7 +265,17 @@ export function qraftAPIClient<
         callbackName !== 'operationInvokeFn' &&
         callbackName !== 'getQueryKey' &&
         callbackName !== 'getMutationKey' &&
-        callbackName !== 'getInfiniteQueryKey'
+        callbackName !== 'getInfiniteQueryKey' &&
+        callbackName !== 'useInfiniteQuery' &&
+        callbackName !== 'useQueries' &&
+        callbackName !== 'useQuery' &&
+        callbackName !== 'useSuspenseInfiniteQuery' &&
+        callbackName !== 'useSuspenseQueries' &&
+        callbackName !== 'useSuspenseQuery' &&
+        callbackName !== 'useIsFetching' &&
+        callbackName !== 'useMutation' &&
+        callbackName !== 'useIsMutating' &&
+        callbackName !== 'useMutationState'
       )
         if (!options || !('queryClient' in options && options.queryClient))
           throw new Error(
@@ -331,7 +365,7 @@ type OperationDeclaration = {
     Record<
       | QueryOperationCallbacks
       | QueryOperationStateCallbacks
-      | MutationOperationCallbacks
+      | MutationOperationHookCallbacks
       | MutationOperationStateCallbacks
       | UtilityOperationCallbacks,
       any
@@ -356,15 +390,8 @@ export type UnionServiceOperationsDeclaration<Services> =
   | OperationsDeclaration<Services>
   | OperationDeclaration;
 
-type QueryOperationCallbacks = Extract<
+type QueryOperationHookCallbacks = Extract<
   keyof ServiceMethods,
-  | 'fetchInfiniteQuery'
-  | 'fetchQuery'
-  | 'prefetchInfiniteQuery'
-  | 'prefetchQuery'
-  | 'refetchQueries'
-  | 'ensureQueryData'
-  | 'ensureInfiniteQueryData'
   | 'useInfiniteQuery'
   | 'useQueries'
   | 'useQuery'
@@ -373,31 +400,57 @@ type QueryOperationCallbacks = Extract<
   | 'useSuspenseQuery'
 >;
 
-type QueryOperationStateCallbacks = Extract<
+type QueryOperationCallbacks =
+  | Extract<
+      keyof ServiceMethods,
+      | 'fetchInfiniteQuery'
+      | 'fetchQuery'
+      | 'prefetchInfiniteQuery'
+      | 'prefetchQuery'
+      | 'refetchQueries'
+      | 'ensureQueryData'
+      | 'ensureInfiniteQueryData'
+    >
+  | QueryOperationHookCallbacks;
+
+type QueryOperationStateHookCallbacks = Extract<
   keyof ServiceMethods,
-  | 'cancelQueries'
-  | 'getInfiniteQueryData'
-  | 'getInfiniteQueryState'
-  | 'getQueriesData'
-  | 'getQueryData'
-  | 'getQueryState'
-  | 'invalidateQueries'
-  | 'isFetching'
-  | 'removeQueries'
-  | 'resetQueries'
-  | 'setInfiniteQueryData'
-  | 'setQueriesData'
-  | 'setQueryData'
-  | 'useIsFetching'
+  'useIsFetching'
 >;
 
-type MutationOperationCallbacks = Extract<keyof ServiceMethods, 'useMutation'>;
+type QueryOperationStateCallbacks =
+  | Extract<
+      keyof ServiceMethods,
+      | 'cancelQueries'
+      | 'getInfiniteQueryData'
+      | 'getInfiniteQueryState'
+      | 'getQueriesData'
+      | 'getQueryData'
+      | 'getQueryState'
+      | 'invalidateQueries'
+      | 'isFetching'
+      | 'removeQueries'
+      | 'resetQueries'
+      | 'setInfiniteQueryData'
+      | 'setQueriesData'
+      | 'setQueryData'
+    >
+  | QueryOperationStateHookCallbacks;
 
-type MutationOperationStateCallbacks = Extract<
+type MutationOperationHookCallbacks = Extract<
   keyof ServiceMethods,
-  'isMutating' | 'useIsMutating' | 'useMutationState'
+  'useMutation'
 >;
 
+type MutationOperationStateHookCallbacks = Extract<
+  keyof ServiceMethods,
+  'useIsMutating' | 'useMutationState'
+>;
+
+type MutationOperationStateCallbacks =
+  | Extract<keyof ServiceMethods, 'isMutating'>
+  | MutationOperationStateHookCallbacks;
+
 type InvokeOperationCallback = Extract<
   keyof typeof operationInvokeModule,
   'operationInvokeFn'
@@ -405,13 +458,17 @@ type InvokeOperationCallback = Extract<
 
 type UtilityOperationCallbacks = Extract<
   keyof ServiceMethods,
-  'getQueryKey' | 'getInfiniteQueryKey' | 'getMutationKey'
+  | 'getQueryKey'
+  | 'getInfiniteQueryKey'
+  | 'getMutationKey'
+  | QueryOperationStateHookCallbacks
+  | MutationOperationStateHookCallbacks
 >;
 
 type OperationCallbackList =
   | QueryOperationCallbacks
   | QueryOperationStateCallbacks
-  | MutationOperationCallbacks
+  | MutationOperationHookCallbacks
   | MutationOperationStateCallbacks
   | InvokeOperationCallback
   | UtilityOperationCallbacks;
@@ -458,7 +515,15 @@ export type APIBasicClientServices<
   Callbacks extends PartialServiceMethods,
 > = ServicesFilteredByCallbacks<
   Services,
-  Extract<keyof Callbacks, InvokeOperationCallback | UtilityOperationCallbacks>
+  Extract<
+    keyof Callbacks,
+    | InvokeOperationCallback
+    | UtilityOperationCallbacks
+    | QueryOperationHookCallbacks
+    | QueryOperationStateHookCallbacks
+    | MutationOperationStateHookCallbacks
+    | MutationOperationHookCallbacks
+  >
 >;
 
 export type APIUtilityClientServices<