feat: 增加Pick/Omit对type的支持

Author: HUxiaoAlinNG

jest/toolfn.ts

@@ -66,3 +66,8 @@ type ToolFn_15 = Record<Page, string>;
 // interface ToolFn_18 {
 //   name: Record<Page, PageInfo>
 // }
+
+type Filter = 'a' | 'b';
+type ToolFn_16 = Pick<AAA, Filter>;
+
+type ToolFn_17 = Omit<AAA, Filter>;

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

@@ -51,6 +51,21 @@ Object {
 }
 `;
 
+exports[`工具函数Omit_4 1`] = `
+Object {
+  "additionalProperties": false,
+  "properties": Object {
+    "c": Object {
+      "type": "boolean",
+    },
+  },
+  "required": Array [
+    "c",
+  ],
+  "type": "object",
+}
+`;
+
 exports[`工具函数Pick_1 1`] = `
 Object {
   "properties": Object {
@@ -80,6 +95,25 @@ Object {
 }
 `;
 
+exports[`工具函数Pick_3 1`] = `
+Object {
+  "additionalProperties": false,
+  "properties": Object {
+    "a": Object {
+      "type": "number",
+    },
+    "b": Object {
+      "type": "string",
+    },
+  },
+  "required": Array [
+    "a",
+    "b",
+  ],
+  "type": "object",
+}
+`;
+
 exports[`工具函数Record_1 1`] = `
 Object {
   "additionalProperties": false,

src/__tests__/toolfn.test.ts

@@ -22,6 +22,10 @@ test('工具函数Omit_3', () => {
   expect(getSchema('ToolFn_3')).toMatchSnapshot();
 });
 
+test('工具函数Omit_4', () => {
+  expect(getSchema('ToolFn_17')).toMatchSnapshot();
+});
+
 // test('工具函数Omit_4', () => {
 //   expect(getSchema('ToolFn_4')).toMatchSnapshot();
 // });
@@ -50,6 +54,10 @@ test('工具函数Pick_2', () => {
   expect(getSchema('ToolFn_10')).toMatchSnapshot();
 });
 
+test('工具函数Pick_3', () => {
+  expect(getSchema('ToolFn_16')).toMatchSnapshot();
+});
+
 // test('工具函数Pick_3', () => {
 //   expect(getSchema('ToolFn_11')).toMatchSnapshot();
 // });

src/get-jsonschema-from-data.ts

@@ -449,6 +449,9 @@ export default class genTypeSchema extends typescriptToFileDatas {
       if (!extra) return resType;
 
       if (resType) {
+        if (extra && extra.$ref) {
+          extra = _.cloneDeep(attrCommonHandle(extra, false) as AnyOption);
+        }
         const extraKeys = extra.enum || [];
         if (key === 'Omit') {
           const res = deleteJsonSchemaKeys(resType, extraKeys);