@next-core/brick-utils 2.31.0 → 2.31.4

package/dist/index.bundle.js

@@ -3136,18 +3136,46 @@
     return new Position(line, offset - lineStart);
   }
 
+  function createPositionWithColumnOffset(position, columnOffset) {
+    var {
+      line,
+      column
+    } = position;
+    return new Position(line, column + columnOffset);
+  }
+
   class BaseParser {
     constructor() {
       this.sawUnambiguousESM = false;
       this.ambiguousScriptDifferentAst = false;
     }
 
-    hasPlugin(name) {
-      return this.plugins.has(name);
+    hasPlugin(pluginConfig) {
+      if (typeof pluginConfig === "string") {
+        return this.plugins.has(pluginConfig);
+      } else {
+        var [pluginName, pluginOptions] = pluginConfig;
+
+        if (!this.hasPlugin(pluginName)) {
+          return false;
+        }
+
+        var actualOptions = this.plugins.get(pluginName);
+
+        for (var key of Object.keys(pluginOptions)) {
+          if ((actualOptions == null ? void 0 : actualOptions[key]) !== pluginOptions[key]) {
+            return false;
+          }
+        }
+
+        return true;
+      }
     }
 
     getPluginOption(plugin, name) {
-      if (this.hasPlugin(plugin)) return this.plugins.get(plugin)[name];
+      var _this$plugins$get;
+
+      return (_this$plugins$get = this.plugins.get(plugin)) == null ? void 0 : _this$plugins$get[name];
     }
 
   }
@@ -3400,6 +3428,7 @@
     ImportCallSpreadArgument: "`...` is not allowed in `import()`.",
     InvalidBigIntLiteral: "Invalid BigIntLiteral.",
     InvalidCodePoint: "Code point out of bounds.",
+    InvalidCoverInitializedName: "Invalid shorthand property initializer.",
     InvalidDecimal: "Invalid decimal.",
     InvalidDigit: "Expected number in radix %0.",
     InvalidEscapeSequence: "Bad character escape sequence.",
@@ -3485,7 +3514,7 @@
     UnexpectedLexicalDeclaration: "Lexical declaration cannot appear in a single-statement context.",
     UnexpectedNewTarget: "`new.target` can only be used in functions or class properties.",
     UnexpectedNumericSeparator: "A numeric separator is only allowed between two digits.",
-    UnexpectedPrivateField: "Private names can only be used as the name of a class element (i.e. class C { #p = 42; #m() {} } )\n or a property of member expression (i.e. this.#p).",
+    UnexpectedPrivateField: "Unexpected private name.",
     UnexpectedReservedWord: "Unexpected reserved word '%0'.",
     UnexpectedSuper: "'super' is only allowed in object methods and classes.",
     UnexpectedToken: "Unexpected token '%0'.",
@@ -3986,8 +4015,13 @@
 
   var types = {
     brace: new TokContext("{"),
-    template: new TokContext("`", true)
+    j_oTag: new TokContext("<tag"),
+    j_cTag: new TokContext("</tag"),
+    j_expr: new TokContext("<tag>...</tag>", true)
   };
+  {
+    types.template = new TokContext("`", true);
+  }
   var beforeExpr = true;
   var startsExpr = true;
   var isLoop = true;
@@ -4148,6 +4182,13 @@
       beforeExpr,
       startsExpr
     }),
+    templateTail: createToken("...`", {
+      startsExpr
+    }),
+    templateNonTail: createToken("...${", {
+      beforeExpr,
+      startsExpr
+    }),
     at: createToken("@"),
     hash: createToken("#", {
       startsExpr
@@ -4453,19 +4494,19 @@
   };
 
   function tokenIsIdentifier(token) {
-    return token >= 87 && token <= 122;
+    return token >= 89 && token <= 124;
   }
 
   function tokenKeywordOrIdentifierIsKeyword(token) {
-    return token <= 86;
+    return token <= 88;
   }
 
   function tokenIsKeywordOrIdentifier(token) {
-    return token >= 52 && token <= 122;
+    return token >= 54 && token <= 124;
   }
 
   function tokenIsLiteralPropertyName(token) {
-    return token >= 52 && token <= 126;
+    return token >= 54 && token <= 128;
   }
 
   function tokenComesBeforeExpression(token) {
@@ -4477,27 +4518,27 @@
   }
 
   function tokenIsAssignment(token) {
-    return token >= 27 && token <= 31;
+    return token >= 29 && token <= 33;
   }
 
   function tokenIsFlowInterfaceOrTypeOrOpaque(token) {
-    return token >= 119 && token <= 121;
+    return token >= 121 && token <= 123;
   }
 
   function tokenIsLoop(token) {
-    return token >= 84 && token <= 86;
+    return token >= 86 && token <= 88;
   }
 
   function tokenIsKeyword(token) {
-    return token >= 52 && token <= 86;
+    return token >= 54 && token <= 88;
   }
 
   function tokenIsOperator(token) {
-    return token >= 35 && token <= 53;
+    return token >= 37 && token <= 55;
   }
 
   function tokenIsPostfix(token) {
-    return token === 32;
+    return token === 34;
   }
 
   function tokenIsPrefix(token) {
@@ -4505,11 +4546,11 @@
   }
 
   function tokenIsTSTypeOperator(token) {
-    return token >= 111 && token <= 113;
+    return token >= 113 && token <= 115;
   }
 
   function tokenIsTSDeclarationStart(token) {
-    return token >= 114 && token <= 120;
+    return token >= 116 && token <= 122;
   }
 
   function tokenLabelName(token) {
@@ -4521,7 +4562,11 @@
   }
 
   function tokenIsRightAssociative(token) {
-    return token === 51;
+    return token === 53;
+  }
+
+  function tokenIsTemplate(token) {
+    return token >= 24 && token <= 25;
   }
 
   function getExportedToken(token) {
@@ -4549,7 +4594,7 @@
       }
     };
 
-    tokenTypes[132].updateContext = context => {
+    tokenTypes[134].updateContext = context => {
       context.push(types.j_expr, types.j_oTag);
     };
   }
@@ -4935,7 +4980,7 @@
       this.comments = [];
       this.commentStack = [];
       this.pos = 0;
-      this.type = 129;
+      this.type = 131;
       this.value = null;
       this.start = 0;
       this.end = 0;
@@ -5123,21 +5168,16 @@
     }
 
     nextToken() {
-      var curContext = this.curContext();
-      if (!curContext.preserveSpace) this.skipSpace();
+      this.skipSpace();
       this.state.start = this.state.pos;
       if (!this.isLookahead) this.state.startLoc = this.state.curPosition();
 
       if (this.state.pos >= this.length) {
-        this.finishToken(129);
+        this.finishToken(131);
         return;
       }
 
-      if (curContext === types.template) {
-        this.readTmplToken();
-      } else {
-        this.getTokenFromCode(this.codePointAtPos(this.state.pos));
-      }
+      this.getTokenFromCode(this.codePointAtPos(this.state.pos));
     }
 
     skipBlockComment() {
@@ -5346,12 +5386,12 @@
         }
       } else if (isIdentifierStart(next)) {
         ++this.state.pos;
-        this.finishToken(128, this.readWord1(next));
+        this.finishToken(130, this.readWord1(next));
       } else if (next === 92) {
         ++this.state.pos;
-        this.finishToken(128, this.readWord1());
+        this.finishToken(130, this.readWord1());
       } else {
-        this.finishOp(25, 1);
+        this.finishOp(27, 1);
       }
     }
 
@@ -5376,9 +5416,9 @@
       var next = this.input.charCodeAt(this.state.pos + 1);
 
       if (next === 61) {
-        this.finishOp(29, 2);
+        this.finishOp(31, 2);
       } else {
-        this.finishOp(50, 1);
+        this.finishOp(52, 1);
       }
     }
 
@@ -5394,24 +5434,24 @@
       }
 
       var value = this.input.slice(start + 2, this.state.pos);
-      this.finishToken(26, value);
+      this.finishToken(28, value);
       return true;
     }
 
     readToken_mult_modulo(code) {
-      var type = code === 42 ? 49 : 48;
+      var type = code === 42 ? 51 : 50;
       var width = 1;
       var next = this.input.charCodeAt(this.state.pos + 1);
 
       if (code === 42 && next === 42) {
         width++;
         next = this.input.charCodeAt(this.state.pos + 2);
-        type = 51;
+        type = 53;
       }
 
       if (next === 61 && !this.state.inType) {
         width++;
-        type = code === 37 ? 31 : 28;
+        type = code === 37 ? 33 : 30;
       }
 
       this.finishOp(type, width);
@@ -5422,9 +5462,9 @@
 
       if (next === code) {
         if (this.input.charCodeAt(this.state.pos + 2) === 61) {
-          this.finishOp(28, 3);
+          this.finishOp(30, 3);
         } else {
-          this.finishOp(code === 124 ? 37 : 38, 2);
+          this.finishOp(code === 124 ? 39 : 40, 2);
         }
 
         return;
@@ -5432,7 +5472,7 @@
 
       if (code === 124) {
         if (next === 62) {
-          this.finishOp(35, 2);
+          this.finishOp(37, 2);
           return;
         }
 
@@ -5458,20 +5498,20 @@
       }
 
       if (next === 61) {
-        this.finishOp(28, 2);
+        this.finishOp(30, 2);
         return;
       }
 
-      this.finishOp(code === 124 ? 39 : 41, 1);
+      this.finishOp(code === 124 ? 41 : 43, 1);
     }
 
     readToken_caret() {
       var next = this.input.charCodeAt(this.state.pos + 1);
 
       if (next === 61 && !this.state.inType) {
-        this.finishOp(30, 2);
+        this.finishOp(32, 2);
       } else {
-        this.finishOp(40, 1);
+        this.finishOp(42, 1);
       }
     }
 
@@ -5479,14 +5519,14 @@
       var next = this.input.charCodeAt(this.state.pos + 1);
 
       if (next === code) {
-        this.finishOp(32, 2);
+        this.finishOp(34, 2);
         return;
       }
 
       if (next === 61) {
-        this.finishOp(28, 2);
+        this.finishOp(30, 2);
       } else {
-        this.finishOp(47, 1);
+        this.finishOp(49, 1);
       }
     }
 
@@ -5498,20 +5538,20 @@
 
       if (next === 60) {
         if (this.input.charCodeAt(pos + 2) === 61) {
-          this.finishOp(28, 3);
+          this.finishOp(30, 3);
           return;
         }
 
-        this.finishOp(46, 2);
+        this.finishOp(48, 2);
         return;
       }
 
       if (next === 61) {
-        this.finishOp(45, 2);
+        this.finishOp(47, 2);
         return;
       }
 
-      this.finishOp(43, 1);
+      this.finishOp(45, 1);
     }
 
     readToken_gt() {
@@ -5524,27 +5564,27 @@
         var size = this.input.charCodeAt(pos + 2) === 62 ? 3 : 2;
 
         if (this.input.charCodeAt(pos + size) === 61) {
-          this.finishOp(28, size + 1);
+          this.finishOp(30, size + 1);
           return;
         }
 
-        this.finishOp(46, size);
+        this.finishOp(48, size);
         return;
       }
 
       if (next === 61) {
-        this.finishOp(45, 2);
+        this.finishOp(47, 2);
         return;
       }
 
-      this.finishOp(44, 1);
+      this.finishOp(46, 1);
     }
 
     readToken_eq_excl(code) {
       var next = this.input.charCodeAt(this.state.pos + 1);
 
       if (next === 61) {
-        this.finishOp(42, this.input.charCodeAt(this.state.pos + 2) === 61 ? 3 : 2);
+        this.finishOp(44, this.input.charCodeAt(this.state.pos + 2) === 61 ? 3 : 2);
         return;
       }
 
@@ -5554,7 +5594,7 @@
         return;
       }
 
-      this.finishOp(code === 61 ? 27 : 33, 1);
+      this.finishOp(code === 61 ? 29 : 35, 1);
     }
 
     readToken_question() {
@@ -5563,9 +5603,9 @@
 
       if (next === 63) {
         if (next2 === 61) {
-          this.finishOp(28, 3);
+          this.finishOp(30, 3);
         } else {
-          this.finishOp(36, 2);
+          this.finishOp(38, 2);
         }
       } else if (next === 46 && !(next2 >= 48 && next2 <= 57)) {
         this.state.pos += 2;
@@ -5657,8 +5697,7 @@
           return;
 
         case 96:
-          ++this.state.pos;
-          this.finishToken(22);
+          this.readTemplateToken();
           return;
 
         case 48:
@@ -5735,12 +5774,12 @@
           return;
 
         case 126:
-          this.finishOp(34, 1);
+          this.finishOp(36, 1);
           return;
 
         case 64:
           ++this.state.pos;
-          this.finishToken(24);
+          this.finishToken(26);
           return;
 
         case 35:
@@ -5824,7 +5863,7 @@
       }
 
       this.state.pos = pos;
-      this.finishToken(127, {
+      this.finishToken(129, {
         pattern: content,
         flags: mods
       });
@@ -5918,11 +5957,11 @@
 
       if (isBigInt) {
         var str = this.input.slice(start, this.state.pos).replace(/[_n]/g, "");
-        this.finishToken(125, str);
+        this.finishToken(127, str);
         return;
       }
 
-      this.finishToken(124, val);
+      this.finishToken(126, val);
     }
 
     readNumber(startsWithDot) {
@@ -6006,17 +6045,17 @@
       var str = this.input.slice(start, this.state.pos).replace(/[_mn]/g, "");
 
       if (isBigInt) {
-        this.finishToken(125, str);
+        this.finishToken(127, str);
         return;
       }
 
       if (isDecimal) {
-        this.finishToken(126, str);
+        this.finishToken(128, str);
         return;
       }
 
       var val = isOctal ? parseInt(str, 8) : parseFloat(str);
-      this.finishToken(124, val);
+      this.finishToken(126, val);
     }
 
     readCodePoint(throwOnInvalid) {
@@ -6070,36 +6109,42 @@
       }
 
       out += this.input.slice(chunkStart, this.state.pos++);
-      this.finishToken(123, out);
+      this.finishToken(125, out);
     }
 
-    readTmplToken() {
+    readTemplateContinuation() {
+      if (!this.match(8)) {
+        this.unexpected(this.state.start, 8);
+      }
+
+      this.state.pos--;
+      this.readTemplateToken();
+    }
+
+    readTemplateToken() {
       var out = "",
           chunkStart = this.state.pos,
           containsInvalid = false;
+      ++this.state.pos;
 
       for (;;) {
         if (this.state.pos >= this.length) {
-          throw this.raise(this.state.start, ErrorMessages.UnterminatedTemplate);
+          throw this.raise(this.state.start + 1, ErrorMessages.UnterminatedTemplate);
         }
 
         var ch = this.input.charCodeAt(this.state.pos);
 
-        if (ch === 96 || ch === 36 && this.input.charCodeAt(this.state.pos + 1) === 123) {
-          if (this.state.pos === this.state.start && this.match(20)) {
-            if (ch === 36) {
-              this.state.pos += 2;
-              this.finishToken(23);
-              return;
-            } else {
-              ++this.state.pos;
-              this.finishToken(22);
-              return;
-            }
-          }
+        if (ch === 96) {
+          ++this.state.pos;
+          out += this.input.slice(chunkStart, this.state.pos);
+          this.finishToken(24, containsInvalid ? null : out);
+          return;
+        }
 
+        if (ch === 36 && this.input.charCodeAt(this.state.pos + 1) === 123) {
+          this.state.pos += 2;
           out += this.input.slice(chunkStart, this.state.pos);
-          this.finishToken(20, containsInvalid ? null : out);
+          this.finishToken(25, containsInvalid ? null : out);
           return;
         }
 
@@ -6307,7 +6352,7 @@
       if (type !== undefined) {
         this.finishToken(type, tokenLabelName(type));
       } else {
-        this.finishToken(122, word);
+        this.finishToken(124, word);
       }
     }
 
@@ -6321,33 +6366,7 @@
       }
     }
 
-    updateContext(prevType) {
-      var {
-        context,
-        type
-      } = this.state;
-
-      switch (type) {
-        case 8:
-          context.pop();
-          break;
-
-        case 5:
-        case 7:
-        case 23:
-          context.push(types.brace);
-          break;
-
-        case 22:
-          if (context[context.length - 1] === types.template) {
-            context.pop();
-          } else {
-            context.push(types.template);
-          }
-
-          break;
-      }
-    }
+    updateContext(prevType) {}
 
   }
 
@@ -6391,11 +6410,15 @@
     }
 
     declarePrivateName(name, elementType, pos) {
-      var classScope = this.current();
-      var redefined = classScope.privateNames.has(name);
+      var {
+        privateNames,
+        loneAccessors,
+        undefinedPrivateNames
+      } = this.current();
+      var redefined = privateNames.has(name);
 
       if (elementType & CLASS_ELEMENT_KIND_ACCESSOR) {
-        var accessor = redefined && classScope.loneAccessors.get(name);
+        var accessor = redefined && loneAccessors.get(name);
 
         if (accessor) {
           var oldStatic = accessor & CLASS_ELEMENT_FLAG_STATIC;
@@ -6403,9 +6426,9 @@
           var oldKind = accessor & CLASS_ELEMENT_KIND_ACCESSOR;
           var newKind = elementType & CLASS_ELEMENT_KIND_ACCESSOR;
           redefined = oldKind === newKind || oldStatic !== newStatic;
-          if (!redefined) classScope.loneAccessors.delete(name);
+          if (!redefined) loneAccessors.delete(name);
         } else if (!redefined) {
-          classScope.loneAccessors.set(name, elementType);
+          loneAccessors.set(name, elementType);
         }
       }
 
@@ -6413,8 +6436,8 @@
         this.raise(pos, ErrorMessages.PrivateNameRedeclaration, name);
       }
 
-      classScope.privateNames.add(name);
-      classScope.undefinedPrivateNames.delete(name);
+      privateNames.add(name);
+      undefinedPrivateNames.delete(name);
     }
 
     usePrivateName(name, pos) {
@@ -6662,7 +6685,7 @@
     }
 
     canInsertSemicolon() {
-      return this.match(129) || this.match(8) || this.hasPrecedingLineBreak();
+      return this.match(131) || this.match(8) || this.hasPrecedingLineBreak();
     }
 
     hasPrecedingLineBreak() {
@@ -6718,21 +6741,31 @@
       throw this.raise(pos != null ? pos : this.state.start, messageOrType);
     }
 
-    expectPlugin(name, pos) {
-      if (!this.hasPlugin(name)) {
+    getPluginNamesFromConfigs(pluginConfigs) {
+      return pluginConfigs.map(c => {
+        if (typeof c === "string") {
+          return c;
+        } else {
+          return c[0];
+        }
+      });
+    }
+
+    expectPlugin(pluginConfig, pos) {
+      if (!this.hasPlugin(pluginConfig)) {
         throw this.raiseWithData(pos != null ? pos : this.state.start, {
-          missingPlugin: [name]
-        }, "This experimental syntax requires enabling the parser plugin: '".concat(name, "'"));
+          missingPlugin: this.getPluginNamesFromConfigs([pluginConfig])
+        }, "This experimental syntax requires enabling the parser plugin: ".concat(JSON.stringify(pluginConfig), "."));
       }
 
       return true;
     }
 
-    expectOnePlugin(names, pos) {
-      if (!names.some(n => this.hasPlugin(n))) {
+    expectOnePlugin(pluginConfigs, pos) {
+      if (!pluginConfigs.some(c => this.hasPlugin(c))) {
         throw this.raiseWithData(pos != null ? pos : this.state.start, {
-          missingPlugin: names
-        }, "This experimental syntax requires enabling one of the following parser plugin(s): '".concat(names.join(", "), "'"));
+          missingPlugin: this.getPluginNamesFromConfigs(pluginConfigs)
+        }, "This experimental syntax requires enabling one of the following parser plugin(s): ".concat(pluginConfigs.map(c => JSON.stringify(c)).join(", "), "."));
       }
     }
 
@@ -6810,7 +6843,7 @@
         return hasErrors;
       } else if (hasErrors) {
         if (shorthandAssign >= 0) {
-          this.unexpected(shorthandAssign);
+          this.raise(shorthandAssign, ErrorMessages.InvalidCoverInitializedName);
         }
 
         if (doubleProto >= 0) {
@@ -6976,12 +7009,18 @@
     }
 
     var cloned = Object.create(NodePrototype);
-    cloned.type = "StringLiteral";
+    cloned.type = type;
     cloned.start = start;
     cloned.end = end;
     cloned.loc = loc;
     cloned.range = range;
-    cloned.extra = extra;
+
+    if (node.raw !== undefined) {
+      cloned.raw = node.raw;
+    } else {
+      cloned.extra = extra;
+    }
+
     cloned.value = node.value;
     return cloned;
   }
