@next-core/brick-utils 2.34.2 → 2.35.2

package/dist/index.bundle.js

@@ -3063,40 +3063,6 @@
     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;
@@ -3379,6 +3345,7 @@
     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.",
@@ -3543,7 +3510,7 @@
         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) {
@@ -3574,7 +3541,7 @@
         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,
@@ -3596,7 +3563,32 @@
 
   }
 
+  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,
@@ -3838,7 +3830,16 @@
       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;
       }
 
@@ -3952,6 +3953,16 @@
       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 {
@@ -4180,6 +4191,12 @@
       prefix,
       startsExpr
     }),
+    doubleCaret: createToken("^^", {
+      startsExpr
+    }),
+    doubleAt: createToken("@@", {
+      startsExpr
+    }),
     pipeline: createBinop("|>", 0),
     nullishCoalescing: createBinop("??", 1),
     logicalOR: createBinop("||", 1),
@@ -4192,6 +4209,8 @@
     gt: createBinop("</>/<=/>=", 7),
     relational: createBinop("</>/<=/>=", 7),
     bitShift: createBinop("<</>>/>>>", 8),
+    bitShiftL: createBinop("<</>>/>>>", 8),
+    bitShiftR: createBinop("<</>>/>>>", 8),
     plusMin: createToken("+/-", {
       beforeExpr,
       binop: 9,
@@ -4445,19 +4464,19 @@
   };
 
   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) {
@@ -4473,19 +4492,19 @@
   }
 
   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) {
@@ -4497,11 +4516,11 @@
   }
 
   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) {
@@ -4513,7 +4532,7 @@
   }
 
   function tokenIsRightAssociative(token) {
-    return token === 53;
+    return token === 57;
   }
 
   function tokenIsTemplate(token) {
@@ -4541,10 +4560,44 @@
       }
     };
 
-    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 + "]");
@@ -4623,8 +4676,8 @@
     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"]);
@@ -4978,7 +5031,7 @@
       this.comments = [];
       this.commentStack = [];
       this.pos = 0;
-      this.type = 131;
+      this.type = 135;
       this.value = null;
       this.start = 0;
       this.end = 0;
@@ -5033,7 +5086,7 @@
     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]
@@ -5181,7 +5234,7 @@
       if (!this.isLookahead) this.state.startLoc = this.state.curPosition();
 
       if (this.state.pos >= this.length) {
-        this.finishToken(131);
+        this.finishToken(135);
         return;
       }
 
@@ -5404,10 +5457,10 @@
         }
       } 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);
       }
@@ -5436,7 +5489,7 @@
       if (next === 61) {
         this.finishOp(31, 2);
       } else {
-        this.finishOp(52, 1);
+        this.finishOp(56, 1);
       }
     }
 
@@ -5457,14 +5510,14 @@
     }
 
     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) {
@@ -5482,7 +5535,7 @@
         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;
@@ -5490,7 +5543,7 @@
 
       if (code === 124) {
         if (next === 62) {
-          this.finishOp(37, 2);
+          this.finishOp(39, 2);
           return;
         }
 
@@ -5524,7 +5577,7 @@
         return;
       }
 
-      this.finishOp(code === 124 ? 41 : 43, 1);
+      this.finishOp(code === 124 ? 43 : 45, 1);
     }
 
     readToken_caret() {
@@ -5532,8 +5585,31 @@
 
       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);
       }
     }
 
@@ -5548,7 +5624,7 @@
       if (next === 61) {
         this.finishOp(30, 2);
       } else {
-        this.finishOp(49, 1);
+        this.finishOp(53, 1);
       }
     }
 
@@ -5564,16 +5640,16 @@
           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() {
@@ -5590,23 +5666,23 @@
           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;
       }
 
@@ -5627,7 +5703,7 @@
         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;
@@ -5804,8 +5880,7 @@
           return;
 
         case 64:
-          ++this.state.pos;
-          this.finishToken(26);
+          this.readToken_atSign();
           return;
 
         case 35:
@@ -5877,19 +5952,37 @@
       ++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;
@@ -5900,7 +5993,7 @@
       }
 
       this.state.pos = pos;
-      this.finishToken(129, {
+      this.finishToken(133, {
         pattern: content,
         flags: mods
       });
@@ -6007,12 +6100,12 @@
       }
 
       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) {
@@ -6109,17 +6202,17 @@
       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) {
@@ -6179,7 +6272,7 @@
       }
 
       out += this.input.slice(chunkStart, this.state.pos++);
-      this.finishToken(125, out);
+      this.finishToken(129, out);
     }
 
     readTemplateContinuation() {
@@ -6260,14 +6353,12 @@
     }
 
     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
         });
@@ -6372,7 +6463,7 @@
             at: codeLoc
           });
         } else {
-          this.state.pos = indexes.get(codeLoc) - 1;
+          this.state.pos = codeLoc.index - 1;
         }
       }
 
@@ -6437,7 +6528,7 @@
       if (type !== undefined) {
         this.finishToken(type, tokenLabelName(type));
       } else {
-        this.finishToken(124, word);
+        this.finishToken(128, word);
       }
     }
 
@@ -6578,14 +6669,14 @@
     }
 
     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) {
@@ -6808,11 +6899,11 @@
     }
 
     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() {
@@ -6839,7 +6930,7 @@
     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",
@@ -6954,9 +7045,10 @@
       var {
         shorthandAssignLoc,
         doubleProtoLoc,
+        privateKeyLoc,
         optionalParametersLoc
       } = refExpressionErrors;
-      var hasErrors = !!shorthandAssignLoc || !!doubleProtoLoc || !!optionalParametersLoc;
+      var hasErrors = !!shorthandAssignLoc || !!doubleProtoLoc || !!optionalParametersLoc || !!privateKeyLoc;
 
       if (!andThrow) {
         return hasErrors;
@@ -6974,6 +7066,12 @@
         });
       }
 
+      if (privateKeyLoc != null) {
+        this.raise(ErrorMessages.UnexpectedPrivateField, {
+          at: privateKeyLoc
+        });
+      }
+
       if (optionalParametersLoc != null) {
         this.unexpected(optionalParametersLoc);
       }
@@ -7046,12 +7144,23 @@
       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;
     }
 
@@ -7167,9 +7276,9 @@
 
     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;
     }
