Improve regexp/require-unicode-regexp rule to allow patterns with v flag (#586)

Author: ota-meshi

.changeset/loud-flowers-search.md

@@ -0,0 +1,5 @@
+---
+"eslint-plugin-regexp": minor
+---
+
+Improve `regexp/require-unicode-regexp` rule to allow patterns with v flag

lib/rules/require-unicode-regexp.ts

@@ -15,8 +15,8 @@ import type { ReadonlyFlags } from "regexp-ast-analysis"
 import {
     hasSomeDescendant,
     toCache,
-    toCharSet,
     getFirstCharAfter,
+    toUnicodeSet,
 } from "regexp-ast-analysis"
 
 const UTF16_MAX = 0xffff
@@ -146,22 +146,18 @@ function isCompatibleCharLike(
     flags: ReadonlyFlags,
     uFlags: ReadonlyFlags,
 ): boolean {
-    // FIXME: TS Error
-    // @ts-expect-error -- FIXME
-    const cs = toCharSet(char, flags)
+    const cs = toUnicodeSet(char, flags)
     if (!cs.isDisjointWith(SURROGATES)) {
         // If the character (class/set) contains high or low
         // surrogates, then we won't be able to guarantee that the
         // Unicode pattern will behave the same way.
         return false
     }
 
-    // FIXME: TS Error
-    // @ts-expect-error -- FIXME
-    const uCs = toCharSet(char, uFlags)
+    const uCs = toUnicodeSet(char, uFlags)
 
     // Compare the ranges.
-    return rangeEqual(cs.ranges, uCs.ranges)
+    return rangeEqual(cs.chars.ranges, uCs.chars.ranges)
 }
 
 /**
@@ -203,23 +199,19 @@ function isCompatibleQuantifier(
         return undefined
     }
 
-    // FIXME: TS Error
-    // @ts-expect-error -- FIXME
-    const cs = toCharSet(q.element, flags)
+    const cs = toUnicodeSet(q.element, flags)
     if (!cs.isSupersetOf(SURROGATES)) {
         // failed condition 1
         return false
     }
 
-    // FIXME: TS Error
-    // @ts-expect-error -- FIXME
-    const uCs = toCharSet(q.element, uFlags)
+    const uCs = toUnicodeSet(q.element, uFlags)
     if (!uCs.isSupersetOf(SURROGATES) || !uCs.isSupersetOf(ASTRAL)) {
         // failed condition 2
         return false
     }
 
-    if (!rangeEqual(cs.ranges, uCs.without(ASTRAL).ranges)) {
+    if (!rangeEqual(cs.chars.ranges, uCs.without(ASTRAL).chars.ranges)) {
         // failed condition 3
         return false
     }
@@ -353,7 +345,7 @@ export default createRule("require-unicode-regexp", {
                 return {}
             }
 
-            if (!flags.unicode) {
+            if (!flags.unicode && !flags.unicodeSets) {
                 context.report({
                     node,
                     loc: getFlagsLocation(),

tests/lib/rules/require-unicode-regexp.ts

@@ -3,7 +3,7 @@ import rule from "../../../lib/rules/require-unicode-regexp"
 
 const tester = new RuleTester({
     parserOptions: {
-        ecmaVersion: 2020,
+        ecmaVersion: "latest",
         sourceType: "module",
     },
 })
@@ -28,6 +28,8 @@ tester.run("require-unicode-regexp", rule as any, {
         String.raw`const flags = 'u'; new globalThis.RegExp('', flags)`,
         String.raw`const flags = 'g'; new globalThis.RegExp('', flags + 'u')`,
         String.raw`const flags = 'gimu'; new globalThis.RegExp('foo', flags[3])`,
+        String.raw`/foo/v`,
+        String.raw`new RegExp('foo', 'v')`,
     ],
     invalid: [
         {