@@ -7092,7 +7131,7 @@
   }
 
   function isMaybeDefaultImport(type) {
-    return tokenIsKeywordOrIdentifier(type) && type !== 91;
+    return tokenIsKeywordOrIdentifier(type) && type !== 93;
   }
 
   var exportSuggestions = {
@@ -7134,7 +7173,7 @@
     }
 
     finishToken(type, val) {
-      if (type !== 123 && type !== 13 && type !== 26) {
+      if (type !== 125 && type !== 13 && type !== 28) {
         if (this.flowPragma === undefined) {
           this.flowPragma = null;
         }
@@ -7171,7 +7210,7 @@
       var node = this.startNode();
       var moduloPos = this.state.start;
       this.next();
-      this.expectContextual(101);
+      this.expectContextual(103);
 
       if (this.state.lastTokStart > moduloPos + 1) {
         this.raise(moduloPos, FlowErrors.UnexpectedSpaceBetweenModuloChecks);
@@ -7193,14 +7232,14 @@
       var type = null;
       var predicate = null;
 
-      if (this.match(48)) {
+      if (this.match(50)) {
         this.state.inType = oldInType;
         predicate = this.flowParsePredicate();
       } else {
         type = this.flowParseType();
         this.state.inType = oldInType;
 
-        if (this.match(48)) {
+        if (this.match(50)) {
           predicate = this.flowParsePredicate();
         }
       }
@@ -7220,7 +7259,7 @@
       var typeNode = this.startNode();
       var typeContainer = this.startNode();
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         typeNode.typeParameters = this.flowParseTypeParameterDeclaration();
       } else {
         typeNode.typeParameters = null;
@@ -7242,13 +7281,13 @@
     }
 
     flowParseDeclare(node, insideModule) {
-      if (this.match(74)) {
+      if (this.match(76)) {
         return this.flowParseDeclareClass(node);
-      } else if (this.match(62)) {
+      } else if (this.match(64)) {
         return this.flowParseDeclareFunction(node);
-      } else if (this.match(68)) {
+      } else if (this.match(70)) {
         return this.flowParseDeclareVariable(node);
-      } else if (this.eatContextual(117)) {
+      } else if (this.eatContextual(119)) {
         if (this.match(16)) {
           return this.flowParseDeclareModuleExports(node);
         } else {
@@ -7258,13 +7297,13 @@
 
           return this.flowParseDeclareModule(node);
         }
-      } else if (this.isContextual(120)) {
+      } else if (this.isContextual(122)) {
         return this.flowParseDeclareTypeAlias(node);
-      } else if (this.isContextual(121)) {
+      } else if (this.isContextual(123)) {
         return this.flowParseDeclareOpaqueType(node);
-      } else if (this.isContextual(119)) {
+      } else if (this.isContextual(121)) {
         return this.flowParseDeclareInterface(node);
-      } else if (this.match(76)) {
+      } else if (this.match(78)) {
         return this.flowParseDeclareExportDeclaration(node, insideModule);
       } else {
         throw this.unexpected();
@@ -7282,7 +7321,7 @@
     flowParseDeclareModule(node) {
       this.scope.enter(SCOPE_OTHER);
 
-      if (this.match(123)) {
+      if (this.match(125)) {
         node.id = this.parseExprAtom();
       } else {
         node.id = this.parseIdentifier();
@@ -7295,16 +7334,16 @@
       while (!this.match(8)) {
         var _bodyNode = this.startNode();
 
-        if (this.match(77)) {
+        if (this.match(79)) {
           this.next();
 
-          if (!this.isContextual(120) && !this.match(81)) {
+          if (!this.isContextual(122) && !this.match(83)) {
             this.raise(this.state.lastTokStart, FlowErrors.InvalidNonTypeImportInDeclareModule);
           }
 
           this.parseImport(_bodyNode);
         } else {
-          this.expectContextual(115, FlowErrors.UnsupportedStatementInDeclareModule);
+          this.expectContextual(117, FlowErrors.UnsupportedStatementInDeclareModule);
           _bodyNode = this.flowParseDeclare(_bodyNode, true);
         }
 
@@ -7341,10 +7380,10 @@
     }
 
     flowParseDeclareExportDeclaration(node, insideModule) {
-      this.expect(76);
+      this.expect(78);
 
-      if (this.eat(59)) {
-        if (this.match(62) || this.match(74)) {
+      if (this.eat(61)) {
+        if (this.match(64) || this.match(76)) {
           node.declaration = this.flowParseDeclare(this.startNode());
         } else {
           node.declaration = this.flowParseType();
@@ -7354,17 +7393,17 @@
         node.default = true;
         return this.finishNode(node, "DeclareExportDeclaration");
       } else {
-        if (this.match(69) || this.isLet() || (this.isContextual(120) || this.isContextual(119)) && !insideModule) {
+        if (this.match(71) || this.isLet() || (this.isContextual(122) || this.isContextual(121)) && !insideModule) {
           var label = this.state.value;
           var suggestion = exportSuggestions[label];
           throw this.raise(this.state.start, FlowErrors.UnsupportedDeclareExportKind, label, suggestion);
         }
 
-        if (this.match(68) || this.match(62) || this.match(74) || this.isContextual(121)) {
+        if (this.match(70) || this.match(64) || this.match(76) || this.isContextual(123)) {
           node.declaration = this.flowParseDeclare(this.startNode());
           node.default = false;
           return this.finishNode(node, "DeclareExportDeclaration");
-        } else if (this.match(49) || this.match(5) || this.isContextual(119) || this.isContextual(120) || this.isContextual(121)) {
+        } else if (this.match(51) || this.match(5) || this.isContextual(121) || this.isContextual(122) || this.isContextual(123)) {
           node = this.parseExport(node);
 
           if (node.type === "ExportNamedDeclaration") {
@@ -7383,7 +7422,7 @@
 
     flowParseDeclareModuleExports(node) {
       this.next();
-      this.expectContextual(102);
+      this.expectContextual(104);
       node.typeAnnotation = this.flowParseTypeAnnotation();
       this.semicolon();
       return this.finishNode(node, "DeclareModuleExports");
@@ -7414,7 +7453,7 @@
       node.id = this.flowParseRestrictedIdentifier(!isClass, true);
       this.scope.declareName(node.id.name, isClass ? BIND_FUNCTION : BIND_LEXICAL, node.id.start);
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         node.typeParameters = this.flowParseTypeParameterDeclaration();
       } else {
         node.typeParameters = null;
@@ -7424,13 +7463,13 @@
       node.implements = [];
       node.mixins = [];
 
-      if (this.eat(75)) {
+      if (this.eat(77)) {
         do {
           node.extends.push(this.flowParseInterfaceExtends());
         } while (!isClass && this.eat(12));
       }
 
-      if (this.isContextual(108)) {
+      if (this.isContextual(110)) {
         this.next();
 
         do {
@@ -7438,7 +7477,7 @@
         } while (this.eat(12));
       }
 
-      if (this.isContextual(104)) {
+      if (this.isContextual(106)) {
         this.next();
 
         do {
@@ -7459,7 +7498,7 @@
       var node = this.startNode();
       node.id = this.flowParseQualifiedTypeIdentifier();
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         node.typeParameters = this.flowParseTypeParameterInstantiation();
       } else {
         node.typeParameters = null;
@@ -7493,23 +7532,23 @@
       node.id = this.flowParseRestrictedIdentifier(false, true);
       this.scope.declareName(node.id.name, BIND_LEXICAL, node.id.start);
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         node.typeParameters = this.flowParseTypeParameterDeclaration();
       } else {
         node.typeParameters = null;
       }
 
-      node.right = this.flowParseTypeInitialiser(27);
+      node.right = this.flowParseTypeInitialiser(29);
       this.semicolon();
       return this.finishNode(node, "TypeAlias");
     }
 
     flowParseOpaqueType(node, declare) {
-      this.expectContextual(120);
+      this.expectContextual(122);
       node.id = this.flowParseRestrictedIdentifier(true, true);
       this.scope.declareName(node.id.name, BIND_LEXICAL, node.id.start);
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         node.typeParameters = this.flowParseTypeParameterDeclaration();
       } else {
         node.typeParameters = null;
@@ -7524,7 +7563,7 @@
       node.impltype = null;
 
       if (!declare) {
-        node.impltype = this.flowParseTypeInitialiser(27);
+        node.impltype = this.flowParseTypeInitialiser(29);
       }
 
       this.semicolon();
@@ -7541,8 +7580,8 @@
       node.variance = variance;
       node.bound = ident.typeAnnotation;
 
-      if (this.match(27)) {
-        this.eat(27);
+      if (this.match(29)) {
+        this.eat(29);
         node.default = this.flowParseType();
       } else {
         if (requireDefault) {
@@ -7559,7 +7598,7 @@
       node.params = [];
       this.state.inType = true;
 
-      if (this.match(43) || this.match(132)) {
+      if (this.match(45) || this.match(134)) {
         this.next();
       } else {
         this.unexpected();
@@ -7575,12 +7614,12 @@
           defaultRequired = true;
         }
 
-        if (!this.match(44)) {
+        if (!this.match(46)) {
           this.expect(12);
         }
-      } while (!this.match(44));
+      } while (!this.match(46));
 
-      this.expect(44);
+      this.expect(46);
       this.state.inType = oldInType;
       return this.finishNode(node, "TypeParameterDeclaration");
     }
@@ -7590,20 +7629,20 @@
       var oldInType = this.state.inType;
       node.params = [];
       this.state.inType = true;
-      this.expect(43);
+      this.expect(45);
       var oldNoAnonFunctionType = this.state.noAnonFunctionType;
       this.state.noAnonFunctionType = false;
 
-      while (!this.match(44)) {
+      while (!this.match(46)) {
         node.params.push(this.flowParseType());
 
-        if (!this.match(44)) {
+        if (!this.match(46)) {
           this.expect(12);
         }
       }
 
       this.state.noAnonFunctionType = oldNoAnonFunctionType;
-      this.expect(44);
+      this.expect(46);
       this.state.inType = oldInType;
       return this.finishNode(node, "TypeParameterInstantiation");
     }
@@ -7613,27 +7652,27 @@
       var oldInType = this.state.inType;
       node.params = [];
       this.state.inType = true;
-      this.expect(43);
+      this.expect(45);
 
-      while (!this.match(44)) {
+      while (!this.match(46)) {
         node.params.push(this.flowParseTypeOrImplicitInstantiation());
 
-        if (!this.match(44)) {
+        if (!this.match(46)) {
           this.expect(12);
         }
       }
 
-      this.expect(44);
+      this.expect(46);
       this.state.inType = oldInType;
       return this.finishNode(node, "TypeParameterInstantiation");
     }
 
     flowParseInterfaceType() {
       var node = this.startNode();
-      this.expectContextual(119);
+      this.expectContextual(121);
       node.extends = [];
 
-      if (this.eat(75)) {
+      if (this.eat(77)) {
         do {
           node.extends.push(this.flowParseInterfaceExtends());
         } while (this.eat(12));
@@ -7650,7 +7689,7 @@
     }
 
     flowParseObjectPropertyKey() {
-      return this.match(124) || this.match(123) ? this.parseExprAtom() : this.parseIdentifier(true);
+      return this.match(126) || this.match(125) ? this.parseExprAtom() : this.parseIdentifier(true);
     }
 
     flowParseObjectTypeIndexer(node, isStatic, variance) {
@@ -7676,7 +7715,7 @@
       this.expect(3);
       this.expect(3);
 
-      if (this.match(43) || this.match(10)) {
+      if (this.match(45) || this.match(10)) {
         node.method = true;
         node.optional = false;
         node.value = this.flowParseObjectTypeMethodish(this.startNodeAt(node.start, node.loc.start));
@@ -7699,13 +7738,13 @@
       node.typeParameters = null;
       node.this = null;
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         node.typeParameters = this.flowParseTypeParameterDeclaration();
       }
 
       this.expect(10);
 
-      if (this.match(72)) {
+      if (this.match(74)) {
         node.this = this.flowParseFunctionTypeParam(true);
         node.this.name = null;
 
@@ -7775,7 +7814,7 @@
         var inexactStart = null;
         var node = this.startNode();
 
-        if (allowProto && this.isContextual(109)) {
+        if (allowProto && this.isContextual(111)) {
           var lookahead = this.lookahead();
 
           if (lookahead.type !== 14 && lookahead.type !== 17) {
@@ -7785,7 +7824,7 @@
           }
         }
 
-        if (allowStatic && this.isContextual(98)) {
+        if (allowStatic && this.isContextual(100)) {
           var _lookahead = this.lookahead();
 
           if (_lookahead.type !== 14 && _lookahead.type !== 17) {
@@ -7810,7 +7849,7 @@
           } else {
             nodeStart.indexers.push(this.flowParseObjectTypeIndexer(node, isStatic, variance));
           }
-        } else if (this.match(10) || this.match(43)) {
+        } else if (this.match(10) || this.match(45)) {
           if (protoStart != null) {
             this.unexpected(protoStart);
           }
@@ -7823,7 +7862,7 @@
         } else {
           var kind = "init";
 
-          if (this.isContextual(92) || this.isContextual(97)) {
+          if (this.isContextual(94) || this.isContextual(99)) {
             var _lookahead2 = this.lookahead();
 
             if (tokenIsLiteralPropertyName(_lookahead2.type)) {
@@ -7899,7 +7938,7 @@
         node.kind = kind;
         var optional = false;
 
-        if (this.match(43) || this.match(10)) {
+        if (this.match(45) || this.match(10)) {
           node.method = true;
 
           if (protoStart != null) {
@@ -7984,7 +8023,7 @@
       node.typeParameters = null;
       node.id = this.flowParseQualifiedTypeIdentifier(startPos, startLoc, id);
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         node.typeParameters = this.flowParseTypeParameterInstantiation();
       }
 
@@ -7993,7 +8032,7 @@
 
     flowParseTypeofType() {
       var node = this.startNode();
-      this.expect(81);
+      this.expect(83);
       node.argument = this.flowParsePrimaryType();
       return this.finishNode(node, "TypeofTypeAnnotation");
     }
@@ -8019,7 +8058,7 @@
       var typeAnnotation = null;
       var node = this.startNode();
       var lh = this.lookahead();
-      var isThis = this.state.type === 72;
+      var isThis = this.state.type === 74;
 
       if (lh.type === 14 || lh.type === 17) {
         if (isThis && !first) {
@@ -8060,7 +8099,7 @@
       var rest = null;
       var _this = null;
 
-      if (this.match(72)) {
+      if (this.match(74)) {
         _this = this.flowParseFunctionTypeParam(true);
         _this.name = null;
 
@@ -8152,7 +8191,7 @@
           this.state.noAnonFunctionType = oldNoAnonFunctionType;
           return type;
 
-        case 43:
+        case 45:
           node.typeParameters = this.flowParseTypeParameterDeclaration();
           this.expect(10);
           tmp = this.flowParseFunctionTypeParams();
@@ -8168,7 +8207,7 @@
           this.next();
 
           if (!this.match(11) && !this.match(21)) {
-            if (tokenIsIdentifier(this.state.type) || this.match(72)) {
+            if (tokenIsIdentifier(this.state.type) || this.match(74)) {
               var token = this.lookahead().type;
               isGroupedType = token !== 17 && token !== 14;
             } else {
@@ -8204,24 +8243,24 @@
           node.typeParameters = null;
           return this.finishNode(node, "FunctionTypeAnnotation");
 
-        case 123:
+        case 125:
           return this.parseLiteral(this.state.value, "StringLiteralTypeAnnotation");
 
-        case 79:
-        case 80:
-          node.value = this.match(79);
+        case 81:
+        case 82:
+          node.value = this.match(81);
           this.next();
           return this.finishNode(node, "BooleanLiteralTypeAnnotation");
 
-        case 47:
+        case 49:
           if (this.state.value === "-") {
             this.next();
 
-            if (this.match(124)) {
+            if (this.match(126)) {
               return this.parseLiteralAtNode(-this.state.value, "NumberLiteralTypeAnnotation", node);
             }
 
-            if (this.match(125)) {
+            if (this.match(127)) {
               return this.parseLiteralAtNode(-this.state.value, "BigIntLiteralTypeAnnotation", node);
             }
 
@@ -8230,29 +8269,29 @@
 
           throw this.unexpected();
 
-        case 124:
+        case 126:
           return this.parseLiteral(this.state.value, "NumberLiteralTypeAnnotation");
 
-        case 125:
+        case 127:
           return this.parseLiteral(this.state.value, "BigIntLiteralTypeAnnotation");
 
-        case 82:
+        case 84:
           this.next();
           return this.finishNode(node, "VoidTypeAnnotation");
 
-        case 78:
+        case 80:
           this.next();
           return this.finishNode(node, "NullLiteralTypeAnnotation");
 
-        case 72:
+        case 74:
           this.next();
           return this.finishNode(node, "ThisTypeAnnotation");
 
-        case 49:
+        case 51:
           this.next();
           return this.finishNode(node, "ExistsTypeAnnotation");
 
-        case 81:
+        case 83:
           return this.flowParseTypeofType();
 
         default:
@@ -8261,7 +8300,7 @@
             this.next();
             return super.createIdentifier(node, label);
           } else if (tokenIsIdentifier(this.state.type)) {
-            if (this.isContextual(119)) {
+            if (this.isContextual(121)) {
               return this.flowParseInterfaceType();
             }
 
@@ -8335,11 +8374,11 @@
 
     flowParseIntersectionType() {
       var node = this.startNode();
-      this.eat(41);
+      this.eat(43);
       var type = this.flowParseAnonFunctionWithoutParens();
       node.types = [type];
 
-      while (this.eat(41)) {
+      while (this.eat(43)) {
         node.types.push(this.flowParseAnonFunctionWithoutParens());
       }
 
@@ -8348,11 +8387,11 @@
 
     flowParseUnionType() {
       var node = this.startNode();
-      this.eat(39);
+      this.eat(41);
       var type = this.flowParseIntersectionType();
       node.types = [type];
 
-      while (this.eat(39)) {
+      while (this.eat(41)) {
         node.types.push(this.flowParseIntersectionType());
       }
 
@@ -8368,7 +8407,7 @@
     }
 
     flowParseTypeOrImplicitInstantiation() {
-      if (this.state.type === 122 && this.state.value === "_") {
+      if (this.state.type === 124 && this.state.value === "_") {
         var startPos = this.state.start;
         var startLoc = this.state.startLoc;
         var node = this.parseIdentifier();
@@ -8404,7 +8443,7 @@
     flowParseVariance() {
       var variance = null;
 
-      if (this.match(47)) {
+      if (this.match(49)) {
         variance = this.startNode();
 
         if (this.state.value === "+") {
@@ -8443,7 +8482,7 @@
     }
 
     parseStatement(context, topLevel) {
-      if (this.state.strict && this.isContextual(119)) {
+      if (this.state.strict && this.isContextual(121)) {
         var lookahead = this.lookahead();
 
         if (tokenIsKeywordOrIdentifier(lookahead.type)) {
@@ -8451,7 +8490,7 @@
           this.next();
           return this.flowParseInterface(node);
         }
-      } else if (this.shouldParseEnums() && this.isContextual(116)) {
+      } else if (this.shouldParseEnums() && this.isContextual(118)) {
         var _node = this.startNode();
 
         this.next();
@@ -8470,7 +8509,7 @@
     parseExpressionStatement(node, expr) {
       if (expr.type === "Identifier") {
         if (expr.name === "declare") {
-          if (this.match(74) || tokenIsIdentifier(this.state.type) || this.match(62) || this.match(68) || this.match(76)) {
+          if (this.match(76) || tokenIsIdentifier(this.state.type) || this.match(64) || this.match(70) || this.match(78)) {
             return this.flowParseDeclare(node);
           }
         } else if (tokenIsIdentifier(this.state.type)) {
@@ -8492,7 +8531,7 @@
         type
       } = this.state;
 
-      if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 116) {
+      if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 118) {
         return !this.state.containsEsc;
       }
 
@@ -8504,7 +8543,7 @@
         type
       } = this.state;
 
-      if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 116) {
+      if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 118) {
         return this.state.containsEsc;
       }
 
@@ -8512,7 +8551,7 @@
     }
 
     parseExportDefaultExpression() {
-      if (this.shouldParseEnums() && this.isContextual(116)) {
+      if (this.shouldParseEnums() && this.isContextual(118)) {
         var node = this.startNode();
         this.next();
         return this.flowParseEnumDeclaration(node);
@@ -8685,7 +8724,7 @@
     }
 
     parseExportDeclaration(node) {
-      if (this.isContextual(120)) {
+      if (this.isContextual(122)) {
         node.exportKind = "type";
         var declarationNode = this.startNode();
         this.next();
@@ -8697,21 +8736,21 @@
         } else {
           return this.flowParseTypeAlias(declarationNode);
         }
-      } else if (this.isContextual(121)) {
+      } else if (this.isContextual(123)) {
         node.exportKind = "type";
 
         var _declarationNode = this.startNode();
 
         this.next();
         return this.flowParseOpaqueType(_declarationNode, false);
-      } else if (this.isContextual(119)) {
+      } else if (this.isContextual(121)) {
         node.exportKind = "type";
 
         var _declarationNode2 = this.startNode();
 
         this.next();
         return this.flowParseInterface(_declarationNode2);
-      } else if (this.shouldParseEnums() && this.isContextual(116)) {
+      } else if (this.shouldParseEnums() && this.isContextual(118)) {
         node.exportKind = "value";
 
         var _declarationNode3 = this.startNode();
@@ -8726,7 +8765,7 @@
     eatExportStar(node) {
       if (super.eatExportStar(...arguments)) return true;
 
-      if (this.isContextual(120) && this.lookahead().type === 49) {
+      if (this.isContextual(122) && this.lookahead().type === 51) {
         node.exportKind = "type";
         this.next();
         this.next();
@@ -8750,7 +8789,7 @@
     parseClassId(node, isStatement, optionalId) {
       super.parseClassId(node, isStatement, optionalId);
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         node.typeParameters = this.flowParseTypeParameterDeclaration();
       }
     }
@@ -8758,7 +8797,7 @@
     parseClassMember(classBody, member, state) {
       var pos = this.state.start;
 
-      if (this.isContextual(115)) {
+      if (this.isContextual(117)) {
         if (this.parseClassMemberFromModifier(classBody, member)) {
           return;
         }
@@ -8789,7 +8828,7 @@
         this.raise(this.state.pos, ErrorMessages.InvalidIdentifier, fullWord);
       }
 
-      this.finishToken(122, fullWord);
+      this.finishToken(124, fullWord);
     }
 
     getTokenFromCode(code) {
@@ -8798,7 +8837,7 @@
       if (code === 123 && next === 124) {
         return this.finishOp(6, 2);
       } else if (this.state.inType && (code === 62 || code === 60)) {
-        return this.finishOp(code === 62 ? 44 : 43, 1);
+        return this.finishOp(code === 62 ? 46 : 45, 1);
       } else if (this.state.inType && code === 63) {
         if (next === 46) {
           return this.finishOp(18, 2);
@@ -8894,7 +8933,7 @@
     }
 
     isClassMethod() {
-      return this.match(43) || super.isClassMethod();
+      return this.match(45) || super.isClassMethod();
     }
 
     isClassProperty() {
@@ -8912,7 +8951,7 @@
 
       delete method.variance;
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         method.typeParameters = this.flowParseTypeParameterDeclaration();
       }
 
@@ -8940,7 +8979,7 @@
 
       delete method.variance;
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         method.typeParameters = this.flowParseTypeParameterDeclaration();
       }
 
@@ -8950,11 +8989,11 @@
     parseClassSuper(node) {
       super.parseClassSuper(node);
 
-      if (node.superClass && this.match(43)) {
+      if (node.superClass && this.match(45)) {
         node.superTypeParameters = this.flowParseTypeParameterInstantiation();
       }
 
-      if (this.isContextual(104)) {
+      if (this.isContextual(106)) {
         this.next();
         var implemented = node.implements = [];
 
@@ -8963,7 +9002,7 @@
 
           _node3.id = this.flowParseRestrictedIdentifier(true);
 
-          if (this.match(43)) {
+          if (this.match(45)) {
             _node3.typeParameters = this.flowParseTypeParameterInstantiation();
           } else {
             _node3.typeParameters = null;
@@ -9001,7 +9040,7 @@
       delete prop.variance;
       var typeParameters;
 
-      if (this.match(43) && !isAccessor) {
+      if (this.match(45) && !isAccessor) {
         typeParameters = this.flowParseTypeParameterDeclaration();
         if (!this.match(10)) this.unexpected();
       }
@@ -9032,7 +9071,7 @@
         this.raise(param.start, FlowErrors.ThisParamAnnotationRequired);
       }
 
-      if (this.match(27) && this.isThisParam(param)) {
+      if (this.match(29) && this.isThisParam(param)) {
         this.raise(param.start, FlowErrors.ThisParamNoDefault);
       }
 
@@ -9068,9 +9107,9 @@
       node.importKind = "value";
       var kind = null;
 
-      if (this.match(81)) {
+      if (this.match(83)) {
         kind = "typeof";
-      } else if (this.isContextual(120)) {
+      } else if (this.isContextual(122)) {
         kind = "type";
       }
 
@@ -9080,11 +9119,11 @@
           type
         } = lh;
 
-        if (kind === "type" && type === 49) {
+        if (kind === "type" && type === 51) {
           this.unexpected(lh.start);
         }
 
-        if (isMaybeDefaultImport(type) || type === 5 || type === 49) {
+        if (isMaybeDefaultImport(type) || type === 5 || type === 51) {
           this.next();
           node.importKind = kind;
         }
@@ -9107,7 +9146,7 @@
 
       var isBinding = false;
 
-      if (this.isContextual(87) && !this.isLookaheadContextual("as")) {
+      if (this.isContextual(89) && !this.isLookaheadContextual("as")) {
         var as_ident = this.parseIdentifier(true);
 
         if (specifierTypeKind !== null && !tokenIsKeywordOrIdentifier(this.state.type)) {
@@ -9132,7 +9171,7 @@
           specifier.importKind = null;
         }
 
-        if (this.eatContextual(87)) {
+        if (this.eatContextual(89)) {
           specifier.local = this.parseIdentifier();
         } else {
           isBinding = true;
@@ -9160,7 +9199,7 @@
 
     parseBindingAtom() {
       switch (this.state.type) {
-        case 72:
+        case 74:
           return this.parseIdentifier(true);
 
         default:
@@ -9171,7 +9210,7 @@
     parseFunctionParams(node, allowModifiers) {
       var kind = node.kind;
 
-      if (kind !== "get" && kind !== "set" && this.match(43)) {
+      if (kind !== "get" && kind !== "set" && this.match(45)) {
         node.typeParameters = this.flowParseTypeParameterDeclaration();
       }
 
@@ -9208,23 +9247,21 @@
       var state = null;
       var jsx;
 
-      if (this.hasPlugin("jsx") && (this.match(132) || this.match(43))) {
+      if (this.hasPlugin("jsx") && (this.match(134) || this.match(45))) {
         state = this.state.clone();
         jsx = this.tryParse(() => super.parseMaybeAssign(refExpressionErrors, afterLeftParse), state);
         if (!jsx.error) return jsx.node;
         var {
           context
         } = this.state;
-        var curContext = context[context.length - 1];
+        var currentContext = context[context.length - 1];
 
-        if (curContext === types.j_oTag) {
-          context.length -= 2;
-        } else if (curContext === types.j_expr) {
-          context.length -= 1;
+        if (currentContext === types.j_oTag || currentContext === types.j_expr) {
+          context.pop();
         }
       }
 
-      if ((_jsx = jsx) != null && _jsx.error || this.match(43)) {
+      if ((_jsx = jsx) != null && _jsx.error || this.match(45)) {
         var _jsx2, _jsx3;
 
         state = state || this.state.clone();
@@ -9334,7 +9371,7 @@
         node.callee = base;
         node.arguments = this.parseCallExpressionArguments(11, false);
         base = this.finishNode(node, "CallExpression");
-      } else if (base.type === "Identifier" && base.name === "async" && this.match(43)) {
+      } else if (base.type === "Identifier" && base.name === "async" && this.match(45)) {
         var state = this.state.clone();
         var arrow = this.tryParse(abort => this.parseAsyncArrowWithTypeParameters(startPos, startLoc) || abort(), state);
         if (!arrow.error && !arrow.aborted) return arrow.node;
@@ -9374,7 +9411,7 @@
         node.arguments = this.parseCallExpressionArguments(11, false);
         node.optional = true;
         return this.finishCallExpression(node, true);
-      } else if (!noCalls && this.shouldParseTypes() && this.match(43)) {
+      } else if (!noCalls && this.shouldParseTypes() && this.match(45)) {
         var _node4 = this.startNodeAt(startPos, startLoc);
 
         _node4.callee = base;
@@ -9398,7 +9435,7 @@
     parseNewArguments(node) {
       var targs = null;
 
-      if (this.shouldParseTypes() && this.match(43)) {
+      if (this.shouldParseTypes() && this.match(45)) {
         targs = this.tryParse(() => this.flowParseTypeParameterInstantiationCallOrNew()).node;
       }
 
@@ -9596,7 +9633,7 @@
       var endOfInit = () => this.match(12) || this.match(8);
 
       switch (this.state.type) {
-        case 124:
+        case 126:
           {
             var literal = this.parseNumericLiteral(this.state.value);
 
@@ -9614,7 +9651,7 @@
             };
           }
 
-        case 123:
+        case 125:
           {
             var _literal = this.parseStringLiteral(this.state.value);
 
@@ -9632,10 +9669,10 @@
             };
           }
 
-        case 79:
-        case 80:
+        case 81:
+        case 82:
           {
-            var _literal2 = this.parseBooleanLiteral(this.match(79));
+            var _literal2 = this.parseBooleanLiteral(this.match(81));
 
             if (endOfInit()) {
               return {
@@ -9662,7 +9699,7 @@
     flowEnumMemberRaw() {
       var pos = this.state.start;
       var id = this.parseIdentifier(true);
-      var init = this.eat(27) ? this.flowEnumMemberInit() : {
+      var init = this.eat(29) ? this.flowEnumMemberInit() : {
         type: "none",
         pos
       };
@@ -9830,7 +9867,7 @@
         enumName
       } = _ref16;
 
-      if (this.eatContextual(95)) {
+      if (this.eatContextual(97)) {
         if (!tokenIsIdentifier(this.state.type)) {
           throw this.flowEnumErrorInvalidExplicitType(this.state.start, {
             enumName,
@@ -10247,9 +10284,6 @@
     UnterminatedJsxContent: "Unterminated JSX contents.",
     UnwrappedAdjacentJSXElements: "Adjacent JSX elements must be wrapped in an enclosing tag. Did you want a JSX fragment <>...</>?"
   }, ErrorCodes.SyntaxError, "jsx");
-  types.j_oTag = new TokContext("<tag");
-  types.j_cTag = new TokContext("</tag");
-  types.j_expr = new TokContext("<tag>...</tag>", true);
 
   function isFragment(object) {
     return object ? object.type === "JSXOpeningFragment" || object.type === "JSXClosingFragment" : false;
@@ -10289,14 +10323,14 @@
             if (this.state.pos === this.state.start) {
               if (ch === 60 && this.state.canStartJSXElement) {
                 ++this.state.pos;
-                return this.finishToken(132);
+                return this.finishToken(134);
               }
 
               return super.getTokenFromCode(ch);
             }
 
             out += this.input.slice(chunkStart, this.state.pos);
-            return this.finishToken(131, out);
+            return this.finishToken(133, out);
 
           case 38:
             out += this.input.slice(chunkStart, this.state.pos);
@@ -10362,7 +10396,7 @@
       }
 
       out += this.input.slice(chunkStart, this.state.pos++);
-      return this.finishToken(123, out);
+      return this.finishToken(125, out);
     }
 
     jsxReadEntity() {
@@ -10416,13 +10450,13 @@
         ch = this.input.charCodeAt(++this.state.pos);
       } while (isIdentifierChar(ch) || ch === 45);
 
-      return this.finishToken(130, this.input.slice(start, this.state.pos));
+      return this.finishToken(132, this.input.slice(start, this.state.pos));
     }
 
     jsxParseIdentifier() {
       var node = this.startNode();
 
-      if (this.match(130)) {
+      if (this.match(132)) {
         node.name = this.state.value;
       } else if (tokenIsKeyword(this.state.type)) {
         node.name = tokenLabelName(this.state.type);
@@ -10470,8 +10504,9 @@
       switch (this.state.type) {
         case 5:
           node = this.startNode();
+          this.setContext(types.brace);
           this.next();
-          node = this.jsxParseExpressionContainer(node);
+          node = this.jsxParseExpressionContainer(node, types.j_oTag);
 
           if (node.expression.type === "JSXEmptyExpression") {
             this.raise(node.start, JsxErrors.AttributeIsEmpty);
@@ -10479,8 +10514,8 @@
 
           return node;
 
-        case 132:
-        case 123:
+        case 134:
+        case 125:
           return this.parseExprAtom();
 
         default:
@@ -10496,11 +10531,12 @@
     jsxParseSpreadChild(node) {
       this.next();
       node.expression = this.parseExpression();
+      this.setContext(types.j_oTag);
       this.expect(8);
       return this.finishNode(node, "JSXSpreadChild");
     }
 
-    jsxParseExpressionContainer(node) {
+    jsxParseExpressionContainer(node, previousContext) {
       if (this.match(8)) {
         node.expression = this.jsxParseEmptyExpression();
       } else {
@@ -10508,6 +10544,7 @@
         node.expression = expression;
       }
 
+      this.setContext(previousContext);
       this.expect(8);
       return this.finishNode(node, "JSXExpressionContainer");
     }
@@ -10515,23 +10552,26 @@
     jsxParseAttribute() {
       var node = this.startNode();
 
-      if (this.eat(5)) {
+      if (this.match(5)) {
+        this.setContext(types.brace);
+        this.next();
         this.expect(21);
         node.argument = this.parseMaybeAssignAllowIn();
+        this.setContext(types.j_oTag);
         this.expect(8);
         return this.finishNode(node, "JSXSpreadAttribute");
       }
 
       node.name = this.jsxParseNamespacedName();
-      node.value = this.eat(27) ? this.jsxParseAttributeValue() : null;
+      node.value = this.eat(29) ? this.jsxParseAttributeValue() : null;
       return this.finishNode(node, "JSXAttribute");
     }
 
     jsxParseOpeningElementAt(startPos, startLoc) {
       var node = this.startNodeAt(startPos, startLoc);
 
-      if (this.match(133)) {
-        this.expect(133);
+      if (this.match(135)) {
+        this.expect(135);
         return this.finishNode(node, "JSXOpeningFragment");
       }
 
@@ -10542,26 +10582,26 @@
     jsxParseOpeningElementAfterName(node) {
       var attributes = [];
 
-      while (!this.match(50) && !this.match(133)) {
+      while (!this.match(52) && !this.match(135)) {
         attributes.push(this.jsxParseAttribute());
       }
 
       node.attributes = attributes;
-      node.selfClosing = this.eat(50);
-      this.expect(133);
+      node.selfClosing = this.eat(52);
+      this.expect(135);
       return this.finishNode(node, "JSXOpeningElement");
     }
 
     jsxParseClosingElementAt(startPos, startLoc) {
       var node = this.startNodeAt(startPos, startLoc);
 
-      if (this.match(133)) {
-        this.expect(133);
+      if (this.match(135)) {
+        this.expect(135);
         return this.finishNode(node, "JSXClosingFragment");
       }
 
       node.name = this.jsxParseElementName();
-      this.expect(133);
+      this.expect(135);
       return this.finishNode(node, "JSXClosingElement");
     }
 
@@ -10574,12 +10614,12 @@
       if (!openingElement.selfClosing) {
         contents: for (;;) {
           switch (this.state.type) {
-            case 132:
+            case 134:
               startPos = this.state.start;
               startLoc = this.state.startLoc;
               this.next();
 
-              if (this.eat(50)) {
+              if (this.eat(52)) {
                 closingElement = this.jsxParseClosingElementAt(startPos, startLoc);
                 break contents;
               }
@@ -10587,7 +10627,7 @@
               children.push(this.jsxParseElementAt(startPos, startLoc));
               break;
 
-            case 131:
+            case 133:
               children.push(this.parseExprAtom());
               break;
 
@@ -10595,12 +10635,13 @@
               {
                 var _node5 = this.startNode();
 
+                this.setContext(types.brace);
                 this.next();
 
                 if (this.match(21)) {
                   children.push(this.jsxParseSpreadChild(_node5));
                 } else {
-                  children.push(this.jsxParseExpressionContainer(_node5));
+                  children.push(this.jsxParseExpressionContainer(_node5, types.j_expr));
                 }
 
                 break;
@@ -10632,7 +10673,7 @@
 
       node.children = children;
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         throw this.raise(this.state.start, JsxErrors.UnwrappedAdjacentJSXElements);
       }
 
@@ -10646,19 +10687,31 @@
       return this.jsxParseElementAt(startPos, startLoc);
     }
 
+    setContext(newContext) {
+      var {
+        context
+      } = this.state;
+      context[context.length - 1] = newContext;
+    }
+
     parseExprAtom(refExpressionErrors) {
-      if (this.match(131)) {
+      if (this.match(133)) {
         return this.parseLiteral(this.state.value, "JSXText");
-      } else if (this.match(132)) {
+      } else if (this.match(134)) {
         return this.jsxParseElement();
-      } else if (this.match(43) && this.input.charCodeAt(this.state.pos) !== 33) {
-        this.replaceToken(132);
+      } else if (this.match(45) && this.input.charCodeAt(this.state.pos) !== 33) {
+        this.replaceToken(134);
         return this.jsxParseElement();
       } else {
         return super.parseExprAtom(refExpressionErrors);
       }
     }
 
+    skipSpace() {
+      var curContext = this.curContext();
+      if (!curContext.preserveSpace) super.skipSpace();
+    }
+
     getTokenFromCode(code) {
       var context = this.curContext();
 
@@ -10673,7 +10726,7 @@
 
         if (code === 62) {
           ++this.state.pos;
-          return this.finishToken(133);
+          return this.finishToken(135);
         }
 
         if ((code === 34 || code === 39) && context === types.j_oTag) {
@@ -10683,31 +10736,31 @@
 
       if (code === 60 && this.state.canStartJSXElement && this.input.charCodeAt(this.state.pos + 1) !== 33) {
         ++this.state.pos;
-        return this.finishToken(132);
+        return this.finishToken(134);
       }
 
       return super.getTokenFromCode(code);
     }
 
     updateContext(prevType) {
-      super.updateContext(prevType);
       var {
         context,
         type
       } = this.state;
 
-      if (type === 50 && prevType === 132) {
+      if (type === 52 && prevType === 134) {
         context.splice(-2, 2, types.j_cTag);
         this.state.canStartJSXElement = false;
-      } else if (type === 132) {
-        context.push(types.j_expr, types.j_oTag);
-      } else if (type === 133) {
-        var out = context.pop();
+      } else if (type === 134) {
+        context.push(types.j_oTag);
+      } else if (type === 135) {
+        var out = context[context.length - 1];
 
-        if (out === types.j_oTag && prevType === 50 || out === types.j_cTag) {
+        if (out === types.j_oTag && prevType === 52 || out === types.j_cTag) {
           context.pop();
           this.state.canStartJSXElement = context[context.length - 1] === types.j_expr;
         } else {
+          this.setContext(types.j_expr);
           this.state.canStartJSXElement = true;
         }
       } else {
@@ -10919,7 +10972,7 @@
     }
 
     tsTokenCanFollowModifier() {
-      return (this.match(0) || this.match(5) || this.match(49) || this.match(21) || this.match(128) || this.isLiteralPropertyName()) && !this.hasPrecedingLineBreak();
+      return (this.match(0) || this.match(5) || this.match(51) || this.match(21) || this.match(130) || this.isLiteralPropertyName()) && !this.hasPrecedingLineBreak();
     }
 
     tsNextTokenCanFollowModifier() {
@@ -11008,7 +11061,7 @@
           return this.match(3);
 
         case "TypeParametersOrArguments":
-          return this.match(44);
+          return this.match(46);
       }
 
       throw new Error("Unreachable");
@@ -11074,7 +11127,7 @@
         if (bracket) {
           this.expect(0);
         } else {
-          this.expect(43);
+          this.expect(45);
         }
       }
 
@@ -11083,7 +11136,7 @@
       if (bracket) {
         this.expect(3);
       } else {
-        this.expect(44);
+        this.expect(46);
       }
 
       return result;
@@ -11091,10 +11144,10 @@
 
     tsParseImportType() {
       var node = this.startNode();
-      this.expect(77);
+      this.expect(79);
       this.expect(10);
 
-      if (!this.match(123)) {
+      if (!this.match(125)) {
         this.raise(this.state.start, TSErrors.UnsupportedImportTypeArgument);
       }
 
@@ -11105,7 +11158,7 @@
         node.qualifier = this.tsParseEntityName(true);
       }
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         node.typeParameters = this.tsParseTypeArguments();
       }
 
@@ -11129,7 +11182,7 @@
       var node = this.startNode();
       node.typeName = this.tsParseEntityName(false);
 
-      if (!this.hasPrecedingLineBreak() && this.match(43)) {
+      if (!this.hasPrecedingLineBreak() && this.match(45)) {
         node.typeParameters = this.tsParseTypeArguments();
       }
 
@@ -11153,9 +11206,9 @@
 
     tsParseTypeQuery() {
       var node = this.startNode();
-      this.expect(81);
+      this.expect(83);
 
-      if (this.match(77)) {
+      if (this.match(79)) {
         node.exprName = this.tsParseImportType();
       } else {
         node.exprName = this.tsParseEntityName(true);
@@ -11167,13 +11220,13 @@
     tsParseTypeParameter() {
       var node = this.startNode();
       node.name = this.tsParseTypeParameterName();
-      node.constraint = this.tsEatThenParseType(75);
-      node.default = this.tsEatThenParseType(27);
+      node.constraint = this.tsEatThenParseType(77);
+      node.default = this.tsEatThenParseType(29);
       return this.finishNode(node, "TSTypeParameter");
     }
 
     tsTryParseTypeParameters() {
-      if (this.match(43)) {
+      if (this.match(45)) {
         return this.tsParseTypeParameters();
       }
     }
@@ -11181,7 +11234,7 @@
     tsParseTypeParameters() {
       var node = this.startNode();
 
-      if (this.match(43) || this.match(132)) {
+      if (this.match(45) || this.match(134)) {
         this.next();
       } else {
         this.unexpected();
@@ -11204,7 +11257,7 @@
     }
 
     tsTryNextParseConstantContext() {
-      if (this.lookahead().type === 69) {
+      if (this.lookahead().type === 71) {
         this.next();
         return this.tsParseTypeReference();
       }
@@ -11279,14 +11332,14 @@
       if (this.eat(17)) node.optional = true;
       var nodeAny = node;
 
-      if (this.match(10) || this.match(43)) {
+      if (this.match(10) || this.match(45)) {
         if (readonly) {
           this.raise(node.start, TSErrors.ReadonlyForMethodSignature);
         }
 
         var method = nodeAny;
 
-        if (method.kind && this.match(43)) {
+        if (method.kind && this.match(45)) {
           this.raise(this.state.pos, TSErrors.AccesorCannotHaveTypeParameters);
         }
 
@@ -11341,15 +11394,15 @@
     tsParseTypeMember() {
       var node = this.startNode();
 
-      if (this.match(10) || this.match(43)) {
+      if (this.match(10) || this.match(45)) {
         return this.tsParseSignatureMember("TSCallSignatureDeclaration", node);
       }
 
-      if (this.match(71)) {
+      if (this.match(73)) {
         var id = this.startNode();
         this.next();
 
-        if (this.match(10) || this.match(43)) {
+        if (this.match(10) || this.match(45)) {
           return this.tsParseSignatureMember("TSConstructSignatureDeclaration", node);
         } else {
           node.key = this.createIdentifier(id, "new");
@@ -11390,11 +11443,11 @@
     tsIsStartOfMappedType() {
       this.next();
 
-      if (this.eat(47)) {
-        return this.isContextual(112);
+      if (this.eat(49)) {
+        return this.isContextual(114);
       }
 
-      if (this.isContextual(112)) {
+      if (this.isContextual(114)) {
         this.next();
       }
 
@@ -11409,13 +11462,13 @@
       }
 
       this.next();
-      return this.match(52);
+      return this.match(54);
     }
 
     tsParseMappedTypeParameter() {
       var node = this.startNode();
       node.name = this.tsParseTypeParameterName();
-      node.constraint = this.tsExpectThenParseType(52);
+      node.constraint = this.tsExpectThenParseType(54);
       return this.finishNode(node, "TSTypeParameter");
     }
 
@@ -11423,20 +11476,20 @@
       var node = this.startNode();
       this.expect(5);
 
-      if (this.match(47)) {
+      if (this.match(49)) {
         node.readonly = this.state.value;
         this.next();
-        this.expectContextual(112);
-      } else if (this.eatContextual(112)) {
+        this.expectContextual(114);
+      } else if (this.eatContextual(114)) {
         node.readonly = true;
       }
 
       this.expect(0);
       node.typeParameter = this.tsParseMappedTypeParameter();
-      node.nameType = this.eatContextual(87) ? this.tsParseType() : null;
+      node.nameType = this.eatContextual(89) ? this.tsParseType() : null;
       this.expect(3);
 
-      if (this.match(47)) {
+      if (this.match(49)) {
         node.optional = this.state.value;
         this.next();
         this.expect(17);
@@ -11547,11 +11600,11 @@
 
       node.literal = (() => {
         switch (this.state.type) {
-          case 124:
+          case 126:
+          case 127:
           case 125:
-          case 123:
-          case 79:
-          case 80:
+          case 81:
+          case 82:
             return this.parseExprAtom();
 
           default:
@@ -11576,7 +11629,7 @@
     tsParseThisTypeOrThisTypePredicate() {
       var thisKeyword = this.tsParseThisTypeNode();
 
-      if (this.isContextual(107) && !this.hasPrecedingLineBreak()) {
+      if (this.isContextual(109) && !this.hasPrecedingLineBreak()) {
         return this.tsParseThisTypePredicate(thisKeyword);
       } else {
         return thisKeyword;
@@ -11585,19 +11638,19 @@
 
     tsParseNonArrayType() {
       switch (this.state.type) {
-        case 123:
-        case 124:
         case 125:
-        case 79:
-        case 80:
+        case 126:
+        case 127:
+        case 81:
+        case 82:
           return this.tsParseLiteralTypeNode();
 
-        case 47:
+        case 49:
           if (this.state.value === "-") {
             var node = this.startNode();
             var nextToken = this.lookahead();
 
-            if (nextToken.type !== 124 && nextToken.type !== 125) {
+            if (nextToken.type !== 126 && nextToken.type !== 127) {
               throw this.unexpected();
             }
 
@@ -11607,13 +11660,13 @@
 
           break;
 
-        case 72:
+        case 74:
           return this.tsParseThisTypeOrThisTypePredicate();
 
-        case 81:
+        case 83:
           return this.tsParseTypeQuery();
 
-        case 77:
+        case 79:
           return this.tsParseImportType();
 
         case 5:
@@ -11625,7 +11678,8 @@
         case 10:
           return this.tsParseParenthesizedType();
 
-        case 22:
+        case 25:
+        case 24:
           return this.tsParseTemplateLiteralType();
 
         default:
@@ -11634,8 +11688,8 @@
               type
             } = this.state;
 
-            if (tokenIsIdentifier(type) || type === 82 || type === 78) {
-              var nodeType = type === 82 ? "TSVoidKeyword" : type === 78 ? "TSNullKeyword" : keywordTypeFromName(this.state.value);
+            if (tokenIsIdentifier(type) || type === 84 || type === 80) {
+              var nodeType = type === 84 ? "TSVoidKeyword" : type === 80 ? "TSNullKeyword" : keywordTypeFromName(this.state.value);
 
               if (nodeType !== undefined && this.lookaheadCharCode() !== 46) {
                 var _node6 = this.startNode();
@@ -11701,7 +11755,7 @@
 
     tsParseInferType() {
       var node = this.startNode();
-      this.expectContextual(106);
+      this.expectContextual(108);
       var typeParameter = this.startNode();
       typeParameter.name = this.tsParseTypeParameterName();
       node.typeParameter = this.finishNode(typeParameter, "TSTypeParameter");
@@ -11710,7 +11764,7 @@
 
     tsParseTypeOperatorOrHigher() {
       var isTypeOperator = tokenIsTSTypeOperator(this.state.type) && !this.state.containsEsc;
-      return isTypeOperator ? this.tsParseTypeOperator() : this.isContextual(106) ? this.tsParseInferType() : this.tsParseArrayTypeOrHigher();
+      return isTypeOperator ? this.tsParseTypeOperator() : this.isContextual(108) ? this.tsParseInferType() : this.tsParseArrayTypeOrHigher();
     }
 
     tsParseUnionOrIntersectionType(kind, parseConstituentType, operator) {
@@ -11731,15 +11785,15 @@
     }
 
     tsParseIntersectionTypeOrHigher() {
-      return this.tsParseUnionOrIntersectionType("TSIntersectionType", this.tsParseTypeOperatorOrHigher.bind(this), 41);
+      return this.tsParseUnionOrIntersectionType("TSIntersectionType", this.tsParseTypeOperatorOrHigher.bind(this), 43);
     }
 
     tsParseUnionTypeOrHigher() {
-      return this.tsParseUnionOrIntersectionType("TSUnionType", this.tsParseIntersectionTypeOrHigher.bind(this), 39);
+      return this.tsParseUnionOrIntersectionType("TSUnionType", this.tsParseIntersectionTypeOrHigher.bind(this), 41);
     }
 
     tsIsStartOfFunctionType() {
-      if (this.match(43)) {
+      if (this.match(45)) {
         return true;
       }
 
@@ -11747,7 +11801,7 @@
     }
 
     tsSkipParameterStart() {
-      if (tokenIsIdentifier(this.state.type) || this.match(72)) {
+      if (tokenIsIdentifier(this.state.type) || this.match(74)) {
         this.next();
         return true;
       }
@@ -11797,7 +11851,7 @@
       }
 
       if (this.tsSkipParameterStart()) {
-        if (this.match(14) || this.match(12) || this.match(17) || this.match(27)) {
+        if (this.match(14) || this.match(12) || this.match(17) || this.match(29)) {
           return true;
         }
 
@@ -11820,7 +11874,7 @@
         var node = this.startNode();
         var asserts = !!this.tsTryParse(this.tsParseTypePredicateAsserts.bind(this));
 
-        if (asserts && this.match(72)) {
+        if (asserts && this.match(74)) {
           var thisTypePredicate = this.tsParseThisTypeOrThisTypePredicate();
 
           if (thisTypePredicate.type === "TSThisType") {
@@ -11875,21 +11929,21 @@
     tsParseTypePredicatePrefix() {
       var id = this.parseIdentifier();
 
-      if (this.isContextual(107) && !this.hasPrecedingLineBreak()) {
+      if (this.isContextual(109) && !this.hasPrecedingLineBreak()) {
         this.next();
         return id;
       }
     }
 
     tsParseTypePredicateAsserts() {
-      if (this.state.type !== 100) {
+      if (this.state.type !== 102) {
         return false;
       }
 
       var containsEsc = this.state.containsEsc;
       this.next();
 
-      if (!tokenIsIdentifier(this.state.type) && !this.match(72)) {
+      if (!tokenIsIdentifier(this.state.type) && !this.match(74)) {
         return false;
       }
 
@@ -11914,7 +11968,7 @@
       assert(this.state.inType);
       var type = this.tsParseNonConditionalType();
 
-      if (this.hasPrecedingLineBreak() || !this.eat(75)) {
+      if (this.hasPrecedingLineBreak() || !this.eat(77)) {
         return type;
       }
 
@@ -11929,7 +11983,7 @@
     }
 
     isAbstractConstructorSignature() {
-      return this.isContextual(114) && this.lookahead().type === 71;
+      return this.isContextual(116) && this.lookahead().type === 73;
     }
 
     tsParseNonConditionalType() {
@@ -11937,7 +11991,7 @@
         return this.tsParseFunctionOrConstructorType("TSFunctionType");
       }
 
-      if (this.match(71)) {
+      if (this.match(73)) {
         return this.tsParseFunctionOrConstructorType("TSConstructorType");
       } else if (this.isAbstractConstructorSignature()) {
         return this.tsParseFunctionOrConstructorType("TSConstructorType", true);
@@ -11956,7 +12010,7 @@
       var _const = this.tsTryNextParseConstantContext();
 
       node.typeAnnotation = _const || this.tsNextThenParseType();
-      this.expect(44);
+      this.expect(46);
       node.expression = this.parseMaybeUnary();
       return this.finishNode(node, "TSTypeAssertion");
     }
@@ -11976,7 +12030,7 @@
       var node = this.startNode();
       node.expression = this.tsParseEntityName(false);
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         node.typeParameters = this.tsParseTypeArguments();
       }
 
@@ -11994,7 +12048,7 @@
 
       node.typeParameters = this.tsTryParseTypeParameters();
 
-      if (this.eat(75)) {
+      if (this.eat(77)) {
         node.extends = this.tsParseHeritageClause("extends");
       }
 
@@ -12009,9 +12063,9 @@
       this.checkLVal(node.id, "typescript type alias", BIND_TS_TYPE);
       node.typeParameters = this.tsTryParseTypeParameters();
       node.typeAnnotation = this.tsInType(() => {
-        this.expect(27);
+        this.expect(29);
 
-        if (this.isContextual(105) && this.lookahead().type !== 16) {
+        if (this.isContextual(107) && this.lookahead().type !== 16) {
           var _node8 = this.startNode();
 
           this.next();
@@ -12067,9 +12121,9 @@
 
     tsParseEnumMember() {
       var node = this.startNode();
-      node.id = this.match(123) ? this.parseExprAtom() : this.parseIdentifier(true);
+      node.id = this.match(125) ? this.parseExprAtom() : this.parseIdentifier(true);
 
-      if (this.eat(27)) {
+      if (this.eat(29)) {
         node.initializer = this.parseMaybeAssignAllowIn();
       }
 
@@ -12119,10 +12173,10 @@
     }
 
     tsParseAmbientExternalModuleDeclaration(node) {
-      if (this.isContextual(103)) {
+      if (this.isContextual(105)) {
         node.global = true;
         node.id = this.parseIdentifier();
-      } else if (this.match(123)) {
+      } else if (this.match(125)) {
         node.id = this.parseExprAtom();
       } else {
         this.unexpected();
@@ -12145,7 +12199,7 @@
       node.isExport = isExport || false;
       node.id = this.parseIdentifier();
       this.checkLVal(node.id, "import equals declaration", BIND_LEXICAL);
-      this.expect(27);
+      this.expect(29);
       var moduleReference = this.tsParseModuleReference();
 
       if (node.importKind === "type" && moduleReference.type !== "TSExternalModuleReference") {
@@ -12158,7 +12212,7 @@
     }
 
     tsIsExternalModuleReference() {
-      return this.isContextual(110) && this.lookaheadCharCode() === 40;
+      return this.isContextual(112) && this.lookaheadCharCode() === 40;
     }
 
     tsParseModuleReference() {
@@ -12167,10 +12221,10 @@
 
     tsParseExternalModuleReference() {
       var node = this.startNode();
-      this.expectContextual(110);
+      this.expectContextual(112);
       this.expect(10);
 
-      if (!this.match(123)) {
+      if (!this.match(125)) {
         throw this.unexpected();
       }
 
@@ -12213,33 +12267,33 @@
       var starttype = this.state.type;
       var kind;
 
-      if (this.isContextual(93)) {
-        starttype = 68;
+      if (this.isContextual(95)) {
+        starttype = 70;
         kind = "let";
       }
 
       return this.tsInAmbientContext(() => {
         switch (starttype) {
-          case 62:
+          case 64:
             nany.declare = true;
             return this.parseFunctionStatement(nany, false, true);
 
-          case 74:
+          case 76:
             nany.declare = true;
             return this.parseClass(nany, true, false);
 
-          case 69:
-            if (this.match(69) && this.isLookaheadContextual("enum")) {
-              this.expect(69);
-              this.expectContextual(116);
+          case 71:
+            if (this.match(71) && this.isLookaheadContextual("enum")) {
+              this.expect(71);
+              this.expectContextual(118);
               return this.tsParseEnumDeclaration(nany, true);
             }
 
-          case 68:
+          case 70:
             kind = kind || this.state.value;
             return this.parseVarStatement(nany, kind);
 
-          case 103:
+          case 105:
             return this.tsParseAmbientExternalModuleDeclaration(nany);
 
           default:
@@ -12293,7 +12347,7 @@
     tsParseDeclaration(node, value, next) {
       switch (value) {
         case "abstract":
-          if (this.tsCheckLineTerminator(next) && (this.match(74) || tokenIsIdentifier(this.state.type))) {
+          if (this.tsCheckLineTerminator(next) && (this.match(76) || tokenIsIdentifier(this.state.type))) {
             return this.tsParseAbstractDeclaration(node);
           }
 
@@ -12316,7 +12370,7 @@
 
         case "module":
           if (this.tsCheckLineTerminator(next)) {
-            if (this.match(123)) {
+            if (this.match(125)) {
               return this.tsParseAmbientExternalModuleDeclaration(node);
             } else if (tokenIsIdentifier(this.state.type)) {
               return this.tsParseModuleOrNamespaceDeclaration(node);
@@ -12352,7 +12406,7 @@
     }
 
     tsTryParseGenericAsyncArrowFunction(startPos, startLoc) {
-      if (!this.match(43)) {
+      if (!this.match(45)) {
         return undefined;
       }
 
@@ -12378,7 +12432,7 @@
     tsParseTypeArguments() {
       var node = this.startNode();
       node.params = this.tsInType(() => this.tsInNoContext(() => {
-        this.expect(43);
+        this.expect(45);
         return this.tsParseDelimitedList("TypeParametersOrArguments", this.tsParseType.bind(this));
       }));
 
@@ -12386,7 +12440,7 @@
         this.raise(node.start, TSErrors.EmptyTypeArguments);
       }
 
-      this.expect(44);
+      this.expect(46);
       return this.finishNode(node, "TSTypeParameterInstantiation");
     }
 
@@ -12506,7 +12560,7 @@
     }
 
     parseSubscript(base, startPos, startLoc, noCalls, state) {
-      if (!this.hasPrecedingLineBreak() && this.match(33)) {
+      if (!this.hasPrecedingLineBreak() && this.match(35)) {
         this.state.canStartJSXElement = false;
         this.next();
         var nonNullExpression = this.startNodeAt(startPos, startLoc);
@@ -12526,7 +12580,7 @@
         this.next();
       }
 
-      if (this.match(43)) {
+      if (this.match(45)) {
         var missingParenErrorPos;
         var result = this.tsTryParseAndCatch(() => {
           if (!noCalls && this.atPossibleAsyncArrow(base)) {
@@ -12557,7 +12611,7 @@
               }
 
               return this.finishCallExpression(node, state.optionalChainMember);
-            } else if (this.match(22)) {
+            } else if (tokenIsTemplate(this.state.type)) {
               var _result = this.parseTaggedTemplateExpression(base, startPos, startLoc, state);
 
               _result.typeParameters = typeArguments;
@@ -12579,7 +12633,7 @@
     }
 
     parseNewArguments(node) {
-      if (this.match(43)) {
+      if (this.match(45)) {
         var typeParameters = this.tsTryParseAndCatch(() => {
           var args = this.tsParseTypeArguments();
           if (!this.match(10)) this.unexpected();
@@ -12595,7 +12649,7 @@
     }
 
     parseExprOp(left, leftStartPos, leftStartLoc, minPrec) {
-      if (tokenOperatorPrecedence(52) > minPrec && !this.hasPrecedingLineBreak() && this.isContextual(87)) {
+      if (tokenOperatorPrecedence(54) > minPrec && !this.hasPrecedingLineBreak() && this.isContextual(89)) {
         var node = this.startNodeAt(leftStartPos, leftStartLoc);
         node.expression = left;
 
@@ -12622,16 +12676,16 @@
     parseImport(node) {
       node.importKind = "value";
 
-      if (tokenIsIdentifier(this.state.type) || this.match(49) || this.match(5)) {
+      if (tokenIsIdentifier(this.state.type) || this.match(51) || this.match(5)) {
         var ahead = this.lookahead();
 
-        if (this.isContextual(120) && ahead.type !== 12 && ahead.type !== 91 && ahead.type !== 27) {
+        if (this.isContextual(122) && ahead.type !== 12 && ahead.type !== 93 && ahead.type !== 29) {
           node.importKind = "type";
           this.next();
           ahead = this.lookahead();
         }
 
-        if (tokenIsIdentifier(this.state.type) && ahead.type === 27) {
+        if (tokenIsIdentifier(this.state.type) && ahead.type === 29) {
           return this.tsParseImportEqualsDeclaration(node);
         }
       }
@@ -12646,10 +12700,10 @@
     }
 
     parseExport(node) {
-      if (this.match(77)) {
+      if (this.match(79)) {
         this.next();
 
-        if (this.isContextual(120) && this.lookaheadCharCode() !== 61) {
+        if (this.isContextual(122) && this.lookaheadCharCode() !== 61) {
           node.importKind = "type";
           this.next();
         } else {
@@ -12657,19 +12711,19 @@
         }
 
         return this.tsParseImportEqualsDeclaration(node, true);
-      } else if (this.eat(27)) {
+      } else if (this.eat(29)) {
         var assign = node;
         assign.expression = this.parseExpression();
         this.semicolon();
         return this.finishNode(assign, "TSExportAssignment");
-      } else if (this.eatContextual(87)) {
+      } else if (this.eatContextual(89)) {
         var decl = node;
-        this.expectContextual(118);
+        this.expectContextual(120);
         decl.id = this.parseIdentifier();
         this.semicolon();
         return this.finishNode(decl, "TSNamespaceExportDeclaration");
       } else {
-        if (this.isContextual(120) && this.lookahead().type === 5) {
+        if (this.isContextual(122) && this.lookahead().type === 5) {
           this.next();
           node.exportKind = "type";
         } else {
@@ -12681,7 +12735,7 @@
     }
 
     isAbstractClass() {
-      return this.isContextual(114) && this.lookahead().type === 74;
+      return this.isContextual(116) && this.lookahead().type === 76;
     }
 
     parseExportDefaultExpression() {
@@ -12693,7 +12747,7 @@
         return cls;
       }
 
-      if (this.match(119)) {
+      if (this.match(121)) {
         var interfaceNode = this.startNode();
         this.next();
         var result = this.tsParseInterfaceDeclaration(interfaceNode);
@@ -12704,13 +12758,13 @@
     }
 
     parseStatementContent(context, topLevel) {
-      if (this.state.type === 69) {
+      if (this.state.type === 71) {
         var ahead = this.lookahead();
 
-        if (ahead.type === 116) {
+        if (ahead.type === 118) {
           var node = this.startNode();
           this.next();
-          this.expectContextual(116);
+          this.expectContextual(118);
           return this.tsParseEnumDeclaration(node, true);
         }
       }
@@ -12733,7 +12787,7 @@
     }
 
     tsIsStartOfStaticBlocks() {
-      return this.isContextual(98) && this.lookaheadCharCode() === 123;
+      return this.isContextual(100) && this.lookaheadCharCode() === 123;
     }
 
     parseClassMember(classBody, member, state) {
@@ -12863,9 +12917,9 @@
     parseExportDeclaration(node) {
       var startPos = this.state.start;
       var startLoc = this.state.startLoc;
-      var isDeclare = this.eatContextual(115);
+      var isDeclare = this.eatContextual(117);
 
-      if (isDeclare && (this.isContextual(115) || !this.shouldParseExportDeclaration())) {
+      if (isDeclare && (this.isContextual(117) || !this.shouldParseExportDeclaration())) {
         throw this.raise(this.state.start, TSErrors.ExpectedAmbientAfterExportDeclare);
       }
 
@@ -12892,7 +12946,7 @@
     }
 
     parseClassId(node, isStatement, optionalId) {
-      if ((!isStatement || optionalId) && this.isContextual(104)) {
+      if ((!isStatement || optionalId) && this.isContextual(106)) {
         return;
       }
 
@@ -12902,7 +12956,7 @@
     }
 
     parseClassPropertyAnnotation(node) {
-      if (!node.optional && this.eat(33)) {
+      if (!node.optional && this.eat(35)) {
         node.definite = true;
       }
 
@@ -12913,11 +12967,11 @@
     parseClassProperty(node) {
       this.parseClassPropertyAnnotation(node);
 
-      if (this.state.isAmbientContext && this.match(27)) {
+      if (this.state.isAmbientContext && this.match(29)) {
         this.raise(this.state.start, TSErrors.DeclareClassFieldHasInitializer);
       }
 
-      if (node.abstract && this.match(27)) {
+      if (node.abstract && this.match(29)) {
         var {
           key
         } = node;
@@ -12970,11 +13024,11 @@
     parseClassSuper(node) {
       super.parseClassSuper(node);
 
-      if (node.superClass && this.match(43)) {
+      if (node.superClass && this.match(45)) {
         node.superTypeParameters = this.tsParseTypeArguments();
       }
 
-      if (this.eatContextual(104)) {
+      if (this.eatContextual(106)) {
         node.implements = this.tsParseHeritageClause("implements");
       }
     }
@@ -12999,7 +13053,7 @@
     parseVarId(decl, kind) {
       super.parseVarId(decl, kind);
 
-      if (decl.id.type === "Identifier" && this.eat(33)) {
+      if (decl.id.type === "Identifier" && this.eat(35)) {
         decl.definite = true;
       }
 
@@ -13030,22 +13084,21 @@
       var jsx;
       var typeCast;
 
-      if (this.hasPlugin("jsx") && (this.match(132) || this.match(43))) {
+      if (this.hasPlugin("jsx") && (this.match(134) || this.match(45))) {
         state = this.state.clone();
         jsx = this.tryParse(() => super.parseMaybeAssign(...args), state);
         if (!jsx.error) return jsx.node;
         var {
           context
         } = this.state;
+        var currentContext = context[context.length - 1];
 
-        if (context[context.length - 1] === types.j_oTag) {
-          context.length -= 2;
-        } else if (context[context.length - 1] === types.j_expr) {
-          context.length -= 1;
+        if (currentContext === types.j_oTag || currentContext === types.j_expr) {
+          context.pop();
         }
       }
 
-      if (!((_jsx = jsx) != null && _jsx.error) && !this.match(43)) {
+      if (!((_jsx = jsx) != null && _jsx.error) && !this.match(45)) {
         return super.parseMaybeAssign(...args);
       }
 
@@ -13111,7 +13164,7 @@
     }
 
     parseMaybeUnary(refExpressionErrors) {
-      if (!this.hasPlugin("jsx") && this.match(43)) {
+      if (!this.hasPlugin("jsx") && this.match(45)) {
         return this.tsParseTypeAssertion();
       } else {
         return super.parseMaybeUnary(refExpressionErrors);
@@ -13239,7 +13292,7 @@
 
     parseBindingAtom() {
       switch (this.state.type) {
-        case 72:
+        case 74:
           return this.parseIdentifier(true);
 
         default:
@@ -13248,7 +13301,7 @@
     }
 
     parseMaybeDecoratorArguments(expr) {
-      if (this.match(43)) {
+      if (this.match(45)) {
         var typeArguments = this.tsParseTypeArguments();
 
         if (this.match(10)) {
@@ -13272,11 +13325,11 @@
     }
 
     isClassMethod() {
-      return this.match(43) || super.isClassMethod();
+      return this.match(45) || super.isClassMethod();
     }
 
     isClassProperty() {
-      return this.match(33) || this.match(14) || super.isClassProperty();
+      return this.match(35) || this.match(14) || super.isClassProperty();
     }
 
     parseMaybeDefault() {
@@ -13292,11 +13345,11 @@
     getTokenFromCode(code) {
       if (this.state.inType) {
         if (code === 62) {
-          return this.finishOp(44, 1);
+          return this.finishOp(46, 1);
         }
 
         if (code === 60) {
-          return this.finishOp(43, 1);
+          return this.finishOp(45, 1);
         }
       }
 
@@ -13308,10 +13361,10 @@
         type
       } = this.state;
 
-      if (type === 43) {
+      if (type === 45) {
         this.state.pos -= 1;
         this.readToken_lt();
-      } else if (type === 44) {
+      } else if (type === 46) {
         this.state.pos -= 1;
         this.readToken_gt();
       }
@@ -13365,7 +13418,7 @@
     }
 
     jsxParseOpeningElementAfterName(node) {
-      if (this.match(43)) {
+      if (this.match(45)) {
         var typeArguments = this.tsTryParseAndCatch(() => this.tsParseTypeArguments());
         if (typeArguments) node.typeParameters = typeArguments;
       }
@@ -13420,10 +13473,10 @@
     }
 
     tsParseAbstractDeclaration(node) {
-      if (this.match(74)) {
+      if (this.match(76)) {
         node.abstract = true;
         return this.parseClass(node, true, false);
-      } else if (this.isContextual(119)) {
+      } else if (this.isContextual(121)) {
         if (!this.hasFollowingLineBreak()) {
           node.abstract = true;
           this.raise(node.start, TSErrors.NonClassMethodPropertyHasAbstractModifer);
@@ -13431,7 +13484,7 @@
           return this.tsParseInterfaceDeclaration(node);
         }
       } else {
-        this.unexpected(null, 74);
+        this.unexpected(null, 76);
       }
     }
 
@@ -13506,10 +13559,10 @@
       var canParseAsKeyword = true;
       var pos = leftOfAs.start;
 
-      if (this.isContextual(87)) {
+      if (this.isContextual(89)) {
         var firstAs = this.parseIdentifier();
 
-        if (this.isContextual(87)) {
+        if (this.isContextual(89)) {
           var secondAs = this.parseIdentifier();
 
           if (tokenIsKeywordOrIdentifier(this.state.type)) {
@@ -13542,7 +13595,7 @@
       var kindKey = isImport ? "importKind" : "exportKind";
       node[kindKey] = hasTypeSpecifier ? "type" : "value";
 
-      if (canParseAsKeyword && this.eatContextual(87)) {
+      if (canParseAsKeyword && this.eatContextual(89)) {
         node[rightOfAsKey] = isImport ? this.parseIdentifier() : this.parseModuleExportName();
       }
 
@@ -13563,13 +13616,13 @@
 
   var placeholders = superClass => class extends superClass {
     parsePlaceholder(expectedNode) {
-      if (this.match(134)) {
+      if (this.match(136)) {
         var node = this.startNode();
         this.next();
         this.assertNoSpace("Unexpected space in placeholder.");
         node.name = super.parseIdentifier(true);
         this.assertNoSpace("Unexpected space in placeholder.");
-        this.expect(134);
+        this.expect(136);
         return this.finishPlaceholder(node, expectedNode);
       }
     }
@@ -13582,7 +13635,7 @@
 
     getTokenFromCode(code) {
       if (code === 37 && this.input.charCodeAt(this.state.pos + 1) === 37) {
-        return this.finishOp(134, 2);
+        return this.finishOp(136, 2);
       }
 
       return super.getTokenFromCode(...arguments);
@@ -13622,14 +13675,14 @@
         return true;
       }
 
-      if (!this.isContextual(93)) {
+      if (!this.isContextual(95)) {
         return false;
       }
 
       if (context) return false;
       var nextToken = this.lookahead();
 
-      if (nextToken.type === 134) {
+      if (nextToken.type === 136) {
         return true;
       }
 
@@ -13675,7 +13728,7 @@
       var placeholder = this.parsePlaceholder("Identifier");
 
       if (placeholder) {
-        if (this.match(75) || this.match(134) || this.match(5)) {
+        if (this.match(77) || this.match(136) || this.match(5)) {
           node.id = placeholder;
         } else if (optionalId || !isStatement) {
           node.id = null;
@@ -13697,7 +13750,7 @@
       var placeholder = this.parsePlaceholder("Identifier");
       if (!placeholder) return super.parseExport(...arguments);
 
-      if (!this.isContextual(91) && !this.match(12)) {
+      if (!this.isContextual(93) && !this.match(12)) {
         node.specifiers = [];
         node.source = null;
         node.declaration = this.finishPlaceholder(placeholder, "Declaration");
@@ -13712,11 +13765,11 @@
     }
 
     isExportDefaultSpecifier() {
-      if (this.match(59)) {
+      if (this.match(61)) {
         var next = this.nextTokenStart();
 
         if (this.isUnparsedContextual(next, "from")) {
-          if (this.input.startsWith(tokenLabelName(134), this.nextTokenStartSince(next + 4))) {
+          if (this.input.startsWith(tokenLabelName(136), this.nextTokenStartSince(next + 4))) {
             return true;
           }
         }
@@ -13751,7 +13804,7 @@
       if (!placeholder) return super.parseImport(...arguments);
       node.specifiers = [];
 
-      if (!this.isContextual(91) && !this.match(12)) {
+      if (!this.isContextual(93) && !this.match(12)) {
         node.source = this.finishPlaceholder(placeholder, "StringLiteral");
         this.semicolon();
         return this.finishNode(node, "ImportDeclaration");
@@ -13767,7 +13820,7 @@
         if (!hasStarImport) this.parseNamedImportSpecifiers(node);
       }
 
-      this.expectContextual(91);
+      this.expectContextual(93);
       node.source = this.parseImportSource();
       this.semicolon();
       return this.finishNode(node, "ImportDeclaration");
@@ -13781,7 +13834,7 @@
 
   var v8intrinsic = superClass => class extends superClass {
     parseV8Intrinsic() {
-      if (this.match(48)) {
+      if (this.match(50)) {
         var v8IntrinsicStart = this.state.start;
         var node = this.startNode();
         this.next();
@@ -13806,12 +13859,27 @@
 
   };
 
-  function hasPlugin(plugins, name) {
-    return plugins.some(plugin => {
-      if (Array.isArray(plugin)) {
-        return plugin[0] === name;
+  function hasPlugin(plugins, expectedConfig) {
+    var [expectedName, expectedOptions] = typeof expectedConfig === "string" ? [expectedConfig, {}] : expectedConfig;
+    var expectedKeys = Object.keys(expectedOptions);
+    var expectedOptionsIsEmpty = expectedKeys.length === 0;
+    return plugins.some(p => {
+      if (typeof p === "string") {
+        return expectedOptionsIsEmpty && p === expectedName;
       } else {
-        return plugin === name;
+        var [pluginName, pluginOptions] = p;
+
+        if (pluginName !== expectedName) {
+          return false;
+        }
+
+        for (var key of expectedKeys) {
+          if (pluginOptions[key] !== expectedOptions[key]) {
+            return false;
+          }
+        }
+
+        return true;
       }
     });
   }
@@ -13867,7 +13935,9 @@
         throw new Error("\"pipelineOperator\" requires \"proposal\" option whose value must be one of: ".concat(proposalList, "."));
       }
 
-      var tupleSyntaxIsHash = hasPlugin(plugins, "recordAndTuple") && getPluginOption(plugins, "recordAndTuple", "syntaxType") === "hash";
+      var tupleSyntaxIsHash = hasPlugin(plugins, ["recordAndTuple", {
+        syntaxType: "hash"
+      }]);
 
       if (proposal === "hack") {
         if (hasPlugin(plugins, "placeholders")) {
@@ -14204,11 +14274,11 @@
         } else {
           var decorators = [];
 
-          if (this.match(24) && this.hasPlugin("decorators")) {
+          if (this.match(26) && this.hasPlugin("decorators")) {
             this.raise(this.state.start, ErrorMessages.UnsupportedParameterDecorator);
           }
 
-          while (this.match(24)) {
+          while (this.match(26)) {
             decorators.push(this.parseDecorator());
           }
 
@@ -14267,7 +14337,7 @@
       startLoc = (_startLoc = startLoc) != null ? _startLoc : this.state.startLoc;
       startPos = (_startPos = startPos) != null ? _startPos : this.state.start;
       left = (_left = left) != null ? _left : this.parseBindingAtom();
-      if (!this.eat(27)) return left;
+      if (!this.eat(29)) return left;
       var node = this.startNodeAt(startPos, startLoc);
       node.left = left;
       node.right = this.parseMaybeAssignAllowIn();
@@ -14419,7 +14489,7 @@
       this.nextToken();
       var expr = this.parseExpression();
 
-      if (!this.match(129)) {
+      if (!this.match(131)) {
         this.unexpected();
       }
 
@@ -14480,7 +14550,7 @@
       var startPos = this.state.start;
       var startLoc = this.state.startLoc;
 
-      if (this.isContextual(99)) {
+      if (this.isContextual(101)) {
         if (this.prodParam.hasYield) {
           var _left2 = this.parseYield();
 
@@ -14520,7 +14590,7 @@
         var operator = this.state.value;
         node.operator = operator;
 
-        if (this.match(27)) {
+        if (this.match(29)) {
           node.left = this.toAssignable(left, true);
 
           if (refExpressionErrors.doubleProto >= startPos) {
@@ -14572,7 +14642,7 @@
     }
 
     parseMaybeUnaryOrPrivate(refExpressionErrors) {
-      return this.match(128) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
+      return this.match(130) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
     }
 
     parseExprOps(refExpressionErrors) {
@@ -14595,7 +14665,7 @@
           start
         } = left;
 
-        if (minPrec >= tokenOperatorPrecedence(52) || !this.prodParam.hasIn || !this.match(52)) {
+        if (minPrec >= tokenOperatorPrecedence(54) || !this.prodParam.hasIn || !this.match(54)) {
           this.raise(start, ErrorMessages.PrivateInExpectedIn, value);
         }
 
@@ -14604,11 +14674,11 @@
 
       var op = this.state.type;
 
-      if (tokenIsOperator(op) && (this.prodParam.hasIn || !this.match(52))) {
+      if (tokenIsOperator(op) && (this.prodParam.hasIn || !this.match(54))) {
         var prec = tokenOperatorPrecedence(op);
 
         if (prec > minPrec) {
-          if (op === 35) {
+          if (op === 37) {
             this.expectPlugin("pipelineOperator");
 
             if (this.state.inFSharpPipelineDirectBody) {
@@ -14621,17 +14691,19 @@
           var node = this.startNodeAt(leftStartPos, leftStartLoc);
           node.left = left;
           node.operator = this.state.value;
-          var logical = op === 37 || op === 38;
-          var coalesce = op === 36;
+          var logical = op === 39 || op === 40;
+          var coalesce = op === 38;
 
           if (coalesce) {
-            prec = tokenOperatorPrecedence(38);
+            prec = tokenOperatorPrecedence(40);
           }
 
           this.next();
 
-          if (op === 35 && this.getPluginOption("pipelineOperator", "proposal") === "minimal") {
-            if (this.state.type === 90 && this.prodParam.hasAwait) {
+          if (op === 37 && this.hasPlugin(["pipelineOperator", {
+            proposal: "minimal"
+          }])) {
+            if (this.state.type === 92 && this.prodParam.hasAwait) {
               throw this.raise(this.state.start, ErrorMessages.UnexpectedAwaitAfterPipelineBody);
             }
           }
@@ -14640,7 +14712,7 @@
           this.finishNode(node, logical || coalesce ? "LogicalExpression" : "BinaryExpression");
           var nextOp = this.state.type;
 
-          if (coalesce && (nextOp === 37 || nextOp === 38) || logical && nextOp === 36) {
+          if (coalesce && (nextOp === 39 || nextOp === 40) || logical && nextOp === 38) {
             throw this.raise(this.state.start, ErrorMessages.MixingCoalesceWithLogical);
           }
 
@@ -14656,7 +14728,7 @@
       var startLoc = this.state.startLoc;
 
       switch (op) {
-        case 35:
+        case 37:
           switch (this.getPluginOption("pipelineOperator", "proposal")) {
             case "hack":
               return this.withTopicBindingContext(() => {
@@ -14665,7 +14737,7 @@
 
             case "smart":
               return this.withTopicBindingContext(() => {
-                if (this.prodParam.hasYield && this.isContextual(99)) {
+                if (this.prodParam.hasYield && this.isContextual(101)) {
                   throw this.raise(this.state.start, ErrorMessages.PipeBodyIsTighter, this.state.value);
                 }
 
@@ -14709,7 +14781,7 @@
     }
 
     checkExponentialAfterUnary(node) {
-      if (this.match(51)) {
+      if (this.match(53)) {
         this.raise(node.argument.start, ErrorMessages.UnexpectedTokenUnaryExponentiation);
       }
     }
@@ -14717,7 +14789,7 @@
     parseMaybeUnary(refExpressionErrors, sawUnary) {
       var startPos = this.state.start;
       var startLoc = this.state.startLoc;
-      var isAwait = this.isContextual(90);
+      var isAwait = this.isContextual(92);
 
       if (isAwait && this.isAwaitAllowed()) {
         this.next();
@@ -14728,18 +14800,18 @@
         return _expr;
       }
 
-      var update = this.match(32);
+      var update = this.match(34);
       var node = this.startNode();
 
       if (tokenIsPrefix(this.state.type)) {
         node.operator = this.state.value;
         node.prefix = true;
 
-        if (this.match(66)) {
+        if (this.match(68)) {
           this.expectPlugin("throwExpressions");
         }
 
-        var isDelete = this.match(83);
+        var isDelete = this.match(85);
         this.next();
         node.argument = this.parseMaybeUnary(null, true);
         this.checkExpressionErrors(refExpressionErrors, true);
@@ -14767,7 +14839,7 @@
           type
         } = this.state;
 
-        var _startsExpr = this.hasPlugin("v8intrinsic") ? tokenCanStartExpression(type) : tokenCanStartExpression(type) && !this.match(48);
+        var _startsExpr = this.hasPlugin("v8intrinsic") ? tokenCanStartExpression(type) : tokenCanStartExpression(type) && !this.match(50);
 
         if (_startsExpr && !this.isAmbiguousAwait()) {
           this.raiseOverwrite(startPos, ErrorMessages.AwaitNotInAsyncContext);
@@ -14832,15 +14904,19 @@
     }
 
     parseSubscript(base, startPos, startLoc, noCalls, state) {
-      if (!noCalls && this.eat(15)) {
+      var {
+        type
+      } = this.state;
+
+      if (!noCalls && type === 15) {
         return this.parseBind(base, startPos, startLoc, noCalls, state);
-      } else if (this.match(22)) {
+      } else if (tokenIsTemplate(type)) {
         return this.parseTaggedTemplateExpression(base, startPos, startLoc, state);
       }
 
       var optional = false;
 
-      if (this.match(18)) {
+      if (type === 18) {
         if (noCalls && this.lookaheadCharCode() === 40) {
           state.stop = true;
           return base;
@@ -14868,21 +14944,19 @@
       var node = this.startNodeAt(startPos, startLoc);
       node.object = base;
       node.computed = computed;
-      var privateName = !computed && this.match(128) && this.state.value;
-      var property = computed ? this.parseExpression() : privateName ? this.parsePrivateName() : this.parseIdentifier(true);
 
-      if (privateName !== false) {
-        if (node.object.type === "Super") {
+      if (computed) {
+        node.property = this.parseExpression();
+        this.expect(3);
+      } else if (this.match(130)) {
+        if (base.type === "Super") {
           this.raise(startPos, ErrorMessages.SuperPrivateField);
         }
 
-        this.classScope.usePrivateName(privateName, property.start);
-      }
-
-      node.property = property;
-
-      if (computed) {
-        this.expect(3);
+        this.classScope.usePrivateName(this.state.value, this.state.start);
+        node.property = this.parsePrivateName();
+      } else {
+        node.property = this.parseIdentifier(true);
       }
 
       if (state.optionalChainMember) {
@@ -14896,6 +14970,7 @@
     parseBind(base, startPos, startLoc, noCalls, state) {
       var node = this.startNodeAt(startPos, startLoc);
       node.object = base;
+      this.next();
       node.callee = this.parseNoCallExpr();
       state.stop = true;
       return this.parseSubscripts(this.finishNode(node, "BindExpression"), startPos, startLoc, noCalls);
@@ -15056,10 +15131,10 @@
       } = this.state;
 
       switch (type) {
-        case 73:
+        case 75:
           return this.parseSuper();
 
-        case 77:
+        case 79:
           node = this.startNode();
           this.next();
 
@@ -15073,42 +15148,42 @@
 
           return this.finishNode(node, "Import");
 
-        case 72:
+        case 74:
           node = this.startNode();
           this.next();
           return this.finishNode(node, "ThisExpression");
 
-        case 84:
+        case 86:
           {
             return this.parseDo(this.startNode(), false);
           }
 
-        case 50:
-        case 29:
+        case 52:
+        case 31:
           {
             this.readRegexp();
             return this.parseRegExpLiteral(this.state.value);
           }
 
-        case 124:
+        case 126:
           return this.parseNumericLiteral(this.state.value);
 
-        case 125:
+        case 127:
           return this.parseBigIntLiteral(this.state.value);
 
-        case 126:
+        case 128:
           return this.parseDecimalLiteral(this.state.value);
 
-        case 123:
+        case 125:
           return this.parseStringLiteral(this.state.value);
 
-        case 78:
+        case 80:
           return this.parseNullLiteral();
 
-        case 79:
+        case 81:
           return this.parseBooleanLiteral(true);
 
-        case 80:
+        case 82:
           return this.parseBooleanLiteral(false);
 
         case 10:
@@ -15139,21 +15214,22 @@
             return this.parseObjectLike(8, false, false, refExpressionErrors);
           }
 
-        case 62:
+        case 64:
           return this.parseFunctionOrFunctionSent();
 
-        case 24:
+        case 26:
           this.parseDecorators();
 
-        case 74:
+        case 76:
           node = this.startNode();
           this.takeDecorators(node);
           return this.parseClass(node, false);
 
-        case 71:
+        case 73:
           return this.parseNewOrNewTarget();
 
-        case 22:
+        case 25:
+        case 24:
           return this.parseTemplate(false);
 
         case 15:
@@ -15170,25 +15246,25 @@
             }
           }
 
-        case 128:
+        case 130:
           {
             this.raise(this.state.start, ErrorMessages.PrivateInExpectedIn, this.state.value);
             return this.parsePrivateName();
           }
 
-        case 31:
+        case 33:
           {
-            return this.parseTopicReferenceThenEqualsSign(48, "%");
+            return this.parseTopicReferenceThenEqualsSign(50, "%");
           }
 
-        case 30:
+        case 32:
           {
-            return this.parseTopicReferenceThenEqualsSign(40, "^");
+            return this.parseTopicReferenceThenEqualsSign(42, "^");
           }
 
-        case 40:
-        case 48:
-        case 25:
+        case 42:
+        case 50:
+        case 27:
           {
             var pipeProposal = this.getPluginOption("pipelineOperator", "proposal");
 
@@ -15199,7 +15275,7 @@
             }
           }
 
-        case 43:
+        case 45:
           {
             var lookaheadCh = this.input.codePointAt(this.nextTokenStart());
 
@@ -15213,7 +15289,7 @@
 
         default:
           if (tokenIsIdentifier(type)) {
-            if (this.isContextual(117) && this.lookaheadCharCode() === 123 && !this.hasFollowingLineBreak()) {
+            if (this.isContextual(119) && this.lookaheadCharCode() === 123 && !this.hasFollowingLineBreak()) {
               return this.parseModuleExpression();
             }
 
@@ -15227,7 +15303,7 @@
                 type: _type
               } = this.state;
 
-              if (_type === 62) {
+              if (_type === 64) {
                 this.resetPreviousNodeTrailingComments(id);
                 this.next();
                 return this.parseFunction(this.startNodeAtNode(id), undefined, true);
@@ -15237,7 +15313,7 @@
                 } else {
                   return id;
                 }
-              } else if (_type === 84) {
+              } else if (_type === 86) {
                 this.resetPreviousNodeTrailingComments(id);
                 return this.parseDo(this.startNodeAtNode(id), true);
               }
@@ -15308,12 +15384,13 @@
       switch (pipeProposal) {
         case "hack":
           {
-            var pluginTopicToken = this.getPluginOption("pipelineOperator", "topicToken");
-            return tokenLabelName(tokenType) === pluginTopicToken;
+            return this.hasPlugin(["pipelineOperator", {
+              topicToken: tokenLabelName(tokenType)
+            }]);
           }
 
         case "smart":
-          return tokenType === 25;
+          return tokenType === 27;
 
         default:
           throw this.raise(start, ErrorMessages.PipeTopicRequiresHackPipes);
@@ -15392,7 +15469,7 @@
         var meta = this.createIdentifier(this.startNodeAtNode(node), "function");
         this.next();
 
-        if (this.match(96)) {
+        if (this.match(98)) {
           this.expectPlugin("functionSent");
         } else if (!this.hasPlugin("functionSent")) {
           this.unexpected();
@@ -15420,7 +15497,7 @@
       var id = this.createIdentifier(this.startNodeAtNode(node), "import");
       this.next();
 
-      if (this.isContextual(94)) {
+      if (this.isContextual(96)) {
         if (!this.inModule) {
           this.raise(id.start, SourceTypeModuleErrorMessages.ImportMetaOutsideModule);
         }
@@ -15628,38 +15705,46 @@
     }
 
     parseTemplateElement(isTagged) {
-      var elem = this.startNode();
+      var {
+        start,
+        end,
+        value
+      } = this.state;
+      var elemStart = start + 1;
+      var elem = this.startNodeAt(elemStart, createPositionWithColumnOffset(this.state.startLoc, 1));
 
-      if (this.state.value === null) {
+      if (value === null) {
         if (!isTagged) {
-          this.raise(this.state.start + 1, ErrorMessages.InvalidEscapeSequenceTemplate);
+          this.raise(start + 2, ErrorMessages.InvalidEscapeSequenceTemplate);
         }
       }
 
+      var isTail = this.match(24);
+      var endOffset = isTail ? -1 : -2;
+      var elemEnd = end + endOffset;
       elem.value = {
-        raw: this.input.slice(this.state.start, this.state.end).replace(/\r\n?/g, "\n"),
-        cooked: this.state.value
+        raw: this.input.slice(elemStart, elemEnd).replace(/\r\n?/g, "\n"),
+        cooked: value === null ? null : value.slice(1, endOffset)
       };
+      elem.tail = isTail;
       this.next();
-      elem.tail = this.match(22);
-      return this.finishNode(elem, "TemplateElement");
+      this.finishNode(elem, "TemplateElement");
+      this.resetEndLocation(elem, elemEnd, createPositionWithColumnOffset(this.state.lastTokEndLoc, endOffset));
+      return elem;
     }
 
     parseTemplate(isTagged) {
       var node = this.startNode();
-      this.next();
       node.expressions = [];
       var curElt = this.parseTemplateElement(isTagged);
       node.quasis = [curElt];
 
       while (!curElt.tail) {
-        this.expect(23);
         node.expressions.push(this.parseTemplateSubstitution());
-        this.expect(8);
+        this.readTemplateContinuation();
         node.quasis.push(curElt = this.parseTemplateElement(isTagged));
       }
 
-      this.next();
       return this.finishNode(node, "TemplateLiteral");
     }
 
@@ -15726,18 +15811,18 @@
     }
 
     maybeAsyncOrAccessorProp(prop) {
-      return !prop.computed && prop.key.type === "Identifier" && (this.isLiteralPropertyName() || this.match(0) || this.match(49));
+      return !prop.computed && prop.key.type === "Identifier" && (this.isLiteralPropertyName() || this.match(0) || this.match(51));
     }
 
     parsePropertyDefinition(refExpressionErrors) {
       var decorators = [];
 
-      if (this.match(24)) {
+      if (this.match(26)) {
         if (this.hasPlugin("decorators")) {
           this.raise(this.state.start, ErrorMessages.UnsupportedPropertyDecorator);
         }
 
-        while (this.match(24)) {
+        while (this.match(26)) {
           decorators.push(this.parseDecorator());
         }
       }
@@ -15765,7 +15850,7 @@
         startLoc = this.state.startLoc;
       }
 
-      var isGenerator = this.eat(49);
+      var isGenerator = this.eat(51);
       this.parsePropertyNamePrefixOperator(prop);
       var containsEsc = this.state.containsEsc;
       var key = this.parsePropertyName(prop);
@@ -15776,7 +15861,7 @@
         if (keyName === "async" && !this.hasPrecedingLineBreak()) {
           isAsync = true;
           this.resetPreviousNodeTrailingComments(key);
-          isGenerator = this.eat(49);
+          isGenerator = this.eat(51);
           this.parsePropertyName(prop);
         }
 
@@ -15785,7 +15870,7 @@
           this.resetPreviousNodeTrailingComments(key);
           prop.kind = keyName;
 
-          if (this.match(49)) {
+          if (this.match(51)) {
             isGenerator = true;
             this.raise(this.state.pos, ErrorMessages.AccessorIsGenerator, keyName);
             this.next();
@@ -15855,9 +15940,15 @@
 
         if (isPattern) {
           prop.value = this.parseMaybeDefault(startPos, startLoc, cloneIdentifier(prop.key));
-        } else if (this.match(27) && refExpressionErrors) {
-          if (refExpressionErrors.shorthandAssign === -1) {
-            refExpressionErrors.shorthandAssign = this.state.start;
+        } else if (this.match(29)) {
+          var shorthandAssign = this.state.start;
+
+          if (refExpressionErrors != null) {
+            if (refExpressionErrors.shorthandAssign === -1) {
+              refExpressionErrors.shorthandAssign = shorthandAssign;
+            }
+          } else {
+            this.raise(shorthandAssign, ErrorMessages.InvalidCoverInitializedName);
           }
 
           prop.value = this.parseMaybeDefault(startPos, startLoc, cloneIdentifier(prop.key));
@@ -15892,23 +15983,23 @@
           key = this.parseIdentifier(true);
         } else {
           switch (type) {
-            case 124:
+            case 126:
               key = this.parseNumericLiteral(value);
               break;
 
-            case 123:
+            case 125:
               key = this.parseStringLiteral(value);
               break;
 
-            case 125:
+            case 127:
               key = this.parseBigIntLiteral(value);
               break;
 
-            case 126:
+            case 128:
               key = this.parseDecimalLiteral(value);
               break;
 
-            case 128:
+            case 130:
               {
                 var privateKeyPos = this.state.start + 1;
                 this.raise(privateKeyPos, ErrorMessages.UnexpectedPrivateField);
@@ -15923,7 +16014,7 @@
 
         prop.key = key;
 
-        if (type !== 128) {
+        if (type !== 130) {
           prop.computed = false;
         }
       }
@@ -16137,7 +16228,7 @@
 
       if (liberal) {
         if (tokenIsKeyword) {
-          this.replaceToken(122);
+          this.replaceToken(124);
         }
       } else {
         this.checkReservedWord(name, start, tokenIsKeyword, false);
@@ -16204,7 +16295,7 @@
       var node = this.startNodeAt(startPos, startLoc);
       this.expressionScope.recordParameterInitializerError(node.start, ErrorMessages.AwaitExpressionFormalParameter);
 
-      if (this.eat(49)) {
+      if (this.eat(51)) {
         this.raise(node.start, ErrorMessages.ObsoleteAwaitStar);
       }
 
@@ -16224,7 +16315,11 @@
     }
 
     isAmbiguousAwait() {
-      return this.hasPrecedingLineBreak() || this.match(47) || this.match(10) || this.match(0) || this.match(22) || this.match(127) || this.match(50) || this.hasPlugin("v8intrinsic") && this.match(48);
+      if (this.hasPrecedingLineBreak()) return true;
+      var {
+        type
+      } = this.state;
+      return type === 49 || type === 10 || type === 0 || tokenIsTemplate(type) || type === 129 || type === 52 || this.hasPlugin("v8intrinsic") && type === 50;
     }
 
     parseYield() {
@@ -16235,11 +16330,11 @@
       var argument = null;
 
       if (!this.hasPrecedingLineBreak()) {
-        delegating = this.eat(49);
+        delegating = this.eat(51);
 
         switch (this.state.type) {
           case 13:
-          case 129:
+          case 131:
           case 8:
           case 11:
           case 3:
@@ -16259,7 +16354,9 @@
     }
 
     checkPipelineAtInfixOperator(left, leftStartPos) {
-      if (this.getPluginOption("pipelineOperator", "proposal") === "smart") {
+      if (this.hasPlugin(["pipelineOperator", {
+        proposal: "smart"
+      }])) {
         if (left.type === "SequenceExpression") {
           this.raise(leftStartPos, ErrorMessages.PipelineHeadSequenceExpression);
         }
@@ -16321,9 +16418,9 @@
     }
 
     withSmartMixTopicForbiddingContext(callback) {
-      var proposal = this.getPluginOption("pipelineOperator", "proposal");
-
-      if (proposal === "smart") {
+      if (this.hasPlugin(["pipelineOperator", {
+        proposal: "smart"
+      }])) {
         var outerContextTopicState = this.state.topicContext;
         this.state.topicContext = {
           maxNumOfResolvableTopics: 0,
@@ -16444,44 +16541,117 @@
   var loneSurrogate = /(?:[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])/;
   var keywordRelationalOperator = /in(?:stanceof)?/y;
 
-  function babel7CompatTokens(tokens) {
+  function babel7CompatTokens(tokens, input) {
     for (var i = 0; i < tokens.length; i++) {
       var token = tokens[i];
       var {
         type
       } = token;
 
-      if (type === 128) {
+      if (typeof type === "number") {
         {
-          var {
-            loc,
-            start,
-            value,
-            end
-          } = token;
-          var hashEndPos = start + 1;
-          var hashEndLoc = new Position(loc.start.line, loc.start.column + 1);
-          tokens.splice(i, 1, new Token({
-            type: getExportedToken(25),
-            value: "#",
-            start: start,
-            end: hashEndPos,
-            startLoc: loc.start,
-            endLoc: hashEndLoc
-          }), new Token({
-            type: getExportedToken(122),
-            value: value,
-            start: hashEndPos,
-            end: end,
-            startLoc: hashEndLoc,
-            endLoc: loc.end
-          }));
-          i++;
-          continue;
-        }
-      }
+          if (type === 130) {
+            var {
+              loc,
+              start,
+              value,
+              end
+            } = token;
+            var hashEndPos = start + 1;
+            var hashEndLoc = createPositionWithColumnOffset(loc.start, 1);
+            tokens.splice(i, 1, new Token({
+              type: getExportedToken(27),
+              value: "#",
+              start: start,
+              end: hashEndPos,
+              startLoc: loc.start,
+              endLoc: hashEndLoc
+            }), new Token({
+              type: getExportedToken(124),
+              value: value,
+              start: hashEndPos,
+              end: end,
+              startLoc: hashEndLoc,
+              endLoc: loc.end
+            }));
+            i++;
+            continue;
+          }
 
-      if (typeof type === "number") {
+          if (tokenIsTemplate(type)) {
+            var {
+              loc: _loc,
+              start: _start,
+              value: _value,
+              end: _end
+            } = token;
+            var backquoteEnd = _start + 1;
+            var backquoteEndLoc = createPositionWithColumnOffset(_loc.start, 1);
+            var startToken = void 0;
+
+            if (input.charCodeAt(_start) === 96) {
+              startToken = new Token({
+                type: getExportedToken(22),
+                value: "`",
+                start: _start,
+                end: backquoteEnd,
+                startLoc: _loc.start,
+                endLoc: backquoteEndLoc
+              });
+            } else {
+              startToken = new Token({
+                type: getExportedToken(8),
+                value: "}",
+                start: _start,
+                end: backquoteEnd,
+                startLoc: _loc.start,
+                endLoc: backquoteEndLoc
+              });
+            }
+
+            var templateValue = void 0,
+                templateElementEnd = void 0,
+                templateElementEndLoc = void 0,
+                endToken = void 0;
+
+            if (type === 24) {
+              templateElementEnd = _end - 1;
+              templateElementEndLoc = createPositionWithColumnOffset(_loc.end, -1);
+              templateValue = _value === null ? null : _value.slice(1, -1);
+              endToken = new Token({
+                type: getExportedToken(22),
+                value: "`",
+                start: templateElementEnd,
+                end: _end,
+                startLoc: templateElementEndLoc,
+                endLoc: _loc.end
+              });
+            } else {
+              templateElementEnd = _end - 2;
+              templateElementEndLoc = createPositionWithColumnOffset(_loc.end, -2);
+              templateValue = _value === null ? null : _value.slice(1, -2);
+              endToken = new Token({
+                type: getExportedToken(23),
+                value: "${",
+                start: templateElementEnd,
+                end: _end,
+                startLoc: templateElementEndLoc,
+                endLoc: _loc.end
+              });
+            }
+
+            tokens.splice(i, 1, startToken, new Token({
+              type: getExportedToken(20),
+              value: templateValue,
+              start: backquoteEnd,
+              end: templateElementEnd,
+              startLoc: backquoteEndLoc,
+              endLoc: templateElementEndLoc
+            }), endToken);
+            i += 2;
+            continue;
+          }
+        }
         token.type = getExportedToken(type);
       }
     }
@@ -16493,12 +16663,16 @@
     parseTopLevel(file, program) {
       file.program = this.parseProgram(program);
       file.comments = this.state.comments;
-      if (this.options.tokens) file.tokens = babel7CompatTokens(this.tokens);
+
+      if (this.options.tokens) {
+        file.tokens = babel7CompatTokens(this.tokens, this.input);
+      }
+
       return this.finishNode(file, "File");
     }
 
     parseProgram(program) {
-      var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 129;
+      var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 131;
       var sourceType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.options.sourceType;
       program.sourceType = sourceType;
       program.interpreter = this.parseInterpreterDirective();
@@ -16531,7 +16705,7 @@
     }
 
     parseInterpreterDirective() {
-      if (!this.match(26)) {
+      if (!this.match(28)) {
         return null;
       }
 
@@ -16542,7 +16716,7 @@
     }
 
     isLet(context) {
-      if (!this.isContextual(93)) {
+      if (!this.isContextual(95)) {
         return false;
       }
 
@@ -16578,7 +16752,7 @@
     }
 
     parseStatement(context, topLevel) {
-      if (this.match(24)) {
+      if (this.match(26)) {
         this.parseDecorators(true);
       }
 
@@ -16591,27 +16765,27 @@
       var kind;
 
       if (this.isLet(context)) {
-        starttype = 68;
+        starttype = 70;
         kind = "let";
       }
 
       switch (starttype) {
-        case 54:
+        case 56:
           return this.parseBreakContinueStatement(node, true);
 
-        case 57:
+        case 59:
           return this.parseBreakContinueStatement(node, false);
 
-        case 58:
+        case 60:
           return this.parseDebuggerStatement(node);
 
-        case 84:
+        case 86:
           return this.parseDoStatement(node);
 
-        case 85:
+        case 87:
           return this.parseForStatement(node);
 
-        case 62:
+        case 64:
           if (this.lookaheadCharCode() === 46) break;
 
           if (context) {
@@ -16624,27 +16798,27 @@
 
           return this.parseFunctionStatement(node, false, !context);
 
-        case 74:
+        case 76:
           if (context) this.unexpected();
           return this.parseClass(node, true);
 
-        case 63:
+        case 65:
           return this.parseIfStatement(node);
 
-        case 64:
+        case 66:
           return this.parseReturnStatement(node);
 
-        case 65:
+        case 67:
           return this.parseSwitchStatement(node);
 
-        case 66:
+        case 68:
           return this.parseThrowStatement(node);
 
-        case 67:
+        case 69:
           return this.parseTryStatement(node);
 
-        case 69:
-        case 68:
+        case 71:
+        case 70:
           kind = kind || this.state.value;
 
           if (context && kind !== "var") {
@@ -16653,10 +16827,10 @@
 
           return this.parseVarStatement(node, kind);
 
-        case 86:
+        case 88:
           return this.parseWhileStatement(node);
 
-        case 70:
+        case 72:
           return this.parseWithStatement(node);
 
         case 5:
@@ -16665,7 +16839,7 @@
         case 13:
           return this.parseEmptyStatement(node);
 
-        case 77:
+        case 79:
           {
             var nextTokenCharCode = this.lookaheadCharCode();
 
@@ -16674,7 +16848,7 @@
             }
           }
 
-        case 76:
+        case 78:
           {
             if (!this.options.allowImportExportEverywhere && !topLevel) {
               this.raise(this.state.start, ErrorMessages.UnexpectedImportExport);
@@ -16683,7 +16857,7 @@
             this.next();
             var result;
 
-            if (starttype === 77) {
+            if (starttype === 79) {
               result = this.parseImport(node);
 
               if (result.type === "ImportDeclaration" && (!result.importKind || result.importKind === "value")) {
@@ -16741,18 +16915,18 @@
     }
 
     canHaveLeadingDecorator() {
-      return this.match(74);
+      return this.match(76);
     }
 
     parseDecorators(allowExport) {
       var currentContextDecorators = this.state.decoratorStack[this.state.decoratorStack.length - 1];
 
-      while (this.match(24)) {
+      while (this.match(26)) {
         var decorator = this.parseDecorator();
         currentContextDecorators.push(decorator);
       }
 
-      if (this.match(76)) {
+      if (this.match(78)) {
         if (!allowExport) {
           this.unexpected();
         }
@@ -16862,7 +17036,7 @@
       this.state.labels.push(loopLabel);
       node.body = this.withSmartMixTopicForbiddingContext(() => this.parseStatement("do"));
       this.state.labels.pop();
-      this.expect(86);
+      this.expect(88);
       node.test = this.parseHeaderExpression();
       this.eat(13);
       return this.finishNode(node, "DoWhileStatement");
@@ -16873,7 +17047,7 @@
       this.state.labels.push(loopLabel);
       var awaitAt = -1;
 
-      if (this.isAwaitAllowed() && this.eatContextual(90)) {
+      if (this.isAwaitAllowed() && this.eatContextual(92)) {
         awaitAt = this.state.lastTokStart;
       }
 
@@ -16888,10 +17062,10 @@
         return this.parseFor(node, null);
       }
 
-      var startsWithLet = this.isContextual(93);
+      var startsWithLet = this.isContextual(95);
       var isLet = startsWithLet && this.isLetKeyword();
 
-      if (this.match(68) || this.match(69) || isLet) {
+      if (this.match(70) || this.match(71) || isLet) {
         var _init = this.startNode();
 
         var kind = isLet ? "let" : this.state.value;
@@ -16899,7 +17073,7 @@
         this.parseVar(_init, true, kind);
         this.finishNode(_init, "VariableDeclaration");
 
-        if ((this.match(52) || this.isContextual(95)) && _init.declarations.length === 1) {
+        if ((this.match(54) || this.isContextual(97)) && _init.declarations.length === 1) {
           return this.parseForIn(node, _init, awaitAt);
         }
 
@@ -16910,10 +17084,10 @@
         return this.parseFor(node, _init);
       }
 
-      var startsWithAsync = this.isContextual(89);
+      var startsWithAsync = this.isContextual(91);
       var refExpressionErrors = new ExpressionErrors();
       var init = this.parseExpression(true, refExpressionErrors);
-      var isForOf = this.isContextual(95);
+      var isForOf = this.isContextual(97);
 
       if (isForOf) {
         if (startsWithLet) {
@@ -16923,7 +17097,7 @@
         }
       }
 
-      if (isForOf || this.match(52)) {
+      if (isForOf || this.match(54)) {
         this.toAssignable(init, true);
         var description = isForOf ? "for-of statement" : "for-in statement";
         this.checkLVal(init, description);
@@ -16948,7 +17122,7 @@
       this.next();
       node.test = this.parseHeaderExpression();
       node.consequent = this.parseStatement("if");
-      node.alternate = this.eat(60) ? this.parseStatement("if") : null;
+      node.alternate = this.eat(62) ? this.parseStatement("if") : null;
       return this.finishNode(node, "IfStatement");
     }
 
@@ -16979,8 +17153,8 @@
       var cur;
 
       for (var sawDefault; !this.match(8);) {
-        if (this.match(55) || this.match(59)) {
-          var isCase = this.match(55);
+        if (this.match(57) || this.match(61)) {
+          var isCase = this.match(57);
           if (cur) this.finishNode(cur, "SwitchCase");
           cases.push(cur = this.startNode());
           cur.consequent = [];
@@ -17039,7 +17213,7 @@
       node.block = this.parseBlock();
       node.handler = null;
 
-      if (this.match(56)) {
+      if (this.match(58)) {
         var clause = this.startNode();
         this.next();
 
@@ -17057,7 +17231,7 @@
         node.handler = this.finishNode(clause, "CatchClause");
       }
 
-      node.finalizer = this.eat(61) ? this.parseBlock() : null;
+      node.finalizer = this.eat(63) ? this.parseBlock() : null;
 
       if (!node.handler && !node.finalizer) {
         this.raise(node.start, ErrorMessages.NoCatchOrFinally);
@@ -17105,7 +17279,7 @@
         }
       }
 
-      var kind = tokenIsLoop(this.state.type) ? "loop" : this.match(65) ? "switch" : null;
+      var kind = tokenIsLoop(this.state.type) ? "loop" : this.match(67) ? "switch" : null;
 
       for (var i = this.state.labels.length - 1; i >= 0; i--) {
         var _label = this.state.labels[i];
@@ -17223,7 +17397,7 @@
     }
 
     parseForIn(node, init, awaitAt) {
-      var isForIn = this.match(52);
+      var isForIn = this.match(54);
       this.next();
 
       if (isForIn) {
@@ -17256,14 +17430,14 @@
         var decl = this.startNode();
         this.parseVarId(decl, kind);
 
-        if (this.eat(27)) {
+        if (this.eat(29)) {
           decl.init = isFor ? this.parseMaybeAssignDisallowIn() : this.parseMaybeAssignAllowIn();
         } else {
-          if (kind === "const" && !(this.match(52) || this.isContextual(95))) {
+          if (kind === "const" && !(this.match(54) || this.isContextual(97))) {
             if (!isTypescript) {
               this.raise(this.state.lastTokEnd, ErrorMessages.DeclarationMissingInitializer, "Const declarations");
             }
-          } else if (decl.id.type !== "Identifier" && !(isFor && (this.match(52) || this.isContextual(95)))) {
+          } else if (decl.id.type !== "Identifier" && !(isFor && (this.match(54) || this.isContextual(97)))) {
             this.raise(this.state.lastTokEnd, ErrorMessages.DeclarationMissingInitializer, "Complex binding patterns");
           }
 
@@ -17290,11 +17464,11 @@
       var requireId = !!isStatement && !(statement & FUNC_NULLABLE_ID);
       this.initFunction(node, isAsync);
 
-      if (this.match(49) && isHangingStatement) {
+      if (this.match(51) && isHangingStatement) {
         this.raise(this.state.start, ErrorMessages.GeneratorInSingleStatementContext);
       }
 
-      node.generator = this.eat(49);
+      node.generator = this.eat(51);
 
       if (isStatement) {
         node.id = this.parseFunctionId(requireId);
@@ -17352,7 +17526,7 @@
     }
 
     isClassProperty() {
-      return this.match(27) || this.match(13) || this.match(8);
+      return this.match(29) || this.match(13) || this.match(8);
     }
 
     isClassMethod() {
@@ -17383,7 +17557,7 @@
             continue;
           }
 
-          if (this.match(24)) {
+          if (this.match(26)) {
             decorators.push(this.parseDecorator());
             continue;
           }
@@ -17439,7 +17613,7 @@
     }
 
     parseClassMember(classBody, member, state) {
-      var isStatic = this.isContextual(98);
+      var isStatic = this.isContextual(100);
 
       if (isStatic) {
         if (this.parseClassMemberFromModifier(classBody, member)) {
@@ -17465,9 +17639,9 @@
       member.static = isStatic;
       this.parsePropertyNamePrefixOperator(member);
 
-      if (this.eat(49)) {
+      if (this.eat(51)) {
         method.kind = "method";
-        var isPrivateName = this.match(128);
+        var isPrivateName = this.match(130);
         this.parseClassElementName(method);
 
         if (isPrivateName) {
@@ -17484,7 +17658,7 @@
       }
 
       var isContextual = tokenIsIdentifier(this.state.type) && !this.state.containsEsc;
-      var isPrivate = this.match(128);
+      var isPrivate = this.match(130);
       var key = this.parseClassElementName(member);
       var maybeQuestionTokenStart = this.state.start;
       this.parsePostMemberNameModifiers(publicMember);
@@ -17524,7 +17698,7 @@
         }
       } else if (isContextual && key.name === "async" && !this.isLineTerminator()) {
         this.resetPreviousNodeTrailingComments(key);
-        var isGenerator = this.eat(49);
+        var isGenerator = this.eat(51);
 
         if (publicMember.optional) {
           this.unexpected(maybeQuestionTokenStart);
@@ -17532,7 +17706,7 @@
 
         method.kind = "method";
 
-        var _isPrivate = this.match(128);
+        var _isPrivate = this.match(130);
 
         this.parseClassElementName(method);
         this.parsePostMemberNameModifiers(publicMember);
@@ -17546,11 +17720,11 @@
 
           this.pushClassMethod(classBody, publicMethod, isGenerator, true, false, false);
         }
-      } else if (isContextual && (key.name === "get" || key.name === "set") && !(this.match(49) && this.isLineTerminator())) {
+      } else if (isContextual && (key.name === "get" || key.name === "set") && !(this.match(51) && this.isLineTerminator())) {
         this.resetPreviousNodeTrailingComments(key);
         method.kind = key.name;
 
-        var _isPrivate2 = this.match(128);
+        var _isPrivate2 = this.match(130);
 
         this.parseClassElementName(publicMethod);
 
@@ -17583,11 +17757,11 @@
         start
       } = this.state;
 
-      if ((type === 122 || type === 123) && member.static && value === "prototype") {
+      if ((type === 124 || type === 125) && member.static && value === "prototype") {
         this.raise(start, ErrorMessages.StaticPrototype);
       }
 
-      if (type === 128) {
+      if (type === 130) {
         if (value === "constructor") {
           this.raise(start, ErrorMessages.ConstructorClassPrivateField);
         }
@@ -17666,7 +17840,7 @@
       this.scope.enter(SCOPE_CLASS | SCOPE_SUPER);
       this.expressionScope.enter(newExpressionScope());
       this.prodParam.enter(PARAM);
-      node.value = this.eat(27) ? this.parseMaybeAssignAllowIn() : null;
+      node.value = this.eat(29) ? this.parseMaybeAssignAllowIn() : null;
       this.expressionScope.exit();
       this.prodParam.exit();
       this.scope.exit();
@@ -17691,7 +17865,7 @@
     }
 
     parseClassSuper(node) {
-      node.superClass = this.eat(75) ? this.parseExprSubscripts() : null;
+      node.superClass = this.eat(77) ? this.parseExprSubscripts() : null;
     }
 
     parseExport(node) {
@@ -17728,7 +17902,7 @@
         return this.finishNode(node, "ExportNamedDeclaration");
       }
 
-      if (this.eat(59)) {
+      if (this.eat(61)) {
         node.declaration = this.parseExportDefaultExpression();
         this.checkExport(node, true, true);
         return this.finishNode(node, "ExportDefaultDeclaration");
@@ -17738,7 +17912,7 @@
     }
 
     eatExportStar(node) {
-      return this.eat(49);
+      return this.eat(51);
     }
 
     maybeParseExportDefaultSpecifier(node) {
@@ -17754,7 +17928,7 @@
     }
 
     maybeParseExportNamespaceSpecifier(node) {
-      if (this.isContextual(87)) {
+      if (this.isContextual(89)) {
         if (!node.specifiers) node.specifiers = [];
         var specifier = this.startNodeAt(this.state.lastTokStart, this.state.lastTokStartLoc);
         this.next();
@@ -17801,7 +17975,7 @@
     }
 
     isAsyncFunction() {
-      if (!this.isContextual(89)) return false;
+      if (!this.isContextual(91)) return false;
       var next = this.nextTokenStart();
       return !lineBreak.test(this.input.slice(this.state.pos, next)) && this.isUnparsedContextual(next, "function");
     }
@@ -17810,7 +17984,7 @@
       var expr = this.startNode();
       var isAsync = this.isAsyncFunction();
 
-      if (this.match(62) || isAsync) {
+      if (this.match(64) || isAsync) {
         this.next();
 
         if (isAsync) {
@@ -17818,16 +17992,16 @@
         }
 
         return this.parseFunction(expr, FUNC_STATEMENT | FUNC_NULLABLE_ID, isAsync);
-      } else if (this.match(74)) {
+      } else if (this.match(76)) {
         return this.parseClass(expr, true, true);
-      } else if (this.match(24)) {
+      } else if (this.match(26)) {
         if (this.hasPlugin("decorators") && this.getPluginOption("decorators", "decoratorsBeforeExport")) {
           this.raise(this.state.start, ErrorMessages.DecoratorBeforeExport);
         }
 
         this.parseDecorators(false);
         return this.parseClass(expr, true, true);
-      } else if (this.match(69) || this.match(68) || this.isLet()) {
+      } else if (this.match(71) || this.match(70) || this.isLet()) {
         throw this.raise(this.state.start, ErrorMessages.UnsupportedDefaultExport);
       } else {
         var res = this.parseMaybeAssignAllowIn();
@@ -17846,21 +18020,21 @@
       } = this.state;
 
       if (tokenIsIdentifier(type)) {
-        if (type === 89 && !this.state.containsEsc || type === 93) {
+        if (type === 91 && !this.state.containsEsc || type === 95) {
           return false;
         }
 
-        if ((type === 120 || type === 119) && !this.state.containsEsc) {
+        if ((type === 122 || type === 121) && !this.state.containsEsc) {
           var {
             type: nextType
           } = this.lookahead();
 
-          if (tokenIsIdentifier(nextType) && nextType !== 91 || nextType === 5) {
+          if (tokenIsIdentifier(nextType) && nextType !== 93 || nextType === 5) {
             this.expectOnePlugin(["flow", "typescript"]);
             return false;
           }
         }
-      } else if (!this.match(59)) {
+      } else if (!this.match(61)) {
         return false;
       }
 
@@ -17871,7 +18045,7 @@
         return true;
       }
 
-      if (this.match(59) && hasFrom) {
+      if (this.match(61) && hasFrom) {
         var nextAfterFrom = this.input.charCodeAt(this.nextTokenStartSince(next + 4));
         return nextAfterFrom === 34 || nextAfterFrom === 39;
       }
@@ -17880,7 +18054,7 @@
     }
 
     parseExportFrom(node, expect) {
-      if (this.eatContextual(91)) {
+      if (this.eatContextual(93)) {
         node.source = this.parseImportSource();
         this.checkExport(node);
         var assertions = this.maybeParseImportAssertions();
@@ -17900,7 +18074,7 @@
         type
       } = this.state;
 
-      if (type === 24) {
+      if (type === 26) {
         this.expectOnePlugin(["decorators", "decorators-legacy"]);
 
         if (this.hasPlugin("decorators")) {
@@ -17912,7 +18086,7 @@
         }
       }
 
-      return type === 68 || type === 69 || type === 62 || type === 74 || this.isLet() || this.isAsyncFunction();
+      return type === 70 || type === 71 || type === 64 || type === 76 || this.isLet() || this.isAsyncFunction();
     }
 
     checkExport(node, checkNames, isDefault, isFrom) {
@@ -18013,8 +18187,8 @@
           if (this.eat(8)) break;
         }
 
-        var isMaybeTypeOnly = this.isContextual(120);
-        var isString = this.match(123);
+        var isMaybeTypeOnly = this.isContextual(122);
+        var isString = this.match(125);
         var node = this.startNode();
         node.local = this.parseModuleExportName();
         nodes.push(this.parseExportSpecifier(node, isString, isInTypeExport, isMaybeTypeOnly));
@@ -18024,7 +18198,7 @@
     }
 
     parseExportSpecifier(node, isString, isInTypeExport, isMaybeTypeOnly) {
-      if (this.eatContextual(87)) {
+      if (this.eatContextual(89)) {
         node.exported = this.parseModuleExportName();
       } else if (isString) {
         node.exported = cloneStringLiteral(node.local);
@@ -18036,7 +18210,7 @@
     }
 
     parseModuleExportName() {
-      if (this.match(123)) {
+      if (this.match(125)) {
         var result = this.parseStringLiteral(this.state.value);
         var surrogate = result.value.match(loneSurrogate);
 
@@ -18053,12 +18227,12 @@
     parseImport(node) {
       node.specifiers = [];
 
-      if (!this.match(123)) {
+      if (!this.match(125)) {
         var hasDefault = this.maybeParseDefaultImportSpecifier(node);
         var parseNext = !hasDefault || this.eat(12);
         var hasStar = parseNext && this.maybeParseStarImportSpecifier(node);
         if (parseNext && !hasStar) this.parseNamedImportSpecifiers(node);
-        this.expectContextual(91);
+        this.expectContextual(93);
       }
 
       node.source = this.parseImportSource();
@@ -18079,7 +18253,7 @@
     }
 
     parseImportSource() {
-      if (!this.match(123)) this.unexpected();
+      if (!this.match(125)) this.unexpected();
       return this.parseExprAtom();
     }
 
@@ -18111,7 +18285,7 @@
 
         attrNames.add(keyName);
 
-        if (this.match(123)) {
+        if (this.match(125)) {
           node.key = this.parseStringLiteral(keyName);
         } else {
           node.key = this.parseIdentifier(true);
@@ -18119,7 +18293,7 @@
 
         this.expect(14);
 
-        if (!this.match(123)) {
+        if (!this.match(125)) {
           throw this.unexpected(this.state.start, ErrorMessages.ModuleAttributeInvalidValue);
         }
 
@@ -18132,7 +18306,7 @@
     }
 
     maybeParseModuleAttributes() {
-      if (this.match(70) && !this.hasPrecedingLineBreak()) {
+      if (this.match(72) && !this.hasPrecedingLineBreak()) {
         this.expectPlugin("moduleAttributes");
         this.next();
       } else {
@@ -18158,7 +18332,7 @@
         attributes.add(node.key.name);
         this.expect(14);
 
-        if (!this.match(123)) {
+        if (!this.match(125)) {
           throw this.unexpected(this.state.start, ErrorMessages.ModuleAttributeInvalidValue);
         }
 
@@ -18171,7 +18345,7 @@
     }
 
     maybeParseImportAssertions() {
-      if (this.isContextual(88) && !this.hasPrecedingLineBreak()) {
+      if (this.isContextual(90) && !this.hasPrecedingLineBreak()) {
         this.expectPlugin("importAssertions");
         this.next();
       } else {
@@ -18195,10 +18369,10 @@
     }
 
     maybeParseStarImportSpecifier(node) {
-      if (this.match(49)) {
+      if (this.match(51)) {
         var specifier = this.startNode();
         this.next();
-        this.expectContextual(87);
+        this.expectContextual(89);
         this.parseImportSpecifierLocal(node, specifier, "ImportNamespaceSpecifier", "import namespace specifier");
         return true;
       }
@@ -18223,8 +18397,8 @@
         }
 
         var specifier = this.startNode();
-        var importedIsString = this.match(123);
-        var isMaybeTypeOnly = this.isContextual(120);
+        var importedIsString = this.match(125);
+        var isMaybeTypeOnly = this.isContextual(122);
         specifier.imported = this.parseModuleExportName();
         var importSpecifier = this.parseImportSpecifier(specifier, importedIsString, node.importKind === "type" || node.importKind === "typeof", isMaybeTypeOnly);
         node.specifiers.push(importSpecifier);
@@ -18232,7 +18406,7 @@
     }
 
     parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly) {
-      if (this.eatContextual(87)) {
+      if (this.eatContextual(89)) {
         specifier.local = this.parseIdentifier();
       } else {
         var {
@@ -18502,6 +18676,7 @@
     var {
       expressionOnly,
       visitors,
+      withParent,
       hooks = {}
     } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var attemptToVisitGlobals = new Set();
@@ -18522,16 +18697,27 @@
       }
     }
 
-    function Evaluate(node) {
+    function EvaluateChildren(node, keys, parent) {
+      for (var key of keys) {
+        Evaluate(node[key], parent === null || parent === void 0 ? void 0 : parent.concat({
+          node,
+          key
+        }));
+      }
+    }
+
+    function Evaluate(node, parent) {
       if (Array.isArray(node)) {
-        for (var n of node) {
-          Evaluate(n);
-        }
+        node.forEach((n, index) => {
+          Evaluate(n, parent ? parent.slice(0, -1).concat(_objectSpread__default["default"](_objectSpread__default["default"]({}, parent[parent.length - 1]), {}, {
+            index
+          })) : parent);
+        });
       } else if (node) {
         var _hooks$beforeVisit, _hooks$beforeVisitUnk; // `node` maybe `null` in some cases.
 
 
-        (_hooks$beforeVisit = hooks.beforeVisit) === null || _hooks$beforeVisit === void 0 ? void 0 : _hooks$beforeVisit.call(hooks, node);
+        (_hooks$beforeVisit = hooks.beforeVisit) === null || _hooks$beforeVisit === void 0 ? void 0 : _hooks$beforeVisit.call(hooks, node, parent);
         visitors && visit(node); // Expressions:
 
         switch (node.type) {
@@ -18539,7 +18725,7 @@
             if (!ResolveBinding(node.name)) {
               var _hooks$beforeVisitGlo;
 
-              (_hooks$beforeVisitGlo = hooks.beforeVisitGlobal) === null || _hooks$beforeVisitGlo === void 0 ? void 0 : _hooks$beforeVisitGlo.call(hooks, node);
+              (_hooks$beforeVisitGlo = hooks.beforeVisitGlobal) === null || _hooks$beforeVisitGlo === void 0 ? void 0 : _hooks$beforeVisitGlo.call(hooks, node, parent);
               attemptToVisitGlobals.add(node.name);
             }
 
@@ -18547,76 +18733,71 @@
 
           case "ArrayExpression":
           case "ArrayPattern":
-            Evaluate(node.elements);
+            EvaluateChildren(node, ["elements"], parent);
             return;
 
           case "ArrowFunctionExpression":
             {
               var env = getRunningContext().LexicalEnvironment;
               var closure = OrdinaryFunctionCreate(node, env);
-              CallFunction(closure);
+              CallFunction(closure, parent);
               return;
             }
 
           case "AssignmentPattern":
           case "BinaryExpression":
           case "LogicalExpression":
-            Evaluate(node.left);
-            Evaluate(node.right);
+            EvaluateChildren(node, ["left", "right"], parent);
             return;
 
           case "CallExpression":
           case "NewExpression":
-            Evaluate(node.callee);
-            Evaluate(node.arguments);
+            EvaluateChildren(node, ["callee", "arguments"], parent);
             return;
 
           case "ChainExpression":
-            Evaluate(node.expression);
+            EvaluateChildren(node, ["expression"], parent);
             return;
 
           case "ConditionalExpression":
-            Evaluate(node.test);
-            Evaluate(node.consequent);
-            Evaluate(node.alternate);
+            EvaluateChildren(node, ["test", "consequent", "alternate"], parent);
             return;
 
           case "MemberExpression":
-            Evaluate(node.object);
+            EvaluateChildren(node, ["object"], parent);
 
             if (node.computed) {
-              Evaluate(node.property);
+              EvaluateChildren(node, ["property"], parent);
             }
 
             return;
 
           case "ObjectExpression":
           case "ObjectPattern":
-            Evaluate(node.properties);
+            EvaluateChildren(node, ["properties"], parent);
             return;
 
           case "Property":
             if (node.computed) {
-              Evaluate(node.key);
+              EvaluateChildren(node, ["key"], parent);
             }
 
-            Evaluate(node.value);
+            EvaluateChildren(node, ["value"], parent);
             return;
 
           case "RestElement":
           case "SpreadElement":
           case "UnaryExpression":
-            Evaluate(node.argument);
+            EvaluateChildren(node, ["argument"], parent);
             return;
 
           case "SequenceExpression":
           case "TemplateLiteral":
-            Evaluate(node.expressions);
+            EvaluateChildren(node, ["expressions"], parent);
             return;
 
           case "TaggedTemplateExpression":
-            Evaluate(node.tag);
-            Evaluate(node.quasi);
+            EvaluateChildren(node, ["tag", "quasi"], parent);
             return;
 
           case "Literal":
@@ -18627,8 +18808,7 @@
           // Statements and assignments:
           switch (node.type) {
             case "AssignmentExpression":
-              Evaluate(node.right);
-              Evaluate(node.left);
+              EvaluateChildren(node, ["right", "left"], parent);
               return;
 
             case "BlockStatement":
@@ -18642,7 +18822,7 @@
                 var blockEnv = new AnalysisEnvironment(oldEnv);
                 BlockDeclarationInstantiation(node.body, blockEnv);
                 runningContext.LexicalEnvironment = blockEnv;
-                Evaluate(node.body);
+                EvaluateChildren(node, ["body"], parent);
                 runningContext.LexicalEnvironment = oldEnv;
                 return;
               }
@@ -18660,20 +18840,18 @@
                 var catchEnv = new AnalysisEnvironment(_oldEnv);
                 BoundNamesInstantiation(node.param, catchEnv);
                 _runningContext.LexicalEnvironment = catchEnv;
-                Evaluate(node.param);
-                Evaluate(node.body);
+                EvaluateChildren(node, ["param", "body"], parent);
                 _runningContext.LexicalEnvironment = _oldEnv;
                 return;
               }
 
             case "DoWhileStatement":
-              Evaluate(node.body);
-              Evaluate(node.test);
+              EvaluateChildren(node, ["body", "test"], parent);
               return;
 
             case "ExpressionStatement":
             case "TSAsExpression":
-              Evaluate(node.expression);
+              EvaluateChildren(node, ["expression"], parent);
               return;
 
             case "ForInStatement":
@@ -18692,7 +18870,7 @@
                   _runningContext2.LexicalEnvironment = newEnv;
                 }
 
-                Evaluate(node.right);
+                EvaluateChildren(node, ["right"], parent);
                 _runningContext2.LexicalEnvironment = _oldEnv2; // ForIn/OfBodyEvaluation
 
                 if (lexicalBinding) {
@@ -18701,8 +18879,7 @@
                   _runningContext2.LexicalEnvironment = iterationEnv;
                 }
 
-                Evaluate(node.left);
-                Evaluate(node.body);
+                EvaluateChildren(node, ["left", "body"], parent);
                 _runningContext2.LexicalEnvironment = _oldEnv2;
                 return;
               }
@@ -18723,10 +18900,7 @@
                   _runningContext3.LexicalEnvironment = loopEnv;
                 }
 
-                Evaluate(node.init);
-                Evaluate(node.test);
-                Evaluate(node.body);
-                Evaluate(node.update);
+                EvaluateChildren(node, ["init", "test", "body", "update"], parent);
                 _runningContext3.LexicalEnvironment = _oldEnv3;
                 return;
               }
@@ -18739,7 +18913,7 @@
 
                 _env.CreateBinding(fn);
 
-                CallFunction(fo);
+                CallFunction(fo, parent);
                 return;
               }
 
@@ -18747,30 +18921,27 @@
               {
                 var _closure = InstantiateOrdinaryFunctionExpression(node);
 
-                CallFunction(_closure);
+                CallFunction(_closure, parent);
                 return;
               }
 
             case "IfStatement":
-              Evaluate(node.test);
-              Evaluate(node.consequent);
-              Evaluate(node.alternate);
+              EvaluateChildren(node, ["test", "consequent", "alternate"], parent);
               return;
 
             case "ReturnStatement":
             case "ThrowStatement":
             case "UpdateExpression":
-              Evaluate(node.argument);
+              EvaluateChildren(node, ["argument"], parent);
               return;
 
             case "SwitchCase":
-              Evaluate(node.test);
-              Evaluate(node.consequent);
+              EvaluateChildren(node, ["test", "consequent"], parent);
               return;
 
             case "SwitchStatement":
               {
-                Evaluate(node.discriminant);
+                EvaluateChildren(node, ["discriminant"], parent);
 
                 var _runningContext4 = getRunningContext();
 
@@ -18780,34 +18951,30 @@
 
                 BlockDeclarationInstantiation(node.cases, _blockEnv);
                 _runningContext4.LexicalEnvironment = _blockEnv;
-                Evaluate(node.cases);
+                EvaluateChildren(node, ["cases"], parent);
                 _runningContext4.LexicalEnvironment = _oldEnv4;
                 return;
               }
 
             case "TryStatement":
-              Evaluate(node.block);
-              Evaluate(node.handler);
-              Evaluate(node.finalizer);
+              EvaluateChildren(node, ["block", "handler", "finalizer"], parent);
               return;
 
             case "VariableDeclaration":
-              Evaluate(node.declarations);
+              EvaluateChildren(node, ["declarations"], parent);
               return;
 
             case "VariableDeclarator":
-              Evaluate(node.id);
-              Evaluate(node.init);
+              EvaluateChildren(node, ["id", "init"], parent);
               return;
 
             case "WhileStatement":
-              Evaluate(node.test);
-              Evaluate(node.body);
+              EvaluateChildren(node, ["test", "body"], parent);
               return;
           }
         }
 
-        var silent = (_hooks$beforeVisitUnk = hooks.beforeVisitUnknown) === null || _hooks$beforeVisitUnk === void 0 ? void 0 : _hooks$beforeVisitUnk.call(hooks, node);
+        var silent = (_hooks$beforeVisitUnk = hooks.beforeVisitUnknown) === null || _hooks$beforeVisitUnk === void 0 ? void 0 : _hooks$beforeVisitUnk.call(hooks, node, parent);
 
         if (!silent) {
           // eslint-disable-next-line no-console
@@ -18839,10 +19006,16 @@
       BoundNamesInstantiation(declarations, env);
     }
 
-    function CallFunction(closure) {
+    function CallFunction(closure, parent) {
       PrepareOrdinaryCall(closure);
-      FunctionDeclarationInstantiation(closure);
-      Evaluate(closure.ECMAScriptCode);
+      FunctionDeclarationInstantiation(closure, parent);
+      Evaluate(closure.ECMAScriptCode, parent === null || parent === void 0 ? void 0 : parent.concat({
+        node: closure.Function,
+        key: "body"
+      }).concat(closure.Function.body.type === "BlockStatement" ? {
+        node: closure.Function.body,
+        key: "body"
+      } : []));
       analysisContextStack.pop();
     }
 
@@ -18854,7 +19027,7 @@
       analysisContextStack.push(calleeContext);
     }
 
-    function FunctionDeclarationInstantiation(func) {
+    function FunctionDeclarationInstantiation(func, parent) {
       var calleeContext = getRunningContext();
       var code = func.ECMAScriptCode;
       var formals = func.FormalParameters;
@@ -18866,7 +19039,10 @@
       var varNames = collectBoundNames(varDeclarations);
       var env = calleeContext.LexicalEnvironment;
       BoundNamesInstantiation(formals, env);
-      Evaluate(formals);
+      Evaluate(formals, parent === null || parent === void 0 ? void 0 : parent.concat({
+        node: func.Function,
+        key: "params"
+      }));
       var varEnv;
 
       if (!hasParameterExpressions) {
@@ -18911,19 +19087,16 @@
       return OrdinaryFunctionCreate(functionExpression, funcEnv);
     }
 
-    function OrdinaryFunctionCreate(_ref, scope) {
-      var {
-        params,
-        body
-      } = _ref;
+    function OrdinaryFunctionCreate(func, scope) {
       return {
-        FormalParameters: params,
-        ECMAScriptCode: body.type === "BlockStatement" ? body.body : body,
+        Function: func,
+        FormalParameters: func.params,
+        ECMAScriptCode: func.body.type === "BlockStatement" ? func.body.body : func.body,
         Environment: scope
       };
     }
 
-    Evaluate(rootAst);
+    Evaluate(rootAst, withParent ? [] : undefined);
     return attemptToVisitGlobals;
   }
 
@@ -19183,12 +19356,16 @@
     if (typeof data === "string") {
       if (data.includes(PROCESSORS) && isEvaluable(data)) {
         preevaluate(data, {
-          visitors: {
-            MemberExpression(node) {
-              var accessNamespace = node.object;
+          withParent: true,
+          hooks: {
+            beforeVisitGlobal(node, parent) {
+              if (node.name === PROCESSORS) {
+                var memberParent = parent[parent.length - 1];
+                var outerMemberParent = parent[parent.length - 2];
 
-              if (!node.computed && node.property.type === "Identifier" && accessNamespace.type === "MemberExpression" && !accessNamespace.computed && accessNamespace.object.type === "Identifier" && accessNamespace.object.name === PROCESSORS && accessNamespace.property.type === "Identifier") {
-                collection.push("".concat(accessNamespace.property.name, ".").concat(node.property.name));
+                if ((memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object" && !memberParent.node.computed && memberParent.node.property.type === "Identifier" && (outerMemberParent === null || outerMemberParent === void 0 ? void 0 : outerMemberParent.node.type) === "MemberExpression" && outerMemberParent.key === "object" && !outerMemberParent.node.computed && outerMemberParent.node.property.type === "Identifier") {
+                  collection.push("".concat(memberParent.node.property.name, ".").concat(outerMemberParent.node.property.name));
+                }
               }
             }
 
@@ -19979,12 +20156,18 @@
     if (typeof data === "string") {
       if (data.includes(PERMISSIONS) && isEvaluable(data)) {
         preevaluate(data, {
-          visitors: {
-            CallExpression(node) {
-              if (node.callee.type === "MemberExpression" && node.callee.object.type === "Identifier" && node.callee.object.name === PERMISSIONS && !node.callee.computed && node.callee.property.type === "Identifier" && node.callee.property.name === check) {
-                for (var arg of node.arguments) {
-                  if (arg.type === "Literal" && typeof arg.value === "string") {
-                    collection.add(arg.value);
+          withParent: true,
+          hooks: {
+            beforeVisitGlobal(node, parent) {
+              if (node.name === PERMISSIONS) {
+                var memberParent = parent[parent.length - 1];
+                var callParent = parent[parent.length - 2];
+
+                if ((callParent === null || callParent === void 0 ? void 0 : callParent.node.type) === "CallExpression" && (callParent === null || callParent === void 0 ? void 0 : callParent.key) === "callee" && (memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object" && !memberParent.node.computed && memberParent.node.property.type === "Identifier" && memberParent.node.property.name === check) {
+                  for (var arg of callParent.node.arguments) {
+                    if (arg.type === "Literal" && typeof arg.value === "string") {
+                      collection.add(arg.value);
+                    }
                   }
                 }
               }
@@ -20070,21 +20253,22 @@
     var _storyboard$meta;
 
     var collection = new Map();
-    var beforeVisit = beforeVisitFactory(collection); // Notice: `menus` may contain evaluations of I18N too.
+    var beforeVisitGlobal = beforeVisitGlobalFactory(collection); // Notice: `menus` may contain evaluations of I18N too.
 
     var {
       customTemplates,
       menus,
       functions
     } = (_storyboard$meta = storyboard.meta) !== null && _storyboard$meta !== void 0 ? _storyboard$meta : {};
-    collectI18N([storyboard.routes, customTemplates, menus], beforeVisit);
+    collectI18N([storyboard.routes, customTemplates, menus], beforeVisitGlobal);
 
     if (Array.isArray(functions)) {
       for (var fn of functions) {
         precookFunction(fn.source, {
           typescript: fn.typescript,
+          withParent: true,
           hooks: {
-            beforeVisit
+            beforeVisitGlobal
           }
         });
       }
@@ -20094,18 +20278,19 @@
   }
   function scanI18NInAny(data) {
     var collection = new Map();
-    collectI18N(data, beforeVisitFactory(collection));
+    collectI18N(data, beforeVisitGlobalFactory(collection));
     return collection;
   }
 
-  function collectI18N(data, beforeVisit) {
+  function collectI18N(data, beforeVisitGlobal) {
     var memo = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
 
     if (typeof data === "string") {
       if (data.includes(I18N) && isEvaluable(data)) {
         preevaluate(data, {
+          withParent: true,
           hooks: {
-            beforeVisit
+            beforeVisitGlobal
           }
         });
       }
@@ -20119,31 +20304,35 @@
 
       if (Array.isArray(data)) {
         for (var item of data) {
-          collectI18N(item, beforeVisit, memo);
+          collectI18N(item, beforeVisitGlobal, memo);
         }
       } else {
         for (var _item of Object.values(data)) {
-          collectI18N(_item, beforeVisit, memo);
+          collectI18N(_item, beforeVisitGlobal, memo);
         }
       }
     }
   }
 
-  function beforeVisitFactory(collection) {
-    return function beforeVisit(node) {
-      if (node.type === "CallExpression") {
-        var [keyNode, defaultNode] = node.arguments;
+  function beforeVisitGlobalFactory(collection) {
+    return function beforeVisitGlobal(node, parent) {
+      if (node.name === I18N) {
+        var callParent = parent[parent.length - 1];
 
-        if (node.callee.type === "Identifier" && node.callee.name === I18N && keyNode && keyNode.type === "Literal" && typeof keyNode.value === "string") {
-          var valueSet = collection.get(keyNode.value);
+        if ((callParent === null || callParent === void 0 ? void 0 : callParent.node.type) === "CallExpression" && callParent.key === "callee") {
+          var [keyNode, defaultNode] = callParent.node.arguments;
 
-          if (!valueSet) {
-            valueSet = new Set();
-            collection.set(keyNode.value, valueSet);
-          }
+          if (keyNode && keyNode.type === "Literal" && typeof keyNode.value === "string") {
+            var valueSet = collection.get(keyNode.value);
 
-          if (defaultNode && defaultNode.type === "Literal" && typeof defaultNode.value === "string") {
-            valueSet.add(defaultNode.value);
+            if (!valueSet) {
+              valueSet = new Set();
+              collection.set(keyNode.value, valueSet);
+            }
+
+            if (defaultNode && defaultNode.type === "Literal" && typeof defaultNode.value === "string") {
+              valueSet.add(defaultNode.value);
+            }
           }
         }
       }
@@ -20820,23 +21009,35 @@
 
     return depsMap;
   }
-  var CTX = "CTX";
+  var CTX$1 = "CTX";
 
   function collectContexts(data, stats) {
     var memo = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
 
     if (typeof data === "string") {
-      if (data.includes(CTX) && isEvaluable(data)) {
+      if (data.includes(CTX$1) && isEvaluable(data)) {
         preevaluate(data, {
-          visitors: {
-            MemberExpression(node) {
-              if (node.object.type === "Identifier" && node.object.name === CTX) {
-                if (!node.computed && node.property.type === "Identifier") {
-                  if (!stats.dependencies.includes(node.property.name)) {
-                    stats.dependencies.push(node.property.name);
+          withParent: true,
+          hooks: {
+            beforeVisitGlobal(node, parent) {
+              if (node.name === CTX$1) {
+                var memberParent = parent[parent.length - 1];
+
+                if ((memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object") {
+                  var memberNode = memberParent.node;
+                  var dep;
+
+                  if (!memberNode.computed && memberNode.property.type === "Identifier") {
+                    dep = memberNode.property.name;
+                  } else if (memberNode.computed && memberNode.property.type === "Literal" && typeof memberNode.property.value === "string") {
+                    dep = memberNode.property.value;
+                  } else {
+                    stats.includesComputed = true;
+                  }
+
+                  if (dep !== undefined && !stats.dependencies.includes(dep)) {
+                    stats.dependencies.push(dep);
                   }
-                } else {
-                  stats.includesComputed = true;
                 }
               }
             }
@@ -21134,6 +21335,7 @@
   }
 
   var TRACK_CONTEXT = "track context";
+  var CTX = "CTX";
   /**
    * Get tracking CTX for an evaluable expression in `track context` mode.
    *
@@ -21167,13 +21369,20 @@
       var {
         expression
       } = preevaluate(raw, {
-        visitors: {
-          MemberExpression(node) {
-            if (node.object.type === "Identifier" && node.object.name === "CTX") {
-              if (!node.computed && node.property.type === "Identifier") {
-                contexts.add(node.property.name);
-              } else if (node.computed && node.property.type === "Literal" && typeof node.property.value === "string") {
-                contexts.add(node.property.value);
+        withParent: true,
+        hooks: {
+          beforeVisitGlobal(node, parent) {
+            if (node.name === CTX) {
+              var memberParent = parent[parent.length - 1];
+
+              if ((memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object") {
+                var memberNode = memberParent.node;
+
+                if (!memberNode.computed && memberNode.property.type === "Identifier") {
+                  contexts.add(memberNode.property.name);
+                } else if (memberNode.computed && memberNode.property.type === "Literal" && typeof memberNode.property.value === "string") {
+                  contexts.add(memberNode.property.value);
+                }
               }
             }
           }