@@ -7182,9 +7291,9 @@
 
     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) {
@@ -7253,7 +7362,7 @@
   }
 
   function isMaybeDefaultImport(type) {
-    return tokenIsKeywordOrIdentifier(type) && type !== 93;
+    return tokenIsKeywordOrIdentifier(type) && type !== 97;
   }
 
   var exportSuggestions = {
@@ -7295,7 +7404,7 @@
     }
 
     finishToken(type, val) {
-      if (type !== 125 && type !== 13 && type !== 28) {
+      if (type !== 129 && type !== 13 && type !== 28) {
         if (this.flowPragma === undefined) {
           this.flowPragma = null;
         }
@@ -7332,9 +7441,9 @@
       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
         });
@@ -7356,14 +7465,14 @@
       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();
         }
       }
@@ -7383,7 +7492,7 @@
       var typeNode = this.startNode();
       var typeContainer = this.startNode();
 
-      if (this.match(45)) {
+      if (this.match(47)) {
         typeNode.typeParameters = this.flowParseTypeParameterDeclaration();
       } else {
         typeNode.typeParameters = null;
@@ -7405,13 +7514,13 @@
     }
 
     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 {
@@ -7423,13 +7532,13 @@
 
           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();
@@ -7447,7 +7556,7 @@
     flowParseDeclareModule(node) {
       this.scope.enter(SCOPE_OTHER);
 
-      if (this.match(125)) {
+      if (this.match(129)) {
         node.id = this.parseExprAtom();
       } else {
         node.id = this.parseIdentifier();
@@ -7460,10 +7569,10 @@
       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
             });
@@ -7471,7 +7580,7 @@
 
           this.parseImport(_bodyNode);
         } else {
-          this.expectContextual(117, FlowErrors.UnsupportedStatementInDeclareModule);
+          this.expectContextual(121, FlowErrors.UnsupportedStatementInDeclareModule);
           _bodyNode = this.flowParseDeclare(_bodyNode, true);
         }
 
@@ -7514,10 +7623,10 @@
     }
 
     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();
@@ -7527,7 +7636,7 @@
         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, {
@@ -7535,11 +7644,11 @@
           }, 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") {
@@ -7558,7 +7667,7 @@
 
     flowParseDeclareModuleExports(node) {
       this.next();
-      this.expectContextual(104);
+      this.expectContextual(108);
       node.typeAnnotation = this.flowParseTypeAnnotation();
       this.semicolon();
       return this.finishNode(node, "DeclareModuleExports");
@@ -7589,7 +7698,7 @@
       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;
@@ -7599,13 +7708,13 @@
       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 {
@@ -7613,7 +7722,7 @@
         } while (this.eat(12));
       }
 
-      if (this.isContextual(106)) {
+      if (this.isContextual(110)) {
         this.next();
 
         do {
@@ -7634,7 +7743,7 @@
       var node = this.startNode();
       node.id = this.flowParseQualifiedTypeIdentifier();
 
-      if (this.match(45)) {
+      if (this.match(47)) {
         node.typeParameters = this.flowParseTypeParameterInstantiation();
       } else {
         node.typeParameters = null;
@@ -7672,7 +7781,7 @@
       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;
@@ -7684,11 +7793,11 @@
     }
 
     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;
@@ -7740,7 +7849,7 @@
       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();
@@ -7756,12 +7865,12 @@
           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");
     }
@@ -7771,20 +7880,20 @@
       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");
     }
@@ -7794,27 +7903,27 @@
       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));
@@ -7831,7 +7940,7 @@
     }
 
     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) {
@@ -7857,7 +7966,7 @@
       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));
@@ -7880,13 +7989,13 @@
       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;
 
@@ -7956,7 +8065,7 @@
         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) {
@@ -7966,7 +8075,7 @@
           }
         }
 
-        if (allowStatic && this.isContextual(100)) {
+        if (allowStatic && this.isContextual(104)) {
           var _lookahead = this.lookahead();
 
           if (_lookahead.type !== 14 && _lookahead.type !== 17) {
@@ -7991,7 +8100,7 @@
           } 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);
           }
@@ -8004,7 +8113,7 @@
         } 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)) {
@@ -8092,7 +8201,7 @@
         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) {
@@ -8180,7 +8289,7 @@
       node.typeParameters = null;
       node.id = this.flowParseQualifiedTypeIdentifier(startPos, startLoc, id);
 
-      if (this.match(45)) {
+      if (this.match(47)) {
         node.typeParameters = this.flowParseTypeParameterInstantiation();
       }
 
@@ -8189,7 +8298,7 @@
 
     flowParseTypeofType() {
       var node = this.startNode();
-      this.expect(83);
+      this.expect(87);
       node.argument = this.flowParsePrimaryType();
       return this.finishNode(node, "TypeofTypeAnnotation");
     }
@@ -8215,7 +8324,7 @@
       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) {
@@ -8260,7 +8369,7 @@
       var rest = null;
       var _this = null;
 
-      if (this.match(74)) {
+      if (this.match(78)) {
         _this = this.flowParseFunctionTypeParam(true);
         _this.name = null;
 
@@ -8352,7 +8461,7 @@
           this.state.noAnonFunctionType = oldNoAnonFunctionType;
           return type;
 
-        case 45:
+        case 47:
           node.typeParameters = this.flowParseTypeParameterDeclaration();
           this.expect(10);
           tmp = this.flowParseFunctionTypeParams();
@@ -8368,7 +8477,7 @@
           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 {
@@ -8404,24 +8513,24 @@
           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);
             }
 
@@ -8432,29 +8541,29 @@
 
           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:
@@ -8463,7 +8572,7 @@
             this.next();
             return super.createIdentifier(node, label);
           } else if (tokenIsIdentifier(this.state.type)) {
-            if (this.isContextual(121)) {
+            if (this.isContextual(125)) {
               return this.flowParseInterfaceType();
             }
 
@@ -8537,11 +8646,11 @@
 
     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());
       }
 
@@ -8550,11 +8659,11 @@
 
     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());
       }
 
@@ -8570,7 +8679,7 @@
     }
 
     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();
