Skip to content

Commit

Permalink
Cache getConstraintOfDistributiveConditionalType (#53358)
Browse files Browse the repository at this point in the history
  • Loading branch information
jakebailey authored Mar 27, 2023
1 parent b34371a commit 3efcfcb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13605,6 +13605,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

function getConstraintOfDistributiveConditionalType(type: ConditionalType): Type | undefined {
if (type.resolvedConstraintOfDistributive !== undefined) {
return type.resolvedConstraintOfDistributive || 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
Expand All @@ -13622,10 +13626,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.resolvedConstraintOfDistributive = instantiated;
return instantiated;
}
}
}
type.resolvedConstraintOfDistributive = false;
return undefined;
}

Expand Down
2 changes: 2 additions & 0 deletions src/compiler/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6645,6 +6645,8 @@ export interface ConditionalType extends InstantiableType {
/** @internal */
resolvedDefaultConstraint?: Type;
/** @internal */
resolvedConstraintOfDistributive?: Type | false;
/** @internal */
mapper?: TypeMapper;
/** @internal */
combinedMapper?: TypeMapper;
Expand Down

0 comments on commit 3efcfcb

Please sign in to comment.