diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index e11bbb2bf3a..257c3339ea9 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -233,132 +233,131 @@ declare namespace ts {
         ParenthesizedType = 170,
         ThisType = 171,
         TypeOperator = 172,
-        BinaryType = 173,
-        IndexedAccessType = 174,
-        MappedType = 175,
-        LiteralType = 176,
-        ObjectBindingPattern = 177,
-        ArrayBindingPattern = 178,
-        BindingElement = 179,
-        ArrayLiteralExpression = 180,
-        ObjectLiteralExpression = 181,
-        PropertyAccessExpression = 182,
-        ElementAccessExpression = 183,
-        CallExpression = 184,
-        NewExpression = 185,
-        TaggedTemplateExpression = 186,
-        TypeAssertionExpression = 187,
-        ParenthesizedExpression = 188,
-        FunctionExpression = 189,
-        ArrowFunction = 190,
-        DeleteExpression = 191,
-        TypeOfExpression = 192,
-        VoidExpression = 193,
-        AwaitExpression = 194,
-        PrefixUnaryExpression = 195,
-        PostfixUnaryExpression = 196,
-        BinaryExpression = 197,
-        ConditionalExpression = 198,
-        TemplateExpression = 199,
-        YieldExpression = 200,
-        SpreadElement = 201,
-        ClassExpression = 202,
-        OmittedExpression = 203,
-        ExpressionWithTypeArguments = 204,
-        AsExpression = 205,
-        NonNullExpression = 206,
-        MetaProperty = 207,
-        TemplateSpan = 208,
-        SemicolonClassElement = 209,
-        Block = 210,
-        VariableStatement = 211,
-        EmptyStatement = 212,
-        ExpressionStatement = 213,
-        IfStatement = 214,
-        DoStatement = 215,
-        WhileStatement = 216,
-        ForStatement = 217,
-        ForInStatement = 218,
-        ForOfStatement = 219,
-        ContinueStatement = 220,
-        BreakStatement = 221,
-        ReturnStatement = 222,
-        WithStatement = 223,
-        SwitchStatement = 224,
-        LabeledStatement = 225,
-        ThrowStatement = 226,
-        TryStatement = 227,
-        DebuggerStatement = 228,
-        VariableDeclaration = 229,
-        VariableDeclarationList = 230,
-        FunctionDeclaration = 231,
-        ClassDeclaration = 232,
-        InterfaceDeclaration = 233,
-        TypeAliasDeclaration = 234,
-        EnumDeclaration = 235,
-        ModuleDeclaration = 236,
-        ModuleBlock = 237,
-        CaseBlock = 238,
-        NamespaceExportDeclaration = 239,
-        ImportEqualsDeclaration = 240,
-        ImportDeclaration = 241,
-        ImportClause = 242,
-        NamespaceImport = 243,
-        NamedImports = 244,
-        ImportSpecifier = 245,
-        ExportAssignment = 246,
-        ExportDeclaration = 247,
-        NamedExports = 248,
-        ExportSpecifier = 249,
-        MissingDeclaration = 250,
-        ExternalModuleReference = 251,
-        JsxElement = 252,
-        JsxSelfClosingElement = 253,
-        JsxOpeningElement = 254,
-        JsxClosingElement = 255,
-        JsxFragment = 256,
-        JsxOpeningFragment = 257,
-        JsxClosingFragment = 258,
-        JsxAttribute = 259,
-        JsxAttributes = 260,
-        JsxSpreadAttribute = 261,
-        JsxExpression = 262,
-        CaseClause = 263,
-        DefaultClause = 264,
-        HeritageClause = 265,
-        CatchClause = 266,
-        PropertyAssignment = 267,
-        ShorthandPropertyAssignment = 268,
-        SpreadAssignment = 269,
-        EnumMember = 270,
-        SourceFile = 271,
-        Bundle = 272,
-        JSDocTypeExpression = 273,
-        JSDocAllType = 274,
-        JSDocUnknownType = 275,
-        JSDocNullableType = 276,
-        JSDocNonNullableType = 277,
-        JSDocOptionalType = 278,
-        JSDocFunctionType = 279,
-        JSDocVariadicType = 280,
-        JSDocComment = 281,
-        JSDocTypeLiteral = 282,
-        JSDocTag = 283,
-        JSDocAugmentsTag = 284,
-        JSDocClassTag = 285,
-        JSDocParameterTag = 286,
-        JSDocReturnTag = 287,
-        JSDocTypeTag = 288,
-        JSDocTemplateTag = 289,
-        JSDocTypedefTag = 290,
-        JSDocPropertyTag = 291,
-        SyntaxList = 292,
-        NotEmittedStatement = 293,
-        PartiallyEmittedExpression = 294,
-        CommaListExpression = 295,
-        MergeDeclarationMarker = 296,
-        EndOfDeclarationMarker = 297,
-        Count = 298,
+        IndexedAccessType = 173,
+        MappedType = 174,
+        LiteralType = 175,
+        ObjectBindingPattern = 176,
+        ArrayBindingPattern = 177,
+        BindingElement = 178,
+        ArrayLiteralExpression = 179,
+        ObjectLiteralExpression = 180,
+        PropertyAccessExpression = 181,
+        ElementAccessExpression = 182,
+        CallExpression = 183,
+        NewExpression = 184,
+        TaggedTemplateExpression = 185,
+        TypeAssertionExpression = 186,
+        ParenthesizedExpression = 187,
+        FunctionExpression = 188,
+        ArrowFunction = 189,
+        DeleteExpression = 190,
+        TypeOfExpression = 191,
+        VoidExpression = 192,
+        AwaitExpression = 193,
+        PrefixUnaryExpression = 194,
+        PostfixUnaryExpression = 195,
+        BinaryExpression = 196,
+        ConditionalExpression = 197,
+        TemplateExpression = 198,
+        YieldExpression = 199,
+        SpreadElement = 200,
+        ClassExpression = 201,
+        OmittedExpression = 202,
+        ExpressionWithTypeArguments = 203,
+        AsExpression = 204,
+        NonNullExpression = 205,
+        MetaProperty = 206,
+        TemplateSpan = 207,
+        SemicolonClassElement = 208,
+        Block = 209,
+        VariableStatement = 210,
+        EmptyStatement = 211,
+        ExpressionStatement = 212,
+        IfStatement = 213,
+        DoStatement = 214,
+        WhileStatement = 215,
+        ForStatement = 216,
+        ForInStatement = 217,
+        ForOfStatement = 218,
+        ContinueStatement = 219,
+        BreakStatement = 220,
+        ReturnStatement = 221,
+        WithStatement = 222,
+        SwitchStatement = 223,
+        LabeledStatement = 224,
+        ThrowStatement = 225,
+        TryStatement = 226,
+        DebuggerStatement = 227,
+        VariableDeclaration = 228,
+        VariableDeclarationList = 229,
+        FunctionDeclaration = 230,
+        ClassDeclaration = 231,
+        InterfaceDeclaration = 232,
+        TypeAliasDeclaration = 233,
+        EnumDeclaration = 234,
+        ModuleDeclaration = 235,
+        ModuleBlock = 236,
+        CaseBlock = 237,
+        NamespaceExportDeclaration = 238,
+        ImportEqualsDeclaration = 239,
+        ImportDeclaration = 240,
+        ImportClause = 241,
+        NamespaceImport = 242,
+        NamedImports = 243,
+        ImportSpecifier = 244,
+        ExportAssignment = 245,
+        ExportDeclaration = 246,
+        NamedExports = 247,
+        ExportSpecifier = 248,
+        MissingDeclaration = 249,
+        ExternalModuleReference = 250,
+        JsxElement = 251,
+        JsxSelfClosingElement = 252,
+        JsxOpeningElement = 253,
+        JsxClosingElement = 254,
+        JsxFragment = 255,
+        JsxOpeningFragment = 256,
+        JsxClosingFragment = 257,
+        JsxAttribute = 258,
+        JsxAttributes = 259,
+        JsxSpreadAttribute = 260,
+        JsxExpression = 261,
+        CaseClause = 262,
+        DefaultClause = 263,
+        HeritageClause = 264,
+        CatchClause = 265,
+        PropertyAssignment = 266,
+        ShorthandPropertyAssignment = 267,
+        SpreadAssignment = 268,
+        EnumMember = 269,
+        SourceFile = 270,
+        Bundle = 271,
+        JSDocTypeExpression = 272,
+        JSDocAllType = 273,
+        JSDocUnknownType = 274,
+        JSDocNullableType = 275,
+        JSDocNonNullableType = 276,
+        JSDocOptionalType = 277,
+        JSDocFunctionType = 278,
+        JSDocVariadicType = 279,
+        JSDocComment = 280,
+        JSDocTypeLiteral = 281,
+        JSDocTag = 282,
+        JSDocAugmentsTag = 283,
+        JSDocClassTag = 284,
+        JSDocParameterTag = 285,
+        JSDocReturnTag = 286,
+        JSDocTypeTag = 287,
+        JSDocTemplateTag = 288,
+        JSDocTypedefTag = 289,
+        JSDocPropertyTag = 290,
+        SyntaxList = 291,
+        NotEmittedStatement = 292,
+        PartiallyEmittedExpression = 293,
+        CommaListExpression = 294,
+        MergeDeclarationMarker = 295,
+        EndOfDeclarationMarker = 296,
+        Count = 297,
         FirstAssignment = 58,
         LastAssignment = 70,
         FirstCompoundAssignment = 59,
@@ -370,7 +369,7 @@ declare namespace ts {
         FirstFutureReservedWord = 108,
         LastFutureReservedWord = 116,
         FirstTypeNode = 159,
-        LastTypeNode = 176,
+        LastTypeNode = 175,
         FirstPunctuation = 17,
         LastPunctuation = 70,
         FirstToken = 0,
@@ -384,10 +383,10 @@ declare namespace ts {
         FirstBinaryOperator = 27,
         LastBinaryOperator = 70,
         FirstNode = 144,
-        FirstJSDocNode = 273,
-        LastJSDocNode = 291,
-        FirstJSDocTagNode = 283,
-        LastJSDocTagNode = 291,
+        FirstJSDocNode = 272,
+        LastJSDocNode = 290,
+        FirstJSDocTagNode = 282,
+        LastJSDocTagNode = 290,
     }
     enum NodeFlags {
         None = 0,
@@ -737,7 +736,8 @@ declare namespace ts {
     }
     interface ConditionalTypeNode extends TypeNode {
         kind: SyntaxKind.ConditionalType;
-        conditionType: TypeNode;
+        checkType: TypeNode;
+        extendsType: TypeNode;
         trueType: TypeNode;
         falseType: TypeNode;
     }
@@ -750,12 +750,6 @@ declare namespace ts {
         operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword;
         type: TypeNode;
     }
-    interface BinaryTypeNode extends TypeNode {
-        kind: SyntaxKind.BinaryType;
-        left: TypeNode;
-        operator: SyntaxKind.ExtendsKeyword;
-        right: TypeNode;
-    }
     interface IndexedAccessTypeNode extends TypeNode {
         kind: SyntaxKind.IndexedAccessType;
         objectType: TypeNode;
@@ -2027,26 +2021,25 @@ declare namespace ts {
         Index = 524288,
         IndexedAccess = 1048576,
         Conditional = 2097152,
-        Extends = 4194304,
-        NonPrimitive = 134217728,
+        NonPrimitive = 67108864,
         Literal = 224,
         Unit = 13536,
         StringOrNumberLiteral = 96,
         PossiblyFalsy = 14574,
         StringLike = 524322,
         NumberLike = 84,
-        BooleanLike = 4194440,
+        BooleanLike = 136,
         EnumLike = 272,
         ESSymbolLike = 1536,
         UnionOrIntersection = 393216,
         StructuredType = 458752,
         TypeVariable = 1081344,
         InstantiableNonPrimitive = 3178496,
-        InstantiablePrimitive = 4718592,
-        Instantiable = 7897088,
-        StructuredOrInstantiable = 8355840,
-        Narrowable = 142575359,
-        NotUnionOrUnit = 134283777,
+        InstantiablePrimitive = 524288,
+        Instantiable = 3702784,
+        StructuredOrInstantiable = 4161536,
+        Narrowable = 71272191,
+        NotUnionOrUnit = 67174913,
     }
     type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     interface Type {
@@ -2147,13 +2140,10 @@ declare namespace ts {
         type: InstantiableType | UnionOrIntersectionType;
     }
     interface ConditionalType extends InstantiableType {
-        conditionType: Type;
-        trueType: Type;
-        falseType: Type;
-    }
-    interface ExtendsType extends InstantiableType {
         checkType: Type;
         extendsType: Type;
+        trueType: Type;
+        falseType: Type;
     }
     enum SignatureKind {
         Call = 0,
@@ -2974,7 +2964,6 @@ declare namespace ts {
     function isParenthesizedTypeNode(node: Node): node is ParenthesizedTypeNode;
     function isThisTypeNode(node: Node): node is ThisTypeNode;
     function isTypeOperatorNode(node: Node): node is TypeOperatorNode;
-    function isBinaryTypeNode(node: Node): node is BinaryTypeNode;
     function isIndexedAccessTypeNode(node: Node): node is IndexedAccessTypeNode;
     function isMappedTypeNode(node: Node): node is MappedTypeNode;
     function isLiteralTypeNode(node: Node): node is LiteralTypeNode;
@@ -3388,16 +3377,14 @@ declare namespace ts {
     function createIntersectionTypeNode(types: TypeNode[]): IntersectionTypeNode;
     function updateIntersectionTypeNode(node: IntersectionTypeNode, types: NodeArray<TypeNode>): IntersectionTypeNode;
     function createUnionOrIntersectionTypeNode(kind: SyntaxKind.UnionType | SyntaxKind.IntersectionType, types: ReadonlyArray<TypeNode>): UnionOrIntersectionTypeNode;
-    function createConditionalTypeNode(conditionType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
-    function updateConditionalTypeNode(node: ConditionalTypeNode, conditionType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
+    function createConditionalTypeNode(checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
+    function updateConditionalTypeNode(node: ConditionalTypeNode, checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
     function createParenthesizedType(type: TypeNode): ParenthesizedTypeNode;
     function updateParenthesizedType(node: ParenthesizedTypeNode, type: TypeNode): ParenthesizedTypeNode;
     function createThisTypeNode(): ThisTypeNode;
     function createTypeOperatorNode(type: TypeNode): TypeOperatorNode;
     function createTypeOperatorNode(operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword, type: TypeNode): TypeOperatorNode;
     function updateTypeOperatorNode(node: TypeOperatorNode, type: TypeNode): TypeOperatorNode;
-    function createBinaryTypeNode(left: TypeNode, operator: SyntaxKind.ExtendsKeyword, right: TypeNode): BinaryTypeNode;
-    function updateBinaryTypeNode(node: BinaryTypeNode, left: TypeNode, operator: SyntaxKind.ExtendsKeyword, right: TypeNode): BinaryTypeNode;
     function createIndexedAccessTypeNode(objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
     function updateIndexedAccessTypeNode(node: IndexedAccessTypeNode, objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
     function createMappedTypeNode(readonlyToken: ReadonlyToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | undefined, type: TypeNode | undefined): MappedTypeNode;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 7635dc581a4..2513867ef29 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -233,132 +233,131 @@ declare namespace ts {
         ParenthesizedType = 170,
         ThisType = 171,
         TypeOperator = 172,
-        BinaryType = 173,
-        IndexedAccessType = 174,
-        MappedType = 175,
-        LiteralType = 176,
-        ObjectBindingPattern = 177,
-        ArrayBindingPattern = 178,
-        BindingElement = 179,
-        ArrayLiteralExpression = 180,
-        ObjectLiteralExpression = 181,
-        PropertyAccessExpression = 182,
-        ElementAccessExpression = 183,
-        CallExpression = 184,
-        NewExpression = 185,
-        TaggedTemplateExpression = 186,
-        TypeAssertionExpression = 187,
-        ParenthesizedExpression = 188,
-        FunctionExpression = 189,
-        ArrowFunction = 190,
-        DeleteExpression = 191,
-        TypeOfExpression = 192,
-        VoidExpression = 193,
-        AwaitExpression = 194,
-        PrefixUnaryExpression = 195,
-        PostfixUnaryExpression = 196,
-        BinaryExpression = 197,
-        ConditionalExpression = 198,
-        TemplateExpression = 199,
-        YieldExpression = 200,
-        SpreadElement = 201,
-        ClassExpression = 202,
-        OmittedExpression = 203,
-        ExpressionWithTypeArguments = 204,
-        AsExpression = 205,
-        NonNullExpression = 206,
-        MetaProperty = 207,
-        TemplateSpan = 208,
-        SemicolonClassElement = 209,
-        Block = 210,
-        VariableStatement = 211,
-        EmptyStatement = 212,
-        ExpressionStatement = 213,
-        IfStatement = 214,
-        DoStatement = 215,
-        WhileStatement = 216,
-        ForStatement = 217,
-        ForInStatement = 218,
-        ForOfStatement = 219,
-        ContinueStatement = 220,
-        BreakStatement = 221,
-        ReturnStatement = 222,
-        WithStatement = 223,
-        SwitchStatement = 224,
-        LabeledStatement = 225,
-        ThrowStatement = 226,
-        TryStatement = 227,
-        DebuggerStatement = 228,
-        VariableDeclaration = 229,
-        VariableDeclarationList = 230,
-        FunctionDeclaration = 231,
-        ClassDeclaration = 232,
-        InterfaceDeclaration = 233,
-        TypeAliasDeclaration = 234,
-        EnumDeclaration = 235,
-        ModuleDeclaration = 236,
-        ModuleBlock = 237,
-        CaseBlock = 238,
-        NamespaceExportDeclaration = 239,
-        ImportEqualsDeclaration = 240,
-        ImportDeclaration = 241,
-        ImportClause = 242,
-        NamespaceImport = 243,
-        NamedImports = 244,
-        ImportSpecifier = 245,
-        ExportAssignment = 246,
-        ExportDeclaration = 247,
-        NamedExports = 248,
-        ExportSpecifier = 249,
-        MissingDeclaration = 250,
-        ExternalModuleReference = 251,
-        JsxElement = 252,
-        JsxSelfClosingElement = 253,
-        JsxOpeningElement = 254,
-        JsxClosingElement = 255,
-        JsxFragment = 256,
-        JsxOpeningFragment = 257,
-        JsxClosingFragment = 258,
-        JsxAttribute = 259,
-        JsxAttributes = 260,
-        JsxSpreadAttribute = 261,
-        JsxExpression = 262,
-        CaseClause = 263,
-        DefaultClause = 264,
-        HeritageClause = 265,
-        CatchClause = 266,
-        PropertyAssignment = 267,
-        ShorthandPropertyAssignment = 268,
-        SpreadAssignment = 269,
-        EnumMember = 270,
-        SourceFile = 271,
-        Bundle = 272,
-        JSDocTypeExpression = 273,
-        JSDocAllType = 274,
-        JSDocUnknownType = 275,
-        JSDocNullableType = 276,
-        JSDocNonNullableType = 277,
-        JSDocOptionalType = 278,
-        JSDocFunctionType = 279,
-        JSDocVariadicType = 280,
-        JSDocComment = 281,
-        JSDocTypeLiteral = 282,
-        JSDocTag = 283,
-        JSDocAugmentsTag = 284,
-        JSDocClassTag = 285,
-        JSDocParameterTag = 286,
-        JSDocReturnTag = 287,
-        JSDocTypeTag = 288,
-        JSDocTemplateTag = 289,
-        JSDocTypedefTag = 290,
-        JSDocPropertyTag = 291,
-        SyntaxList = 292,
-        NotEmittedStatement = 293,
-        PartiallyEmittedExpression = 294,
-        CommaListExpression = 295,
-        MergeDeclarationMarker = 296,
-        EndOfDeclarationMarker = 297,
-        Count = 298,
+        IndexedAccessType = 173,
+        MappedType = 174,
+        LiteralType = 175,
+        ObjectBindingPattern = 176,
+        ArrayBindingPattern = 177,
+        BindingElement = 178,
+        ArrayLiteralExpression = 179,
+        ObjectLiteralExpression = 180,
+        PropertyAccessExpression = 181,
+        ElementAccessExpression = 182,
+        CallExpression = 183,
+        NewExpression = 184,
+        TaggedTemplateExpression = 185,
+        TypeAssertionExpression = 186,
+        ParenthesizedExpression = 187,
+        FunctionExpression = 188,
+        ArrowFunction = 189,
+        DeleteExpression = 190,
+        TypeOfExpression = 191,
+        VoidExpression = 192,
+        AwaitExpression = 193,
+        PrefixUnaryExpression = 194,
+        PostfixUnaryExpression = 195,
+        BinaryExpression = 196,
+        ConditionalExpression = 197,
+        TemplateExpression = 198,
+        YieldExpression = 199,
+        SpreadElement = 200,
+        ClassExpression = 201,
+        OmittedExpression = 202,
+        ExpressionWithTypeArguments = 203,
+        AsExpression = 204,
+        NonNullExpression = 205,
+        MetaProperty = 206,
+        TemplateSpan = 207,
+        SemicolonClassElement = 208,
+        Block = 209,
+        VariableStatement = 210,
+        EmptyStatement = 211,
+        ExpressionStatement = 212,
+        IfStatement = 213,
+        DoStatement = 214,
+        WhileStatement = 215,
+        ForStatement = 216,
+        ForInStatement = 217,
+        ForOfStatement = 218,
+        ContinueStatement = 219,
+        BreakStatement = 220,
+        ReturnStatement = 221,
+        WithStatement = 222,
+        SwitchStatement = 223,
+        LabeledStatement = 224,
+        ThrowStatement = 225,
+        TryStatement = 226,
+        DebuggerStatement = 227,
+        VariableDeclaration = 228,
+        VariableDeclarationList = 229,
+        FunctionDeclaration = 230,
+        ClassDeclaration = 231,
+        InterfaceDeclaration = 232,
+        TypeAliasDeclaration = 233,
+        EnumDeclaration = 234,
+        ModuleDeclaration = 235,
+        ModuleBlock = 236,
+        CaseBlock = 237,
+        NamespaceExportDeclaration = 238,
+        ImportEqualsDeclaration = 239,
+        ImportDeclaration = 240,
+        ImportClause = 241,
+        NamespaceImport = 242,
+        NamedImports = 243,
+        ImportSpecifier = 244,
+        ExportAssignment = 245,
+        ExportDeclaration = 246,
+        NamedExports = 247,
+        ExportSpecifier = 248,
+        MissingDeclaration = 249,
+        ExternalModuleReference = 250,
+        JsxElement = 251,
+        JsxSelfClosingElement = 252,
+        JsxOpeningElement = 253,
+        JsxClosingElement = 254,
+        JsxFragment = 255,
+        JsxOpeningFragment = 256,
+        JsxClosingFragment = 257,
+        JsxAttribute = 258,
+        JsxAttributes = 259,
+        JsxSpreadAttribute = 260,
+        JsxExpression = 261,
+        CaseClause = 262,
+        DefaultClause = 263,
+        HeritageClause = 264,
+        CatchClause = 265,
+        PropertyAssignment = 266,
+        ShorthandPropertyAssignment = 267,
+        SpreadAssignment = 268,
+        EnumMember = 269,
+        SourceFile = 270,
+        Bundle = 271,
+        JSDocTypeExpression = 272,
+        JSDocAllType = 273,
+        JSDocUnknownType = 274,
+        JSDocNullableType = 275,
+        JSDocNonNullableType = 276,
+        JSDocOptionalType = 277,
+        JSDocFunctionType = 278,
+        JSDocVariadicType = 279,
+        JSDocComment = 280,
+        JSDocTypeLiteral = 281,
+        JSDocTag = 282,
+        JSDocAugmentsTag = 283,
+        JSDocClassTag = 284,
+        JSDocParameterTag = 285,
+        JSDocReturnTag = 286,
+        JSDocTypeTag = 287,
+        JSDocTemplateTag = 288,
+        JSDocTypedefTag = 289,
+        JSDocPropertyTag = 290,
+        SyntaxList = 291,
+        NotEmittedStatement = 292,
+        PartiallyEmittedExpression = 293,
+        CommaListExpression = 294,
+        MergeDeclarationMarker = 295,
+        EndOfDeclarationMarker = 296,
+        Count = 297,
         FirstAssignment = 58,
         LastAssignment = 70,
         FirstCompoundAssignment = 59,
@@ -370,7 +369,7 @@ declare namespace ts {
         FirstFutureReservedWord = 108,
         LastFutureReservedWord = 116,
         FirstTypeNode = 159,
-        LastTypeNode = 176,
+        LastTypeNode = 175,
         FirstPunctuation = 17,
         LastPunctuation = 70,
         FirstToken = 0,
@@ -384,10 +383,10 @@ declare namespace ts {
         FirstBinaryOperator = 27,
         LastBinaryOperator = 70,
         FirstNode = 144,
-        FirstJSDocNode = 273,
-        LastJSDocNode = 291,
-        FirstJSDocTagNode = 283,
-        LastJSDocTagNode = 291,
+        FirstJSDocNode = 272,
+        LastJSDocNode = 290,
+        FirstJSDocTagNode = 282,
+        LastJSDocTagNode = 290,
     }
     enum NodeFlags {
         None = 0,
@@ -737,7 +736,8 @@ declare namespace ts {
     }
     interface ConditionalTypeNode extends TypeNode {
         kind: SyntaxKind.ConditionalType;
-        conditionType: TypeNode;
+        checkType: TypeNode;
+        extendsType: TypeNode;
         trueType: TypeNode;
         falseType: TypeNode;
     }
@@ -750,12 +750,6 @@ declare namespace ts {
         operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword;
         type: TypeNode;
     }
-    interface BinaryTypeNode extends TypeNode {
-        kind: SyntaxKind.BinaryType;
-        left: TypeNode;
-        operator: SyntaxKind.ExtendsKeyword;
-        right: TypeNode;
-    }
     interface IndexedAccessTypeNode extends TypeNode {
         kind: SyntaxKind.IndexedAccessType;
         objectType: TypeNode;
@@ -2027,26 +2021,25 @@ declare namespace ts {
         Index = 524288,
         IndexedAccess = 1048576,
         Conditional = 2097152,
-        Extends = 4194304,
-        NonPrimitive = 134217728,
+        NonPrimitive = 67108864,
         Literal = 224,
         Unit = 13536,
         StringOrNumberLiteral = 96,
         PossiblyFalsy = 14574,
         StringLike = 524322,
         NumberLike = 84,
-        BooleanLike = 4194440,
+        BooleanLike = 136,
         EnumLike = 272,
         ESSymbolLike = 1536,
         UnionOrIntersection = 393216,
         StructuredType = 458752,
         TypeVariable = 1081344,
         InstantiableNonPrimitive = 3178496,
-        InstantiablePrimitive = 4718592,
-        Instantiable = 7897088,
-        StructuredOrInstantiable = 8355840,
-        Narrowable = 142575359,
-        NotUnionOrUnit = 134283777,
+        InstantiablePrimitive = 524288,
+        Instantiable = 3702784,
+        StructuredOrInstantiable = 4161536,
+        Narrowable = 71272191,
+        NotUnionOrUnit = 67174913,
     }
     type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     interface Type {
@@ -2147,13 +2140,10 @@ declare namespace ts {
         type: InstantiableType | UnionOrIntersectionType;
     }
     interface ConditionalType extends InstantiableType {
-        conditionType: Type;
-        trueType: Type;
-        falseType: Type;
-    }
-    interface ExtendsType extends InstantiableType {
         checkType: Type;
         extendsType: Type;
+        trueType: Type;
+        falseType: Type;
     }
     enum SignatureKind {
         Call = 0,
@@ -3027,7 +3017,6 @@ declare namespace ts {
     function isParenthesizedTypeNode(node: Node): node is ParenthesizedTypeNode;
     function isThisTypeNode(node: Node): node is ThisTypeNode;
     function isTypeOperatorNode(node: Node): node is TypeOperatorNode;
-    function isBinaryTypeNode(node: Node): node is BinaryTypeNode;
     function isIndexedAccessTypeNode(node: Node): node is IndexedAccessTypeNode;
     function isMappedTypeNode(node: Node): node is MappedTypeNode;
     function isLiteralTypeNode(node: Node): node is LiteralTypeNode;
@@ -3335,16 +3324,14 @@ declare namespace ts {
     function createIntersectionTypeNode(types: TypeNode[]): IntersectionTypeNode;
     function updateIntersectionTypeNode(node: IntersectionTypeNode, types: NodeArray<TypeNode>): IntersectionTypeNode;
     function createUnionOrIntersectionTypeNode(kind: SyntaxKind.UnionType | SyntaxKind.IntersectionType, types: ReadonlyArray<TypeNode>): UnionOrIntersectionTypeNode;
-    function createConditionalTypeNode(conditionType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
-    function updateConditionalTypeNode(node: ConditionalTypeNode, conditionType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
+    function createConditionalTypeNode(checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
+    function updateConditionalTypeNode(node: ConditionalTypeNode, checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
     function createParenthesizedType(type: TypeNode): ParenthesizedTypeNode;
     function updateParenthesizedType(node: ParenthesizedTypeNode, type: TypeNode): ParenthesizedTypeNode;
     function createThisTypeNode(): ThisTypeNode;
     function createTypeOperatorNode(type: TypeNode): TypeOperatorNode;
     function createTypeOperatorNode(operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword, type: TypeNode): TypeOperatorNode;
     function updateTypeOperatorNode(node: TypeOperatorNode, type: TypeNode): TypeOperatorNode;
-    function createBinaryTypeNode(left: TypeNode, operator: SyntaxKind.ExtendsKeyword, right: TypeNode): BinaryTypeNode;
-    function updateBinaryTypeNode(node: BinaryTypeNode, left: TypeNode, operator: SyntaxKind.ExtendsKeyword, right: TypeNode): BinaryTypeNode;
     function createIndexedAccessTypeNode(objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
     function updateIndexedAccessTypeNode(node: IndexedAccessTypeNode, objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
     function createMappedTypeNode(readonlyToken: ReadonlyToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | undefined, type: TypeNode | undefined): MappedTypeNode;