fix: 修正请求参数键名错误的问题

FrontEndDev-org · Jul 22, 2024 · 31ebf30 · 31ebf30
1 parent 10110d4
commit 31ebf30
Show file tree

Hide file tree

Showing 9 changed files with 329 additions and 274 deletions.
diff --git a/src/printer/Args.ts b/src/printer/Args.ts
@@ -1,6 +1,5 @@
 import type { ArgItem } from './Arg';
 import { requiredTypeStringify } from './helpers';
-import { Named } from './Named';
 
 export class Args {
     fixedArgs: ArgItem[];
@@ -45,7 +44,7 @@ export class Args {
 
                 if (kind === 'config') return `...${uniqueName}`;
 
-                const propVal = arg.structured ? `{${originName}:${uniqueName}}` : uniqueName;
+                const value = arg.structured ? (originName === uniqueName ? `{${originName}}` : `{${originName}: ${uniqueName}}`) : uniqueName;
 
                 if (kind === 'path') {
                     const args = [
@@ -54,12 +53,12 @@ export class Args {
                         JSON.stringify(url),
                     ];
 
-                    if (type !== '') args.push(propVal);
+                    if (type !== '') args.push(value);
 
-                    return `url:resolveURL(${args.join(',')})`;
+                    return `url: resolveURL(${args.join(',')})`;
                 }
 
-                return `${originName}:${propVal}`;
+                return kind === value ? kind : `${kind}: ${value}`;
             })
             .join(',\n');
     }

diff --git a/src/printer/index.ts b/src/printer/index.ts
@@ -270,12 +270,12 @@ export class Printer {
         const { axiosRequestConfigTypeName = AXIOS_QUEST_CONFIG_TYPE_NAME } = this.options || {};
 
         return `${jsDoc.print()}
-        export async function ${funcName}(${requestArgs.toArgs(axiosRequestConfigTypeName)}): AxiosPromise<${respType}> {
-            return axios({
-                method: ${JSON.stringify(method)},
-                ${requestArgs.toValues(url)}
-            });
-        }`;
+export async function ${funcName}(${requestArgs.toArgs(axiosRequestConfigTypeName)}): AxiosPromise<${respType}> {
+    return axios({
+        method: ${JSON.stringify(method)},
+        ${requestArgs.toValues(url)}
+    });
+}`;
     }
 
     private _parseContents(