feat(src/utils): 修改当 yapi 下发的字段名称中含有空格时出现的字段多余空格问题 (#28)

fjc0k · May 12, 2020 · 23e3e35 · 23e3e35
1 parent 71ff882
commit 23e3e35
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 3 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -140,15 +140,15 @@ export function propDefinitionsToJsonSchema(propDefinitions: PropDefinitions): J
     required: propDefinitions.reduce<string[]>(
       (res, prop) => {
         if (prop.required) {
-          res.push(prop.name)
+          res.push(prop.name.trim())
         }
         return res
       },
       [],
     ),
     properties: propDefinitions.reduce<Exclude<JSONSchema4['properties'], undefined>>(
       (res, prop) => {
-        res[prop.name] = {
+        res[prop.name.trim()] = {
           type: prop.type,
           description: prop.comment,
           ...(prop.type === 'file' as any ? {tsType: FileData.name} : {}),

diff --git a/tests/__mocks__/request-promise-native.ts b/tests/__mocks__/request-promise-native.ts
@@ -70,7 +70,13 @@ const mockData: Record<string, any> = {
           path: '/getMethod',
           project_id: 27,
           res_body_type: 'json',
-          req_body_form: [],
+          req_body_form: [{
+            required: '0',
+            _id: '5cbdd1c293bc6574a2de33dd',
+            name: '   trim       ',
+            example: '2',
+            desc: '测试 trim 的值',
+          }],
           req_params: [],
           req_headers: [],
           req_query: [
@@ -88,6 +94,13 @@ const mockData: Record<string, any> = {
               example: '2',
               desc: 'Y 值',
             },
+            {
+              required: '0',
+              _id: '5cbdd1c293bc6574a2de33dc',
+              name: '   trim       ',
+              example: '2',
+              desc: '测试 trim 的值',
+            },
           ],
           markdown: '',
           desc: '',

diff --git a/tests/__snapshots__/Generator.test.ts.snap b/tests/__snapshots__/Generator.test.ts.snap
@@ -46,6 +46,10 @@ export interface GetMethodTestTestTestTestRequest {
    * Y 值
    */
   y?: string
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string
 }
 
 /**
@@ -414,6 +418,10 @@ export interface GetMethodTestTestTestTestRequest {
    * Y 值
    */
   y?: string;
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string;
 }
 
 /**
@@ -884,6 +892,10 @@ export interface GetMethodTestTestTestRequest {
    * Y 值
    */
   y?: string
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string
 }
 
 /**
@@ -2087,6 +2099,10 @@ export interface GetMethodTestTestTestRequest {
    * Y 值
    */
   y?: string;
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string;
 }
 
 /**
@@ -3244,6 +3260,10 @@ export interface GetMethodTestRequest {
    * Y 值
    */
   y?: string
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string
 }
 
 /**
@@ -4229,6 +4249,10 @@ export interface GetMethodTestRequest {
    * Y 值
    */
   y?: string;
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string;
 }
 
 /**
@@ -5243,6 +5267,10 @@ export interface GetMethodTestTestRequest {
    * Y 值
    */
   y?: string
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string
 }
 
 /**
@@ -6306,6 +6334,10 @@ export interface GetMethodTestTestRequest {
    * Y 值
    */
   y?: string;
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string;
 }
 
 /**
@@ -7840,6 +7872,10 @@ export interface GetMethodTestTestTestTestTestRequest {
    * Y 值
    */
   y?: string
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string
 }
 
 /**
@@ -9084,6 +9120,10 @@ export interface GetMethodTestTestTestTestTestRequest {
    * Y 值
    */
   y?: string;
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string;
 }
 
 /**

diff --git a/tests/__snapshots__/cli.test.ts.snap b/tests/__snapshots__/cli.test.ts.snap
@@ -261,6 +261,10 @@ export interface GetMethodRequest {
    * Y 值
    */
   y?: string
+  /**
+   * 测试 trim 的值
+   */
+  trim?: string
 }
 
 /**