@@ -8606,7 +8715,7 @@
     flowParseVariance() {
       var variance = null;
 
-      if (this.match(49)) {
+      if (this.match(53)) {
         variance = this.startNode();
 
         if (this.state.value === "+") {
@@ -8645,7 +8754,7 @@
     }
 
     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)) {
@@ -8653,7 +8762,7 @@
           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();
@@ -8672,7 +8781,7 @@
     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)) {
@@ -8694,7 +8803,7 @@
         type
       } = this.state;
 
-      if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 118) {
+      if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 122) {
         return !this.state.containsEsc;
       }
 
@@ -8706,7 +8815,7 @@
         type
       } = this.state;
 
-      if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 118) {
+      if (tokenIsFlowInterfaceOrTypeOrOpaque(type) || this.shouldParseEnums() && type === 122) {
         return this.state.containsEsc;
       }
 
@@ -8714,7 +8823,7 @@
     }
 
     parseExportDefaultExpression() {
-      if (this.shouldParseEnums() && this.isContextual(118)) {
+      if (this.shouldParseEnums() && this.isContextual(122)) {
         var node = this.startNode();
         this.next();
         return this.flowParseEnumDeclaration(node);
@@ -8889,7 +8998,7 @@
     }
 
     parseExportDeclaration(node) {
-      if (this.isContextual(122)) {
+      if (this.isContextual(126)) {
         node.exportKind = "type";
         var declarationNode = this.startNode();
         this.next();
@@ -8901,21 +9010,21 @@
         } 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();
@@ -8930,7 +9039,7 @@
     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();
@@ -8956,7 +9065,7 @@
     parseClassId(node, isStatement, optionalId) {
       super.parseClassId(node, isStatement, optionalId);
 
-      if (this.match(45)) {
+      if (this.match(47)) {
         node.typeParameters = this.flowParseTypeParameterDeclaration();
       }
     }
@@ -8966,7 +9075,7 @@
         startLoc
       } = this.state;
 
-      if (this.isContextual(117)) {
+      if (this.isContextual(121)) {
         if (this.parseClassMemberFromModifier(classBody, member)) {
           return;
         }
@@ -9003,7 +9112,7 @@
         }, fullWord);
       }
 
-      this.finishToken(124, fullWord);
+      this.finishToken(128, fullWord);
     }
 
     getTokenFromCode(code) {
@@ -9012,14 +9121,14 @@
       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 {
@@ -9110,7 +9219,7 @@
     }
 
     isClassMethod() {
-      return this.match(45) || super.isClassMethod();
+      return this.match(47) || super.isClassMethod();
     }
 
     isClassProperty() {
@@ -9128,7 +9237,7 @@
 
       delete method.variance;
 
-      if (this.match(45)) {
+      if (this.match(47)) {
         method.typeParameters = this.flowParseTypeParameterDeclaration();
       }
 
@@ -9160,7 +9269,7 @@
 
       delete method.variance;
 
-      if (this.match(45)) {
+      if (this.match(47)) {
         method.typeParameters = this.flowParseTypeParameterDeclaration();
       }
 
@@ -9170,11 +9279,11 @@
     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 = [];
 
@@ -9183,7 +9292,7 @@
 
           _node3.id = this.flowParseRestrictedIdentifier(true);
 
-          if (this.match(45)) {
+          if (this.match(47)) {
             _node3.typeParameters = this.flowParseTypeParameterInstantiation();
           } else {
             _node3.typeParameters = null;
@@ -9225,7 +9334,7 @@
       delete prop.variance;
       var typeParameters;
 
-      if (this.match(45) && !isAccessor) {
+      if (this.match(47) && !isAccessor) {
         typeParameters = this.flowParseTypeParameterDeclaration();
         if (!this.match(10)) this.unexpected();
       }
@@ -9302,9 +9411,9 @@
       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";
       }
 
@@ -9314,11 +9423,11 @@
           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;
         }
@@ -9341,7 +9450,7 @@
 
       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)) {
@@ -9368,7 +9477,7 @@
           specifier.importKind = null;
         }
 
-        if (this.eatContextual(89)) {
+        if (this.eatContextual(93)) {
           specifier.local = this.parseIdentifier();
         } else {
           isBinding = true;
@@ -9398,7 +9507,7 @@
 
     parseBindingAtom() {
       switch (this.state.type) {
-        case 74:
+        case 78:
           return this.parseIdentifier(true);
 
         default:
@@ -9409,7 +9518,7 @@
     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();
       }
 
@@ -9446,7 +9555,7 @@
       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;
@@ -9460,7 +9569,7 @@
         }
       }
 
-      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();
@@ -9576,7 +9685,7 @@
         node.callee = base;
         node.arguments = this.parseCallExpressionArguments(11, false);
         base = this.finishNode(node, "CallExpression");
-      } else if (base.type === "Identifier" && base.name === "async" && this.match(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;
@@ -9616,7 +9725,7 @@
         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;
@@ -9640,7 +9749,7 @@
     parseNewArguments(node) {
       var targs = null;
 
-      if (this.shouldParseTypes() && this.match(45)) {
+      if (this.shouldParseTypes() && this.match(47)) {
         targs = this.tryParse(() => this.flowParseTypeParameterInstantiationCallOrNew()).node;
       }
 
@@ -9815,7 +9924,7 @@
       var endOfInit = () => this.match(12) || this.match(8);
 
       switch (this.state.type) {
-        case 126:
+        case 130:
           {
             var literal = this.parseNumericLiteral(this.state.value);
 
@@ -9833,7 +9942,7 @@
             };
           }
 
-        case 125:
+        case 129:
           {
             var _literal = this.parseStringLiteral(this.state.value);
 
@@ -9851,10 +9960,10 @@
             };
           }
 
-        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 {
@@ -10047,7 +10156,7 @@
         enumName
       } = _ref15;
 
-      if (this.eatContextual(97)) {
+      if (this.eatContextual(101)) {
         if (!tokenIsIdentifier(this.state.type)) {
           throw this.flowEnumErrorInvalidExplicitType(this.state.startLoc, {
             enumName,
@@ -10500,14 +10609,14 @@
             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);
@@ -10575,7 +10684,7 @@
       }
 
       out += this.input.slice(chunkStart, this.state.pos++);
-      return this.finishToken(125, out);
+      return this.finishToken(129, out);
     }
 
     jsxReadEntity() {
@@ -10629,13 +10738,13 @@
         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);
@@ -10695,8 +10804,8 @@
 
           return node;
 
-        case 134:
-        case 125:
+        case 138:
+        case 129:
           return this.parseExprAtom();
 
         default:
@@ -10707,7 +10816,7 @@
     }
 
     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);
     }
 
@@ -10753,8 +10862,8 @@
     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");
       }
 
@@ -10765,26 +10874,26 @@
     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");
     }
 
@@ -10797,12 +10906,12 @@
       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;
               }
@@ -10810,7 +10919,7 @@
               children.push(this.jsxParseElementAt(startPos, startLoc));
               break;
 
-            case 133:
+            case 137:
               children.push(this.parseExprAtom());
               break;
 
@@ -10862,7 +10971,7 @@
 
       node.children = children;
 
-      if (this.match(45)) {
+      if (this.match(47)) {
         throw this.raise(JsxErrors.UnwrappedAdjacentJSXElements, {
           at: this.state.startLoc
         });
@@ -10886,12 +10995,12 @@
     }
 
     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);
@@ -10917,7 +11026,7 @@
 
         if (code === 62) {
           ++this.state.pos;
-          return this.finishToken(135);
+          return this.finishToken(139);
         }
 
         if ((code === 34 || code === 39) && context === types.j_oTag) {
@@ -10927,7 +11036,7 @@
 
       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);
@@ -10939,15 +11048,15 @@
         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 {
@@ -11163,7 +11272,7 @@
     }
 
     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() {
@@ -11264,7 +11373,7 @@
           return this.match(3);
 
         case "TypeParametersOrArguments":
-          return this.match(46);
+          return this.match(48);
       }
 
       throw new Error("Unreachable");
@@ -11330,7 +11439,7 @@
         if (bracket) {
           this.expect(0);
         } else {
-          this.expect(45);
+          this.expect(47);
         }
       }
 
@@ -11339,7 +11448,7 @@
       if (bracket) {
         this.expect(3);
       } else {
-        this.expect(46);
+        this.expect(48);
       }
 
       return result;
@@ -11347,10 +11456,10 @@
 
     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
         });
@@ -11363,7 +11472,7 @@
         node.qualifier = this.tsParseEntityName(true);
       }
 
