Skip to content

Commit

Permalink
feat: prefer-regex-literals support v flag (#17410)
Browse files Browse the repository at this point in the history 
* feat: `prefer-regex-literals` support `v` flag

* Update tests/lib/rules/prefer-regex-literals.js

Co-authored-by: Milos Djermanovic <milos.djermanovic@gmail.com>

---------

Co-authored-by: Milos Djermanovic <milos.djermanovic@gmail.com>
  • Loading branch information
@ota-meshi @mdjermanovic
ota-meshi and mdjermanovic committed Jul 25, 2023
1 parent a6a3ad4 commit b7fad2b
Show file tree
Hide file tree
Showing 3 changed files with 191 additions and 5 deletions.
12 changes: 9 additions & 3 deletions lib/rules/prefer-regex-literals.js
View file
Expand Up @@ -241,7 +241,7 @@ module.exports = {
/**
* Returns a ecmaVersion compatible for regexpp.
* @param {number} ecmaVersion The ecmaVersion to convert.
* @returns {import("regexpp/ecma-versions").EcmaVersion} The resulting ecmaVersion compatible for regexpp.
* @returns {import("@eslint-community/regexpp/ecma-versions").EcmaVersion} The resulting ecmaVersion compatible for regexpp.
*/
function getRegexppEcmaVersion(ecmaVersion) {
if (ecmaVersion <= 5) {
Expand Down Expand Up @@ -297,7 +297,10 @@ module.exports = {
const validator = new RegExpValidator({ ecmaVersion: regexppEcmaVersion });

try {
validator.validatePattern(pattern, 0, pattern.length, flags ? flags.includes("u") : false);
validator.validatePattern(pattern, 0, pattern.length, {
unicode: flags ? flags.includes("u") : false,
unicodeSets: flags ? flags.includes("v") : false
});
if (flags) {
validator.validateFlags(flags);
}
Expand Down Expand Up @@ -461,7 +464,10 @@ module.exports = {
if (regexContent && !noFix) {
let charIncrease = 0;

const ast = new RegExpParser({ ecmaVersion: regexppEcmaVersion }).parsePattern(regexContent, 0, regexContent.length, flags ? flags.includes("u") : false);
const ast = new RegExpParser({ ecmaVersion: regexppEcmaVersion }).parsePattern(regexContent, 0, regexContent.length, {
unicode: flags ? flags.includes("u") : false,
unicodeSets: flags ? flags.includes("v") : false
});

visitRegExpAST(ast, {
onCharacterEnter(characterNode) {
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/utils/regular-expressions.js
View file
Expand Up @@ -8,7 +8,7 @@

const { RegExpValidator } = require("@eslint-community/regexpp");

const REGEXPP_LATEST_ECMA_VERSION = 2022;
const REGEXPP_LATEST_ECMA_VERSION = 2024;

/**
* Checks if the given regular expression pattern would be valid with the `u` flag.
Expand Down
182 changes: 181 additions & 1 deletion tests/lib/rules/prefer-regex-literals.js
View file
Expand Up @@ -134,7 +134,10 @@ ruleTester.run("prefer-regex-literals", rule, {
{
code: "class C { #RegExp; foo() { globalThis.#RegExp('a'); } }",
env: { es2020: true }
}
},

// ES2024
"new RegExp('[[A--B]]' + a, 'v')"
],

invalid: [
Expand Down Expand Up @@ -2808,6 +2811,183 @@ ruleTester.run("prefer-regex-literals", rule, {
suggestions: null
}
]
},

// ES2024
{
code: "new RegExp('[[A--B]]', 'v')",
parserOptions: { ecmaVersion: 2024 },
errors: [
{
messageId: "unexpectedRegExp",
suggestions: [
{
messageId: "replaceWithLiteral",
output: "/[[A--B]]/v"
}
]
}
]
},
{
code: "new RegExp('[[A--B]]', 'v')",
parserOptions: { ecmaVersion: 2023 },
errors: [
{
messageId: "unexpectedRegExp",
suggestions: null
}
]
},
{
code: "new RegExp('[[A&&&]]', 'v')",
parserOptions: { ecmaVersion: 2024 },
errors: [
{
messageId: "unexpectedRegExp",
suggestions: null
}
]
},
{
code: "new RegExp('a', 'uv')",
parserOptions: { ecmaVersion: 2024 },
errors: [
{
messageId: "unexpectedRegExp",
suggestions: null
}
]
},
{
code: "new RegExp(/a/, 'v')",
options: [{ disallowRedundantWrapping: true }],
parserOptions: { ecmaVersion: 2024 },
errors: [
{
messageId: "unexpectedRedundantRegExpWithFlags",
suggestions: [
{
messageId: "replaceWithLiteralAndFlags",
output: "/a/v",
data: {
flags: "v"
}
}
]
}
]
},
{
code: "new RegExp(/a/, 'v')",
options: [{ disallowRedundantWrapping: true }],
parserOptions: { ecmaVersion: 2023 },
errors: [
{
messageId: "unexpectedRedundantRegExpWithFlags",
suggestions: null
}
]
},
{
code: "new RegExp(/a/g, 'v')",
options: [{ disallowRedundantWrapping: true }],
parserOptions: { ecmaVersion: 2024 },
errors: [
{
messageId: "unexpectedRedundantRegExpWithFlags",
suggestions: [
{
messageId: "replaceWithLiteralAndFlags",
output: "/a/v",
data: {
flags: "v"
}
},
{
messageId: "replaceWithIntendedLiteralAndFlags",
output: "/a/gv",
data: {
flags: "gv"
}
}
]
}
]
},
{
code: "new RegExp(/[[A--B]]/v, 'g')",
options: [{ disallowRedundantWrapping: true }],
parserOptions: { ecmaVersion: 2024 },
errors: [
{
messageId: "unexpectedRedundantRegExpWithFlags",
suggestions: [
{
messageId: "replaceWithIntendedLiteralAndFlags",
output: "/[[A--B]]/vg",
data: {
flags: "vg"
}
}

// suggestion with flags `g` would be invalid
]
}
]
},
{
code: "new RegExp(/a/u, 'v')",
options: [{ disallowRedundantWrapping: true }],
parserOptions: { ecmaVersion: 2024 },
errors: [
{
messageId: "unexpectedRedundantRegExpWithFlags",
suggestions: [
{
messageId: "replaceWithLiteralAndFlags",
output: "/a/v",
data: {
flags: "v"
}
}

// suggestion with merged flags `uv` would be invalid
]
}
]
},
{
code: "new RegExp(/a/v, 'u')",
options: [{ disallowRedundantWrapping: true }],
parserOptions: { ecmaVersion: 2024 },
errors: [
{
messageId: "unexpectedRedundantRegExpWithFlags",
suggestions: [
{
messageId: "replaceWithLiteralAndFlags",
output: "/a/u",
data: {
flags: "u"
}
}

// suggestion with merged flags `vu` would be invalid
]
}
]
},
{
code: "new RegExp(/[[A--B]]/v, 'u')",
options: [{ disallowRedundantWrapping: true }],
parserOptions: { ecmaVersion: 2024 },
errors: [
{
messageId: "unexpectedRedundantRegExpWithFlags",
suggestions: null
}
]
}
]
});
Expand Down

0 comments on commit b7fad2b

Please sign in to comment.