@next-core/brick-utils 2.31.1 → 2.31.5

package/dist/index.esm.js

@@ -3131,18 +3131,46 @@ function getLineInfo(input, offset) {
   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];
   }
 
 }
@@ -3395,6 +3423,7 @@ var ErrorMessages = makeErrorTemplates({
   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.",
@@ -3480,7 +3509,7 @@ var ErrorMessages = makeErrorTemplates({
   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'.",
@@ -3981,8 +4010,13 @@ class TokContext {
 
 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;
@@ -4143,6 +4177,13 @@ var tt = {
     beforeExpr,
     startsExpr
   }),
+  templateTail: createToken("...`", {
+    startsExpr
+  }),
+  templateNonTail: createToken("...${", {
+    beforeExpr,
+    startsExpr
+  }),
   at: createToken("@"),
   hash: createToken("#", {
     startsExpr
@@ -4448,19 +4489,19 @@ var tt = {
 };
 
 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) {
@@ -4472,27 +4513,27 @@ function tokenCanStartExpression(token) {
 }
 
 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) {
@@ -4500,11 +4541,11 @@ function tokenIsPrefix(token) {
 }
 
 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) {
@@ -4516,7 +4557,11 @@ function tokenOperatorPrecedence(token) {
 }
 
 function tokenIsRightAssociative(token) {
-  return token === 51;
+  return token === 53;
+}
+
+function tokenIsTemplate(token) {
+  return token >= 24 && token <= 25;
 }
 
 function getExportedToken(token) {
@@ -4544,7 +4589,7 @@ function isTokenType(obj) {
     }
   };
 
-  tokenTypes[132].updateContext = context => {
+  tokenTypes[134].updateContext = context => {
     context.push(types.j_expr, types.j_oTag);
   };
 }
@@ -4930,7 +4975,7 @@ class State {
     this.comments = [];
     this.commentStack = [];
     this.pos = 0;
-    this.type = 129;
+    this.type = 131;
     this.value = null;
     this.start = 0;
     this.end = 0;
@@ -5118,21 +5163,16 @@ class Tokenizer extends ParserError {
   }
 
   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() {
@@ -5341,12 +5381,12 @@ class Tokenizer extends ParserError {
       }
     } 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);
     }
   }
 
@@ -5371,9 +5411,9 @@ class Tokenizer extends ParserError {
     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);
     }
   }
 
@@ -5389,24 +5429,24 @@ class Tokenizer extends ParserError {
     }
 
     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);
@@ -5417,9 +5457,9 @@ class Tokenizer extends ParserError {
 
     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;
@@ -5427,7 +5467,7 @@ class Tokenizer extends ParserError {
 
     if (code === 124) {
       if (next === 62) {
-        this.finishOp(35, 2);
+        this.finishOp(37, 2);
         return;
       }
 
@@ -5453,20 +5493,20 @@ class Tokenizer extends ParserError {
     }
 
     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);
     }
   }
 
@@ -5474,14 +5514,14 @@ class Tokenizer extends ParserError {
     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);
     }
   }
 