-      if (this.match(45)) {
+      if (this.match(47)) {
         node.typeParameters = this.tsParseTypeArguments();
       }
 
@@ -11387,7 +11496,7 @@
       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();
       }
 
@@ -11411,9 +11520,9 @@
 
     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);
@@ -11425,13 +11534,13 @@
     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();
       }
     }
@@ -11439,7 +11548,7 @@
     tsParseTypeParameters() {
       var node = this.startNode();
 
-      if (this.match(45) || this.match(134)) {
+      if (this.match(47) || this.match(138)) {
         this.next();
       } else {
         this.unexpected();
@@ -11464,7 +11573,7 @@
     }
 
     tsTryNextParseConstantContext() {
-      if (this.lookahead().type === 71) {
+      if (this.lookahead().type === 75) {
         this.next();
         return this.tsParseTypeReference();
       }
@@ -11543,7 +11652,7 @@
       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
@@ -11552,7 +11661,7 @@
 
         var method = nodeAny;
 
-        if (method.kind && this.match(45)) {
+        if (method.kind && this.match(47)) {
           this.raise(TSErrors.AccesorCannotHaveTypeParameters, {
             at: this.state.curPosition()
           });
@@ -11625,15 +11734,15 @@
     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");
@@ -11674,11 +11783,11 @@
     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();
       }
 
@@ -11693,13 +11802,13 @@
       }
 
       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");
     }
 
@@ -11707,20 +11816,20 @@
       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);
@@ -11837,11 +11946,11 @@
 
       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:
@@ -11866,7 +11975,7 @@
     tsParseThisTypeOrThisTypePredicate() {
       var thisKeyword = this.tsParseThisTypeNode();
 
-      if (this.isContextual(109) && !this.hasPrecedingLineBreak()) {
+      if (this.isContextual(113) && !this.hasPrecedingLineBreak()) {
         return this.tsParseThisTypePredicate(thisKeyword);
       } else {
         return thisKeyword;
@@ -11875,19 +11984,19 @@
 
     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();
             }
 
@@ -11897,13 +12006,13 @@
 
           break;
 
-        case 74:
+        case 78:
           return this.tsParseThisTypeOrThisTypePredicate();
 
-        case 83:
+        case 87:
           return this.tsParseTypeQuery();
 
-        case 79:
+        case 83:
           return this.tsParseImportType();
 
         case 5:
@@ -11925,8 +12034,8 @@
               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();
@@ -11994,7 +12103,7 @@
 
     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");
@@ -12003,7 +12112,7 @@
 
     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) {
@@ -12024,15 +12133,15 @@
     }
 
     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;
       }
 
@@ -12040,7 +12149,7 @@
     }
 
     tsSkipParameterStart() {
-      if (tokenIsIdentifier(this.state.type) || this.match(74)) {
+      if (tokenIsIdentifier(this.state.type) || this.match(78)) {
         this.next();
         return true;
       }
@@ -12113,7 +12222,7 @@
         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") {
@@ -12168,21 +12277,21 @@
     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;
       }
 
@@ -12209,7 +12318,7 @@
       assert(this.state.inType);
       var type = this.tsParseNonConditionalType();
 
-      if (this.hasPrecedingLineBreak() || !this.eat(77)) {
+      if (this.hasPrecedingLineBreak() || !this.eat(81)) {
         return type;
       }
 
@@ -12224,7 +12333,7 @@
     }
 
     isAbstractConstructorSignature() {
-      return this.isContextual(116) && this.lookahead().type === 73;
+      return this.isContextual(120) && this.lookahead().type === 77;
     }
 
     tsParseNonConditionalType() {
@@ -12232,7 +12341,7 @@
         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);
@@ -12253,7 +12362,7 @@
       var _const = this.tsTryNextParseConstantContext();
 
       node.typeAnnotation = _const || this.tsNextThenParseType();
-      this.expect(46);
+      this.expect(48);
       node.expression = this.parseMaybeUnary();
       return this.finishNode(node, "TSTypeAssertion");
     }
@@ -12275,7 +12384,7 @@
       var node = this.startNode();
       node.expression = this.tsParseEntityName(false);
 
-      if (this.match(45)) {
+      if (this.match(47)) {
         node.typeParameters = this.tsParseTypeArguments();
       }
 
@@ -12295,7 +12404,7 @@
 
       node.typeParameters = this.tsTryParseTypeParameters();
 
-      if (this.eat(77)) {
+      if (this.eat(81)) {
         node.extends = this.tsParseHeritageClause("extends");
       }
 
@@ -12312,7 +12421,7 @@
       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();
@@ -12368,7 +12477,7 @@
 
     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();
@@ -12420,10 +12529,10 @@
     }
 
     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();
@@ -12461,7 +12570,7 @@
     }
 
     tsIsExternalModuleReference() {
-      return this.isContextual(112) && this.lookaheadCharCode() === 40;
+      return this.isContextual(116) && this.lookaheadCharCode() === 40;
     }
 
     tsParseModuleReference() {
@@ -12470,10 +12579,10 @@
 
     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();
       }
 
@@ -12516,33 +12625,33 @@
       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:
@@ -12596,7 +12705,7 @@
     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);
           }
 
