Skip to content

Commit 922d47e

Browse files
committed
Fast path for negative case when relating to unions of primtives
1 parent ddcbd9f commit 922d47e

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

src/compiler/checker.ts

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16548,7 +16548,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1654816548
for (const u of unionTypes) {
1654916549
if (!containsType(u.types, type)) {
1655016550
const primitive = type.flags & TypeFlags.StringLiteral ? stringType :
16551-
type.flags & TypeFlags.NumberLiteral ? numberType :
16551+
type.flags & (TypeFlags.Enum | TypeFlags.NumberLiteral) ? numberType :
1655216552
type.flags & TypeFlags.BigIntLiteral ? bigintType :
1655316553
type.flags & TypeFlags.UniqueESSymbol ? esSymbolType :
1655416554
undefined;
@@ -16584,10 +16584,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1658416584
return false;
1658516585
}
1658616586

16587-
function eachIsUnionContaining(types: Type[], flag: TypeFlags) {
16588-
return every(types, t => !!(t.flags & TypeFlags.Union) && some((t as UnionType).types, tt => !!(tt.flags & flag)));
16589-
}
16590-
1659116587
function removeFromEach(types: Type[], flag: TypeFlags) {
1659216588
for (let i = 0; i < types.length; i++) {
1659316589
types[i] = filterType(types[i], t => !(t.flags & flag));
@@ -16719,12 +16715,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1671916715
// reduced we'll never reduce again, so this occurs at most once.
1672016716
result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
1672116717
}
16722-
else if (eachIsUnionContaining(typeSet, TypeFlags.Undefined)) {
16718+
else if (every(typeSet, t => !!(t.flags & TypeFlags.Union && (t as UnionType).types[0].flags & TypeFlags.Undefined))) {
1672316719
const containedUndefinedType = some(typeSet, containsMissingType) ? missingType : undefinedType;
1672416720
removeFromEach(typeSet, TypeFlags.Undefined);
1672516721
result = getUnionType([getIntersectionType(typeSet), containedUndefinedType], UnionReduction.Literal, aliasSymbol, aliasTypeArguments);
1672616722
}
16727-
else if (eachIsUnionContaining(typeSet, TypeFlags.Null)) {
16723+
else if (every(typeSet, t => !!(t.flags & TypeFlags.Union && ((t as UnionType).types[0].flags & TypeFlags.Null || (t as UnionType).types[1].flags & TypeFlags.Null)))) {
1672816724
removeFromEach(typeSet, TypeFlags.Null);
1672916725
result = getUnionType([getIntersectionType(typeSet), nullType], UnionReduction.Literal, aliasSymbol, aliasTypeArguments);
1673016726
}
@@ -20837,6 +20833,20 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
2083720833
if (containsType(targetTypes, source)) {
2083820834
return Ternary.True;
2083920835
}
20836+
if (getObjectFlags(target) & ObjectFlags.PrimitiveUnion && !(source.flags & TypeFlags.EnumLiteral) && (
20837+
source.flags & (TypeFlags.StringLiteral | TypeFlags.BooleanLiteral | TypeFlags.BigIntLiteral) ||
20838+
(relation === subtypeRelation || relation === strictSubtypeRelation) && source.flags & TypeFlags.NumberLiteral)) {
20839+
// When relating a literal type to a union of primitive types, we know the relation is false unless
20840+
// the union contains the base primitive type or the string literal type in one of its fresh/regular forms.
20841+
// We exclude numeric literals for non-subtype relations because numeric literals are assignable to
20842+
// numeric enum literals with the same value.
20843+
const alternateForm = source === (source as StringLiteralType).regularType ? (source as StringLiteralType).freshType : (source as StringLiteralType).regularType;
20844+
const primitive = source.flags & TypeFlags.StringLiteral ? stringType :
20845+
source.flags & TypeFlags.NumberLiteral ? numberType :
20846+
source.flags & TypeFlags.BigIntLiteral ? bigintType :
20847+
undefined;
20848+
return primitive && containsType(targetTypes, primitive) || alternateForm && containsType(targetTypes, alternateForm) ? Ternary.True : Ternary.False;
20849+
}
2084020850
const match = getMatchingUnionConstituentForType(target as UnionType, source);
2084120851
if (match) {
2084220852
const related = isRelatedTo(source, match, RecursionFlags.Target, /*reportErrors*/ false);

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6130,7 +6130,7 @@ export const enum TypeFlags {
61306130
/** @internal */
61316131
IncludesInstantiable = Substitution,
61326132
/** @internal */
6133-
NotPrimitiveUnion = Any | Unknown | Enum | Void | Never | Object | Intersection | IncludesInstantiable,
6133+
NotPrimitiveUnion = Any | Unknown | Void | Never | Object | Intersection | IncludesInstantiable,
61346134
}
61356135

61366136
export type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;

0 commit comments

Comments
 (0)