Clean up types

Author: rbuckton

src/compiler/binder.ts

@@ -1581,7 +1581,7 @@ namespace ts {
             }
         }
 
-        function bindOptionalChain(node: ValidOptionalChain, trueTarget: FlowLabel, falseTarget: FlowLabel) {
+        function bindOptionalChain(node: OptionalChain, trueTarget: FlowLabel, falseTarget: FlowLabel) {
             // For an optional chain, we emulate the behavior of a logical expression:
             //
             // a?.b         -> a && a.b
@@ -1605,7 +1605,7 @@ namespace ts {
             }
         }
 
-        function bindOptionalChainFlow(node: ValidOptionalChain) {
+        function bindOptionalChainFlow(node: OptionalChain) {
             if (isTopLevelLogicalExpression(node)) {
                 const postExpressionLabel = createBranchLabel();
                 bindOptionalChain(node, postExpressionLabel, postExpressionLabel);
@@ -1617,7 +1617,7 @@ namespace ts {
         }
 
         function bindAccessExpressionFlow(node: AccessExpression) {
-            if (isValidOptionalChain(node)) {
+            if (isOptionalChain(node)) {
                 bindOptionalChainFlow(node);
             }
             else {
@@ -1626,7 +1626,7 @@ namespace ts {
         }
 
         function bindCallExpressionFlow(node: CallExpression) {
-            if (isValidOptionalChain(node)) {
+            if (isOptionalChain(node)) {
                 bindOptionalChainFlow(node);
             }
             else {

src/compiler/types.ts

@@ -1806,17 +1806,6 @@ namespace ts {
         questionDotToken: QuestionDotToken;
     }
 
-    /* @internal */
-    export interface ValidPropertyAccessChainLink extends PropertyAccessChain {
-        questionDotToken: undefined;
-        expression: ValidOptionalChain;
-    }
-
-    /* @internal */
-    export type ValidPropertyAccessChain =
-        | PropertyAccessChainRoot
-        | ValidPropertyAccessChainLink;
-
     export interface SuperPropertyAccessExpression extends PropertyAccessExpression {
         expression: SuperExpression;
     }
@@ -1843,17 +1832,6 @@ namespace ts {
         questionDotToken: QuestionDotToken;
     }
 
-    /* @internal */
-    export interface ValidElementAccessChainLink extends ElementAccessChain {
-        questionDotToken: undefined;
-        expression: ValidOptionalChain;
-    }
-
-    /* @internal */
-    export type ValidElementAccessChain =
-        | ElementAccessChainRoot
-        | ValidElementAccessChainLink;
-
     export interface SuperElementAccessExpression extends ElementAccessExpression {
         expression: SuperExpression;
     }
@@ -1878,17 +1856,6 @@ namespace ts {
         questionDotToken: QuestionDotToken;
     }
 
-    /* @internal */
-    export interface ValidCallChainLink extends CallChain {
-        questionDotToken: undefined;
-        expression: ValidOptionalChain;
-    }
-
-    /* @internal */
-    export type ValidCallChain =
-        | CallChainRoot
-        | ValidCallChainLink;
-
     export type OptionalChain =
         | PropertyAccessChain
         | ElementAccessChain
@@ -1902,13 +1869,6 @@ namespace ts {
         | CallChainRoot
         ;
 
-    /* @internal */
-    export type ValidOptionalChain =
-        | ValidPropertyAccessChain
-        | ValidElementAccessChain
-        | ValidCallChain
-        ;
-
     /** @internal */
     export type BindableObjectDefinePropertyCall = CallExpression & { arguments: { 0: EntityNameExpression, 1: StringLiteralLike | NumericLiteral, 2: ObjectLiteralExpression } };
 

src/compiler/utilities.ts

@@ -7125,19 +7125,6 @@ namespace ts {
         return node.kind === SyntaxKind.GetAccessor;
     }
 
-    /**
-     * Tests whether an OptionalChain is valid. We can parse an invalid optional chain if it contains an
-     * invalid TaggedTemplateChain per the ECMAScript syntax.
-     */
-    /* @internal */
-    export function isValidOptionalChain(node: Expression): node is ValidOptionalChain {
-        while (isOptionalChain(node)) {
-            if (node.questionDotToken) return true;
-            node = node.expression;
-        }
-        return false;
-    }
-
     /* @internal */
     export function isOptionalChainRoot(node: Node): node is OptionalChainRoot {
         return isOptionalChain(node) && !!node.questionDotToken;