Merge pull request #11 from HUxiaoAlinNG/master

feat: 完善additionalProperties处理，补充测试用例

Author: wangweianger

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

@@ -6,8 +6,10 @@ Object {
   "definitions": Object {},
   "properties": Object {
     "value1": Object {
+      "additionalProperties": false,
       "properties": Object {
         "value2": Object {
+          "additionalProperties": false,
           "properties": Object {
             "value3": Object {
               "type": "string",

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

@@ -252,6 +252,7 @@ Object {
       ],
     },
     "other6": Object {
+      "additionalProperties": false,
       "properties": Object {
         "some": Object {
           "type": "string",
@@ -267,6 +268,7 @@ Object {
       "type": "object",
     },
     "other8": Object {
+      "additionalProperties": false,
       "properties": Object {
         "a": Object {
           "$ref": "#/definitions/Param.C.D.E.F.GetBaseDetailResponse",

src/__tests__/other.test.ts

@@ -68,4 +68,17 @@ test('获取注释_1', () => {
 
 test('Promise_1', () => {
   expect(getSchema('Other_6')).toMatchSnapshot();
-});
+});
+
+test('测试方法边界情况_genJsonschema', () => {
+  const resultGenJsonschema = genTypeSchema.genJsonschema({}, {});
+  expect(resultGenJsonschema).toMatchObject({});
+});
+
+test('测试方法边界情况_getJsonSchema', () => {
+  const resultGetJsonSchemaTest1 = genTypeSchema.getJsonSchema('test', 'test');
+  expect(resultGetJsonSchemaTest1).toMatchObject({});
+
+  const resultGetJsonSchema = genTypeSchema.getJsonSchema('', 'test')
+  expect(resultGetJsonSchema).toMatchObject({});
+});

src/get-jsonschema-from-data.ts

@@ -97,7 +97,7 @@ export default class genTypeSchema extends typescriptToFileDatas {
   genJsonschema(
     fileJson: AnyOption,
     typeJson: AnyOption,
-    entry: { keySet: Set<string>; refKeyTime: Record<string, number> },
+    entry?: { keySet: Set<string>; refKeyTime: Record<string, number> },
     file?: string,
   ): null | AnyOption {
     if (!entry) {
@@ -311,7 +311,6 @@ export default class genTypeSchema extends typescriptToFileDatas {
 
       // 兼容import外部引入与内部引用两种方式
       let $refJson = fileJson[firstKey] || fileJson[$refKey] || {};
-      // 魔法操作，消灭一直循环引用问题
       if ((entry as any).keySet.has($refKey)) {
         (entry as any).refKeyTime[$refKey] = ((entry as any).refKeyTime[$refKey] || 0) + 1;
         return;
@@ -568,6 +567,7 @@ export default class genTypeSchema extends typescriptToFileDatas {
       } else if (item.properties) {
         const res = this.genJsonschema(fileJson, item, entry, file) as AnyOption;
         Object.assign(item, res);
+        item.additionalProperties = item.additionalProperties || false;
         if (item.definitions) {
           typeJson.definitions = { ...typeJson.definitions, ...item.definitions };
           delete item.definitions;