@@ -12619,7 +12728,7 @@
 
         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);
@@ -12655,7 +12764,7 @@
     }
 
     tsTryParseGenericAsyncArrowFunction(startPos, startLoc) {
-      if (!this.match(45)) {
+      if (!this.match(47)) {
         return undefined;
       }
 
@@ -12678,10 +12787,18 @@
       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));
       }));
 
@@ -12691,7 +12808,7 @@
         });
       }
 
-      this.expect(46);
+      this.expect(48);
       return this.finishNode(node, "TSTypeParameterInstantiation");
     }
 
@@ -12839,7 +12956,7 @@
         this.next();
       }
 
-      if (this.match(45)) {
+      if (this.match(47) || this.match(51)) {
         var missingParenErrorLoc;
         var result = this.tsTryParseAndCatch(() => {
           if (!noCalls && this.atPossibleAsyncArrow(base)) {
@@ -12852,7 +12969,7 @@
 
           var node = this.startNodeAt(startPos, startLoc);
           node.callee = base;
-          var typeArguments = this.tsParseTypeArguments();
+          var typeArguments = this.tsParseTypeArgumentsInExpression();
 
           if (typeArguments) {
             if (isOptionalCall && !this.match(10)) {
@@ -12892,9 +13009,9 @@
     }
 
     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;
         });
@@ -12908,7 +13025,7 @@
     }
 
     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;
 
@@ -12935,10 +13052,10 @@
     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();
@@ -12961,10 +13078,10 @@
     }
 
     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 {
@@ -12977,14 +13094,14 @@
         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 {
@@ -12996,7 +13113,7 @@
     }
 
     isAbstractClass() {
-      return this.isContextual(116) && this.lookahead().type === 76;
+      return this.isContextual(120) && this.lookahead().type === 80;
     }
 
     parseExportDefaultExpression() {
@@ -13008,7 +13125,7 @@
         return cls;
       }
 
-      if (this.match(121)) {
+      if (this.match(125)) {
         var interfaceNode = this.startNode();
         this.next();
         var result = this.tsParseInterfaceDeclaration(interfaceNode);
@@ -13019,13 +13136,13 @@
     }
 
     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);
         }
       }
@@ -13048,7 +13165,7 @@
     }
 
     tsIsStartOfStaticBlocks() {
-      return this.isContextual(100) && this.lookaheadCharCode() === 123;
+      return this.isContextual(104) && this.lookaheadCharCode() === 123;
     }
 
     parseClassMember(classBody, member, state) {
@@ -13196,9 +13313,9 @@
     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
         });
@@ -13227,7 +13344,7 @@
     }
 
     parseClassId(node, isStatement, optionalId) {
-      if ((!isStatement || optionalId) && this.isContextual(106)) {
+      if ((!isStatement || optionalId) && this.isContextual(110)) {
         return;
       }
 
@@ -13317,11 +13434,11 @@
     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");
       }
     }
@@ -13377,7 +13494,7 @@
       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;
@@ -13391,7 +13508,7 @@
         }
       }
 
-      if (!((_jsx = jsx) != null && _jsx.error) && !this.match(45)) {
+      if (!((_jsx = jsx) != null && _jsx.error) && !this.match(47)) {
         return super.parseMaybeAssign(...args);
       }
 
@@ -13459,7 +13576,7 @@
     }
 
     parseMaybeUnary(refExpressionErrors) {
-      if (!this.hasPlugin("jsx") && this.match(45)) {
+      if (!this.hasPlugin("jsx") && this.match(47)) {
         return this.tsParseTypeAssertion();
       } else {
         return super.parseMaybeUnary(refExpressionErrors);
@@ -13591,7 +13708,7 @@
 
     parseBindingAtom() {
       switch (this.state.type) {
-        case 74:
+        case 78:
           return this.parseIdentifier(true);
 
         default:
@@ -13600,8 +13717,8 @@
     }
 
     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);
@@ -13625,7 +13742,7 @@
     }
 
     isClassMethod() {
-      return this.match(45) || super.isClassMethod();
+      return this.match(47) || super.isClassMethod();
     }
 
     isClassProperty() {
@@ -13647,11 +13764,11 @@
     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);
         }
       }
 
@@ -13663,15 +13780,29 @@
         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];
@@ -13722,8 +13853,8 @@
     }
 
     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;
       }
 
@@ -13777,10 +13908,10 @@
     }
 
     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, {
@@ -13790,7 +13921,7 @@
           return this.tsParseInterfaceDeclaration(node);
         }
       } else {
-        this.unexpected(null, 76);
+        this.unexpected(null, 80);
       }
     }
 
@@ -13867,10 +13998,10 @@
       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)) {
@@ -13905,7 +14036,7 @@
       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();
       }
 
@@ -13926,13 +14057,13 @@
 
   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);
       }
     }
@@ -13945,7 +14076,7 @@
 
     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);
@@ -13985,14 +14116,14 @@
         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;
       }
 
@@ -14038,7 +14169,7 @@
       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;
@@ -14062,7 +14193,7 @@
       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");
@@ -14077,11 +14208,11 @@
     }
 
     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;
           }
         }
@@ -14116,7 +14247,7 @@
       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");
@@ -14132,7 +14263,7 @@
         if (!hasStarImport) this.parseNamedImportSpecifiers(node);
       }
 
