feat: 增加Partial、Required对联合类型的处理

Author: HUxiaoAlinNG

jest/toolfn.ts

@@ -102,4 +102,8 @@ type ToolFn_21 = Required<CCC>;
 
 type ToolFn_22 = Required<DDD>;
 
-type ToolFn_23 = Required<{ a?: string, b?: DDD }>;
+type ToolFn_23 = Required<{ a?: string, b?: DDD }>;
+
+type ToolFn_24 = Partial<BBB | AAA>;
+
+type ToolFn_25 = Required<DDD | CCC>;

src/__tests__/__snapshots__/toolfn.test.ts.snap

@@ -179,6 +179,65 @@ Object {
 }
 `;
 
+exports[`工具函数Partial_联合类型_1 1`] = `
+Object {
+  "anyOf": Array [
+    Object {
+      "additionalProperties": false,
+      "definitions": Object {
+        "AAA": Object {
+          "additionalProperties": false,
+          "properties": Object {
+            "a": Object {
+              "type": "number",
+            },
+            "b": Object {
+              "type": "string",
+            },
+            "c": Object {
+              "type": "boolean",
+            },
+          },
+          "required": Array [
+            "a",
+            "b",
+            "c",
+          ],
+          "type": "object",
+        },
+      },
+      "properties": Object {
+        "a": Object {
+          "type": "number",
+        },
+        "b": Object {
+          "type": "string",
+        },
+        "c": Object {
+          "$ref": "#/definitions/AAA",
+        },
+      },
+      "type": "object",
+    },
+    Object {
+      "additionalProperties": false,
+      "properties": Object {
+        "a": Object {
+          "type": "number",
+        },
+        "b": Object {
+          "type": "string",
+        },
+        "c": Object {
+          "type": "boolean",
+        },
+      },
+      "type": "object",
+    },
+  ],
+}
+`;
+
 exports[`工具函数Pick_1 1`] = `
 Object {
   "properties": Object {
@@ -406,3 +465,67 @@ Object {
   "type": "object",
 }
 `;
+
+exports[`工具函数Required_联合类型_1 1`] = `
+Object {
+  "anyOf": Array [
+    Object {
+      "additionalProperties": false,
+      "definitions": Object {
+        "CCC": Object {
+          "additionalProperties": false,
+          "properties": Object {
+            "a": Object {
+              "type": "number",
+            },
+            "b": Object {
+              "type": "string",
+            },
+            "c": Object {
+              "type": "boolean",
+            },
+          },
+          "type": "object",
+        },
+      },
+      "properties": Object {
+        "a": Object {
+          "type": "number",
+        },
+        "b": Object {
+          "type": "string",
+        },
+        "c": Object {
+          "$ref": "#/definitions/CCC",
+        },
+      },
+      "required": Array [
+        "a",
+        "b",
+        "c",
+      ],
+      "type": "object",
+    },
+    Object {
+      "additionalProperties": false,
+      "properties": Object {
+        "a": Object {
+          "type": "number",
+        },
+        "b": Object {
+          "type": "string",
+        },
+        "c": Object {
+          "type": "boolean",
+        },
+      },
+      "required": Array [
+        "a",
+        "b",
+        "c",
+      ],
+      "type": "object",
+    },
+  ],
+}
+`;

src/__tests__/toolfn.test.ts

@@ -103,6 +103,10 @@ test('工具函数Partial_3', () => {
   expect(getSchema('ToolFn_20')).toMatchSnapshot();
 });
 
+test('工具函数Partial_联合类型_1', () => {
+  expect(getSchema('ToolFn_24')).toMatchSnapshot();
+});
+
 test('工具函数Required_1', () => {
   expect(getSchema('ToolFn_21')).toMatchSnapshot();
 });
@@ -113,4 +117,8 @@ test('工具函数Required_2', () => {
 
 test('工具函数Required_3', () => {
   expect(getSchema('ToolFn_23')).toMatchSnapshot();
-});
+});
+
+test('工具函数Required_联合类型_1', () => {
+  expect(getSchema('ToolFn_25')).toMatchSnapshot();
+})

src/get-jsonschema-from-data.ts

@@ -314,7 +314,7 @@ export default class genTypeSchema extends typescriptToFileDatas {
       $refJson = _.cloneDeep($refJson)
       if ((entry as any).keySet.has($refKey)) {
         (entry as any).refKeyTime[$refKey] = ((entry as any).refKeyTime[$refKey] || 0) + 1;
-        return;
+        return $refJson;
       }
 
       (entry as any).keySet.add($refKey);
@@ -472,9 +472,18 @@ export default class genTypeSchema extends typescriptToFileDatas {
         resType = _.cloneDeep(this.genJsonschema(fileJson, type, entry, file) as AnyOption);
       } else if (type.$ref) {
         resType = _.cloneDeep(attrCommonHandle(type, false) as AnyOption);
+      } else if (type.anyOf) {
+        resType = { anyOf: [] };
+        resType.anyOf = type.anyOf.map((item: AnyOption) => {
+          return PartialRequiredHandle(key, item);
+        })
       }
 
-      if (resType) {
+      if (resType && Object.keys(resType).length) {
+        if (resType.anyOf) {
+          return resType;
+        }
+
         if (key === 'Partial') {
           delete resType.required;
           return resType;