Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

feat(eslint-plugin): [prefer-nullish-coalescing] add ignoreTernaryTests option#4965

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.

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

Already on GitHub?Sign in to your account

Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
25 commits
Select commitHold shift + click to select a range
a07ac2d
feat(eslint-plugin): added ignoreTernaryTests option to prefer-nullis…
jguddasMay 12, 2022
0487bb7
feat(eslint-plugin): added checking of loose equal ternary cases for …
jguddasMay 16, 2022
33a6053
feat(eslint-plugin): fixed typo in docs for prefer-nullish-coalescing…
jguddasMay 16, 2022
b7b0758
feat(eslint-plugin): added more test cases for prefer-nullish-coalesc…
jguddasMay 16, 2022
42e9737
feat(eslint-plugin): added support for MemberExpressions for ignoreTe…
jguddasMay 19, 2022
61b9680
refactor(eslint-plugin): cleanup prefer-nullish-coalescing rule
jguddasMay 25, 2022
40609b1
test(eslint-plugin): added missing test case for prefer-nullish-coale…
jguddasMay 25, 2022
e9626e9
chore: removed currently not supported comment
jguddasJun 11, 2022
81f1a1d
refactor: simplified return statement
jguddasJun 11, 2022
060002a
refactor: renamed utilities
jguddasJun 11, 2022
a20e741
refactor: used new utilities in prefer-optional-chain.ts
jguddasJun 11, 2022
ee6bbf6
refactor: simplified prefer-nullish-coalescing.ts
jguddasJun 11, 2022
0726c9d
test: added test case for prefer-nullish-coalescing
jguddasJun 11, 2022
c4146c0
refactor: renamed message id to preferNullishOverOr
jguddasJun 11, 2022
65415e6
fix: covered edge case where we have two loose comparisons
jguddasJun 11, 2022
dda02a3
refactor: removed useless .trim
jguddasJun 11, 2022
cafa047
chore: fixed typo
jguddasJun 11, 2022
8ee505c
test: added more test cases
jguddasJun 11, 2022
119f14d
fix: fixed tests
jguddasJun 11, 2022
31966ff
chore: fixed typo
jguddasJun 11, 2022
3d0eab1
test: added more test cases
jguddasJun 11, 2022
73034b0
refactor: inlined getOperator and getNodes
jguddasJun 13, 2022
4ef1ef7
perf: skip type check if both null and undefined are not checked
jguddasJun 13, 2022
3b36d89
Merge branch 'main' into feat/eslint-plugin-added-ignoreTernaryTests-…
JoshuaKGoldbergJul 23, 2022
67e7ab5
Apply suggestions from code review
JoshuaKGoldbergJul 23, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,19 +46,61 @@ This rule aims enforce the usage of the safer operator.
```ts
type Options = [
{
ignoreTernaryTests?: boolean;
ignoreConditionalTests?: boolean;
ignoreMixedLogicalExpressions?: boolean;
},
];

const defaultOptions = [
{
ignoreTernaryTests: true;
ignoreConditionalTests: true,
ignoreMixedLogicalExpressions: true,
},
];
```

### `ignoreTernaryTests`

Setting this option to `true` (the default) will cause the rule to ignore any ternary expressions that could be simplified by using the nullish coalescing operator.

Incorrect code for `ignoreTernaryTests: false`, and correct code for `ignoreTernaryTests: true`:

```ts
const foo: any = 'bar';
foo !== undefined && foo !== null ? foo : 'a string';
foo === undefined || foo === null ? 'a string' : foo;
foo == undefined ? 'a string' : foo;
foo == null ? 'a string' : foo;

const foo: string | undefined = 'bar';
foo !== undefined ? foo : 'a string';
foo === undefined ? 'a string' : foo;

const foo: string | null = 'bar';
foo !== null ? foo : 'a string';
foo === null ? 'a string' : foo;
```

Correct code for `ignoreTernaryTests: false`:

```ts
const foo: any = 'bar';
foo ?? 'a string';
foo ?? 'a string';
foo ?? 'a string';
foo ?? 'a string';

const foo: string | undefined = 'bar';
foo ?? 'a string';
foo ?? 'a string';

const foo: string | null = 'bar';
foo ?? 'a string';
foo ?? 'a string';
```

### `ignoreConditionalTests`

Setting this option to `true` (the default) will cause the rule to ignore any cases that are located within a conditional test.
Expand Down
186 changes: 182 additions & 4 deletionspackages/eslint-plugin/src/rules/prefer-nullish-coalescing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,20 @@ import {
TSESTree,
} from '@typescript-eslint/utils';
import * as util from '../util';
import * as ts from 'typescript';

export type Options = [
{
ignoreConditionalTests?: boolean;
ignoreTernaryTests?: boolean;
ignoreMixedLogicalExpressions?: boolean;
},
];
export type MessageIds = 'preferNullish' | 'suggestNullish';

export type MessageIds =
| 'preferNullishOverOr'
| 'preferNullishOverTernary'
| 'suggestNullish';

export default util.createRule<Options, MessageIds>({
name: 'prefer-nullish-coalescing',
Expand All@@ -27,8 +33,10 @@ export default util.createRule<Options, MessageIds>({
},
hasSuggestions: true,
messages: {
preferNullish:
preferNullishOverOr:
'Prefer using nullish coalescing operator (`??`) instead of a logical or (`||`), as it is a safer operator.',
preferNullishOverTernary:
'Prefer using nullish coalescing operator (`??`) instead of a ternary expression, as it is simpler to read.',
suggestNullish: 'Fix to nullish coalescing operator (`??`).',
},
schema: [
Expand All@@ -38,6 +46,9 @@ export default util.createRule<Options, MessageIds>({
ignoreConditionalTests: {
type: 'boolean',
},
ignoreTernaryTests: {
type: 'boolean',
},
ignoreMixedLogicalExpressions: {
type: 'boolean',
},
Expand All@@ -52,15 +63,182 @@ export default util.createRule<Options, MessageIds>({
defaultOptions: [
{
ignoreConditionalTests: true,
ignoreTernaryTests: true,
ignoreMixedLogicalExpressions: true,
},
],
create(context, [{ ignoreConditionalTests, ignoreMixedLogicalExpressions }]) {
create(
context,
[
{
ignoreConditionalTests,
ignoreTernaryTests,
ignoreMixedLogicalExpressions,
},
],
) {
const parserServices = util.getParserServices(context);
const sourceCode = context.getSourceCode();
const checker = parserServices.program.getTypeChecker();

return {
ConditionalExpression(node: TSESTree.ConditionalExpression): void {
if (ignoreTernaryTests) {
return;
}

let operator: '==' | '!=' | '===' | '!==' | undefined;
let nodesInsideTestExpression: TSESTree.Node[] = [];
if (node.test.type === AST_NODE_TYPES.BinaryExpression) {
nodesInsideTestExpression = [node.test.left, node.test.right];
if (
node.test.operator === '==' ||
node.test.operator === '!=' ||
node.test.operator === '===' ||
node.test.operator === '!=='
) {
operator = node.test.operator;
}
} else if (
node.test.type === AST_NODE_TYPES.LogicalExpression &&
node.test.left.type === AST_NODE_TYPES.BinaryExpression &&
node.test.right.type === AST_NODE_TYPES.BinaryExpression
) {
nodesInsideTestExpression = [
node.test.left.left,
node.test.left.right,
node.test.right.left,
node.test.right.right,
];
if (node.test.operator === '||') {
if (
node.test.left.operator === '===' &&
node.test.right.operator === '==='
) {
operator = '===';
} else if (
((node.test.left.operator === '===' ||
node.test.right.operator === '===') &&
(node.test.left.operator === '==' ||
node.test.right.operator === '==')) ||
(node.test.left.operator === '==' &&
node.test.right.operator === '==')
) {
operator = '==';
}
} else if (node.test.operator === '&&') {
if (
node.test.left.operator === '!==' &&
node.test.right.operator === '!=='
) {
operator = '!==';
} else if (
((node.test.left.operator === '!==' ||
node.test.right.operator === '!==') &&
(node.test.left.operator === '!=' ||
node.test.right.operator === '!=')) ||
(node.test.left.operator === '!=' &&
node.test.right.operator === '!=')
) {
operator = '!=';
}
}
Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

The other way to solve this is to put a bunch ofelse { return; } here instead of the oneif (!operator) { return; } at the end

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Yeah I tried refactoring a bit and couldn't find anything significantly cleaner. 🤷

}

if (!operator) {
return;
}

let identifier: TSESTree.Node | undefined;
let hasUndefinedCheck = false;
let hasNullCheck = false;

// we check that the test only contains null, undefined and the identifier
for (const testNode of nodesInsideTestExpression) {
if (util.isNullLiteral(testNode)) {
hasNullCheck = true;
} else if (util.isUndefinedIdentifier(testNode)) {
hasUndefinedCheck = true;
} else if (
(operator === '!==' || operator === '!=') &&
util.isNodeEqual(testNode, node.consequent)
) {
identifier = testNode;
} else if (
(operator === '===' || operator === '==') &&
util.isNodeEqual(testNode, node.alternate)
) {
identifier = testNode;
} else {
return;
}
}

if (!identifier) {
return;
}

const isFixable = ((): boolean => {
// it is fixable if we check for both null and undefined, or not if neither
if (hasUndefinedCheck === hasNullCheck) {
return hasUndefinedCheck;
}

// it is fixable if we loosely check for either null or undefined
if (operator === '==' || operator === '!=') {
return true;
}

const tsNode = parserServices.esTreeNodeToTSNodeMap.get(identifier);
const type = checker.getTypeAtLocation(tsNode);
const flags = util.getTypeFlags(type);

if (flags & (ts.TypeFlags.Any | ts.TypeFlags.Unknown)) {
return false;
}

const hasNullType = (flags & ts.TypeFlags.Null) !== 0;

// it is fixable if we check for undefined and the type is not nullable
if (hasUndefinedCheck && !hasNullType) {
return true;
}

const hasUndefinedType = (flags & ts.TypeFlags.Undefined) !== 0;

// it is fixable if we check for null and the type can't be undefined
return hasNullCheck && !hasUndefinedType;
})();

if (isFixable) {
context.report({
node,
messageId: 'preferNullishOverTernary',
suggest: [
{
messageId: 'suggestNullish',
fix(fixer: TSESLint.RuleFixer): TSESLint.RuleFix {
const [left, right] =
operator === '===' || operator === '=='
? [node.alternate, node.consequent]
: [node.consequent, node.alternate];
return fixer.replaceText(
node,
`${sourceCode.text.slice(
left.range[0],
left.range[1],
)} ?? ${sourceCode.text.slice(
right.range[0],
right.range[1],
)}`,
);
},
},
],
});
}
},

'LogicalExpression[operator = "||"]'(
node: TSESTree.LogicalExpression,
): void {
Expand DownExpand Up@@ -110,7 +288,7 @@ export default util.createRule<Options, MessageIds>({

context.report({
node: barBarOperator,
messageId: 'preferNullish',
messageId: 'preferNullishOverOr',
suggest: [
{
messageId: 'suggestNullish',
Expand Down
22 changes: 4 additions & 18 deletionspackages/eslint-plugin/src/rules/prefer-optional-chain.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -437,24 +437,10 @@ function isValidChainTarget(
- foo !== undefined
- foo != undefined
*/
if (
return (
node.type === AST_NODE_TYPES.BinaryExpression &&
['!==', '!='].includes(node.operator) &&
isValidChainTarget(node.left, allowIdentifier)
) {
if (
node.right.type === AST_NODE_TYPES.Identifier &&
node.right.name === 'undefined'
) {
return true;
}
if (
node.right.type === AST_NODE_TYPES.Literal &&
node.right.value === null
) {
return true;
}
}

return false;
isValidChainTarget(node.left, allowIdentifier) &&
(util.isUndefinedIdentifier(node.right) || util.isNullLiteral(node.right))
);
}
3 changes: 3 additions & 0 deletionspackages/eslint-plugin/src/util/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,9 @@ export * from './getThisExpression';
export * from './getWrappingFixer';
export * from './misc';
export * from './objectIterators';
export * from './isNullLiteral';
export * from './isUndefinedIdentifier';
export * from './isNodeEqual';

// this is done for convenience - saves migrating all of the old rules
export * from '@typescript-eslint/type-utils';
Expand Down
31 changes: 31 additions & 0 deletionspackages/eslint-plugin/src/util/isNodeEqual.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils';

export function isNodeEqual(a: TSESTree.Node, b: TSESTree.Node): boolean {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Nit: this name is a little non-specific. Maybe...

Suggested change
exportfunctionisNodeEqual(a:TSESTree.Node,b:TSESTree.Node):boolean{
exportfunctiondoNodesContainSameValue(a:TSESTree.Node,b:TSESTree.Node):boolean{

There's almost certainly a better name out there thandoNodesContainSameValue, so that's just a starting thought.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I will think about this one.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I have thought about this, I don't likedoNodesContainSameValue since we don't just compare the contents or value.

I however also have no idea for a better name 🤷‍♂️

JoshuaKGoldberg reacted with laugh emoji
if (a.type !== b.type) {
return false;
}
if (
a.type === AST_NODE_TYPES.ThisExpression &&
b.type === AST_NODE_TYPES.ThisExpression
) {
return true;
}
if (a.type === AST_NODE_TYPES.Literal && b.type === AST_NODE_TYPES.Literal) {
return a.value === b.value;
}
if (
a.type === AST_NODE_TYPES.Identifier &&
b.type === AST_NODE_TYPES.Identifier
) {
return a.name === b.name;
}
if (
a.type === AST_NODE_TYPES.MemberExpression &&
b.type === AST_NODE_TYPES.MemberExpression
) {
return (
isNodeEqual(a.property, b.property) && isNodeEqual(a.object, b.object)
);
}
return false;
}
5 changes: 5 additions & 0 deletionspackages/eslint-plugin/src/util/isNullLiteral.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils';

export function isNullLiteral(i: TSESTree.Node): boolean {
return i.type === AST_NODE_TYPES.Literal && i.value === null;
}
5 changes: 5 additions & 0 deletionspackages/eslint-plugin/src/util/isUndefinedIdentifier.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils';

export function isUndefinedIdentifier(i: TSESTree.Node): boolean {
return i.type === AST_NODE_TYPES.Identifier && i.name === 'undefined';
}
Loading

[8]ページ先頭

©2009-2025 Movatter.jp