feat(ytt.config.ts): 令 getRequestDataTypeName 和 getResponseDataTypeNa…

…me 可选
fjc0k · Apr 18, 2019 · be83d17 · be83d17
1 parent cecab49
commit be83d17
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/src/Generator.ts b/src/Generator.ts
@@ -57,9 +57,9 @@ export class Generator {
                     const categoryUID = `_${serverIndex}_${projectIndex}_${categoryIndex}`
                     const categoryCode = [
                       [
-                        `const mockUrl${categoryUID} = ${JSON.stringify(syntheticalConfig.mockUrl)}`,
-                        `const prodUrl${categoryUID} = ${JSON.stringify(syntheticalConfig.prodUrl)}`,
-                        `const dataKey${categoryUID} = ${JSON.stringify(syntheticalConfig.dataKey)}`,
+                        `const mockUrl${categoryUID} = ${JSON.stringify(syntheticalConfig.mockUrl)} as any`,
+                        `const prodUrl${categoryUID} = ${JSON.stringify(syntheticalConfig.prodUrl)} as any`,
+                        `const dataKey${categoryUID} = ${JSON.stringify(syntheticalConfig.dataKey)} as any`,
                       ].join('\n'),
                       ...(await Promise.all(
                         interfaceList.map(
@@ -335,12 +335,22 @@ export class Generator {
       ...interfaceInfo,
       parsedPath: path.parse(interfaceInfo.path),
     }
-    const requestDataTypeName = changeCase.pascalCase(
-      await syntheticalConfig.getRequestDataTypeName!(extendedInterfaceInfo, changeCase),
-    )
-    const responseDataTypeName = changeCase.pascalCase(
-      await syntheticalConfig.getResponseDataTypeName!(extendedInterfaceInfo, changeCase),
+    const requestFunctionName = await syntheticalConfig.getRequestFunctionName!(
+      extendedInterfaceInfo,
+      changeCase,
     )
+    const requestDataTypeName = isFunction(syntheticalConfig.getRequestDataTypeName)
+      ? await syntheticalConfig.getRequestDataTypeName(
+        extendedInterfaceInfo,
+        changeCase,
+      )
+      : changeCase.pascalCase(`${requestFunctionName}Request`)
+    const responseDataTypeName = isFunction(syntheticalConfig.getResponseDataTypeName)
+      ? await syntheticalConfig.getResponseDataTypeName(
+        extendedInterfaceInfo,
+        changeCase,
+      )
+      : changeCase.pascalCase(`${requestFunctionName}Response`)
     const requestDataType = await Generator.generateRequestDataType({
       interfaceInfo: interfaceInfo,
       typeName: requestDataTypeName,
@@ -350,7 +360,6 @@ export class Generator {
       typeName: responseDataTypeName,
       dataKey: syntheticalConfig.dataKey,
     })
-    const requestFunctionName = await syntheticalConfig.getRequestFunctionName!(extendedInterfaceInfo, changeCase)
     const isRequestDataRequired = /(\{\}|any)$/s.test(requestDataType)
     return [
       `\n/**\n * 接口 **${interfaceInfo.title}** 的 **请求类型**\n */`,

diff --git a/src/types.ts b/src/types.ts
@@ -315,15 +315,15 @@ export interface ServerConfig {
            * @param changeCase 常用的大小写转换函数集合对象
            * @returns 请求数据类型的名称
            */
-          getRequestDataTypeName(interfaceInfo: ExtendedInterface, changeCase: ChangeCase): string,
+          getRequestDataTypeName?(interfaceInfo: ExtendedInterface, changeCase: ChangeCase): string,
           /**
            * 获取响应数据类型的名称。
            *
            * @param interfaceInfo 接口信息
            * @param changeCase 常用的大小写转换函数集合对象
            * @returns 响应数据类型的名称
            */
-          getResponseDataTypeName(interfaceInfo: ExtendedInterface, changeCase: ChangeCase): string,
+          getResponseDataTypeName?(interfaceInfo: ExtendedInterface, changeCase: ChangeCase): string,
         }
       >,
     }

diff --git a/tests/__snapshots__/Generator.test.ts.snap b/tests/__snapshots__/Generator.test.ts.snap
@@ -2,9 +2,9 @@
 
 exports[`Generator 正确生成代码并写入文件 1`] = `
 Array [
-  "const mockUrl_0_0_0 = \\"http://foo.bar/mock/32\\"
-const prodUrl_0_0_0 = \\"http://prod.com/\\"
-const dataKey_0_0_0 = undefined
+  "const mockUrl_0_0_0 = \\"http://foo.bar/mock/32\\" as any
+const prodUrl_0_0_0 = \\"http://prod.com/\\" as any
+const dataKey_0_0_0 = undefined as any
 
 
 /**
@@ -329,9 +329,9 @@ import request from \\"./request\\"
 // @ts-ignore
 import { Method, RequestBodyType, ResponseBodyType, RequestConfig, FileData, parseRequestData } from 'yapi-to-typescript'
 
-const mockUrl_0_0_0 = \\"http://foo.bar/mock/32\\"
-const prodUrl_0_0_0 = \\"http://prod.com/\\"
-const dataKey_0_0_0 = undefined
+const mockUrl_0_0_0 = \\"http://foo.bar/mock/32\\" as any
+const prodUrl_0_0_0 = \\"http://prod.com/\\" as any
+const dataKey_0_0_0 = undefined as any
 
 
 /**