Add parser support for the "regexp unicode sets" proposal (#14086)

babel · Dec 31, 2021 · 9a41623 · 9a41623
1 parent 2810dc6
commit 9a41623
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 0 deletions.
diff --git a/packages/babel-parser/src/parser/error-message.js b/packages/babel-parser/src/parser/error-message.js
@@ -76,6 +76,8 @@ export const ErrorMessages = makeErrorTemplates(
     ImportCallArity: "`import()` requires exactly %0.",
     ImportCallNotNewExpression: "Cannot use new with import(...).",
     ImportCallSpreadArgument: "`...` is not allowed in `import()`.",
+    IncompatibleRegExpUVFlags:
+      "The 'u' and 'v' regular expression flags cannot be enabled at the same time.",
     InvalidBigIntLiteral: "Invalid BigIntLiteral.",
     InvalidCodePoint: "Code point out of bounds.",
     InvalidCoverInitializedName: "Invalid shorthand property initializer.",

diff --git a/packages/babel-parser/src/tokenizer/index.js b/packages/babel-parser/src/tokenizer/index.js
@@ -33,6 +33,8 @@ const VALID_REGEX_FLAGS = new Set([
   charCodes.lowercaseY,
   charCodes.lowercaseU,
   charCodes.lowercaseD,
+  // This is only valid when using the regexpUnicodeSets plugin
+  charCodes.lowercaseV,
 ]);
 
 // The following character codes are forbidden from being
@@ -1071,6 +1073,16 @@ export default class Tokenizer extends ParserErrors {
       const char = String.fromCharCode(cp);
 
       if (VALID_REGEX_FLAGS.has(cp)) {
+        if (cp === charCodes.lowercaseV) {
+          this.expectPlugin("regexpUnicodeSets", pos + 1);
+          if (mods.includes("u")) {
+            this.raise(pos + 1, Errors.IncompatibleRegExpUVFlags);
+          }
+        } else if (cp === charCodes.lowercaseU) {
+          if (mods.includes("v")) {
+            this.raise(pos + 1, Errors.IncompatibleRegExpUVFlags);
+          }
+        }
         if (mods.includes(char)) {
           this.raise(pos + 1, Errors.DuplicateRegExpFlags);
         }

diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/regexp-unicode-sets/input.js b/packages/babel-parser/test/fixtures/experimental/_no-plugin/regexp-unicode-sets/input.js
@@ -0,0 +1 @@
+/a/v;
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/regexp-unicode-sets/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/regexp-unicode-sets/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "This experimental syntax requires enabling the parser plugin: \"regexpUnicodeSets\". (1:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/basic/input.js b/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/basic/input.js
@@ -0,0 +1 @@
+/a/v;
diff --git a/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/basic/output.json b/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/basic/output.json
@@ -0,0 +1,26 @@
+{
+  "type": "File",
+  "start":0,"end":5,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":5}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":5,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":5}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":0,"end":5,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":5}},
+        "expression": {
+          "type": "RegExpLiteral",
+          "start":0,"end":4,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":4}},
+          "extra": {
+            "raw": "/a/v"
+          },
+          "pattern": "a",
+          "flags": "v"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/options.json b/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["regexpUnicodeSets"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/uv-error/input.js b/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/uv-error/input.js
@@ -0,0 +1 @@
+/a/ugv;
diff --git a/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/uv-error/output.json b/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/uv-error/output.json
@@ -0,0 +1,29 @@
+{
+  "type": "File",
+  "start":0,"end":7,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":7}},
+  "errors": [
+    "SyntaxError: The 'u' and 'v' regular expression flags cannot be enabled at the same time. (1:6)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":7,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":7}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":0,"end":7,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":7}},
+        "expression": {
+          "type": "RegExpLiteral",
+          "start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
+          "extra": {
+            "raw": "/a/ugv"
+          },
+          "pattern": "a",
+          "flags": "ugv"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/vu-error/input.js b/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/vu-error/input.js
@@ -0,0 +1 @@
+/a/vu;
diff --git a/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/vu-error/output.json b/packages/babel-parser/test/fixtures/experimental/regexp-unicode-sets/vu-error/output.json
@@ -0,0 +1,29 @@
+{
+  "type": "File",
+  "start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
+  "errors": [
+    "SyntaxError: The 'u' and 'v' regular expression flags cannot be enabled at the same time. (1:5)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}},
+        "expression": {
+          "type": "RegExpLiteral",
+          "start":0,"end":5,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":5}},
+          "extra": {
+            "raw": "/a/vu"
+          },
+          "pattern": "a",
+          "flags": "vu"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/typings/babel-parser.d.ts b/packages/babel-parser/typings/babel-parser.d.ts
@@ -153,6 +153,7 @@ export type ParserPlugin =
   | "pipelineOperator"
   | "placeholders"
   | "privateIn" // Enabled by default
+  | "regexpUnicodeSets"
   | "throwExpressions"
   | "topLevelAwait"
   | "typescript"