-      this.expectContextual(93);
+      this.expectContextual(97);
       node.source = this.parseImportSource();
       this.semicolon();
       return this.finishNode(node, "ImportDeclaration");
@@ -14146,7 +14277,7 @@
 
   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();
@@ -14213,7 +14344,7 @@
   }
 
   var PIPELINE_PROPOSALS = ["minimal", "fsharp", "hack", "smart"];
-  var TOPIC_TOKENS = ["^", "%", "#"];
+  var TOPIC_TOKENS = ["^^", "@@", "^", "%", "#"];
   var RECORD_AND_TUPLE_SYNTAX_TYPES = ["hash", "bar"];
 
   function validatePlugins(plugins) {
@@ -14396,8 +14527,19 @@
           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":
           {
@@ -14637,6 +14779,10 @@
 
       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);
       }
@@ -14829,7 +14975,7 @@
       this.nextToken();
       var expr = this.parseExpression();
 
-      if (!this.match(131)) {
+      if (!this.match(135)) {
         this.unexpected();
       }
 
@@ -14890,7 +15036,7 @@
       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();
 
@@ -14933,13 +15079,18 @@
         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;
         }
@@ -14982,7 +15133,7 @@
     }
 
     parseMaybeUnaryOrPrivate(refExpressionErrors) {
-      return this.match(130) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
+      return this.match(134) ? this.parsePrivateName() : this.parseMaybeUnary(refExpressionErrors);
     }
 
     parseExprOps(refExpressionErrors) {
@@ -15002,7 +15153,7 @@
       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);
@@ -15013,11 +15164,11 @@
 
       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) {
@@ -15030,19 +15181,19 @@
           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
               });
@@ -15053,7 +15204,7 @@
           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
             });
@@ -15071,7 +15222,7 @@
       var startLoc = this.state.startLoc;
 
       switch (op) {
-        case 37:
+        case 39:
           switch (this.getPluginOption("pipelineOperator", "proposal")) {
             case "hack":
               return this.withTopicBindingContext(() => {
@@ -15080,7 +15231,7 @@
 
             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);
@@ -15130,7 +15281,7 @@
     }
 
     checkExponentialAfterUnary(node) {
-      if (this.match(53)) {
+      if (this.match(57)) {
         this.raise(ErrorMessages.UnexpectedTokenUnaryExponentiation, {
           node: node.argument
         });
@@ -15140,7 +15291,7 @@
     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();
@@ -15158,11 +15309,11 @@
         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);
@@ -15194,7 +15345,7 @@
           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);
@@ -15303,7 +15454,7 @@
       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
@@ -15340,13 +15491,17 @@
       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;
       }
 
@@ -15356,15 +15511,16 @@
         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();
         }
@@ -15395,7 +15551,7 @@
     }
 
     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) {
@@ -15496,10 +15652,10 @@
       } = this.state;
 
       switch (type) {
-        case 75:
+        case 79:
           return this.parseSuper();
 
-        case 79:
+        case 83:
           node = this.startNode();
           this.next();
 
@@ -15515,42 +15671,42 @@
 
           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:
@@ -15581,18 +15737,18 @@
             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:
@@ -15615,7 +15771,7 @@
             }
           }
 
-        case 130:
+        case 134:
           {
             this.raise(ErrorMessages.PrivateInExpectedIn, {
               at: this.state.startLoc
@@ -15625,16 +15781,22 @@
 
         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");
@@ -15646,7 +15808,7 @@
             }
           }
 
-        case 45:
+        case 47:
           {
             var lookaheadCh = this.input.codePointAt(this.nextTokenStart());
 
@@ -15660,7 +15822,7 @@
 
         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();
             }
 
@@ -15674,7 +15836,7 @@
                 type: _type
               } = this.state;
 
-              if (_type === 64) {
+              if (_type === 68) {
                 this.resetPreviousNodeTrailingComments(id);
                 this.next();
                 return this.parseFunction(this.startNodeAtNode(id), undefined, true);
@@ -15684,7 +15846,7 @@
                 } else {
                   return id;
                 }
-              } else if (_type === 86) {
+              } else if (_type === 90) {
                 this.resetPreviousNodeTrailingComments(id);
                 return this.parseDo(this.startNodeAtNode(id), true);
               }
@@ -15844,7 +16006,7 @@
         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();
@@ -15874,7 +16036,7 @@
       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
@@ -15987,6 +16149,7 @@
       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);
@@ -16016,7 +16179,7 @@
       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;
       }
 
