Conditional type support

factory/formatter.ts

@@ -12,6 +12,7 @@ import { EnumTypeFormatter } from "../src/TypeFormatter/EnumTypeFormatter";
 import { IntersectionTypeFormatter } from "../src/TypeFormatter/IntersectionTypeFormatter";
 import { LiteralTypeFormatter } from "../src/TypeFormatter/LiteralTypeFormatter";
 import { LiteralUnionTypeFormatter } from "../src/TypeFormatter/LiteralUnionTypeFormatter";
+import { NeverTypeFormatter } from "../src/TypeFormatter/NeverTypeFormatter";
 import { NullTypeFormatter } from "../src/TypeFormatter/NullTypeFormatter";
 import { NumberTypeFormatter } from "../src/TypeFormatter/NumberTypeFormatter";
 import { ObjectTypeFormatter } from "../src/TypeFormatter/ObjectTypeFormatter";
@@ -23,6 +24,7 @@ import { StringTypeFormatter } from "../src/TypeFormatter/StringTypeFormatter";
 import { TupleTypeFormatter } from "../src/TypeFormatter/TupleTypeFormatter";
 import { UndefinedTypeFormatter } from "../src/TypeFormatter/UndefinedTypeFormatter";
 import { UnionTypeFormatter } from "../src/TypeFormatter/UnionTypeFormatter";
+import { UnknownTypeFormatter } from "../src/TypeFormatter/UnknownTypeFormatter";
 
 
 
