@orval/query 7.2.0 → 7.4.0

package/dist/index.js

@@ -1674,6 +1674,10 @@ var vueUnRefParams = (props) => {
 var wrapRouteParameters = (route, prepend, append) => route.replaceAll(import_core.TEMPLATE_TAG_REGEX, `\${${prepend}$1${append}}`);
 var makeRouteSafe = (route) => wrapRouteParameters(route, "encodeURIComponent(String(", "))");
 var isVue = (client) => import_core.OutputClient.VUE_QUERY === client;
+var getHasSignal = ({
+  overrideQuerySignal = false,
+  verb
+}) => overrideQuerySignal && (!(0, import_core.getIsBodyVerb)(verb) || verb === import_core.Verbs.POST);
 
 // src/client.ts
 var AXIOS_DEPENDENCIES = [
@@ -1692,9 +1696,9 @@ var AXIOS_DEPENDENCIES = [
     dependency: "axios"
   }
 ];
-var generateQueryRequestFunction = (verbOptions, options, isVue3) => {
+var generateQueryRequestFunction = (verbOptions, options, isVue2) => {
   if (options.context.output.httpClient === import_core2.OutputHttpClient.AXIOS) {
-    return generateAxiosRequestFunction(verbOptions, options, isVue3);
+    return generateAxiosRequestFunction(verbOptions, options, isVue2);
   } else {
     return (0, import_fetch.generateRequestFunction)(verbOptions, options);
   }
@@ -1712,11 +1716,11 @@ var generateAxiosRequestFunction = ({
   formUrlEncoded,
   override,
   paramsSerializer
-}, { route: _route, context }, isVue3) => {
+}, { route: _route, context }, isVue2) => {
   var _a, _b, _c;
   let props = _props;
   let route = _route;
-  if (isVue3) {
+  if (isVue2) {
     props = vueWrapTypeWithMaybeRef(_props);
   }
   if ((_a = context.output) == null ? void 0 : _a.urlEncodeParameters) {
@@ -1725,9 +1729,11 @@ var generateAxiosRequestFunction = ({
   const isRequestOptions = override.requestOptions !== false;
   const isFormData = override.formData !== false;
   const isFormUrlEncoded = override.formUrlEncoded !== false;
-  const hasSignal = !!override.query.signal;
+  const hasSignal = getHasSignal({
+    overrideQuerySignal: override.query.signal,
+    verb
+  });
   const isExactOptionalPropertyTypes = !!((_c = (_b = context.output.tsconfig) == null ? void 0 : _b.compilerOptions) == null ? void 0 : _c.exactOptionalPropertyTypes);
-  const isBodyVerb = import_core2.VERBS_WITH_BODY.includes(verb);
   const bodyForm = (0, import_core2.generateFormDataAndUrlEncodedFunction)({
     formData,
     formUrlEncoded,
@@ -1745,13 +1751,12 @@ var generateAxiosRequestFunction = ({
       verb,
       isFormData,
       isFormUrlEncoded,
-      isBodyVerb,
       hasSignal,
       isExactOptionalPropertyTypes,
-      isVue: isVue3
+      isVue: isVue2
     });
-    let bodyDefinition = body.definition.replace("[]", "\\[\\]");
-    let propsImplementation = (mutator == null ? void 0 : mutator.bodyTypeName) && body.definition ? (0, import_core2.toObjectString)(props, "implementation").replace(
+    const bodyDefinition = body.definition.replace("[]", "\\[\\]");
+    const propsImplementation = (mutator == null ? void 0 : mutator.bodyTypeName) && body.definition ? (0, import_core2.toObjectString)(props, "implementation").replace(
       new RegExp(`(\\w*):\\s?${bodyDefinition}`),
       `$1: ${mutator.bodyTypeName}<${body.definition}>`
     ) : (0, import_core2.toObjectString)(props, "implementation");
@@ -1765,7 +1770,7 @@ var generateAxiosRequestFunction = ({
 
         return useCallback((
     ${propsImplementation}
- ${isRequestOptions && mutator.hasSecondArg ? `options${context.output.optionsParamRequired ? "" : "?"}: SecondParameter<ReturnType<typeof ${mutator.name}>>,` : ""}${!isBodyVerb && hasSignal ? "signal?: AbortSignal\n" : ""}) => {${bodyForm}
+ ${isRequestOptions && mutator.hasSecondArg ? `options${context.output.optionsParamRequired ? "" : "?"}: SecondParameter<ReturnType<typeof ${mutator.name}>>,` : ""}${hasSignal ? "signal?: AbortSignal\n" : ""}) => {${bodyForm}
         return ${operationName}(
           ${mutatorConfig},
           ${requestOptions});
@@ -1775,8 +1780,8 @@ var generateAxiosRequestFunction = ({
     }
     return `${override.query.shouldExportHttpClient ? "export " : ""}const ${operationName} = (
     ${propsImplementation}
- ${isRequestOptions && mutator.hasSecondArg ? `options${context.output.optionsParamRequired ? "" : "?"}: SecondParameter<typeof ${mutator.name}>,` : ""}${!isBodyVerb && hasSignal ? "signal?: AbortSignal\n" : ""}) => {
-      ${isVue3 ? vueUnRefParams(props) : ""}
+ ${isRequestOptions && mutator.hasSecondArg ? `options${context.output.optionsParamRequired ? "" : "?"}: SecondParameter<typeof ${mutator.name}>,` : ""}${hasSignal ? "signal?: AbortSignal\n" : ""}) => {
+      ${isVue2 ? vueUnRefParams(props) : ""}
       ${bodyForm}
       return ${mutator.name}<${response.definition.success || "unknown"}>(
       ${mutatorConfig},
@@ -1801,7 +1806,7 @@ var generateAxiosRequestFunction = ({
     paramsSerializerOptions: override == null ? void 0 : override.paramsSerializerOptions,
     isExactOptionalPropertyTypes,
     hasSignal,
-    isVue: isVue3
+    isVue: isVue2
   });
   const optionsArgs = generateRequestOptionsArguments({
     isRequestOptions,
@@ -1809,8 +1814,9 @@ var generateAxiosRequestFunction = ({
   });
   const queryProps = (0, import_core2.toObjectString)(props, "implementation");
   const httpRequestFunctionImplementation = `export const ${operationName} = (
-    ${queryProps} ${optionsArgs} ): Promise<AxiosResponse<${response.definition.success || "unknown"}>> => {${bodyForm}
-    ${isVue3 ? vueUnRefParams(props) : ""}
+    ${queryProps} ${optionsArgs} ): Promise<AxiosResponse<${response.definition.success || "unknown"}>> => {
+    ${isVue2 ? vueUnRefParams(props) : ""}
+    ${bodyForm}
     return axios${!isSyntheticDefaultImportsAllowed ? ".default" : ""}.${verb}(${options});
   }
 `;
@@ -1888,17 +1894,22 @@ var getQueryErrorType = (operationName, response, httpClient, mutator) => {
     return httpClient === import_core2.OutputHttpClient.AXIOS ? `AxiosError<${response.definition.errors || "unknown"}>` : `${response.definition.errors || "unknown"}`;
   }
 };
-var getHooksOptionImplementation = (isRequestOptions, httpClient, mutator) => {
+var getHooksOptionImplementation = (isRequestOptions, httpClient, operationName, mutator) => {
   const options = httpClient === import_core2.OutputHttpClient.AXIOS ? ", axios: axiosOptions" : ", fetch: fetchOptions";
-  return isRequestOptions ? `const {mutation: mutationOptions${!mutator ? options : (mutator == null ? void 0 : mutator.hasSecondArg) ? ", request: requestOptions" : ""}} = options ?? {};` : "";
+  return isRequestOptions ? `const mutationKey = ['${operationName}'];
+const {mutation: mutationOptions${!mutator ? options : (mutator == null ? void 0 : mutator.hasSecondArg) ? ", request: requestOptions" : ""}} = options ?
+      options.mutation && 'mutationKey' in options.mutation && options.mutation.mutationKey ?
+      options
+      : {...options, mutation: {...options.mutation, mutationKey}}
+      : {mutation: { mutationKey, }${(mutator == null ? void 0 : mutator.hasSecondArg) ? ", request: undefined" : ""}${!mutator ? httpClient === import_core2.OutputHttpClient.AXIOS ? ", axios: undefined" : ", fetch: undefined" : ""}};` : "";
 };
 var getMutationRequestArgs = (isRequestOptions, httpClient, mutator) => {
   const options = httpClient === import_core2.OutputHttpClient.AXIOS ? "axiosOptions" : "fetchOptions";
   return isRequestOptions ? !mutator ? options : (mutator == null ? void 0 : mutator.hasSecondArg) ? "requestOptions" : "" : "";
 };
-var getHttpFunctionQueryProps = (isVue3, httpClient, queryProperties) => {
-  if (isVue3 && httpClient === import_core2.OutputHttpClient.FETCH && queryProperties) {
-    return `unref(${queryProperties})`;
+var getHttpFunctionQueryProps = (isVue2, httpClient, queryProperties) => {
+  if (isVue2 && httpClient === import_core2.OutputHttpClient.FETCH && queryProperties) {
+    return queryProperties.split(",").map((prop) => `unref(${prop})`).join(",");
   }
   return queryProperties;
 };
@@ -1966,7 +1977,8 @@ var SVELTE_QUERY_DEPENDENCIES = [
       { name: "CreateInfiniteQueryResult" },
       { name: "QueryKey" },
       { name: "InfiniteData" },
-      { name: "CreateMutationResult" }
+      { name: "CreateMutationResult" },
+      { name: "DataTag" }
     ],
     dependency: "@tanstack/svelte-query"
   }
@@ -2031,7 +2043,8 @@ var REACT_QUERY_DEPENDENCIES = [
       { name: "QueryKey" },
       { name: "QueryClient" },
       { name: "InfiniteData" },
-      { name: "UseMutationResult" }
+      { name: "UseMutationResult" },
+      { name: "DataTag" }
     ],
     dependency: "@tanstack/react-query"
   }
@@ -2097,7 +2110,8 @@ var VUE_QUERY_DEPENDENCIES = [
       { name: "UseQueryReturnType" },
       { name: "UseInfiniteQueryReturnType" },
       { name: "InfiniteData" },
-      { name: "UseMutationReturnType" }
+      { name: "UseMutationReturnType" },
+      { name: "DataTag" }
     ],
     dependency: "@tanstack/vue-query"
   },
@@ -2169,7 +2183,7 @@ var generateQueryOptions = ({
       (_, key) => (type !== QueryType.INFINITE || type !== QueryType.SUSPENSE_INFINITE) && INFINITE_QUERY_PROPERTIES.includes(key)
     )
   )) == null ? void 0 : _a.slice(1, -1)}` : "";
-  if (!params.length) {
+  if (!params.length || isSuspenseQuery(type)) {
     if (options) {
       return `${queryConfig} ...queryOptions`;
     }
@@ -2181,9 +2195,7 @@ var isSuspenseQuery = (type) => {
   return [QueryType.SUSPENSE_INFINITE, QueryType.SUSPENSE_QUERY].includes(type);
 };
 var getQueryOptionsDefinition = ({
-  operationName,
   definitions,
-  mutator,
   type,
   hasSvelteQueryV4,
   hasQueryV5,
@@ -2192,27 +2204,22 @@ var getQueryOptionsDefinition = ({
   isReturnType,
   initialData
 }) => {
-  const isMutatorHook = mutator == null ? void 0 : mutator.isHook;
   const prefix = !hasSvelteQueryV4 ? "Use" : "Create";
   const partialOptions = !isReturnType && hasQueryV5;
   if (type) {
-    const funcReturnType = `Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>`;
     const optionTypeInitialDataPostfix = initialData && !isSuspenseQuery(type) ? ` & Pick<
         ${(0, import_core3.pascal)(initialData)}InitialDataOptions<
-          ${funcReturnType},
+          TData,
           TError,
           TData${hasQueryV5 && (type === QueryType.INFINITE || type === QueryType.SUSPENSE_INFINITE) && queryParam && queryParams ? `, QueryKey` : ""}
         > , 'initialData'
       >` : "";
-    const optionType = `${prefix}${(0, import_core3.pascal)(
-      type
-    )}Options<${funcReturnType}, TError, TData${hasQueryV5 && (type === QueryType.INFINITE || type === QueryType.SUSPENSE_INFINITE) && queryParam && queryParams ? `, ${funcReturnType}, QueryKey, ${queryParams == null ? void 0 : queryParams.schema.name}['${queryParam}']` : ""}>`;
+    const optionType = `${prefix}${(0, import_core3.pascal)(type)}Options<TData, TError, TData${hasQueryV5 && (type === QueryType.INFINITE || type === QueryType.SUSPENSE_INFINITE) && queryParam && queryParams ? `, TData, QueryKey, ${queryParams == null ? void 0 : queryParams.schema.name}['${queryParam}']` : ""}>`;
     return `${partialOptions ? "Partial<" : ""}${optionType}${partialOptions ? ">" : ""}${optionTypeInitialDataPostfix}`;
   }
-  return `${prefix}MutationOptions<Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>, TError,${definitions ? `{${definitions}}` : "void"}, TContext>`;
+  return `${prefix}MutationOptions<TData, TError,${definitions ? `{${definitions}}` : "void"}, TContext>`;
 };
 var generateQueryArguments = ({
-  operationName,
   definitions,
   mutator,
   isRequestOptions,
@@ -2225,9 +2232,7 @@ var generateQueryArguments = ({
   httpClient
 }) => {
   const definition = getQueryOptionsDefinition({
-    operationName,
     definitions,
-    mutator,
     type,
     hasSvelteQueryV4,
     hasQueryV5,
@@ -2251,42 +2256,42 @@ var generateQueryReturnType = ({
   operationName,
   hasVueQueryV4,
   hasSvelteQueryV4,
+  hasQueryV5,
   isInitialDataDefined
 }) => {
   switch (outputClient) {
     case import_core3.OutputClient.SVELTE_QUERY: {
       if (!hasSvelteQueryV4) {
-        return `Use${(0, import_core3.pascal)(type)}StoreResult<Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>, TError, TData, QueryKey> & { queryKey: QueryKey }`;
+        return `Use${(0, import_core3.pascal)(type)}StoreResult<Awaited<ReturnType<${isMutatorHook ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>, TError, TData, QueryKey> & { queryKey: QueryKey} }`;
       }
       return `Create${(0, import_core3.pascal)(
         type
-      )}Result<TData, TError> & { queryKey: QueryKey }`;
+      )}Result<TData, TError> & { queryKey: ${hasQueryV5 ? "DataTag<QueryKey, TData>" : "QueryKey"} }`;
     }
     case import_core3.OutputClient.VUE_QUERY: {
       if (!hasVueQueryV4) {
         return ` UseQueryReturnType<TData, TError, Use${(0, import_core3.pascal)(
           type
-        )}Result<TData, TError>> & { queryKey: QueryKey }`;
+        )}Result<TData, TError>> & { queryKey: QueryKey} }`;
       }
       if (type !== QueryType.INFINITE && type !== QueryType.SUSPENSE_INFINITE) {
-        return `UseQueryReturnType<TData, TError> & { queryKey: QueryKey }`;
+        return `UseQueryReturnType<TData, TError> & { queryKey: ${hasQueryV5 ? "DataTag<QueryKey, TData>" : "QueryKey"} }`;
       }
-      return `UseInfiniteQueryReturnType<TData, TError> & { queryKey: QueryKey }`;
+      return `UseInfiniteQueryReturnType<TData, TError> & { queryKey: ${hasQueryV5 ? "DataTag<QueryKey, TData>" : "QueryKey"} }`;
     }
     case import_core3.OutputClient.REACT_QUERY:
     default: {
-      return ` ${isInitialDataDefined && !isSuspenseQuery(type) ? "Defined" : ""}Use${(0, import_core3.pascal)(type)}Result<TData, TError> & { queryKey: QueryKey }`;
+      return ` ${isInitialDataDefined && !isSuspenseQuery(type) ? "Defined" : ""}Use${(0, import_core3.pascal)(type)}Result<TData, TError> & { queryKey: ${hasQueryV5 ? "DataTag<QueryKey, TData>" : "QueryKey"} }`;
     }
   }
 };
 var generateMutatorReturnType = ({
   outputClient,
-  dataType,
   variableType
 }) => {
   if (outputClient === import_core3.OutputClient.REACT_QUERY) {
     return `: UseMutationResult<
-        Awaited<ReturnType<${dataType}>>,
+        TData,
         TError,
         ${variableType},
         TContext
@@ -2294,7 +2299,7 @@ var generateMutatorReturnType = ({
   }
   if (outputClient === import_core3.OutputClient.SVELTE_QUERY) {
     return `: CreateMutationResult<
-        Awaited<ReturnType<${dataType}>>,
+        TData,
         TError,
         ${variableType},
         TContext
@@ -2302,7 +2307,7 @@ var generateMutatorReturnType = ({
   }
   if (outputClient === import_core3.OutputClient.VUE_QUERY) {
     return `: UseMutationReturnType<
-        Awaited<ReturnType<${dataType}>>,
+        TData,
         TError,
         ${variableType},
         TContext
@@ -2386,6 +2391,7 @@ var generateQueryImplementation = ({
     operationName,
     hasVueQueryV4,
     hasSvelteQueryV4,
+    hasQueryV5,
     isInitialDataDefined: true
   });
   const returnType = generateQueryReturnType({
@@ -2394,7 +2400,8 @@ var generateQueryImplementation = ({
     isMutatorHook: mutator == null ? void 0 : mutator.isHook,
     operationName,
     hasVueQueryV4,
-    hasSvelteQueryV4
+    hasSvelteQueryV4,
+    hasQueryV5
   });
   const errorType = getQueryErrorType(
     operationName,
@@ -2404,7 +2411,6 @@ var generateQueryImplementation = ({
   );
   const dataType = (mutator == null ? void 0 : mutator.isHook) ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`;
   const definedInitialDataQueryArguments = generateQueryArguments({
-    operationName,
     definitions: "",
     mutator,
     isRequestOptions,
@@ -2417,7 +2423,6 @@ var generateQueryImplementation = ({
     httpClient
   });
   const undefinedInitialDataQueryArguments = generateQueryArguments({
-    operationName,
     definitions: "",
     mutator,
     isRequestOptions,
@@ -2430,7 +2435,6 @@ var generateQueryImplementation = ({
     httpClient
   });
   const queryArguments = generateQueryArguments({
-    operationName,
     definitions: "",
     mutator,
     isRequestOptions,
@@ -2458,9 +2462,7 @@ var generateQueryImplementation = ({
     hasSignal
   });
   const queryOptionFnReturnType = getQueryOptionsDefinition({
-    operationName,
     definitions: "",
-    mutator,
     type,
     hasSvelteQueryV4,
     hasQueryV5,
@@ -2502,7 +2504,7 @@ ${hookOptions}
 
       ${queryOptionsMutator ? `const customOptions = ${queryOptionsMutator.name}({...queryOptions, queryKey, queryFn}${queryOptionsMutator.hasSecondArg ? `, { ${queryProperties} }` : ""}${queryOptionsMutator.hasThirdArg ? `, { url: \`${route}\` }` : ""});` : ""}
 
-   return  ${!queryOptionsMutator ? `{ queryKey, queryFn, ${queryOptionsImp}}` : "customOptions"} as ${queryOptionFnReturnType} ${isVue(outputClient) ? "" : "& { queryKey: QueryKey }"}
+   return  ${!queryOptionsMutator ? `{ queryKey, queryFn, ${queryOptionsImp}}` : "customOptions"} as ${queryOptionFnReturnType} ${isVue(outputClient) ? "" : `& { queryKey: ${hasQueryV5 ? "DataTag<QueryKey, TData>" : "QueryKey"} }`}
 }`;
   const operationPrefix = hasSvelteQueryV4 ? "create" : "use";
   const queryHookName = (0, import_core3.camel)(`${operationPrefix}-${name}`);
@@ -2536,7 +2538,7 @@ export function ${queryHookName}<TData = ${TData}, TError = ${errorType}>(
     `${operationPrefix}-${type}`
   )}(${queryOptionsVarName}) as ${returnType};
 
-  ${queryResultVarName}.queryKey = ${isVue(outputClient) ? `unref(${queryOptionsVarName})` : queryOptionsVarName}.queryKey ${isVue(outputClient) ? "as QueryKey" : ""};
+  ${queryResultVarName}.queryKey = ${isVue(outputClient) ? `unref(${queryOptionsVarName})` : queryOptionsVarName}.queryKey ${isVue(outputClient) ? `as ${hasQueryV5 ? "DataTag<QueryKey, TData>" : "QueryKey"}` : ""};
 
   return ${queryResultVarName};
 }
@@ -2660,7 +2662,7 @@ var generateQueryHook = async ({
       ] : []
     ];
     const queryKeyFnName = (0, import_core3.camel)(`get-${operationName}-queryKey`);
-    let queryKeyProps = (0, import_core3.toObjectString)(
+    const queryKeyProps = (0, import_core3.toObjectString)(
       props.filter((prop) => prop.type !== import_core3.GetterPropType.HEADER),
       "implementation"
     );
@@ -2686,7 +2688,10 @@ var generateQueryHook = async ({
         outputClient,
         httpClient,
         isExactOptionalPropertyTypes,
-        hasSignal: !!query.signal,
+        hasSignal: getHasSignal({
+          overrideQuerySignal: override.query.signal,
+          verb
+        }),
         queryOptionsMutator,
         queryKeyMutator,
         route,
@@ -2720,7 +2725,7 @@ var generateQueryHook = async ({
       ({ definition, type }) => type === import_core3.GetterPropType.BODY ? (mutator == null ? void 0 : mutator.bodyTypeName) ? `data: ${mutator.bodyTypeName}<${body.definition}>` : `data: ${body.definition}` : definition
     ).join(";");
     const properties = props.map(({ name, type }) => type === import_core3.GetterPropType.BODY ? "data" : name).join(",");
-    let errorType = getQueryErrorType(
+    const errorType = getQueryErrorType(
       operationName,
       response,
       httpClient,
@@ -2728,15 +2733,12 @@ var generateQueryHook = async ({
     );
     const dataType = (mutator == null ? void 0 : mutator.isHook) ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`;
     const mutationOptionFnReturnType = getQueryOptionsDefinition({
-      operationName,
       definitions,
-      mutator,
       hasSvelteQueryV4,
       hasQueryV5,
       isReturnType: true
     });
     const mutationArguments = generateQueryArguments({
-      operationName,
       definitions,
       mutator,
       isRequestOptions,
@@ -2751,10 +2753,12 @@ var generateQueryHook = async ({
     const hooksOptionImplementation = getHooksOptionImplementation(
       isRequestOptions,
       httpClient,
+      (0, import_core3.camel)(operationName),
       mutator
     );
-    const mutationOptionsFn = `export const ${mutationOptionsFnName} = <TError = ${errorType},
-    TContext = unknown>(${mutationArguments}): ${mutationOptionFnReturnType} => {
+    const TData = `Awaited<ReturnType<${(mutator == null ? void 0 : mutator.isHook) ? `ReturnType<typeof use${(0, import_core3.pascal)(operationName)}Hook>` : `typeof ${operationName}`}>>`;
+    const mutationOptionsFn = `export const ${mutationOptionsFnName} = <TData = ${TData}, TError = ${errorType},
+    TContext = unknown>(${mutationArguments}) => {
 ${hooksOptionImplementation}
 
       ${(mutator == null ? void 0 : mutator.isHook) ? `const ${operationName} =  use${(0, import_core3.pascal)(operationName)}Hook()` : ""}
@@ -2769,7 +2773,7 @@ ${hooksOptionImplementation}
         ${mutationOptionsMutator ? `const customOptions = ${mutationOptionsMutator.name}({...mutationOptions, mutationFn}${mutationOptionsMutator.hasThirdArg ? `, { url: \`${route}\` }` : ""});` : ""}
 
 
-  return  ${!mutationOptionsMutator ? "{ mutationFn, ...mutationOptions }" : "customOptions"}}`;
+  return  ${!mutationOptionsMutator ? "{ mutationFn, ...mutationOptions }" : "customOptions"} as ${mutationOptionFnReturnType}}`;
     const operationPrefix = hasSvelteQueryV4 ? "create" : "use";
     implementation += `
 ${mutationOptionsFn}
@@ -2782,10 +2786,9 @@ ${mutationOptionsFn}
 
     ${doc}export const ${(0, import_core3.camel)(
       `${operationPrefix}-${operationName}`
-    )} = <TError = ${errorType},
+    )} = <TData = ${TData}, TError = ${errorType},
     TContext = unknown>(${mutationArguments})${generateMutatorReturnType({
       outputClient,
-      dataType,
       variableType: definitions ? `{${definitions}}` : "void"
     })} => {