Merge branch 'master' into sort-character-class-elements

Author: RunDevelopment

.changeset/early-guests-hug.md

@@ -0,0 +1,5 @@
+---
+"eslint-plugin-regexp": minor
+---
+
+Add support for v flag to `regexp/prefer-unicode-codepoint-escapes` rule

.changeset/friendly-walls-reply.md

@@ -0,0 +1,5 @@
+---
+"eslint-plugin-regexp": minor
+---
+
+Add support for v flag to `regexp/no-dupe-characters-character-class` rule

.changeset/gold-baboons-clap.md

@@ -0,0 +1,5 @@
+---
+"eslint-plugin-regexp": minor
+---
+
+Add support for v flag to  `regexp/no-useless-character-class` rule

.changeset/large-dingos-allow.md

@@ -0,0 +1,5 @@
+---
+"eslint-plugin-regexp": minor
+---
+
+Add support for v flag to `regexp/unicode-escape` rule

.changeset/neat-rats-sneeze.md

@@ -0,0 +1,5 @@
+---
+"eslint-plugin-regexp": minor
+---
+
+Add support for `v` flag to `regexp/no-contradiction-with-assertion`

.changeset/pre.json

@@ -10,11 +10,14 @@
     "clever-jobs-clap",
     "curvy-shoes-kiss",
     "cyan-waves-notice",
+    "early-guests-hug",
     "heavy-rings-reply",
     "hungry-spoons-mix",
     "khaki-colts-tell",
+    "large-dingos-allow",
     "loud-flowers-search",
     "lovely-brooms-explode",
+    "neat-rats-sneeze",
     "short-dingos-dance",
     "six-squids-look",
     "small-doors-lie",

.changeset/rich-ways-exercise.md

@@ -0,0 +1,5 @@
+---
+"eslint-plugin-regexp": minor
+---
+
+Improve `regexp/sort-alternatives` rule to add support for string alternatives and v flag

.changeset/sour-feet-explain.md

@@ -0,0 +1,5 @@
+---
+"eslint-plugin-regexp": minor
+---
+
+Add `regexp/require-unicode-sets-regexp` rule

.eslintignore

@@ -3,6 +3,7 @@
 /dist
 /docs/.vitepress/dist
 /docs/.vitepress/build-system/shim/eslint.mjs
+/docs/.vitepress/cache
 /node_modules
 /assets
 !/docs/.vitepress

.gitignore

@@ -105,3 +105,4 @@ dist
 
 ## Repo
 docs/.vitepress/build-system/shim/eslint.mjs
+docs/.vitepress/cache

CHANGELOG.md

@@ -1,5 +1,17 @@
 # eslint-plugin-regexp
 