@@ -39,7 +41,9 @@ export function createFormatter(config: Config): TypeFormatter {
         .addTypeFormatter(new NullTypeFormatter())
 
         .addTypeFormatter(new AnyTypeFormatter())
+        .addTypeFormatter(new NeverTypeFormatter())
         .addTypeFormatter(new UndefinedTypeFormatter())
+        .addTypeFormatter(new UnknownTypeFormatter())
 
         .addTypeFormatter(new LiteralTypeFormatter())
         .addTypeFormatter(new EnumTypeFormatter())

factory/parser.ts

@@ -12,13 +12,15 @@ import { ArrayNodeParser } from "../src/NodeParser/ArrayNodeParser";
 import { BooleanLiteralNodeParser } from "../src/NodeParser/BooleanLiteralNodeParser";
 import { BooleanTypeNodeParser } from "../src/NodeParser/BooleanTypeNodeParser";
 import { CallExpressionParser } from "../src/NodeParser/CallExpressionParser";
+import { ConditionalTypeNodeParser } from "../src/NodeParser/ConditionalTypeNodeParser";
 import { EnumNodeParser } from "../src/NodeParser/EnumNodeParser";
 import { ExpressionWithTypeArgumentsNodeParser } from "../src/NodeParser/ExpressionWithTypeArgumentsNodeParser";
 import { IndexedAccessTypeNodeParser } from "../src/NodeParser/IndexedAccessTypeNodeParser";
 import { InterfaceAndClassNodeParser } from "../src/NodeParser/InterfaceAndClassNodeParser";
 import { IntersectionNodeParser } from "../src/NodeParser/IntersectionNodeParser";
 import { LiteralNodeParser } from "../src/NodeParser/LiteralNodeParser";
 import { MappedTypeNodeParser } from "../src/NodeParser/MappedTypeNodeParser";
+import { NeverTypeNodeParser } from "../src/NodeParser/NeverTypeNodeParser";
 import { NullLiteralNodeParser } from "../src/NodeParser/NullLiteralNodeParser";
 import { NumberLiteralNodeParser } from "../src/NodeParser/NumberLiteralNodeParser";
 import { NumberTypeNodeParser } from "../src/NodeParser/NumberTypeNodeParser";
@@ -37,11 +39,11 @@ import { TypeOperatorNodeParser } from "../src/NodeParser/TypeOperatorNodeParser
 import { TypeReferenceNodeParser } from "../src/NodeParser/TypeReferenceNodeParser";
 import { UndefinedTypeNodeParser } from "../src/NodeParser/UndefinedTypeNodeParser";
 import { UnionNodeParser } from "../src/NodeParser/UnionNodeParser";
+import { UnknownTypeNodeParser } from "../src/NodeParser/UnknownTypeNodeParser";
 import { SubNodeParser } from "../src/SubNodeParser";
 import { TopRefNodeParser } from "../src/TopRefNodeParser";
 import { FunctionNodeParser } from "./../src/NodeParser/FunctionNodeParser";
 
-
 export function createParser(program: ts.Program, config: Config): NodeParser {
     const typeChecker = program.getTypeChecker();
     const chainNodeParser = new ChainNodeParser(typeChecker, []);
@@ -72,7 +74,9 @@ export function createParser(program: ts.Program, config: Config): NodeParser {
         .addNodeParser(new NumberTypeNodeParser())
         .addNodeParser(new BooleanTypeNodeParser())
         .addNodeParser(new AnyTypeNodeParser())
+        .addNodeParser(new UnknownTypeNodeParser())
         .addNodeParser(new UndefinedTypeNodeParser())
+        .addNodeParser(new NeverTypeNodeParser())
         .addNodeParser(new ObjectTypeNodeParser())
 
         .addNodeParser(new StringLiteralNodeParser())
@@ -92,6 +96,7 @@ export function createParser(program: ts.Program, config: Config): NodeParser {
         .addNodeParser(new IndexedAccessTypeNodeParser(chainNodeParser))
         .addNodeParser(new TypeofNodeParser(typeChecker, chainNodeParser))
         .addNodeParser(new MappedTypeNodeParser(chainNodeParser))
+        .addNodeParser(new ConditionalTypeNodeParser(typeChecker, chainNodeParser))
         .addNodeParser(new TypeOperatorNodeParser(chainNodeParser))
 
         .addNodeParser(new UnionNodeParser(typeChecker, chainNodeParser))

index.ts

@@ -45,8 +45,10 @@ export * from "./src/SubTypeFormatter";
 export * from "./src/ChainTypeFormatter";
 export * from "./src/CircularReferenceTypeFormatter";
 export * from "./src/TypeFormatter/AnyTypeFormatter";
+export * from "./src/TypeFormatter/UnknownTypeFormatter";
 export * from "./src/TypeFormatter/NullTypeFormatter";
 export * from "./src/TypeFormatter/UndefinedTypeFormatter";
+export * from "./src/TypeFormatter/NeverTypeFormatter";
 export * from "./src/TypeFormatter/BooleanTypeFormatter";
 export * from "./src/TypeFormatter/NumberTypeFormatter";
 export * from "./src/TypeFormatter/StringTypeFormatter";
@@ -71,9 +73,11 @@ export * from "./src/ExposeNodeParser";
 export * from "./src/TopRefNodeParser";
 export * from "./src/CircularReferenceNodeParser";
 export * from "./src/NodeParser/AnyTypeNodeParser";
+export * from "./src/NodeParser/UnknownTypeNodeParser";
 export * from "./src/NodeParser/LiteralNodeParser";
 export * from "./src/NodeParser/NullLiteralNodeParser";
 export * from "./src/NodeParser/UndefinedTypeNodeParser";
+export * from "./src/NodeParser/NeverTypeNodeParser";
 export * from "./src/NodeParser/NumberLiteralNodeParser";
 export * from "./src/NodeParser/StringLiteralNodeParser";
 export * from "./src/NodeParser/BooleanLiteralNodeParser";
@@ -93,6 +97,7 @@ export * from "./src/NodeParser/UnionNodeParser";
 export * from "./src/NodeParser/TupleNodeParser";
 export * from "./src/NodeParser/AnnotatedNodeParser";
 export * from "./src/NodeParser/CallExpressionParser";
+export * from "./src/NodeParser/ConditionalTypeNodeParser";
 export * from "./src/NodeParser/PrefixUnaryExpressionNodeParser";
 
 export * from "./src/SchemaGenerator";

src/NodeParser/AnnotatedNodeParser.ts

@@ -20,6 +20,9 @@ export class AnnotatedNodeParser implements SubNodeParser {
 
     public createType(node: ts.Node, context: Context, reference?: ReferenceType): BaseType {
         const baseType = this.childNodeParser.createType(node, context, reference);
+        if (node.getSourceFile().fileName.match(/[\/\\]typescript[\/\\]lib[\/\\]lib\.[^/\\]+\.d\.ts$/i)) {
+            return baseType;
+        }
         const annotatedNode = this.getAnnotatedNode(node);
         const annotations = this.annotationsReader.getAnnotations(annotatedNode);
         const nullable = this.annotationsReader instanceof ExtendedAnnotationsReader ?

src/NodeParser/AnyTypeNodeParser.ts

@@ -6,7 +6,7 @@ import { BaseType } from "../Type/BaseType";
 
 export class AnyTypeNodeParser implements SubNodeParser {
     public supportsNode(node: ts.KeywordTypeNode): boolean {
-        return node.kind === ts.SyntaxKind.AnyKeyword || node.kind === ts.SyntaxKind.UnknownKeyword;
+        return node.kind === ts.SyntaxKind.AnyKeyword;
     }
     public createType(node: ts.KeywordTypeNode, context: Context): BaseType {
         return new AnyType();

src/NodeParser/ConditionalTypeNodeParser.ts

@@ -0,0 +1,50 @@
+import * as ts from "typescript";
+import { Context, NodeParser } from "../NodeParser";
+import { SubNodeParser } from "../SubNodeParser";
+import { BaseType } from "../Type/BaseType";
+import { isAssignableTo } from "../Utils/isAssignableTo";
+import { narrowType } from "../Utils/narrowType";
+
+export class ConditionalTypeNodeParser implements SubNodeParser {
+    public constructor(
+        private typeChecker: ts.TypeChecker,
+        private childNodeParser: NodeParser,
+    ) {}
+
+    public supportsNode(node: ts.ConditionalTypeNode): boolean {
+        return node.kind === ts.SyntaxKind.ConditionalType;
+    }
+
+    public createType(node: ts.ConditionalTypeNode, context: Context): BaseType {
+        const checkType = this.childNodeParser.createType(node.checkType, context);
+        const extendsType = this.childNodeParser.createType(node.extendsType, context);
+        const result = isAssignableTo(extendsType, checkType);
+        const tsResultType = result ? node.trueType : node.falseType;
+        const resultType = this.childNodeParser.createType(tsResultType, context);
+
+        // If result type is the same type parameter as the check type then narrow down the result type
+        const checkTypeParameterName = this.getTypeParameterName(node.checkType);
+        const resultTypeParameterName = this.getTypeParameterName(tsResultType);
+        if (resultTypeParameterName != null && resultTypeParameterName === checkTypeParameterName) {
+            return narrowType(resultType, type => isAssignableTo(extendsType, type) === result);
+        }
+
+        return resultType;
+    }
+
+    /**
+     * Returns the type parameter name of the given type node if any.
+     *
+     * @param node - The type node for which to return the type parameter name.
+     * @return The type parameter name or null if specified type node is not a type parameter.
+     */
+    private getTypeParameterName(node: ts.TypeNode): string | null {
+        if (ts.isTypeReferenceNode(node)) {
+            const typeSymbol = this.typeChecker.getSymbolAtLocation(node.typeName)!;
+            if (typeSymbol.flags & ts.SymbolFlags.TypeParameter) {
+                return typeSymbol.name;
+            }
+        }
+        return null;
+    }
+}

src/NodeParser/NeverTypeNodeParser.ts

@@ -0,0 +1,14 @@
+import * as ts from "typescript";
+import { Context } from "../NodeParser";
+import { SubNodeParser } from "../SubNodeParser";
+import { BaseType } from "../Type/BaseType";
+import { NeverType } from "../Type/NeverType";
+
+export class NeverTypeNodeParser implements SubNodeParser {
+    public supportsNode(node: ts.KeywordTypeNode): boolean {
+        return node.kind === ts.SyntaxKind.NeverKeyword;
+    }
+    public createType(node: ts.KeywordTypeNode, context: Context): BaseType {
+        return new NeverType();
+    }
+}

src/NodeParser/UnknownTypeNodeParser.ts

@@ -0,0 +1,14 @@
+import * as ts from "typescript";
+import { Context } from "../NodeParser";
+import { SubNodeParser } from "../SubNodeParser";
+import { BaseType } from "../Type/BaseType";
+import { UnknownType } from "../Type/UnknownType";
+
+export class UnknownTypeNodeParser implements SubNodeParser {
+    public supportsNode(node: ts.KeywordTypeNode): boolean {
+        return node.kind === ts.SyntaxKind.UnknownKeyword;
+    }
+    public createType(node: ts.KeywordTypeNode, context: Context): BaseType {
+        return new UnknownType();
+    }
+}

src/Type/EnumType.ts

@@ -1,13 +1,18 @@
 import { BaseType } from "./BaseType";
+import { LiteralType } from "./LiteralType";
+import { NullType } from "./NullType";
 
 export type EnumValue = string|boolean|number|null;
 
 export class EnumType extends BaseType {
+    private types: BaseType[];
+
     public constructor(
         private id: string,
         private values: EnumValue[],
     ) {
         super();
+        this.types = values.map(value => value == null ? new NullType() : new LiteralType(value));
     }
 
     public getId(): string {
@@ -17,4 +22,8 @@ export class EnumType extends BaseType {
     public getValues(): EnumValue[] {
         return this.values;
     }
+
+    public getTypes(): BaseType[] {
+        return this.types;
+    }
 }

src/Type/NeverType.ts

@@ -0,0 +1,7 @@
+import { BaseType } from "./BaseType";
+
+export class NeverType extends BaseType {
+    public getId(): string {
+        return "never";
+    }
+}

src/Type/UnknownType.ts

@@ -0,0 +1,7 @@
+import { BaseType } from "./BaseType";
+
+export class UnknownType extends BaseType {
+    public getId(): string {
+        return "unknown";
+    }
+}

src/TypeFormatter/NeverTypeFormatter.ts

@@ -0,0 +1,16 @@
+import { Definition } from "../Schema/Definition";
+import { SubTypeFormatter } from "../SubTypeFormatter";
+import { BaseType } from "../Type/BaseType";
+import { NeverType } from "../Type/NeverType";
+
+export class NeverTypeFormatter implements SubTypeFormatter {
+    public supportsType(type: NeverType): boolean {
+        return type instanceof NeverType;
+    }
+    public getDefinition(type: NeverType): Definition {
+        return {not: {}};
+    }
+    public getChildren(type: NeverType): BaseType[] {
+        return [];
+    }
+}

src/TypeFormatter/ObjectTypeFormatter.ts

@@ -7,6 +7,7 @@ import { UndefinedType } from "../Type/UndefinedType";
 import { UnionType } from "../Type/UnionType";
 import { TypeFormatter } from "../TypeFormatter";
 import { getAllOfDefinitionReducer } from "../Utils/allOfDefinition";
+import { derefType } from "../Utils/derefType";
 import { StringMap } from "../Utils/StringMap";
 
 export class ObjectTypeFormatter implements SubTypeFormatter {
@@ -75,7 +76,7 @@ export class ObjectTypeFormatter implements SubTypeFormatter {
     }
 
     private prepareObjectProperty(property: ObjectProperty): ObjectProperty {
-        const propType = property.getType();
+        const propType = derefType(property.getType());
         if (propType instanceof UndefinedType) {
             return new ObjectProperty(property.getName(), new UndefinedType(), false);
         } else if (!(propType instanceof UnionType)) {

src/TypeFormatter/UnknownTypeFormatter.ts

@@ -0,0 +1,16 @@
+import { Definition } from "../Schema/Definition";
+import { SubTypeFormatter } from "../SubTypeFormatter";
+import { BaseType } from "../Type/BaseType";
+import { UnknownType } from "../Type/UnknownType";
+
+export class UnknownTypeFormatter implements SubTypeFormatter {
+    public supportsType(type: UnknownType): boolean {
+        return type instanceof UnknownType;
+    }
+    public getDefinition(type: UnknownType): Definition {
+        return {};
+    }
+    public getChildren(type: UnknownType): BaseType[] {
+        return [];
+    }
+}