✨ Supports ES2022 RegExp Match Indices (#22)

mysticatea · Jun 14, 2021 · 024a64a · 024a64a
1 parent 20e0388
commit 024a64a
Show file tree

Hide file tree

Showing 19 changed files with 1,415 additions and 652 deletions.
diff --git a/src/ast.ts b/src/ast.ts
@@ -288,6 +288,7 @@ export interface Flags extends NodeBase {
     parent: RegExpLiteral | null
     dotAll: boolean
     global: boolean
+    hasIndices: boolean
     ignoreCase: boolean
     multiline: boolean
     sticky: boolean

diff --git a/src/ecma-versions.ts b/src/ecma-versions.ts
@@ -1 +1,10 @@
-export type EcmaVersion = 5 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021
+export type EcmaVersion =
+    | 5
+    | 2015
+    | 2016
+    | 2017
+    | 2018
+    | 2019
+    | 2020
+    | 2021
+    | 2022
diff --git a/src/parser.ts b/src/parser.ts
@@ -40,7 +40,7 @@ class RegExpParserState {
 
     public constructor(options?: RegExpParser.Options) {
         this.strict = Boolean(options && options.strict)
-        this.ecmaVersion = (options && options.ecmaVersion) || 2020
+        this.ecmaVersion = (options && options.ecmaVersion) || 2022
     }
 
     public get pattern(): Pattern {
@@ -66,6 +66,7 @@ class RegExpParserState {
         unicode: boolean,
         sticky: boolean,
         dotAll: boolean,
+        hasIndices: boolean,
     ): void {
         this._flags = {
             type: "Flags",
@@ -79,6 +80,7 @@ class RegExpParserState {
             unicode,
             sticky,
             dotAll,
+            hasIndices,
         }
     }
 
@@ -502,11 +504,12 @@ export namespace RegExpParser {
         strict?: boolean
 
         /**
-         * ECMAScript version. Default is `2020`.
+         * ECMAScript version. Default is `2022`.
          * - `2015` added `u` and `y` flags.
          * - `2018` added `s` flag, Named Capturing Group, Lookbehind Assertion,
          *   and Unicode Property Escape.
          * - `2019`, `2020`, and `2021` added more valid Unicode Property Escapes.
+         * - `2022` added `d` flag.
          */
         ecmaVersion?: EcmaVersion
     }

diff --git a/src/validator.ts b/src/validator.ts
@@ -127,11 +127,12 @@ export namespace RegExpValidator {
         strict?: boolean
 
         /**
-         * ECMAScript version. Default is `2020`.
+         * ECMAScript version. Default is `2022`.
          * - `2015` added `u` and `y` flags.
          * - `2018` added `s` flag, Named Capturing Group, Lookbehind Assertion,
          *   and Unicode Property Escape.
          * - `2019`, `2020`, and `2021` added more valid Unicode Property Escapes.
+         * - `2022` added `d` flag.
          */
         ecmaVersion?: EcmaVersion
 
@@ -158,6 +159,7 @@ export namespace RegExpValidator {
          * @param unicode `u` flag.
          * @param sticky `y` flag.
          * @param dotAll `s` flag.
+         * @param hasIndices `d` flag.
          */
         onFlags?(
             start: number,
@@ -168,6 +170,7 @@ export namespace RegExpValidator {
             unicode: boolean,
             sticky: boolean,
             dotAll: boolean,
+            hasIndices: boolean,
         ): void
 
         /**
@@ -476,6 +479,7 @@ export class RegExpValidator {
         let sticky = false
         let unicode = false
         let dotAll = false
+        let hasIndices = false
         for (let i = start; i < end; ++i) {
             const flag = source.charCodeAt(i)
 
@@ -496,6 +500,8 @@ export class RegExpValidator {
                 sticky = true
             } else if (flag === LatinSmallLetterS && this.ecmaVersion >= 2018) {
                 dotAll = true
+            } else if (flag === LatinSmallLetterD && this.ecmaVersion >= 2022) {
+                hasIndices = true
             } else {
                 this.raise(`Invalid flag '${source[i]}'`)
             }
@@ -509,6 +515,7 @@ export class RegExpValidator {
             unicode,
             sticky,
             dotAll,
+            hasIndices,
         )
     }
 
@@ -548,7 +555,7 @@ export class RegExpValidator {
     }
 
     private get ecmaVersion() {
-        return this._options.ecmaVersion || 2020
+        return this._options.ecmaVersion || 2022
     }
 
     private onLiteralEnter(start: number): void {
@@ -572,6 +579,7 @@ export class RegExpValidator {
         unicode: boolean,
         sticky: boolean,
         dotAll: boolean,
+        hasIndices: boolean,
     ): void {
         if (this._options.onFlags) {
             this._options.onFlags(
@@ -583,6 +591,7 @@ export class RegExpValidator {
                 unicode,
                 sticky,
                 dotAll,
+                hasIndices,
             )
         }
     }

diff --git a/test/fixtures/parser/literal.ts b/test/fixtures/parser/literal.ts
@@ -3,7 +3,19 @@ import path from "path"
 
 type FixtureData = {
     [filename: string]: {
-        options: { strict: boolean; ecmaVersion: 5 | 2015 | 2016 | 2017 | 2018 }
+        options: {
+            strict: boolean
+            ecmaVersion:
+                | 5
+                | 2015
+                | 2016
+                | 2017
+                | 2018
+                | 2019
+                | 2020
+                | 2021
+                | 2022
+        }
         patterns: {
             [source: string]:
                 | { ast: object }