JSON-To-TypeScript: fix bugs

Author: k.golikov

src/pages/jsonToTypeScriptPage/utils/getAllTypeScriptTypeDeclarations.ts

@@ -8,7 +8,7 @@ const renameConflictingType = (
 ): void => {
     const match = /^(.*?)(\d+)$/.exec(type.name);
     if (!match) {
-        type.name += '1';
+        type.name += '2';
     } else {
         const [, left, numericPart] = match;
         const numeric = Number(numericPart);

src/pages/jsonToTypeScriptPage/utils/getTypeScriptUnion.ts

@@ -1,4 +1,5 @@
 import { TypeScriptType, TypeScriptUnion, TypeScriptUnknown } from '../types/typescript';
+import { remove } from 'lodash';
 
 const getTypeScriptUnion = (name: string, types: TypeScriptType[]): TypeScriptType => {
     if (types.length === 0) {
@@ -8,6 +9,7 @@ const getTypeScriptUnion = (name: string, types: TypeScriptType[]): TypeScriptTy
         return types[0];
     }
 
+    remove(types, (type) => type instanceof TypeScriptUnknown);
     return new TypeScriptUnion(name, types);
 };
 

src/pages/jsonToTypeScriptPage/utils/mergeTypeScriptTypes.ts

@@ -1,6 +1,13 @@
 import { chain, isString } from 'lodash';
-import { TypeScriptInterface, TypeScriptObjectField, TypeScriptType, TypeScriptUnion } from '../types/typescript';
+import {
+    TypeScriptArray,
+    TypeScriptInterface,
+    TypeScriptObjectField,
+    TypeScriptType,
+    TypeScriptUnion
+} from '../types/typescript';
 import mergeTypeScriptTypesList from './mergeTypeScriptTypesList';
+import getTypeScriptUnion from './getTypeScriptUnion';
 
 const mergeTypeScriptTypes = (a: TypeScriptType, b: TypeScriptType): TypeScriptType[] => {
     const singleType = [a];
@@ -63,6 +70,11 @@ const mergeTypeScriptTypes = (a: TypeScriptType, b: TypeScriptType): TypeScriptT
         return [new TypeScriptInterface(a.name, mergedFields)];
     }
 
+    if (a instanceof TypeScriptArray && b instanceof TypeScriptArray) {
+        const mergedTypes = mergeTypeScriptTypes(a.type, b.type);
+        return [new TypeScriptArray(getTypeScriptUnion('', mergedTypes))];
+    }
+
     if (a instanceof TypeScriptUnion || b instanceof TypeScriptUnion) {
         const aTypes = a instanceof TypeScriptUnion ? a.types : [a];
         const bTypes = b instanceof TypeScriptUnion ? b.types : [b];