Skip to content

Commit

Permalink
fix(eslint-plugin): [prefer-regexp-exec] respect flags when using `Re…
Browse files Browse the repository at this point in the history
…gExp` (#3855)
  • Loading branch information
rafaelss95 committed Sep 21, 2021
1 parent 4195919 commit ffdb5ff
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 5 deletions.
27 changes: 23 additions & 4 deletions packages/eslint-plugin/src/rules/prefer-regexp-exec.ts
Expand Up @@ -75,13 +75,31 @@ export default createRule({
return result;
}

function isLikelyToContainGlobalFlag(
node: TSESTree.CallExpressionArgument,
): boolean {
if (
node.type === AST_NODE_TYPES.CallExpression ||
node.type === AST_NODE_TYPES.NewExpression
) {
const [, flags] = node.arguments;
return (
flags.type === AST_NODE_TYPES.Literal &&
typeof flags.value === 'string' &&
flags.value.includes('g')
);
}

return node.type === AST_NODE_TYPES.Identifier;
}

return {
"CallExpression[arguments.length=1] > MemberExpression.callee[property.name='match'][computed=false]"(
memberNode: TSESTree.MemberExpression,
): void {
const objectNode = memberNode.object;
const callNode = memberNode.parent as TSESTree.CallExpression;
const argumentNode = callNode.arguments[0];
const [argumentNode] = callNode.arguments;
const argumentValue = getStaticValue(argumentNode, globalScope);

if (
Expand All @@ -96,9 +114,10 @@ export default createRule({

// Don't report regular expressions with global flag.
if (
argumentValue &&
argumentValue.value instanceof RegExp &&
argumentValue.value.flags.includes('g')
(!argumentValue && isLikelyToContainGlobalFlag(argumentNode)) ||
(argumentValue &&
argumentValue.value instanceof RegExp &&
argumentValue.value.flags.includes('g'))
) {
return;
}
Expand Down
58 changes: 57 additions & 1 deletion packages/eslint-plugin/tests/rules/prefer-regexp-exec.test.ts
@@ -1,5 +1,5 @@
import rule from '../../src/rules/prefer-regexp-exec';
import { RuleTester, getFixturesRootDir } from '../RuleTester';
import { getFixturesRootDir, RuleTester } from '../RuleTester';

const rootPath = getFixturesRootDir();

Expand Down Expand Up @@ -56,6 +56,24 @@ const matchers = [{ match: (s: RegExp) => false }];
const file = '';
matchers.some(matcher => !!file.match(matcher));
`,
// https://github.com/typescript-eslint/typescript-eslint/issues/3477
`
function test(pattern: string) {
'hello hello'.match(RegExp(pattern, 'g'))?.reduce(() => []);
}
`,
// https://github.com/typescript-eslint/typescript-eslint/issues/3477
`
function test(pattern: string) {
'hello hello'.match(new RegExp(pattern, 'gi'))?.reduce(() => []);
}
`,
// https://github.com/typescript-eslint/typescript-eslint/issues/3477
`
const matchCount = (str: string, re: RegExp) => {
return (str.match(re) || []).length;
};
`,
],
invalid: [
{
Expand Down Expand Up @@ -174,6 +192,44 @@ function f<T extends 'a' | 'b'>(s: T) {
output: `
function f<T extends 'a' | 'b'>(s: T) {
/thing/.exec(s);
}
`,
},
{
code: `
const text = 'something';
const search = new RegExp('test', '');
text.match(search);
`,
errors: [
{
messageId: 'regExpExecOverStringMatch',
line: 4,
column: 6,
},
],
output: `
const text = 'something';
const search = new RegExp('test', '');
search.exec(text);
`,
},
{
code: `
function test(pattern: string) {
'check'.match(new RegExp(pattern, undefined));
}
`,
errors: [
{
messageId: 'regExpExecOverStringMatch',
line: 3,
column: 11,
},
],
output: `
function test(pattern: string) {
new RegExp(pattern, undefined).exec('check');
}
`,
},
Expand Down

0 comments on commit ffdb5ff

Please sign in to comment.