Don't recalculate undefined in getConstraintOfDistributiveConditional…

…Type
microsoft · Mar 19, 2023 · 5301906 · 5301906
1 parent b70784e
commit 5301906
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13594,6 +13594,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function getConstraintOfDistributiveConditionalType(type: ConditionalType): Type | undefined {
+        if (type.resolvedDefaultConstraintOfDistributed !== undefined) {
+            return type.resolvedDefaultConstraintOfDistributed || undefined;
+        }
+
         // Check if we have a conditional type of the form 'T extends U ? X : Y', where T is a constrained
         // type parameter. If so, create an instantiation of the conditional type where T is replaced
         // with its constraint. We do this because if the constraint is a union type it will be distributed
@@ -13611,10 +13615,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             if (constraint && constraint !== type.checkType) {
                 const instantiated = getConditionalTypeInstantiation(type, prependTypeMapping(type.root.checkType, constraint, type.mapper));
                 if (!(instantiated.flags & TypeFlags.Never)) {
+                    type.resolvedDefaultConstraintOfDistributed = instantiated;
                     return instantiated;
                 }
             }
         }
+        type.resolvedDefaultConstraintOfDistributed = false;
         return undefined;
     }
 

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -6630,6 +6630,8 @@ export interface ConditionalType extends InstantiableType {
     /** @internal */
     resolvedDefaultConstraint?: Type;
     /** @internal */
+    resolvedDefaultConstraintOfDistributed?: Type | false;
+    /** @internal */
     mapper?: TypeMapper;
     /** @internal */
     combinedMapper?: TypeMapper;