fix(axios-client): better result type without mutators

src/core/generators/axios.ts

@@ -127,11 +127,9 @@ const generateAxiosImplementation = (
 
   returnTypesToWrite.set(
     operationName,
-    (title?: string) =>
-      `export type ${pascal(operationName)}Result = AsyncReturnType<${
-        title
-          ? `ReturnType<typeof ${title}>['${operationName}']`
-          : `typeof ${operationName}`
+    () =>
+      `export type ${pascal(operationName)}Result = AxiosResponse<${
+        response.definition.success || 'unknown'
       }>`,
   );
 
@@ -179,6 +177,7 @@ export const generateAxiosFooter: ClientFooterBuilder = ({
   operationNames,
   title,
   noFunction,
+  hasMutator,
 }) => {
   const functionFooter = `return {${operationNames.join(',')}}};\n`;
   const returnTypesArr = operationNames
@@ -188,14 +187,18 @@ export const generateAxiosFooter: ClientFooterBuilder = ({
         : '';
     })
     .filter(Boolean);
-  const returnTypes = returnTypesArr.length
+  let returnTypes = hasMutator
     ? `\n// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AsyncReturnType<
 T extends (...args: any) => Promise<any>
 > = T extends (...args: any) => Promise<infer R> ? R : any;
-\n${returnTypesArr.join('\n')}`
+\n`
     : '';
 
+  if (returnTypesArr.length) {
+    returnTypes += returnTypesArr.join('\n');
+  }
+
   return noFunction ? returnTypes : functionFooter + returnTypes;
 };
 

src/core/generators/client.ts

@@ -182,11 +182,13 @@ export const generateClientFooter = ({
   operationNames,
   title,
   customTitleFunc,
+  hasMutator,
 }: {
   outputClient: OutputClient | OutputClientFunc;
   operationNames: string[];
   title: string;
   customTitleFunc?: (title: string) => string;
+  hasMutator: boolean;
 }): GeneratorClientExtra => {
   const titles = generateClientTitle(outputClient, title, customTitleFunc);
   const { footer } = getGeneratorClient(outputClient);
@@ -201,10 +203,10 @@ export const generateClientFooter = ({
         '[WARN] Passing an array of strings for operations names to the footer function is deprecated and will be removed in a future major release. Please pass them in an object instead: { operationNames: string[] }.',
       );
     } else {
-      implementation = footer({ operationNames, title: titles.implementation });
+      implementation = footer({ operationNames, title: titles.implementation, hasMutator });
     }
   } catch (e) {
-    implementation = footer({ operationNames, title: titles.implementation });
+    implementation = footer({ operationNames, title: titles.implementation, hasMutator });
   }
 
   return {

src/core/writers/target.ts

@@ -63,6 +63,7 @@ export const generateTarget = (
           operationNames,
           title: pascal(info.title),
           customTitleFunc: options.override.title,
+          hasMutator: !!acc.mutators.length,
         });
         acc.implementation += footer.implementation;
         acc.implementationMSW.handler += footer.implementationMSW;

src/core/writers/targetTags.ts

@@ -96,7 +96,9 @@ export const generateTargetForTags = (
             operationNames,
             title: pascal(tag),
             customTitleFunc: options.override.title,
+            hasMutator: !!target.mutators?.length,
           });
+
           const header = generateClientHeader({
             outputClient: options.client,
             isRequestOptions: options.override.requestOptions !== false,

src/types/generator.ts

@@ -129,7 +129,7 @@ export type GeneratorMutator = {
   hasSecondArg: boolean;
   hasThirdArg: boolean;
   isHook: boolean;
-  bodyTypeName?: string
+  bodyTypeName?: string;
 };
 
 export type ClientBuilder = (
@@ -148,13 +148,12 @@ export type ClientHeaderBuilder = (params: {
   provideIn: boolean | 'root' | 'any';
 }) => string;
 
-export type ClientFooterBuilder = (
-  params: {
-    noFunction?: boolean | undefined;
-    operationNames: string[];
-    title?: string;
-  },
-) => string;
+export type ClientFooterBuilder = (params: {
+  noFunction?: boolean | undefined;
+  operationNames: string[];
+  title?: string;
+  hasMutator: boolean;
+}) => string;
 
 export type ClientTitleBuilder = (title: string) => string;