Merge pull request bcherny#191 from sokra/bugfix/optimize-custom-type

fix bug when optimizing custom types

Author: bcherny

src/generator.ts

@@ -158,7 +158,7 @@ function generateType(ast: AST, options: Options): string {
       + ast.params.map(_ => generateType(_, options)).join(', ')
       + ']'
     case 'UNION': return generateSetOperation(ast, options)
-    case 'CUSTOM_TYPE': return ast.param
+    case 'CUSTOM_TYPE': return ast.params
   }
 }
 

src/parser.ts

@@ -104,7 +104,7 @@ function parseNonLiteral(
       return set({
         comment: schema.description,
         keyName,
-        param: schema.tsType!,
+        params: schema.tsType!,
         standaloneName: standaloneName(schema, keyNameFromDefinition, usedNames),
         type: 'CUSTOM_TYPE'
       })

src/types/AST.ts

@@ -115,7 +115,7 @@ export interface TUnion extends AbstractAST {
 
 export interface TCustomType extends AbstractAST {
   type: 'CUSTOM_TYPE'
-  param: string
+  params: string
 }
 
 ////////////////////////////////////////////     literals

test/__snapshots__/test/test.js.md

@@ -937,6 +937,7 @@ Generated by [AVA](https://ava.li).
     export interface OptimizableSchema {␊
       bar: string | number;␊
       foo: any;␊
+      fooBar: A | B;␊
       [k: string]: any;␊
     }␊
     `

test/__snapshots__/test/test.js.snap

@@ -14,9 +14,18 @@ export const input = {
         { type: 'any' },
         { type: 'integer' }
       ]
+    },
+    fooBar: {
+      anyOf: [
+        { tsType: 'A' },
+        { tsType: 'A' },
+        { tsType: 'B' },
+        { tsType: 'A' },
+        { tsType: 'B' }
+      ]
     }
   },
-  required: ['bar', 'foo'],
+  required: ['bar', 'foo', 'fooBar'],
   title: 'Optimizable Schema',
   type: 'object'
 }