From f1c7c9fdc793320383c2798ac504d2ce147c3452 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 22 Jun 2024 10:37:47 +0200 Subject: [PATCH] Handle nullable discriminants in non-strictNullChecks mode --- src/compiler/checker.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 4ab2c808e23..ae82670ebff 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -24177,7 +24177,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { for (let i = 0; i < types.length; i++) { if (include[i]) { const targetType = getTypeOfPropertyOrIndexSignatureOfType(types[i], propertyName); - if (targetType && !isIntersectionEmpty(getDiscriminatingType(), targetType)) { + if (targetType && isMatchingDiscriminantType(getDiscriminatingType(), targetType)) { matched = true; } else { @@ -24196,6 +24196,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return filtered.flags & TypeFlags.Never ? target : filtered; } + function isMatchingDiscriminantType(source: Type, target: Type) { + return !strictNullChecks && !!(source.flags & TypeFlags.Nullable) || !isIntersectionEmpty(source, target); + } + /** * A type is 'weak' if it is an object type with at least one optional property * and no required properties, call/construct signatures or index signatures