@@ -16209,7 +16372,7 @@
     }
 
     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) {
@@ -16250,10 +16413,10 @@
         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;
@@ -16261,7 +16424,7 @@
         if (keyName === "async" && !this.hasPrecedingLineBreak()) {
           isAsync = true;
           this.resetPreviousNodeTrailingComments(key);
-          isGenerator = this.eat(51);
+          isGenerator = this.eat(55);
           this.parsePropertyName(prop);
         }
 
@@ -16270,7 +16433,7 @@
           this.resetPreviousNodeTrailingComments(key);
           prop.kind = keyName;
 
-          if (this.match(51)) {
+          if (this.match(55)) {
             isGenerator = true;
             this.raise(ErrorMessages.AccessorIsGenerator, {
               at: this.state.curPosition()
@@ -16370,7 +16533,7 @@
       return node;
     }
 
-    parsePropertyName(prop) {
+    parsePropertyName(prop, refExpressionErrors) {
       if (this.eat(0)) {
         prop.computed = true;
         prop.key = this.parseMaybeAssignAllowIn();
@@ -16386,27 +16549,36 @@
           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;
               }
@@ -16418,7 +16590,7 @@
 
         prop.key = key;
 
-        if (type !== 130) {
+        if (type !== 134) {
           prop.computed = false;
         }
       }
@@ -16640,7 +16812,7 @@
 
       if (liberal) {
         if (tokenIsKeyword) {
-          this.replaceToken(124);
+          this.replaceToken(128);
         }
       } else {
         this.checkReservedWord(name, startLoc, tokenIsKeyword, false);
@@ -16721,7 +16893,7 @@
       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
         });
@@ -16747,7 +16919,7 @@
       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() {
@@ -16758,11 +16930,11 @@
       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:
@@ -16980,7 +17152,7 @@
 
       if (typeof type === "number") {
         {
-          if (type === 130) {
+          if (type === 134) {
             var {
               loc,
               start,
@@ -16997,7 +17169,7 @@
               startLoc: loc.start,
               endLoc: hashEndLoc
             }), new Token({
-              type: getExportedToken(124),
+              type: getExportedToken(128),
               value: value,
               start: hashEndPos,
               end: end,
@@ -17102,7 +17274,7 @@
     }
 
     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();
@@ -17147,7 +17319,7 @@
     }
 
     isLet(context) {
-      if (!this.isContextual(95)) {
+      if (!this.isContextual(99)) {
         return false;
       }
 
@@ -17196,27 +17368,27 @@
       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) {
@@ -17233,27 +17405,27 @@
 
           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") {
@@ -17264,10 +17436,10 @@
 
           return this.parseVarStatement(node, kind);
 
-        case 88:
+        case 92:
           return this.parseWhileStatement(node);
 
-        case 72:
+        case 76:
           return this.parseWithStatement(node);
 
         case 5:
@@ -17276,7 +17448,7 @@
         case 13:
           return this.parseEmptyStatement(node);
 
-        case 79:
+        case 83:
           {
             var nextTokenCharCode = this.lookaheadCharCode();
 
@@ -17285,7 +17457,7 @@
             }
           }
 
-        case 78:
+        case 82:
           {
             if (!this.options.allowImportExportEverywhere && !topLevel) {
               this.raise(ErrorMessages.UnexpectedImportExport, {
@@ -17296,7 +17468,7 @@
             this.next();
             var result;
 
-            if (starttype === 79) {
+            if (starttype === 83) {
               result = this.parseImport(node);
 
               if (result.type === "ImportDeclaration" && (!result.importKind || result.importKind === "value")) {
@@ -17358,7 +17530,7 @@
     }
 
     canHaveLeadingDecorator() {
-      return this.match(76);
+      return this.match(80);
     }
 
     parseDecorators(allowExport) {
@@ -17369,7 +17541,7 @@
         currentContextDecorators.push(decorator);
       }
 
-      if (this.match(78)) {
+      if (this.match(82)) {
         if (!allowExport) {
           this.unexpected();
         }
@@ -17485,7 +17657,7 @@
       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");
@@ -17496,7 +17668,7 @@
       this.state.labels.push(loopLabel);
       var awaitAt = null;
 
-      if (this.isAwaitAllowed() && this.eatContextual(92)) {
+      if (this.isAwaitAllowed() && this.eatContextual(96)) {
         awaitAt = this.state.lastTokStartLoc;
       }
 
@@ -17511,10 +17683,10 @@
         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;
@@ -17522,7 +17694,7 @@
         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);
         }
 
@@ -17533,10 +17705,10 @@
         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) {
@@ -17552,7 +17724,8 @@
         }
       }
 
-      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);
@@ -17577,7 +17750,7 @@
       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");
     }
 
@@ -17610,8 +17783,8 @@
       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 = [];
@@ -17674,7 +17847,7 @@
       node.block = this.parseBlock();
       node.handler = null;
 
-      if (this.match(58)) {
+      if (this.match(62)) {
         var clause = this.startNode();
         this.next();
 
@@ -17692,7 +17865,7 @@
         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, {
@@ -17746,7 +17919,7 @@
         }
       }
 
-      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];
@@ -17864,7 +18037,7 @@
     }
 
     parseForIn(node, init, awaitAt) {
-      var isForIn = this.match(54);
+      var isForIn = this.match(58);
       this.next();
 
       if (isForIn) {
@@ -17906,13 +18079,13 @@
         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");
@@ -17941,13 +18114,13 @@
       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);
@@ -18098,7 +18271,7 @@
     }
 
     parseClassMember(classBody, member, state) {
-      var isStatic = this.isContextual(100);
+      var isStatic = this.isContextual(104);
 
       if (isStatic) {
         if (this.parseClassMemberFromModifier(classBody, member)) {
@@ -18119,14 +18292,15 @@
       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) {
@@ -18145,7 +18319,7 @@
       }
 
       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);
@@ -18189,7 +18363,7 @@
         }
       } 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);
@@ -18197,7 +18371,7 @@
 
         method.kind = "method";
 
-        var _isPrivate = this.match(130);
+        var _isPrivate = this.match(134);
 
         this.parseClassElementName(method);
         this.parsePostMemberNameModifiers(publicMember);
@@ -18213,11 +18387,11 @@
 
           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);
 
@@ -18234,6 +18408,14 @@
         }
 
         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);
@@ -18251,13 +18433,13 @@
         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
@@ -18309,6 +18491,25 @@
       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));
     }
@@ -18338,6 +18539,12 @@
       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());
@@ -18369,7 +18576,7 @@
     }
 
     parseClassSuper(node) {
-      node.superClass = this.eat(77) ? this.parseExprSubscripts() : null;
+      node.superClass = this.eat(81) ? this.parseExprSubscripts() : null;
     }
 
     parseExport(node) {
@@ -18406,7 +18613,7 @@
         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");
@@ -18416,7 +18623,7 @@
     }
 
     eatExportStar(node) {
-      return this.eat(51);
+      return this.eat(55);
     }
 
     maybeParseExportDefaultSpecifier(node) {
@@ -18432,7 +18639,7 @@
     }
 
     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();
@@ -18479,7 +18686,7 @@
     }
 
     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");
     }
@@ -18488,7 +18695,7 @@
       var expr = this.startNode();
       var isAsync = this.isAsyncFunction();
 
-      if (this.match(64) || isAsync) {
+      if (this.match(68) || isAsync) {
         this.next();
 
         if (isAsync) {
@@ -18498,7 +18705,7 @@
         return this.parseFunction(expr, FUNC_STATEMENT | FUNC_NULLABLE_ID, isAsync);
       }
 
-      if (this.match(76)) {
+      if (this.match(80)) {
         return this.parseClass(expr, true, true);
       }
 
@@ -18513,7 +18720,7 @@
         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
         });
@@ -18534,21 +18741,21 @@
       } = 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;
       }
 
@@ -18559,7 +18766,7 @@
         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;
       }