+## 2.0.0-next.6
+
+### Minor Changes
+
+-   Add support for v flag to `regexp/prefer-unicode-codepoint-escapes` rule ([#592](https://github.com/ota-meshi/eslint-plugin-regexp/pull/592))
+
+-   Add support for v flag to `regexp/unicode-escape` rule ([#592](https://github.com/ota-meshi/eslint-plugin-regexp/pull/592))
+
+### Patch Changes
+
+-   Add support for `v` flag to `regexp/no-contradiction-with-assertion` ([#606](https://github.com/ota-meshi/eslint-plugin-regexp/pull/606))
+
 ## 2.0.0-next.5
 
 ### Minor Changes

README.md

@@ -166,6 +166,7 @@ The `plugin:regexp/all` config enables all rules. It's meant for testing, not fo
 | [prefer-regexp-exec](https://ota-meshi.github.io/eslint-plugin-regexp/rules/prefer-regexp-exec.html)                                       | enforce that `RegExp#exec` is used instead of `String#match` if no global flag is provided |    |    |    |    |
 | [prefer-regexp-test](https://ota-meshi.github.io/eslint-plugin-regexp/rules/prefer-regexp-test.html)                                       | enforce that `RegExp#test` is used instead of `String#match` and `RegExp#exec`             |    |    | 🔧 |    |
 | [require-unicode-regexp](https://ota-meshi.github.io/eslint-plugin-regexp/rules/require-unicode-regexp.html)                               | enforce the use of the `u` flag                                                            |    |    | 🔧 |    |
+| [require-unicode-sets-regexp](https://ota-meshi.github.io/eslint-plugin-regexp/rules/require-unicode-sets-regexp.html)                     | enforce the use of the `v` flag                                                            |    |    | 🔧 |    |
 | [sort-alternatives](https://ota-meshi.github.io/eslint-plugin-regexp/rules/sort-alternatives.html)                                         | sort alternatives if order doesn't matter                                                  |    |    | 🔧 |    |
 | [use-ignore-case](https://ota-meshi.github.io/eslint-plugin-regexp/rules/use-ignore-case.html)                                             | use the `i` flag if it simplifies the pattern                                              | ✅  |    | 🔧 |    |
 

docs/.vitepress/config.ts renamed to docs/.vitepress/config.mts

@@ -3,18 +3,13 @@ import { defineConfig } from "vitepress"
 import { BUNDLED_LANGUAGES } from "shiki"
 import path from "path"
 import { fileURLToPath } from "url"
-import { rules } from "../../lib/utils/rules"
-import type { RuleModule } from "../../lib/types"
+import { rules } from "../../lib/utils/rules.js"
+import type { RuleModule } from "../../lib/types.js"
 
 // Pre-build cjs packages that cannot be bundled well.
 import "./build-system/build"
 
-const dirname = path.dirname(
-    fileURLToPath(
-        // @ts-expect-error -- Cannot change `module` option
-        import.meta.url,
-    ),
-)
+const dirname = path.dirname(fileURLToPath(import.meta.url))
 
 // Include `json5` as alias for jsonc
 const jsonc = BUNDLED_LANGUAGES.find((lang) => lang.id === "jsonc")
@@ -67,6 +62,12 @@ export default defineConfig({
 
     lastUpdated: true,
     themeConfig: {
+        search: {
+            provider: "local",
+            options: {
+                detailedView: true,
+            },
+        },
         editLink: {
             pattern:
                 "https://github.com/ota-meshi/eslint-plugin-regexp/edit/master/docs/:path",
@@ -92,17 +93,17 @@ export default defineConfig({
                 },
                 {
                     text: "Possible Errors",
-                    collapsible: false,
+                    collapsed: false,
                     items: categories["Possible Errors"].map(ruleToSidebarItem),
                 },
                 {
                     text: "Best Practices",
-                    collapsible: false,
+                    collapsed: false,
                     items: categories["Best Practices"].map(ruleToSidebarItem),
                 },
                 {
                     text: "Stylistic Issues",
-                    collapsible: false,
+                    collapsed: false,
                     items: categories["Stylistic Issues"].map(
                         ruleToSidebarItem,
                     ),
@@ -111,7 +112,7 @@ export default defineConfig({
                     ? [
                           {
                               text: "Deprecated",
-                              collapsible: false,
+                              collapsed: false,
                               items: categories.deprecated.map(
                                   ruleToSidebarItem,
                               ),

docs/rules/index.md

@@ -73,6 +73,7 @@ sidebarDepth: 0
 | [prefer-regexp-exec](prefer-regexp-exec.md)                                       | enforce that `RegExp#exec` is used instead of `String#match` if no global flag is provided |    |    |    |    |
 | [prefer-regexp-test](prefer-regexp-test.md)                                       | enforce that `RegExp#test` is used instead of `String#match` and `RegExp#exec`             |    |    | 🔧 |    |
 | [require-unicode-regexp](require-unicode-regexp.md)                               | enforce the use of the `u` flag                                                            |    |    | 🔧 |    |
+| [require-unicode-sets-regexp](require-unicode-sets-regexp.md)                     | enforce the use of the `v` flag                                                            |    |    | 🔧 |    |
 | [sort-alternatives](sort-alternatives.md)                                         | sort alternatives if order doesn't matter                                                  |    |    | 🔧 |    |
 | [use-ignore-case](use-ignore-case.md)                                             | use the `i` flag if it simplifies the pattern                                              | ✅  |    | 🔧 |    |
 

docs/rules/require-unicode-sets-regexp.md

@@ -0,0 +1,68 @@
+---
+pageClass: "rule-details"
+sidebarDepth: 0
+title: "regexp/require-unicode-sets-regexp"
+description: "enforce the use of the `v` flag"
+---
+# regexp/require-unicode-sets-regexp
+
+🔧 This rule is automatically fixable by the [`--fix` CLI option](https://eslint.org/docs/latest/user-guide/command-line-interface#--fix).
+
+<!-- end auto-generated rule header -->
+
+> enforce the use of the `v` flag
+
+## :book: Rule Details
+
+This rule reports regular expressions without the `v` flag.
+
+It will automatically replace the `v` flag to regular expressions where it is already uses the 'u' flag and statically guaranteed to be safe to do so. In all other cases, the developer has to check that adding the `v` flag doesn't cause the regex to behave incorrectly.
+
+If you want to automatically add the `v` flag to legacy regular expressions that don't use the `u` flag, use them together with the [regexp/require-unicode-regexp] rule.
+
+<eslint-code-block fix>
+
+```js
+/* eslint regexp/require-unicode-sets-regexp: "error" */
+
+/* ✓ GOOD */
+var foo = /foo/v;
+var foo = /a\s+b/v;
+
+/* ✗ BAD */
+var foo = /foo/;
+var foo = RegExp("a\\s+b");
+var foo = /[a-z]/i;
+var foo = /\S/;
+var foo = /foo/u;
+var foo = RegExp("a\\s+b", 'u');
+var foo = /[a-z]/iu;
+var foo = /\S/u;
+```
+
+</eslint-code-block>
+
+## :wrench: Options
+
+Nothing.
+
+## :couple: Related rules
+
+- [regexp/require-unicode-regexp]
+
+[regexp/require-unicode-regexp]: ./require-unicode-regexp.md
+
+## :books: Further reading
+
+- [require-unicode-regexp]
+
+[require-unicode-regexp]: https://eslint.org/docs/rules/require-unicode-regexp
+
+## :rocket: Version
+
+:exclamation: <badge text="This rule has not been released yet." vertical="middle" type="error"> ***This rule has not been released yet.*** </badge>
+
+## :mag: Implementation
+
+- [Rule source](https://github.com/ota-meshi/eslint-plugin-regexp/blob/master/lib/rules/require-unicode-sets-regexp.ts)
+- [Test source](https://github.com/ota-meshi/eslint-plugin-regexp/blob/master/tests/lib/rules/require-unicode-sets-regexp.ts)

docs/rules/sort-alternatives.md

@@ -19,7 +19,8 @@ This rule will sort alternatives to improve readability and maintainability.
 
 The primary target of this rule are lists of words and/or numbers. These lists are somewhat common, and sorting them makes it easy for readers to check whether a particular word or number is included.
 
-This rule will only sort alternatives if reordering the alternatives doesn't affect the pattern.
+This rule will only sort alternatives if reordering the alternatives doesn't affect the pattern.\
+However, character classes containing strings are ensured to match the longest string, so they can always be sorted.
 
 <eslint-code-block fix>
 
@@ -29,11 +30,13 @@ This rule will only sort alternatives if reordering the alternatives doesn't aff
 /* ✓ GOOD */
 var foo = /\b(1|2|3)\b/;
 var foo = /\b(alpha|beta|gamma)\b/;
+var foo = /[\q{blue|green|red}]/v;
 
 /* ✗ BAD */
 var foo = /\b(2|1|3)\b/;
 var foo = /__(?:Foo|Bar)__/;
 var foo = /\((?:TM|R|C)\)/;
+var foo = /[\q{red|green|blue}]/v;
 ```
 
 </eslint-code-block>

lib/rules/no-contradiction-with-assertion.ts

@@ -89,7 +89,11 @@ function* getNextElements(
 
         if (
             parent.type === "CharacterClass" ||
-            parent.type === "CharacterClassRange"
+            parent.type === "CharacterClassRange" ||
+            parent.type === "ExpressionCharacterClass" ||
+            parent.type === "ClassIntersection" ||
+            parent.type === "ClassSubtraction" ||
+            parent.type === "StringAlternative"
         ) {
             return
         }
@@ -103,10 +107,8 @@ function* getNextElements(
             }
         }
 
-        // FIXME: TS Error
-        // @ts-expect-error -- FIXME
         const elements = parent.elements
-        const index = elements.indexOf(element) as number
+        const index = elements.indexOf(element)
         const inc = dir === "ltr" ? 1 : -1
         for (let i = index + inc; i >= 0 && i < elements.length; i += inc) {
             const e = elements[i]