Union types may be considered as reffedTypes (#482)

Author: NPellet

typescript-json-schema.ts

@@ -7,7 +7,6 @@ import { JSONSchema7 } from "json-schema";
 import { pathEqual } from "path-equal";
 export { Program, CompilerOptions, Symbol } from "typescript";
 
-
 const vm = require("vm");
 
 const REGEX_FILE_NAME_OR_SPACE = /(\bimport\(".*?"\)|".*?")\.| /g;
@@ -512,7 +511,6 @@ export class JsonSchemaGenerator {
         this.inheritingTypes = inheritingTypes;
         this.tc = tc;
         this.userValidationKeywords = args.validationKeywords.reduce((acc, word) => ({ ...acc, [word]: true }), {});
-
     }
 
     public get ReffedDefinitions(): { [key: string]: Definition } {
@@ -528,14 +526,14 @@ export class JsonSchemaGenerator {
     }
 
     private resetSchemaSpecificProperties() {
-      this.reffedDefinitions = {};
-      this.typeIdsByName = {};
-      this.typeNamesById = {};
-
-      // restore schema overrides
-      this.schemaOverrides.forEach((value, key) => {
-        this.reffedDefinitions[key] = value;
-      });
+        this.reffedDefinitions = {};
+        this.typeIdsByName = {};
+        this.typeNamesById = {};
+
+        // restore schema overrides
+        this.schemaOverrides.forEach((value, key) => {
+            this.reffedDefinitions[key] = value;
+        });
     }
 
     /**
@@ -564,7 +562,7 @@ export class JsonSchemaGenerator {
         jsdocs.forEach((doc) => {
             // if we have @TJS-... annotations, we have to parse them
             let name = doc.name;
-            const originalText = doc.text ? doc.text.map(t => t.text).join("") : "";
+            const originalText = doc.text ? doc.text.map((t) => t.text).join("") : "";
             let text = originalText;
             // In TypeScript versions prior to 3.7, it stops parsing the annotation
             // at the first non-alphanumeric character and puts the rest of the line as the
@@ -643,7 +641,6 @@ export class JsonSchemaGenerator {
                 fixedTypes.splice(fixedTypes.length - 1, 1);
             } else {
                 definition.maxItems = targetTupleType.fixedLength;
-
             }
         } else {
             const propertyTypeString = this.tc.typeToString(
@@ -876,7 +873,8 @@ export class JsonSchemaGenerator {
             if (value !== undefined) {
                 pushEnumValue(value);
             } else {
-                const def = this.getTypeDefinition(valueType);
+                const symbol = valueType.aliasSymbol;
+                const def = this.getTypeDefinition(valueType, undefined, undefined, symbol, symbol);
                 if (def.type === "undefined") {
                     if (prop) {
                         (<any>prop).mayBeUndefined = true;
@@ -994,7 +992,6 @@ export class JsonSchemaGenerator {
         return definition;
     }
 
-
     private getClassDefinition(clazzType: ts.Type, definition: Definition): Definition {
         const node = clazzType.getSymbol()!.getDeclarations()![0];
 
@@ -1476,7 +1473,7 @@ export class JsonSchemaGenerator {
             if (onlyIncludeFiles === undefined) {
                 return !file.isDeclarationFile;
             }
-            return onlyIncludeFiles.filter(f => pathEqual(f,file.fileName)).length > 0;
+            return onlyIncludeFiles.filter((f) => pathEqual(f, file.fileName)).length > 0;
         }
         const files = program.getSourceFiles().filter(includeFile);
         if (files.length) {
@@ -1697,7 +1694,7 @@ export async function exec(filePattern: string, fullTypeName: string, args = get
         onlyIncludeFiles = glob.sync(filePattern);
         program = getProgramFromFiles(onlyIncludeFiles, {
             strictNullChecks: args.strictNullChecks,
-            esModuleInterop: args.esModuleInterop
+            esModuleInterop: args.esModuleInterop,
         });
         onlyIncludeFiles = onlyIncludeFiles.map(normalizeFileName);
     }