@@ -18568,7 +18775,7 @@
     }
 
     parseExportFrom(node, expect) {
-      if (this.eatContextual(93)) {
+      if (this.eatContextual(97)) {
         node.source = this.parseImportSource();
         this.checkExport(node);
         var assertions = this.maybeParseImportAssertions();
@@ -18602,7 +18809,7 @@
         }
       }
 
-      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) {
@@ -18711,8 +18918,8 @@
           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));
@@ -18722,7 +18929,7 @@
     }
 
     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);
@@ -18734,7 +18941,7 @@
     }
 
     parseModuleExportName() {
-      if (this.match(125)) {
+      if (this.match(129)) {
         var result = this.parseStringLiteral(this.state.value);
         var surrogate = result.value.match(loneSurrogate);
 
@@ -18753,12 +18960,12 @@
     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();
@@ -18779,7 +18986,7 @@
     }
 
     parseImportSource() {
-      if (!this.match(125)) this.unexpected();
+      if (!this.match(129)) this.unexpected();
       return this.parseExprAtom();
     }
 
@@ -18813,7 +19020,7 @@
 
         attrNames.add(keyName);
 
-        if (this.match(125)) {
+        if (this.match(129)) {
           node.key = this.parseStringLiteral(keyName);
         } else {
           node.key = this.parseIdentifier(true);
@@ -18821,7 +19028,7 @@
 
         this.expect(14);
 
-        if (!this.match(125)) {
+        if (!this.match(129)) {
           throw this.raise(ErrorMessages.ModuleAttributeInvalidValue, {
             at: this.state.startLoc
           });
@@ -18836,7 +19043,7 @@
     }
 
     maybeParseModuleAttributes() {
-      if (this.match(72) && !this.hasPrecedingLineBreak()) {
+      if (this.match(76) && !this.hasPrecedingLineBreak()) {
         this.expectPlugin("moduleAttributes");
         this.next();
       } else {
@@ -18866,7 +19073,7 @@
         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
           });
@@ -18881,7 +19088,7 @@
     }
 
     maybeParseImportAssertions() {
-      if (this.isContextual(90) && !this.hasPrecedingLineBreak()) {
+      if (this.isContextual(94) && !this.hasPrecedingLineBreak()) {
         this.expectPlugin("importAssertions");
         this.next();
       } else {
@@ -18905,10 +19112,10 @@
     }
 
     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;
       }
@@ -18935,8 +19142,8 @@
         }
 
         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);
@@ -18944,7 +19151,7 @@
     }
 
     parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly) {
-      if (this.eatContextual(89)) {
+      if (this.eatContextual(93)) {
         specifier.local = this.parseIdentifier();
       } else {
         var {
@@ -20073,11 +20280,13 @@
         // istanbul ignore else
         if (editor.includes(".")) {
           var namespace = editor.split(".")[0];
-          var find = brickMap.get(namespace);
+          var find = brickMap.get(namespace); // There maybe no `editorsJsFilePath`.
 
           if (find) {
-            deps.add(find.editorsJsFilePath);
-            dll.add("editor-bricks-helper");
+            if (find.editorsJsFilePath) {
+              deps.add(find.editorsJsFilePath);
+              dll.add("editor-bricks-helper");
+            }
           } else {
             // eslint-disable-next-line no-console
             console.error("the name of editor is `".concat(editor, "` and it don't match any editor package"));
@@ -21751,23 +21960,24 @@
 
   var yamlFieldsInBrick = ["permissionsPreCheck", "transformFrom"]; // Fields started with `_` will be removed by default.
 
-  var fieldsToRemoveInRoute = ["appId", "children", "creator", "ctime", "id", "instanceId", "graphInfo", "modifier", "mountPoint", "mtime", "org", "parent", "sort", "name", "providersBak", "providers_bak", "deleteAuthorizers", "readAuthorizers", "updateAuthorizers"];
-  var fieldsToRemoveInBrick = fieldsToRemoveInRoute.concat("type", "alias"); // Those fields can be disposed if value is null.
+  var baseFieldsToRemove = ["appId", "children", "creator", "ctime", "id", "graphInfo", "modifier", "mountPoint", "mtime", "org", "parent", "sort", "name", "providersBak", "providers_bak", "deleteAuthorizers", "readAuthorizers", "updateAuthorizers"];
+  var fieldsToRemoveInRoute = baseFieldsToRemove.concat("instanceId");
+  var fieldsToRemoveInBrick = baseFieldsToRemove.concat("type", "alias"); // Those fields can be disposed if value is null.
 
   var disposableNullFields = ["alias", "documentId", "hybrid", "bg", "context", "exports", "ref", "portal", "analyticsData"];
   function normalizeBuilderNode(node) {
     if (isBrickNode(node)) {
-      return normalize(node, fieldsToRemoveInBrick, jsonFieldsInBrick, yamlFieldsInBrick, false);
+      return normalize(node, fieldsToRemoveInBrick, jsonFieldsInBrick, yamlFieldsInBrick, "brick");
     }
 
     if (isRouteNode(node)) {
-      return normalize(node, fieldsToRemoveInRoute, jsonFieldsInRoute, yamlFieldsInRoute, true);
+      return normalize(node, fieldsToRemoveInRoute, jsonFieldsInRoute, yamlFieldsInRoute, "route");
     }
 
     return null;
   }
 
-  function normalize(node, fieldsToRemove, jsonFields, yamlFields, cleanUpSegues) {
+  function normalize(node, fieldsToRemove, jsonFields, yamlFields, type) {
     return Object.fromEntries(Object.entries(node) // Remove unused fields from CMDB.
     // Consider fields started with `_` as unused.
     .filter(_ref => {
@@ -21776,7 +21986,7 @@
     }) // Parse specific fields.
     .map(_ref2 => {
       var [key, value] = _ref2;
-      return [key, cleanUpSegues && key === "segues" ? getCleanSegues(value) : jsonFields.includes(key) ? safeJsonParse(value) : yamlFields.includes(key) ? safeYamlParse(value) : lodash.cloneDeep(value)];
+      return [key === "instanceId" ? "iid" : key, type === "route" && key === "segues" ? getCleanSegues(value) : jsonFields.includes(key) ? safeJsonParse(value) : yamlFields.includes(key) ? safeYamlParse(value) : lodash.cloneDeep(value)];
     }));
   } // Clear `segue._view` which is for development only.