diff --git a/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts b/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts index 97664597ef6d..1c9c76bfbacf 100644 --- a/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts +++ b/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts @@ -304,6 +304,19 @@ export default createRule({ ); } + // Conditional is always necessary if it involves: + // `any` or `unknown` or a naked type variable + function isConditionalAlwaysNecessary(type: ts.Type): boolean { + return tsutils + .unionTypeParts(type) + .some( + part => + isTypeAnyType(part) || + isTypeUnknownType(part) || + isTypeFlagSet(part, ts.TypeFlags.TypeVariable), + ); + } + function isNullableMemberExpression( node: TSESTree.MemberExpression, ): boolean { @@ -370,18 +383,7 @@ export default createRule({ const type = getConstrainedTypeAtLocation(services, expression); - // Conditional is always necessary if it involves: - // `any` or `unknown` or a naked type variable - if ( - tsutils - .unionTypeParts(type) - .some( - part => - isTypeAnyType(part) || - isTypeUnknownType(part) || - isTypeFlagSet(part, ts.TypeFlags.TypeVariable), - ) - ) { + if (isConditionalAlwaysNecessary(type)) { return; } let messageId: MessageId | null = null; @@ -813,7 +815,7 @@ export default createRule({ : true; return ( - isTypeFlagSet(type, ts.TypeFlags.Any | ts.TypeFlags.Unknown) || + isConditionalAlwaysNecessary(type) || (isOwnNullable && isNullableType(type)) ); } diff --git a/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts b/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts index e199e72fb43d..61bee3988958 100644 --- a/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts +++ b/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts @@ -143,6 +143,24 @@ function test(t: T | []) { return t ? 'yes' : 'no'; } `, + ` +function test(arg: T, key: keyof T) { + if (arg[key]?.toString()) { + } +} + `, + ` +function test(arg: T, key: keyof T) { + if (arg?.toString()) { + } +} + `, + ` +function test(arg: T | { value: string }) { + if (arg?.value) { + } +} + `, // Boolean expressions ` pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy