-
-
Notifications
You must be signed in to change notification settings - Fork 364
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into prefer-regexp-test
- Loading branch information
Showing
18 changed files
with
867 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# Disallow `new Array()` | ||
|
||
The ESLint built-in rule [`no-array-constructor`](https://eslint.org/docs/rules/no-array-constructor) enforces using an array literal instead of the `Array` constructor, but it still allows using the `Array` constructor with **one** argument. This rule fills that gap. | ||
|
||
When using the `Array` constructor with one argument, it's not clear whether the argument is meant to be the length of the array or the only element. | ||
|
||
This rule is fixable if the value type of the argument is known. | ||
|
||
## Fail | ||
|
||
```js | ||
const array = new Array(length); | ||
``` | ||
|
||
```js | ||
const array = new Array(onlyElement); | ||
``` | ||
|
||
```js | ||
const array = new Array(...unknownArgumentsList); | ||
``` | ||
|
||
## Pass | ||
|
||
```js | ||
const array = Array.from({length}); | ||
``` | ||
|
||
```js | ||
const array = [onlyElement]; | ||
``` | ||
|
||
```js | ||
const array = [...items]; | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
'use strict'; | ||
const {isParenthesized, getStaticValue} = require('eslint-utils'); | ||
const getDocumentationUrl = require('./utils/get-documentation-url'); | ||
const needsSemicolon = require('./utils/needs-semicolon'); | ||
|
||
const MESSAGE_ID_ERROR = 'error'; | ||
const MESSAGE_ID_LENGTH = 'array-length'; | ||
const MESSAGE_ID_ONLY_ELEMENT = 'only-element'; | ||
const MESSAGE_ID_SPREAD = 'spread'; | ||
const messages = { | ||
[MESSAGE_ID_ERROR]: 'Do not use `new Array()`.', | ||
[MESSAGE_ID_LENGTH]: 'The argument is the length of array.', | ||
[MESSAGE_ID_ONLY_ELEMENT]: 'The argument is the only element of array.', | ||
[MESSAGE_ID_SPREAD]: 'Spread the argument.' | ||
}; | ||
const newArraySelector = [ | ||
'NewExpression', | ||
'[callee.type="Identifier"]', | ||
'[callee.name="Array"]', | ||
'[arguments.length=1]' | ||
].join(''); | ||
|
||
function getProblem(context, node) { | ||
const problem = { | ||
node, | ||
messageId: MESSAGE_ID_ERROR | ||
}; | ||
|
||
const [argumentNode] = node.arguments; | ||
|
||
const sourceCode = context.getSourceCode(); | ||
let text = sourceCode.getText(argumentNode); | ||
if (isParenthesized(argumentNode, sourceCode)) { | ||
text = `(${text})`; | ||
} | ||
|
||
const maybeSemiColon = needsSemicolon(sourceCode.getTokenBefore(node), sourceCode, '[') ? | ||
';' : | ||
''; | ||
|
||
// We are not sure how many `arguments` passed | ||
if (argumentNode.type === 'SpreadElement') { | ||
problem.suggest = [ | ||
{ | ||
messageId: MESSAGE_ID_SPREAD, | ||
fix: fixer => fixer.replaceText(node, `${maybeSemiColon}[${text}]`) | ||
} | ||
]; | ||
return problem; | ||
} | ||
|
||
const result = getStaticValue(argumentNode, context.getScope()); | ||
const fromLengthText = `Array.from(${text === 'length' ? '{length}' : `{length: ${text}}`})`; | ||
const onlyElementText = `${maybeSemiColon}[${text}]`; | ||
|
||
// We don't know the argument is number or not | ||
if (result === null) { | ||
problem.suggest = [ | ||
{ | ||
messageId: MESSAGE_ID_LENGTH, | ||
fix: fixer => fixer.replaceText(node, fromLengthText) | ||
}, | ||
{ | ||
messageId: MESSAGE_ID_ONLY_ELEMENT, | ||
fix: fixer => fixer.replaceText(node, onlyElementText) | ||
} | ||
]; | ||
return problem; | ||
} | ||
|
||
problem.fix = fixer => fixer.replaceText( | ||
node, | ||
typeof result.value === 'number' ? fromLengthText : onlyElementText | ||
); | ||
|
||
return problem; | ||
} | ||
|
||
const create = context => ({ | ||
[newArraySelector](node) { | ||
context.report(getProblem(context, node)); | ||
} | ||
}); | ||
|
||
module.exports = { | ||
create, | ||
meta: { | ||
type: 'suggestion', | ||
docs: { | ||
url: getDocumentationUrl(__filename) | ||
}, | ||
fixable: 'code', | ||
messages | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
'use strict'; | ||
|
||
/** | ||
Check if the given node is a true logical expression or not. | ||
The three binary expressions logical-or (`||`), logical-and (`&&`), and coalesce (`??`) are known as `ShortCircuitExpression`, but ESTree represents these by the `LogicalExpression` node type. This function rejects coalesce expressions of `LogicalExpression` node type. | ||
@param {Node} node - The node to check. | ||
@returns {boolean} `true` if the node is `&&` or `||`. | ||
@see https://tc39.es/ecma262/#prod-ShortCircuitExpression | ||
*/ | ||
const isLogicalExpression = node => | ||
node && | ||
node.type === 'LogicalExpression' && | ||
(node.operator === '&&' || node.operator === '||'); | ||
|
||
module.exports = isLogicalExpression; |
67 changes: 67 additions & 0 deletions
67
rules/utils/should-add-parentheses-to-member-expression-object.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
'use strict'; | ||
|
||
const {isOpeningParenToken, isClosingParenToken} = require('eslint-utils'); | ||
|
||
// Determine whether this node is a decimal integer literal. | ||
// Copied from https://github.com/eslint/eslint/blob/cc4871369645c3409dc56ded7a555af8a9f63d51/lib/rules/utils/ast-utils.js#L1237 | ||
const DECIMAL_INTEGER_PATTERN = /^(?:0|0[0-7]*[89]\d*|[1-9](?:_?\d)*)$/u; | ||
const isDecimalInteger = node => | ||
node.type === 'Literal' && | ||
typeof node.value === 'number' && | ||
DECIMAL_INTEGER_PATTERN.test(node.raw); | ||
|
||
/** | ||
Determine if a constructor function is newed-up with parens. | ||
@param {Node} node - The `NewExpression` node to be checked. | ||
@param {SourceCode} sourceCode - The source code object. | ||
@returns {boolean} True if the constructor is called with parens. | ||
Copied from https://github.com/eslint/eslint/blob/cc4871369645c3409dc56ded7a555af8a9f63d51/lib/rules/no-extra-parens.js#L252 | ||
*/ | ||
function isNewExpressionWithParentheses(node, sourceCode) { | ||
if (node.arguments.length > 0) { | ||
return true; | ||
} | ||
|
||
const [penultimateToken, lastToken] = sourceCode.getLastTokens(node, 2); | ||
// The expression should end with its own parens, for example, `new new Foo()` is not a new expression with parens. | ||
return isOpeningParenToken(penultimateToken) && | ||
isClosingParenToken(lastToken) && | ||
node.callee.range[1] < node.range[1]; | ||
} | ||
|
||
/** | ||
Check if parentheses should to be added to a `node` when it's used as an `object` of `MemberExpression`. | ||
@param {Node} node - The AST node to check. | ||
@param {SourceCode} sourceCode - The source code object. | ||
@returns {boolean} | ||
*/ | ||
function shouldAddParenthesesToMemberExpressionObject(node, sourceCode) { | ||
switch (node.type) { | ||
// This is not a full list. Some other nodes like `FunctionDeclaration` don't need parentheses, | ||
// but it's not possible to be in the place we are checking at this point. | ||
case 'Identifier': | ||
case 'MemberExpression': | ||
case 'CallExpression': | ||
case 'ChainExpression': | ||
case 'TemplateLiteral': | ||
return false; | ||
case 'NewExpression': | ||
return !isNewExpressionWithParentheses(node, sourceCode); | ||
case 'Literal': { | ||
/* istanbul ignore next */ | ||
if (isDecimalInteger(node)) { | ||
return true; | ||
} | ||
|
||
return false; | ||
} | ||
|
||
default: | ||
return true; | ||
} | ||
} | ||
|
||
module.exports = shouldAddParenthesesToMemberExpressionObject; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.