@kubb/plugin-react-query 3.0.0-alpha.25 → 3.0.0-alpha.28

package/src/components/Mutation.tsx

@@ -4,6 +4,7 @@ import { type Operation, isOptional } from '@kubb/oas'
 import { Client } from '@kubb/plugin-client/components'
 import type { OperationSchemas } from '@kubb/plugin-oas'
 import { getComments, getPathParams } from '@kubb/plugin-oas/utils'
+import type { Params } from '@kubb/react/types'
 import type { ReactNode } from 'react'
 import type { PluginReactQuery } from '../types.ts'
 import { MutationKey } from './MutationKey.tsx'
@@ -16,7 +17,6 @@ type Props = {
   typeName: string
   clientName: string
   mutationKeyName: string
-  mutationKeyTypeName: string
   typeSchemas: OperationSchemas
   operation: Operation
   dataReturnType: PluginReactQuery['resolvedOptions']['client']['dataReturnType']
@@ -31,7 +31,7 @@ type GetParamsProps = {
 
 function getParams({ dataReturnType, typeSchemas }: GetParamsProps) {
   const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
-  const mutateParams = FunctionParams.factory({
+  const mutationParams = FunctionParams.factory({
     ...getPathParams(typeSchemas.pathParams, { typed: true }),
     data: typeSchemas.request?.name
       ? {
@@ -52,13 +52,14 @@ function getParams({ dataReturnType, typeSchemas }: GetParamsProps) {
         }
       : undefined,
   })
-  const TRequest = mutateParams.toConstructor({ valueAsType: true })
+  const TRequest = mutationParams.toConstructor({ valueAsType: true })
+  const generics = [TData, typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error', `{${TRequest}}`].join(', ')
 
   return FunctionParams.factory({
     options: {
       type: `
 {
-  mutation?: UseMutationOptions<${[TData, typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error', `{${TRequest}}`].join(', ')}>,
+  mutation?: UseMutationOptions<${generics}>,
   client?: ${typeSchemas.request?.name ? `Partial<RequestConfig<${typeSchemas.request?.name}>>` : 'Partial<RequestConfig>'},
 }
 `,
@@ -67,9 +68,7 @@ function getParams({ dataReturnType, typeSchemas }: GetParamsProps) {
   })
 }
 
-export function Mutation({ name, clientName, pathParamsType, dataReturnType, typeSchemas, operation, mutationKeyTypeName, mutationKeyName }: Props): ReactNode {
-  const returnType = 'ReturnType<typeof mutation> & { mutationKey: MutationKey }'
-
+export function Mutation({ name, clientName, pathParamsType, dataReturnType, typeSchemas, operation, mutationKeyName }: Props): ReactNode {
   const mutationKeyParams = MutationKey.getParams({
     pathParamsType,
     typeSchemas,
@@ -87,35 +86,49 @@ export function Mutation({ name, clientName, pathParamsType, dataReturnType, typ
   })
 
   const mutationParams = FunctionParams.factory({
+    ...getPathParams(typeSchemas.pathParams, { typed: true }),
+    data: typeSchemas.request?.name
+      ? {
+          type: typeSchemas.request?.name,
+          optional: isOptional(typeSchemas.request?.schema),
+        }
+      : undefined,
+    params: typeSchemas.queryParams?.name
+      ? {
+          type: typeSchemas.queryParams?.name,
+          optional: isOptional(typeSchemas.queryParams?.schema),
+        }
+      : undefined,
+    headers: typeSchemas.headerParams?.name
+      ? {
+          type: typeSchemas.headerParams?.name,
+          optional: isOptional(typeSchemas.headerParams?.schema),
+        }
+      : undefined,
+  })
+
+  const dataParams = FunctionParams.factory({
     data: {
       // No use of pathParams because useMutation can only take one argument in object form,
       // see https://tanstack.com/query/latest/docs/framework/react/reference/useMutation#usemutation
       mode: 'object',
-      //TODO rename with value
-      children: {
-        ...getPathParams(typeSchemas.pathParams, { typed: true }),
-        data: typeSchemas.request?.name
-          ? {
-              type: typeSchemas.request?.name,
-              optional: isOptional(typeSchemas.request?.schema),
-            }
-          : undefined,
-        params: typeSchemas.queryParams?.name
-          ? {
-              type: typeSchemas.queryParams?.name,
-              optional: isOptional(typeSchemas.queryParams?.schema),
-            }
-          : undefined,
-        headers: typeSchemas.headerParams?.name
-          ? {
-              type: typeSchemas.headerParams?.name,
-              optional: isOptional(typeSchemas.headerParams?.schema),
-            }
-          : undefined,
-      },
+      children: Object.entries(mutationParams.params).reduce((acc, [key, value]) => {
+        if (value) {
+          acc[key] = {
+            ...value,
+            type: undefined,
+          }
+        }
+
+        return acc
+      }, {} as Params),
     },
   })
 
+  const TRequest = mutationParams.toConstructor({ valueAsType: true })
+  const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
+  const generics = [TData, typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error', `{${TRequest}}`].join(', ')
+
   return (
     <File.Source name={name} isExportable isIndexable>
       <Function
@@ -130,16 +143,13 @@ export function Mutation({ name, clientName, pathParamsType, dataReturnType, typ
         const { mutation: mutationOptions, client: config = {} } = options ?? {}
         const mutationKey = mutationOptions?.mutationKey ?? ${mutationKeyName}(${mutationKeyParams.toCall()})
 
-        const mutation = useMutation({
-          mutationFn: async(${mutationParams.toConstructor()}) => {
+        return useMutation<${generics}>({
+          mutationFn: async(${dataParams.toConstructor()}) => {
             return ${clientName}(${clientParams.toCall()})
           },
+          mutationKey,
           ...mutationOptions
-        }) as ${returnType}
-
-        mutation.mutationKey = mutationKey as MutationKey
-
-        return mutation
+        })
     `}
       </Function>
     </File.Source>

package/src/components/Query.tsx

@@ -68,7 +68,7 @@ function getParams({ pathParamsType, dataReturnType, typeSchemas }: GetParamsPro
 
 export function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, pathParamsType, dataReturnType, typeSchemas, operation }: Props): ReactNode {
   const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
-  const returnType = 'ReturnType<typeof query> & { queryKey: TQueryKey }'
+  const returnType = `UseQueryResult<${['TData', typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'].join(', ')}> & { queryKey: TQueryKey }`
   const generics = [`TData = ${TData}`, `TQueryData = ${TData}`, `TQueryKey extends QueryKey = ${queryKeyTypeName}`]
 
   const queryKeyParams = QueryKey.getParams({

package/src/components/SuspenseQuery.tsx

@@ -77,7 +77,7 @@ export function SuspenseQuery({
   operation,
 }: Props): ReactNode {
   const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
-  const returnType = 'ReturnType<typeof query> & { queryKey: TQueryKey }'
+  const returnType = `UseSuspenseQueryResult<${['TData', typeSchemas.errors?.map((item) => item.name).join(' | ') || 'Error'].join(', ')}> & { queryKey: TQueryKey }`
   const generics = [`TData = ${TData}`, `TQueryData = ${TData}`, `TQueryKey extends QueryKey = ${queryKeyTypeName}`]
 
   const queryKeyParams = QueryKey.getParams({

package/src/generators/__snapshots__/clientDataReturnTypeFull.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig, ResponseConfig } from "@kubb/plugin-client/client";
-import type { QueryKey, QueryObserverOptions } from "@tanstack/react-query";
+import type { QueryKey, QueryObserverOptions, UseQueryResult } from "@tanstack/react-query";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
@@ -42,7 +42,7 @@ export function useFindPetsByTags<TData = ResponseConfig<FindPetsByTagsQueryResp
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
         queryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryResult<TData, FindPetsByTags400> & {
         queryKey: TQueryKey;
     };
     query.queryKey = queryKey as TQueryKey;

package/src/generators/__snapshots__/clientGetImportPath.ts

@@ -1,5 +1,5 @@
 import client from "axios";
-import type { QueryKey, QueryObserverOptions } from "@tanstack/react-query";
+import type { QueryKey, QueryObserverOptions, UseQueryResult } from "@tanstack/react-query";
 import type { RequestConfig } from "axios";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 
@@ -42,7 +42,7 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
         queryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryResult<TData, FindPetsByTags400> & {
         queryKey: TQueryKey;
     };
     query.queryKey = queryKey as TQueryKey;

package/src/generators/__snapshots__/clientPostImportPath.ts

@@ -1,5 +1,5 @@
 import client from "axios";
-import type { UseMutationOptions, MutationKey } from "@tanstack/react-query";
+import type { UseMutationOptions } from "@tanstack/react-query";
 import type { RequestConfig } from "axios";
 import { useMutation } from "@tanstack/react-query";
 
@@ -30,18 +30,15 @@ export function useUpdatePetWithForm(options: {
 } = {}) {
     const { mutation: mutationOptions, client: config = {} } = options ?? {};
     const mutationKey = mutationOptions?.mutationKey ?? updatePetWithFormMutationKey();
-    const mutation = useMutation({
-        mutationFn: async ({ petId, data, params }: {
-            petId: UpdatePetWithFormPathParams["petId"];
-            data?: UpdatePetWithFormMutationRequest;
-            params?: UpdatePetWithFormQueryParams;
-        }) => {
+    return useMutation<UpdatePetWithFormMutationResponse, UpdatePetWithForm405, {
+        petId: UpdatePetWithFormPathParams["petId"];
+        data?: UpdatePetWithFormMutationRequest;
+        params?: UpdatePetWithFormQueryParams;
+    }>({
+        mutationFn: async ({ petId, data, params }) => {
             return updatePetWithForm(petId, data, params, config);
         },
+        mutationKey,
         ...mutationOptions
-    }) as ReturnType<typeof mutation> & {
-        mutationKey: MutationKey;
-    };
-    mutation.mutationKey = mutationKey as MutationKey;
-    return mutation;
+    });
 }

package/src/generators/__snapshots__/findByTags.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
-import type { QueryKey, QueryObserverOptions } from "@tanstack/react-query";
+import type { QueryKey, QueryObserverOptions, UseQueryResult } from "@tanstack/react-query";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
@@ -42,7 +42,7 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
         queryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryResult<TData, FindPetsByTags400> & {
         queryKey: TQueryKey;
     };
     query.queryKey = queryKey as TQueryKey;

package/src/generators/__snapshots__/findByTagsPathParamsObject.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
-import type { QueryKey, QueryObserverOptions } from "@tanstack/react-query";
+import type { QueryKey, QueryObserverOptions, UseQueryResult } from "@tanstack/react-query";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
@@ -42,7 +42,7 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
         queryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryResult<TData, FindPetsByTags400> & {
         queryKey: TQueryKey;
     };
     query.queryKey = queryKey as TQueryKey;

package/src/generators/__snapshots__/findByTagsWithCustomQueryKey.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
-import type { QueryKey, QueryObserverOptions } from "@tanstack/react-query";
+import type { QueryKey, QueryObserverOptions, UseQueryResult } from "@tanstack/react-query";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [test, { url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
@@ -42,7 +42,7 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
         queryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryResult<TData, FindPetsByTags400> & {
         queryKey: TQueryKey;
     };
     query.queryKey = queryKey as TQueryKey;

package/src/generators/__snapshots__/findByTagsWithZod.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
-import type { QueryKey, QueryObserverOptions } from "@tanstack/react-query";
+import type { QueryKey, QueryObserverOptions, UseQueryResult } from "@tanstack/react-query";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 
  export const findPetsByTagsQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
@@ -42,7 +42,7 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
         queryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryResult<TData, FindPetsByTags400> & {
         queryKey: TQueryKey;
     };
     query.queryKey = queryKey as TQueryKey;

package/src/generators/__snapshots__/findInfiniteByTags.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
-import type { QueryKey, InfiniteQueryObserverOptions } from "@tanstack/react-query";
+import type { QueryKey, InfiniteQueryObserverOptions, UseInfiniteQueryResult } from "@tanstack/react-query";
 import { useInfiniteQuery, infiniteQueryOptions } from "@tanstack/react-query";
 
  export const findPetsByTagsInfiniteQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
@@ -48,7 +48,7 @@ export function useFindPetsByTagsInfinite<TData = FindPetsByTagsQueryResponse, T
         ...findPetsByTagsInfiniteQueryOptions(headers, params, config) as unknown as InfiniteQueryObserverOptions,
         queryKey,
         ...queryOptions as unknown as Omit<InfiniteQueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseInfiniteQueryResult<TData, FindPetsByTags400> & {
         queryKey: TQueryKey;
     };
     query.queryKey = queryKey as TQueryKey;

package/src/generators/__snapshots__/findInfiniteByTagsCursor.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
-import type { QueryKey, InfiniteQueryObserverOptions } from "@tanstack/react-query";
+import type { QueryKey, InfiniteQueryObserverOptions, UseInfiniteQueryResult } from "@tanstack/react-query";
 import { useInfiniteQuery, infiniteQueryOptions } from "@tanstack/react-query";
 
  export const findPetsByTagsInfiniteQueryKey = (params?: FindPetsByTagsQueryParams) => [{ url: "/pet/findByTags" }, ...(params ? [params] : [])] as const;
@@ -48,7 +48,7 @@ export function useFindPetsByTagsInfinite<TData = FindPetsByTagsQueryResponse, T
         ...findPetsByTagsInfiniteQueryOptions(headers, params, config) as unknown as InfiniteQueryObserverOptions,
         queryKey,
         ...queryOptions as unknown as Omit<InfiniteQueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseInfiniteQueryResult<TData, FindPetsByTags400> & {
         queryKey: TQueryKey;
     };
     query.queryKey = queryKey as TQueryKey;

package/src/generators/__snapshots__/postAsQuery.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
-import type { QueryKey, QueryObserverOptions } from "custom-query";
+import type { QueryKey, QueryObserverOptions, UseQueryResult } from "custom-query";
 import { useQuery, queryOptions } from "custom-query";
 
  export const updatePetWithFormQueryKey = (petId: UpdatePetWithFormPathParams["petId"], data?: UpdatePetWithFormMutationRequest, params?: UpdatePetWithFormQueryParams) => [{ url: "/pet/:petId", params: { petId: petId } }, ...(params ? [params] : []), ...(data ? [data] : [])] as const;
@@ -40,7 +40,7 @@ export function useUpdatePetWithForm<TData = UpdatePetWithFormMutationResponse,
         ...updatePetWithFormQueryOptions(petId, data, params, config) as unknown as QueryObserverOptions,
         queryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryResult<TData, UpdatePetWithForm405> & {
         queryKey: TQueryKey;
     };
     query.queryKey = queryKey as TQueryKey;

package/src/generators/__snapshots__/updatePetById.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
-import type { UseMutationOptions, MutationKey } from "@tanstack/react-query";
+import type { UseMutationOptions } from "@tanstack/react-query";
 import { useMutation } from "@tanstack/react-query";
 
  export const updatePetWithFormMutationKey = () => [{ "url": "/pet/{petId}" }] as const;
@@ -30,18 +30,15 @@ export function useUpdatePetWithForm(options: {
 } = {}) {
     const { mutation: mutationOptions, client: config = {} } = options ?? {};
     const mutationKey = mutationOptions?.mutationKey ?? updatePetWithFormMutationKey();
-    const mutation = useMutation({
-        mutationFn: async ({ petId, data, params }: {
-            petId: UpdatePetWithFormPathParams["petId"];
-            data?: UpdatePetWithFormMutationRequest;
-            params?: UpdatePetWithFormQueryParams;
-        }) => {
+    return useMutation<UpdatePetWithFormMutationResponse, UpdatePetWithForm405, {
+        petId: UpdatePetWithFormPathParams["petId"];
+        data?: UpdatePetWithFormMutationRequest;
+        params?: UpdatePetWithFormQueryParams;
+    }>({
+        mutationFn: async ({ petId, data, params }) => {
             return updatePetWithForm(petId, data, params, config);
         },
+        mutationKey,
         ...mutationOptions
-    }) as ReturnType<typeof mutation> & {
-        mutationKey: MutationKey;
-    };
-    mutation.mutationKey = mutationKey as MutationKey;
-    return mutation;
+    });
 }

package/src/generators/__snapshots__/updatePetByIdPathParamsObject.ts

@@ -1,6 +1,6 @@
 import client from "@kubb/plugin-client/client";
 import type { RequestConfig } from "@kubb/plugin-client/client";
-import type { UseMutationOptions, MutationKey } from "@tanstack/react-query";
+import type { UseMutationOptions } from "@tanstack/react-query";
 import { useMutation } from "@tanstack/react-query";
 
  export const updatePetWithFormMutationKey = () => [{ "url": "/pet/{petId}" }] as const;
@@ -32,18 +32,15 @@ export function useUpdatePetWithForm(options: {
 } = {}) {
     const { mutation: mutationOptions, client: config = {} } = options ?? {};
     const mutationKey = mutationOptions?.mutationKey ?? updatePetWithFormMutationKey();
-    const mutation = useMutation({
-        mutationFn: async ({ petId, data, params }: {
-            petId: UpdatePetWithFormPathParams["petId"];
-            data?: UpdatePetWithFormMutationRequest;
-            params?: UpdatePetWithFormQueryParams;
-        }) => {
+    return useMutation<UpdatePetWithFormMutationResponse, UpdatePetWithForm405, {
+        petId: UpdatePetWithFormPathParams["petId"];
+        data?: UpdatePetWithFormMutationRequest;
+        params?: UpdatePetWithFormQueryParams;
+    }>({
+        mutationFn: async ({ petId, data, params }) => {
             return updatePetWithForm({ petId }, data, params, config);
         },
+        mutationKey,
         ...mutationOptions
-    }) as ReturnType<typeof mutation> & {
-        mutationKey: MutationKey;
-    };
-    mutation.mutationKey = mutationKey as MutationKey;
-    return mutation;
+    });
 }

package/src/generators/infiniteQueryGenerator.tsx

@@ -59,7 +59,7 @@ export const infiniteQueryGenerator = createReactGenerator<PluginReactQuery>({
       <File baseName={query.file.baseName} path={query.file.path} meta={query.file.meta} banner={output?.banner} footer={output?.footer}>
         {options.parser === 'zod' && <File.Import extName={output?.extName} name={[zod.schemas.response.name]} root={query.file.path} path={zod.file.path} />}
         <File.Import name={['useInfiniteQuery', 'infiniteQueryOptions']} path={options.query.importPath} />
-        <File.Import name={['QueryKey', 'WithRequired', 'InfiniteQueryObserverOptions']} path={options.query.importPath} isTypeOnly />
+        <File.Import name={['QueryKey', 'WithRequired', 'InfiniteQueryObserverOptions', 'UseInfiniteQueryResult']} path={options.query.importPath} isTypeOnly />
         <File.Import name={'client'} path={options.client.importPath} />
         <File.Import name={['RequestConfig']} path={options.client.importPath} isTypeOnly />
         {options.client.dataReturnType === 'full' && <File.Import name={['ResponseConfig']} path={options.client.importPath} isTypeOnly />}

package/src/generators/mutationGenerator.tsx

@@ -58,7 +58,7 @@ export const mutationGenerator = createReactGenerator<PluginReactQuery>({
           <File.Import extName={output?.extName} name={[zod.schemas.response.name]} root={mutation.file.path} path={zod.file.path} />
         )}
         <File.Import name={['useMutation']} path={options.mutation.importPath} />
-        <File.Import name={['UseMutationOptions', 'MutationKey']} path={options.mutation.importPath} isTypeOnly />
+        <File.Import name={['UseMutationOptions']} path={options.mutation.importPath} isTypeOnly />
         <File.Import name={'client'} path={options.client.importPath} />
         <File.Import name={['RequestConfig', 'ResponseConfig']} path={options.client.importPath} isTypeOnly />
         <File.Import
@@ -104,7 +104,6 @@ export const mutationGenerator = createReactGenerator<PluginReactQuery>({
           dataReturnType={options.client.dataReturnType}
           pathParamsType={options.pathParamsType}
           mutationKeyName={mutationKey.name}
-          mutationKeyTypeName={mutationKey.typeName}
         />
       </File>
     )

package/src/generators/queryGenerator.tsx

@@ -60,7 +60,7 @@ export const queryGenerator = createReactGenerator<PluginReactQuery>({
       <File baseName={query.file.baseName} path={query.file.path} meta={query.file.meta} banner={output?.banner} footer={output?.footer}>
         {options.parser === 'zod' && <File.Import extName={output?.extName} name={[zod.schemas.response.name]} root={query.file.path} path={zod.file.path} />}
         <File.Import name={['useQuery', 'queryOptions']} path={options.query.importPath} />
-        <File.Import name={['QueryKey', 'WithRequired', 'QueryObserverOptions']} path={options.query.importPath} isTypeOnly />
+        <File.Import name={['QueryKey', 'WithRequired', 'QueryObserverOptions', 'UseQueryResult']} path={options.query.importPath} isTypeOnly />
         <File.Import name={'client'} path={options.client.importPath} />
         <File.Import name={['RequestConfig']} path={options.client.importPath} isTypeOnly />
         {options.client.dataReturnType === 'full' && <File.Import name={['ResponseConfig']} path={options.client.importPath} isTypeOnly />}

package/src/generators/suspenseQueryGenerator.tsx

@@ -59,7 +59,7 @@ export const suspenseQueryGenerator = createReactGenerator<PluginReactQuery>({
       <File baseName={query.file.baseName} path={query.file.path} meta={query.file.meta} banner={output?.banner} footer={output?.footer}>
         {options.parser === 'zod' && <File.Import extName={output?.extName} name={[zod.schemas.response.name]} root={query.file.path} path={zod.file.path} />}
         <File.Import name={['useSuspenseQuery', 'queryOptions']} path={options.query.importPath} />
-        <File.Import name={['QueryKey', 'WithRequired', 'UseSuspenseQueryOptions']} path={options.query.importPath} isTypeOnly />
+        <File.Import name={['QueryKey', 'WithRequired', 'UseSuspenseQueryOptions', 'UseSuspenseQueryResult']} path={options.query.importPath} isTypeOnly />
         <File.Import name={'client'} path={options.client.importPath} />
         <File.Import name={['RequestConfig']} path={options.client.importPath} isTypeOnly />
         {options.client.dataReturnType === 'full' && <File.Import name={['ResponseConfig']} path={options.client.importPath} isTypeOnly />}

package/src/plugin.ts

@@ -27,6 +27,7 @@ export const pluginReactQuery = createPlugin<PluginReactQuery>((options) => {
     infinite,
     transformers = {},
     pathParamsType = 'inline',
+    generators = [queryGenerator, suspenseQueryGenerator, infiniteQueryGenerator, mutationGenerator].filter(Boolean),
     mutation = {},
     query = {},
   } = options
@@ -134,7 +135,7 @@ export const pluginReactQuery = createPlugin<PluginReactQuery>((options) => {
         },
       )
 
-      const files = await operationGenerator.build(queryGenerator, suspenseQueryGenerator, infiniteQueryGenerator, mutationGenerator)
+      const files = await operationGenerator.build(...generators)
       await this.addFile(...files)
 
       if (this.config.output.exportType) {

package/src/types.ts

@@ -1,7 +1,8 @@
 import type { Output, PluginFactoryOptions, ResolveNameParams } from '@kubb/core'
 
 import type { HttpMethod } from '@kubb/oas'
-import type { Exclude, Include, Override, ResolvePathOptions } from '@kubb/plugin-oas'
+import type { PluginClient } from '@kubb/plugin-client'
+import type { Exclude, Generator, Include, Override, ResolvePathOptions } from '@kubb/plugin-oas'
 
 type Suspense = object
 
@@ -170,6 +171,10 @@ export type Options = {
      */
     name?: (name: ResolveNameParams['name'], type?: ResolveNameParams['type']) => string
   }
+  /**
+   * Define some generators next to the react-query generators
+   */
+  generators?: Array<Generator<PluginReactQuery>>
 }
 
 type ResolvedOptions = {