@@ -5493,20 +5533,20 @@ class Tokenizer extends ParserError {
 
     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() {
@@ -5519,27 +5559,27 @@ class Tokenizer extends ParserError {
       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;
     }
 
@@ -5549,7 +5589,7 @@ class Tokenizer extends ParserError {
       return;
     }
 
-    this.finishOp(code === 61 ? 27 : 33, 1);
+    this.finishOp(code === 61 ? 29 : 35, 1);
   }
 
   readToken_question() {
@@ -5558,9 +5598,9 @@ class Tokenizer extends ParserError {
 
     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;
@@ -5652,8 +5692,7 @@ class Tokenizer extends ParserError {
         return;
 
       case 96:
-        ++this.state.pos;
-        this.finishToken(22);
+        this.readTemplateToken();
         return;
 
       case 48:
@@ -5730,12 +5769,12 @@ class Tokenizer extends ParserError {
         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:
@@ -5819,7 +5858,7 @@ class Tokenizer extends ParserError {
     }
 
     this.state.pos = pos;
-    this.finishToken(127, {
+    this.finishToken(129, {
       pattern: content,
       flags: mods
     });
@@ -5913,11 +5952,11 @@ class Tokenizer extends ParserError {
 
     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) {
@@ -6001,17 +6040,17 @@ class Tokenizer extends ParserError {
     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) {
@@ -6065,36 +6104,42 @@ class Tokenizer extends ParserError {
     }
 
     out += this.input.slice(chunkStart, this.state.pos++);
-    this.finishToken(123, out);
+    this.finishToken(125, out);
+  }
+
+  readTemplateContinuation() {
+    if (!this.match(8)) {
+      this.unexpected(this.state.start, 8);
+    }
+
+    this.state.pos--;
+    this.readTemplateToken();
   }
 
-  readTmplToken() {
+  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;
       }
 
@@ -6302,7 +6347,7 @@ class Tokenizer extends ParserError {
     if (type !== undefined) {
       this.finishToken(type, tokenLabelName(type));
     } else {
-      this.finishToken(122, word);
+      this.finishToken(124, word);
     }
   }
 
@@ -6316,33 +6361,7 @@ class Tokenizer extends ParserError {
     }
   }
 
-  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) {}
 
 }
 
@@ -6386,11 +6405,15 @@ class ClassScopeHandler {
   }
 
   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;
@@ -6398,9 +6421,9 @@ class ClassScopeHandler {
         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);
       }
     }
 
@@ -6408,8 +6431,8 @@ class ClassScopeHandler {
       this.raise(pos, ErrorMessages.PrivateNameRedeclaration, name);
     }
 
-    classScope.privateNames.add(name);
-    classScope.undefinedPrivateNames.delete(name);
+    privateNames.add(name);
+    undefinedPrivateNames.delete(name);
   }
 
   usePrivateName(name, pos) {
@@ -6657,7 +6680,7 @@ class UtilParser extends Tokenizer {
   }
 
   canInsertSemicolon() {
-    return this.match(129) || this.match(8) || this.hasPrecedingLineBreak();
+    return this.match(131) || this.match(8) || this.hasPrecedingLineBreak();
   }
 
   hasPrecedingLineBreak() {
@@ -6713,21 +6736,31 @@ class UtilParser extends Tokenizer {
     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(", "), "."));
     }
   }
 
@@ -6805,7 +6838,7 @@ class UtilParser extends Tokenizer {
       return hasErrors;
     } else if (hasErrors) {
       if (shorthandAssign >= 0) {
-        this.unexpected(shorthandAssign);
+        this.raise(shorthandAssign, ErrorMessages.InvalidCoverInitializedName);
       }
 
       if (doubleProto >= 0) {
@@ -6971,12 +7004,18 @@ function cloneStringLiteral(node) {
   }
 
   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;
 }
@@ -7087,7 +7126,7 @@ function hasTypeImportKind(node) {
 }
 
 function isMaybeDefaultImport(type) {
-  return tokenIsKeywordOrIdentifier(type) && type !== 91;
+  return tokenIsKeywordOrIdentifier(type) && type !== 93;
 }
 
 var exportSuggestions = {
@@ -7129,7 +7168,7 @@ var flow = superClass => class extends superClass {
   }
 
   finishToken(type, val) {
-    if (type !== 123 && type !== 13 && type !== 26) {
+    if (type !== 125 && type !== 13 && type !== 28) {
       if (this.flowPragma === undefined) {
         this.flowPragma = null;
       }
@@ -7166,7 +7205,7 @@ var flow = superClass => class extends superClass {
     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);
@@ -7188,14 +7227,14 @@ var flow = superClass => class extends superClass {
     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();
       }
     }
@@ -7215,7 +7254,7 @@ var flow = superClass => class extends superClass {
     var typeNode = this.startNode();
     var typeContainer = this.startNode();
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       typeNode.typeParameters = this.flowParseTypeParameterDeclaration();
     } else {
       typeNode.typeParameters = null;
@@ -7237,13 +7276,13 @@ var flow = superClass => class extends superClass {
   }
 
   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 {
@@ -7253,13 +7292,13 @@ var flow = superClass => class extends superClass {
 
         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();
@@ -7277,7 +7316,7 @@ var flow = superClass => class extends superClass {
   flowParseDeclareModule(node) {
     this.scope.enter(SCOPE_OTHER);
 
-    if (this.match(123)) {
+    if (this.match(125)) {
       node.id = this.parseExprAtom();
     } else {
       node.id = this.parseIdentifier();
@@ -7290,16 +7329,16 @@ var flow = superClass => class extends superClass {
     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);
       }
 
@@ -7336,10 +7375,10 @@ var flow = superClass => class extends superClass {
   }
 
   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();
@@ -7349,17 +7388,17 @@ var flow = superClass => class extends superClass {
       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") {
@@ -7378,7 +7417,7 @@ var flow = superClass => class extends superClass {
 
   flowParseDeclareModuleExports(node) {
     this.next();
-    this.expectContextual(102);
+    this.expectContextual(104);
     node.typeAnnotation = this.flowParseTypeAnnotation();
     this.semicolon();
     return this.finishNode(node, "DeclareModuleExports");
@@ -7409,7 +7448,7 @@ var flow = superClass => class extends superClass {
     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;
@@ -7419,13 +7458,13 @@ var flow = superClass => class extends superClass {
     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 {
@@ -7433,7 +7472,7 @@ var flow = superClass => class extends superClass {
       } while (this.eat(12));
     }
 
-    if (this.isContextual(104)) {
+    if (this.isContextual(106)) {
       this.next();
 
       do {
@@ -7454,7 +7493,7 @@ var flow = superClass => class extends superClass {
     var node = this.startNode();
     node.id = this.flowParseQualifiedTypeIdentifier();
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       node.typeParameters = this.flowParseTypeParameterInstantiation();
     } else {
       node.typeParameters = null;
@@ -7488,23 +7527,23 @@ var flow = superClass => class extends superClass {
     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;
@@ -7519,7 +7558,7 @@ var flow = superClass => class extends superClass {
     node.impltype = null;
 
     if (!declare) {
-      node.impltype = this.flowParseTypeInitialiser(27);
+      node.impltype = this.flowParseTypeInitialiser(29);
     }
 
     this.semicolon();
@@ -7536,8 +7575,8 @@ var flow = superClass => class extends superClass {
     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) {
@@ -7554,7 +7593,7 @@ var flow = superClass => class extends superClass {
     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();
@@ -7570,12 +7609,12 @@ var flow = superClass => class extends superClass {
         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");
   }
@@ -7585,20 +7624,20 @@ var flow = superClass => class extends superClass {
     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");
   }
@@ -7608,27 +7647,27 @@ var flow = superClass => class extends superClass {
     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));
@@ -7645,7 +7684,7 @@ var flow = superClass => class extends superClass {
   }
 
   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) {
@@ -7671,7 +7710,7 @@ var flow = superClass => class extends superClass {
     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));
@@ -7694,13 +7733,13 @@ var flow = superClass => class extends superClass {
     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;
 
@@ -7770,7 +7809,7 @@ var flow = superClass => class extends superClass {
       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) {
@@ -7780,7 +7819,7 @@ var flow = superClass => class extends superClass {
         }
       }
 
-      if (allowStatic && this.isContextual(98)) {
+      if (allowStatic && this.isContextual(100)) {
         var _lookahead = this.lookahead();
 
         if (_lookahead.type !== 14 && _lookahead.type !== 17) {
@@ -7805,7 +7844,7 @@ var flow = superClass => class extends superClass {
         } 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);
         }
@@ -7818,7 +7857,7 @@ var flow = superClass => class extends superClass {
       } 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)) {
@@ -7894,7 +7933,7 @@ var flow = superClass => class extends superClass {
       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) {
@@ -7979,7 +8018,7 @@ var flow = superClass => class extends superClass {
     node.typeParameters = null;
     node.id = this.flowParseQualifiedTypeIdentifier(startPos, startLoc, id);
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       node.typeParameters = this.flowParseTypeParameterInstantiation();
     }
 
@@ -7988,7 +8027,7 @@ var flow = superClass => class extends superClass {
 
   flowParseTypeofType() {
     var node = this.startNode();
-    this.expect(81);
+    this.expect(83);
     node.argument = this.flowParsePrimaryType();
     return this.finishNode(node, "TypeofTypeAnnotation");
   }
@@ -8014,7 +8053,7 @@ var flow = superClass => class extends superClass {
     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) {
@@ -8055,7 +8094,7 @@ var flow = superClass => class extends superClass {
     var rest = null;
     var _this = null;
 
-    if (this.match(72)) {
+    if (this.match(74)) {
       _this = this.flowParseFunctionTypeParam(true);
       _this.name = null;
 
@@ -8147,7 +8186,7 @@ var flow = superClass => class extends superClass {
         this.state.noAnonFunctionType = oldNoAnonFunctionType;
         return type;
 
-      case 43:
+      case 45:
         node.typeParameters = this.flowParseTypeParameterDeclaration();
         this.expect(10);
         tmp = this.flowParseFunctionTypeParams();
@@ -8163,7 +8202,7 @@ var flow = superClass => class extends superClass {
         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 {
@@ -8199,24 +8238,24 @@ var flow = superClass => class extends superClass {
         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);
           }
 
@@ -8225,29 +8264,29 @@ var flow = superClass => class extends superClass {
 
         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:
@@ -8256,7 +8295,7 @@ var flow = superClass => class extends superClass {
           this.next();
           return super.createIdentifier(node, label);
         } else if (tokenIsIdentifier(this.state.type)) {
-          if (this.isContextual(119)) {
+          if (this.isContextual(121)) {
             return this.flowParseInterfaceType();
           }
 
@@ -8330,11 +8369,11 @@ var flow = superClass => class extends superClass {
 
   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());
     }
 
@@ -8343,11 +8382,11 @@ var flow = superClass => class extends superClass {
 
   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());
     }
 
@@ -8363,7 +8402,7 @@ var flow = superClass => class extends superClass {
   }
 
   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();
@@ -8399,7 +8438,7 @@ var flow = superClass => class extends superClass {
   flowParseVariance() {
     var variance = null;
 
-    if (this.match(47)) {
+    if (this.match(49)) {
       variance = this.startNode();
 
       if (this.state.value === "+") {
@@ -8438,7 +8477,7 @@ var flow = superClass => class extends superClass {
   }
 
   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)) {
@@ -8446,7 +8485,7 @@ var flow = superClass => class extends superClass {
         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();
@@ -8465,7 +8504,7 @@ var flow = superClass => class extends superClass {
   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)) {
@@ -8487,7 +8526,7 @@ var flow = superClass => class extends superClass {
       type
     } = this.state;
 
-    if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 116) {
+    if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 118) {
       return !this.state.containsEsc;
     }
 
@@ -8499,7 +8538,7 @@ var flow = superClass => class extends superClass {
       type
     } = this.state;
 
-    if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 116) {
+    if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 118) {
       return this.state.containsEsc;
     }
 
@@ -8507,7 +8546,7 @@ var flow = superClass => class extends superClass {
   }
 
   parseExportDefaultExpression() {
-    if (this.shouldParseEnums() && this.isContextual(116)) {
+    if (this.shouldParseEnums() && this.isContextual(118)) {
       var node = this.startNode();
       this.next();
       return this.flowParseEnumDeclaration(node);
@@ -8680,7 +8719,7 @@ var flow = superClass => class extends superClass {
   }
 
   parseExportDeclaration(node) {
-    if (this.isContextual(120)) {
+    if (this.isContextual(122)) {
       node.exportKind = "type";
       var declarationNode = this.startNode();
       this.next();
@@ -8692,21 +8731,21 @@ var flow = superClass => class extends superClass {
       } 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();
@@ -8721,7 +8760,7 @@ var flow = superClass => class extends superClass {
   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();
@@ -8745,7 +8784,7 @@ var flow = superClass => class extends superClass {
   parseClassId(node, isStatement, optionalId) {
     super.parseClassId(node, isStatement, optionalId);
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       node.typeParameters = this.flowParseTypeParameterDeclaration();
     }
   }
@@ -8753,7 +8792,7 @@ var flow = superClass => class extends superClass {
   parseClassMember(classBody, member, state) {
     var pos = this.state.start;
 
-    if (this.isContextual(115)) {
+    if (this.isContextual(117)) {
       if (this.parseClassMemberFromModifier(classBody, member)) {
         return;
       }
@@ -8784,7 +8823,7 @@ var flow = superClass => class extends superClass {
       this.raise(this.state.pos, ErrorMessages.InvalidIdentifier, fullWord);
     }
 
-    this.finishToken(122, fullWord);
+    this.finishToken(124, fullWord);
   }
 
   getTokenFromCode(code) {
@@ -8793,7 +8832,7 @@ var flow = superClass => class extends superClass {
     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);
@@ -8889,7 +8928,7 @@ var flow = superClass => class extends superClass {
   }
 
   isClassMethod() {
-    return this.match(43) || super.isClassMethod();
+    return this.match(45) || super.isClassMethod();
   }
 
   isClassProperty() {
@@ -8907,7 +8946,7 @@ var flow = superClass => class extends superClass {
 
     delete method.variance;
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       method.typeParameters = this.flowParseTypeParameterDeclaration();
     }
 
@@ -8935,7 +8974,7 @@ var flow = superClass => class extends superClass {
 
     delete method.variance;
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       method.typeParameters = this.flowParseTypeParameterDeclaration();
     }
 
@@ -8945,11 +8984,11 @@ var flow = superClass => class extends superClass {
   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 = [];
 
@@ -8958,7 +8997,7 @@ var flow = superClass => class extends superClass {
 
         _node3.id = this.flowParseRestrictedIdentifier(true);
 
-        if (this.match(43)) {
+        if (this.match(45)) {
           _node3.typeParameters = this.flowParseTypeParameterInstantiation();
         } else {
           _node3.typeParameters = null;
@@ -8996,7 +9035,7 @@ var flow = superClass => class extends superClass {
     delete prop.variance;
     var typeParameters;
 
-    if (this.match(43) && !isAccessor) {
+    if (this.match(45) && !isAccessor) {
       typeParameters = this.flowParseTypeParameterDeclaration();
       if (!this.match(10)) this.unexpected();
     }
@@ -9027,7 +9066,7 @@ var flow = superClass => class extends superClass {
       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);
     }
 
@@ -9063,9 +9102,9 @@ var flow = superClass => class extends superClass {
     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";
     }
 
@@ -9075,11 +9114,11 @@ var flow = superClass => class extends superClass {
         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;
       }
@@ -9102,7 +9141,7 @@ var flow = superClass => class extends superClass {
 
     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)) {
@@ -9127,7 +9166,7 @@ var flow = superClass => class extends superClass {
         specifier.importKind = null;
       }
 
-      if (this.eatContextual(87)) {
+      if (this.eatContextual(89)) {
         specifier.local = this.parseIdentifier();
       } else {
         isBinding = true;
@@ -9155,7 +9194,7 @@ var flow = superClass => class extends superClass {
 
   parseBindingAtom() {
     switch (this.state.type) {
-      case 72:
+      case 74:
         return this.parseIdentifier(true);
 
       default:
@@ -9166,7 +9205,7 @@ var flow = superClass => class extends superClass {
   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();
     }
 
@@ -9203,23 +9242,21 @@ var flow = superClass => class extends superClass {
     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();
@@ -9329,7 +9366,7 @@ var flow = superClass => class extends superClass {
       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;
@@ -9369,7 +9406,7 @@ var flow = superClass => class extends superClass {
       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;
@@ -9393,7 +9430,7 @@ var flow = superClass => class extends superClass {
   parseNewArguments(node) {
     var targs = null;
 
-    if (this.shouldParseTypes() && this.match(43)) {
+    if (this.shouldParseTypes() && this.match(45)) {
       targs = this.tryParse(() => this.flowParseTypeParameterInstantiationCallOrNew()).node;
     }
 
@@ -9591,7 +9628,7 @@ var flow = superClass => class extends superClass {
     var endOfInit = () => this.match(12) || this.match(8);
 
     switch (this.state.type) {
-      case 124:
+      case 126:
         {
           var literal = this.parseNumericLiteral(this.state.value);
 
@@ -9609,7 +9646,7 @@ var flow = superClass => class extends superClass {
           };
         }
 
-      case 123:
+      case 125:
         {
           var _literal = this.parseStringLiteral(this.state.value);
 
@@ -9627,10 +9664,10 @@ var flow = superClass => class extends superClass {
           };
         }
 
-      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 {
@@ -9657,7 +9694,7 @@ var flow = superClass => class extends superClass {
   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
     };
@@ -9825,7 +9862,7 @@ var flow = superClass => class extends superClass {
       enumName
     } = _ref16;
 
-    if (this.eatContextual(95)) {
+    if (this.eatContextual(97)) {
       if (!tokenIsIdentifier(this.state.type)) {
         throw this.flowEnumErrorInvalidExplicitType(this.state.start, {
           enumName,
@@ -10242,9 +10279,6 @@ var JsxErrors = makeErrorTemplates({
   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;
@@ -10284,14 +10318,14 @@ var jsx = superClass => class extends superClass {
           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);
@@ -10357,7 +10391,7 @@ var jsx = superClass => class extends superClass {
     }
 
     out += this.input.slice(chunkStart, this.state.pos++);
-    return this.finishToken(123, out);
+    return this.finishToken(125, out);
   }
 
   jsxReadEntity() {
@@ -10411,13 +10445,13 @@ var jsx = superClass => class extends superClass {
       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);
@@ -10465,8 +10499,9 @@ var jsx = superClass => class extends superClass {
     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);
@@ -10474,8 +10509,8 @@ var jsx = superClass => class extends superClass {
 
         return node;
 
-      case 132:
-      case 123:
+      case 134:
+      case 125:
         return this.parseExprAtom();
 
       default:
@@ -10491,11 +10526,12 @@ var jsx = superClass => class extends superClass {
   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 {
@@ -10503,6 +10539,7 @@ var jsx = superClass => class extends superClass {
       node.expression = expression;
     }
 
+    this.setContext(previousContext);
     this.expect(8);
     return this.finishNode(node, "JSXExpressionContainer");
   }
@@ -10510,23 +10547,26 @@ var jsx = superClass => class extends superClass {
   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");
     }
 
@@ -10537,26 +10577,26 @@ var jsx = superClass => class extends superClass {
   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");
   }
 
@@ -10569,12 +10609,12 @@ var jsx = superClass => class extends superClass {
     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;
             }
@@ -10582,7 +10622,7 @@ var jsx = superClass => class extends superClass {
             children.push(this.jsxParseElementAt(startPos, startLoc));
             break;
 
-          case 131:
+          case 133:
             children.push(this.parseExprAtom());
             break;
 
@@ -10590,12 +10630,13 @@ var jsx = superClass => class extends superClass {
             {
               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;
@@ -10627,7 +10668,7 @@ var jsx = superClass => class extends superClass {
 
     node.children = children;
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       throw this.raise(this.state.start, JsxErrors.UnwrappedAdjacentJSXElements);
     }
 
@@ -10641,19 +10682,31 @@ var jsx = superClass => class extends superClass {
     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();
 
@@ -10668,7 +10721,7 @@ var jsx = superClass => class extends superClass {
 
       if (code === 62) {
         ++this.state.pos;
-        return this.finishToken(133);
+        return this.finishToken(135);
       }
 
       if ((code === 34 || code === 39) && context === types.j_oTag) {
@@ -10678,31 +10731,31 @@ var jsx = superClass => class extends superClass {
 
     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 {
@@ -10914,7 +10967,7 @@ var typescript = superClass => class extends superClass {
   }
 
   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() {
@@ -11003,7 +11056,7 @@ var typescript = superClass => class extends superClass {
         return this.match(3);
 
       case "TypeParametersOrArguments":
-        return this.match(44);
+        return this.match(46);
     }
 
     throw new Error("Unreachable");
@@ -11069,7 +11122,7 @@ var typescript = superClass => class extends superClass {
       if (bracket) {
         this.expect(0);
       } else {
-        this.expect(43);
+        this.expect(45);
       }
     }
 
@@ -11078,7 +11131,7 @@ var typescript = superClass => class extends superClass {
     if (bracket) {
       this.expect(3);
     } else {
-      this.expect(44);
+      this.expect(46);
     }
 
     return result;
@@ -11086,10 +11139,10 @@ var typescript = superClass => class extends superClass {
 
   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);
     }
 
@@ -11100,7 +11153,7 @@ var typescript = superClass => class extends superClass {
       node.qualifier = this.tsParseEntityName(true);
     }
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       node.typeParameters = this.tsParseTypeArguments();
     }
 
@@ -11124,7 +11177,7 @@ var typescript = superClass => class extends superClass {
     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();
     }
 
@@ -11148,9 +11201,9 @@ var typescript = superClass => class extends superClass {
 
   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);
@@ -11162,13 +11215,13 @@ var typescript = superClass => class extends superClass {
   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();
     }
   }
@@ -11176,7 +11229,7 @@ var typescript = superClass => class extends superClass {
   tsParseTypeParameters() {
     var node = this.startNode();
 
-    if (this.match(43) || this.match(132)) {
+    if (this.match(45) || this.match(134)) {
       this.next();
     } else {
       this.unexpected();
@@ -11199,7 +11252,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsTryNextParseConstantContext() {
-    if (this.lookahead().type === 69) {
+    if (this.lookahead().type === 71) {
       this.next();
       return this.tsParseTypeReference();
     }
@@ -11274,14 +11327,14 @@ var typescript = superClass => class extends superClass {
     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);
       }
 
@@ -11336,15 +11389,15 @@ var typescript = superClass => class extends superClass {
   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");
@@ -11385,11 +11438,11 @@ var typescript = superClass => class extends superClass {
   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();
     }
 
@@ -11404,13 +11457,13 @@ var typescript = superClass => class extends superClass {
     }
 
     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");
   }
 
@@ -11418,20 +11471,20 @@ var typescript = superClass => class extends superClass {
     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);
@@ -11542,11 +11595,11 @@ var typescript = superClass => class extends superClass {
 
     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:
@@ -11571,7 +11624,7 @@ var typescript = superClass => class extends superClass {
   tsParseThisTypeOrThisTypePredicate() {
     var thisKeyword = this.tsParseThisTypeNode();
 
-    if (this.isContextual(107) && !this.hasPrecedingLineBreak()) {
+    if (this.isContextual(109) && !this.hasPrecedingLineBreak()) {
       return this.tsParseThisTypePredicate(thisKeyword);
     } else {
       return thisKeyword;
@@ -11580,19 +11633,19 @@ var typescript = superClass => class extends superClass {
 
   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();
           }
 
@@ -11602,13 +11655,13 @@ var typescript = superClass => class extends superClass {
 
         break;
 
-      case 72:
+      case 74:
         return this.tsParseThisTypeOrThisTypePredicate();
 
-      case 81:
+      case 83:
         return this.tsParseTypeQuery();
 
-      case 77:
+      case 79:
         return this.tsParseImportType();
 
       case 5:
@@ -11620,7 +11673,8 @@ var typescript = superClass => class extends superClass {
       case 10:
         return this.tsParseParenthesizedType();
 
-      case 22:
+      case 25:
+      case 24:
         return this.tsParseTemplateLiteralType();
 
       default:
@@ -11629,8 +11683,8 @@ var typescript = superClass => class extends superClass {
             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();
@@ -11696,7 +11750,7 @@ var typescript = superClass => class extends superClass {
 
   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");
@@ -11705,7 +11759,7 @@ var typescript = superClass => class extends superClass {
 
   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) {
@@ -11726,15 +11780,15 @@ var typescript = superClass => class extends superClass {
   }
 
   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;
     }
 
@@ -11742,7 +11796,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsSkipParameterStart() {
-    if (tokenIsIdentifier(this.state.type) || this.match(72)) {
+    if (tokenIsIdentifier(this.state.type) || this.match(74)) {
       this.next();
       return true;
     }
@@ -11792,7 +11846,7 @@ var typescript = superClass => class extends superClass {
     }
 
     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;
       }
 
@@ -11815,7 +11869,7 @@ var typescript = superClass => class extends superClass {
       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") {
@@ -11870,21 +11924,21 @@ var typescript = superClass => class extends superClass {
   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;
     }
 
@@ -11909,7 +11963,7 @@ var typescript = superClass => class extends superClass {
     assert(this.state.inType);
     var type = this.tsParseNonConditionalType();
 
-    if (this.hasPrecedingLineBreak() || !this.eat(75)) {
+    if (this.hasPrecedingLineBreak() || !this.eat(77)) {
       return type;
     }
 
@@ -11924,7 +11978,7 @@ var typescript = superClass => class extends superClass {
   }
 
   isAbstractConstructorSignature() {
-    return this.isContextual(114) && this.lookahead().type === 71;
+    return this.isContextual(116) && this.lookahead().type === 73;
   }
 
   tsParseNonConditionalType() {
@@ -11932,7 +11986,7 @@ var typescript = superClass => class extends superClass {
       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);
@@ -11951,7 +12005,7 @@ var typescript = superClass => class extends superClass {
     var _const = this.tsTryNextParseConstantContext();
 
     node.typeAnnotation = _const || this.tsNextThenParseType();
-    this.expect(44);
+    this.expect(46);
     node.expression = this.parseMaybeUnary();
     return this.finishNode(node, "TSTypeAssertion");
   }
@@ -11971,7 +12025,7 @@ var typescript = superClass => class extends superClass {
     var node = this.startNode();
     node.expression = this.tsParseEntityName(false);
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       node.typeParameters = this.tsParseTypeArguments();
     }
 
@@ -11989,7 +12043,7 @@ var typescript = superClass => class extends superClass {
 
     node.typeParameters = this.tsTryParseTypeParameters();
 
-    if (this.eat(75)) {
+    if (this.eat(77)) {
       node.extends = this.tsParseHeritageClause("extends");
     }
 
@@ -12004,9 +12058,9 @@ var typescript = superClass => class extends superClass {
     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();
@@ -12062,9 +12116,9 @@ var typescript = superClass => class extends superClass {
 
   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();
     }
 
@@ -12114,10 +12168,10 @@ var typescript = superClass => class extends superClass {
   }
 
   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();
@@ -12140,7 +12194,7 @@ var typescript = superClass => class extends superClass {
     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") {
@@ -12153,7 +12207,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsIsExternalModuleReference() {
-    return this.isContextual(110) && this.lookaheadCharCode() === 40;
+    return this.isContextual(112) && this.lookaheadCharCode() === 40;
   }
 
   tsParseModuleReference() {
@@ -12162,10 +12216,10 @@ var typescript = superClass => class extends superClass {
 
   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();
     }
 
@@ -12208,33 +12262,33 @@ var typescript = superClass => class extends superClass {
     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:
@@ -12288,7 +12342,7 @@ var typescript = superClass => class extends superClass {
   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);
         }
 
@@ -12311,7 +12365,7 @@ var typescript = superClass => class extends superClass {
 
       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);
@@ -12347,7 +12401,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsTryParseGenericAsyncArrowFunction(startPos, startLoc) {
-    if (!this.match(43)) {
+    if (!this.match(45)) {
       return undefined;
     }
 
@@ -12373,7 +12427,7 @@ var typescript = superClass => class extends superClass {
   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));
     }));
 
@@ -12381,7 +12435,7 @@ var typescript = superClass => class extends superClass {
       this.raise(node.start, TSErrors.EmptyTypeArguments);
     }
 
-    this.expect(44);
+    this.expect(46);
     return this.finishNode(node, "TSTypeParameterInstantiation");
   }
 
@@ -12501,7 +12555,7 @@ var typescript = superClass => class extends superClass {
   }
 
   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);
@@ -12521,7 +12575,7 @@ var typescript = superClass => class extends superClass {
       this.next();
     }
 
-    if (this.match(43)) {
+    if (this.match(45)) {
       var missingParenErrorPos;
       var result = this.tsTryParseAndCatch(() => {
         if (!noCalls && this.atPossibleAsyncArrow(base)) {
@@ -12552,7 +12606,7 @@ var typescript = superClass => class extends superClass {
             }
 
             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;
@@ -12574,7 +12628,7 @@ var typescript = superClass => class extends superClass {
   }
 
   parseNewArguments(node) {
-    if (this.match(43)) {
+    if (this.match(45)) {
       var typeParameters = this.tsTryParseAndCatch(() => {
         var args = this.tsParseTypeArguments();
         if (!this.match(10)) this.unexpected();
@@ -12590,7 +12644,7 @@ var typescript = superClass => class extends superClass {
   }
 
   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;
 
@@ -12617,16 +12671,16 @@ var typescript = superClass => class extends superClass {
   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);
       }
     }
@@ -12641,10 +12695,10 @@ var typescript = superClass => class extends superClass {
   }
 
   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 {
@@ -12652,19 +12706,19 @@ var typescript = superClass => class extends superClass {
       }
 
       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 {
@@ -12676,7 +12730,7 @@ var typescript = superClass => class extends superClass {
   }
 
   isAbstractClass() {
-    return this.isContextual(114) && this.lookahead().type === 74;
+    return this.isContextual(116) && this.lookahead().type === 76;
   }
 
   parseExportDefaultExpression() {
@@ -12688,7 +12742,7 @@ var typescript = superClass => class extends superClass {
       return cls;
     }
 
-    if (this.match(119)) {
+    if (this.match(121)) {
       var interfaceNode = this.startNode();
       this.next();
       var result = this.tsParseInterfaceDeclaration(interfaceNode);
@@ -12699,13 +12753,13 @@ var typescript = superClass => class extends superClass {
   }
 
   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);
       }
     }
@@ -12728,7 +12782,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsIsStartOfStaticBlocks() {
-    return this.isContextual(98) && this.lookaheadCharCode() === 123;
+    return this.isContextual(100) && this.lookaheadCharCode() === 123;
   }
 
   parseClassMember(classBody, member, state) {
@@ -12858,9 +12912,9 @@ var typescript = superClass => class extends superClass {
   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);
     }
 
@@ -12887,7 +12941,7 @@ var typescript = superClass => class extends superClass {
   }
 
   parseClassId(node, isStatement, optionalId) {
-    if ((!isStatement || optionalId) && this.isContextual(104)) {
+    if ((!isStatement || optionalId) && this.isContextual(106)) {
       return;
     }
 
@@ -12897,7 +12951,7 @@ var typescript = superClass => class extends superClass {
   }
 
   parseClassPropertyAnnotation(node) {
-    if (!node.optional && this.eat(33)) {
+    if (!node.optional && this.eat(35)) {
       node.definite = true;
     }
 
@@ -12908,11 +12962,11 @@ var typescript = superClass => class extends superClass {
   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;
@@ -12965,11 +13019,11 @@ var typescript = superClass => class extends superClass {
   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");
     }
   }
@@ -12994,7 +13048,7 @@ var typescript = superClass => class extends superClass {
   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;
     }
 
@@ -13025,22 +13079,21 @@ var typescript = superClass => class extends superClass {
     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);
     }
 
@@ -13106,7 +13159,7 @@ var typescript = superClass => class extends superClass {
   }
 
   parseMaybeUnary(refExpressionErrors) {
-    if (!this.hasPlugin("jsx") && this.match(43)) {
+    if (!this.hasPlugin("jsx") && this.match(45)) {
       return this.tsParseTypeAssertion();
     } else {
       return super.parseMaybeUnary(refExpressionErrors);
@@ -13234,7 +13287,7 @@ var typescript = superClass => class extends superClass {
 
   parseBindingAtom() {
     switch (this.state.type) {
-      case 72:
+      case 74:
         return this.parseIdentifier(true);
 
       default:
@@ -13243,7 +13296,7 @@ var typescript = superClass => class extends superClass {
   }
 
   parseMaybeDecoratorArguments(expr) {
-    if (this.match(43)) {
+    if (this.match(45)) {
       var typeArguments = this.tsParseTypeArguments();
 
       if (this.match(10)) {
@@ -13267,11 +13320,11 @@ var typescript = superClass => class extends superClass {
   }
 
   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() {
@@ -13287,11 +13340,11 @@ var typescript = superClass => class extends superClass {
   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);
       }
     }
 
@@ -13303,10 +13356,10 @@ var typescript = superClass => class extends superClass {
       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();
     }
@@ -13360,7 +13413,7 @@ var typescript = superClass => class extends superClass {
   }
 
   jsxParseOpeningElementAfterName(node) {
-    if (this.match(43)) {
+    if (this.match(45)) {
       var typeArguments = this.tsTryParseAndCatch(() => this.tsParseTypeArguments());
       if (typeArguments) node.typeParameters = typeArguments;
     }
@@ -13415,10 +13468,10 @@ var typescript = superClass => class extends superClass {
   }
 
   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);
@@ -13426,7 +13479,7 @@ var typescript = superClass => class extends superClass {
         return this.tsParseInterfaceDeclaration(node);
       }
     } else {
-      this.unexpected(null, 74);
+      this.unexpected(null, 76);
     }
   }
 
@@ -13501,10 +13554,10 @@ var typescript = superClass => class extends superClass {
     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)) {
@@ -13537,7 +13590,7 @@ var typescript = superClass => class extends superClass {
     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();
     }
 
@@ -13558,13 +13611,13 @@ var PlaceHolderErrors = makeErrorTemplates({
 
 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);
     }
   }
@@ -13577,7 +13630,7 @@ var placeholders = superClass => class extends superClass {
 
   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);
@@ -13617,14 +13670,14 @@ var placeholders = superClass => class extends superClass {
       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;
     }
 
@@ -13670,7 +13723,7 @@ var placeholders = superClass => class extends superClass {
     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;
@@ -13692,7 +13745,7 @@ var placeholders = superClass => class extends superClass {
     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");
@@ -13707,11 +13760,11 @@ var placeholders = superClass => class extends superClass {
   }
 
   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;
         }
       }
@@ -13746,7 +13799,7 @@ var placeholders = superClass => class extends superClass {
     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");
@@ -13762,7 +13815,7 @@ var placeholders = superClass => class extends superClass {
       if (!hasStarImport) this.parseNamedImportSpecifiers(node);
     }
 
-    this.expectContextual(91);
+    this.expectContextual(93);
     node.source = this.parseImportSource();
     this.semicolon();
     return this.finishNode(node, "ImportDeclaration");
@@ -13776,7 +13829,7 @@ var placeholders = superClass => class extends superClass {
 
 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();
@@ -13801,12 +13854,27 @@ var v8intrinsic = superClass => class extends superClass {
 
 };
 
-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;
     }
   });
 }
@@ -13862,7 +13930,9 @@ function validatePlugins(plugins) {
       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")) {
@@ -14199,11 +14269,11 @@ class LValParser extends NodeUtils {
       } 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());
         }
 
@@ -14262,7 +14332,7 @@ class LValParser extends NodeUtils {
     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();
@@ -14414,7 +14484,7 @@ class ExpressionParser extends LValParser {
     this.nextToken();
     var expr = this.parseExpression();
 
-    if (!this.match(129)) {
+    if (!this.match(131)) {
       this.unexpected();
     }
 
@@ -14475,7 +14545,7 @@ class ExpressionParser extends LValParser {
     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();
 
@@ -14515,7 +14585,7 @@ class ExpressionParser extends LValParser {
       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) {
@@ -14567,7 +14637,7 @@ class ExpressionParser extends LValParser {
   }
 
   parseMaybeUnaryOrPrivate(refExpressionErrors) {
-    return this.match(128) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
+    return this.match(130) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
   }
 
   parseExprOps(refExpressionErrors) {
@@ -14590,7 +14660,7 @@ class ExpressionParser extends LValParser {
         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);
       }
 
@@ -14599,11 +14669,11 @@ class ExpressionParser extends LValParser {
 
     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) {
@@ -14616,17 +14686,19 @@ class ExpressionParser extends LValParser {
         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);
           }
         }
@@ -14635,7 +14707,7 @@ class ExpressionParser extends LValParser {
         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);
         }
 
@@ -14651,7 +14723,7 @@ class ExpressionParser extends LValParser {
     var startLoc = this.state.startLoc;
 
     switch (op) {
-      case 35:
+      case 37:
         switch (this.getPluginOption("pipelineOperator", "proposal")) {
           case "hack":
             return this.withTopicBindingContext(() => {
@@ -14660,7 +14732,7 @@ class ExpressionParser extends LValParser {
 
           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);
               }
 
@@ -14704,7 +14776,7 @@ class ExpressionParser extends LValParser {
   }
 
   checkExponentialAfterUnary(node) {
-    if (this.match(51)) {
+    if (this.match(53)) {
       this.raise(node.argument.start, ErrorMessages.UnexpectedTokenUnaryExponentiation);
     }
   }
@@ -14712,7 +14784,7 @@ class ExpressionParser extends LValParser {
   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();
@@ -14723,18 +14795,18 @@ class ExpressionParser extends LValParser {
       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);
@@ -14762,7 +14834,7 @@ class ExpressionParser extends LValParser {
         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);
@@ -14827,15 +14899,19 @@ class ExpressionParser extends LValParser {
   }
 
   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;
@@ -14863,21 +14939,19 @@ class ExpressionParser extends LValParser {
     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) {
@@ -14891,6 +14965,7 @@ class ExpressionParser extends LValParser {
   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);
@@ -15051,10 +15126,10 @@ class ExpressionParser extends LValParser {
     } = this.state;
 
     switch (type) {
-      case 73:
+      case 75:
         return this.parseSuper();
 
-      case 77:
+      case 79:
         node = this.startNode();
         this.next();
 
@@ -15068,42 +15143,42 @@ class ExpressionParser extends LValParser {
 
         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:
@@ -15134,21 +15209,22 @@ class ExpressionParser extends LValParser {
           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:
@@ -15165,25 +15241,25 @@ class ExpressionParser extends LValParser {
           }
         }
 
-      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");
 
@@ -15194,7 +15270,7 @@ class ExpressionParser extends LValParser {
           }
         }
 
-      case 43:
+      case 45:
         {
           var lookaheadCh = this.input.codePointAt(this.nextTokenStart());
 
@@ -15208,7 +15284,7 @@ class ExpressionParser extends LValParser {
 
       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();
           }
 
@@ -15222,7 +15298,7 @@ class ExpressionParser extends LValParser {
               type: _type
             } = this.state;
 
-            if (_type === 62) {
+            if (_type === 64) {
               this.resetPreviousNodeTrailingComments(id);
               this.next();
               return this.parseFunction(this.startNodeAtNode(id), undefined, true);
@@ -15232,7 +15308,7 @@ class ExpressionParser extends LValParser {
               } else {
                 return id;
               }
-            } else if (_type === 84) {
+            } else if (_type === 86) {
               this.resetPreviousNodeTrailingComments(id);
               return this.parseDo(this.startNodeAtNode(id), true);
             }
@@ -15303,12 +15379,13 @@ class ExpressionParser extends LValParser {
     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);
@@ -15387,7 +15464,7 @@ class ExpressionParser extends LValParser {
       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();
@@ -15415,7 +15492,7 @@ class ExpressionParser extends LValParser {
     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);
       }
@@ -15623,38 +15700,46 @@ class ExpressionParser extends LValParser {
   }
 
   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");
   }
 
@@ -15721,18 +15806,18 @@ class ExpressionParser extends LValParser {
   }
 
   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());
       }
     }
@@ -15760,7 +15845,7 @@ class ExpressionParser extends LValParser {
       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);
@@ -15771,7 +15856,7 @@ class ExpressionParser extends LValParser {
       if (keyName === "async" && !this.hasPrecedingLineBreak()) {
         isAsync = true;
         this.resetPreviousNodeTrailingComments(key);
-        isGenerator = this.eat(49);
+        isGenerator = this.eat(51);
         this.parsePropertyName(prop);
       }
 
@@ -15780,7 +15865,7 @@ class ExpressionParser extends LValParser {
         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();
@@ -15850,9 +15935,15 @@ class ExpressionParser extends LValParser {
 
       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));
@@ -15887,23 +15978,23 @@ class ExpressionParser extends LValParser {
         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);
@@ -15918,7 +16009,7 @@ class ExpressionParser extends LValParser {
 
       prop.key = key;
 
-      if (type !== 128) {
+      if (type !== 130) {
         prop.computed = false;
       }
     }
@@ -16132,7 +16223,7 @@ class ExpressionParser extends LValParser {
 
     if (liberal) {
       if (tokenIsKeyword) {
-        this.replaceToken(122);
+        this.replaceToken(124);
       }
     } else {
       this.checkReservedWord(name, start, tokenIsKeyword, false);
@@ -16199,7 +16290,7 @@ class ExpressionParser extends LValParser {
     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);
     }
 
@@ -16219,7 +16310,11 @@ class ExpressionParser extends LValParser {
   }
 
   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() {
@@ -16230,11 +16325,11 @@ class ExpressionParser extends LValParser {
     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:
@@ -16254,7 +16349,9 @@ class ExpressionParser extends LValParser {
   }
 
   checkPipelineAtInfixOperator(left, leftStartPos) {
-    if (this.getPluginOption("pipelineOperator", "proposal") === "smart") {
+    if (this.hasPlugin(["pipelineOperator", {
+      proposal: "smart"
+    }])) {
       if (left.type === "SequenceExpression") {
         this.raise(leftStartPos, ErrorMessages.PipelineHeadSequenceExpression);
       }
@@ -16316,9 +16413,9 @@ class ExpressionParser extends LValParser {
   }
 
   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,
@@ -16439,44 +16536,117 @@ var FUNC_NO_FLAGS = 0b000,
 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);
     }
   }
@@ -16488,12 +16658,16 @@ class StatementParser extends ExpressionParser {
   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();
@@ -16526,7 +16700,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseInterpreterDirective() {
-    if (!this.match(26)) {
+    if (!this.match(28)) {
       return null;
     }
 
@@ -16537,7 +16711,7 @@ class StatementParser extends ExpressionParser {
   }
 
   isLet(context) {
-    if (!this.isContextual(93)) {
+    if (!this.isContextual(95)) {
       return false;
     }
 
@@ -16573,7 +16747,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseStatement(context, topLevel) {
-    if (this.match(24)) {
+    if (this.match(26)) {
       this.parseDecorators(true);
     }
 
@@ -16586,27 +16760,27 @@ class StatementParser extends ExpressionParser {
     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) {
@@ -16619,27 +16793,27 @@ class StatementParser extends ExpressionParser {
 
         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") {
@@ -16648,10 +16822,10 @@ class StatementParser extends ExpressionParser {
 
         return this.parseVarStatement(node, kind);
 
-      case 86:
+      case 88:
         return this.parseWhileStatement(node);
 
-      case 70:
+      case 72:
         return this.parseWithStatement(node);
 
       case 5:
@@ -16660,7 +16834,7 @@ class StatementParser extends ExpressionParser {
       case 13:
         return this.parseEmptyStatement(node);
 
-      case 77:
+      case 79:
         {
           var nextTokenCharCode = this.lookaheadCharCode();
 
@@ -16669,7 +16843,7 @@ class StatementParser extends ExpressionParser {
           }
         }
 
-      case 76:
+      case 78:
         {
           if (!this.options.allowImportExportEverywhere && !topLevel) {
             this.raise(this.state.start, ErrorMessages.UnexpectedImportExport);
@@ -16678,7 +16852,7 @@ class StatementParser extends ExpressionParser {
           this.next();
           var result;
 
-          if (starttype === 77) {
+          if (starttype === 79) {
             result = this.parseImport(node);
 
             if (result.type === "ImportDeclaration" && (!result.importKind || result.importKind === "value")) {
@@ -16736,18 +16910,18 @@ class StatementParser extends ExpressionParser {
   }
 
   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();
       }
@@ -16857,7 +17031,7 @@ class StatementParser extends ExpressionParser {
     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");
@@ -16868,7 +17042,7 @@ class StatementParser extends ExpressionParser {
     this.state.labels.push(loopLabel);
     var awaitAt = -1;
 
-    if (this.isAwaitAllowed() && this.eatContextual(90)) {
+    if (this.isAwaitAllowed() && this.eatContextual(92)) {
       awaitAt = this.state.lastTokStart;
     }
 
@@ -16883,10 +17057,10 @@ class StatementParser extends ExpressionParser {
       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;
@@ -16894,7 +17068,7 @@ class StatementParser extends ExpressionParser {
       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);
       }
 
@@ -16905,10 +17079,10 @@ class StatementParser extends ExpressionParser {
       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) {
@@ -16918,7 +17092,7 @@ class StatementParser extends ExpressionParser {
       }
     }
 
-    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);
@@ -16943,7 +17117,7 @@ class StatementParser extends ExpressionParser {
     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");
   }
 
@@ -16974,8 +17148,8 @@ class StatementParser extends ExpressionParser {
     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 = [];
@@ -17034,7 +17208,7 @@ class StatementParser extends ExpressionParser {
     node.block = this.parseBlock();
     node.handler = null;
 
-    if (this.match(56)) {
+    if (this.match(58)) {
       var clause = this.startNode();
       this.next();
 
@@ -17052,7 +17226,7 @@ class StatementParser extends ExpressionParser {
       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);
@@ -17100,7 +17274,7 @@ class StatementParser extends ExpressionParser {
       }
     }
 
-    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];
@@ -17218,7 +17392,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseForIn(node, init, awaitAt) {
-    var isForIn = this.match(52);
+    var isForIn = this.match(54);
     this.next();
 
     if (isForIn) {
@@ -17251,14 +17425,14 @@ class StatementParser extends ExpressionParser {
       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");
         }
 
@@ -17285,11 +17459,11 @@ class StatementParser extends ExpressionParser {
     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);
@@ -17347,7 +17521,7 @@ class StatementParser extends ExpressionParser {
   }
 
   isClassProperty() {
-    return this.match(27) || this.match(13) || this.match(8);
+    return this.match(29) || this.match(13) || this.match(8);
   }
 
   isClassMethod() {
@@ -17378,7 +17552,7 @@ class StatementParser extends ExpressionParser {
           continue;
         }
 
-        if (this.match(24)) {
+        if (this.match(26)) {
           decorators.push(this.parseDecorator());
           continue;
         }
@@ -17434,7 +17608,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseClassMember(classBody, member, state) {
-    var isStatic = this.isContextual(98);
+    var isStatic = this.isContextual(100);
 
     if (isStatic) {
       if (this.parseClassMemberFromModifier(classBody, member)) {
@@ -17460,9 +17634,9 @@ class StatementParser extends ExpressionParser {
     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) {
@@ -17479,7 +17653,7 @@ class StatementParser extends ExpressionParser {
     }
 
     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);
@@ -17519,7 +17693,7 @@ class StatementParser extends ExpressionParser {
       }
     } 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);
@@ -17527,7 +17701,7 @@ class StatementParser extends ExpressionParser {
 
       method.kind = "method";
 
-      var _isPrivate = this.match(128);
+      var _isPrivate = this.match(130);
 
       this.parseClassElementName(method);
       this.parsePostMemberNameModifiers(publicMember);
@@ -17541,11 +17715,11 @@ class StatementParser extends ExpressionParser {
 
         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);
 
@@ -17578,11 +17752,11 @@ class StatementParser extends ExpressionParser {
       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);
       }
@@ -17661,7 +17835,7 @@ class StatementParser extends ExpressionParser {
     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();
@@ -17686,7 +17860,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseClassSuper(node) {
-    node.superClass = this.eat(75) ? this.parseExprSubscripts() : null;
+    node.superClass = this.eat(77) ? this.parseExprSubscripts() : null;
   }
 
   parseExport(node) {
@@ -17723,7 +17897,7 @@ class StatementParser extends ExpressionParser {
       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");
@@ -17733,7 +17907,7 @@ class StatementParser extends ExpressionParser {
   }
 
   eatExportStar(node) {
-    return this.eat(49);
+    return this.eat(51);
   }
 
   maybeParseExportDefaultSpecifier(node) {
@@ -17749,7 +17923,7 @@ class StatementParser extends ExpressionParser {
   }
 
   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();
@@ -17796,7 +17970,7 @@ class StatementParser extends ExpressionParser {
   }
 
   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");
   }
@@ -17805,7 +17979,7 @@ class StatementParser extends ExpressionParser {
     var expr = this.startNode();
     var isAsync = this.isAsyncFunction();
 
-    if (this.match(62) || isAsync) {
+    if (this.match(64) || isAsync) {
       this.next();
 
       if (isAsync) {
@@ -17813,16 +17987,16 @@ class StatementParser extends ExpressionParser {
       }
 
       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();
@@ -17841,21 +18015,21 @@ class StatementParser extends ExpressionParser {
     } = 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;
     }
 
@@ -17866,7 +18040,7 @@ class StatementParser extends ExpressionParser {
       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;
     }
@@ -17875,7 +18049,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseExportFrom(node, expect) {
-    if (this.eatContextual(91)) {
+    if (this.eatContextual(93)) {
       node.source = this.parseImportSource();
       this.checkExport(node);
       var assertions = this.maybeParseImportAssertions();
@@ -17895,7 +18069,7 @@ class StatementParser extends ExpressionParser {
       type
     } = this.state;
 
-    if (type === 24) {
+    if (type === 26) {
       this.expectOnePlugin(["decorators", "decorators-legacy"]);
 
       if (this.hasPlugin("decorators")) {
@@ -17907,7 +18081,7 @@ class StatementParser extends ExpressionParser {
       }
     }
 
-    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) {
@@ -18008,8 +18182,8 @@ class StatementParser extends ExpressionParser {
         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));
@@ -18019,7 +18193,7 @@ class StatementParser extends ExpressionParser {
   }
 
   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);
@@ -18031,7 +18205,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseModuleExportName() {
-    if (this.match(123)) {
+    if (this.match(125)) {
       var result = this.parseStringLiteral(this.state.value);
       var surrogate = result.value.match(loneSurrogate);
 
@@ -18048,12 +18222,12 @@ class StatementParser extends ExpressionParser {
   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();
@@ -18074,7 +18248,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseImportSource() {
-    if (!this.match(123)) this.unexpected();
+    if (!this.match(125)) this.unexpected();
     return this.parseExprAtom();
   }
 
@@ -18106,7 +18280,7 @@ class StatementParser extends ExpressionParser {
 
       attrNames.add(keyName);
 
-      if (this.match(123)) {
+      if (this.match(125)) {
         node.key = this.parseStringLiteral(keyName);
       } else {
         node.key = this.parseIdentifier(true);
@@ -18114,7 +18288,7 @@ class StatementParser extends ExpressionParser {
 
       this.expect(14);
 
-      if (!this.match(123)) {
+      if (!this.match(125)) {
         throw this.unexpected(this.state.start, ErrorMessages.ModuleAttributeInvalidValue);
       }
 
@@ -18127,7 +18301,7 @@ class StatementParser extends ExpressionParser {
   }
 
   maybeParseModuleAttributes() {
-    if (this.match(70) && !this.hasPrecedingLineBreak()) {
+    if (this.match(72) && !this.hasPrecedingLineBreak()) {
       this.expectPlugin("moduleAttributes");
       this.next();
     } else {
@@ -18153,7 +18327,7 @@ class StatementParser extends ExpressionParser {
       attributes.add(node.key.name);
       this.expect(14);
 
-      if (!this.match(123)) {
+      if (!this.match(125)) {
         throw this.unexpected(this.state.start, ErrorMessages.ModuleAttributeInvalidValue);
       }
 
@@ -18166,7 +18340,7 @@ class StatementParser extends ExpressionParser {
   }
 
   maybeParseImportAssertions() {
-    if (this.isContextual(88) && !this.hasPrecedingLineBreak()) {
+    if (this.isContextual(90) && !this.hasPrecedingLineBreak()) {
       this.expectPlugin("importAssertions");
       this.next();
     } else {
@@ -18190,10 +18364,10 @@ class StatementParser extends ExpressionParser {
   }
 
   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;
     }
@@ -18218,8 +18392,8 @@ class StatementParser extends ExpressionParser {
       }
 
       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);
@@ -18227,7 +18401,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly) {
-    if (this.eatContextual(87)) {
+    if (this.eatContextual(89)) {
       specifier.local = this.parseIdentifier();
     } else {
       var {