@openapi-qraft/react 2.0.0-next.1 → 2.0.0-next.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openapi-qraft/react",
-  "version": "2.0.0-next.1",
-  "description": "API client for React, providing type-safe requests and dynamic Tanstack Query React Hooks via a modular, Proxy-based architecture.",
+  "version": "2.0.0-next.10",
+  "description": "OpenAPI client for React, providing type-safe requests and dynamic TanStack Query React Hooks via a modular, Proxy-based architecture.",
   "scripts": {
     "build": "NODE_ENV=production rollup --config rollup.config.mjs && tsc --project tsconfig.build.json --emitDeclarationOnly",
     "dev": "rimraf dist/ && tsc --project tsconfig.build.json --watch --outDir ./dist/esm --noEmitOnError false",
@@ -14,29 +14,35 @@
     "_prettify-api": "prettier --write src/tests/fixtures/api/**/*.ts"
   },
   "sideEffects": false,
+  "dependencies": {
+    "@openapi-qraft/tanstack-query-react-types": "2.0.0-next.10"
+  },
   "devDependencies": {
-    "@openapi-qraft/cli": "2.0.0-next.1",
+    "@openapi-qraft/cli": "2.0.0-next.10",
     "@openapi-qraft/eslint-config": "1.0.0",
-    "@openapi-qraft/openapi-typescript-plugin": "^1.2.0-next.1",
+    "@openapi-qraft/openapi-typescript-plugin": "^1.2.0-next.10",
     "@openapi-qraft/rollup-config": "1.1.0-next.0",
+    "@openapi-qraft/tanstack-query-react-plugin": "2.0.0-next.10",
     "@openapi-qraft/test-fixtures": "1.0.0",
-    "@tanstack/react-query": "^5.17.3",
+    "@tanstack/react-query": "^5.56.2",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.5.2",
-    "@types/react": "^18.2.47",
-    "@vitejs/plugin-react": "latest",
-    "@vitest/coverage-v8": "^1.1.3",
-    "eslint": "^9.0.0",
-    "globals": "^15.0.0",
-    "jsdom": "latest",
-    "msw": "^2.0.12",
+    "@types/jscodeshift": "^0.11.11",
+    "@types/react": "^18.3.5",
+    "@vitejs/plugin-react": "^4.3.1",
+    "@vitest/coverage-v8": "^1.6.0",
+    "eslint": "^9.10.0",
+    "globals": "^15.9.0",
+    "jscodeshift": "^17.0.0",
+    "jsdom": "^25.0.0",
+    "msw": "^2.4.7",
     "prettier": "^3.3.3",
-    "query-string": "^8.1.0",
-    "react": "^18.2.0",
+    "query-string": "^8.2.0",
+    "react": "^18.3.1",
     "rimraf": "^5.0.10",
-    "rollup": "~4.18.0",
-    "vitest": "^1.4.0"
+    "rollup": "~4.21.3",
+    "vitest": "^1.6.0"
   },
   "peerDependencies": {
     "@tanstack/query-core": "^5.0.0",

package/src/callbacks/cancelQueries.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationCancelQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationCancelQueries } from '../service-operation/ServiceOperationCancelQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function cancelQueries<TData>(
@@ -10,7 +13,8 @@ export function cancelQueries<TData>(
     ServiceOperationCancelQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['cancelQueries']
   >
 ): Promise<void> {

package/src/callbacks/fetchInfiniteQuery.ts

@@ -1,5 +1,6 @@
+import type { ServiceOperationFetchInfiniteQuery } from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationFetchInfiniteQuery } from '../service-operation/ServiceOperationFetchInfiniteQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
 export const fetchInfiniteQuery: <
@@ -13,7 +14,8 @@ export const fetchInfiniteQuery: <
     ServiceOperationFetchInfiniteQuery<
       TSchema,
       TData,
-      TParams
+      TParams,
+      DefaultError
     >['fetchInfiniteQuery']
   >
 ) => Promise<TData> = (qraftOptions, schema, args) => {

package/src/callbacks/fetchQuery.ts

@@ -1,5 +1,6 @@
+import type { ServiceOperationFetchQuery } from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationFetchQuery } from '../service-operation/ServiceOperationFetchQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
 export const fetchQuery: <
@@ -10,7 +11,12 @@ export const fetchQuery: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: TSchema,
   args: Parameters<
-    ServiceOperationFetchQuery<TSchema, TData, TParams>['fetchQuery']
+    ServiceOperationFetchQuery<
+      TSchema,
+      TData,
+      TParams,
+      DefaultError
+    >['fetchQuery']
   >
 ) => Promise<TData> = (qraftOptions, schema, args) => {
   return callQueryClientMethodWithQueryKey(

package/src/callbacks/getInfiniteQueryData.ts

@@ -1,14 +1,16 @@
+import type {
+  OperationSchema,
+  ServiceOperationGetInfiniteQueryData,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { InfiniteData } from '@tanstack/query-core';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function getInfiniteQueryData<TData>(
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
+    ServiceOperationGetInfiniteQueryData<
       OperationSchema,
       unknown,
       TData

package/src/callbacks/getInfiniteQueryKey.ts

@@ -1,16 +1,20 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationUseInfiniteQuery,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
+import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
 import { composeInfiniteQueryKey } from '../lib/composeInfiniteQueryKey.js';
-import { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
-import { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 
 export const getInfiniteQueryKey = (
   _qraftOptions: CreateAPIBasicClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
+    ServiceOperationUseInfiniteQuery<
       OperationSchema,
       unknown,
-      unknown
+      unknown,
+      DefaultError
     >['getInfiniteQueryKey']
   >
 ) => {

package/src/callbacks/getInfiniteQueryState.ts

@@ -1,16 +1,20 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationGetQueryState,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function getInfiniteQueryState<TData>(
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
+    ServiceOperationGetQueryState<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['getInfiniteQueryState']
   >
 ): TData | undefined {

package/src/callbacks/getMutationKey.ts

@@ -1,17 +1,21 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationUseMutation,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 import { composeMutationKey } from '../lib/composeMutationKey.js';
 
 export const getMutationKey = (
   _qraftOptions: CreateAPIBasicClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationMutation<
+    ServiceOperationUseMutation<
       OperationSchema,
       unknown,
       unknown,
-      unknown
+      unknown,
+      DefaultError
     >['getMutationKey']
   >
 ) => {

package/src/callbacks/getQueriesData.ts

@@ -1,13 +1,21 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationGetQueriesData,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function getQueriesData<TData>(
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<OperationSchema, unknown, TData>['getQueriesData']
+    ServiceOperationGetQueriesData<
+      OperationSchema,
+      unknown,
+      TData,
+      DefaultError
+    >['getQueriesData']
   >
 ): TData | undefined {
   return callQueryClientMethodWithQueryFilters(

package/src/callbacks/getQueryData.ts

@@ -1,13 +1,19 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationGetQueryData,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function getQueryData<TData>(
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<OperationSchema, unknown, TData>['getQueryData']
+    ServiceOperationGetQueryData<
+      OperationSchema,
+      unknown,
+      TData
+    >['getQueryData']
   >
 ): TData | undefined {
   return callQueryClientMethodWithQueryKey(

package/src/callbacks/getQueryKey.ts

@@ -1,13 +1,21 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationUseQuery,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { composeQueryKey } from '../lib/composeQueryKey.js';
 
 export const getQueryKey = (
   _qraftOptions: CreateAPIBasicClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<OperationSchema, unknown, unknown>['getQueryKey']
+    ServiceOperationUseQuery<
+      OperationSchema,
+      unknown,
+      unknown,
+      DefaultError
+    >['getQueryKey']
   >
 ) => {
   return composeQueryKey(schema, args[0]);

package/src/callbacks/getQueryState.ts

@@ -1,13 +1,21 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationGetQueryState,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function getQueryState<TData>(
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<OperationSchema, unknown, TData>['getQueryState']
+    ServiceOperationGetQueryState<
+      OperationSchema,
+      unknown,
+      TData,
+      DefaultError
+    >['getQueryState']
   >
 ): TData | undefined {
   return callQueryClientMethodWithQueryKey(

package/src/callbacks/invalidateQueries.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationInvalidateQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationInvalidateQueries } from '../service-operation/ServiceOperationInvalidateQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function invalidateQueries<TData>(
@@ -10,7 +13,8 @@ export function invalidateQueries<TData>(
     ServiceOperationInvalidateQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['invalidateQueries']
   >
 ): Promise<void> {

package/src/callbacks/isFetching.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationIsFetchingQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationIsFetchingQueries } from '../service-operation/ServiceOperationIsFetchingQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function isFetching<TData>(
@@ -10,7 +13,8 @@ export function isFetching<TData>(
     ServiceOperationIsFetchingQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['isFetching']
   >
 ): Promise<void> {

package/src/callbacks/isMutating.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationIsMutatingQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationIsMutatingQueries } from '../service-operation/ServiceOperationIsMutatingQueries.js';
 import { callQueryClientMethodWithMutationFilters } from '../lib/callQueryClientMethodWithMutationFilters.js';
 
 export function isMutating<TData>(
@@ -10,7 +13,9 @@ export function isMutating<TData>(
     ServiceOperationIsMutatingQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      unknown,
+      DefaultError
     >['isMutating']
   >
 ): Promise<void> {

package/src/callbacks/operationInvokeFn.ts

@@ -1,7 +1,10 @@
+import type {
+  OperationSchema,
+  RequestFnResponse,
+  ServiceOperationMutationFn,
+  ServiceOperationQueryFn,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { CreateAPIBasicClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationMutationFn } from '../service-operation/ServiceOperationMutationFn.js';
-import type { ServiceOperationQueryFn } from '../service-operation/ServiceOperationQueryFn.js';
-import { OperationSchema, RequestFnResponse } from '../lib/requestFn.js';
 
 /**
  * Called when <service>.<operation>(...) is invoked.

package/src/callbacks/prefetchInfiniteQuery.ts

@@ -1,5 +1,6 @@
+import type { ServiceOperationFetchInfiniteQuery } from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationFetchInfiniteQuery } from '../service-operation/ServiceOperationFetchInfiniteQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
 export const prefetchInfiniteQuery: <
@@ -13,7 +14,8 @@ export const prefetchInfiniteQuery: <
     ServiceOperationFetchInfiniteQuery<
       TSchema,
       TData,
-      TParams
+      TParams,
+      DefaultError
     >['prefetchInfiniteQuery']
   >
 ) => Promise<TData> = (qraftOptions, schema, args) => {

package/src/callbacks/prefetchQuery.ts

@@ -1,5 +1,6 @@
+import type { ServiceOperationFetchQuery } from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationFetchQuery } from '../service-operation/ServiceOperationFetchQuery.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientFetchMethod.js';
 
 export const prefetchQuery: <
@@ -10,7 +11,12 @@ export const prefetchQuery: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: TSchema,
   args: Parameters<
-    ServiceOperationFetchQuery<TSchema, TData, TParams>['prefetchQuery']
+    ServiceOperationFetchQuery<
+      TSchema,
+      TData,
+      TParams,
+      DefaultError
+    >['prefetchQuery']
   >
 ) => Promise<TData> = (qraftOptions, schema, args) => {
   return callQueryClientMethodWithQueryKey(

package/src/callbacks/refetchQueries.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationRefetchQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationRefetchQueries } from '../service-operation/ServiceOperationRefetchQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function refetchQueries<TData>(
@@ -10,7 +13,8 @@ export function refetchQueries<TData>(
     ServiceOperationRefetchQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['refetchQueries']
   >
 ): Promise<void> {

package/src/callbacks/removeQueries.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationRemoveQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationRemoveQueries } from '../service-operation/ServiceOperationRemoveQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function removeQueries<TData>(
@@ -10,7 +13,8 @@ export function removeQueries<TData>(
     ServiceOperationRemoveQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['removeQueries']
   >
 ): Promise<void> {

package/src/callbacks/resetQueries.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationResetQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationResetQueries } from '../service-operation/ServiceOperationResetQueries.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function resetQueries<TData>(
@@ -10,7 +13,8 @@ export function resetQueries<TData>(
     ServiceOperationResetQueries<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['resetQueries']
   >
 ): Promise<void> {

package/src/callbacks/setInfiniteQueryData.ts

@@ -1,7 +1,9 @@
+import type {
+  OperationSchema,
+  ServiceOperationSetInfiniteQueryData,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { InfiniteData } from '@tanstack/query-core';
-import type { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetInfiniteQueryData } from '../service-operation/ServiceOperationSetInfiniteQueryData.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function setInfiniteQueryData<TData>(

package/src/callbacks/setQueriesData.ts

@@ -1,6 +1,9 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationSetQueriesData,
+} from '@openapi-qraft/tanstack-query-react-types';
+import type { DefaultError } from '@tanstack/query-core';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetQueriesData } from '../service-operation/ServiceOperationSetQueriesData.js';
 import { callQueryClientMethodWithQueryFilters } from '../lib/callQueryClientMethodWithQueryFilters.js';
 
 export function setQueriesData<TData>(
@@ -10,7 +13,8 @@ export function setQueriesData<TData>(
     ServiceOperationSetQueriesData<
       OperationSchema,
       unknown,
-      TData
+      TData,
+      DefaultError
     >['setQueriesData']
   >
 ): TData | undefined {

package/src/callbacks/setQueryData.ts

@@ -1,6 +1,8 @@
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationSetQueryData,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationSetQueryData } from '../service-operation/ServiceOperationSetQueryData.js';
 import { callQueryClientMethodWithQueryKey } from '../lib/callQueryClientMethodWithQueryKey.js';
 
 export function setQueryData<TData>(

package/src/callbacks/useInfiniteQuery.ts

@@ -1,10 +1,12 @@
 'use client';
 
+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 { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useInfiniteQuery as useInfiniteQueryBase } from '@tanstack/react-query';
 import { useComposeUseQueryOptions } from '../lib/useComposeUseQueryOptions.js';
 
@@ -16,7 +18,12 @@ export const useInfiniteQuery: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<OperationSchema, unknown, unknown>['useInfiniteQuery']
+    ServiceOperationUseInfiniteQuery<
+      OperationSchema,
+      unknown,
+      unknown,
+      DefaultError
+    >['useInfiniteQuery']
   >
 ) => UseInfiniteQueryResult<TData, TError> = (qraftOptions, schema, args) => {
   return useInfiniteQueryBase(

package/src/callbacks/useIsFetching.ts

@@ -1,8 +1,10 @@
 'use client';
 
-import type { OperationSchema } from '../lib/requestFn.js';
+import type {
+  OperationSchema,
+  ServiceOperationUseIsFetchingQueries,
+} from '@openapi-qraft/tanstack-query-react-types';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationQuery } from '../service-operation/ServiceOperation.js';
 import { useIsFetching as useIsFetchingTanstack } from '@tanstack/react-query';
 import { composeQueryFilters } from '../lib/composeQueryFilters.js';
 
@@ -10,7 +12,7 @@ export const useIsFetching: <TVariables = unknown>(
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationQuery<
+    ServiceOperationUseIsFetchingQueries<
       OperationSchema,
       object | undefined,
       TVariables,

package/src/callbacks/useIsMutating.ts

@@ -1,10 +1,12 @@
 'use client';
 
+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 { OperationSchema } from '../lib/requestFn.js';
 import type { CreateAPIQueryClientOptions } from '../qraftAPIClient.js';
-import type { ServiceOperationMutation } from '../service-operation/ServiceOperation.js';
 import { useIsMutating as useIsMutatingStateTanstack } from '@tanstack/react-query';
 import { composeMutationFilters } from '../lib/composeMutationFilters.js';
 
@@ -17,11 +19,12 @@ export const useIsMutating: <
   qraftOptions: CreateAPIQueryClientOptions,
   schema: OperationSchema,
   args: Parameters<
-    ServiceOperationMutation<
+    ServiceOperationUseIsMutating<
       OperationSchema,
       object | undefined,
       TVariables,
-      TData
+      TData,
+      DefaultError
     >['useIsMutating']
   >
 ) => UseMutationResult<TData, TError, TVariables, TContext> = (