Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(eslint-plugin): [prefer-optional-chain] properly disambiguate between boolean and false #8685

Merged
merged 3 commits into from Mar 25, 2024
Merged

fix(eslint-plugin): [prefer-optional-chain] properly disambiguate between boolean and false #8685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
859ba24
make the example from the docs work
abrahamguo Mar 15, 2024
df089d8
revert
abrahamguo Mar 15, 2024
43a2514
allow falsey literals on last operand
abrahamguo Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 4 additions & 9 deletions packages/eslint-plugin/src/rules/prefer-optional-chain-utils/gatherLogicalOperands.ts
View file
Open in desktop
Expand Up @@ -61,17 +61,13 @@ type Operand = ValidOperand | InvalidOperand;
const NULLISH_FLAGS = ts.TypeFlags.Null | ts.TypeFlags.Undefined;
function isValidFalseBooleanCheckType(
node: TSESTree.Node,
operator: TSESTree.LogicalExpression['operator'],
checkType: 'true' | 'false',
disallowFalseyLiteral: boolean,
parserServices: ParserServicesWithTypeInformation,
options: PreferOptionalChainOptions,
): boolean {
const type = parserServices.getTypeAtLocation(node);
const types = unionTypeParts(type);

const disallowFalseyLiteral =
(operator === '||' && checkType === 'false') ||
(operator === '&&' && checkType === 'true');
if (disallowFalseyLiteral) {
/*
```
Expand Down Expand Up @@ -133,6 +129,7 @@ export function gatherLogicalOperands(
const { operands, newlySeenLogicals } = flattenLogicalOperands(node);

for (const operand of operands) {
const areMoreOperands = operand !== operands.at(-1);
switch (operand.type) {
case AST_NODE_TYPES.BinaryExpression: {
// check for "yoda" style logical: null != x
Expand Down Expand Up @@ -258,8 +255,7 @@ export function gatherLogicalOperands(
operand.operator === '!' &&
isValidFalseBooleanCheckType(
operand.argument,
node.operator,
'false',
areMoreOperands && node.operator === '||',
parserServices,
options,
)
Expand All @@ -285,8 +281,7 @@ export function gatherLogicalOperands(
if (
isValidFalseBooleanCheckType(
operand,
node.operator,
'true',
areMoreOperands && node.operator === '&&',
parserServices,
options,
)
Expand Down
19 changes: 19 additions & 0 deletions packages/eslint-plugin/tests/rules/prefer-optional-chain/prefer-optional-chain.test.ts
View file
Open in desktop
Expand Up @@ -1916,6 +1916,25 @@ describe('hand-crafted cases', () => {
},
],
},
{
code: `
declare const foo: { bar: boolean } | null | undefined;
declare function acceptsBoolean(arg: boolean): void;
acceptsBoolean(foo != null && foo.bar);
`,
output: `
declare const foo: { bar: boolean } | null | undefined;
declare function acceptsBoolean(arg: boolean): void;
acceptsBoolean(foo?.bar);
`,
options: [
{
allowPotentiallyUnsafeFixesThatModifyTheReturnTypeIKnowWhatImDoing:
true,
},
],
errors: [{ messageId: 'preferOptionalChain' }],
},
{
code: `
function foo(globalThis?: { Array: Function }) {
Expand Down