@next-core/brick-utils 2.35.0 → 2.35.1

package/dist/index.esm.js

@@ -3058,40 +3058,6 @@ Object.defineProperty(lib, '__esModule', {
   value: true
 });
 
-class Position {
-  constructor(line, col, index) {
-    this.line = void 0;
-    this.column = void 0;
-    this.index = void 0;
-    this.line = line;
-    this.column = col;
-    indexes.set(this, index);
-  }
-
-}
-
-class SourceLocation {
-  constructor(start, end) {
-    this.start = void 0;
-    this.end = void 0;
-    this.filename = void 0;
-    this.identifierName = void 0;
-    this.start = start;
-    this.end = end;
-  }
-
-}
-
-var indexes = new WeakMap();
-
-function createPositionWithColumnOffset(position, columnOffset) {
-  var {
-    line,
-    column
-  } = position;
-  return new Position(line, column + columnOffset, indexes.get(position) + columnOffset);
-}
-
 class BaseParser {
   constructor() {
     this.sawUnambiguousESM = false;
@@ -3374,6 +3340,7 @@ var ErrorMessages = makeErrorTemplates({
   ImportCallArity: "`import()` requires exactly %0.",
   ImportCallNotNewExpression: "Cannot use new with import(...).",
   ImportCallSpreadArgument: "`...` is not allowed in `import()`.",
+  IncompatibleRegExpUVFlags: "The 'u' and 'v' regular expression flags cannot be enabled at the same time.",
   InvalidBigIntLiteral: "Invalid BigIntLiteral.",
   InvalidCodePoint: "Code point out of bounds.",
   InvalidCoverInitializedName: "Invalid shorthand property initializer.",
@@ -3538,7 +3505,7 @@ class ParserError extends CommentsParser {
       params[_key2 - 2] = arguments[_key2];
     }
 
-    var pos = indexes.get(loc);
+    var pos = loc.index;
     var message = template.replace(/%(\d+)/g, (_, i) => params[i]) + " (".concat(loc.line, ":").concat(loc.column, ")");
 
     if (this.options.errorRecovery) {
@@ -3569,7 +3536,7 @@ class ParserError extends CommentsParser {
       params[_key3 - 3] = arguments[_key3];
     }
 
-    var pos = indexes.get(loc);
+    var pos = loc.index;
     var message = errorTemplate.replace(/%(\d+)/g, (_, i) => params[i]) + " (".concat(loc.line, ":").concat(loc.column, ")");
     return this._raise(Object.assign({
       loc,
@@ -3591,7 +3558,32 @@ class ParserError extends CommentsParser {
 
 }
 
+var {
+  defineProperty
+} = Object;
+
+var toUnenumerable = (object, key) => defineProperty(object, key, {
+  enumerable: false,
+  value: object[key]
+});
+
+function toESTreeLocation(node) {
+  toUnenumerable(node.loc.start, "index");
+  toUnenumerable(node.loc.end, "index");
+  return node;
+}
+
 var estree = superClass => class extends superClass {
+  parse() {
+    var file = toESTreeLocation(super.parse());
+
+    if (this.options.tokens) {
+      file.tokens = file.tokens.map(toESTreeLocation);
+    }
+
+    return file;
+  }
+
   parseRegExpLiteral(_ref3) {
     var {
       pattern,
@@ -3833,7 +3825,16 @@ var estree = superClass => class extends superClass {
     var isLHS = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
 
     if (node != null && this.isObjectProperty(node)) {
-      this.toAssignable(node.value, isLHS);
+      var {
+        key,
+        value
+      } = node;
+
+      if (this.isPrivateName(key)) {
+        this.classScope.usePrivateName(this.getPrivateNameSV(key), key.loc.start);
+      }
+
+      this.toAssignable(value, isLHS);
       return node;
     }
 
@@ -3947,6 +3948,16 @@ var estree = superClass => class extends superClass {
     return node.method || node.kind === "get" || node.kind === "set";
   }
 
+  finishNodeAt(node, type, endLoc) {
+    return toESTreeLocation(super.finishNodeAt(node, type, endLoc));
+  }
+
+  resetEndLocation(node) {
+    var endLoc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.state.lastTokEndLoc;
+    super.resetEndLocation(node, endLoc);
+    toESTreeLocation(node);
+  }
+
 };
 
 class TokContext {
@@ -4175,6 +4186,12 @@ var tt = {
     prefix,
     startsExpr
   }),
+  doubleCaret: createToken("^^", {
+    startsExpr
+  }),
+  doubleAt: createToken("@@", {
+    startsExpr
+  }),
   pipeline: createBinop("|>", 0),
   nullishCoalescing: createBinop("??", 1),
   logicalOR: createBinop("||", 1),
@@ -4187,6 +4204,8 @@ var tt = {
   gt: createBinop("</>/<=/>=", 7),
   relational: createBinop("</>/<=/>=", 7),
   bitShift: createBinop("<</>>/>>>", 8),
+  bitShiftL: createBinop("<</>>/>>>", 8),
+  bitShiftR: createBinop("<</>>/>>>", 8),
   plusMin: createToken("+/-", {
     beforeExpr,
     binop: 9,
@@ -4440,19 +4459,19 @@ var tt = {
 };
 
 function tokenIsIdentifier(token) {
-  return token >= 89 && token <= 124;
+  return token >= 93 && token <= 128;
 }
 
 function tokenKeywordOrIdentifierIsKeyword(token) {
-  return token <= 88;
+  return token <= 92;
 }
 
 function tokenIsKeywordOrIdentifier(token) {
-  return token >= 54 && token <= 124;
+  return token >= 58 && token <= 128;
 }
 
 function tokenIsLiteralPropertyName(token) {
-  return token >= 54 && token <= 128;
+  return token >= 58 && token <= 132;
 }
 
 function tokenComesBeforeExpression(token) {
@@ -4468,19 +4487,19 @@ function tokenIsAssignment(token) {
 }
 
 function tokenIsFlowInterfaceOrTypeOrOpaque(token) {
-  return token >= 121 && token <= 123;
+  return token >= 125 && token <= 127;
 }
 
 function tokenIsLoop(token) {
-  return token >= 86 && token <= 88;
+  return token >= 90 && token <= 92;
 }
 
 function tokenIsKeyword(token) {
-  return token >= 54 && token <= 88;
+  return token >= 58 && token <= 92;
 }
 
 function tokenIsOperator(token) {
-  return token >= 37 && token <= 55;
+  return token >= 39 && token <= 59;
 }
 
 function tokenIsPostfix(token) {
@@ -4492,11 +4511,11 @@ function tokenIsPrefix(token) {
 }
 
 function tokenIsTSTypeOperator(token) {
-  return token >= 113 && token <= 115;
+  return token >= 117 && token <= 119;
 }
 
 function tokenIsTSDeclarationStart(token) {
-  return token >= 116 && token <= 122;
+  return token >= 120 && token <= 126;
 }
 
 function tokenLabelName(token) {
@@ -4508,7 +4527,7 @@ function tokenOperatorPrecedence(token) {
 }
 
 function tokenIsRightAssociative(token) {
-  return token === 53;
+  return token === 57;
 }
 
 function tokenIsTemplate(token) {
@@ -4536,10 +4555,44 @@ function getExportedToken(token) {
     }
   };
 
-  tokenTypes[134].updateContext = context => {
+  tokenTypes[138].updateContext = context => {
     context.push(types.j_expr, types.j_oTag);
   };
 }
+
+class Position {
+  constructor(line, col, index) {
+    this.line = void 0;
+    this.column = void 0;
+    this.index = void 0;
+    this.line = line;
+    this.column = col;
+    this.index = index;
+  }
+
+}
+
+class SourceLocation {
+  constructor(start, end) {
+    this.start = void 0;
+    this.end = void 0;
+    this.filename = void 0;
+    this.identifierName = void 0;
+    this.start = start;
+    this.end = end;
+  }
+
+}
+
+function createPositionWithColumnOffset(position, columnOffset) {
+  var {
+    line,
+    column,
+    index
+  } = position;
+  return new Position(line, column + columnOffset, index + columnOffset);
+}
+
 var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u0870-\u0887\u0889-\u088e\u08a0-\u08c9\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c5d\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cdd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u1711\u171f-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4c\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7ca\ua7d0\ua7d1\ua7d3\ua7d5-\ua7d9\ua7f2-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
 var nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0898-\u089f\u08ca-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3c\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1715\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u180f-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf-\u1ace\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
 var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
@@ -4618,8 +4671,8 @@ function isKeyword(word) {
   return keywords.has(word);
 }
 
-function isIteratorStart(current, next) {
-  return current === 64 && next === 64;
+function isIteratorStart(current, next, next2) {
+  return current === 64 && next === 64 && isIdentifierStart(next2);
 }
 
 var reservedWordLikeSet = new Set(["break", "case", "catch", "continue", "debugger", "default", "do", "else", "finally", "for", "function", "if", "return", "switch", "throw", "try", "var", "const", "while", "with", "new", "this", "super", "class", "extends", "export", "import", "null", "true", "false", "in", "instanceof", "typeof", "void", "delete", "implements", "interface", "let", "package", "private", "protected", "public", "static", "yield", "eval", "arguments", "enum", "await"]);
@@ -4973,7 +5026,7 @@ class State {
     this.comments = [];
     this.commentStack = [];
     this.pos = 0;
-    this.type = 131;
+    this.type = 135;
     this.value = null;
     this.start = 0;
     this.end = 0;
@@ -5028,7 +5081,7 @@ var _isDigit = function isDigit(code) {
   return code >= 48 && code <= 57;
 };
 
-var VALID_REGEX_FLAGS = new Set([103, 109, 115, 105, 121, 117, 100]);
+var VALID_REGEX_FLAGS = new Set([103, 109, 115, 105, 121, 117, 100, 118]);
 var forbiddenNumericSeparatorSiblings = {
   decBinOct: [46, 66, 69, 79, 95, 98, 101, 111],
   hex: [46, 88, 95, 120]
@@ -5176,7 +5229,7 @@ class Tokenizer extends ParserError {
     if (!this.isLookahead) this.state.startLoc = this.state.curPosition();
 
     if (this.state.pos >= this.length) {
-      this.finishToken(131);
+      this.finishToken(135);
       return;
     }
 
@@ -5399,10 +5452,10 @@ class Tokenizer extends ParserError {
       }
     } else if (isIdentifierStart(next)) {
       ++this.state.pos;
-      this.finishToken(130, this.readWord1(next));
+      this.finishToken(134, this.readWord1(next));
     } else if (next === 92) {
       ++this.state.pos;
-      this.finishToken(130, this.readWord1());
+      this.finishToken(134, this.readWord1());
     } else {
       this.finishOp(27, 1);
     }
@@ -5431,7 +5484,7 @@ class Tokenizer extends ParserError {
     if (next === 61) {
       this.finishOp(31, 2);
     } else {
-      this.finishOp(52, 1);
+      this.finishOp(56, 1);
     }
   }
 
@@ -5452,14 +5505,14 @@ class Tokenizer extends ParserError {
   }
 
   readToken_mult_modulo(code) {
-    var type = code === 42 ? 51 : 50;
+    var type = code === 42 ? 55 : 54;
     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 = 53;
+      type = 57;
     }
 
     if (next === 61 && !this.state.inType) {
@@ -5477,7 +5530,7 @@ class Tokenizer extends ParserError {
       if (this.input.charCodeAt(this.state.pos + 2) === 61) {
         this.finishOp(30, 3);
       } else {
-        this.finishOp(code === 124 ? 39 : 40, 2);
+        this.finishOp(code === 124 ? 41 : 42, 2);
       }
 
       return;
@@ -5485,7 +5538,7 @@ class Tokenizer extends ParserError {
 
     if (code === 124) {
       if (next === 62) {
-        this.finishOp(37, 2);
+        this.finishOp(39, 2);
         return;
       }
 
@@ -5519,7 +5572,7 @@ class Tokenizer extends ParserError {
       return;
     }
 
-    this.finishOp(code === 124 ? 41 : 43, 1);
+    this.finishOp(code === 124 ? 43 : 45, 1);
   }
 
   readToken_caret() {
@@ -5527,8 +5580,31 @@ class Tokenizer extends ParserError {
 
     if (next === 61 && !this.state.inType) {
       this.finishOp(32, 2);
+    } else if (next === 94 && this.hasPlugin(["pipelineOperator", {
+      proposal: "hack",
+      topicToken: "^^"
+    }])) {
+      this.finishOp(37, 2);
+      var lookaheadCh = this.input.codePointAt(this.state.pos);
+
+      if (lookaheadCh === 94) {
+        throw this.unexpected();
+      }
     } else {
-      this.finishOp(42, 1);
+      this.finishOp(44, 1);
+    }
+  }
+
+  readToken_atSign() {
+    var next = this.input.charCodeAt(this.state.pos + 1);
+
+    if (next === 64 && this.hasPlugin(["pipelineOperator", {
+      proposal: "hack",
+      topicToken: "@@"
+    }])) {
+      this.finishOp(38, 2);
+    } else {
+      this.finishOp(26, 1);
     }
   }
 
@@ -5543,7 +5619,7 @@ class Tokenizer extends ParserError {
     if (next === 61) {
       this.finishOp(30, 2);
     } else {
-      this.finishOp(49, 1);
+      this.finishOp(53, 1);
     }
   }
 
@@ -5559,16 +5635,16 @@ class Tokenizer extends ParserError {
         return;
       }
 
-      this.finishOp(48, 2);
+      this.finishOp(51, 2);
       return;
     }
 
     if (next === 61) {
-      this.finishOp(47, 2);
+      this.finishOp(49, 2);
       return;
     }
 
-    this.finishOp(45, 1);
+    this.finishOp(47, 1);
   }
 
   readToken_gt() {
@@ -5585,23 +5661,23 @@ class Tokenizer extends ParserError {
         return;
       }
 
-      this.finishOp(48, size);
+      this.finishOp(52, size);
       return;
     }
 
     if (next === 61) {
-      this.finishOp(47, 2);
+      this.finishOp(49, 2);
       return;
     }
 
-    this.finishOp(46, 1);
+    this.finishOp(48, 1);
   }
 
   readToken_eq_excl(code) {
     var next = this.input.charCodeAt(this.state.pos + 1);
 
     if (next === 61) {
-      this.finishOp(44, this.input.charCodeAt(this.state.pos + 2) === 61 ? 3 : 2);
+      this.finishOp(46, this.input.charCodeAt(this.state.pos + 2) === 61 ? 3 : 2);
       return;
     }
 
@@ -5622,7 +5698,7 @@ class Tokenizer extends ParserError {
       if (next2 === 61) {
         this.finishOp(30, 3);
       } else {
-        this.finishOp(38, 2);
+        this.finishOp(40, 2);
       }
     } else if (next === 46 && !(next2 >= 48 && next2 <= 57)) {
       this.state.pos += 2;
@@ -5799,8 +5875,7 @@ class Tokenizer extends ParserError {
         return;
 
       case 64:
-        ++this.state.pos;
-        this.finishToken(26);
+        this.readToken_atSign();
         return;
 
       case 35:
@@ -5872,19 +5947,37 @@ class Tokenizer extends ParserError {
     ++pos;
     var mods = "";
 
+    var nextPos = () => createPositionWithColumnOffset(startLoc, pos + 2 - start);
+
     while (pos < this.length) {
       var cp = this.codePointAtPos(pos);
       var char = String.fromCharCode(cp);
 
       if (VALID_REGEX_FLAGS.has(cp)) {
+        if (cp === 118) {
+          this.expectPlugin("regexpUnicodeSets", nextPos());
+
+          if (mods.includes("u")) {
+            this.raise(ErrorMessages.IncompatibleRegExpUVFlags, {
+              at: nextPos()
+            });
+          }
+        } else if (cp === 117) {
+          if (mods.includes("v")) {
+            this.raise(ErrorMessages.IncompatibleRegExpUVFlags, {
+              at: nextPos()
+            });
+          }
+        }
+
         if (mods.includes(char)) {
           this.raise(ErrorMessages.DuplicateRegExpFlags, {
-            at: createPositionWithColumnOffset(startLoc, pos + 2 - start)
+            at: nextPos()
           });
         }
       } else if (isIdentifierChar(cp) || cp === 92) {
         this.raise(ErrorMessages.MalformedRegExpFlags, {
-          at: createPositionWithColumnOffset(startLoc, pos + 2 - start)
+          at: nextPos()
         });
       } else {
         break;
@@ -5895,7 +5988,7 @@ class Tokenizer extends ParserError {
     }
 
     this.state.pos = pos;
-    this.finishToken(129, {
+    this.finishToken(133, {
       pattern: content,
       flags: mods
     });
@@ -6002,12 +6095,12 @@ class Tokenizer extends ParserError {
     }
 
     if (isBigInt) {
-      var str = this.input.slice(indexes.get(startLoc), this.state.pos).replace(/[_n]/g, "");
-      this.finishToken(127, str);
+      var str = this.input.slice(startLoc.index, this.state.pos).replace(/[_n]/g, "");
+      this.finishToken(131, str);
       return;
     }
 
-    this.finishToken(126, val);
+    this.finishToken(130, val);
   }
 
   readNumber(startsWithDot) {
@@ -6104,17 +6197,17 @@ class Tokenizer extends ParserError {
     var str = this.input.slice(start, this.state.pos).replace(/[_mn]/g, "");
 
     if (isBigInt) {
-      this.finishToken(127, str);
+      this.finishToken(131, str);
       return;
     }
 
     if (isDecimal) {
-      this.finishToken(128, str);
+      this.finishToken(132, str);
       return;
     }
 
     var val = isOctal ? parseInt(str, 8) : parseFloat(str);
-    this.finishToken(126, val);
+    this.finishToken(130, val);
   }
 
   readCodePoint(throwOnInvalid) {
@@ -6174,7 +6267,7 @@ class Tokenizer extends ParserError {
     }
 
     out += this.input.slice(chunkStart, this.state.pos++);
-    this.finishToken(125, out);
+    this.finishToken(129, out);
   }
 
   readTemplateContinuation() {
@@ -6255,14 +6348,12 @@ class Tokenizer extends ParserError {
   }
 
   recordStrictModeErrors(message, loc) {
-    var index = indexes.get(loc);
-
-    if (this.state.strict && !this.state.strictErrors.has(index)) {
+    if (this.state.strict && !this.state.strictErrors.has(loc.index)) {
       this.raise(message, {
         at: loc
       });
     } else {
-      this.state.strictErrors.set(index, {
+      this.state.strictErrors.set(loc.index, {
         loc,
         message
       });
@@ -6367,7 +6458,7 @@ class Tokenizer extends ParserError {
           at: codeLoc
         });
       } else {
-        this.state.pos = indexes.get(codeLoc) - 1;
+        this.state.pos = codeLoc.index - 1;
       }
     }
 
@@ -6432,7 +6523,7 @@ class Tokenizer extends ParserError {
     if (type !== undefined) {
       this.finishToken(type, tokenLabelName(type));
     } else {
-      this.finishToken(124, word);
+      this.finishToken(128, word);
     }
   }
 
@@ -6573,14 +6664,14 @@ class ArrowHeadParsingScope extends ExpressionScope {
   }
 
   recordDeclarationError(message, loc) {
-    this.errors.set(indexes.get(loc), {
+    this.errors.set(loc.index, {
       message,
       loc
     });
   }
 
   clearDeclarationError(loc) {
-    this.errors.delete(indexes.get(loc));
+    this.errors.delete(loc.index);
   }
 
   iterateErrors(iterator) {
@@ -6803,11 +6894,11 @@ class UtilParser extends Tokenizer {
   }
 
   canInsertSemicolon() {
-    return this.match(131) || this.match(8) || this.hasPrecedingLineBreak();
+    return this.match(135) || this.match(8) || this.hasPrecedingLineBreak();
   }
 
   hasPrecedingLineBreak() {
-    return lineBreak.test(this.input.slice(indexes.get(this.state.lastTokEndLoc), this.state.start));
+    return lineBreak.test(this.input.slice(this.state.lastTokEndLoc.index, this.state.start));
   }
 
   hasFollowingLineBreak() {
@@ -6834,7 +6925,7 @@ class UtilParser extends Tokenizer {
   assertNoSpace() {
     var message = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "Unexpected space.";
 
-    if (this.state.start > indexes.get(this.state.lastTokEndLoc)) {
+    if (this.state.start > this.state.lastTokEndLoc.index) {
       this.raise({
         code: ErrorCodes.SyntaxError,
         reasonCode: "UnexpectedSpace",
@@ -6949,9 +7040,10 @@ class UtilParser extends Tokenizer {
     var {
       shorthandAssignLoc,
       doubleProtoLoc,
+      privateKeyLoc,
       optionalParametersLoc
     } = refExpressionErrors;
-    var hasErrors = !!shorthandAssignLoc || !!doubleProtoLoc || !!optionalParametersLoc;
+    var hasErrors = !!shorthandAssignLoc || !!doubleProtoLoc || !!optionalParametersLoc || !!privateKeyLoc;
 
     if (!andThrow) {
       return hasErrors;
@@ -6969,6 +7061,12 @@ class UtilParser extends Tokenizer {
       });
     }
 
+    if (privateKeyLoc != null) {
+      this.raise(ErrorMessages.UnexpectedPrivateField, {
+        at: privateKeyLoc
+      });
+    }
+
     if (optionalParametersLoc != null) {
       this.unexpected(optionalParametersLoc);
     }
@@ -7041,12 +7139,23 @@ class UtilParser extends Tokenizer {
     this.prodParam.enter(paramFlags);
   }
 
+  checkDestructuringPrivate(refExpressionErrors) {
+    var {
+      privateKeyLoc
+    } = refExpressionErrors;
+
+    if (privateKeyLoc !== null) {
+      this.expectPlugin("destructuringPrivate", privateKeyLoc);
+    }
+  }
+
 }
 
 class ExpressionErrors {
   constructor() {
     this.shorthandAssignLoc = null;
     this.doubleProtoLoc = null;
+    this.privateKeyLoc = null;
     this.optionalParametersLoc = null;
   }
 
@@ -7162,9 +7271,9 @@ class NodeUtils extends UtilParser {
 
   finishNodeAt(node, type, endLoc) {
     node.type = type;
-    node.end = indexes.get(endLoc);
+    node.end = endLoc.index;
     node.loc.end = endLoc;
-    if (this.options.ranges) node.range[1] = node.end;
+    if (this.options.ranges) node.range[1] = endLoc.index;
     if (this.options.attachComment) this.processComment(node);
     return node;
   }
@@ -7177,9 +7286,9 @@ class NodeUtils extends UtilParser {
 
   resetEndLocation(node) {
     var endLoc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.state.lastTokEndLoc;
-    node.end = indexes.get(endLoc);
+    node.end = endLoc.index;
     node.loc.end = endLoc;
-    if (this.options.ranges) node.range[1] = node.end;
+    if (this.options.ranges) node.range[1] = endLoc.index;
   }
 
   resetStartLocationFromNode(node, locationNode) {
@@ -7248,7 +7357,7 @@ function hasTypeImportKind(node) {
 }
 
 function isMaybeDefaultImport(type) {
-  return tokenIsKeywordOrIdentifier(type) && type !== 93;
+  return tokenIsKeywordOrIdentifier(type) && type !== 97;
 }
 
 var exportSuggestions = {
@@ -7290,7 +7399,7 @@ var flow = superClass => class extends superClass {
   }
 
   finishToken(type, val) {
-    if (type !== 125 && type !== 13 && type !== 28) {
+    if (type !== 129 && type !== 13 && type !== 28) {
       if (this.flowPragma === undefined) {
         this.flowPragma = null;
       }
@@ -7327,9 +7436,9 @@ var flow = superClass => class extends superClass {
     var node = this.startNode();
     var moduloLoc = this.state.startLoc;
     this.next();
-    this.expectContextual(103);
+    this.expectContextual(107);
 
-    if (this.state.lastTokStart > indexes.get(moduloLoc) + 1) {
+    if (this.state.lastTokStart > moduloLoc.index + 1) {
       this.raise(FlowErrors.UnexpectedSpaceBetweenModuloChecks, {
         at: moduloLoc
       });
@@ -7351,14 +7460,14 @@ var flow = superClass => class extends superClass {
     var type = null;
     var predicate = null;
 
-    if (this.match(50)) {
+    if (this.match(54)) {
       this.state.inType = oldInType;
       predicate = this.flowParsePredicate();
     } else {
       type = this.flowParseType();
       this.state.inType = oldInType;
 
-      if (this.match(50)) {
+      if (this.match(54)) {
         predicate = this.flowParsePredicate();
       }
     }
@@ -7378,7 +7487,7 @@ var flow = superClass => class extends superClass {
     var typeNode = this.startNode();
     var typeContainer = this.startNode();
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       typeNode.typeParameters = this.flowParseTypeParameterDeclaration();
     } else {
       typeNode.typeParameters = null;
@@ -7400,13 +7509,13 @@ var flow = superClass => class extends superClass {
   }
 
   flowParseDeclare(node, insideModule) {
-    if (this.match(76)) {
+    if (this.match(80)) {
       return this.flowParseDeclareClass(node);
-    } else if (this.match(64)) {
+    } else if (this.match(68)) {
       return this.flowParseDeclareFunction(node);
-    } else if (this.match(70)) {
+    } else if (this.match(74)) {
       return this.flowParseDeclareVariable(node);
-    } else if (this.eatContextual(119)) {
+    } else if (this.eatContextual(123)) {
       if (this.match(16)) {
         return this.flowParseDeclareModuleExports(node);
       } else {
@@ -7418,13 +7527,13 @@ var flow = superClass => class extends superClass {
 
         return this.flowParseDeclareModule(node);
       }
-    } else if (this.isContextual(122)) {
+    } else if (this.isContextual(126)) {
       return this.flowParseDeclareTypeAlias(node);
-    } else if (this.isContextual(123)) {
+    } else if (this.isContextual(127)) {
       return this.flowParseDeclareOpaqueType(node);
-    } else if (this.isContextual(121)) {
+    } else if (this.isContextual(125)) {
       return this.flowParseDeclareInterface(node);
-    } else if (this.match(78)) {
+    } else if (this.match(82)) {
       return this.flowParseDeclareExportDeclaration(node, insideModule);
     } else {
       throw this.unexpected();
@@ -7442,7 +7551,7 @@ var flow = superClass => class extends superClass {
   flowParseDeclareModule(node) {
     this.scope.enter(SCOPE_OTHER);
 
-    if (this.match(125)) {
+    if (this.match(129)) {
       node.id = this.parseExprAtom();
     } else {
       node.id = this.parseIdentifier();
@@ -7455,10 +7564,10 @@ var flow = superClass => class extends superClass {
     while (!this.match(8)) {
       var _bodyNode = this.startNode();
 
-      if (this.match(79)) {
+      if (this.match(83)) {
         this.next();
 
-        if (!this.isContextual(122) && !this.match(83)) {
+        if (!this.isContextual(126) && !this.match(87)) {
           this.raise(FlowErrors.InvalidNonTypeImportInDeclareModule, {
             at: this.state.lastTokStartLoc
           });
@@ -7466,7 +7575,7 @@ var flow = superClass => class extends superClass {
 
         this.parseImport(_bodyNode);
       } else {
-        this.expectContextual(117, FlowErrors.UnsupportedStatementInDeclareModule);
+        this.expectContextual(121, FlowErrors.UnsupportedStatementInDeclareModule);
         _bodyNode = this.flowParseDeclare(_bodyNode, true);
       }
 
@@ -7509,10 +7618,10 @@ var flow = superClass => class extends superClass {
   }
 
   flowParseDeclareExportDeclaration(node, insideModule) {
-    this.expect(78);
+    this.expect(82);
 
-    if (this.eat(61)) {
-      if (this.match(64) || this.match(76)) {
+    if (this.eat(65)) {
+      if (this.match(68) || this.match(80)) {
         node.declaration = this.flowParseDeclare(this.startNode());
       } else {
         node.declaration = this.flowParseType();
@@ -7522,7 +7631,7 @@ var flow = superClass => class extends superClass {
       node.default = true;
       return this.finishNode(node, "DeclareExportDeclaration");
     } else {
-      if (this.match(71) || this.isLet() || (this.isContextual(122) || this.isContextual(121)) && !insideModule) {
+      if (this.match(75) || this.isLet() || (this.isContextual(126) || this.isContextual(125)) && !insideModule) {
         var label = this.state.value;
         var suggestion = exportSuggestions[label];
         throw this.raise(FlowErrors.UnsupportedDeclareExportKind, {
@@ -7530,11 +7639,11 @@ var flow = superClass => class extends superClass {
         }, label, suggestion);
       }
 
-      if (this.match(70) || this.match(64) || this.match(76) || this.isContextual(123)) {
+      if (this.match(74) || this.match(68) || this.match(80) || this.isContextual(127)) {
         node.declaration = this.flowParseDeclare(this.startNode());
         node.default = false;
         return this.finishNode(node, "DeclareExportDeclaration");
-      } else if (this.match(51) || this.match(5) || this.isContextual(121) || this.isContextual(122) || this.isContextual(123)) {
+      } else if (this.match(55) || this.match(5) || this.isContextual(125) || this.isContextual(126) || this.isContextual(127)) {
         node = this.parseExport(node);
 
         if (node.type === "ExportNamedDeclaration") {
@@ -7553,7 +7662,7 @@ var flow = superClass => class extends superClass {
 
   flowParseDeclareModuleExports(node) {
     this.next();
-    this.expectContextual(104);
+    this.expectContextual(108);
     node.typeAnnotation = this.flowParseTypeAnnotation();
     this.semicolon();
     return this.finishNode(node, "DeclareModuleExports");
@@ -7584,7 +7693,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.loc.start);
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       node.typeParameters = this.flowParseTypeParameterDeclaration();
     } else {
       node.typeParameters = null;
@@ -7594,13 +7703,13 @@ var flow = superClass => class extends superClass {
     node.implements = [];
     node.mixins = [];
 
-    if (this.eat(77)) {
+    if (this.eat(81)) {
       do {
         node.extends.push(this.flowParseInterfaceExtends());
       } while (!isClass && this.eat(12));
     }
 
-    if (this.isContextual(110)) {
+    if (this.isContextual(114)) {
       this.next();
 
       do {
@@ -7608,7 +7717,7 @@ var flow = superClass => class extends superClass {
       } while (this.eat(12));
     }
 
-    if (this.isContextual(106)) {
+    if (this.isContextual(110)) {
       this.next();
 
       do {
@@ -7629,7 +7738,7 @@ var flow = superClass => class extends superClass {
     var node = this.startNode();
     node.id = this.flowParseQualifiedTypeIdentifier();
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       node.typeParameters = this.flowParseTypeParameterInstantiation();
     } else {
       node.typeParameters = null;
@@ -7667,7 +7776,7 @@ var flow = superClass => class extends superClass {
     node.id = this.flowParseRestrictedIdentifier(false, true);
     this.scope.declareName(node.id.name, BIND_LEXICAL, node.id.loc.start);
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       node.typeParameters = this.flowParseTypeParameterDeclaration();
     } else {
       node.typeParameters = null;
@@ -7679,11 +7788,11 @@ var flow = superClass => class extends superClass {
   }
 
   flowParseOpaqueType(node, declare) {
-    this.expectContextual(122);
+    this.expectContextual(126);
     node.id = this.flowParseRestrictedIdentifier(true, true);
     this.scope.declareName(node.id.name, BIND_LEXICAL, node.id.loc.start);
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       node.typeParameters = this.flowParseTypeParameterDeclaration();
     } else {
       node.typeParameters = null;
@@ -7735,7 +7844,7 @@ var flow = superClass => class extends superClass {
     node.params = [];
     this.state.inType = true;
 
-    if (this.match(45) || this.match(134)) {
+    if (this.match(47) || this.match(138)) {
       this.next();
     } else {
       this.unexpected();
@@ -7751,12 +7860,12 @@ var flow = superClass => class extends superClass {
         defaultRequired = true;
       }
 
-      if (!this.match(46)) {
+      if (!this.match(48)) {
         this.expect(12);
       }
-    } while (!this.match(46));
+    } while (!this.match(48));
 
-    this.expect(46);
+    this.expect(48);
     this.state.inType = oldInType;
     return this.finishNode(node, "TypeParameterDeclaration");
   }
@@ -7766,20 +7875,20 @@ var flow = superClass => class extends superClass {
     var oldInType = this.state.inType;
     node.params = [];
     this.state.inType = true;
-    this.expect(45);
+    this.expect(47);
     var oldNoAnonFunctionType = this.state.noAnonFunctionType;
     this.state.noAnonFunctionType = false;
 
-    while (!this.match(46)) {
+    while (!this.match(48)) {
       node.params.push(this.flowParseType());
 
-      if (!this.match(46)) {
+      if (!this.match(48)) {
         this.expect(12);
       }
     }
 
     this.state.noAnonFunctionType = oldNoAnonFunctionType;
-    this.expect(46);
+    this.expect(48);
     this.state.inType = oldInType;
     return this.finishNode(node, "TypeParameterInstantiation");
   }
@@ -7789,27 +7898,27 @@ var flow = superClass => class extends superClass {
     var oldInType = this.state.inType;
     node.params = [];
     this.state.inType = true;
-    this.expect(45);
+    this.expect(47);
 
-    while (!this.match(46)) {
+    while (!this.match(48)) {
       node.params.push(this.flowParseTypeOrImplicitInstantiation());
 
-      if (!this.match(46)) {
+      if (!this.match(48)) {
         this.expect(12);
       }
     }
 
-    this.expect(46);
+    this.expect(48);
     this.state.inType = oldInType;
     return this.finishNode(node, "TypeParameterInstantiation");
   }
 
   flowParseInterfaceType() {
     var node = this.startNode();
-    this.expectContextual(121);
+    this.expectContextual(125);
     node.extends = [];
 
-    if (this.eat(77)) {
+    if (this.eat(81)) {
       do {
         node.extends.push(this.flowParseInterfaceExtends());
       } while (this.eat(12));
@@ -7826,7 +7935,7 @@ var flow = superClass => class extends superClass {
   }
 
   flowParseObjectPropertyKey() {
-    return this.match(126) || this.match(125) ? this.parseExprAtom() : this.parseIdentifier(true);
+    return this.match(130) || this.match(129) ? this.parseExprAtom() : this.parseIdentifier(true);
   }
 
   flowParseObjectTypeIndexer(node, isStatic, variance) {
@@ -7852,7 +7961,7 @@ var flow = superClass => class extends superClass {
     this.expect(3);
     this.expect(3);
 
-    if (this.match(45) || this.match(10)) {
+    if (this.match(47) || this.match(10)) {
       node.method = true;
       node.optional = false;
       node.value = this.flowParseObjectTypeMethodish(this.startNodeAt(node.start, node.loc.start));
@@ -7875,13 +7984,13 @@ var flow = superClass => class extends superClass {
     node.typeParameters = null;
     node.this = null;
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       node.typeParameters = this.flowParseTypeParameterDeclaration();
     }
 
     this.expect(10);
 
-    if (this.match(74)) {
+    if (this.match(78)) {
       node.this = this.flowParseFunctionTypeParam(true);
       node.this.name = null;
 
@@ -7951,7 +8060,7 @@ var flow = superClass => class extends superClass {
       var inexactStartLoc = null;
       var node = this.startNode();
 
-      if (allowProto && this.isContextual(111)) {
+      if (allowProto && this.isContextual(115)) {
         var lookahead = this.lookahead();
 
         if (lookahead.type !== 14 && lookahead.type !== 17) {
@@ -7961,7 +8070,7 @@ var flow = superClass => class extends superClass {
         }
       }
 
-      if (allowStatic && this.isContextual(100)) {
+      if (allowStatic && this.isContextual(104)) {
         var _lookahead = this.lookahead();
 
         if (_lookahead.type !== 14 && _lookahead.type !== 17) {
@@ -7986,7 +8095,7 @@ var flow = superClass => class extends superClass {
         } else {
           nodeStart.indexers.push(this.flowParseObjectTypeIndexer(node, isStatic, variance));
         }
-      } else if (this.match(10) || this.match(45)) {
+      } else if (this.match(10) || this.match(47)) {
         if (protoStartLoc != null) {
           this.unexpected(protoStartLoc);
         }
@@ -7999,7 +8108,7 @@ var flow = superClass => class extends superClass {
       } else {
         var kind = "init";
 
-        if (this.isContextual(94) || this.isContextual(99)) {
+        if (this.isContextual(98) || this.isContextual(103)) {
           var _lookahead2 = this.lookahead();
 
           if (tokenIsLiteralPropertyName(_lookahead2.type)) {
@@ -8087,7 +8196,7 @@ var flow = superClass => class extends superClass {
       node.kind = kind;
       var optional = false;
 
-      if (this.match(45) || this.match(10)) {
+      if (this.match(47) || this.match(10)) {
         node.method = true;
 
         if (protoStartLoc != null) {
@@ -8175,7 +8284,7 @@ var flow = superClass => class extends superClass {
     node.typeParameters = null;
     node.id = this.flowParseQualifiedTypeIdentifier(startPos, startLoc, id);
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       node.typeParameters = this.flowParseTypeParameterInstantiation();
     }
 
@@ -8184,7 +8293,7 @@ var flow = superClass => class extends superClass {
 
   flowParseTypeofType() {
     var node = this.startNode();
-    this.expect(83);
+    this.expect(87);
     node.argument = this.flowParsePrimaryType();
     return this.finishNode(node, "TypeofTypeAnnotation");
   }
@@ -8210,7 +8319,7 @@ var flow = superClass => class extends superClass {
     var typeAnnotation = null;
     var node = this.startNode();
     var lh = this.lookahead();
-    var isThis = this.state.type === 74;
+    var isThis = this.state.type === 78;
 
     if (lh.type === 14 || lh.type === 17) {
       if (isThis && !first) {
@@ -8255,7 +8364,7 @@ var flow = superClass => class extends superClass {
     var rest = null;
     var _this = null;
 
-    if (this.match(74)) {
+    if (this.match(78)) {
       _this = this.flowParseFunctionTypeParam(true);
       _this.name = null;
 
@@ -8347,7 +8456,7 @@ var flow = superClass => class extends superClass {
         this.state.noAnonFunctionType = oldNoAnonFunctionType;
         return type;
 
-      case 45:
+      case 47:
         node.typeParameters = this.flowParseTypeParameterDeclaration();
         this.expect(10);
         tmp = this.flowParseFunctionTypeParams();
@@ -8363,7 +8472,7 @@ var flow = superClass => class extends superClass {
         this.next();
 
         if (!this.match(11) && !this.match(21)) {
-          if (tokenIsIdentifier(this.state.type) || this.match(74)) {
+          if (tokenIsIdentifier(this.state.type) || this.match(78)) {
             var token = this.lookahead().type;
             isGroupedType = token !== 17 && token !== 14;
           } else {
@@ -8399,24 +8508,24 @@ var flow = superClass => class extends superClass {
         node.typeParameters = null;
         return this.finishNode(node, "FunctionTypeAnnotation");
 
-      case 125:
+      case 129:
         return this.parseLiteral(this.state.value, "StringLiteralTypeAnnotation");
 
-      case 81:
-      case 82:
-        node.value = this.match(81);
+      case 85:
+      case 86:
+        node.value = this.match(85);
         this.next();
         return this.finishNode(node, "BooleanLiteralTypeAnnotation");
 
-      case 49:
+      case 53:
         if (this.state.value === "-") {
           this.next();
 
-          if (this.match(126)) {
+          if (this.match(130)) {
             return this.parseLiteralAtNode(-this.state.value, "NumberLiteralTypeAnnotation", node);
           }
 
-          if (this.match(127)) {
+          if (this.match(131)) {
             return this.parseLiteralAtNode(-this.state.value, "BigIntLiteralTypeAnnotation", node);
           }
 
@@ -8427,29 +8536,29 @@ var flow = superClass => class extends superClass {
 
         throw this.unexpected();
 
-      case 126:
+      case 130:
         return this.parseLiteral(this.state.value, "NumberLiteralTypeAnnotation");
 
-      case 127:
+      case 131:
         return this.parseLiteral(this.state.value, "BigIntLiteralTypeAnnotation");
 
-      case 84:
+      case 88:
         this.next();
         return this.finishNode(node, "VoidTypeAnnotation");
 
-      case 80:
+      case 84:
         this.next();
         return this.finishNode(node, "NullLiteralTypeAnnotation");
 
-      case 74:
+      case 78:
         this.next();
         return this.finishNode(node, "ThisTypeAnnotation");
 
-      case 51:
+      case 55:
         this.next();
         return this.finishNode(node, "ExistsTypeAnnotation");
 
-      case 83:
+      case 87:
         return this.flowParseTypeofType();
 
       default:
@@ -8458,7 +8567,7 @@ var flow = superClass => class extends superClass {
           this.next();
           return super.createIdentifier(node, label);
         } else if (tokenIsIdentifier(this.state.type)) {
-          if (this.isContextual(121)) {
+          if (this.isContextual(125)) {
             return this.flowParseInterfaceType();
           }
 
@@ -8532,11 +8641,11 @@ var flow = superClass => class extends superClass {
 
   flowParseIntersectionType() {
     var node = this.startNode();
-    this.eat(43);
+    this.eat(45);
     var type = this.flowParseAnonFunctionWithoutParens();
     node.types = [type];
 
-    while (this.eat(43)) {
+    while (this.eat(45)) {
       node.types.push(this.flowParseAnonFunctionWithoutParens());
     }
 
@@ -8545,11 +8654,11 @@ var flow = superClass => class extends superClass {
 
   flowParseUnionType() {
     var node = this.startNode();
-    this.eat(41);
+    this.eat(43);
     var type = this.flowParseIntersectionType();
     node.types = [type];
 
-    while (this.eat(41)) {
+    while (this.eat(43)) {
       node.types.push(this.flowParseIntersectionType());
     }
 
@@ -8565,7 +8674,7 @@ var flow = superClass => class extends superClass {
   }
 
   flowParseTypeOrImplicitInstantiation() {
-    if (this.state.type === 124 && this.state.value === "_") {
+    if (this.state.type === 128 && this.state.value === "_") {
       var startPos = this.state.start;
       var startLoc = this.state.startLoc;
       var node = this.parseIdentifier();
@@ -8601,7 +8710,7 @@ var flow = superClass => class extends superClass {
   flowParseVariance() {
     var variance = null;
 
-    if (this.match(49)) {
+    if (this.match(53)) {
       variance = this.startNode();
 
       if (this.state.value === "+") {
@@ -8640,7 +8749,7 @@ var flow = superClass => class extends superClass {
   }
 
   parseStatement(context, topLevel) {
-    if (this.state.strict && this.isContextual(121)) {
+    if (this.state.strict && this.isContextual(125)) {
       var lookahead = this.lookahead();
 
       if (tokenIsKeywordOrIdentifier(lookahead.type)) {
@@ -8648,7 +8757,7 @@ var flow = superClass => class extends superClass {
         this.next();
         return this.flowParseInterface(node);
       }
-    } else if (this.shouldParseEnums() && this.isContextual(118)) {
+    } else if (this.shouldParseEnums() && this.isContextual(122)) {
       var _node = this.startNode();
 
       this.next();
@@ -8667,7 +8776,7 @@ var flow = superClass => class extends superClass {
   parseExpressionStatement(node, expr) {
     if (expr.type === "Identifier") {
       if (expr.name === "declare") {
-        if (this.match(76) || tokenIsIdentifier(this.state.type) || this.match(64) || this.match(70) || this.match(78)) {
+        if (this.match(80) || tokenIsIdentifier(this.state.type) || this.match(68) || this.match(74) || this.match(82)) {
           return this.flowParseDeclare(node);
         }
       } else if (tokenIsIdentifier(this.state.type)) {
@@ -8689,7 +8798,7 @@ var flow = superClass => class extends superClass {
       type
     } = this.state;
 
-    if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 118) {
+    if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 122) {
       return !this.state.containsEsc;
     }
 
@@ -8701,7 +8810,7 @@ var flow = superClass => class extends superClass {
       type
     } = this.state;
 
-    if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 118) {
+    if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 122) {
       return this.state.containsEsc;
     }
 
@@ -8709,7 +8818,7 @@ var flow = superClass => class extends superClass {
   }
 
   parseExportDefaultExpression() {
-    if (this.shouldParseEnums() && this.isContextual(118)) {
+    if (this.shouldParseEnums() && this.isContextual(122)) {
       var node = this.startNode();
       this.next();
       return this.flowParseEnumDeclaration(node);
@@ -8884,7 +8993,7 @@ var flow = superClass => class extends superClass {
   }
 
   parseExportDeclaration(node) {
-    if (this.isContextual(122)) {
+    if (this.isContextual(126)) {
       node.exportKind = "type";
       var declarationNode = this.startNode();
       this.next();
@@ -8896,21 +9005,21 @@ var flow = superClass => class extends superClass {
       } else {
         return this.flowParseTypeAlias(declarationNode);
       }
-    } else if (this.isContextual(123)) {
+    } else if (this.isContextual(127)) {
       node.exportKind = "type";
 
       var _declarationNode = this.startNode();
 
       this.next();
       return this.flowParseOpaqueType(_declarationNode, false);
-    } else if (this.isContextual(121)) {
+    } else if (this.isContextual(125)) {
       node.exportKind = "type";
 
       var _declarationNode2 = this.startNode();
 
       this.next();
       return this.flowParseInterface(_declarationNode2);
-    } else if (this.shouldParseEnums() && this.isContextual(118)) {
+    } else if (this.shouldParseEnums() && this.isContextual(122)) {
       node.exportKind = "value";
 
       var _declarationNode3 = this.startNode();
@@ -8925,7 +9034,7 @@ var flow = superClass => class extends superClass {
   eatExportStar(node) {
     if (super.eatExportStar(...arguments)) return true;
 
-    if (this.isContextual(122) && this.lookahead().type === 51) {
+    if (this.isContextual(126) && this.lookahead().type === 55) {
       node.exportKind = "type";
       this.next();
       this.next();
@@ -8951,7 +9060,7 @@ var flow = superClass => class extends superClass {
   parseClassId(node, isStatement, optionalId) {
     super.parseClassId(node, isStatement, optionalId);
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       node.typeParameters = this.flowParseTypeParameterDeclaration();
     }
   }
@@ -8961,7 +9070,7 @@ var flow = superClass => class extends superClass {
       startLoc
     } = this.state;
 
-    if (this.isContextual(117)) {
+    if (this.isContextual(121)) {
       if (this.parseClassMemberFromModifier(classBody, member)) {
         return;
       }
@@ -8998,7 +9107,7 @@ var flow = superClass => class extends superClass {
       }, fullWord);
     }
 
-    this.finishToken(124, fullWord);
+    this.finishToken(128, fullWord);
   }
 
   getTokenFromCode(code) {
@@ -9007,14 +9116,14 @@ 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 ? 46 : 45, 1);
+      return this.finishOp(code === 62 ? 48 : 47, 1);
     } else if (this.state.inType && code === 63) {
       if (next === 46) {
         return this.finishOp(18, 2);
       }
 
       return this.finishOp(17, 1);
-    } else if (isIteratorStart(code, next)) {
+    } else if (isIteratorStart(code, next, this.input.charCodeAt(this.state.pos + 2))) {
       this.state.pos += 2;
       return this.readIterator();
     } else {
@@ -9105,7 +9214,7 @@ var flow = superClass => class extends superClass {
   }
 
   isClassMethod() {
-    return this.match(45) || super.isClassMethod();
+    return this.match(47) || super.isClassMethod();
   }
 
   isClassProperty() {
@@ -9123,7 +9232,7 @@ var flow = superClass => class extends superClass {
 
     delete method.variance;
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       method.typeParameters = this.flowParseTypeParameterDeclaration();
     }
 
@@ -9155,7 +9264,7 @@ var flow = superClass => class extends superClass {
 
     delete method.variance;
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       method.typeParameters = this.flowParseTypeParameterDeclaration();
     }
 
@@ -9165,11 +9274,11 @@ var flow = superClass => class extends superClass {
   parseClassSuper(node) {
     super.parseClassSuper(node);
 
-    if (node.superClass && this.match(45)) {
+    if (node.superClass && this.match(47)) {
       node.superTypeParameters = this.flowParseTypeParameterInstantiation();
     }
 
-    if (this.isContextual(106)) {
+    if (this.isContextual(110)) {
       this.next();
       var implemented = node.implements = [];
 
@@ -9178,7 +9287,7 @@ var flow = superClass => class extends superClass {
 
         _node3.id = this.flowParseRestrictedIdentifier(true);
 
-        if (this.match(45)) {
+        if (this.match(47)) {
           _node3.typeParameters = this.flowParseTypeParameterInstantiation();
         } else {
           _node3.typeParameters = null;
@@ -9220,7 +9329,7 @@ var flow = superClass => class extends superClass {
     delete prop.variance;
     var typeParameters;
 
-    if (this.match(45) && !isAccessor) {
+    if (this.match(47) && !isAccessor) {
       typeParameters = this.flowParseTypeParameterDeclaration();
       if (!this.match(10)) this.unexpected();
     }
@@ -9297,9 +9406,9 @@ var flow = superClass => class extends superClass {
     node.importKind = "value";
     var kind = null;
 
-    if (this.match(83)) {
+    if (this.match(87)) {
       kind = "typeof";
-    } else if (this.isContextual(122)) {
+    } else if (this.isContextual(126)) {
       kind = "type";
     }
 
@@ -9309,11 +9418,11 @@ var flow = superClass => class extends superClass {
         type
       } = lh;
 
-      if (kind === "type" && type === 51) {
+      if (kind === "type" && type === 55) {
         this.unexpected(null, lh.type);
       }
 
-      if (isMaybeDefaultImport(type) || type === 5 || type === 51) {
+      if (isMaybeDefaultImport(type) || type === 5 || type === 55) {
         this.next();
         node.importKind = kind;
       }
@@ -9336,7 +9445,7 @@ var flow = superClass => class extends superClass {
 
     var isBinding = false;
 
-    if (this.isContextual(89) && !this.isLookaheadContextual("as")) {
+    if (this.isContextual(93) && !this.isLookaheadContextual("as")) {
       var as_ident = this.parseIdentifier(true);
 
       if (specifierTypeKind !== null && !tokenIsKeywordOrIdentifier(this.state.type)) {
@@ -9363,7 +9472,7 @@ var flow = superClass => class extends superClass {
         specifier.importKind = null;
       }
 
-      if (this.eatContextual(89)) {
+      if (this.eatContextual(93)) {
         specifier.local = this.parseIdentifier();
       } else {
         isBinding = true;
@@ -9393,7 +9502,7 @@ var flow = superClass => class extends superClass {
 
   parseBindingAtom() {
     switch (this.state.type) {
-      case 74:
+      case 78:
         return this.parseIdentifier(true);
 
       default:
@@ -9404,7 +9513,7 @@ var flow = superClass => class extends superClass {
   parseFunctionParams(node, allowModifiers) {
     var kind = node.kind;
 
-    if (kind !== "get" && kind !== "set" && this.match(45)) {
+    if (kind !== "get" && kind !== "set" && this.match(47)) {
       node.typeParameters = this.flowParseTypeParameterDeclaration();
     }
 
@@ -9441,7 +9550,7 @@ var flow = superClass => class extends superClass {
     var state = null;
     var jsx;
 
-    if (this.hasPlugin("jsx") && (this.match(134) || this.match(45))) {
+    if (this.hasPlugin("jsx") && (this.match(138) || this.match(47))) {
       state = this.state.clone();
       jsx = this.tryParse(() => super.parseMaybeAssign(refExpressionErrors, afterLeftParse), state);
       if (!jsx.error) return jsx.node;
@@ -9455,7 +9564,7 @@ var flow = superClass => class extends superClass {
       }
     }
 
-    if ((_jsx = jsx) != null && _jsx.error || this.match(45)) {
+    if ((_jsx = jsx) != null && _jsx.error || this.match(47)) {
       var _jsx2, _jsx3;
 
       state = state || this.state.clone();
@@ -9571,7 +9680,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(45)) {
+    } else if (base.type === "Identifier" && base.name === "async" && this.match(47)) {
       var state = this.state.clone();
       var arrow = this.tryParse(abort => this.parseAsyncArrowWithTypeParameters(startPos, startLoc) || abort(), state);
       if (!arrow.error && !arrow.aborted) return arrow.node;
@@ -9611,7 +9720,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(45)) {
+    } else if (!noCalls && this.shouldParseTypes() && this.match(47)) {
       var _node4 = this.startNodeAt(startPos, startLoc);
 
       _node4.callee = base;
@@ -9635,7 +9744,7 @@ var flow = superClass => class extends superClass {
   parseNewArguments(node) {
     var targs = null;
 
-    if (this.shouldParseTypes() && this.match(45)) {
+    if (this.shouldParseTypes() && this.match(47)) {
       targs = this.tryParse(() => this.flowParseTypeParameterInstantiationCallOrNew()).node;
     }
 
@@ -9810,7 +9919,7 @@ var flow = superClass => class extends superClass {
     var endOfInit = () => this.match(12) || this.match(8);
 
     switch (this.state.type) {
-      case 126:
+      case 130:
         {
           var literal = this.parseNumericLiteral(this.state.value);
 
@@ -9828,7 +9937,7 @@ var flow = superClass => class extends superClass {
           };
         }
 
-      case 125:
+      case 129:
         {
           var _literal = this.parseStringLiteral(this.state.value);
 
@@ -9846,10 +9955,10 @@ var flow = superClass => class extends superClass {
           };
         }
 
-      case 81:
-      case 82:
+      case 85:
+      case 86:
         {
-          var _literal2 = this.parseBooleanLiteral(this.match(81));
+          var _literal2 = this.parseBooleanLiteral(this.match(85));
 
           if (endOfInit()) {
             return {
@@ -10042,7 +10151,7 @@ var flow = superClass => class extends superClass {
       enumName
     } = _ref15;
 
-    if (this.eatContextual(97)) {
+    if (this.eatContextual(101)) {
       if (!tokenIsIdentifier(this.state.type)) {
         throw this.flowEnumErrorInvalidExplicitType(this.state.startLoc, {
           enumName,
@@ -10495,14 +10604,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(134);
+              return this.finishToken(138);
             }
 
             return super.getTokenFromCode(ch);
           }
 
           out += this.input.slice(chunkStart, this.state.pos);
-          return this.finishToken(133, out);
+          return this.finishToken(137, out);
 
         case 38:
           out += this.input.slice(chunkStart, this.state.pos);
@@ -10570,7 +10679,7 @@ var jsx = superClass => class extends superClass {
     }
 
     out += this.input.slice(chunkStart, this.state.pos++);
-    return this.finishToken(125, out);
+    return this.finishToken(129, out);
   }
 
   jsxReadEntity() {
@@ -10624,13 +10733,13 @@ var jsx = superClass => class extends superClass {
       ch = this.input.charCodeAt(++this.state.pos);
     } while (isIdentifierChar(ch) || ch === 45);
 
-    return this.finishToken(132, this.input.slice(start, this.state.pos));
+    return this.finishToken(136, this.input.slice(start, this.state.pos));
   }
 
   jsxParseIdentifier() {
     var node = this.startNode();
 
-    if (this.match(132)) {
+    if (this.match(136)) {
       node.name = this.state.value;
     } else if (tokenIsKeyword(this.state.type)) {
       node.name = tokenLabelName(this.state.type);
@@ -10690,8 +10799,8 @@ var jsx = superClass => class extends superClass {
 
         return node;
 
-      case 134:
-      case 125:
+      case 138:
+      case 129:
         return this.parseExprAtom();
 
       default:
@@ -10702,7 +10811,7 @@ var jsx = superClass => class extends superClass {
   }
 
   jsxParseEmptyExpression() {
-    var node = this.startNodeAt(indexes.get(this.state.lastTokEndLoc), this.state.lastTokEndLoc);
+    var node = this.startNodeAt(this.state.lastTokEndLoc.index, this.state.lastTokEndLoc);
     return this.finishNodeAt(node, "JSXEmptyExpression", this.state.startLoc);
   }
 
@@ -10748,8 +10857,8 @@ var jsx = superClass => class extends superClass {
   jsxParseOpeningElementAt(startPos, startLoc) {
     var node = this.startNodeAt(startPos, startLoc);
 
-    if (this.match(135)) {
-      this.expect(135);
+    if (this.match(139)) {
+      this.expect(139);
       return this.finishNode(node, "JSXOpeningFragment");
     }
 
@@ -10760,26 +10869,26 @@ var jsx = superClass => class extends superClass {
   jsxParseOpeningElementAfterName(node) {
     var attributes = [];
 
-    while (!this.match(52) && !this.match(135)) {
+    while (!this.match(56) && !this.match(139)) {
       attributes.push(this.jsxParseAttribute());
     }
 
     node.attributes = attributes;
-    node.selfClosing = this.eat(52);
-    this.expect(135);
+    node.selfClosing = this.eat(56);
+    this.expect(139);
     return this.finishNode(node, "JSXOpeningElement");
   }
 
   jsxParseClosingElementAt(startPos, startLoc) {
     var node = this.startNodeAt(startPos, startLoc);
 
-    if (this.match(135)) {
-      this.expect(135);
+    if (this.match(139)) {
+      this.expect(139);
       return this.finishNode(node, "JSXClosingFragment");
     }
 
     node.name = this.jsxParseElementName();
-    this.expect(135);
+    this.expect(139);
     return this.finishNode(node, "JSXClosingElement");
   }
 
@@ -10792,12 +10901,12 @@ var jsx = superClass => class extends superClass {
     if (!openingElement.selfClosing) {
       contents: for (;;) {
         switch (this.state.type) {
-          case 134:
+          case 138:
             startPos = this.state.start;
             startLoc = this.state.startLoc;
             this.next();
 
-            if (this.eat(52)) {
+            if (this.eat(56)) {
               closingElement = this.jsxParseClosingElementAt(startPos, startLoc);
               break contents;
             }
@@ -10805,7 +10914,7 @@ var jsx = superClass => class extends superClass {
             children.push(this.jsxParseElementAt(startPos, startLoc));
             break;
 
-          case 133:
+          case 137:
             children.push(this.parseExprAtom());
             break;
 
@@ -10857,7 +10966,7 @@ var jsx = superClass => class extends superClass {
 
     node.children = children;
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       throw this.raise(JsxErrors.UnwrappedAdjacentJSXElements, {
         at: this.state.startLoc
       });
@@ -10881,12 +10990,12 @@ var jsx = superClass => class extends superClass {
   }
 
   parseExprAtom(refExpressionErrors) {
-    if (this.match(133)) {
+    if (this.match(137)) {
       return this.parseLiteral(this.state.value, "JSXText");
-    } else if (this.match(134)) {
+    } else if (this.match(138)) {
       return this.jsxParseElement();
-    } else if (this.match(45) && this.input.charCodeAt(this.state.pos) !== 33) {
-      this.replaceToken(134);
+    } else if (this.match(47) && this.input.charCodeAt(this.state.pos) !== 33) {
+      this.replaceToken(138);
       return this.jsxParseElement();
     } else {
       return super.parseExprAtom(refExpressionErrors);
@@ -10912,7 +11021,7 @@ var jsx = superClass => class extends superClass {
 
       if (code === 62) {
         ++this.state.pos;
-        return this.finishToken(135);
+        return this.finishToken(139);
       }
 
       if ((code === 34 || code === 39) && context === types.j_oTag) {
@@ -10922,7 +11031,7 @@ 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(134);
+      return this.finishToken(138);
     }
 
     return super.getTokenFromCode(code);
@@ -10934,15 +11043,15 @@ var jsx = superClass => class extends superClass {
       type
     } = this.state;
 
-    if (type === 52 && prevType === 134) {
+    if (type === 56 && prevType === 138) {
       context.splice(-2, 2, types.j_cTag);
       this.state.canStartJSXElement = false;
-    } else if (type === 134) {
+    } else if (type === 138) {
       context.push(types.j_oTag);
-    } else if (type === 135) {
+    } else if (type === 139) {
       var out = context[context.length - 1];
 
-      if (out === types.j_oTag && prevType === 52 || out === types.j_cTag) {
+      if (out === types.j_oTag && prevType === 56 || out === types.j_cTag) {
         context.pop();
         this.state.canStartJSXElement = context[context.length - 1] === types.j_expr;
       } else {
@@ -11158,7 +11267,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsTokenCanFollowModifier() {
-    return (this.match(0) || this.match(5) || this.match(51) || this.match(21) || this.match(130) || this.isLiteralPropertyName()) && !this.hasPrecedingLineBreak();
+    return (this.match(0) || this.match(5) || this.match(55) || this.match(21) || this.match(134) || this.isLiteralPropertyName()) && !this.hasPrecedingLineBreak();
   }
 
   tsNextTokenCanFollowModifier() {
@@ -11259,7 +11368,7 @@ var typescript = superClass => class extends superClass {
         return this.match(3);
 
       case "TypeParametersOrArguments":
-        return this.match(46);
+        return this.match(48);
     }
 
     throw new Error("Unreachable");
@@ -11325,7 +11434,7 @@ var typescript = superClass => class extends superClass {
       if (bracket) {
         this.expect(0);
       } else {
-        this.expect(45);
+        this.expect(47);
       }
     }
 
@@ -11334,7 +11443,7 @@ var typescript = superClass => class extends superClass {
     if (bracket) {
       this.expect(3);
     } else {
-      this.expect(46);
+      this.expect(48);
     }
 
     return result;
@@ -11342,10 +11451,10 @@ var typescript = superClass => class extends superClass {
 
   tsParseImportType() {
     var node = this.startNode();
-    this.expect(79);
+    this.expect(83);
     this.expect(10);
 
-    if (!this.match(125)) {
+    if (!this.match(129)) {
       this.raise(TSErrors.UnsupportedImportTypeArgument, {
         at: this.state.startLoc
       });
@@ -11358,7 +11467,7 @@ var typescript = superClass => class extends superClass {
       node.qualifier = this.tsParseEntityName(true);
     }
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       node.typeParameters = this.tsParseTypeArguments();
     }
 
@@ -11382,7 +11491,7 @@ var typescript = superClass => class extends superClass {
     var node = this.startNode();
     node.typeName = this.tsParseEntityName(false);
 
-    if (!this.hasPrecedingLineBreak() && this.match(45)) {
+    if (!this.hasPrecedingLineBreak() && this.match(47)) {
       node.typeParameters = this.tsParseTypeArguments();
     }
 
@@ -11406,9 +11515,9 @@ var typescript = superClass => class extends superClass {
 
   tsParseTypeQuery() {
     var node = this.startNode();
-    this.expect(83);
+    this.expect(87);
 
-    if (this.match(79)) {
+    if (this.match(83)) {
       node.exprName = this.tsParseImportType();
     } else {
       node.exprName = this.tsParseEntityName(true);
@@ -11420,13 +11529,13 @@ var typescript = superClass => class extends superClass {
   tsParseTypeParameter() {
     var node = this.startNode();
     node.name = this.tsParseTypeParameterName();
-    node.constraint = this.tsEatThenParseType(77);
+    node.constraint = this.tsEatThenParseType(81);
     node.default = this.tsEatThenParseType(29);
     return this.finishNode(node, "TSTypeParameter");
   }
 
   tsTryParseTypeParameters() {
-    if (this.match(45)) {
+    if (this.match(47)) {
       return this.tsParseTypeParameters();
     }
   }
@@ -11434,7 +11543,7 @@ var typescript = superClass => class extends superClass {
   tsParseTypeParameters() {
     var node = this.startNode();
 
-    if (this.match(45) || this.match(134)) {
+    if (this.match(47) || this.match(138)) {
       this.next();
     } else {
       this.unexpected();
@@ -11459,7 +11568,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsTryNextParseConstantContext() {
-    if (this.lookahead().type === 71) {
+    if (this.lookahead().type === 75) {
       this.next();
       return this.tsParseTypeReference();
     }
@@ -11538,7 +11647,7 @@ var typescript = superClass => class extends superClass {
     if (this.eat(17)) node.optional = true;
     var nodeAny = node;
 
-    if (this.match(10) || this.match(45)) {
+    if (this.match(10) || this.match(47)) {
       if (readonly) {
         this.raise(TSErrors.ReadonlyForMethodSignature, {
           node
@@ -11547,7 +11656,7 @@ var typescript = superClass => class extends superClass {
 
       var method = nodeAny;
 
-      if (method.kind && this.match(45)) {
+      if (method.kind && this.match(47)) {
         this.raise(TSErrors.AccesorCannotHaveTypeParameters, {
           at: this.state.curPosition()
         });
@@ -11620,15 +11729,15 @@ var typescript = superClass => class extends superClass {
   tsParseTypeMember() {
     var node = this.startNode();
 
-    if (this.match(10) || this.match(45)) {
+    if (this.match(10) || this.match(47)) {
       return this.tsParseSignatureMember("TSCallSignatureDeclaration", node);
     }
 
-    if (this.match(73)) {
+    if (this.match(77)) {
       var id = this.startNode();
       this.next();
 
-      if (this.match(10) || this.match(45)) {
+      if (this.match(10) || this.match(47)) {
         return this.tsParseSignatureMember("TSConstructSignatureDeclaration", node);
       } else {
         node.key = this.createIdentifier(id, "new");
@@ -11669,11 +11778,11 @@ var typescript = superClass => class extends superClass {
   tsIsStartOfMappedType() {
     this.next();
 
-    if (this.eat(49)) {
-      return this.isContextual(114);
+    if (this.eat(53)) {
+      return this.isContextual(118);
     }
 
-    if (this.isContextual(114)) {
+    if (this.isContextual(118)) {
       this.next();
     }
 
@@ -11688,13 +11797,13 @@ var typescript = superClass => class extends superClass {
     }
 
     this.next();
-    return this.match(54);
+    return this.match(58);
   }
 
   tsParseMappedTypeParameter() {
     var node = this.startNode();
     node.name = this.tsParseTypeParameterName();
-    node.constraint = this.tsExpectThenParseType(54);
+    node.constraint = this.tsExpectThenParseType(58);
     return this.finishNode(node, "TSTypeParameter");
   }
 
@@ -11702,20 +11811,20 @@ var typescript = superClass => class extends superClass {
     var node = this.startNode();
     this.expect(5);
 
-    if (this.match(49)) {
+    if (this.match(53)) {
       node.readonly = this.state.value;
       this.next();
-      this.expectContextual(114);
-    } else if (this.eatContextual(114)) {
+      this.expectContextual(118);
+    } else if (this.eatContextual(118)) {
       node.readonly = true;
     }
 
     this.expect(0);
     node.typeParameter = this.tsParseMappedTypeParameter();
-    node.nameType = this.eatContextual(89) ? this.tsParseType() : null;
+    node.nameType = this.eatContextual(93) ? this.tsParseType() : null;
     this.expect(3);
 
-    if (this.match(49)) {
+    if (this.match(53)) {
       node.optional = this.state.value;
       this.next();
       this.expect(17);
@@ -11832,11 +11941,11 @@ var typescript = superClass => class extends superClass {
 
     node.literal = (() => {
       switch (this.state.type) {
-        case 126:
-        case 127:
-        case 125:
-        case 81:
-        case 82:
+        case 130:
+        case 131:
+        case 129:
+        case 85:
+        case 86:
           return this.parseExprAtom();
 
         default:
@@ -11861,7 +11970,7 @@ var typescript = superClass => class extends superClass {
   tsParseThisTypeOrThisTypePredicate() {
     var thisKeyword = this.tsParseThisTypeNode();
 
-    if (this.isContextual(109) && !this.hasPrecedingLineBreak()) {
+    if (this.isContextual(113) && !this.hasPrecedingLineBreak()) {
       return this.tsParseThisTypePredicate(thisKeyword);
     } else {
       return thisKeyword;
@@ -11870,19 +11979,19 @@ var typescript = superClass => class extends superClass {
 
   tsParseNonArrayType() {
     switch (this.state.type) {
-      case 125:
-      case 126:
-      case 127:
-      case 81:
-      case 82:
+      case 129:
+      case 130:
+      case 131:
+      case 85:
+      case 86:
         return this.tsParseLiteralTypeNode();
 
-      case 49:
+      case 53:
         if (this.state.value === "-") {
           var node = this.startNode();
           var nextToken = this.lookahead();
 
-          if (nextToken.type !== 126 && nextToken.type !== 127) {
+          if (nextToken.type !== 130 && nextToken.type !== 131) {
             throw this.unexpected();
           }
 
@@ -11892,13 +12001,13 @@ var typescript = superClass => class extends superClass {
 
         break;
 
-      case 74:
+      case 78:
         return this.tsParseThisTypeOrThisTypePredicate();
 
-      case 83:
+      case 87:
         return this.tsParseTypeQuery();
 
-      case 79:
+      case 83:
         return this.tsParseImportType();
 
       case 5:
@@ -11920,8 +12029,8 @@ var typescript = superClass => class extends superClass {
             type
           } = this.state;
 
-          if (tokenIsIdentifier(type) || type === 84 || type === 80) {
-            var nodeType = type === 84 ? "TSVoidKeyword" : type === 80 ? "TSNullKeyword" : keywordTypeFromName(this.state.value);
+          if (tokenIsIdentifier(type) || type === 88 || type === 84) {
+            var nodeType = type === 88 ? "TSVoidKeyword" : type === 84 ? "TSNullKeyword" : keywordTypeFromName(this.state.value);
 
             if (nodeType !== undefined && this.lookaheadCharCode() !== 46) {
               var _node6 = this.startNode();
@@ -11989,7 +12098,7 @@ var typescript = superClass => class extends superClass {
 
   tsParseInferType() {
     var node = this.startNode();
-    this.expectContextual(108);
+    this.expectContextual(112);
     var typeParameter = this.startNode();
     typeParameter.name = this.tsParseTypeParameterName();
     node.typeParameter = this.finishNode(typeParameter, "TSTypeParameter");
@@ -11998,7 +12107,7 @@ var typescript = superClass => class extends superClass {
 
   tsParseTypeOperatorOrHigher() {
     var isTypeOperator = tokenIsTSTypeOperator(this.state.type) && !this.state.containsEsc;
-    return isTypeOperator ? this.tsParseTypeOperator() : this.isContextual(108) ? this.tsParseInferType() : this.tsParseArrayTypeOrHigher();
+    return isTypeOperator ? this.tsParseTypeOperator() : this.isContextual(112) ? this.tsParseInferType() : this.tsParseArrayTypeOrHigher();
   }
 
   tsParseUnionOrIntersectionType(kind, parseConstituentType, operator) {
@@ -12019,15 +12128,15 @@ var typescript = superClass => class extends superClass {
   }
 
   tsParseIntersectionTypeOrHigher() {
-    return this.tsParseUnionOrIntersectionType("TSIntersectionType", this.tsParseTypeOperatorOrHigher.bind(this), 43);
+    return this.tsParseUnionOrIntersectionType("TSIntersectionType", this.tsParseTypeOperatorOrHigher.bind(this), 45);
   }
 
   tsParseUnionTypeOrHigher() {
-    return this.tsParseUnionOrIntersectionType("TSUnionType", this.tsParseIntersectionTypeOrHigher.bind(this), 41);
+    return this.tsParseUnionOrIntersectionType("TSUnionType", this.tsParseIntersectionTypeOrHigher.bind(this), 43);
   }
 
   tsIsStartOfFunctionType() {
-    if (this.match(45)) {
+    if (this.match(47)) {
       return true;
     }
 
@@ -12035,7 +12144,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsSkipParameterStart() {
-    if (tokenIsIdentifier(this.state.type) || this.match(74)) {
+    if (tokenIsIdentifier(this.state.type) || this.match(78)) {
       this.next();
       return true;
     }
@@ -12108,7 +12217,7 @@ var typescript = superClass => class extends superClass {
       var node = this.startNode();
       var asserts = !!this.tsTryParse(this.tsParseTypePredicateAsserts.bind(this));
 
-      if (asserts && this.match(74)) {
+      if (asserts && this.match(78)) {
         var thisTypePredicate = this.tsParseThisTypeOrThisTypePredicate();
 
         if (thisTypePredicate.type === "TSThisType") {
@@ -12163,21 +12272,21 @@ var typescript = superClass => class extends superClass {
   tsParseTypePredicatePrefix() {
     var id = this.parseIdentifier();
 
-    if (this.isContextual(109) && !this.hasPrecedingLineBreak()) {
+    if (this.isContextual(113) && !this.hasPrecedingLineBreak()) {
       this.next();
       return id;
     }
   }
 
   tsParseTypePredicateAsserts() {
-    if (this.state.type !== 102) {
+    if (this.state.type !== 106) {
       return false;
     }
 
     var containsEsc = this.state.containsEsc;
     this.next();
 
-    if (!tokenIsIdentifier(this.state.type) && !this.match(74)) {
+    if (!tokenIsIdentifier(this.state.type) && !this.match(78)) {
       return false;
     }
 
@@ -12204,7 +12313,7 @@ var typescript = superClass => class extends superClass {
     assert(this.state.inType);
     var type = this.tsParseNonConditionalType();
 
-    if (this.hasPrecedingLineBreak() || !this.eat(77)) {
+    if (this.hasPrecedingLineBreak() || !this.eat(81)) {
       return type;
     }
 
@@ -12219,7 +12328,7 @@ var typescript = superClass => class extends superClass {
   }
 
   isAbstractConstructorSignature() {
-    return this.isContextual(116) && this.lookahead().type === 73;
+    return this.isContextual(120) && this.lookahead().type === 77;
   }
 
   tsParseNonConditionalType() {
@@ -12227,7 +12336,7 @@ var typescript = superClass => class extends superClass {
       return this.tsParseFunctionOrConstructorType("TSFunctionType");
     }
 
-    if (this.match(73)) {
+    if (this.match(77)) {
       return this.tsParseFunctionOrConstructorType("TSConstructorType");
     } else if (this.isAbstractConstructorSignature()) {
       return this.tsParseFunctionOrConstructorType("TSConstructorType", true);
@@ -12248,7 +12357,7 @@ var typescript = superClass => class extends superClass {
     var _const = this.tsTryNextParseConstantContext();
 
     node.typeAnnotation = _const || this.tsNextThenParseType();
-    this.expect(46);
+    this.expect(48);
     node.expression = this.parseMaybeUnary();
     return this.finishNode(node, "TSTypeAssertion");
   }
@@ -12270,7 +12379,7 @@ var typescript = superClass => class extends superClass {
     var node = this.startNode();
     node.expression = this.tsParseEntityName(false);
 
-    if (this.match(45)) {
+    if (this.match(47)) {
       node.typeParameters = this.tsParseTypeArguments();
     }
 
@@ -12290,7 +12399,7 @@ var typescript = superClass => class extends superClass {
 
     node.typeParameters = this.tsTryParseTypeParameters();
 
-    if (this.eat(77)) {
+    if (this.eat(81)) {
       node.extends = this.tsParseHeritageClause("extends");
     }
 
@@ -12307,7 +12416,7 @@ var typescript = superClass => class extends superClass {
     node.typeAnnotation = this.tsInType(() => {
       this.expect(29);
 
-      if (this.isContextual(107) && this.lookahead().type !== 16) {
+      if (this.isContextual(111) && this.lookahead().type !== 16) {
         var _node8 = this.startNode();
 
         this.next();
@@ -12363,7 +12472,7 @@ var typescript = superClass => class extends superClass {
 
   tsParseEnumMember() {
     var node = this.startNode();
-    node.id = this.match(125) ? this.parseExprAtom() : this.parseIdentifier(true);
+    node.id = this.match(129) ? this.parseExprAtom() : this.parseIdentifier(true);
 
     if (this.eat(29)) {
       node.initializer = this.parseMaybeAssignAllowIn();
@@ -12415,10 +12524,10 @@ var typescript = superClass => class extends superClass {
   }
 
   tsParseAmbientExternalModuleDeclaration(node) {
-    if (this.isContextual(105)) {
+    if (this.isContextual(109)) {
       node.global = true;
       node.id = this.parseIdentifier();
-    } else if (this.match(125)) {
+    } else if (this.match(129)) {
       node.id = this.parseExprAtom();
     } else {
       this.unexpected();
@@ -12456,7 +12565,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsIsExternalModuleReference() {
-    return this.isContextual(112) && this.lookaheadCharCode() === 40;
+    return this.isContextual(116) && this.lookaheadCharCode() === 40;
   }
 
   tsParseModuleReference() {
@@ -12465,10 +12574,10 @@ var typescript = superClass => class extends superClass {
 
   tsParseExternalModuleReference() {
     var node = this.startNode();
-    this.expectContextual(112);
+    this.expectContextual(116);
     this.expect(10);
 
-    if (!this.match(125)) {
+    if (!this.match(129)) {
       throw this.unexpected();
     }
 
@@ -12511,33 +12620,33 @@ var typescript = superClass => class extends superClass {
     var starttype = this.state.type;
     var kind;
 
-    if (this.isContextual(95)) {
-      starttype = 70;
+    if (this.isContextual(99)) {
+      starttype = 74;
       kind = "let";
     }
 
     return this.tsInAmbientContext(() => {
       switch (starttype) {
-        case 64:
+        case 68:
           nany.declare = true;
           return this.parseFunctionStatement(nany, false, true);
 
-        case 76:
+        case 80:
           nany.declare = true;
           return this.parseClass(nany, true, false);
 
-        case 71:
-          if (this.match(71) && this.isLookaheadContextual("enum")) {
-            this.expect(71);
-            this.expectContextual(118);
+        case 75:
+          if (this.match(75) && this.isLookaheadContextual("enum")) {
+            this.expect(75);
+            this.expectContextual(122);
             return this.tsParseEnumDeclaration(nany, true);
           }
 
-        case 70:
+        case 74:
           kind = kind || this.state.value;
           return this.parseVarStatement(nany, kind);
 
-        case 105:
+        case 109:
           return this.tsParseAmbientExternalModuleDeclaration(nany);
 
         default:
@@ -12591,7 +12700,7 @@ var typescript = superClass => class extends superClass {
   tsParseDeclaration(node, value, next) {
     switch (value) {
       case "abstract":
-        if (this.tsCheckLineTerminator(next) && (this.match(76) || tokenIsIdentifier(this.state.type))) {
+        if (this.tsCheckLineTerminator(next) && (this.match(80) || tokenIsIdentifier(this.state.type))) {
           return this.tsParseAbstractDeclaration(node);
         }
 
@@ -12614,7 +12723,7 @@ var typescript = superClass => class extends superClass {
 
       case "module":
         if (this.tsCheckLineTerminator(next)) {
-          if (this.match(125)) {
+          if (this.match(129)) {
             return this.tsParseAmbientExternalModuleDeclaration(node);
           } else if (tokenIsIdentifier(this.state.type)) {
             return this.tsParseModuleOrNamespaceDeclaration(node);
@@ -12650,7 +12759,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsTryParseGenericAsyncArrowFunction(startPos, startLoc) {
-    if (!this.match(45)) {
+    if (!this.match(47)) {
       return undefined;
     }
 
@@ -12673,10 +12782,18 @@ var typescript = superClass => class extends superClass {
     return this.parseArrowExpression(res, null, true);
   }
 
+  tsParseTypeArgumentsInExpression() {
+    if (this.reScan_lt() !== 47) {
+      return undefined;
+    }
+
+    return this.tsParseTypeArguments();
+  }
+
   tsParseTypeArguments() {
     var node = this.startNode();
     node.params = this.tsInType(() => this.tsInNoContext(() => {
-      this.expect(45);
+      this.expect(47);
       return this.tsParseDelimitedList("TypeParametersOrArguments", this.tsParseType.bind(this));
     }));
 
@@ -12686,7 +12803,7 @@ var typescript = superClass => class extends superClass {
       });
     }
 
-    this.expect(46);
+    this.expect(48);
     return this.finishNode(node, "TSTypeParameterInstantiation");
   }
 
@@ -12834,7 +12951,7 @@ var typescript = superClass => class extends superClass {
       this.next();
     }
 
-    if (this.match(45)) {
+    if (this.match(47) || this.match(51)) {
       var missingParenErrorLoc;
       var result = this.tsTryParseAndCatch(() => {
         if (!noCalls && this.atPossibleAsyncArrow(base)) {
@@ -12847,7 +12964,7 @@ var typescript = superClass => class extends superClass {
 
         var node = this.startNodeAt(startPos, startLoc);
         node.callee = base;
-        var typeArguments = this.tsParseTypeArguments();
+        var typeArguments = this.tsParseTypeArgumentsInExpression();
 
         if (typeArguments) {
           if (isOptionalCall && !this.match(10)) {
@@ -12887,9 +13004,9 @@ var typescript = superClass => class extends superClass {
   }
 
   parseNewArguments(node) {
-    if (this.match(45)) {
+    if (this.match(47) || this.match(51)) {
       var typeParameters = this.tsTryParseAndCatch(() => {
-        var args = this.tsParseTypeArguments();
+        var args = this.tsParseTypeArgumentsInExpression();
         if (!this.match(10)) this.unexpected();
         return args;
       });
@@ -12903,7 +13020,7 @@ var typescript = superClass => class extends superClass {
   }
 
   parseExprOp(left, leftStartPos, leftStartLoc, minPrec) {
-    if (tokenOperatorPrecedence(54) > minPrec && !this.hasPrecedingLineBreak() && this.isContextual(89)) {
+    if (tokenOperatorPrecedence(58) > minPrec && !this.hasPrecedingLineBreak() && this.isContextual(93)) {
       var node = this.startNodeAt(leftStartPos, leftStartLoc);
       node.expression = left;
 
@@ -12930,10 +13047,10 @@ var typescript = superClass => class extends superClass {
   parseImport(node) {
     node.importKind = "value";
 
-    if (tokenIsIdentifier(this.state.type) || this.match(51) || this.match(5)) {
+    if (tokenIsIdentifier(this.state.type) || this.match(55) || this.match(5)) {
       var ahead = this.lookahead();
 
-      if (this.isContextual(122) && ahead.type !== 12 && ahead.type !== 93 && ahead.type !== 29) {
+      if (this.isContextual(126) && ahead.type !== 12 && ahead.type !== 97 && ahead.type !== 29) {
         node.importKind = "type";
         this.next();
         ahead = this.lookahead();
@@ -12956,10 +13073,10 @@ var typescript = superClass => class extends superClass {
   }
 
   parseExport(node) {
-    if (this.match(79)) {
+    if (this.match(83)) {
       this.next();
 
-      if (this.isContextual(122) && this.lookaheadCharCode() !== 61) {
+      if (this.isContextual(126) && this.lookaheadCharCode() !== 61) {
         node.importKind = "type";
         this.next();
       } else {
@@ -12972,14 +13089,14 @@ var typescript = superClass => class extends superClass {
       assign.expression = this.parseExpression();
       this.semicolon();
       return this.finishNode(assign, "TSExportAssignment");
-    } else if (this.eatContextual(89)) {
+    } else if (this.eatContextual(93)) {
       var decl = node;
-      this.expectContextual(120);
+      this.expectContextual(124);
       decl.id = this.parseIdentifier();
       this.semicolon();
       return this.finishNode(decl, "TSNamespaceExportDeclaration");
     } else {
-      if (this.isContextual(122) && this.lookahead().type === 5) {
+      if (this.isContextual(126) && this.lookahead().type === 5) {
         this.next();
         node.exportKind = "type";
       } else {
@@ -12991,7 +13108,7 @@ var typescript = superClass => class extends superClass {
   }
 
   isAbstractClass() {
-    return this.isContextual(116) && this.lookahead().type === 76;
+    return this.isContextual(120) && this.lookahead().type === 80;
   }
 
   parseExportDefaultExpression() {
@@ -13003,7 +13120,7 @@ var typescript = superClass => class extends superClass {
       return cls;
     }
 
-    if (this.match(121)) {
+    if (this.match(125)) {
       var interfaceNode = this.startNode();
       this.next();
       var result = this.tsParseInterfaceDeclaration(interfaceNode);
@@ -13014,13 +13131,13 @@ var typescript = superClass => class extends superClass {
   }
 
   parseStatementContent(context, topLevel) {
-    if (this.state.type === 71) {
+    if (this.state.type === 75) {
       var ahead = this.lookahead();
 
-      if (ahead.type === 118) {
+      if (ahead.type === 122) {
         var node = this.startNode();
         this.next();
-        this.expectContextual(118);
+        this.expectContextual(122);
         return this.tsParseEnumDeclaration(node, true);
       }
     }
@@ -13043,7 +13160,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsIsStartOfStaticBlocks() {
-    return this.isContextual(100) && this.lookaheadCharCode() === 123;
+    return this.isContextual(104) && this.lookaheadCharCode() === 123;
   }
 
   parseClassMember(classBody, member, state) {
@@ -13191,9 +13308,9 @@ var typescript = superClass => class extends superClass {
   parseExportDeclaration(node) {
     var startPos = this.state.start;
     var startLoc = this.state.startLoc;
-    var isDeclare = this.eatContextual(117);
+    var isDeclare = this.eatContextual(121);
 
-    if (isDeclare && (this.isContextual(117) || !this.shouldParseExportDeclaration())) {
+    if (isDeclare && (this.isContextual(121) || !this.shouldParseExportDeclaration())) {
       throw this.raise(TSErrors.ExpectedAmbientAfterExportDeclare, {
         at: this.state.startLoc
       });
@@ -13222,7 +13339,7 @@ var typescript = superClass => class extends superClass {
   }
 
   parseClassId(node, isStatement, optionalId) {
-    if ((!isStatement || optionalId) && this.isContextual(106)) {
+    if ((!isStatement || optionalId) && this.isContextual(110)) {
       return;
     }
 
@@ -13312,11 +13429,11 @@ var typescript = superClass => class extends superClass {
   parseClassSuper(node) {
     super.parseClassSuper(node);
 
-    if (node.superClass && this.match(45)) {
-      node.superTypeParameters = this.tsParseTypeArguments();
+    if (node.superClass && (this.match(47) || this.match(51))) {
+      node.superTypeParameters = this.tsParseTypeArgumentsInExpression();
     }
 
-    if (this.eatContextual(106)) {
+    if (this.eatContextual(110)) {
       node.implements = this.tsParseHeritageClause("implements");
     }
   }
@@ -13372,7 +13489,7 @@ var typescript = superClass => class extends superClass {
     var jsx;
     var typeCast;
 
-    if (this.hasPlugin("jsx") && (this.match(134) || this.match(45))) {
+    if (this.hasPlugin("jsx") && (this.match(138) || this.match(47))) {
       state = this.state.clone();
       jsx = this.tryParse(() => super.parseMaybeAssign(...args), state);
       if (!jsx.error) return jsx.node;
@@ -13386,7 +13503,7 @@ var typescript = superClass => class extends superClass {
       }
     }
 
-    if (!((_jsx = jsx) != null && _jsx.error) && !this.match(45)) {
+    if (!((_jsx = jsx) != null && _jsx.error) && !this.match(47)) {
       return super.parseMaybeAssign(...args);
     }
 
@@ -13454,7 +13571,7 @@ var typescript = superClass => class extends superClass {
   }
 
   parseMaybeUnary(refExpressionErrors) {
-    if (!this.hasPlugin("jsx") && this.match(45)) {
+    if (!this.hasPlugin("jsx") && this.match(47)) {
       return this.tsParseTypeAssertion();
     } else {
       return super.parseMaybeUnary(refExpressionErrors);
@@ -13586,7 +13703,7 @@ var typescript = superClass => class extends superClass {
 
   parseBindingAtom() {
     switch (this.state.type) {
-      case 74:
+      case 78:
         return this.parseIdentifier(true);
 
       default:
@@ -13595,8 +13712,8 @@ var typescript = superClass => class extends superClass {
   }
 
   parseMaybeDecoratorArguments(expr) {
-    if (this.match(45)) {
-      var typeArguments = this.tsParseTypeArguments();
+    if (this.match(47) || this.match(51)) {
+      var typeArguments = this.tsParseTypeArgumentsInExpression();
 
       if (this.match(10)) {
         var call = super.parseMaybeDecoratorArguments(expr);
@@ -13620,7 +13737,7 @@ var typescript = superClass => class extends superClass {
   }
 
   isClassMethod() {
-    return this.match(45) || super.isClassMethod();
+    return this.match(47) || super.isClassMethod();
   }
 
   isClassProperty() {
@@ -13642,11 +13759,11 @@ var typescript = superClass => class extends superClass {
   getTokenFromCode(code) {
     if (this.state.inType) {
       if (code === 62) {
-        return this.finishOp(46, 1);
+        return this.finishOp(48, 1);
       }
 
       if (code === 60) {
-        return this.finishOp(45, 1);
+        return this.finishOp(47, 1);
       }
     }
 
@@ -13658,15 +13775,29 @@ var typescript = superClass => class extends superClass {
       type
     } = this.state;
 
-    if (type === 45) {
+    if (type === 47) {
       this.state.pos -= 1;
       this.readToken_lt();
-    } else if (type === 46) {
+    } else if (type === 48) {
       this.state.pos -= 1;
       this.readToken_gt();
     }
   }
 
+  reScan_lt() {
+    var {
+      type
+    } = this.state;
+
+    if (type === 51) {
+      this.state.pos -= 2;
+      this.finishOp(47, 1);
+      return 47;
+    }
+
+    return type;
+  }
+
   toAssignableList(exprList) {
     for (var i = 0; i < exprList.length; i++) {
       var expr = exprList[i];
@@ -13717,8 +13848,8 @@ var typescript = superClass => class extends superClass {
   }
 
   jsxParseOpeningElementAfterName(node) {
-    if (this.match(45)) {
-      var typeArguments = this.tsTryParseAndCatch(() => this.tsParseTypeArguments());
+    if (this.match(47) || this.match(51)) {
+      var typeArguments = this.tsTryParseAndCatch(() => this.tsParseTypeArgumentsInExpression());
       if (typeArguments) node.typeParameters = typeArguments;
     }
 
@@ -13772,10 +13903,10 @@ var typescript = superClass => class extends superClass {
   }
 
   tsParseAbstractDeclaration(node) {
-    if (this.match(76)) {
+    if (this.match(80)) {
       node.abstract = true;
       return this.parseClass(node, true, false);
-    } else if (this.isContextual(121)) {
+    } else if (this.isContextual(125)) {
       if (!this.hasFollowingLineBreak()) {
         node.abstract = true;
         this.raise(TSErrors.NonClassMethodPropertyHasAbstractModifer, {
@@ -13785,7 +13916,7 @@ var typescript = superClass => class extends superClass {
         return this.tsParseInterfaceDeclaration(node);
       }
     } else {
-      this.unexpected(null, 76);
+      this.unexpected(null, 80);
     }
   }
 
@@ -13862,10 +13993,10 @@ var typescript = superClass => class extends superClass {
     var canParseAsKeyword = true;
     var loc = leftOfAs.loc.start;
 
-    if (this.isContextual(89)) {
+    if (this.isContextual(93)) {
       var firstAs = this.parseIdentifier();
 
-      if (this.isContextual(89)) {
+      if (this.isContextual(93)) {
         var secondAs = this.parseIdentifier();
 
         if (tokenIsKeywordOrIdentifier(this.state.type)) {
@@ -13900,7 +14031,7 @@ var typescript = superClass => class extends superClass {
     var kindKey = isImport ? "importKind" : "exportKind";
     node[kindKey] = hasTypeSpecifier ? "type" : "value";
 
-    if (canParseAsKeyword && this.eatContextual(89)) {
+    if (canParseAsKeyword && this.eatContextual(93)) {
       node[rightOfAsKey] = isImport ? this.parseIdentifier() : this.parseModuleExportName();
     }
 
@@ -13921,13 +14052,13 @@ var PlaceholderErrors = makeErrorTemplates({
 
 var placeholders = superClass => class extends superClass {
   parsePlaceholder(expectedNode) {
-    if (this.match(136)) {
+    if (this.match(140)) {
       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(136);
+      this.expect(140);
       return this.finishPlaceholder(node, expectedNode);
     }
   }
@@ -13940,7 +14071,7 @@ var placeholders = superClass => class extends superClass {
 
   getTokenFromCode(code) {
     if (code === 37 && this.input.charCodeAt(this.state.pos + 1) === 37) {
-      return this.finishOp(136, 2);
+      return this.finishOp(140, 2);
     }
 
     return super.getTokenFromCode(...arguments);
@@ -13980,14 +14111,14 @@ var placeholders = superClass => class extends superClass {
       return true;
     }
 
-    if (!this.isContextual(95)) {
+    if (!this.isContextual(99)) {
       return false;
     }
 
     if (context) return false;
     var nextToken = this.lookahead();
 
-    if (nextToken.type === 136) {
+    if (nextToken.type === 140) {
       return true;
     }
 
@@ -14033,7 +14164,7 @@ var placeholders = superClass => class extends superClass {
     var placeholder = this.parsePlaceholder("Identifier");
 
     if (placeholder) {
-      if (this.match(77) || this.match(136) || this.match(5)) {
+      if (this.match(81) || this.match(140) || this.match(5)) {
         node.id = placeholder;
       } else if (optionalId || !isStatement) {
         node.id = null;
@@ -14057,7 +14188,7 @@ var placeholders = superClass => class extends superClass {
     var placeholder = this.parsePlaceholder("Identifier");
     if (!placeholder) return super.parseExport(...arguments);
 
-    if (!this.isContextual(93) && !this.match(12)) {
+    if (!this.isContextual(97) && !this.match(12)) {
       node.specifiers = [];
       node.source = null;
       node.declaration = this.finishPlaceholder(placeholder, "Declaration");
@@ -14072,11 +14203,11 @@ var placeholders = superClass => class extends superClass {
   }
 
   isExportDefaultSpecifier() {
-    if (this.match(61)) {
+    if (this.match(65)) {
       var next = this.nextTokenStart();
 
       if (this.isUnparsedContextual(next, "from")) {
-        if (this.input.startsWith(tokenLabelName(136), this.nextTokenStartSince(next + 4))) {
+        if (this.input.startsWith(tokenLabelName(140), this.nextTokenStartSince(next + 4))) {
           return true;
         }
       }
@@ -14111,7 +14242,7 @@ var placeholders = superClass => class extends superClass {
     if (!placeholder) return super.parseImport(...arguments);
     node.specifiers = [];
 
-    if (!this.isContextual(93) && !this.match(12)) {
+    if (!this.isContextual(97) && !this.match(12)) {
       node.source = this.finishPlaceholder(placeholder, "StringLiteral");
       this.semicolon();
       return this.finishNode(node, "ImportDeclaration");
@@ -14127,7 +14258,7 @@ var placeholders = superClass => class extends superClass {
       if (!hasStarImport) this.parseNamedImportSpecifiers(node);
     }
 
-    this.expectContextual(93);
+    this.expectContextual(97);
     node.source = this.parseImportSource();
     this.semicolon();
     return this.finishNode(node, "ImportDeclaration");
@@ -14141,7 +14272,7 @@ var placeholders = superClass => class extends superClass {
 
 var v8intrinsic = superClass => class extends superClass {
   parseV8Intrinsic() {
-    if (this.match(50)) {
+    if (this.match(54)) {
       var v8IntrinsicStartLoc = this.state.startLoc;
       var node = this.startNode();
       this.next();
@@ -14208,7 +14339,7 @@ function getPluginOption(plugins, name, option) {
 }
 
 var PIPELINE_PROPOSALS = ["minimal", "fsharp", "hack", "smart"];
-var TOPIC_TOKENS = ["^", "%", "#"];
+var TOPIC_TOKENS = ["^^", "@@", "^", "%", "#"];
 var RECORD_AND_TUPLE_SYNTAX_TYPES = ["hash", "bar"];
 
 function validatePlugins(plugins) {
@@ -14391,8 +14522,19 @@ class LValParser extends NodeUtils {
         break;
 
       case "ObjectProperty":
-        this.toAssignable(node.value, isLHS);
-        break;
+        {
+          var {
+            key,
+            value
+          } = node;
+
+          if (this.isPrivateName(key)) {
+            this.classScope.usePrivateName(this.getPrivateNameSV(key), key.loc.start);
+          }
+
+          this.toAssignable(value, isLHS);
+          break;
+        }
 
       case "SpreadElement":
         {
@@ -14632,6 +14774,10 @@ class LValParser extends NodeUtils {
 
     if (type === 21) {
       return this.parseBindingRestProperty(prop);
+    } else if (type === 134) {
+      this.expectPlugin("destructuringPrivate", startLoc);
+      this.classScope.usePrivateName(this.state.value, startLoc);
+      prop.key = this.parsePrivateName();
     } else {
       this.parsePropertyName(prop);
     }
@@ -14824,7 +14970,7 @@ class ExpressionParser extends LValParser {
     this.nextToken();
     var expr = this.parseExpression();
 
-    if (!this.match(131)) {
+    if (!this.match(135)) {
       this.unexpected();
     }
 
@@ -14885,7 +15031,7 @@ class ExpressionParser extends LValParser {
     var startPos = this.state.start;
     var startLoc = this.state.startLoc;
 
-    if (this.isContextual(101)) {
+    if (this.isContextual(105)) {
       if (this.prodParam.hasYield) {
         var _left2 = this.parseYield();
 
@@ -14928,13 +15074,18 @@ class ExpressionParser extends LValParser {
       if (this.match(29)) {
         node.left = this.toAssignable(left, true);
 
-        if (refExpressionErrors.doubleProtoLoc != null && indexes.get(refExpressionErrors.doubleProtoLoc) >= startPos) {
+        if (refExpressionErrors.doubleProtoLoc != null && refExpressionErrors.doubleProtoLoc.index >= startPos) {
           refExpressionErrors.doubleProtoLoc = null;
         }
 
-        if (refExpressionErrors.shorthandAssignLoc != null && indexes.get(refExpressionErrors.shorthandAssignLoc) >= startPos) {
+        if (refExpressionErrors.shorthandAssignLoc != null && refExpressionErrors.shorthandAssignLoc.index >= startPos) {
           refExpressionErrors.shorthandAssignLoc = null;
         }
+
+        if (refExpressionErrors.privateKeyLoc != null && refExpressionErrors.privateKeyLoc.index >= startPos) {
+          this.checkDestructuringPrivate(refExpressionErrors);
+          refExpressionErrors.privateKeyLoc = null;
+        }
       } else {
         node.left = left;
       }
@@ -14977,7 +15128,7 @@ class ExpressionParser extends LValParser {
   }
 
   parseMaybeUnaryOrPrivate(refExpressionErrors) {
-    return this.match(130) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
+    return this.match(134) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
   }
 
   parseExprOps(refExpressionErrors) {
@@ -14997,7 +15148,7 @@ class ExpressionParser extends LValParser {
     if (this.isPrivateName(left)) {
       var value = this.getPrivateNameSV(left);
 
-      if (minPrec >= tokenOperatorPrecedence(54) || !this.prodParam.hasIn || !this.match(54)) {
+      if (minPrec >= tokenOperatorPrecedence(58) || !this.prodParam.hasIn || !this.match(58)) {
         this.raise(ErrorMessages.PrivateInExpectedIn, {
           node: left
         }, value);
@@ -15008,11 +15159,11 @@ class ExpressionParser extends LValParser {
 
     var op = this.state.type;
 
-    if (tokenIsOperator(op) && (this.prodParam.hasIn || !this.match(54))) {
+    if (tokenIsOperator(op) && (this.prodParam.hasIn || !this.match(58))) {
       var prec = tokenOperatorPrecedence(op);
 
       if (prec > minPrec) {
-        if (op === 37) {
+        if (op === 39) {
           this.expectPlugin("pipelineOperator");
 
           if (this.state.inFSharpPipelineDirectBody) {
@@ -15025,19 +15176,19 @@ class ExpressionParser extends LValParser {
         var node = this.startNodeAt(leftStartPos, leftStartLoc);
         node.left = left;
         node.operator = this.state.value;
-        var logical = op === 39 || op === 40;
-        var coalesce = op === 38;
+        var logical = op === 41 || op === 42;
+        var coalesce = op === 40;
 
         if (coalesce) {
-          prec = tokenOperatorPrecedence(40);
+          prec = tokenOperatorPrecedence(42);
         }
 
         this.next();
 
-        if (op === 37 && this.hasPlugin(["pipelineOperator", {
+        if (op === 39 && this.hasPlugin(["pipelineOperator", {
           proposal: "minimal"
         }])) {
-          if (this.state.type === 92 && this.prodParam.hasAwait) {
+          if (this.state.type === 96 && this.prodParam.hasAwait) {
             throw this.raise(ErrorMessages.UnexpectedAwaitAfterPipelineBody, {
               at: this.state.startLoc
             });
@@ -15048,7 +15199,7 @@ class ExpressionParser extends LValParser {
         this.finishNode(node, logical || coalesce ? "LogicalExpression" : "BinaryExpression");
         var nextOp = this.state.type;
 
-        if (coalesce && (nextOp === 39 || nextOp === 40) || logical && nextOp === 38) {
+        if (coalesce && (nextOp === 41 || nextOp === 42) || logical && nextOp === 40) {
           throw this.raise(ErrorMessages.MixingCoalesceWithLogical, {
             at: this.state.startLoc
           });
@@ -15066,7 +15217,7 @@ class ExpressionParser extends LValParser {
     var startLoc = this.state.startLoc;
 
     switch (op) {
-      case 37:
+      case 39:
         switch (this.getPluginOption("pipelineOperator", "proposal")) {
           case "hack":
             return this.withTopicBindingContext(() => {
@@ -15075,7 +15226,7 @@ class ExpressionParser extends LValParser {
 
           case "smart":
             return this.withTopicBindingContext(() => {
-              if (this.prodParam.hasYield && this.isContextual(101)) {
+              if (this.prodParam.hasYield && this.isContextual(105)) {
                 throw this.raise(ErrorMessages.PipeBodyIsTighter, {
                   at: this.state.startLoc
                 }, this.state.value);
@@ -15125,7 +15276,7 @@ class ExpressionParser extends LValParser {
   }
 
   checkExponentialAfterUnary(node) {
-    if (this.match(53)) {
+    if (this.match(57)) {
       this.raise(ErrorMessages.UnexpectedTokenUnaryExponentiation, {
         node: node.argument
       });
@@ -15135,7 +15286,7 @@ class ExpressionParser extends LValParser {
   parseMaybeUnary(refExpressionErrors, sawUnary) {
     var startPos = this.state.start;
     var startLoc = this.state.startLoc;
-    var isAwait = this.isContextual(92);
+    var isAwait = this.isContextual(96);
 
     if (isAwait && this.isAwaitAllowed()) {
       this.next();
@@ -15153,11 +15304,11 @@ class ExpressionParser extends LValParser {
       node.operator = this.state.value;
       node.prefix = true;
 
-      if (this.match(68)) {
+      if (this.match(72)) {
         this.expectPlugin("throwExpressions");
       }
 
-      var isDelete = this.match(85);
+      var isDelete = this.match(89);
       this.next();
       node.argument = this.parseMaybeUnary(null, true);
       this.checkExpressionErrors(refExpressionErrors, true);
@@ -15189,7 +15340,7 @@ class ExpressionParser extends LValParser {
         type
       } = this.state;
 
-      var _startsExpr = this.hasPlugin("v8intrinsic") ? tokenCanStartExpression(type) : tokenCanStartExpression(type) && !this.match(50);
+      var _startsExpr = this.hasPlugin("v8intrinsic") ? tokenCanStartExpression(type) : tokenCanStartExpression(type) && !this.match(54);
 
       if (_startsExpr && !this.isAmbiguousAwait()) {
         this.raiseOverwrite(startLoc, ErrorMessages.AwaitNotInAsyncContext);
@@ -15298,7 +15449,7 @@ class ExpressionParser extends LValParser {
     if (computed) {
       node.property = this.parseExpression();
       this.expect(3);
-    } else if (this.match(130)) {
+    } else if (this.match(134)) {
       if (base.type === "Super") {
         this.raise(ErrorMessages.SuperPrivateField, {
           at: startLoc
@@ -15335,13 +15486,17 @@ class ExpressionParser extends LValParser {
     this.next();
     var node = this.startNodeAt(startPos, startLoc);
     node.callee = base;
+    var {
+      maybeAsyncArrow,
+      optionalChainMember
+    } = state;
 
-    if (state.maybeAsyncArrow) {
+    if (maybeAsyncArrow) {
       this.expressionScope.enter(newAsyncArrowScope());
       refExpressionErrors = new ExpressionErrors();
     }
 
-    if (state.optionalChainMember) {
+    if (optionalChainMember) {
       node.optional = optional;
     }
 
@@ -15351,15 +15506,16 @@ class ExpressionParser extends LValParser {
       node.arguments = this.parseCallExpressionArguments(11, base.type === "Import", base.type !== "Super", node, refExpressionErrors);
     }
 
-    this.finishCallExpression(node, state.optionalChainMember);
+    this.finishCallExpression(node, optionalChainMember);
 
-    if (state.maybeAsyncArrow && this.shouldParseAsyncArrow() && !optional) {
+    if (maybeAsyncArrow && this.shouldParseAsyncArrow() && !optional) {
       state.stop = true;
+      this.checkDestructuringPrivate(refExpressionErrors);
       this.expressionScope.validateAsPattern();
       this.expressionScope.exit();
       node = this.parseAsyncArrowFromCallExpression(this.startNodeAt(startPos, startLoc), node);
     } else {
-      if (state.maybeAsyncArrow) {
+      if (maybeAsyncArrow) {
         this.checkExpressionErrors(refExpressionErrors, true);
         this.expressionScope.exit();
       }
@@ -15390,7 +15546,7 @@ class ExpressionParser extends LValParser {
   }
 
   atPossibleAsyncArrow(base) {
-    return base.type === "Identifier" && base.name === "async" && indexes.get(this.state.lastTokEndLoc) === base.end && !this.canInsertSemicolon() && base.end - base.start === 5 && base.start === this.state.potentialArrowAt;
+    return base.type === "Identifier" && base.name === "async" && this.state.lastTokEndLoc.index === base.end && !this.canInsertSemicolon() && base.end - base.start === 5 && base.start === this.state.potentialArrowAt;
   }
 
   finishCallExpression(node, optional) {
@@ -15491,10 +15647,10 @@ class ExpressionParser extends LValParser {
     } = this.state;
 
     switch (type) {
-      case 75:
+      case 79:
         return this.parseSuper();
 
-      case 79:
+      case 83:
         node = this.startNode();
         this.next();
 
@@ -15510,42 +15666,42 @@ class ExpressionParser extends LValParser {
 
         return this.finishNode(node, "Import");
 
-      case 74:
+      case 78:
         node = this.startNode();
         this.next();
         return this.finishNode(node, "ThisExpression");
 
-      case 86:
+      case 90:
         {
           return this.parseDo(this.startNode(), false);
         }
 
-      case 52:
+      case 56:
       case 31:
         {
           this.readRegexp();
           return this.parseRegExpLiteral(this.state.value);
         }
 
-      case 126:
+      case 130:
         return this.parseNumericLiteral(this.state.value);
 
-      case 127:
+      case 131:
         return this.parseBigIntLiteral(this.state.value);
 
-      case 128:
+      case 132:
         return this.parseDecimalLiteral(this.state.value);
 
-      case 125:
+      case 129:
         return this.parseStringLiteral(this.state.value);
 
-      case 80:
+      case 84:
         return this.parseNullLiteral();
 
-      case 81:
+      case 85:
         return this.parseBooleanLiteral(true);
 
-      case 82:
+      case 86:
         return this.parseBooleanLiteral(false);
 
       case 10:
@@ -15576,18 +15732,18 @@ class ExpressionParser extends LValParser {
           return this.parseObjectLike(8, false, false, refExpressionErrors);
         }
 
-      case 64:
+      case 68:
         return this.parseFunctionOrFunctionSent();
 
       case 26:
         this.parseDecorators();
 
-      case 76:
+      case 80:
         node = this.startNode();
         this.takeDecorators(node);
         return this.parseClass(node, false);
 
-      case 73:
+      case 77:
         return this.parseNewOrNewTarget();
 
       case 25:
@@ -15610,7 +15766,7 @@ class ExpressionParser extends LValParser {
           }
         }
 
-      case 130:
+      case 134:
         {
           this.raise(ErrorMessages.PrivateInExpectedIn, {
             at: this.state.startLoc
@@ -15620,16 +15776,22 @@ class ExpressionParser extends LValParser {
 
       case 33:
         {
-          return this.parseTopicReferenceThenEqualsSign(50, "%");
+          return this.parseTopicReferenceThenEqualsSign(54, "%");
         }
 
       case 32:
         {
-          return this.parseTopicReferenceThenEqualsSign(42, "^");
+          return this.parseTopicReferenceThenEqualsSign(44, "^");
         }
 
-      case 42:
-      case 50:
+      case 37:
+      case 38:
+        {
+          return this.parseTopicReference("hack");
+        }
+
+      case 44:
+      case 54:
       case 27:
         {
           var pipeProposal = this.getPluginOption("pipelineOperator", "proposal");
@@ -15641,7 +15803,7 @@ class ExpressionParser extends LValParser {
           }
         }
 
-      case 45:
+      case 47:
         {
           var lookaheadCh = this.input.codePointAt(this.nextTokenStart());
 
@@ -15655,7 +15817,7 @@ class ExpressionParser extends LValParser {
 
       default:
         if (tokenIsIdentifier(type)) {
-          if (this.isContextual(119) && this.lookaheadCharCode() === 123 && !this.hasFollowingLineBreak()) {
+          if (this.isContextual(123) && this.lookaheadCharCode() === 123 && !this.hasFollowingLineBreak()) {
             return this.parseModuleExpression();
           }
 
@@ -15669,7 +15831,7 @@ class ExpressionParser extends LValParser {
               type: _type
             } = this.state;
 
-            if (_type === 64) {
+            if (_type === 68) {
               this.resetPreviousNodeTrailingComments(id);
               this.next();
               return this.parseFunction(this.startNodeAtNode(id), undefined, true);
@@ -15679,7 +15841,7 @@ class ExpressionParser extends LValParser {
               } else {
                 return id;
               }
-            } else if (_type === 86) {
+            } else if (_type === 90) {
               this.resetPreviousNodeTrailingComments(id);
               return this.parseDo(this.startNodeAtNode(id), true);
             }
@@ -15839,7 +16001,7 @@ class ExpressionParser extends LValParser {
       var meta = this.createIdentifier(this.startNodeAtNode(node), "function");
       this.next();
 
-      if (this.match(98)) {
+      if (this.match(102)) {
         this.expectPlugin("functionSent");
       } else if (!this.hasPlugin("functionSent")) {
         this.unexpected();
@@ -15869,7 +16031,7 @@ class ExpressionParser extends LValParser {
     var id = this.createIdentifier(this.startNodeAtNode(node), "import");
     this.next();
 
-    if (this.isContextual(96)) {
+    if (this.isContextual(100)) {
       if (!this.inModule) {
         this.raise(SourceTypeModuleErrorMessages.ImportMetaOutsideModule, {
           node: id
@@ -15982,6 +16144,7 @@ class ExpressionParser extends LValParser {
     var arrowNode = this.startNodeAt(startPos, startLoc);
 
     if (canBeArrow && this.shouldParseArrow(exprList) && (arrowNode = this.parseArrow(arrowNode))) {
+      this.checkDestructuringPrivate(refExpressionErrors);
       this.expressionScope.validateAsPattern();
       this.expressionScope.exit();
       this.parseArrowExpression(arrowNode, exprList, false);
@@ -16011,7 +16174,7 @@ class ExpressionParser extends LValParser {
     if (!this.options.createParenthesizedExpressions) {
       this.addExtra(val, "parenthesized", true);
       this.addExtra(val, "parenStart", startPos);
-      this.takeSurroundingComments(val, startPos, indexes.get(this.state.lastTokEndLoc));
+      this.takeSurroundingComments(val, startPos, this.state.lastTokEndLoc.index);
       return val;
     }
 
@@ -16204,7 +16367,7 @@ class ExpressionParser extends LValParser {
   }
 
   maybeAsyncOrAccessorProp(prop) {
-    return !prop.computed && prop.key.type === "Identifier" && (this.isLiteralPropertyName() || this.match(0) || this.match(51));
+    return !prop.computed && prop.key.type === "Identifier" && (this.isLiteralPropertyName() || this.match(0) || this.match(55));
   }
 
   parsePropertyDefinition(refExpressionErrors) {
@@ -16245,10 +16408,10 @@ class ExpressionParser extends LValParser {
       startLoc = this.state.startLoc;
     }
 
-    var isGenerator = this.eat(51);
+    var isGenerator = this.eat(55);
     this.parsePropertyNamePrefixOperator(prop);
     var containsEsc = this.state.containsEsc;
-    var key = this.parsePropertyName(prop);
+    var key = this.parsePropertyName(prop, refExpressionErrors);
 
     if (!isGenerator && !containsEsc && this.maybeAsyncOrAccessorProp(prop)) {
       var keyName = key.name;
@@ -16256,7 +16419,7 @@ class ExpressionParser extends LValParser {
       if (keyName === "async" && !this.hasPrecedingLineBreak()) {
         isAsync = true;
         this.resetPreviousNodeTrailingComments(key);
-        isGenerator = this.eat(51);
+        isGenerator = this.eat(55);
         this.parsePropertyName(prop);
       }
 
@@ -16265,7 +16428,7 @@ class ExpressionParser extends LValParser {
         this.resetPreviousNodeTrailingComments(key);
         prop.kind = keyName;
 
-        if (this.match(51)) {
+        if (this.match(55)) {
           isGenerator = true;
           this.raise(ErrorMessages.AccessorIsGenerator, {
             at: this.state.curPosition()
@@ -16365,7 +16528,7 @@ class ExpressionParser extends LValParser {
     return node;
   }
 
-  parsePropertyName(prop) {
+  parsePropertyName(prop, refExpressionErrors) {
     if (this.eat(0)) {
       prop.computed = true;
       prop.key = this.parseMaybeAssignAllowIn();
@@ -16381,27 +16544,36 @@ class ExpressionParser extends LValParser {
         key = this.parseIdentifier(true);
       } else {
         switch (type) {
-          case 126:
+          case 130:
             key = this.parseNumericLiteral(value);
             break;
 
-          case 125:
+          case 129:
             key = this.parseStringLiteral(value);
             break;
 
-          case 127:
+          case 131:
             key = this.parseBigIntLiteral(value);
             break;
 
-          case 128:
+          case 132:
             key = this.parseDecimalLiteral(value);
             break;
 
-          case 130:
+          case 134:
             {
-              this.raise(ErrorMessages.UnexpectedPrivateField, {
-                at: createPositionWithColumnOffset(this.state.startLoc, 1)
-              });
+              var privateKeyLoc = this.state.startLoc;
+
+              if (refExpressionErrors != null) {
+                if (refExpressionErrors.privateKeyLoc === null) {
+                  refExpressionErrors.privateKeyLoc = privateKeyLoc;
+                }
+              } else {
+                this.raise(ErrorMessages.UnexpectedPrivateField, {
+                  at: privateKeyLoc
+                });
+              }
+
               key = this.parsePrivateName();
               break;
             }
@@ -16413,7 +16585,7 @@ class ExpressionParser extends LValParser {
 
       prop.key = key;
 
-      if (type !== 130) {
+      if (type !== 134) {
         prop.computed = false;
       }
     }
@@ -16635,7 +16807,7 @@ class ExpressionParser extends LValParser {
 
     if (liberal) {
       if (tokenIsKeyword) {
-        this.replaceToken(124);
+        this.replaceToken(128);
       }
     } else {
       this.checkReservedWord(name, startLoc, tokenIsKeyword, false);
@@ -16716,7 +16888,7 @@ class ExpressionParser extends LValParser {
     var node = this.startNodeAt(startPos, startLoc);
     this.expressionScope.recordParameterInitializerError(node.loc.start, ErrorMessages.AwaitExpressionFormalParameter);
 
-    if (this.eat(51)) {
+    if (this.eat(55)) {
       this.raise(ErrorMessages.ObsoleteAwaitStar, {
         node
       });
@@ -16742,7 +16914,7 @@ class ExpressionParser extends LValParser {
     var {
       type
     } = this.state;
-    return type === 49 || type === 10 || type === 0 || tokenIsTemplate(type) || type === 129 || type === 52 || this.hasPlugin("v8intrinsic") && type === 50;
+    return type === 53 || type === 10 || type === 0 || tokenIsTemplate(type) || type === 133 || type === 56 || this.hasPlugin("v8intrinsic") && type === 54;
   }
 
   parseYield() {
@@ -16753,11 +16925,11 @@ class ExpressionParser extends LValParser {
     var argument = null;
 
     if (!this.hasPrecedingLineBreak()) {
-      delegating = this.eat(51);
+      delegating = this.eat(55);
 
       switch (this.state.type) {
         case 13:
-        case 131:
+        case 135:
         case 8:
         case 11:
         case 3:
@@ -16975,7 +17147,7 @@ function babel7CompatTokens(tokens, input) {
 
     if (typeof type === "number") {
       {
-        if (type === 130) {
+        if (type === 134) {
           var {
             loc,
             start,
@@ -16992,7 +17164,7 @@ function babel7CompatTokens(tokens, input) {
             startLoc: loc.start,
             endLoc: hashEndLoc
           }), new Token({
-            type: getExportedToken(124),
+            type: getExportedToken(128),
             value: value,
             start: hashEndPos,
             end: end,
@@ -17097,7 +17269,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseProgram(program) {
-    var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 131;
+    var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 135;
     var sourceType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.options.sourceType;
     program.sourceType = sourceType;
     program.interpreter = this.parseInterpreterDirective();
@@ -17142,7 +17314,7 @@ class StatementParser extends ExpressionParser {
   }
 
   isLet(context) {
-    if (!this.isContextual(95)) {
+    if (!this.isContextual(99)) {
       return false;
     }
 
@@ -17191,27 +17363,27 @@ class StatementParser extends ExpressionParser {
     var kind;
 
     if (this.isLet(context)) {
-      starttype = 70;
+      starttype = 74;
       kind = "let";
     }
 
     switch (starttype) {
-      case 56:
+      case 60:
         return this.parseBreakContinueStatement(node, true);
 
-      case 59:
+      case 63:
         return this.parseBreakContinueStatement(node, false);
 
-      case 60:
+      case 64:
         return this.parseDebuggerStatement(node);
 
-      case 86:
+      case 90:
         return this.parseDoStatement(node);
 
-      case 87:
+      case 91:
         return this.parseForStatement(node);
 
-      case 64:
+      case 68:
         if (this.lookaheadCharCode() === 46) break;
 
         if (context) {
@@ -17228,27 +17400,27 @@ class StatementParser extends ExpressionParser {
 
         return this.parseFunctionStatement(node, false, !context);
 
-      case 76:
+      case 80:
         if (context) this.unexpected();
         return this.parseClass(node, true);
 
-      case 65:
+      case 69:
         return this.parseIfStatement(node);
 
-      case 66:
+      case 70:
         return this.parseReturnStatement(node);
 
-      case 67:
+      case 71:
         return this.parseSwitchStatement(node);
 
-      case 68:
+      case 72:
         return this.parseThrowStatement(node);
 
-      case 69:
+      case 73:
         return this.parseTryStatement(node);
 
-      case 71:
-      case 70:
+      case 75:
+      case 74:
         kind = kind || this.state.value;
 
         if (context && kind !== "var") {
@@ -17259,10 +17431,10 @@ class StatementParser extends ExpressionParser {
 
         return this.parseVarStatement(node, kind);
 
-      case 88:
+      case 92:
         return this.parseWhileStatement(node);
 
-      case 72:
+      case 76:
         return this.parseWithStatement(node);
 
       case 5:
@@ -17271,7 +17443,7 @@ class StatementParser extends ExpressionParser {
       case 13:
         return this.parseEmptyStatement(node);
 
-      case 79:
+      case 83:
         {
           var nextTokenCharCode = this.lookaheadCharCode();
 
@@ -17280,7 +17452,7 @@ class StatementParser extends ExpressionParser {
           }
         }
 
-      case 78:
+      case 82:
         {
           if (!this.options.allowImportExportEverywhere && !topLevel) {
             this.raise(ErrorMessages.UnexpectedImportExport, {
@@ -17291,7 +17463,7 @@ class StatementParser extends ExpressionParser {
           this.next();
           var result;
 
-          if (starttype === 79) {
+          if (starttype === 83) {
             result = this.parseImport(node);
 
             if (result.type === "ImportDeclaration" && (!result.importKind || result.importKind === "value")) {
@@ -17353,7 +17525,7 @@ class StatementParser extends ExpressionParser {
   }
 
   canHaveLeadingDecorator() {
-    return this.match(76);
+    return this.match(80);
   }
 
   parseDecorators(allowExport) {
@@ -17364,7 +17536,7 @@ class StatementParser extends ExpressionParser {
       currentContextDecorators.push(decorator);
     }
 
-    if (this.match(78)) {
+    if (this.match(82)) {
       if (!allowExport) {
         this.unexpected();
       }
@@ -17480,7 +17652,7 @@ class StatementParser extends ExpressionParser {
     this.state.labels.push(loopLabel);
     node.body = this.withSmartMixTopicForbiddingContext(() => this.parseStatement("do"));
     this.state.labels.pop();
-    this.expect(88);
+    this.expect(92);
     node.test = this.parseHeaderExpression();
     this.eat(13);
     return this.finishNode(node, "DoWhileStatement");
@@ -17491,7 +17663,7 @@ class StatementParser extends ExpressionParser {
     this.state.labels.push(loopLabel);
     var awaitAt = null;
 
-    if (this.isAwaitAllowed() && this.eatContextual(92)) {
+    if (this.isAwaitAllowed() && this.eatContextual(96)) {
       awaitAt = this.state.lastTokStartLoc;
     }
 
@@ -17506,10 +17678,10 @@ class StatementParser extends ExpressionParser {
       return this.parseFor(node, null);
     }
 
-    var startsWithLet = this.isContextual(95);
+    var startsWithLet = this.isContextual(99);
     var isLet = startsWithLet && this.isLetKeyword();
 
-    if (this.match(70) || this.match(71) || isLet) {
+    if (this.match(74) || this.match(75) || isLet) {
       var _init = this.startNode();
 
       var kind = isLet ? "let" : this.state.value;
@@ -17517,7 +17689,7 @@ class StatementParser extends ExpressionParser {
       this.parseVar(_init, true, kind);
       this.finishNode(_init, "VariableDeclaration");
 
-      if ((this.match(54) || this.isContextual(97)) && _init.declarations.length === 1) {
+      if ((this.match(58) || this.isContextual(101)) && _init.declarations.length === 1) {
         return this.parseForIn(node, _init, awaitAt);
       }
 
@@ -17528,10 +17700,10 @@ class StatementParser extends ExpressionParser {
       return this.parseFor(node, _init);
     }
 
-    var startsWithAsync = this.isContextual(91);
+    var startsWithAsync = this.isContextual(95);
     var refExpressionErrors = new ExpressionErrors();
     var init = this.parseExpression(true, refExpressionErrors);
-    var isForOf = this.isContextual(97);
+    var isForOf = this.isContextual(101);
 
     if (isForOf) {
       if (startsWithLet) {
@@ -17547,7 +17719,8 @@ class StatementParser extends ExpressionParser {
       }
     }
 
-    if (isForOf || this.match(54)) {
+    if (isForOf || this.match(58)) {
+      this.checkDestructuringPrivate(refExpressionErrors);
       this.toAssignable(init, true);
       var description = isForOf ? "for-of statement" : "for-in statement";
       this.checkLVal(init, description);
@@ -17572,7 +17745,7 @@ class StatementParser extends ExpressionParser {
     this.next();
     node.test = this.parseHeaderExpression();
     node.consequent = this.parseStatement("if");
-    node.alternate = this.eat(62) ? this.parseStatement("if") : null;
+    node.alternate = this.eat(66) ? this.parseStatement("if") : null;
     return this.finishNode(node, "IfStatement");
   }
 
@@ -17605,8 +17778,8 @@ class StatementParser extends ExpressionParser {
     var cur;
 
     for (var sawDefault; !this.match(8);) {
-      if (this.match(57) || this.match(61)) {
-        var isCase = this.match(57);
+      if (this.match(61) || this.match(65)) {
+        var isCase = this.match(61);
         if (cur) this.finishNode(cur, "SwitchCase");
         cases.push(cur = this.startNode());
         cur.consequent = [];
@@ -17669,7 +17842,7 @@ class StatementParser extends ExpressionParser {
     node.block = this.parseBlock();
     node.handler = null;
 
-    if (this.match(58)) {
+    if (this.match(62)) {
       var clause = this.startNode();
       this.next();
 
@@ -17687,7 +17860,7 @@ class StatementParser extends ExpressionParser {
       node.handler = this.finishNode(clause, "CatchClause");
     }
 
-    node.finalizer = this.eat(63) ? this.parseBlock() : null;
+    node.finalizer = this.eat(67) ? this.parseBlock() : null;
 
     if (!node.handler && !node.finalizer) {
       this.raise(ErrorMessages.NoCatchOrFinally, {
@@ -17741,7 +17914,7 @@ class StatementParser extends ExpressionParser {
       }
     }
 
-    var kind = tokenIsLoop(this.state.type) ? "loop" : this.match(67) ? "switch" : null;
+    var kind = tokenIsLoop(this.state.type) ? "loop" : this.match(71) ? "switch" : null;
 
     for (var i = this.state.labels.length - 1; i >= 0; i--) {
       var _label = this.state.labels[i];
@@ -17859,7 +18032,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseForIn(node, init, awaitAt) {
-    var isForIn = this.match(54);
+    var isForIn = this.match(58);
     this.next();
 
     if (isForIn) {
@@ -17901,13 +18074,13 @@ class StatementParser extends ExpressionParser {
       if (this.eat(29)) {
         decl.init = isFor ? this.parseMaybeAssignDisallowIn() : this.parseMaybeAssignAllowIn();
       } else {
-        if (kind === "const" && !(this.match(54) || this.isContextual(97))) {
+        if (kind === "const" && !(this.match(58) || this.isContextual(101))) {
           if (!isTypescript) {
             this.raise(ErrorMessages.DeclarationMissingInitializer, {
               at: this.state.lastTokEndLoc
             }, "Const declarations");
           }
-        } else if (decl.id.type !== "Identifier" && !(isFor && (this.match(54) || this.isContextual(97)))) {
+        } else if (decl.id.type !== "Identifier" && !(isFor && (this.match(58) || this.isContextual(101)))) {
           this.raise(ErrorMessages.DeclarationMissingInitializer, {
             at: this.state.lastTokEndLoc
           }, "Complex binding patterns");
@@ -17936,13 +18109,13 @@ class StatementParser extends ExpressionParser {
     var requireId = !!isStatement && !(statement & FUNC_NULLABLE_ID);
     this.initFunction(node, isAsync);
 
-    if (this.match(51) && isHangingStatement) {
+    if (this.match(55) && isHangingStatement) {
       this.raise(ErrorMessages.GeneratorInSingleStatementContext, {
         at: this.state.startLoc
       });
     }
 
-    node.generator = this.eat(51);
+    node.generator = this.eat(55);
 
     if (isStatement) {
       node.id = this.parseFunctionId(requireId);
@@ -18093,7 +18266,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseClassMember(classBody, member, state) {
-    var isStatic = this.isContextual(100);
+    var isStatic = this.isContextual(104);
 
     if (isStatic) {
       if (this.parseClassMemberFromModifier(classBody, member)) {
@@ -18114,14 +18287,15 @@ class StatementParser extends ExpressionParser {
     var privateMethod = member;
     var publicProp = member;
     var privateProp = member;
+    var accessorProp = member;
     var method = publicMethod;
     var publicMember = publicMethod;
     member.static = isStatic;
     this.parsePropertyNamePrefixOperator(member);
 
-    if (this.eat(51)) {
+    if (this.eat(55)) {
       method.kind = "method";
-      var isPrivateName = this.match(130);
+      var isPrivateName = this.match(134);
       this.parseClassElementName(method);
 
       if (isPrivateName) {
@@ -18140,7 +18314,7 @@ class StatementParser extends ExpressionParser {
     }
 
     var isContextual = tokenIsIdentifier(this.state.type) && !this.state.containsEsc;
-    var isPrivate = this.match(130);
+    var isPrivate = this.match(134);
     var key = this.parseClassElementName(member);
     var maybeQuestionTokenStartLoc = this.state.startLoc;
     this.parsePostMemberNameModifiers(publicMember);
@@ -18184,7 +18358,7 @@ class StatementParser extends ExpressionParser {
       }
     } else if (isContextual && key.name === "async" && !this.isLineTerminator()) {
       this.resetPreviousNodeTrailingComments(key);
-      var isGenerator = this.eat(51);
+      var isGenerator = this.eat(55);
 
       if (publicMember.optional) {
         this.unexpected(maybeQuestionTokenStartLoc);
@@ -18192,7 +18366,7 @@ class StatementParser extends ExpressionParser {
 
       method.kind = "method";
 
-      var _isPrivate = this.match(130);
+      var _isPrivate = this.match(134);
 
       this.parseClassElementName(method);
       this.parsePostMemberNameModifiers(publicMember);
@@ -18208,11 +18382,11 @@ class StatementParser extends ExpressionParser {
 
         this.pushClassMethod(classBody, publicMethod, isGenerator, true, false, false);
       }
-    } else if (isContextual && (key.name === "get" || key.name === "set") && !(this.match(51) && this.isLineTerminator())) {
+    } else if (isContextual && (key.name === "get" || key.name === "set") && !(this.match(55) && this.isLineTerminator())) {
       this.resetPreviousNodeTrailingComments(key);
       method.kind = key.name;
 
-      var _isPrivate2 = this.match(130);
+      var _isPrivate2 = this.match(134);
 
       this.parseClassElementName(publicMethod);
 
@@ -18229,6 +18403,14 @@ class StatementParser extends ExpressionParser {
       }
 
       this.checkGetterSetterParams(publicMethod);
+    } else if (isContextual && key.name === "accessor" && !this.isLineTerminator()) {
+      this.expectPlugin("decoratorAutoAccessors");
+      this.resetPreviousNodeTrailingComments(key);
+
+      var _isPrivate3 = this.match(134);
+
+      this.parseClassElementName(publicProp);
+      this.pushClassAccessorProperty(classBody, accessorProp, _isPrivate3);
     } else if (this.isLineTerminator()) {
       if (isPrivate) {
         this.pushClassPrivateProperty(classBody, privateProp);
@@ -18246,13 +18428,13 @@ class StatementParser extends ExpressionParser {
       value
     } = this.state;
 
-    if ((type === 124 || type === 125) && member.static && value === "prototype") {
+    if ((type === 128 || type === 129) && member.static && value === "prototype") {
       this.raise(ErrorMessages.StaticPrototype, {
         at: this.state.startLoc
       });
     }
 
-    if (type === 130) {
+    if (type === 134) {
       if (value === "constructor") {
         this.raise(ErrorMessages.ConstructorClassPrivateField, {
           at: this.state.startLoc
@@ -18304,6 +18486,25 @@ class StatementParser extends ExpressionParser {
     this.classScope.declarePrivateName(this.getPrivateNameSV(node.key), CLASS_ELEMENT_OTHER, node.key.loc.start);
   }
 
+  pushClassAccessorProperty(classBody, prop, isPrivate) {
+    if (!isPrivate && !prop.computed) {
+      var key = prop.key;
+
+      if (key.name === "constructor" || key.value === "constructor") {
+        this.raise(ErrorMessages.ConstructorClassField, {
+          node: key
+        });
+      }
+    }
+
+    var node = this.parseClassAccessorProperty(prop);
+    classBody.body.push(node);
+
+    if (isPrivate) {
+      this.classScope.declarePrivateName(this.getPrivateNameSV(node.key), CLASS_ELEMENT_OTHER, node.key.loc.start);
+    }
+  }
+
   pushClassMethod(classBody, method, isGenerator, isAsync, isConstructor, allowsDirectSuper) {
     classBody.body.push(this.parseMethod(method, isGenerator, isAsync, isConstructor, allowsDirectSuper, "ClassMethod", true));
   }
@@ -18333,6 +18534,12 @@ class StatementParser extends ExpressionParser {
     return this.finishNode(node, "ClassProperty");
   }
 
+  parseClassAccessorProperty(node) {
+    this.parseInitializer(node);
+    this.semicolon();
+    return this.finishNode(node, "ClassAccessorProperty");
+  }
+
   parseInitializer(node) {
     this.scope.enter(SCOPE_CLASS | SCOPE_SUPER);
     this.expressionScope.enter(newExpressionScope());
@@ -18364,7 +18571,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseClassSuper(node) {
-    node.superClass = this.eat(77) ? this.parseExprSubscripts() : null;
+    node.superClass = this.eat(81) ? this.parseExprSubscripts() : null;
   }
 
   parseExport(node) {
@@ -18401,7 +18608,7 @@ class StatementParser extends ExpressionParser {
       return this.finishNode(node, "ExportNamedDeclaration");
     }
 
-    if (this.eat(61)) {
+    if (this.eat(65)) {
       node.declaration = this.parseExportDefaultExpression();
       this.checkExport(node, true, true);
       return this.finishNode(node, "ExportDefaultDeclaration");
@@ -18411,7 +18618,7 @@ class StatementParser extends ExpressionParser {
   }
 
   eatExportStar(node) {
-    return this.eat(51);
+    return this.eat(55);
   }
 
   maybeParseExportDefaultSpecifier(node) {
@@ -18427,7 +18634,7 @@ class StatementParser extends ExpressionParser {
   }
 
   maybeParseExportNamespaceSpecifier(node) {
-    if (this.isContextual(89)) {
+    if (this.isContextual(93)) {
       if (!node.specifiers) node.specifiers = [];
       var specifier = this.startNodeAt(this.state.lastTokStart, this.state.lastTokStartLoc);
       this.next();
@@ -18474,7 +18681,7 @@ class StatementParser extends ExpressionParser {
   }
 
   isAsyncFunction() {
-    if (!this.isContextual(91)) return false;
+    if (!this.isContextual(95)) return false;
     var next = this.nextTokenStart();
     return !lineBreak.test(this.input.slice(this.state.pos, next)) && this.isUnparsedContextual(next, "function");
   }
@@ -18483,7 +18690,7 @@ class StatementParser extends ExpressionParser {
     var expr = this.startNode();
     var isAsync = this.isAsyncFunction();
 
-    if (this.match(64) || isAsync) {
+    if (this.match(68) || isAsync) {
       this.next();
 
       if (isAsync) {
@@ -18493,7 +18700,7 @@ class StatementParser extends ExpressionParser {
       return this.parseFunction(expr, FUNC_STATEMENT | FUNC_NULLABLE_ID, isAsync);
     }
 
-    if (this.match(76)) {
+    if (this.match(80)) {
       return this.parseClass(expr, true, true);
     }
 
@@ -18508,7 +18715,7 @@ class StatementParser extends ExpressionParser {
       return this.parseClass(expr, true, true);
     }
 
-    if (this.match(71) || this.match(70) || this.isLet()) {
+    if (this.match(75) || this.match(74) || this.isLet()) {
       throw this.raise(ErrorMessages.UnsupportedDefaultExport, {
         at: this.state.startLoc
       });
@@ -18529,21 +18736,21 @@ class StatementParser extends ExpressionParser {
     } = this.state;
 
     if (tokenIsIdentifier(type)) {
-      if (type === 91 && !this.state.containsEsc || type === 95) {
+      if (type === 95 && !this.state.containsEsc || type === 99) {
         return false;
       }
 
-      if ((type === 122 || type === 121) && !this.state.containsEsc) {
+      if ((type === 126 || type === 125) && !this.state.containsEsc) {
         var {
           type: nextType
         } = this.lookahead();
 
-        if (tokenIsIdentifier(nextType) && nextType !== 93 || nextType === 5) {
+        if (tokenIsIdentifier(nextType) && nextType !== 97 || nextType === 5) {
           this.expectOnePlugin(["flow", "typescript"]);
           return false;
         }
       }
-    } else if (!this.match(61)) {
+    } else if (!this.match(65)) {
       return false;
     }
 
@@ -18554,7 +18761,7 @@ class StatementParser extends ExpressionParser {
       return true;
     }
 
-    if (this.match(61) && hasFrom) {
+    if (this.match(65) && hasFrom) {
       var nextAfterFrom = this.input.charCodeAt(this.nextTokenStartSince(next + 4));
       return nextAfterFrom === 34 || nextAfterFrom === 39;
     }
@@ -18563,7 +18770,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseExportFrom(node, expect) {
-    if (this.eatContextual(93)) {
+    if (this.eatContextual(97)) {
       node.source = this.parseImportSource();
       this.checkExport(node);
       var assertions = this.maybeParseImportAssertions();
@@ -18597,7 +18804,7 @@ class StatementParser extends ExpressionParser {
       }
     }
 
-    return type === 70 || type === 71 || type === 64 || type === 76 || this.isLet() || this.isAsyncFunction();
+    return type === 74 || type === 75 || type === 68 || type === 80 || this.isLet() || this.isAsyncFunction();
   }
 
   checkExport(node, checkNames, isDefault, isFrom) {
@@ -18706,8 +18913,8 @@ class StatementParser extends ExpressionParser {
         if (this.eat(8)) break;
       }
 
-      var isMaybeTypeOnly = this.isContextual(122);
-      var isString = this.match(125);
+      var isMaybeTypeOnly = this.isContextual(126);
+      var isString = this.match(129);
       var node = this.startNode();
       node.local = this.parseModuleExportName();
       nodes.push(this.parseExportSpecifier(node, isString, isInTypeExport, isMaybeTypeOnly));
@@ -18717,7 +18924,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseExportSpecifier(node, isString, isInTypeExport, isMaybeTypeOnly) {
-    if (this.eatContextual(89)) {
+    if (this.eatContextual(93)) {
       node.exported = this.parseModuleExportName();
     } else if (isString) {
       node.exported = cloneStringLiteral(node.local);
@@ -18729,7 +18936,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseModuleExportName() {
-    if (this.match(125)) {
+    if (this.match(129)) {
       var result = this.parseStringLiteral(this.state.value);
       var surrogate = result.value.match(loneSurrogate);
 
@@ -18748,12 +18955,12 @@ class StatementParser extends ExpressionParser {
   parseImport(node) {
     node.specifiers = [];
 
-    if (!this.match(125)) {
+    if (!this.match(129)) {
       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(93);
+      this.expectContextual(97);
     }
 
     node.source = this.parseImportSource();
@@ -18774,7 +18981,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseImportSource() {
-    if (!this.match(125)) this.unexpected();
+    if (!this.match(129)) this.unexpected();
     return this.parseExprAtom();
   }
 
@@ -18808,7 +19015,7 @@ class StatementParser extends ExpressionParser {
 
       attrNames.add(keyName);
 
-      if (this.match(125)) {
+      if (this.match(129)) {
         node.key = this.parseStringLiteral(keyName);
       } else {
         node.key = this.parseIdentifier(true);
@@ -18816,7 +19023,7 @@ class StatementParser extends ExpressionParser {
 
       this.expect(14);
 
-      if (!this.match(125)) {
+      if (!this.match(129)) {
         throw this.raise(ErrorMessages.ModuleAttributeInvalidValue, {
           at: this.state.startLoc
         });
@@ -18831,7 +19038,7 @@ class StatementParser extends ExpressionParser {
   }
 
   maybeParseModuleAttributes() {
-    if (this.match(72) && !this.hasPrecedingLineBreak()) {
+    if (this.match(76) && !this.hasPrecedingLineBreak()) {
       this.expectPlugin("moduleAttributes");
       this.next();
     } else {
@@ -18861,7 +19068,7 @@ class StatementParser extends ExpressionParser {
       attributes.add(node.key.name);
       this.expect(14);
 
-      if (!this.match(125)) {
+      if (!this.match(129)) {
         throw this.raise(ErrorMessages.ModuleAttributeInvalidValue, {
           at: this.state.startLoc
         });
@@ -18876,7 +19083,7 @@ class StatementParser extends ExpressionParser {
   }
 
   maybeParseImportAssertions() {
-    if (this.isContextual(90) && !this.hasPrecedingLineBreak()) {
+    if (this.isContextual(94) && !this.hasPrecedingLineBreak()) {
       this.expectPlugin("importAssertions");
       this.next();
     } else {
@@ -18900,10 +19107,10 @@ class StatementParser extends ExpressionParser {
   }
 
   maybeParseStarImportSpecifier(node) {
-    if (this.match(51)) {
+    if (this.match(55)) {
       var specifier = this.startNode();
       this.next();
-      this.expectContextual(89);
+      this.expectContextual(93);
       this.parseImportSpecifierLocal(node, specifier, "ImportNamespaceSpecifier", "import namespace specifier");
       return true;
     }
@@ -18930,8 +19137,8 @@ class StatementParser extends ExpressionParser {
       }
 
       var specifier = this.startNode();
-      var importedIsString = this.match(125);
-      var isMaybeTypeOnly = this.isContextual(122);
+      var importedIsString = this.match(129);
+      var isMaybeTypeOnly = this.isContextual(126);
       specifier.imported = this.parseModuleExportName();
       var importSpecifier = this.parseImportSpecifier(specifier, importedIsString, node.importKind === "type" || node.importKind === "typeof", isMaybeTypeOnly);
       node.specifiers.push(importSpecifier);
@@ -18939,7 +19146,7 @@ class StatementParser extends ExpressionParser {
   }
 
   parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly) {
-    if (this.eatContextual(89)) {
+    if (this.eatContextual(93)) {
       specifier.local = this.parseIdentifier();
     } else {
       var {