Some fixes / improvements

Author: k.golikov

src/pages/jsonToTypeScriptPage/utils/getAllTypeScriptTypeDeclarations.ts

@@ -4,7 +4,13 @@ import getTypeScriptTypeDeclaration from './getTypeScriptTypeDeclaration';
 import ExportType from '../types/ExportType';
 
 const getAllTypeScriptTypeDeclarations = (type: TypeScriptType, name: string, exportType?: ExportType) => {
-    return getAllTypeScriptTypeDeclarableTypes(type)
+    const declarableTypes = getAllTypeScriptTypeDeclarableTypes(type);
+
+    if (declarableTypes.length === 0) {
+        return getTypeScriptTypeDeclaration(type, name, exportType);
+    }
+
+    return declarableTypes
         .map((declarable) => getTypeScriptTypeDeclaration(declarable as TypeScriptType, name, exportType))
         .join('\n\n');
 };

src/pages/jsonToTypeScriptPage/utils/getTypeScriptTypeDeclaration.ts

@@ -1,17 +1,14 @@
 import { TypeScriptType } from '../types/typescript';
-import { isString } from 'lodash';
+import { isObject } from 'lodash';
 import ExportType from '../types/ExportType';
+import getTypeScriptTypeReference from './getTypeScriptTypeReference';
 
 const getTypeScriptTypeDeclaration = (type: TypeScriptType, name: string, exportType?: ExportType): string => {
-    if (isString(type)) {
-        return `type ${name} = ${type};`;
-    }
-
-    if ('stringifyDeclaration' in type) {
+    if (isObject(type) && 'stringifyDeclaration' in type) {
         return type.stringifyDeclaration(exportType);
     }
 
-    return '';
+    return `type ${name} = ${getTypeScriptTypeReference(type)};`;
 };
 
 export default getTypeScriptTypeDeclaration;