@kubb/plugin-vue-query 3.0.0-alpha.26 → 3.0.0-alpha.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-vue-query",
-  "version": "3.0.0-alpha.26",
+  "version": "3.0.0-alpha.29",
   "description": "Generator vue-query hooks",
   "keywords": [
     "faker",
@@ -62,24 +62,24 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "@kubb/core": "3.0.0-alpha.26",
-    "@kubb/fs": "3.0.0-alpha.26",
-    "@kubb/oas": "3.0.0-alpha.26",
-    "@kubb/plugin-oas": "3.0.0-alpha.26",
-    "@kubb/plugin-ts": "3.0.0-alpha.26",
-    "@kubb/plugin-zod": "3.0.0-alpha.26",
-    "@kubb/react": "3.0.0-alpha.26"
+    "@kubb/core": "3.0.0-alpha.29",
+    "@kubb/fs": "3.0.0-alpha.29",
+    "@kubb/oas": "3.0.0-alpha.29",
+    "@kubb/plugin-oas": "3.0.0-alpha.29",
+    "@kubb/plugin-ts": "3.0.0-alpha.29",
+    "@kubb/plugin-zod": "3.0.0-alpha.29",
+    "@kubb/react": "3.0.0-alpha.29"
   },
   "devDependencies": {
     "@types/react": "^18.3.9",
     "react": "^18.3.1",
     "tsup": "^8.3.0",
     "typescript": "^5.6.2",
-    "@kubb/config-ts": "3.0.0-alpha.26",
-    "@kubb/config-tsup": "3.0.0-alpha.26"
+    "@kubb/config-ts": "3.0.0-alpha.29",
+    "@kubb/config-tsup": "3.0.0-alpha.29"
   },
   "peerDependencies": {
-    "@kubb/react": "3.0.0-alpha.26"
+    "@kubb/react": "3.0.0-alpha.29"
   },
   "engines": {
     "node": ">=20"

package/src/components/InfiniteQuery.tsx

@@ -85,7 +85,7 @@ export function InfiniteQuery({
   operation,
 }: Props): ReactNode {
   const TData = dataReturnType === 'data' ? typeSchemas.response.name : `ResponseConfig<${typeSchemas.response.name}>`
-  const returnType = 'ReturnType<typeof query> & { queryKey: TQueryKey }'
+  const returnType = `UseInfiniteQueryReturnType<${['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({
@@ -121,7 +121,7 @@ export function InfiniteQuery({
 
        const query = useInfiniteQuery({
         ...${queryOptions},
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<InfiniteQueryObserverOptions, "queryKey">
        }) as ${returnType}
 

package/src/components/InfiniteQueryOptions.tsx

@@ -107,14 +107,23 @@ export function InfiniteQueryOptions({
           }`
       : ''
 
+  const enabled = Object.entries(queryKeyParams.flatParams)
+    .map(([key, item]) => (item && !item.optional ? key : undefined))
+    .filter(Boolean)
+    .join('&& ')
+
+  const enabledText = enabled ? `enabled: !!(${enabled})` : ''
+
   return (
     <File.Source name={name} isExportable isIndexable>
       <Function name={name} export params={params.toConstructor()}>
         {`
       const queryKey = ${queryKeyName}(${queryKeyParams.toCall()})
       return infiniteQueryOptions({
+       ${enabledText}
        queryKey,
-       queryFn: async ({ pageParam }) => {
+       queryFn: async ({ signal, pageParam }) => {
+          config.signal = signal
           ${infiniteOverrideParams}
           return ${clientName}(${clientParams.toCall()})
        },

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 { PluginVueQuery } from '../types.ts'
 import { MutationKey } from './MutationKey.tsx'
@@ -30,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,
       override(item) {
@@ -59,7 +60,7 @@ function getParams({ dataReturnType, typeSchemas }: GetParamsProps) {
         }
       : undefined,
   })
-  const TRequest = mutateParams.toConstructor({ valueAsType: true })
+  const TRequest = mutationParams.toConstructor({ valueAsType: true })
 
   return FunctionParams.factory({
     options: {
@@ -75,8 +76,6 @@ function getParams({ dataReturnType, typeSchemas }: GetParamsProps) {
 }
 
 export function Mutation({ name, clientName, pathParamsType, dataReturnType, typeSchemas, operation, mutationKeyName }: Props): ReactNode {
-  const returnType = 'ReturnType<typeof mutation> & { mutationKey: MutationKey }'
-
   const mutationKeyParams = MutationKey.getParams({
     pathParamsType,
     typeSchemas,
@@ -94,35 +93,48 @@ 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
@@ -137,16 +149,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

@@ -76,7 +76,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 = `UseQueryReturnType<${['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({
@@ -112,7 +112,7 @@ export function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 
        const query = useQuery({
         ...${queryOptions},
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
        }) as ${returnType}
 

package/src/components/QueryOptions.tsx

@@ -72,14 +72,23 @@ export function QueryOptions({ name, clientName, typeSchemas, pathParamsType, qu
     typeSchemas,
   })
 
+  const enabled = Object.entries(queryKeyParams.flatParams)
+    .map(([key, item]) => (item && !item.optional ? key : undefined))
+    .filter(Boolean)
+    .join('&& ')
+
+  const enabledText = enabled ? `enabled: !!(${enabled})` : ''
+
   return (
     <File.Source name={name} isExportable isIndexable>
       <Function name={name} export params={params.toConstructor()}>
         {`
       const queryKey = ${queryKeyName}(${queryKeyParams.toCall()})
       return queryOptions({
+      ${enabledText}
        queryKey,
-       queryFn: async () => {
+       queryFn: async ({ signal }) => {
+          config.signal = signal
           return ${clientName}(${clientParams.toCall({
             transformName(name) {
               return `unref(${name})`

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, UseQueryReturnType } from "@tanstack/react-query";
 import type { MaybeRef } from "vue";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 import { unref } from "vue";
@@ -23,7 +23,8 @@ async function findPetsByTags(headers: FindPetsByTagsHeaderParams, params?: Find
     const queryKey = findPetsByTagsQueryKey(params);
     return queryOptions({
         queryKey,
-        queryFn: async () => {
+        queryFn: async ({ signal }) => {
+            config.signal = signal;
             return findPetsByTags(unref(headers), unref(params), unref(config));
         },
     });
@@ -42,9 +43,9 @@ export function useFindPetsByTags<TData = ResponseConfig<FindPetsByTagsQueryResp
     const queryKey = queryOptions?.queryKey ?? findPetsByTagsQueryKey(params);
     const query = useQuery({
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryReturnType<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, UseQueryReturnType } from "@tanstack/react-query";
 import type { RequestConfig } from "axios";
 import type { MaybeRef } from "vue";
 import { useQuery, queryOptions } from "@tanstack/react-query";
@@ -23,7 +23,8 @@ async function findPetsByTags(headers: FindPetsByTagsHeaderParams, params?: Find
     const queryKey = findPetsByTagsQueryKey(params);
     return queryOptions({
         queryKey,
-        queryFn: async () => {
+        queryFn: async ({ signal }) => {
+            config.signal = signal;
             return findPetsByTags(unref(headers), unref(params), unref(config));
         },
     });
@@ -42,9 +43,9 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
     const queryKey = queryOptions?.queryKey ?? findPetsByTagsQueryKey(params);
     const query = useQuery({
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryReturnType<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 { MutationObserverOptions, MutationKey } from "@tanstack/react-query";
+import type { MutationObserverOptions } from "@tanstack/react-query";
 import type { RequestConfig } from "axios";
 import type { MaybeRef } from "vue";
 import { useMutation } from "@tanstack/react-query";
@@ -31,18 +31,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, UseQueryReturnType } from "@tanstack/react-query";
 import type { MaybeRef } from "vue";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 import { unref } from "vue";
@@ -23,7 +23,8 @@ async function findPetsByTags(headers: FindPetsByTagsHeaderParams, params?: Find
     const queryKey = findPetsByTagsQueryKey(params);
     return queryOptions({
         queryKey,
-        queryFn: async () => {
+        queryFn: async ({ signal }) => {
+            config.signal = signal;
             return findPetsByTags(unref(headers), unref(params), unref(config));
         },
     });
@@ -42,9 +43,9 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
     const queryKey = queryOptions?.queryKey ?? findPetsByTagsQueryKey(params);
     const query = useQuery({
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryReturnType<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, UseQueryReturnType } from "@tanstack/react-query";
 import type { MaybeRef } from "vue";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 import { unref } from "vue";
@@ -23,7 +23,8 @@ async function findPetsByTags(headers: FindPetsByTagsHeaderParams, params?: Find
     const queryKey = findPetsByTagsQueryKey(params);
     return queryOptions({
         queryKey,
-        queryFn: async () => {
+        queryFn: async ({ signal }) => {
+            config.signal = signal;
             return findPetsByTags(unref(headers), unref(params), unref(config));
         },
     });
@@ -42,9 +43,9 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
     const queryKey = queryOptions?.queryKey ?? findPetsByTagsQueryKey(params);
     const query = useQuery({
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryReturnType<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, UseQueryReturnType } from "@tanstack/react-query";
 import type { MaybeRef } from "vue";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 import { unref } from "vue";
@@ -23,7 +23,8 @@ async function findPetsByTags(headers: FindPetsByTagsHeaderParams, params?: Find
     const queryKey = findPetsByTagsQueryKey(params);
     return queryOptions({
         queryKey,
-        queryFn: async () => {
+        queryFn: async ({ signal }) => {
+            config.signal = signal;
             return findPetsByTags(unref(headers), unref(params), unref(config));
         },
     });
@@ -42,9 +43,9 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
     const queryKey = queryOptions?.queryKey ?? findPetsByTagsQueryKey(params);
     const query = useQuery({
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryReturnType<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, UseQueryReturnType } from "@tanstack/react-query";
 import type { MaybeRef } from "vue";
 import { useQuery, queryOptions } from "@tanstack/react-query";
 import { unref } from "vue";
@@ -23,7 +23,8 @@ async function findPetsByTags(headers: FindPetsByTagsHeaderParams, params?: Find
     const queryKey = findPetsByTagsQueryKey(params);
     return queryOptions({
         queryKey,
-        queryFn: async () => {
+        queryFn: async ({ signal }) => {
+            config.signal = signal;
             return findPetsByTags(unref(headers), unref(params), unref(config));
         },
     });
@@ -42,9 +43,9 @@ export function useFindPetsByTags<TData = FindPetsByTagsQueryResponse, TQueryDat
     const queryKey = queryOptions?.queryKey ?? findPetsByTagsQueryKey(params);
     const query = useQuery({
         ...findPetsByTagsQueryOptions(headers, params, config) as unknown as QueryObserverOptions,
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryReturnType<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, UseInfiniteQueryReturnType } from "@tanstack/react-query";
 import type { MaybeRef } from "vue";
 import { useInfiniteQuery, infiniteQueryOptions } from "@tanstack/react-query";
 
@@ -22,7 +22,8 @@ async function findPetsByTags(headers: FindPetsByTagsHeaderParams, params?: Find
     const queryKey = findPetsByTagsInfiniteQueryKey(params);
     return infiniteQueryOptions({
         queryKey,
-        queryFn: async ({ pageParam }) => {
+        queryFn: async ({ signal, pageParam }) => {
+            config.signal = signal;
             if (params) {
                 params["pageSize"] = pageParam as unknown as FindPetsByTagsQueryParams["pageSize"];
             }
@@ -47,9 +48,9 @@ export function useFindPetsByTagsInfinite<TData = FindPetsByTagsQueryResponse, T
     const queryKey = queryOptions?.queryKey ?? findPetsByTagsInfiniteQueryKey(params);
     const query = useInfiniteQuery({
         ...findPetsByTagsInfiniteQueryOptions(headers, params, config) as unknown as InfiniteQueryObserverOptions,
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<InfiniteQueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseInfiniteQueryReturnType<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, UseInfiniteQueryReturnType } from "@tanstack/react-query";
 import type { MaybeRef } from "vue";
 import { useInfiniteQuery, infiniteQueryOptions } from "@tanstack/react-query";
 
@@ -22,7 +22,8 @@ async function findPetsByTags(headers: FindPetsByTagsHeaderParams, params?: Find
     const queryKey = findPetsByTagsInfiniteQueryKey(params);
     return infiniteQueryOptions({
         queryKey,
-        queryFn: async ({ pageParam }) => {
+        queryFn: async ({ signal, pageParam }) => {
+            config.signal = signal;
             if (params) {
                 params["pageSize"] = pageParam as unknown as FindPetsByTagsQueryParams["pageSize"];
             }
@@ -47,9 +48,9 @@ export function useFindPetsByTagsInfinite<TData = FindPetsByTagsQueryResponse, T
     const queryKey = queryOptions?.queryKey ?? findPetsByTagsInfiniteQueryKey(params);
     const query = useInfiniteQuery({
         ...findPetsByTagsInfiniteQueryOptions(headers, params, config) as unknown as InfiniteQueryObserverOptions,
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<InfiniteQueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseInfiniteQueryReturnType<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, UseQueryReturnType } from "custom-query";
 import type { MaybeRef } from "vue";
 import { useQuery, queryOptions } from "custom-query";
 import { unref } from "vue";
@@ -21,8 +21,10 @@ async function updatePetWithForm(petId: UpdatePetWithFormPathParams["petId"], da
  export function updatePetWithFormQueryOptions(petId: MaybeRef<UpdatePetWithFormPathParams["petId"]>, data?: MaybeRef<UpdatePetWithFormMutationRequest>, params?: MaybeRef<UpdatePetWithFormQueryParams>, config: Partial<RequestConfig<UpdatePetWithFormMutationRequest>> = {}) {
     const queryKey = updatePetWithFormQueryKey(petId, data, params);
     return queryOptions({
+        enabled: !!(petId),
         queryKey,
-        queryFn: async () => {
+        queryFn: async ({ signal }) => {
+            config.signal = signal;
             return updatePetWithForm(unref(petId), unref(data), unref(params), unref(config));
         },
     });
@@ -40,9 +42,9 @@ export function useUpdatePetWithForm<TData = UpdatePetWithFormMutationResponse,
     const queryKey = queryOptions?.queryKey ?? updatePetWithFormQueryKey(petId, data, params);
     const query = useQuery({
         ...updatePetWithFormQueryOptions(petId, data, params, config) as unknown as QueryObserverOptions,
-        queryKey,
+        queryKey: queryKey as QueryKey,
         ...queryOptions as unknown as Omit<QueryObserverOptions, "queryKey">
-    }) as ReturnType<typeof query> & {
+    }) as UseQueryReturnType<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 { MutationObserverOptions, MutationKey } from "@tanstack/react-query";
+import type { MutationObserverOptions } from "@tanstack/react-query";
 import type { MaybeRef } from "vue";
 import { useMutation } from "@tanstack/react-query";
 
@@ -31,18 +31,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 { MutationObserverOptions, MutationKey } from "@tanstack/react-query";
+import type { MutationObserverOptions } from "@tanstack/react-query";
 import type { MaybeRef } from "vue";
 import { useMutation } from "@tanstack/react-query";
 
@@ -33,18 +33,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;
+    });
 }