@next-core/brick-utils 2.43.1 → 2.43.2

package/dist/index.esm.js

@@ -492,7 +492,7 @@ function createProviderClass(api) {
   };
 }
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -3120,10 +3120,10 @@ function createPositionWithColumnOffset(position, columnOffset) {
   return new Position(line, column + columnOffset, index + columnOffset);
 }
 
-var ParseErrorCodes = Object.freeze({
+var ParseErrorCode = {
   SyntaxError: "BABEL_PARSER_SYNTAX_ERROR",
   SourceTypeModuleError: "BABEL_PARSER_SOURCETYPE_MODULE_REQUIRED"
-});
+};
 
 var reflect = function (keys) {
   var last = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : keys.length - 1;
@@ -3139,42 +3139,47 @@ var reflect = function (keys) {
   };
 };
 
-var instantiate = (constructor, properties, descriptors) => Object.keys(descriptors).map(key => [key, descriptors[key]]).filter(_ref2 => {
-  var [, descriptor] = _ref2;
+var instantiate = (constructor, properties, descriptors) => Object.keys(descriptors).map(key => [key, descriptors[key]]).filter(_ref3 => {
+  var [, descriptor] = _ref3;
   return !!descriptor;
-}).map(_ref3 => {
-  var [key, descriptor] = _ref3;
+}).map(_ref4 => {
+  var [key, descriptor] = _ref4;
   return [key, typeof descriptor === "function" ? {
     value: descriptor,
     enumerable: false
   } : typeof descriptor.reflect === "string" ? Object.assign({}, descriptor, reflect(descriptor.reflect.split("."))) : descriptor];
-}).reduce((instance, _ref4) => {
-  var [key, descriptor] = _ref4;
+}).reduce((instance, _ref5) => {
+  var [key, descriptor] = _ref5;
   return Object.defineProperty(instance, key, Object.assign({
     configurable: true
   }, descriptor));
 }, Object.assign(new constructor(), properties));
 
-var ModuleErrors = _ => ({
-  ImportMetaOutsideModule: _("import.meta may appear only with 'sourceType: \"module\"'", {
-    code: ParseErrorCodes.SourceTypeModuleError
-  }),
-  ImportOutsideModule: _("'import' and 'export' may appear only with 'sourceType: \"module\"'", {
-    code: ParseErrorCodes.SourceTypeModuleError
-  })
-});
-
+var ModuleErrors = {
+  ImportMetaOutsideModule: {
+    message: "import.meta may appear only with 'sourceType: \"module\"'",
+    code: ParseErrorCode.SourceTypeModuleError
+  },
+  ImportOutsideModule: {
+    message: "'import' and 'export' may appear only with 'sourceType: \"module\"'",
+    code: ParseErrorCode.SourceTypeModuleError
+  }
+};
 var NodeDescriptions = {
   ArrayPattern: "array destructuring pattern",
   AssignmentExpression: "assignment expression",
   AssignmentPattern: "assignment expression",
   ArrowFunctionExpression: "arrow function expression",
   ConditionalExpression: "conditional expression",
+  CatchClause: "catch clause",
   ForOfStatement: "for-of statement",
   ForInStatement: "for-in statement",
   ForStatement: "for-loop",
   FormalParameters: "function parameter list",
   Identifier: "identifier",
+  ImportSpecifier: "import specifier",
+  ImportDefaultSpecifier: "import default specifier",
+  ImportNamespaceSpecifier: "import namespace specifier",
   ObjectPattern: "object destructuring pattern",
   ParenthesizedExpression: "parenthesized expression",
   RestElement: "rest element",
@@ -3186,349 +3191,347 @@ var NodeDescriptions = {
   YieldExpression: "yield expression"
 };
 
-var toNodeDescription = _ref5 => {
+var toNodeDescription = _ref6 => {
   var {
     type,
     prefix
-  } = _ref5;
+  } = _ref6;
   return type === "UpdateExpression" ? NodeDescriptions.UpdateExpression[String(prefix)] : NodeDescriptions[type];
 };
 
-var StandardErrors = _ => ({
-  AccessorIsGenerator: _(_ref6 => {
+var StandardErrors = {
+  AccessorIsGenerator: _ref7 => {
     var {
       kind
-    } = _ref6;
+    } = _ref7;
     return "A ".concat(kind, "ter cannot be a generator.");
-  }),
-  ArgumentsInClass: _("'arguments' is only allowed in functions and class methods."),
-  AsyncFunctionInSingleStatementContext: _("Async functions can only be declared at the top level or inside a block."),
-  AwaitBindingIdentifier: _("Can not use 'await' as identifier inside an async function."),
-  AwaitBindingIdentifierInStaticBlock: _("Can not use 'await' as identifier inside a static block."),
-  AwaitExpressionFormalParameter: _("'await' is not allowed in async function parameters."),
-  AwaitNotInAsyncContext: _("'await' is only allowed within async functions and at the top levels of modules."),
-  AwaitNotInAsyncFunction: _("'await' is only allowed within async functions."),
-  BadGetterArity: _("A 'get' accesor must not have any formal parameters."),
-  BadSetterArity: _("A 'set' accesor must have exactly one formal parameter."),
-  BadSetterRestParameter: _("A 'set' accesor function argument must not be a rest parameter."),
-  ConstructorClassField: _("Classes may not have a field named 'constructor'."),
-  ConstructorClassPrivateField: _("Classes may not have a private field named '#constructor'."),
-  ConstructorIsAccessor: _("Class constructor may not be an accessor."),
-  ConstructorIsAsync: _("Constructor can't be an async function."),
-  ConstructorIsGenerator: _("Constructor can't be a generator."),
-  DeclarationMissingInitializer: _(_ref7 => {
+  },
+  ArgumentsInClass: "'arguments' is only allowed in functions and class methods.",
+  AsyncFunctionInSingleStatementContext: "Async functions can only be declared at the top level or inside a block.",
+  AwaitBindingIdentifier: "Can not use 'await' as identifier inside an async function.",
+  AwaitBindingIdentifierInStaticBlock: "Can not use 'await' as identifier inside a static block.",
+  AwaitExpressionFormalParameter: "'await' is not allowed in async function parameters.",
+  AwaitNotInAsyncContext: "'await' is only allowed within async functions and at the top levels of modules.",
+  AwaitNotInAsyncFunction: "'await' is only allowed within async functions.",
+  BadGetterArity: "A 'get' accesor must not have any formal parameters.",
+  BadSetterArity: "A 'set' accesor must have exactly one formal parameter.",
+  BadSetterRestParameter: "A 'set' accesor function argument must not be a rest parameter.",
+  ConstructorClassField: "Classes may not have a field named 'constructor'.",
+  ConstructorClassPrivateField: "Classes may not have a private field named '#constructor'.",
+  ConstructorIsAccessor: "Class constructor may not be an accessor.",
+  ConstructorIsAsync: "Constructor can't be an async function.",
+  ConstructorIsGenerator: "Constructor can't be a generator.",
+  DeclarationMissingInitializer: _ref8 => {
     var {
       kind
-    } = _ref7;
+    } = _ref8;
     return "Missing initializer in ".concat(kind, " declaration.");
-  }),
-  DecoratorBeforeExport: _("Decorators must be placed *before* the 'export' keyword. You can set the 'decoratorsBeforeExport' option to false to use the 'export @decorator class {}' syntax."),
-  DecoratorConstructor: _("Decorators can't be used with a constructor. Did you mean '@dec class { ... }'?"),
-  DecoratorExportClass: _("Using the export keyword between a decorator and a class is not allowed. Please use `export @dec class` instead."),
-  DecoratorSemicolon: _("Decorators must not be followed by a semicolon."),
-  DecoratorStaticBlock: _("Decorators can't be used with a static block."),
-  DeletePrivateField: _("Deleting a private field is not allowed."),
-  DestructureNamedImport: _("ES2015 named imports do not destructure. Use another statement for destructuring after the import."),
-  DuplicateConstructor: _("Duplicate constructor in the same class."),
-  DuplicateDefaultExport: _("Only one default export allowed per module."),
-  DuplicateExport: _(_ref8 => {
+  },
+  DecoratorArgumentsOutsideParentheses: "Decorator arguments must be moved inside parentheses: use '@(decorator(args))' instead of '@(decorator)(args)'.",
+  DecoratorBeforeExport: "Decorators must be placed *before* the 'export' keyword. You can set the 'decoratorsBeforeExport' option to false to use the 'export @decorator class {}' syntax.",
+  DecoratorConstructor: "Decorators can't be used with a constructor. Did you mean '@dec class { ... }'?",
+  DecoratorExportClass: "Using the export keyword between a decorator and a class is not allowed. Please use `export @dec class` instead.",
+  DecoratorSemicolon: "Decorators must not be followed by a semicolon.",
+  DecoratorStaticBlock: "Decorators can't be used with a static block.",
+  DeletePrivateField: "Deleting a private field is not allowed.",
+  DestructureNamedImport: "ES2015 named imports do not destructure. Use another statement for destructuring after the import.",
+  DuplicateConstructor: "Duplicate constructor in the same class.",
+  DuplicateDefaultExport: "Only one default export allowed per module.",
+  DuplicateExport: _ref9 => {
     var {
       exportName
-    } = _ref8;
+    } = _ref9;
     return "`".concat(exportName, "` has already been exported. Exported identifiers must be unique.");
-  }),
-  DuplicateProto: _("Redefinition of __proto__ property."),
-  DuplicateRegExpFlags: _("Duplicate regular expression flag."),
-  ElementAfterRest: _("Rest element must be last element."),
-  EscapedCharNotAnIdentifier: _("Invalid Unicode escape."),
-  ExportBindingIsString: _(_ref9 => {
+  },
+  DuplicateProto: "Redefinition of __proto__ property.",
+  DuplicateRegExpFlags: "Duplicate regular expression flag.",
+  ElementAfterRest: "Rest element must be last element.",
+  EscapedCharNotAnIdentifier: "Invalid Unicode escape.",
+  ExportBindingIsString: _ref10 => {
     var {
       localName,
       exportName
-    } = _ref9;
+    } = _ref10;
     return "A string literal cannot be used as an exported binding without `from`.\n- Did you mean `export { '".concat(localName, "' as '").concat(exportName, "' } from 'some-module'`?");
-  }),
-  ExportDefaultFromAsIdentifier: _("'from' is not allowed as an identifier after 'export default'."),
-  ForInOfLoopInitializer: _(_ref10 => {
+  },
+  ExportDefaultFromAsIdentifier: "'from' is not allowed as an identifier after 'export default'.",
+  ForInOfLoopInitializer: _ref11 => {
     var {
       type
-    } = _ref10;
+    } = _ref11;
     return "'".concat(type === "ForInStatement" ? "for-in" : "for-of", "' loop variable declaration may not have an initializer.");
-  }),
-  ForOfAsync: _("The left-hand side of a for-of loop may not be 'async'."),
-  ForOfLet: _("The left-hand side of a for-of loop may not start with 'let'."),
-  GeneratorInSingleStatementContext: _("Generators can only be declared at the top level or inside a block."),
-  IllegalBreakContinue: _(_ref11 => {
+  },
+  ForOfAsync: "The left-hand side of a for-of loop may not be 'async'.",
+  ForOfLet: "The left-hand side of a for-of loop may not start with 'let'.",
+  GeneratorInSingleStatementContext: "Generators can only be declared at the top level or inside a block.",
+  IllegalBreakContinue: _ref12 => {
     var {
       type
-    } = _ref11;
+    } = _ref12;
     return "Unsyntactic ".concat(type === "BreakStatement" ? "break" : "continue", ".");
-  }),
-  IllegalLanguageModeDirective: _("Illegal 'use strict' directive in function with non-simple parameter list."),
-  IllegalReturn: _("'return' outside of function."),
-  ImportBindingIsString: _(_ref12 => {
+  },
+  IllegalLanguageModeDirective: "Illegal 'use strict' directive in function with non-simple parameter list.",
+  IllegalReturn: "'return' outside of function.",
+  ImportBindingIsString: _ref13 => {
     var {
       importName
-    } = _ref12;
+    } = _ref13;
     return "A string literal cannot be used as an imported binding.\n- Did you mean `import { \"".concat(importName, "\" as foo }`?");
-  }),
-  ImportCallArgumentTrailingComma: _("Trailing comma is disallowed inside import(...) arguments."),
-  ImportCallArity: _(_ref13 => {
+  },
+  ImportCallArgumentTrailingComma: "Trailing comma is disallowed inside import(...) arguments.",
+  ImportCallArity: _ref14 => {
     var {
       maxArgumentCount
-    } = _ref13;
+    } = _ref14;
     return "`import()` requires exactly ".concat(maxArgumentCount === 1 ? "one argument" : "one or two arguments", ".");
-  }),
-  ImportCallNotNewExpression: _("Cannot use new with import(...)."),
-  ImportCallSpreadArgument: _("`...` is not allowed in `import()`."),
-  ImportJSONBindingNotDefault: _("A JSON module can only be imported with `default`."),
-  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."),
-  InvalidDecimal: _("Invalid decimal."),
-  InvalidDigit: _(_ref14 => {
+  },
+  ImportCallNotNewExpression: "Cannot use new with import(...).",
+  ImportCallSpreadArgument: "`...` is not allowed in `import()`.",
+  ImportJSONBindingNotDefault: "A JSON module can only be imported with `default`.",
+  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.",
+  InvalidDecimal: "Invalid decimal.",
+  InvalidDigit: _ref15 => {
     var {
       radix
-    } = _ref14;
+    } = _ref15;
     return "Expected number in radix ".concat(radix, ".");
-  }),
-  InvalidEscapeSequence: _("Bad character escape sequence."),
-  InvalidEscapeSequenceTemplate: _("Invalid escape sequence in template."),
-  InvalidEscapedReservedWord: _(_ref15 => {
+  },
+  InvalidEscapeSequence: "Bad character escape sequence.",
+  InvalidEscapeSequenceTemplate: "Invalid escape sequence in template.",
+  InvalidEscapedReservedWord: _ref16 => {
     var {
       reservedWord
-    } = _ref15;
+    } = _ref16;
     return "Escape sequence in keyword ".concat(reservedWord, ".");
-  }),
-  InvalidIdentifier: _(_ref16 => {
+  },
+  InvalidIdentifier: _ref17 => {
     var {
       identifierName
-    } = _ref16;
+    } = _ref17;
     return "Invalid identifier ".concat(identifierName, ".");
-  }),
-  InvalidLhs: _(_ref17 => {
+  },
+  InvalidLhs: _ref18 => {
     var {
       ancestor
-    } = _ref17;
+    } = _ref18;
     return "Invalid left-hand side in ".concat(toNodeDescription(ancestor), ".");
-  }),
-  InvalidLhsBinding: _(_ref18 => {
+  },
+  InvalidLhsBinding: _ref19 => {
     var {
       ancestor
-    } = _ref18;
+    } = _ref19;
     return "Binding invalid left-hand side in ".concat(toNodeDescription(ancestor), ".");
-  }),
-  InvalidNumber: _("Invalid number."),
-  InvalidOrMissingExponent: _("Floating-point numbers require a valid exponent after the 'e'."),
-  InvalidOrUnexpectedToken: _(_ref19 => {
+  },
+  InvalidNumber: "Invalid number.",
+  InvalidOrMissingExponent: "Floating-point numbers require a valid exponent after the 'e'.",
+  InvalidOrUnexpectedToken: _ref20 => {
     var {
       unexpected
-    } = _ref19;
+    } = _ref20;
     return "Unexpected character '".concat(unexpected, "'.");
-  }),
-  InvalidParenthesizedAssignment: _("Invalid parenthesized assignment pattern."),
-  InvalidPrivateFieldResolution: _(_ref20 => {
+  },
+  InvalidParenthesizedAssignment: "Invalid parenthesized assignment pattern.",
+  InvalidPrivateFieldResolution: _ref21 => {
     var {
       identifierName
-    } = _ref20;
+    } = _ref21;
     return "Private name #".concat(identifierName, " is not defined.");
-  }),
-  InvalidPropertyBindingPattern: _("Binding member expression."),
-  InvalidRecordProperty: _("Only properties and spread elements are allowed in record definitions."),
-  InvalidRestAssignmentPattern: _("Invalid rest operator's argument."),
-  LabelRedeclaration: _(_ref21 => {
+  },
+  InvalidPropertyBindingPattern: "Binding member expression.",
+  InvalidRecordProperty: "Only properties and spread elements are allowed in record definitions.",
+  InvalidRestAssignmentPattern: "Invalid rest operator's argument.",
+  LabelRedeclaration: _ref22 => {
     var {
       labelName
-    } = _ref21;
+    } = _ref22;
     return "Label '".concat(labelName, "' is already declared.");
-  }),
-  LetInLexicalBinding: _("'let' is not allowed to be used as a name in 'let' or 'const' declarations."),
-  LineTerminatorBeforeArrow: _("No line break is allowed before '=>'."),
-  MalformedRegExpFlags: _("Invalid regular expression flag."),
-  MissingClassName: _("A class name is required."),
-  MissingEqInAssignment: _("Only '=' operator can be used for specifying default value."),
-  MissingSemicolon: _("Missing semicolon."),
-  MissingPlugin: _(_ref22 => {
+  },
+  LetInLexicalBinding: "'let' is not allowed to be used as a name in 'let' or 'const' declarations.",
+  LineTerminatorBeforeArrow: "No line break is allowed before '=>'.",
+  MalformedRegExpFlags: "Invalid regular expression flag.",
+  MissingClassName: "A class name is required.",
+  MissingEqInAssignment: "Only '=' operator can be used for specifying default value.",
+  MissingSemicolon: "Missing semicolon.",
+  MissingPlugin: _ref23 => {
     var {
       missingPlugin
-    } = _ref22;
+    } = _ref23;
     return "This experimental syntax requires enabling the parser plugin: ".concat(missingPlugin.map(name => JSON.stringify(name)).join(", "), ".");
-  }),
-  MissingOneOfPlugins: _(_ref23 => {
+  },
+  MissingOneOfPlugins: _ref24 => {
     var {
       missingPlugin
-    } = _ref23;
+    } = _ref24;
     return "This experimental syntax requires enabling one of the following parser plugin(s): ".concat(missingPlugin.map(name => JSON.stringify(name)).join(", "), ".");
-  }),
-  MissingUnicodeEscape: _("Expecting Unicode escape sequence \\uXXXX."),
-  MixingCoalesceWithLogical: _("Nullish coalescing operator(??) requires parens when mixing with logical operators."),
-  ModuleAttributeDifferentFromType: _("The only accepted module attribute is `type`."),
-  ModuleAttributeInvalidValue: _("Only string literals are allowed as module attribute values."),
-  ModuleAttributesWithDuplicateKeys: _(_ref24 => {
+  },
+  MissingUnicodeEscape: "Expecting Unicode escape sequence \\uXXXX.",
+  MixingCoalesceWithLogical: "Nullish coalescing operator(??) requires parens when mixing with logical operators.",
+  ModuleAttributeDifferentFromType: "The only accepted module attribute is `type`.",
+  ModuleAttributeInvalidValue: "Only string literals are allowed as module attribute values.",
+  ModuleAttributesWithDuplicateKeys: _ref25 => {
     var {
       key
-    } = _ref24;
+    } = _ref25;
     return "Duplicate key \"".concat(key, "\" is not allowed in module attributes.");
-  }),
-  ModuleExportNameHasLoneSurrogate: _(_ref25 => {
+  },
+  ModuleExportNameHasLoneSurrogate: _ref26 => {
     var {
       surrogateCharCode
-    } = _ref25;
+    } = _ref26;
     return "An export name cannot include a lone surrogate, found '\\u".concat(surrogateCharCode.toString(16), "'.");
-  }),
-  ModuleExportUndefined: _(_ref26 => {
+  },
+  ModuleExportUndefined: _ref27 => {
     var {
       localName
-    } = _ref26;
+    } = _ref27;
     return "Export '".concat(localName, "' is not defined.");
-  }),
-  MultipleDefaultsInSwitch: _("Multiple default clauses."),
-  NewlineAfterThrow: _("Illegal newline after throw."),
-  NoCatchOrFinally: _("Missing catch or finally clause."),
-  NumberIdentifier: _("Identifier directly after number."),
-  NumericSeparatorInEscapeSequence: _("Numeric separators are not allowed inside unicode escape sequences or hex escape sequences."),
-  ObsoleteAwaitStar: _("'await*' has been removed from the async functions proposal. Use Promise.all() instead."),
-  OptionalChainingNoNew: _("Constructors in/after an Optional Chain are not allowed."),
-  OptionalChainingNoTemplate: _("Tagged Template Literals are not allowed in optionalChain."),
-  OverrideOnConstructor: _("'override' modifier cannot appear on a constructor declaration."),
-  ParamDupe: _("Argument name clash."),
-  PatternHasAccessor: _("Object pattern can't contain getter or setter."),
-  PatternHasMethod: _("Object pattern can't contain methods."),
-  PrivateInExpectedIn: _(_ref27 => {
+  },
+  MultipleDefaultsInSwitch: "Multiple default clauses.",
+  NewlineAfterThrow: "Illegal newline after throw.",
+  NoCatchOrFinally: "Missing catch or finally clause.",
+  NumberIdentifier: "Identifier directly after number.",
+  NumericSeparatorInEscapeSequence: "Numeric separators are not allowed inside unicode escape sequences or hex escape sequences.",
+  ObsoleteAwaitStar: "'await*' has been removed from the async functions proposal. Use Promise.all() instead.",
+  OptionalChainingNoNew: "Constructors in/after an Optional Chain are not allowed.",
+  OptionalChainingNoTemplate: "Tagged Template Literals are not allowed in optionalChain.",
+  OverrideOnConstructor: "'override' modifier cannot appear on a constructor declaration.",
+  ParamDupe: "Argument name clash.",
+  PatternHasAccessor: "Object pattern can't contain getter or setter.",
+  PatternHasMethod: "Object pattern can't contain methods.",
+  PrivateInExpectedIn: _ref28 => {
     var {
       identifierName
-    } = _ref27;
+    } = _ref28;
     return "Private names are only allowed in property accesses (`obj.#".concat(identifierName, "`) or in `in` expressions (`#").concat(identifierName, " in obj`).");
-  }),
-  PrivateNameRedeclaration: _(_ref28 => {
+  },
+  PrivateNameRedeclaration: _ref29 => {
     var {
       identifierName
-    } = _ref28;
+    } = _ref29;
     return "Duplicate private name #".concat(identifierName, ".");
-  }),
-  RecordExpressionBarIncorrectEndSyntaxType: _("Record expressions ending with '|}' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'bar'."),
-  RecordExpressionBarIncorrectStartSyntaxType: _("Record expressions starting with '{|' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'bar'."),
-  RecordExpressionHashIncorrectStartSyntaxType: _("Record expressions starting with '#{' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'hash'."),
-  RecordNoProto: _("'__proto__' is not allowed in Record expressions."),
-  RestTrailingComma: _("Unexpected trailing comma after rest element."),
-  SloppyFunction: _("In non-strict mode code, functions can only be declared at top level, inside a block, or as the body of an if statement."),
-  StaticPrototype: _("Classes may not have static property named prototype."),
-  SuperNotAllowed: _("`super()` is only valid inside a class constructor of a subclass. Maybe a typo in the method name ('constructor') or not extending another class?"),
-  SuperPrivateField: _("Private fields can't be accessed on super."),
-  TrailingDecorator: _("Decorators must be attached to a class element."),
-  TupleExpressionBarIncorrectEndSyntaxType: _("Tuple expressions ending with '|]' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'bar'."),
-  TupleExpressionBarIncorrectStartSyntaxType: _("Tuple expressions starting with '[|' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'bar'."),
-  TupleExpressionHashIncorrectStartSyntaxType: _("Tuple expressions starting with '#[' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'hash'."),
-  UnexpectedArgumentPlaceholder: _("Unexpected argument placeholder."),
-  UnexpectedAwaitAfterPipelineBody: _('Unexpected "await" after pipeline body; await must have parentheses in minimal proposal.'),
-  UnexpectedDigitAfterHash: _("Unexpected digit after hash token."),
-  UnexpectedImportExport: _("'import' and 'export' may only appear at the top level."),
-  UnexpectedKeyword: _(_ref29 => {
+  },
+  RecordExpressionBarIncorrectEndSyntaxType: "Record expressions ending with '|}' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'bar'.",
+  RecordExpressionBarIncorrectStartSyntaxType: "Record expressions starting with '{|' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'bar'.",
+  RecordExpressionHashIncorrectStartSyntaxType: "Record expressions starting with '#{' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'hash'.",
+  RecordNoProto: "'__proto__' is not allowed in Record expressions.",
+  RestTrailingComma: "Unexpected trailing comma after rest element.",
+  SloppyFunction: "In non-strict mode code, functions can only be declared at top level, inside a block, or as the body of an if statement.",
+  StaticPrototype: "Classes may not have static property named prototype.",
+  SuperNotAllowed: "`super()` is only valid inside a class constructor of a subclass. Maybe a typo in the method name ('constructor') or not extending another class?",
+  SuperPrivateField: "Private fields can't be accessed on super.",
+  TrailingDecorator: "Decorators must be attached to a class element.",
+  TupleExpressionBarIncorrectEndSyntaxType: "Tuple expressions ending with '|]' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'bar'.",
+  TupleExpressionBarIncorrectStartSyntaxType: "Tuple expressions starting with '[|' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'bar'.",
+  TupleExpressionHashIncorrectStartSyntaxType: "Tuple expressions starting with '#[' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'hash'.",
+  UnexpectedArgumentPlaceholder: "Unexpected argument placeholder.",
+  UnexpectedAwaitAfterPipelineBody: 'Unexpected "await" after pipeline body; await must have parentheses in minimal proposal.',
+  UnexpectedDigitAfterHash: "Unexpected digit after hash token.",
+  UnexpectedImportExport: "'import' and 'export' may only appear at the top level.",
+  UnexpectedKeyword: _ref30 => {
     var {
       keyword
-    } = _ref29;
+    } = _ref30;
     return "Unexpected keyword '".concat(keyword, "'.");
-  }),
-  UnexpectedLeadingDecorator: _("Leading decorators must be attached to a class declaration."),
-  UnexpectedLexicalDeclaration: _("Lexical declaration cannot appear in a single-statement context."),
-  UnexpectedNewTarget: _("`new.target` can only be used in functions or class properties."),
-  UnexpectedNumericSeparator: _("A numeric separator is only allowed between two digits."),
-  UnexpectedPrivateField: _("Unexpected private name."),
-  UnexpectedReservedWord: _(_ref30 => {
+  },
+  UnexpectedLeadingDecorator: "Leading decorators must be attached to a class declaration.",
+  UnexpectedLexicalDeclaration: "Lexical declaration cannot appear in a single-statement context.",
+  UnexpectedNewTarget: "`new.target` can only be used in functions or class properties.",
+  UnexpectedNumericSeparator: "A numeric separator is only allowed between two digits.",
+  UnexpectedPrivateField: "Unexpected private name.",
+  UnexpectedReservedWord: _ref31 => {
     var {
       reservedWord
-    } = _ref30;
+    } = _ref31;
     return "Unexpected reserved word '".concat(reservedWord, "'.");
-  }),
-  UnexpectedSuper: _("'super' is only allowed in object methods and classes."),
-  UnexpectedToken: _(_ref31 => {
+  },
+  UnexpectedSuper: "'super' is only allowed in object methods and classes.",
+  UnexpectedToken: _ref32 => {
     var {
       expected,
       unexpected
-    } = _ref31;
+    } = _ref32;
     return "Unexpected token".concat(unexpected ? " '".concat(unexpected, "'.") : "").concat(expected ? ", expected \"".concat(expected, "\"") : "");
-  }),
-  UnexpectedTokenUnaryExponentiation: _("Illegal expression. Wrap left hand side or entire exponentiation in parentheses."),
-  UnsupportedBind: _("Binding should be performed on object property."),
-  UnsupportedDecoratorExport: _("A decorated export must export a class declaration."),
-  UnsupportedDefaultExport: _("Only expressions, functions or classes are allowed as the `default` export."),
-  UnsupportedImport: _("`import` can only be used in `import()` or `import.meta`."),
-  UnsupportedMetaProperty: _(_ref32 => {
+  },
+  UnexpectedTokenUnaryExponentiation: "Illegal expression. Wrap left hand side or entire exponentiation in parentheses.",
+  UnsupportedBind: "Binding should be performed on object property.",
+  UnsupportedDecoratorExport: "A decorated export must export a class declaration.",
+  UnsupportedDefaultExport: "Only expressions, functions or classes are allowed as the `default` export.",
+  UnsupportedImport: "`import` can only be used in `import()` or `import.meta`.",
+  UnsupportedMetaProperty: _ref33 => {
     var {
       target,
       onlyValidPropertyName
-    } = _ref32;
+    } = _ref33;
     return "The only valid meta property for ".concat(target, " is ").concat(target, ".").concat(onlyValidPropertyName, ".");
-  }),
-  UnsupportedParameterDecorator: _("Decorators cannot be used to decorate parameters."),
-  UnsupportedPropertyDecorator: _("Decorators cannot be used to decorate object literal properties."),
-  UnsupportedSuper: _("'super' can only be used with function calls (i.e. super()) or in property accesses (i.e. super.prop or super[prop])."),
-  UnterminatedComment: _("Unterminated comment."),
-  UnterminatedRegExp: _("Unterminated regular expression."),
-  UnterminatedString: _("Unterminated string constant."),
-  UnterminatedTemplate: _("Unterminated template."),
-  VarRedeclaration: _(_ref33 => {
+  },
+  UnsupportedParameterDecorator: "Decorators cannot be used to decorate parameters.",
+  UnsupportedPropertyDecorator: "Decorators cannot be used to decorate object literal properties.",
+  UnsupportedSuper: "'super' can only be used with function calls (i.e. super()) or in property accesses (i.e. super.prop or super[prop]).",
+  UnterminatedComment: "Unterminated comment.",
+  UnterminatedRegExp: "Unterminated regular expression.",
+  UnterminatedString: "Unterminated string constant.",
+  UnterminatedTemplate: "Unterminated template.",
+  VarRedeclaration: _ref34 => {
     var {
       identifierName
-    } = _ref33;
+    } = _ref34;
     return "Identifier '".concat(identifierName, "' has already been declared.");
-  }),
-  YieldBindingIdentifier: _("Can not use 'yield' as identifier inside a generator."),
-  YieldInParameter: _("Yield expression is not allowed in formal parameters."),
-  ZeroDigitNumericSeparator: _("Numeric separator can not be used after leading 0.")
-});
-
-var StrictModeErrors = _ => ({
-  StrictDelete: _("Deleting local variable in strict mode."),
-  StrictEvalArguments: _(_ref34 => {
+  },
+  YieldBindingIdentifier: "Can not use 'yield' as identifier inside a generator.",
+  YieldInParameter: "Yield expression is not allowed in formal parameters.",
+  ZeroDigitNumericSeparator: "Numeric separator can not be used after leading 0."
+};
+var StrictModeErrors = {
+  StrictDelete: "Deleting local variable in strict mode.",
+  StrictEvalArguments: _ref35 => {
     var {
       referenceName
-    } = _ref34;
+    } = _ref35;
     return "Assigning to '".concat(referenceName, "' in strict mode.");
-  }),
-  StrictEvalArgumentsBinding: _(_ref35 => {
+  },
+  StrictEvalArgumentsBinding: _ref36 => {
     var {
       bindingName
-    } = _ref35;
+    } = _ref36;
     return "Binding '".concat(bindingName, "' in strict mode.");
-  }),
-  StrictFunction: _("In strict mode code, functions can only be declared at top level or inside a block."),
-  StrictNumericEscape: _("The only valid numeric escape in strict mode is '\\0'."),
-  StrictOctalLiteral: _("Legacy octal literals are not allowed in strict mode."),
-  StrictWith: _("'with' in strict mode.")
-});
-
+  },
+  StrictFunction: "In strict mode code, functions can only be declared at top level or inside a block.",
+  StrictNumericEscape: "The only valid numeric escape in strict mode is '\\0'.",
+  StrictOctalLiteral: "Legacy octal literals are not allowed in strict mode.",
+  StrictWith: "'with' in strict mode."
+};
 var UnparenthesizedPipeBodyDescriptions = new Set(["ArrowFunctionExpression", "AssignmentExpression", "ConditionalExpression", "YieldExpression"]);
-
-var PipelineOperatorErrors = _ => ({
-  PipeBodyIsTighter: _("Unexpected yield after pipeline body; any yield expression acting as Hack-style pipe body must be parenthesized due to its loose operator precedence."),
-  PipeTopicRequiresHackPipes: _('Topic reference is used, but the pipelineOperator plugin was not passed a "proposal": "hack" or "smart" option.'),
-  PipeTopicUnbound: _("Topic reference is unbound; it must be inside a pipe body."),
-  PipeTopicUnconfiguredToken: _(_ref36 => {
+var PipelineOperatorErrors = {
+  PipeBodyIsTighter: "Unexpected yield after pipeline body; any yield expression acting as Hack-style pipe body must be parenthesized due to its loose operator precedence.",
+  PipeTopicRequiresHackPipes: 'Topic reference is used, but the pipelineOperator plugin was not passed a "proposal": "hack" or "smart" option.',
+  PipeTopicUnbound: "Topic reference is unbound; it must be inside a pipe body.",
+  PipeTopicUnconfiguredToken: _ref37 => {
     var {
       token
-    } = _ref36;
+    } = _ref37;
     return "Invalid topic token ".concat(token, ". In order to use ").concat(token, " as a topic reference, the pipelineOperator plugin must be configured with { \"proposal\": \"hack\", \"topicToken\": \"").concat(token, "\" }.");
-  }),
-  PipeTopicUnused: _("Hack-style pipe body does not contain a topic reference; Hack-style pipes must use topic at least once."),
-  PipeUnparenthesizedBody: _(_ref37 => {
+  },
+  PipeTopicUnused: "Hack-style pipe body does not contain a topic reference; Hack-style pipes must use topic at least once.",
+  PipeUnparenthesizedBody: _ref38 => {
     var {
       type
-    } = _ref37;
+    } = _ref38;
     return "Hack-style pipe body cannot be an unparenthesized ".concat(toNodeDescription({
       type
     }), "; please wrap it in parentheses.");
-  }),
-  PipelineBodyNoArrow: _('Unexpected arrow "=>" after pipeline body; arrow function in pipeline body must be parenthesized.'),
-  PipelineBodySequenceExpression: _("Pipeline body may not be a comma-separated sequence expression."),
-  PipelineHeadSequenceExpression: _("Pipeline head should not be a comma-separated sequence expression."),
-  PipelineTopicUnused: _("Pipeline is in topic style but does not use topic reference."),
-  PrimaryTopicNotAllowed: _("Topic reference was used in a lexical context without topic binding."),
-  PrimaryTopicRequiresSmartPipeline: _('Topic reference is used, but the pipelineOperator plugin was not passed a "proposal": "hack" or "smart" option.')
-});
-
-var _excluded$1 = ["toMessage"];
+  },
+  PipelineBodyNoArrow: 'Unexpected arrow "=>" after pipeline body; arrow function in pipeline body must be parenthesized.',
+  PipelineBodySequenceExpression: "Pipeline body may not be a comma-separated sequence expression.",
+  PipelineHeadSequenceExpression: "Pipeline head should not be a comma-separated sequence expression.",
+  PipelineTopicUnused: "Pipeline is in topic style but does not use topic reference.",
+  PrimaryTopicNotAllowed: "Topic reference was used in a lexical context without topic binding.",
+  PrimaryTopicRequiresSmartPipeline: 'Topic reference is used, but the pipelineOperator plugin was not passed a "proposal": "hack" or "smart" option.'
+};
+var _excluded$1 = ["toMessage"],
+    _excluded2$1 = ["message"];
 
 function toParseErrorConstructor(_ref) {
   var {
@@ -3536,11 +3539,11 @@ function toParseErrorConstructor(_ref) {
   } = _ref,
       properties = _objectWithoutPropertiesLoose(_ref, _excluded$1);
 
-  return function constructor(_ref38) {
+  return function constructor(_ref39) {
     var {
       loc,
       details
-    } = _ref38;
+    } = _ref39;
     return instantiate(SyntaxError, Object.assign({}, properties, {
       loc
     }), {
@@ -3581,27 +3584,38 @@ function toParseErrorConstructor(_ref) {
   };
 }
 
-function toParseErrorCredentials(toMessageOrMessage, credentials) {
-  return Object.assign({
-    toMessage: typeof toMessageOrMessage === "string" ? () => toMessageOrMessage : toMessageOrMessage
-  }, credentials);
-}
-
 function ParseErrorEnum(argument, syntaxPlugin) {
   if (Array.isArray(argument)) {
-    return toParseErrorCredentialsMap => ParseErrorEnum(toParseErrorCredentialsMap, argument[0]);
+    return parseErrorTemplates => ParseErrorEnum(parseErrorTemplates, argument[0]);
   }
 
-  var partialCredentials = argument(toParseErrorCredentials);
   var ParseErrorConstructors = {};
 
-  for (var reasonCode of Object.keys(partialCredentials)) {
+  var _loop = function (reasonCode) {
+    var template = argument[reasonCode];
+
+    var _ref2 = typeof template === "string" ? {
+      message: () => template
+    } : typeof template === "function" ? {
+      message: template
+    } : template,
+        {
+      message
+    } = _ref2,
+        rest = _objectWithoutPropertiesLoose(_ref2, _excluded2$1);
+
+    var toMessage = typeof message === "string" ? () => message : message;
     ParseErrorConstructors[reasonCode] = toParseErrorConstructor(Object.assign({
-      code: ParseErrorCodes.SyntaxError,
-      reasonCode
+      code: ParseErrorCode.SyntaxError,
+      reasonCode,
+      toMessage
     }, syntaxPlugin ? {
       syntaxPlugin
-    } : {}, partialCredentials[reasonCode]));
+    } : {}, rest));
+  };
+
+  for (var reasonCode of Object.keys(argument)) {
+    _loop(reasonCode);
   }
 
   return ParseErrorConstructors;
@@ -3623,7 +3637,7 @@ function toESTreeLocation(node) {
   return node;
 }
 
-var estree = superClass => class extends superClass {
+var estree = superClass => class ESTreeParserMixin extends superClass {
   parse() {
     var file = toESTreeLocation(super.parse());
 
@@ -3634,11 +3648,11 @@ var estree = superClass => class extends superClass {
     return file;
   }
 
-  parseRegExpLiteral(_ref39) {
+  parseRegExpLiteral(_ref40) {
     var {
       pattern,
       flags
-    } = _ref39;
+    } = _ref40;
     var regex = null;
 
     try {
@@ -3695,14 +3709,17 @@ var estree = superClass => class extends superClass {
   }
 
   directiveToStmt(directive) {
-    var directiveLiteral = directive.value;
-    var stmt = this.startNodeAt(directive.start, directive.loc.start);
-    var expression = this.startNodeAt(directiveLiteral.start, directiveLiteral.loc.start);
-    expression.value = directiveLiteral.extra.expressionValue;
-    expression.raw = directiveLiteral.extra.raw;
-    stmt.expression = this.finishNodeAt(expression, "Literal", directiveLiteral.loc.end);
-    stmt.directive = directiveLiteral.extra.raw.slice(1, -1);
-    return this.finishNodeAt(stmt, "ExpressionStatement", directive.loc.end);
+    var expression = directive.value;
+    delete directive.value;
+    expression.type = "Literal";
+    expression.raw = expression.extra.raw;
+    expression.value = expression.extra.expressionValue;
+    var stmt = directive;
+    stmt.type = "ExpressionStatement";
+    stmt.expression = expression;
+    stmt.directive = expression.extra.rawValue;
+    delete expression.extra;
+    return stmt;
   }
 
   initFunction(node, isAsync) {
@@ -3728,12 +3745,8 @@ var estree = superClass => class extends superClass {
     return stmt.type === "ExpressionStatement" && stmt.expression.type === "Literal" && typeof stmt.expression.value === "string" && !((_stmt$expression$extr = stmt.expression.extra) != null && _stmt$expression$extr.parenthesized);
   }
 
-  parseBlockBody(node) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
-    }
-
-    super.parseBlockBody(node, ...args);
+  parseBlockBody(node, allowDirectives, topLevel, end, afterBlockParse) {
+    super.parseBlockBody(node, allowDirectives, topLevel, end, afterBlockParse);
     var directiveStatements = node.directives.map(d => this.directiveToStmt(d));
     node.body = directiveStatements.concat(node.body);
     delete node.directives;
@@ -3813,8 +3826,7 @@ var estree = superClass => class extends superClass {
       node.computed = false;
     }
 
-    type = "MethodDefinition";
-    return this.finishNode(node, type);
+    return this.finishNode(node, "MethodDefinition");
   }
 
   parseClassProperty() {
@@ -3845,7 +3857,11 @@ var estree = superClass => class extends superClass {
 
     if (node) {
       node.type = "Property";
-      if (node.kind === "method") node.kind = "init";
+
+      if (node.kind === "method") {
+        node.kind = "init";
+      }
+
       node.shorthand = false;
     }
 
@@ -3863,12 +3879,8 @@ var estree = superClass => class extends superClass {
     return node;
   }
 
-  isValidLVal(type) {
-    for (var _len2 = arguments.length, rest = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-      rest[_key2 - 1] = arguments[_key2];
-    }
-
-    return type === "Property" ? "value" : super.isValidLVal(type, ...rest);
+  isValidLVal(type, isUnparenthesizedInAssign, binding) {
+    return type === "Property" ? "value" : super.isValidLVal(type, isUnparenthesizedInAssign, binding);
   }
 
   isAssignable(node, isBinding) {
@@ -3898,7 +3910,7 @@ var estree = superClass => class extends superClass {
     }
   }
 
-  toAssignableObjectExpressionProp(prop) {
+  toAssignableObjectExpressionProp(prop, isLast, isLHS) {
     if (prop.kind === "get" || prop.kind === "set") {
       this.raise(Errors.PatternHasAccessor, {
         at: prop.key
@@ -3908,12 +3920,12 @@ var estree = superClass => class extends superClass {
         at: prop.key
       });
     } else {
-      super.toAssignableObjectExpressionProp(...arguments);
+      super.toAssignableObjectExpressionProp(prop, isLast, isLHS);
     }
   }
 
-  finishCallExpression(node, optional) {
-    super.finishCallExpression(node, optional);
+  finishCallExpression(unfinished, optional) {
+    var node = super.finishCallExpression(unfinished, optional);
 
     if (node.callee.type === "Import") {
       node.type = "ImportExpression";
@@ -3940,8 +3952,8 @@ var estree = superClass => class extends superClass {
     super.toReferencedArguments(node);
   }
 
-  parseExport(node) {
-    super.parseExport(node);
+  parseExport(unfinished) {
+    var node = super.parseExport(unfinished);
 
     switch (node.type) {
       case "ExportAllDeclaration":
@@ -4616,12 +4628,12 @@ function getExportedToken(token) {
   };
 }
 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 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\u0cf3\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-\u0ece\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 + "]");
 var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
 nonASCIIidentifierStartChars = nonASCIIidentifierChars = null;
-var astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2, 1, 68, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 349, 41, 7, 1, 79, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 85, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72, 264, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 190, 0, 80, 921, 103, 110, 18, 195, 2637, 96, 16, 1070, 4050, 582, 8634, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 689, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 43, 8, 8936, 3, 2, 6, 2, 1, 2, 290, 46, 2, 18, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 482, 44, 11, 6, 17, 0, 322, 29, 19, 43, 1269, 6, 2, 3, 2, 1, 2, 14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42719, 33, 4152, 8, 221, 3, 5761, 15, 7472, 3104, 541, 1507, 4938];
-var astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 154, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 19306, 9, 87, 9, 39, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4706, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 262, 6, 10, 9, 357, 0, 62, 13, 1495, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
+var astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 13, 10, 2, 14, 2, 6, 2, 1, 2, 10, 2, 14, 2, 6, 2, 1, 68, 310, 10, 21, 11, 7, 25, 5, 2, 41, 2, 8, 70, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 349, 41, 7, 1, 79, 28, 11, 0, 9, 21, 43, 17, 47, 20, 28, 22, 13, 52, 58, 1, 3, 0, 14, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 20, 1, 64, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 38, 6, 186, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 19, 72, 264, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 16, 0, 2, 12, 2, 33, 125, 0, 80, 921, 103, 110, 18, 195, 2637, 96, 16, 1071, 18, 5, 4026, 582, 8634, 568, 8, 30, 18, 78, 18, 29, 19, 47, 17, 3, 32, 20, 6, 18, 689, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 43, 8, 8936, 3, 2, 6, 2, 1, 2, 290, 16, 0, 30, 2, 3, 0, 15, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 1845, 30, 7, 5, 262, 61, 147, 44, 11, 6, 17, 0, 322, 29, 19, 43, 485, 27, 757, 6, 2, 3, 2, 1, 2, 14, 2, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42719, 33, 4153, 7, 221, 3, 5761, 15, 7472, 3104, 541, 1507, 4938, 6, 4191];
+var astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 81, 2, 71, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 3, 0, 158, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 10, 1, 2, 0, 49, 6, 4, 4, 14, 9, 5351, 0, 7, 14, 13835, 9, 87, 9, 39, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4706, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 101, 0, 161, 6, 10, 9, 357, 0, 62, 13, 499, 13, 983, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
 
 function isInAstralSet(code, set) {
   var pos = 0x10000;
@@ -4719,12 +4731,13 @@ var BIND_KIND_VALUE = 0b000000000001,
     BIND_SCOPE_VAR = 0b000000000100,
     BIND_SCOPE_LEXICAL = 0b000000001000,
     BIND_SCOPE_FUNCTION = 0b000000010000,
-    BIND_FLAGS_NONE = 0b000001000000,
-    BIND_FLAGS_CLASS = 0b000010000000,
-    BIND_FLAGS_TS_ENUM = 0b000100000000,
-    BIND_FLAGS_TS_CONST_ENUM = 0b001000000000,
-    BIND_FLAGS_TS_EXPORT_ONLY = 0b010000000000,
-    BIND_FLAGS_FLOW_DECLARE_FN = 0b100000000000;
+    BIND_FLAGS_NONE = 0b0000001000000,
+    BIND_FLAGS_CLASS = 0b0000010000000,
+    BIND_FLAGS_TS_ENUM = 0b0000100000000,
+    BIND_FLAGS_TS_CONST_ENUM = 0b0001000000000,
+    BIND_FLAGS_TS_EXPORT_ONLY = 0b0010000000000,
+    BIND_FLAGS_FLOW_DECLARE_FN = 0b0100000000000,
+    BIND_FLAGS_TS_IMPORT = 0b1000000000000;
 var BIND_CLASS = BIND_KIND_VALUE | BIND_KIND_TYPE | BIND_SCOPE_LEXICAL | BIND_FLAGS_CLASS,
     BIND_LEXICAL = BIND_KIND_VALUE | 0 | BIND_SCOPE_LEXICAL | 0,
     BIND_VAR = BIND_KIND_VALUE | 0 | BIND_SCOPE_VAR | 0,
@@ -4737,6 +4750,7 @@ var BIND_CLASS = BIND_KIND_VALUE | BIND_KIND_TYPE | BIND_SCOPE_LEXICAL | BIND_FL
     BIND_OUTSIDE = BIND_KIND_VALUE | 0 | 0 | BIND_FLAGS_NONE,
     BIND_TS_CONST_ENUM = BIND_TS_ENUM | BIND_FLAGS_TS_CONST_ENUM,
     BIND_TS_NAMESPACE = 0 | 0 | 0 | BIND_FLAGS_TS_EXPORT_ONLY,
+    BIND_TS_TYPE_IMPORT = 0 | BIND_KIND_TYPE | 0 | BIND_FLAGS_TS_IMPORT,
     BIND_FLOW_DECLARE_FN = BIND_FLAGS_FLOW_DECLARE_FN;
 var CLASS_ELEMENT_FLAG_STATIC = 0b100,
     CLASS_ELEMENT_KIND_GETTER = 0b010,
@@ -4748,59 +4762,285 @@ var CLASS_ELEMENT_STATIC_GETTER = CLASS_ELEMENT_KIND_GETTER | CLASS_ELEMENT_FLAG
     CLASS_ELEMENT_INSTANCE_SETTER = CLASS_ELEMENT_KIND_SETTER,
     CLASS_ELEMENT_OTHER = 0;
 
-class BaseParser {
-  constructor() {
-    this.sawUnambiguousESM = false;
-    this.ambiguousScriptDifferentAst = false;
+class Scope {
+  constructor(flags) {
+    this.var = new Set();
+    this.lexical = new Set();
+    this.functions = new Set();
+    this.flags = flags;
   }
 
-  hasPlugin(pluginConfig) {
-    if (typeof pluginConfig === "string") {
-      return this.plugins.has(pluginConfig);
-    } else {
-      var [pluginName, pluginOptions] = pluginConfig;
+}
 
-      if (!this.hasPlugin(pluginName)) {
-        return false;
-      }
+class ScopeHandler {
+  constructor(parser, inModule) {
+    this.parser = void 0;
+    this.scopeStack = [];
+    this.inModule = void 0;
+    this.undefinedExports = new Map();
+    this.parser = parser;
+    this.inModule = inModule;
+  }
 
-      var actualOptions = this.plugins.get(pluginName);
+  get inFunction() {
+    return (this.currentVarScopeFlags() & SCOPE_FUNCTION) > 0;
+  }
 
-      for (var key of Object.keys(pluginOptions)) {
-        if ((actualOptions == null ? void 0 : actualOptions[key]) !== pluginOptions[key]) {
-          return false;
-        }
-      }
+  get allowSuper() {
+    return (this.currentThisScopeFlags() & SCOPE_SUPER) > 0;
+  }
 
-      return true;
-    }
+  get allowDirectSuper() {
+    return (this.currentThisScopeFlags() & SCOPE_DIRECT_SUPER) > 0;
   }
 
-  getPluginOption(plugin, name) {
-    var _this$plugins$get;
+  get inClass() {
+    return (this.currentThisScopeFlags() & SCOPE_CLASS) > 0;
+  }
 
-    return (_this$plugins$get = this.plugins.get(plugin)) == null ? void 0 : _this$plugins$get[name];
+  get inClassAndNotInNonArrowFunction() {
+    var flags = this.currentThisScopeFlags();
+    return (flags & SCOPE_CLASS) > 0 && (flags & SCOPE_FUNCTION) === 0;
   }
 
-}
+  get inStaticBlock() {
+    for (var i = this.scopeStack.length - 1;; i--) {
+      var {
+        flags
+      } = this.scopeStack[i];
 
-function setTrailingComments(node, comments) {
-  if (node.trailingComments === undefined) {
-    node.trailingComments = comments;
-  } else {
-    node.trailingComments.unshift(...comments);
+      if (flags & SCOPE_STATIC_BLOCK) {
+        return true;
+      }
+
+      if (flags & (SCOPE_VAR | SCOPE_CLASS)) {
+        return false;
+      }
+    }
   }
-}
 
-function setLeadingComments(node, comments) {
-  if (node.leadingComments === undefined) {
-    node.leadingComments = comments;
-  } else {
-    node.leadingComments.unshift(...comments);
+  get inNonArrowFunction() {
+    return (this.currentThisScopeFlags() & SCOPE_FUNCTION) > 0;
   }
-}
 
-function setInnerComments(node, comments) {
+  get treatFunctionsAsVar() {
+    return this.treatFunctionsAsVarInScope(this.currentScope());
+  }
+
+  createScope(flags) {
+    return new Scope(flags);
+  }
+
+  enter(flags) {
+    this.scopeStack.push(this.createScope(flags));
+  }
+
+  exit() {
+    var scope = this.scopeStack.pop();
+    return scope.flags;
+  }
+
+  treatFunctionsAsVarInScope(scope) {
+    return !!(scope.flags & (SCOPE_FUNCTION | SCOPE_STATIC_BLOCK) || !this.parser.inModule && scope.flags & SCOPE_PROGRAM);
+  }
+
+  declareName(name, bindingType, loc) {
+    var scope = this.currentScope();
+
+    if (bindingType & BIND_SCOPE_LEXICAL || bindingType & BIND_SCOPE_FUNCTION) {
+      this.checkRedeclarationInScope(scope, name, bindingType, loc);
+
+      if (bindingType & BIND_SCOPE_FUNCTION) {
+        scope.functions.add(name);
+      } else {
+        scope.lexical.add(name);
+      }
+
+      if (bindingType & BIND_SCOPE_LEXICAL) {
+        this.maybeExportDefined(scope, name);
+      }
+    } else if (bindingType & BIND_SCOPE_VAR) {
+      for (var i = this.scopeStack.length - 1; i >= 0; --i) {
+        scope = this.scopeStack[i];
+        this.checkRedeclarationInScope(scope, name, bindingType, loc);
+        scope.var.add(name);
+        this.maybeExportDefined(scope, name);
+        if (scope.flags & SCOPE_VAR) break;
+      }
+    }
+
+    if (this.parser.inModule && scope.flags & SCOPE_PROGRAM) {
+      this.undefinedExports.delete(name);
+    }
+  }
+
+  maybeExportDefined(scope, name) {
+    if (this.parser.inModule && scope.flags & SCOPE_PROGRAM) {
+      this.undefinedExports.delete(name);
+    }
+  }
+
+  checkRedeclarationInScope(scope, name, bindingType, loc) {
+    if (this.isRedeclaredInScope(scope, name, bindingType)) {
+      this.parser.raise(Errors.VarRedeclaration, {
+        at: loc,
+        identifierName: name
+      });
+    }
+  }
+
+  isRedeclaredInScope(scope, name, bindingType) {
+    if (!(bindingType & BIND_KIND_VALUE)) return false;
+
+    if (bindingType & BIND_SCOPE_LEXICAL) {
+      return scope.lexical.has(name) || scope.functions.has(name) || scope.var.has(name);
+    }
+
+    if (bindingType & BIND_SCOPE_FUNCTION) {
+      return scope.lexical.has(name) || !this.treatFunctionsAsVarInScope(scope) && scope.var.has(name);
+    }
+
+    return scope.lexical.has(name) && !(scope.flags & SCOPE_SIMPLE_CATCH && scope.lexical.values().next().value === name) || !this.treatFunctionsAsVarInScope(scope) && scope.functions.has(name);
+  }
+
+  checkLocalExport(id) {
+    var {
+      name
+    } = id;
+    var topLevelScope = this.scopeStack[0];
+
+    if (!topLevelScope.lexical.has(name) && !topLevelScope.var.has(name) && !topLevelScope.functions.has(name)) {
+      this.undefinedExports.set(name, id.loc.start);
+    }
+  }
+
+  currentScope() {
+    return this.scopeStack[this.scopeStack.length - 1];
+  }
+
+  currentVarScopeFlags() {
+    for (var i = this.scopeStack.length - 1;; i--) {
+      var {
+        flags
+      } = this.scopeStack[i];
+
+      if (flags & SCOPE_VAR) {
+        return flags;
+      }
+    }
+  }
+
+  currentThisScopeFlags() {
+    for (var i = this.scopeStack.length - 1;; i--) {
+      var {
+        flags
+      } = this.scopeStack[i];
+
+      if (flags & (SCOPE_VAR | SCOPE_CLASS) && !(flags & SCOPE_ARROW)) {
+        return flags;
+      }
+    }
+  }
+
+}
+
+class FlowScope extends Scope {
+  constructor() {
+    super(...arguments);
+    this.declareFunctions = new Set();
+  }
+
+}
+
+class FlowScopeHandler extends ScopeHandler {
+  createScope(flags) {
+    return new FlowScope(flags);
+  }
+
+  declareName(name, bindingType, loc) {
+    var scope = this.currentScope();
+
+    if (bindingType & BIND_FLAGS_FLOW_DECLARE_FN) {
+      this.checkRedeclarationInScope(scope, name, bindingType, loc);
+      this.maybeExportDefined(scope, name);
+      scope.declareFunctions.add(name);
+      return;
+    }
+
+    super.declareName(name, bindingType, loc);
+  }
+
+  isRedeclaredInScope(scope, name, bindingType) {
+    if (super.isRedeclaredInScope(scope, name, bindingType)) return true;
+
+    if (bindingType & BIND_FLAGS_FLOW_DECLARE_FN) {
+      return !scope.declareFunctions.has(name) && (scope.lexical.has(name) || scope.functions.has(name));
+    }
+
+    return false;
+  }
+
+  checkLocalExport(id) {
+    if (!this.scopeStack[0].declareFunctions.has(id.name)) {
+      super.checkLocalExport(id);
+    }
+  }
+
+}
+
+class BaseParser {
+  constructor() {
+    this.sawUnambiguousESM = false;
+    this.ambiguousScriptDifferentAst = false;
+  }
+
+  hasPlugin(pluginConfig) {
+    if (typeof pluginConfig === "string") {
+      return this.plugins.has(pluginConfig);
+    } else {
+      var [pluginName, pluginOptions] = pluginConfig;
+
+      if (!this.hasPlugin(pluginName)) {
+        return false;
+      }
+
+      var actualOptions = this.plugins.get(pluginName);
+
+      for (var key of Object.keys(pluginOptions)) {
+        if ((actualOptions == null ? void 0 : actualOptions[key]) !== pluginOptions[key]) {
+          return false;
+        }
+      }
+
+      return true;
+    }
+  }
+
+  getPluginOption(plugin, name) {
+    var _this$plugins$get;
+
+    return (_this$plugins$get = this.plugins.get(plugin)) == null ? void 0 : _this$plugins$get[name];
+  }
+
+}
+
+function setTrailingComments(node, comments) {
+  if (node.trailingComments === undefined) {
+    node.trailingComments = comments;
+  } else {
+    node.trailingComments.unshift(...comments);
+  }
+}
+
+function setLeadingComments(node, comments) {
+  if (node.leadingComments === undefined) {
+    node.leadingComments = comments;
+  } else {
+    node.leadingComments.unshift(...comments);
+  }
+}
+
+function setInnerComments(node, comments) {
   if (node.innerComments === undefined) {
     node.innerComments = comments;
   } else {
@@ -5069,65 +5309,394 @@ class State {
     this.context = [types.brace];
     this.canStartJSXElement = true;
     this.containsEsc = false;
+    this.firstInvalidTemplateEscapePos = null;
     this.strictErrors = new Map();
     this.tokensLength = 0;
   }
 
-  init(_ref40) {
-    var {
-      strictMode,
-      sourceType,
-      startLine,
-      startColumn
-    } = _ref40;
-    this.strict = strictMode === false ? false : strictMode === true ? true : sourceType === "module";
-    this.curLine = startLine;
-    this.lineStart = -startColumn;
-    this.startLoc = this.endLoc = new Position(startLine, startColumn, 0);
+  init(_ref41) {
+    var {
+      strictMode,
+      sourceType,
+      startLine,
+      startColumn
+    } = _ref41;
+    this.strict = strictMode === false ? false : strictMode === true ? true : sourceType === "module";
+    this.curLine = startLine;
+    this.lineStart = -startColumn;
+    this.startLoc = this.endLoc = new Position(startLine, startColumn, 0);
+  }
+
+  curPosition() {
+    return new Position(this.curLine, this.pos - this.lineStart, this.pos);
+  }
+
+  clone(skipArrays) {
+    var state = new State();
+    var keys = Object.keys(this);
+
+    for (var i = 0, length = keys.length; i < length; i++) {
+      var key = keys[i];
+      var val = this[key];
+
+      if (!skipArrays && Array.isArray(val)) {
+        val = val.slice();
+      }
+
+      state[key] = val;
+    }
+
+    return state;
+  }
+
+}
+
+var _isDigit = function isDigit(code) {
+  return code >= 48 && code <= 57;
+};
+
+var forbiddenNumericSeparatorSiblings = {
+  decBinOct: new Set([46, 66, 69, 79, 95, 98, 101, 111]),
+  hex: new Set([46, 88, 95, 120])
+};
+var isAllowedNumericSeparatorSibling = {
+  bin: ch => ch === 48 || ch === 49,
+  oct: ch => ch >= 48 && ch <= 55,
+  dec: ch => ch >= 48 && ch <= 57,
+  hex: ch => ch >= 48 && ch <= 57 || ch >= 65 && ch <= 70 || ch >= 97 && ch <= 102
+};
+
+function readStringContents(type, input, pos, lineStart, curLine, errors) {
+  var initialPos = pos;
+  var initialLineStart = lineStart;
+  var initialCurLine = curLine;
+  var out = "";
+  var firstInvalidLoc = null;
+  var chunkStart = pos;
+  var {
+    length
+  } = input;
+
+  for (;;) {
+    if (pos >= length) {
+      errors.unterminated(initialPos, initialLineStart, initialCurLine);
+      out += input.slice(chunkStart, pos);
+      break;
+    }
+
+    var ch = input.charCodeAt(pos);
+
+    if (isStringEnd(type, ch, input, pos)) {
+      out += input.slice(chunkStart, pos);
+      break;
+    }
+
+    if (ch === 92) {
+      out += input.slice(chunkStart, pos);
+      var res = readEscapedChar(input, pos, lineStart, curLine, type === "template", errors);
+
+      if (res.ch === null && !firstInvalidLoc) {
+        firstInvalidLoc = {
+          pos,
+          lineStart,
+          curLine
+        };
+      } else {
+        out += res.ch;
+      }
+
+      ({
+        pos,
+        lineStart,
+        curLine
+      } = res);
+      chunkStart = pos;
+    } else if (ch === 8232 || ch === 8233) {
+      ++pos;
+      ++curLine;
+      lineStart = pos;
+    } else if (ch === 10 || ch === 13) {
+      if (type === "template") {
+        out += input.slice(chunkStart, pos) + "\n";
+        ++pos;
+
+        if (ch === 13 && input.charCodeAt(pos) === 10) {
+          ++pos;
+        }
+
+        ++curLine;
+        chunkStart = lineStart = pos;
+      } else {
+        errors.unterminated(initialPos, initialLineStart, initialCurLine);
+      }
+    } else {
+      ++pos;
+    }
+  }
+
+  return {
+    pos,
+    str: out,
+    firstInvalidLoc,
+    lineStart,
+    curLine,
+    containsInvalid: !!firstInvalidLoc
+  };
+}
+
+function isStringEnd(type, ch, input, pos) {
+  if (type === "template") {
+    return ch === 96 || ch === 36 && input.charCodeAt(pos + 1) === 123;
+  }
+
+  return ch === (type === "double" ? 34 : 39);
+}
+
+function readEscapedChar(input, pos, lineStart, curLine, inTemplate, errors) {
+  var throwOnInvalid = !inTemplate;
+  pos++;
+
+  var res = ch => ({
+    pos,
+    ch,
+    lineStart,
+    curLine
+  });
+
+  var ch = input.charCodeAt(pos++);
+
+  switch (ch) {
+    case 110:
+      return res("\n");
+
+    case 114:
+      return res("\r");
+
+    case 120:
+      {
+        var code;
+        ({
+          code,
+          pos
+        } = readHexChar(input, pos, lineStart, curLine, 2, false, throwOnInvalid, errors));
+        return res(code === null ? null : String.fromCharCode(code));
+      }
+
+    case 117:
+      {
+        var _code;
+
+        ({
+          code: _code,
+          pos
+        } = readCodePoint(input, pos, lineStart, curLine, throwOnInvalid, errors));
+        return res(_code === null ? null : String.fromCodePoint(_code));
+      }
+
+    case 116:
+      return res("\t");
+
+    case 98:
+      return res("\b");
+
+    case 118:
+      return res("\u000b");
+
+    case 102:
+      return res("\f");
+
+    case 13:
+      if (input.charCodeAt(pos) === 10) {
+        ++pos;
+      }
+
+    case 10:
+      lineStart = pos;
+      ++curLine;
+
+    case 8232:
+    case 8233:
+      return res("");
+
+    case 56:
+    case 57:
+      if (inTemplate) {
+        return res(null);
+      } else {
+        errors.strictNumericEscape(pos - 1, lineStart, curLine);
+      }
+
+    default:
+      if (ch >= 48 && ch <= 55) {
+        var startPos = pos - 1;
+        var match = input.slice(startPos, pos + 2).match(/^[0-7]+/);
+        var octalStr = match[0];
+        var octal = parseInt(octalStr, 8);
+
+        if (octal > 255) {
+          octalStr = octalStr.slice(0, -1);
+          octal = parseInt(octalStr, 8);
+        }
+
+        pos += octalStr.length - 1;
+        var next = input.charCodeAt(pos);
+
+        if (octalStr !== "0" || next === 56 || next === 57) {
+          if (inTemplate) {
+            return res(null);
+          } else {
+            errors.strictNumericEscape(startPos, lineStart, curLine);
+          }
+        }
+
+        return res(String.fromCharCode(octal));
+      }
+
+      return res(String.fromCharCode(ch));
+  }
+}
+
+function readHexChar(input, pos, lineStart, curLine, len, forceLen, throwOnInvalid, errors) {
+  var initialPos = pos;
+  var n;
+  ({
+    n,
+    pos
+  } = readInt(input, pos, lineStart, curLine, 16, len, forceLen, false, errors, !throwOnInvalid));
+
+  if (n === null) {
+    if (throwOnInvalid) {
+      errors.invalidEscapeSequence(initialPos, lineStart, curLine);
+    } else {
+      pos = initialPos - 1;
+    }
+  }
+
+  return {
+    code: n,
+    pos
+  };
+}
+
+function readInt(input, pos, lineStart, curLine, radix, len, forceLen, allowNumSeparator, errors, bailOnError) {
+  var start = pos;
+  var forbiddenSiblings = radix === 16 ? forbiddenNumericSeparatorSiblings.hex : forbiddenNumericSeparatorSiblings.decBinOct;
+  var isAllowedSibling = radix === 16 ? isAllowedNumericSeparatorSibling.hex : radix === 10 ? isAllowedNumericSeparatorSibling.dec : radix === 8 ? isAllowedNumericSeparatorSibling.oct : isAllowedNumericSeparatorSibling.bin;
+  var invalid = false;
+  var total = 0;
+
+  for (var i = 0, e = len == null ? Infinity : len; i < e; ++i) {
+    var code = input.charCodeAt(pos);
+    var val = void 0;
+
+    if (code === 95 && allowNumSeparator !== "bail") {
+      var prev = input.charCodeAt(pos - 1);
+      var next = input.charCodeAt(pos + 1);
+
+      if (!allowNumSeparator) {
+        if (bailOnError) return {
+          n: null,
+          pos
+        };
+        errors.numericSeparatorInEscapeSequence(pos, lineStart, curLine);
+      } else if (Number.isNaN(next) || !isAllowedSibling(next) || forbiddenSiblings.has(prev) || forbiddenSiblings.has(next)) {
+        if (bailOnError) return {
+          n: null,
+          pos
+        };
+        errors.unexpectedNumericSeparator(pos, lineStart, curLine);
+      }
+
+      ++pos;
+      continue;
+    }
+
+    if (code >= 97) {
+      val = code - 97 + 10;
+    } else if (code >= 65) {
+      val = code - 65 + 10;
+    } else if (_isDigit(code)) {
+      val = code - 48;
+    } else {
+      val = Infinity;
+    }
+
+    if (val >= radix) {
+      if (val <= 9 && bailOnError) {
+        return {
+          n: null,
+          pos
+        };
+      } else if (val <= 9 && errors.invalidDigit(pos, lineStart, curLine, radix)) {
+        val = 0;
+      } else if (forceLen) {
+        val = 0;
+        invalid = true;
+      } else {
+        break;
+      }
+    }
+
+    ++pos;
+    total = total * radix + val;
   }
 
-  curPosition() {
-    return new Position(this.curLine, this.pos - this.lineStart, this.pos);
+  if (pos === start || len != null && pos - start !== len || invalid) {
+    return {
+      n: null,
+      pos
+    };
   }
 
-  clone(skipArrays) {
-    var state = new State();
-    var keys = Object.keys(this);
+  return {
+    n: total,
+    pos
+  };
+}
 
-    for (var i = 0, length = keys.length; i < length; i++) {
-      var key = keys[i];
-      var val = this[key];
+function readCodePoint(input, pos, lineStart, curLine, throwOnInvalid, errors) {
+  var ch = input.charCodeAt(pos);
+  var code;
 
-      if (!skipArrays && Array.isArray(val)) {
-        val = val.slice();
-      }
+  if (ch === 123) {
+    ++pos;
+    ({
+      code,
+      pos
+    } = readHexChar(input, pos, lineStart, curLine, input.indexOf("}", pos) - pos, true, throwOnInvalid, errors));
+    ++pos;
 
-      state[key] = val;
+    if (code !== null && code > 0x10ffff) {
+      if (throwOnInvalid) {
+        errors.invalidCodePoint(pos, lineStart, curLine);
+      } else {
+        return {
+          code: null,
+          pos
+        };
+      }
     }
-
-    return state;
+  } else {
+    ({
+      code,
+      pos
+    } = readHexChar(input, pos, lineStart, curLine, 4, false, throwOnInvalid, errors));
   }
 
+  return {
+    code,
+    pos
+  };
 }
 
 var _excluded$2 = ["at"],
     _excluded2 = ["at"];
 
-var _isDigit = function isDigit(code) {
-  return code >= 48 && code <= 57;
-};
+function buildPosition(pos, lineStart, curLine) {
+  return new Position(curLine, pos - lineStart, pos);
+}
 
 var VALID_REGEX_FLAGS = new Set([103, 109, 115, 105, 121, 117, 100, 118]);
-var forbiddenNumericSeparatorSiblings = {
-  decBinOct: new Set([46, 66, 69, 79, 95, 98, 101, 111]),
-  hex: new Set([46, 88, 95, 120])
-};
-var isAllowedNumericSeparatorSibling = {
-  bin: ch => ch === 48 || ch === 49,
-  oct: ch => ch >= 48 && ch <= 55,
-  dec: ch => ch >= 48 && ch <= 57,
-  hex: ch => ch >= 48 && ch <= 57 || ch >= 65 && ch <= 70 || ch >= 97 && ch <= 102
-};
 
 class Token {
   constructor(state) {
@@ -5145,6 +5714,42 @@ class Tokenizer extends CommentsParser {
     super();
     this.isLookahead = void 0;
     this.tokens = [];
+    this.errorHandlers_readInt = {
+      invalidDigit: (pos, lineStart, curLine, radix) => {
+        if (!this.options.errorRecovery) return false;
+        this.raise(Errors.InvalidDigit, {
+          at: buildPosition(pos, lineStart, curLine),
+          radix
+        });
+        return true;
+      },
+      numericSeparatorInEscapeSequence: this.errorBuilder(Errors.NumericSeparatorInEscapeSequence),
+      unexpectedNumericSeparator: this.errorBuilder(Errors.UnexpectedNumericSeparator)
+    };
+    this.errorHandlers_readCodePoint = Object.assign({}, this.errorHandlers_readInt, {
+      invalidEscapeSequence: this.errorBuilder(Errors.InvalidEscapeSequence),
+      invalidCodePoint: this.errorBuilder(Errors.InvalidCodePoint)
+    });
+    this.errorHandlers_readStringContents_string = Object.assign({}, this.errorHandlers_readCodePoint, {
+      strictNumericEscape: (pos, lineStart, curLine) => {
+        this.recordStrictModeErrors(Errors.StrictNumericEscape, {
+          at: buildPosition(pos, lineStart, curLine)
+        });
+      },
+      unterminated: (pos, lineStart, curLine) => {
+        throw this.raise(Errors.UnterminatedString, {
+          at: buildPosition(pos - 1, lineStart, curLine)
+        });
+      }
+    });
+    this.errorHandlers_readStringContents_template = Object.assign({}, this.errorHandlers_readCodePoint, {
+      strictNumericEscape: this.errorBuilder(Errors.StrictNumericEscape),
+      unterminated: (pos, lineStart, curLine) => {
+        throw this.raise(Errors.UnterminatedTemplate, {
+          at: buildPosition(pos, lineStart, curLine)
+        });
+      }
+    });
     this.state = new State();
     this.state.init(options);
     this.input = input;
@@ -5243,8 +5848,8 @@ class Tokenizer extends CommentsParser {
     this.state.strict = strict;
 
     if (strict) {
-      this.state.strictErrors.forEach(_ref41 => {
-        var [toParseError, at] = _ref41;
+      this.state.strictErrors.forEach(_ref42 => {
+        var [toParseError, at] = _ref42;
         return this.raise(toParseError, {
           at
         });
@@ -5425,7 +6030,7 @@ class Tokenizer extends CommentsParser {
 
     if (comments.length > 0) {
       var end = this.state.pos;
-      var CommentWhitespace = {
+      var commentWhitespace = {
         start: spaceStart,
         end,
         comments,
@@ -5433,7 +6038,7 @@ class Tokenizer extends CommentsParser {
         trailingNode: null,
         containingNode: null
       };
-      this.state.commentStack.push(CommentWhitespace);
+      this.state.commentStack.push(commentWhitespace);
     }
   }
 
@@ -5471,7 +6076,7 @@ class Tokenizer extends CommentsParser {
     if (next === 123 || next === 91 && this.hasPlugin("recordAndTuple")) {
       this.expectPlugin("recordAndTuple");
 
-      if (this.getPluginOption("recordAndTuple", "syntaxType") !== "hash") {
+      if (this.getPluginOption("recordAndTuple", "syntaxType") === "bar") {
         throw this.raise(next === 123 ? Errors.RecordExpressionHashIncorrectStartSyntaxType : Errors.TupleExpressionHashIncorrectStartSyntaxType, {
           at: this.state.curPosition()
         });
@@ -6029,70 +6634,15 @@ class Tokenizer extends CommentsParser {
     });
   }
 
-  readInt(radix, len, forceLen) {
+  readInt(radix, len) {
+    var forceLen = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var allowNumSeparator = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-    var start = this.state.pos;
-    var forbiddenSiblings = radix === 16 ? forbiddenNumericSeparatorSiblings.hex : forbiddenNumericSeparatorSiblings.decBinOct;
-    var isAllowedSibling = radix === 16 ? isAllowedNumericSeparatorSibling.hex : radix === 10 ? isAllowedNumericSeparatorSibling.dec : radix === 8 ? isAllowedNumericSeparatorSibling.oct : isAllowedNumericSeparatorSibling.bin;
-    var invalid = false;
-    var total = 0;
-
-    for (var i = 0, e = len == null ? Infinity : len; i < e; ++i) {
-      var code = this.input.charCodeAt(this.state.pos);
-      var val = void 0;
-
-      if (code === 95 && allowNumSeparator !== "bail") {
-        var prev = this.input.charCodeAt(this.state.pos - 1);
-        var next = this.input.charCodeAt(this.state.pos + 1);
-
-        if (!allowNumSeparator) {
-          this.raise(Errors.NumericSeparatorInEscapeSequence, {
-            at: this.state.curPosition()
-          });
-        } else if (Number.isNaN(next) || !isAllowedSibling(next) || forbiddenSiblings.has(prev) || forbiddenSiblings.has(next)) {
-          this.raise(Errors.UnexpectedNumericSeparator, {
-            at: this.state.curPosition()
-          });
-        }
-
-        ++this.state.pos;
-        continue;
-      }
-
-      if (code >= 97) {
-        val = code - 97 + 10;
-      } else if (code >= 65) {
-        val = code - 65 + 10;
-      } else if (_isDigit(code)) {
-        val = code - 48;
-      } else {
-        val = Infinity;
-      }
-
-      if (val >= radix) {
-        if (this.options.errorRecovery && val <= 9) {
-          val = 0;
-          this.raise(Errors.InvalidDigit, {
-            at: this.state.curPosition(),
-            radix
-          });
-        } else if (forceLen) {
-          val = 0;
-          invalid = true;
-        } else {
-          break;
-        }
-      }
-
-      ++this.state.pos;
-      total = total * radix + val;
-    }
-
-    if (this.state.pos === start || len != null && this.state.pos - start !== len || invalid) {
-      return null;
-    }
-
-    return total;
+    var {
+      n,
+      pos
+    } = readInt(this.input, this.state.pos, this.state.lineStart, this.state.curLine, radix, len, forceLen, allowNumSeparator, this.errorHandlers_readInt, false);
+    this.state.pos = pos;
+    return n;
   }
 
   readRadixNumber(radix) {
@@ -6244,63 +6794,25 @@ class Tokenizer extends CommentsParser {
   }
 
   readCodePoint(throwOnInvalid) {
-    var ch = this.input.charCodeAt(this.state.pos);
-    var code;
-
-    if (ch === 123) {
-      ++this.state.pos;
-      code = this.readHexChar(this.input.indexOf("}", this.state.pos) - this.state.pos, true, throwOnInvalid);
-      ++this.state.pos;
-
-      if (code !== null && code > 0x10ffff) {
-        if (throwOnInvalid) {
-          this.raise(Errors.InvalidCodePoint, {
-            at: this.state.curPosition()
-          });
-        } else {
-          return null;
-        }
-      }
-    } else {
-      code = this.readHexChar(4, false, throwOnInvalid);
-    }
-
+    var {
+      code,
+      pos
+    } = readCodePoint(this.input, this.state.pos, this.state.lineStart, this.state.curLine, throwOnInvalid, this.errorHandlers_readCodePoint);
+    this.state.pos = pos;
     return code;
   }
 
   readString(quote) {
-    var out = "",
-        chunkStart = ++this.state.pos;
-
-    for (;;) {
-      if (this.state.pos >= this.length) {
-        throw this.raise(Errors.UnterminatedString, {
-          at: this.state.startLoc
-        });
-      }
-
-      var ch = this.input.charCodeAt(this.state.pos);
-      if (ch === quote) break;
-
-      if (ch === 92) {
-        out += this.input.slice(chunkStart, this.state.pos);
-        out += this.readEscapedChar(false);
-        chunkStart = this.state.pos;
-      } else if (ch === 8232 || ch === 8233) {
-        ++this.state.pos;
-        ++this.state.curLine;
-        this.state.lineStart = this.state.pos;
-      } else if (isNewLine(ch)) {
-        throw this.raise(Errors.UnterminatedString, {
-          at: this.state.startLoc
-        });
-      } else {
-        ++this.state.pos;
-      }
-    }
-
-    out += this.input.slice(chunkStart, this.state.pos++);
-    this.finishToken(129, out);
+    var {
+      str,
+      pos,
+      curLine,
+      lineStart
+    } = readStringContents(quote === 34 ? "double" : "single", this.input, this.state.pos + 1, this.state.lineStart, this.state.curLine, this.errorHandlers_readStringContents_string);
+    this.state.pos = pos + 1;
+    this.state.lineStart = lineStart;
+    this.state.curLine = curLine;
+    this.finishToken(129, str);
   }
 
   readTemplateContinuation() {
@@ -6313,195 +6825,43 @@ class Tokenizer extends CommentsParser {
   }
 
   readTemplateToken() {
-    var out = "",
-        chunkStart = this.state.pos,
-        containsInvalid = false;
-    ++this.state.pos;
-
-    for (;;) {
-      if (this.state.pos >= this.length) {
-        throw this.raise(Errors.UnterminatedTemplate, {
-          at: createPositionWithColumnOffset(this.state.startLoc, 1)
-        });
-      }
-
-      var ch = this.input.charCodeAt(this.state.pos);
-
-      if (ch === 96) {
-        ++this.state.pos;
-        out += this.input.slice(chunkStart, this.state.pos);
-        this.finishToken(24, containsInvalid ? null : out);
-        return;
-      }
-
-      if (ch === 36 && this.input.charCodeAt(this.state.pos + 1) === 123) {
-        this.state.pos += 2;
-        out += this.input.slice(chunkStart, this.state.pos);
-        this.finishToken(25, containsInvalid ? null : out);
-        return;
-      }
-
-      if (ch === 92) {
-        out += this.input.slice(chunkStart, this.state.pos);
-        var escaped = this.readEscapedChar(true);
-
-        if (escaped === null) {
-          containsInvalid = true;
-        } else {
-          out += escaped;
-        }
-
-        chunkStart = this.state.pos;
-      } else if (isNewLine(ch)) {
-        out += this.input.slice(chunkStart, this.state.pos);
-        ++this.state.pos;
-
-        switch (ch) {
-          case 13:
-            if (this.input.charCodeAt(this.state.pos) === 10) {
-              ++this.state.pos;
-            }
-
-          case 10:
-            out += "\n";
-            break;
-
-          default:
-            out += String.fromCharCode(ch);
-            break;
-        }
-
-        ++this.state.curLine;
-        this.state.lineStart = this.state.pos;
-        chunkStart = this.state.pos;
-      } else {
-        ++this.state.pos;
-      }
-    }
-  }
-
-  recordStrictModeErrors(toParseError, _ref42) {
+    var opening = this.input[this.state.pos];
     var {
-      at
-    } = _ref42;
-    var index = at.index;
-
-    if (this.state.strict && !this.state.strictErrors.has(index)) {
-      this.raise(toParseError, {
-        at
-      });
-    } else {
-      this.state.strictErrors.set(index, [toParseError, at]);
-    }
-  }
-
-  readEscapedChar(inTemplate) {
-    var throwOnInvalid = !inTemplate;
-    var ch = this.input.charCodeAt(++this.state.pos);
-    ++this.state.pos;
-
-    switch (ch) {
-      case 110:
-        return "\n";
-
-      case 114:
-        return "\r";
-
-      case 120:
-        {
-          var code = this.readHexChar(2, false, throwOnInvalid);
-          return code === null ? null : String.fromCharCode(code);
-        }
-
-      case 117:
-        {
-          var _code = this.readCodePoint(throwOnInvalid);
-
-          return _code === null ? null : String.fromCodePoint(_code);
-        }
-
-      case 116:
-        return "\t";
-
-      case 98:
-        return "\b";
-
-      case 118:
-        return "\u000b";
-
-      case 102:
-        return "\f";
-
-      case 13:
-        if (this.input.charCodeAt(this.state.pos) === 10) {
-          ++this.state.pos;
-        }
-
-      case 10:
-        this.state.lineStart = this.state.pos;
-        ++this.state.curLine;
-
-      case 8232:
-      case 8233:
-        return "";
-
-      case 56:
-      case 57:
-        if (inTemplate) {
-          return null;
-        } else {
-          this.recordStrictModeErrors(Errors.StrictNumericEscape, {
-            at: createPositionWithColumnOffset(this.state.curPosition(), -1)
-          });
-        }
-
-      default:
-        if (ch >= 48 && ch <= 55) {
-          var codePos = createPositionWithColumnOffset(this.state.curPosition(), -1);
-          var match = this.input.slice(this.state.pos - 1, this.state.pos + 2).match(/^[0-7]+/);
-          var octalStr = match[0];
-          var octal = parseInt(octalStr, 8);
-
-          if (octal > 255) {
-            octalStr = octalStr.slice(0, -1);
-            octal = parseInt(octalStr, 8);
-          }
-
-          this.state.pos += octalStr.length - 1;
-          var next = this.input.charCodeAt(this.state.pos);
-
-          if (octalStr !== "0" || next === 56 || next === 57) {
-            if (inTemplate) {
-              return null;
-            } else {
-              this.recordStrictModeErrors(Errors.StrictNumericEscape, {
-                at: codePos
-              });
-            }
-          }
-
-          return String.fromCharCode(octal);
-        }
-
-        return String.fromCharCode(ch);
+      str,
+      firstInvalidLoc,
+      pos,
+      curLine,
+      lineStart
+    } = readStringContents("template", this.input, this.state.pos + 1, this.state.lineStart, this.state.curLine, this.errorHandlers_readStringContents_template);
+    this.state.pos = pos + 1;
+    this.state.lineStart = lineStart;
+    this.state.curLine = curLine;
+
+    if (firstInvalidLoc) {
+      this.state.firstInvalidTemplateEscapePos = new Position(firstInvalidLoc.curLine, firstInvalidLoc.pos - firstInvalidLoc.lineStart, firstInvalidLoc.pos);
+    }
+
+    if (this.input.codePointAt(pos) === 96) {
+      this.finishToken(24, firstInvalidLoc ? null : opening + str + "`");
+    } else {
+      this.state.pos++;
+      this.finishToken(25, firstInvalidLoc ? null : opening + str + "${");
     }
   }
 
-  readHexChar(len, forceLen, throwOnInvalid) {
-    var codeLoc = this.state.curPosition();
-    var n = this.readInt(16, len, forceLen, false);
+  recordStrictModeErrors(toParseError, _ref43) {
+    var {
+      at
+    } = _ref43;
+    var index = at.index;
 
-    if (n === null) {
-      if (throwOnInvalid) {
-        this.raise(Errors.InvalidEscapeSequence, {
-          at: codeLoc
-        });
-      } else {
-        this.state.pos = codeLoc.index - 1;
-      }
+    if (this.state.strict && !this.state.strictErrors.has(index)) {
+      this.raise(toParseError, {
+        at
+      });
+    } else {
+      this.state.strictErrors.set(index, [toParseError, at]);
     }
-
-    return n;
   }
 
   readWord1(firstCode) {
@@ -6650,229 +7010,12 @@ class Tokenizer extends CommentsParser {
     }
   }
 
-}
-
-class Scope {
-  constructor(flags) {
-    this.var = new Set();
-    this.lexical = new Set();
-    this.functions = new Set();
-    this.flags = flags;
-  }
-
-}
-
-class ScopeHandler {
-  constructor(parser, inModule) {
-    this.parser = void 0;
-    this.scopeStack = [];
-    this.inModule = void 0;
-    this.undefinedExports = new Map();
-    this.parser = parser;
-    this.inModule = inModule;
-  }
-
-  get inFunction() {
-    return (this.currentVarScopeFlags() & SCOPE_FUNCTION) > 0;
-  }
-
-  get allowSuper() {
-    return (this.currentThisScopeFlags() & SCOPE_SUPER) > 0;
-  }
-
-  get allowDirectSuper() {
-    return (this.currentThisScopeFlags() & SCOPE_DIRECT_SUPER) > 0;
-  }
-
-  get inClass() {
-    return (this.currentThisScopeFlags() & SCOPE_CLASS) > 0;
-  }
-
-  get inClassAndNotInNonArrowFunction() {
-    var flags = this.currentThisScopeFlags();
-    return (flags & SCOPE_CLASS) > 0 && (flags & SCOPE_FUNCTION) === 0;
-  }
-
-  get inStaticBlock() {
-    for (var i = this.scopeStack.length - 1;; i--) {
-      var {
-        flags
-      } = this.scopeStack[i];
-
-      if (flags & SCOPE_STATIC_BLOCK) {
-        return true;
-      }
-
-      if (flags & (SCOPE_VAR | SCOPE_CLASS)) {
-        return false;
-      }
-    }
-  }
-
-  get inNonArrowFunction() {
-    return (this.currentThisScopeFlags() & SCOPE_FUNCTION) > 0;
-  }
-
-  get treatFunctionsAsVar() {
-    return this.treatFunctionsAsVarInScope(this.currentScope());
-  }
-
-  createScope(flags) {
-    return new Scope(flags);
-  }
-
-  enter(flags) {
-    this.scopeStack.push(this.createScope(flags));
-  }
-
-  exit() {
-    this.scopeStack.pop();
-  }
-
-  treatFunctionsAsVarInScope(scope) {
-    return !!(scope.flags & (SCOPE_FUNCTION | SCOPE_STATIC_BLOCK) || !this.parser.inModule && scope.flags & SCOPE_PROGRAM);
-  }
-
-  declareName(name, bindingType, loc) {
-    var scope = this.currentScope();
-
-    if (bindingType & BIND_SCOPE_LEXICAL || bindingType & BIND_SCOPE_FUNCTION) {
-      this.checkRedeclarationInScope(scope, name, bindingType, loc);
-
-      if (bindingType & BIND_SCOPE_FUNCTION) {
-        scope.functions.add(name);
-      } else {
-        scope.lexical.add(name);
-      }
-
-      if (bindingType & BIND_SCOPE_LEXICAL) {
-        this.maybeExportDefined(scope, name);
-      }
-    } else if (bindingType & BIND_SCOPE_VAR) {
-      for (var i = this.scopeStack.length - 1; i >= 0; --i) {
-        scope = this.scopeStack[i];
-        this.checkRedeclarationInScope(scope, name, bindingType, loc);
-        scope.var.add(name);
-        this.maybeExportDefined(scope, name);
-        if (scope.flags & SCOPE_VAR) break;
-      }
-    }
-
-    if (this.parser.inModule && scope.flags & SCOPE_PROGRAM) {
-      this.undefinedExports.delete(name);
-    }
-  }
-
-  maybeExportDefined(scope, name) {
-    if (this.parser.inModule && scope.flags & SCOPE_PROGRAM) {
-      this.undefinedExports.delete(name);
-    }
-  }
-
-  checkRedeclarationInScope(scope, name, bindingType, loc) {
-    if (this.isRedeclaredInScope(scope, name, bindingType)) {
-      this.parser.raise(Errors.VarRedeclaration, {
-        at: loc,
-        identifierName: name
+  errorBuilder(error) {
+    return (pos, lineStart, curLine) => {
+      this.raise(error, {
+        at: buildPosition(pos, lineStart, curLine)
       });
-    }
-  }
-
-  isRedeclaredInScope(scope, name, bindingType) {
-    if (!(bindingType & BIND_KIND_VALUE)) return false;
-
-    if (bindingType & BIND_SCOPE_LEXICAL) {
-      return scope.lexical.has(name) || scope.functions.has(name) || scope.var.has(name);
-    }
-
-    if (bindingType & BIND_SCOPE_FUNCTION) {
-      return scope.lexical.has(name) || !this.treatFunctionsAsVarInScope(scope) && scope.var.has(name);
-    }
-
-    return scope.lexical.has(name) && !(scope.flags & SCOPE_SIMPLE_CATCH && scope.lexical.values().next().value === name) || !this.treatFunctionsAsVarInScope(scope) && scope.functions.has(name);
-  }
-
-  checkLocalExport(id) {
-    var {
-      name
-    } = id;
-    var topLevelScope = this.scopeStack[0];
-
-    if (!topLevelScope.lexical.has(name) && !topLevelScope.var.has(name) && !topLevelScope.functions.has(name)) {
-      this.undefinedExports.set(name, id.loc.start);
-    }
-  }
-
-  currentScope() {
-    return this.scopeStack[this.scopeStack.length - 1];
-  }
-
-  currentVarScopeFlags() {
-    for (var i = this.scopeStack.length - 1;; i--) {
-      var {
-        flags
-      } = this.scopeStack[i];
-
-      if (flags & SCOPE_VAR) {
-        return flags;
-      }
-    }
-  }
-
-  currentThisScopeFlags() {
-    for (var i = this.scopeStack.length - 1;; i--) {
-      var {
-        flags
-      } = this.scopeStack[i];
-
-      if (flags & (SCOPE_VAR | SCOPE_CLASS) && !(flags & SCOPE_ARROW)) {
-        return flags;
-      }
-    }
-  }
-
-}
-
-class FlowScope extends Scope {
-  constructor() {
-    super(...arguments);
-    this.declareFunctions = new Set();
-  }
-
-}
-
-class FlowScopeHandler extends ScopeHandler {
-  createScope(flags) {
-    return new FlowScope(flags);
-  }
-
-  declareName(name, bindingType, loc) {
-    var scope = this.currentScope();
-
-    if (bindingType & BIND_FLAGS_FLOW_DECLARE_FN) {
-      this.checkRedeclarationInScope(scope, name, bindingType, loc);
-      this.maybeExportDefined(scope, name);
-      scope.declareFunctions.add(name);
-      return;
-    }
-
-    super.declareName(...arguments);
-  }
-
-  isRedeclaredInScope(scope, name, bindingType) {
-    if (super.isRedeclaredInScope(...arguments)) return true;
-
-    if (bindingType & BIND_FLAGS_FLOW_DECLARE_FN) {
-      return !scope.declareFunctions.has(name) && (scope.lexical.has(name) || scope.functions.has(name));
-    }
-
-    return false;
-  }
-
-  checkLocalExport(id) {
-    if (!this.scopeStack[0].declareFunctions.has(id.name)) {
-      super.checkLocalExport(id);
-    }
+    };
   }
 
 }
@@ -7001,10 +7144,10 @@ class ArrowHeadParsingScope extends ExpressionScope {
     this.declarationErrors = new Map();
   }
 
-  recordDeclarationError(ParsingErrorClass, _ref43) {
+  recordDeclarationError(ParsingErrorClass, _ref44) {
     var {
       at
-    } = _ref43;
+    } = _ref44;
     var index = at.index;
     this.declarationErrors.set(index, [ParsingErrorClass, at]);
   }
@@ -7034,10 +7177,10 @@ class ExpressionScopeHandler {
     this.stack.pop();
   }
 
-  recordParameterInitializerError(toParseError, _ref44) {
+  recordParameterInitializerError(toParseError, _ref45) {
     var {
       at: node
-    } = _ref44;
+    } = _ref45;
     var origin = {
       at: node.loc.start
     };
@@ -7060,10 +7203,10 @@ class ExpressionScopeHandler {
     this.parser.raise(toParseError, origin);
   }
 
-  recordArrowParemeterBindingError(error, _ref45) {
+  recordArrowParemeterBindingError(error, _ref46) {
     var {
       at: node
-    } = _ref45;
+    } = _ref46;
     var {
       stack
     } = this;
@@ -7081,10 +7224,10 @@ class ExpressionScopeHandler {
     }
   }
 
-  recordAsyncArrowParametersError(_ref46) {
+  recordAsyncArrowParametersError(_ref47) {
     var {
       at
-    } = _ref46;
+    } = _ref47;
     var {
       stack
     } = this;
@@ -7108,8 +7251,8 @@ class ExpressionScopeHandler {
     } = this;
     var currentScope = stack[stack.length - 1];
     if (!currentScope.canBeArrowParameterDeclaration()) return;
-    currentScope.iterateErrors(_ref47 => {
-      var [toParseError, loc] = _ref47;
+    currentScope.iterateErrors(_ref48 => {
+      var [toParseError, loc] = _ref48;
       this.parser.raise(toParseError, {
         at: loc
       });
@@ -7474,7 +7617,7 @@ class Node {
 var NodePrototype = Node.prototype;
 {
   NodePrototype.__clone = function () {
-    var newNode = new Node();
+    var newNode = new Node(undefined, this.start, this.loc.start);
     var keys = Object.keys(this);
 
     for (var i = 0, length = keys.length; i < length; i++) {
@@ -7596,138 +7739,140 @@ class NodeUtils extends UtilParser {
 }
 
 var reservedTypes = new Set(["_", "any", "bool", "boolean", "empty", "extends", "false", "interface", "mixed", "null", "number", "static", "string", "true", "typeof", "void"]);
-var FlowErrors = ParseErrorEnum(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["flow"])))(_ => ({
-  AmbiguousConditionalArrow: _("Ambiguous expression: wrap the arrow functions in parentheses to disambiguate."),
-  AmbiguousDeclareModuleKind: _("Found both `declare module.exports` and `declare export` in the same module. Modules can only have 1 since they are either an ES module or they are a CommonJS module."),
-  AssignReservedType: _(_ref48 => {
+var FlowErrors = ParseErrorEnum(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["flow"])))({
+  AmbiguousConditionalArrow: "Ambiguous expression: wrap the arrow functions in parentheses to disambiguate.",
+  AmbiguousDeclareModuleKind: "Found both `declare module.exports` and `declare export` in the same module. Modules can only have 1 since they are either an ES module or they are a CommonJS module.",
+  AssignReservedType: _ref49 => {
     var {
       reservedType
-    } = _ref48;
+    } = _ref49;
     return "Cannot overwrite reserved type ".concat(reservedType, ".");
-  }),
-  DeclareClassElement: _("The `declare` modifier can only appear on class fields."),
-  DeclareClassFieldInitializer: _("Initializers are not allowed in fields with the `declare` modifier."),
-  DuplicateDeclareModuleExports: _("Duplicate `declare module.exports` statement."),
-  EnumBooleanMemberNotInitialized: _(_ref49 => {
+  },
+  DeclareClassElement: "The `declare` modifier can only appear on class fields.",
+  DeclareClassFieldInitializer: "Initializers are not allowed in fields with the `declare` modifier.",
+  DuplicateDeclareModuleExports: "Duplicate `declare module.exports` statement.",
+  EnumBooleanMemberNotInitialized: _ref50 => {
     var {
       memberName,
       enumName
-    } = _ref49;
+    } = _ref50;
     return "Boolean enum members need to be initialized. Use either `".concat(memberName, " = true,` or `").concat(memberName, " = false,` in enum `").concat(enumName, "`.");
-  }),
-  EnumDuplicateMemberName: _(_ref50 => {
+  },
+  EnumDuplicateMemberName: _ref51 => {
     var {
       memberName,
       enumName
-    } = _ref50;
+    } = _ref51;
     return "Enum member names need to be unique, but the name `".concat(memberName, "` has already been used before in enum `").concat(enumName, "`.");
-  }),
-  EnumInconsistentMemberValues: _(_ref51 => {
+  },
+  EnumInconsistentMemberValues: _ref52 => {
     var {
       enumName
-    } = _ref51;
+    } = _ref52;
     return "Enum `".concat(enumName, "` has inconsistent member initializers. Either use no initializers, or consistently use literals (either booleans, numbers, or strings) for all member initializers.");
-  }),
-  EnumInvalidExplicitType: _(_ref52 => {
+  },
+  EnumInvalidExplicitType: _ref53 => {
     var {
       invalidEnumType,
       enumName
-    } = _ref52;
+    } = _ref53;
     return "Enum type `".concat(invalidEnumType, "` is not valid. Use one of `boolean`, `number`, `string`, or `symbol` in enum `").concat(enumName, "`.");
-  }),
-  EnumInvalidExplicitTypeUnknownSupplied: _(_ref53 => {
+  },
+  EnumInvalidExplicitTypeUnknownSupplied: _ref54 => {
     var {
       enumName
-    } = _ref53;
+    } = _ref54;
     return "Supplied enum type is not valid. Use one of `boolean`, `number`, `string`, or `symbol` in enum `".concat(enumName, "`.");
-  }),
-  EnumInvalidMemberInitializerPrimaryType: _(_ref54 => {
+  },
+  EnumInvalidMemberInitializerPrimaryType: _ref55 => {
     var {
       enumName,
       memberName,
       explicitType
-    } = _ref54;
+    } = _ref55;
     return "Enum `".concat(enumName, "` has type `").concat(explicitType, "`, so the initializer of `").concat(memberName, "` needs to be a ").concat(explicitType, " literal.");
-  }),
-  EnumInvalidMemberInitializerSymbolType: _(_ref55 => {
+  },
+  EnumInvalidMemberInitializerSymbolType: _ref56 => {
     var {
       enumName,
       memberName
-    } = _ref55;
+    } = _ref56;
     return "Symbol enum members cannot be initialized. Use `".concat(memberName, ",` in enum `").concat(enumName, "`.");
-  }),
-  EnumInvalidMemberInitializerUnknownType: _(_ref56 => {
+  },
+  EnumInvalidMemberInitializerUnknownType: _ref57 => {
     var {
       enumName,
       memberName
-    } = _ref56;
+    } = _ref57;
     return "The enum member initializer for `".concat(memberName, "` needs to be a literal (either a boolean, number, or string) in enum `").concat(enumName, "`.");
-  }),
-  EnumInvalidMemberName: _(_ref57 => {
+  },
+  EnumInvalidMemberName: _ref58 => {
     var {
       enumName,
       memberName,
       suggestion
-    } = _ref57;
+    } = _ref58;
     return "Enum member names cannot start with lowercase 'a' through 'z'. Instead of using `".concat(memberName, "`, consider using `").concat(suggestion, "`, in enum `").concat(enumName, "`.");
-  }),
-  EnumNumberMemberNotInitialized: _(_ref58 => {
+  },
+  EnumNumberMemberNotInitialized: _ref59 => {
     var {
       enumName,
       memberName
-    } = _ref58;
+    } = _ref59;
     return "Number enum members need to be initialized, e.g. `".concat(memberName, " = 1` in enum `").concat(enumName, "`.");
-  }),
-  EnumStringMemberInconsistentlyInitailized: _(_ref59 => {
+  },
+  EnumStringMemberInconsistentlyInitailized: _ref60 => {
     var {
       enumName
-    } = _ref59;
+    } = _ref60;
     return "String enum members need to consistently either all use initializers, or use no initializers, in enum `".concat(enumName, "`.");
-  }),
-  GetterMayNotHaveThisParam: _("A getter cannot have a `this` parameter."),
-  ImportTypeShorthandOnlyInPureImport: _("The `type` and `typeof` keywords on named imports can only be used on regular `import` statements. It cannot be used with `import type` or `import typeof` statements."),
-  InexactInsideExact: _("Explicit inexact syntax cannot appear inside an explicit exact object type."),
-  InexactInsideNonObject: _("Explicit inexact syntax cannot appear in class or interface definitions."),
-  InexactVariance: _("Explicit inexact syntax cannot have variance."),
-  InvalidNonTypeImportInDeclareModule: _("Imports within a `declare module` body must always be `import type` or `import typeof`."),
-  MissingTypeParamDefault: _("Type parameter declaration needs a default, since a preceding type parameter declaration has a default."),
-  NestedDeclareModule: _("`declare module` cannot be used inside another `declare module`."),
-  NestedFlowComment: _("Cannot have a flow comment inside another flow comment."),
-  PatternIsOptional: _("A binding pattern parameter cannot be optional in an implementation signature.", {
+  },
+  GetterMayNotHaveThisParam: "A getter cannot have a `this` parameter.",
+  ImportTypeShorthandOnlyInPureImport: "The `type` and `typeof` keywords on named imports can only be used on regular `import` statements. It cannot be used with `import type` or `import typeof` statements.",
+  InexactInsideExact: "Explicit inexact syntax cannot appear inside an explicit exact object type.",
+  InexactInsideNonObject: "Explicit inexact syntax cannot appear in class or interface definitions.",
+  InexactVariance: "Explicit inexact syntax cannot have variance.",
+  InvalidNonTypeImportInDeclareModule: "Imports within a `declare module` body must always be `import type` or `import typeof`.",
+  MissingTypeParamDefault: "Type parameter declaration needs a default, since a preceding type parameter declaration has a default.",
+  NestedDeclareModule: "`declare module` cannot be used inside another `declare module`.",
+  NestedFlowComment: "Cannot have a flow comment inside another flow comment.",
+  PatternIsOptional: Object.assign({
+    message: "A binding pattern parameter cannot be optional in an implementation signature."
+  }, {
     reasonCode: "OptionalBindingPattern"
   }),
-  SetterMayNotHaveThisParam: _("A setter cannot have a `this` parameter."),
-  SpreadVariance: _("Spread properties cannot have variance."),
-  ThisParamAnnotationRequired: _("A type annotation is required for the `this` parameter."),
-  ThisParamBannedInConstructor: _("Constructors cannot have a `this` parameter; constructors don't bind `this` like other functions."),
-  ThisParamMayNotBeOptional: _("The `this` parameter cannot be optional."),
-  ThisParamMustBeFirst: _("The `this` parameter must be the first function parameter."),
-  ThisParamNoDefault: _("The `this` parameter may not have a default value."),
-  TypeBeforeInitializer: _("Type annotations must come before default assignments, e.g. instead of `age = 25: number` use `age: number = 25`."),
-  TypeCastInPattern: _("The type cast expression is expected to be wrapped with parenthesis."),
-  UnexpectedExplicitInexactInObject: _("Explicit inexact syntax must appear at the end of an inexact object."),
-  UnexpectedReservedType: _(_ref60 => {
+  SetterMayNotHaveThisParam: "A setter cannot have a `this` parameter.",
+  SpreadVariance: "Spread properties cannot have variance.",
+  ThisParamAnnotationRequired: "A type annotation is required for the `this` parameter.",
+  ThisParamBannedInConstructor: "Constructors cannot have a `this` parameter; constructors don't bind `this` like other functions.",
+  ThisParamMayNotBeOptional: "The `this` parameter cannot be optional.",
+  ThisParamMustBeFirst: "The `this` parameter must be the first function parameter.",
+  ThisParamNoDefault: "The `this` parameter may not have a default value.",
+  TypeBeforeInitializer: "Type annotations must come before default assignments, e.g. instead of `age = 25: number` use `age: number = 25`.",
+  TypeCastInPattern: "The type cast expression is expected to be wrapped with parenthesis.",
+  UnexpectedExplicitInexactInObject: "Explicit inexact syntax must appear at the end of an inexact object.",
+  UnexpectedReservedType: _ref61 => {
     var {
       reservedType
-    } = _ref60;
+    } = _ref61;
     return "Unexpected reserved type ".concat(reservedType, ".");
-  }),
-  UnexpectedReservedUnderscore: _("`_` is only allowed as a type argument to call or new."),
-  UnexpectedSpaceBetweenModuloChecks: _("Spaces between `%` and `checks` are not allowed here."),
-  UnexpectedSpreadType: _("Spread operator cannot appear in class or interface definitions."),
-  UnexpectedSubtractionOperand: _('Unexpected token, expected "number" or "bigint".'),
-  UnexpectedTokenAfterTypeParameter: _("Expected an arrow function after this type parameter declaration."),
-  UnexpectedTypeParameterBeforeAsyncArrowFunction: _("Type parameters must come after the async keyword, e.g. instead of `<T> async () => {}`, use `async <T>() => {}`."),
-  UnsupportedDeclareExportKind: _(_ref61 => {
+  },
+  UnexpectedReservedUnderscore: "`_` is only allowed as a type argument to call or new.",
+  UnexpectedSpaceBetweenModuloChecks: "Spaces between `%` and `checks` are not allowed here.",
+  UnexpectedSpreadType: "Spread operator cannot appear in class or interface definitions.",
+  UnexpectedSubtractionOperand: 'Unexpected token, expected "number" or "bigint".',
+  UnexpectedTokenAfterTypeParameter: "Expected an arrow function after this type parameter declaration.",
+  UnexpectedTypeParameterBeforeAsyncArrowFunction: "Type parameters must come after the async keyword, e.g. instead of `<T> async () => {}`, use `async <T>() => {}`.",
+  UnsupportedDeclareExportKind: _ref62 => {
     var {
       unsupportedExportKind,
       suggestion
-    } = _ref61;
+    } = _ref62;
     return "`declare export ".concat(unsupportedExportKind, "` is not supported. Use `").concat(suggestion, "` instead.");
-  }),
-  UnsupportedStatementInDeclareModule: _("Only declares and type imports are allowed inside declare module."),
-  UnterminatedFlowComment: _("Unterminated flow-comment.")
-}));
+  },
+  UnsupportedStatementInDeclareModule: "Only declares and type imports are allowed inside declare module.",
+  UnterminatedFlowComment: "Unterminated flow-comment."
+});
 
 function isEsModuleType(bodyElement) {
   return bodyElement.type === "DeclareExportAllDeclaration" || bodyElement.type === "DeclareExportDeclaration" && (!bodyElement.declaration || bodyElement.declaration.type !== "TypeAlias" && bodyElement.declaration.type !== "InterfaceDeclaration");
@@ -7761,7 +7906,7 @@ function partition(list, test) {
 
 var FLOW_PRAGMA_REGEX = /\*?\s*@((?:no)?flow)\b/;
 
-var flow = superClass => class extends superClass {
+var flow = superClass => class FlowParserMixin extends superClass {
   constructor() {
     super(...arguments);
     this.flowPragma = undefined;
@@ -7826,7 +7971,7 @@ var flow = superClass => class extends superClass {
     }
 
     if (this.eat(10)) {
-      node.value = this.parseExpression();
+      node.value = super.parseExpression();
       this.expect(11);
       return this.finishNode(node, "DeclaredPredicate");
     } else {
@@ -7933,7 +8078,7 @@ var flow = superClass => class extends superClass {
     this.scope.enter(SCOPE_OTHER);
 
     if (this.match(129)) {
-      node.id = this.parseExprAtom();
+      node.id = super.parseExprAtom();
     } else {
       node.id = this.parseIdentifier();
     }
@@ -7954,7 +8099,7 @@ var flow = superClass => class extends superClass {
           });
         }
 
-        this.parseImport(_bodyNode);
+        super.parseImport(_bodyNode);
       } else {
         this.expectContextual(121, FlowErrors.UnsupportedStatementInDeclareModule);
         _bodyNode = this.flowParseDeclare(_bodyNode, true);
@@ -8052,16 +8197,16 @@ var flow = superClass => class extends superClass {
 
   flowParseDeclareTypeAlias(node) {
     this.next();
-    this.flowParseTypeAlias(node);
-    node.type = "DeclareTypeAlias";
-    return node;
+    var finished = this.flowParseTypeAlias(node);
+    finished.type = "DeclareTypeAlias";
+    return finished;
   }
 
   flowParseDeclareOpaqueType(node) {
     this.next();
-    this.flowParseOpaqueType(node, true);
-    node.type = "DeclareOpaqueType";
-    return node;
+    var finished = this.flowParseOpaqueType(node, true);
+    finished.type = "DeclareOpaqueType";
+    return finished;
   }
 
   flowParseDeclareInterface(node) {
@@ -8318,7 +8463,7 @@ var flow = superClass => class extends superClass {
   }
 
   flowParseObjectPropertyKey() {
-    return this.match(130) || this.match(129) ? this.parseExprAtom() : this.parseIdentifier(true);
+    return this.match(130) || this.match(129) ? super.parseExprAtom() : this.parseIdentifier(true);
   }
 
   flowParseObjectTypeIndexer(node, isStatic, variance) {
@@ -8406,14 +8551,14 @@ var flow = superClass => class extends superClass {
     return this.finishNode(node, "ObjectTypeCallProperty");
   }
 
-  flowParseObjectType(_ref62) {
+  flowParseObjectType(_ref63) {
     var {
       allowStatic,
       allowExact,
       allowSpread,
       allowProto,
       allowInexact
-    } = _ref62;
+    } = _ref63;
     var oldInType = this.state.inType;
     this.state.inType = true;
     var nodeStart = this.startNode();
@@ -9103,7 +9248,7 @@ var flow = superClass => class extends superClass {
       }
 
       this.next();
-      this.finishNode(variance, "Variance");
+      return this.finishNode(variance, "Variance");
     }
 
     return variance;
@@ -9128,7 +9273,7 @@ var flow = superClass => class extends superClass {
       node.returnType = typeNode.typeAnnotation ? this.finishNode(typeNode, "TypeAnnotation") : null;
     }
 
-    super.parseFunctionBodyAndFinish(node, type, isMethod);
+    return super.parseFunctionBodyAndFinish(node, type, isMethod);
   }
 
   parseStatement(context, topLevel) {
@@ -9383,7 +9528,7 @@ var flow = superClass => class extends superClass {
 
       if (this.match(5)) {
         node.specifiers = this.parseExportSpecifiers(true);
-        this.parseExportFrom(node);
+        super.parseExportFrom(node);
         return null;
       } else {
         return this.flowParseTypeAlias(declarationNode);
@@ -9415,7 +9560,7 @@ var flow = superClass => class extends superClass {
   }
 
   eatExportStar(node) {
-    if (super.eatExportStar(...arguments)) return true;
+    if (super.eatExportStar(node)) return true;
 
     if (this.isContextual(126) && this.lookahead().type === 55) {
       node.exportKind = "type";
@@ -9454,7 +9599,7 @@ var flow = superClass => class extends superClass {
     } = this.state;
 
     if (this.isContextual(121)) {
-      if (this.parseClassMemberFromModifier(classBody, member)) {
+      if (super.parseClassMemberFromModifier(classBody, member)) {
         return;
       }
 
@@ -9530,7 +9675,7 @@ var flow = superClass => class extends superClass {
       node.left = this.typeCastToParameter(node.left);
     }
 
-    super.toAssignable(...arguments);
+    super.toAssignable(node, isLHS);
   }
 
   toAssignableList(exprList, trailingCommaLoc, isLHS) {
@@ -9571,12 +9716,8 @@ var flow = superClass => class extends superClass {
     return node;
   }
 
-  isValidLVal(type) {
-    for (var _len3 = arguments.length, rest = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-      rest[_key3 - 1] = arguments[_key3];
-    }
-
-    return type === "TypeCastExpression" || super.isValidLVal(type, ...rest);
+  isValidLVal(type, isParenthesized, binding) {
+    return type === "TypeCastExpression" || super.isValidLVal(type, isParenthesized, binding);
   }
 
   parseClassProperty(node) {
@@ -9716,11 +9857,13 @@ var flow = superClass => class extends superClass {
       if (!this.match(10)) this.unexpected();
     }
 
-    super.parseObjPropValue(prop, startPos, startLoc, isGenerator, isAsync, isPattern, isAccessor, refExpressionErrors);
+    var result = super.parseObjPropValue(prop, startPos, startLoc, isGenerator, isAsync, isPattern, isAccessor, refExpressionErrors);
 
     if (typeParameters) {
-      (prop.value || prop).typeParameters = typeParameters;
+      (result.value || result).typeParameters = typeParameters;
     }
+
+    return result;
   }
 
   parseAssignableListItemTypes(param) {
@@ -9812,7 +9955,7 @@ var flow = superClass => class extends superClass {
     return super.maybeParseDefaultImportSpecifier(node);
   }
 
-  parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly) {
+  parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly, bindingType) {
     var firstIdent = specifier.imported;
     var specifierTypeKind = null;
 
@@ -10035,6 +10178,8 @@ var flow = superClass => class extends superClass {
   }
 
   checkParams(node, allowDuplicates, isArrowFunction) {
+    var strictModeChanged = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+
     if (isArrowFunction && this.state.noArrowParamsConversionAt.indexOf(node.start) !== -1) {
       return;
     }
@@ -10047,7 +10192,7 @@ var flow = superClass => class extends superClass {
       }
     }
 
-    return super.checkParams(...arguments);
+    return super.checkParams(node, allowDuplicates, isArrowFunction, strictModeChanged);
   }
 
   parseParenAndDistinguishExpression(canBeArrow) {
@@ -10059,7 +10204,7 @@ var flow = superClass => class extends superClass {
       this.next();
       var node = this.startNodeAt(startPos, startLoc);
       node.callee = base;
-      node.arguments = this.parseCallExpressionArguments(11, false);
+      node.arguments = super.parseCallExpressionArguments(11, false);
       base = this.finishNode(node, "CallExpression");
     } else if (base.type === "Identifier" && base.name === "async" && this.match(47)) {
       var state = this.state.clone();
@@ -10108,8 +10253,12 @@ var flow = superClass => class extends superClass {
       var result = this.tryParse(() => {
         _node4.typeArguments = this.flowParseTypeParameterInstantiationCallOrNew();
         this.expect(10);
-        _node4.arguments = this.parseCallExpressionArguments(11, false);
-        if (subscriptState.optionalChainMember) _node4.optional = false;
+        _node4.arguments = super.parseCallExpressionArguments(11, false);
+
+        if (subscriptState.optionalChainMember) {
+          _node4.optional = false;
+        }
+
         return this.finishCallExpression(_node4, subscriptState.optionalChainMember);
       });
 
@@ -10137,7 +10286,7 @@ var flow = superClass => class extends superClass {
     var node = this.startNodeAt(startPos, startLoc);
     this.parseFunctionParams(node);
     if (!this.parseArrow(node)) return;
-    return this.parseArrowExpression(node, undefined, true);
+    return super.parseArrowExpression(node, undefined, true);
   }
 
   readToken_mult_modulo(code) {
@@ -10185,8 +10334,13 @@ var flow = superClass => class extends superClass {
       }
 
       this.hasFlowCommentCompletion();
-      this.state.pos += this.skipFlowComment();
-      this.state.hasFlowComment = true;
+      var commentSkip = this.skipFlowComment();
+
+      if (commentSkip) {
+        this.state.pos += commentSkip;
+        this.state.hasFlowComment = true;
+      }
+
       return;
     }
 
@@ -10244,11 +10398,11 @@ var flow = superClass => class extends superClass {
     }
   }
 
-  flowEnumErrorBooleanMemberNotInitialized(loc, _ref63) {
+  flowEnumErrorBooleanMemberNotInitialized(loc, _ref64) {
     var {
       enumName,
       memberName
-    } = _ref63;
+    } = _ref64;
     this.raise(FlowErrors.EnumBooleanMemberNotInitialized, {
       at: loc,
       memberName,
@@ -10262,11 +10416,11 @@ var flow = superClass => class extends superClass {
     }, enumContext));
   }
 
-  flowEnumErrorNumberMemberNotInitialized(loc, _ref64) {
+  flowEnumErrorNumberMemberNotInitialized(loc, _ref65) {
     var {
       enumName,
       memberName
-    } = _ref64;
+    } = _ref65;
     this.raise(FlowErrors.EnumNumberMemberNotInitialized, {
       at: loc,
       enumName,
@@ -10274,10 +10428,10 @@ var flow = superClass => class extends superClass {
     });
   }
 
-  flowEnumErrorStringMemberInconsistentlyInitailized(node, _ref65) {
+  flowEnumErrorStringMemberInconsistentlyInitailized(node, _ref66) {
     var {
       enumName
-    } = _ref65;
+    } = _ref66;
     this.raise(FlowErrors.EnumStringMemberInconsistentlyInitailized, {
       at: node,
       enumName
@@ -10380,11 +10534,11 @@ var flow = superClass => class extends superClass {
     }
   }
 
-  flowEnumMembers(_ref66) {
+  flowEnumMembers(_ref67) {
     var {
       enumName,
       explicitType
-    } = _ref66;
+    } = _ref67;
     var seenNames = new Set();
     var members = {
       booleanMembers: [],
@@ -10494,10 +10648,10 @@ var flow = superClass => class extends superClass {
     };
   }
 
-  flowEnumStringMembers(initializedMembers, defaultedMembers, _ref67) {
+  flowEnumStringMembers(initializedMembers, defaultedMembers, _ref68) {
     var {
       enumName
-    } = _ref67;
+    } = _ref68;
 
     if (initializedMembers.length === 0) {
       return defaultedMembers;
@@ -10522,10 +10676,10 @@ var flow = superClass => class extends superClass {
     }
   }
 
-  flowEnumParseExplicitType(_ref68) {
+  flowEnumParseExplicitType(_ref69) {
     var {
       enumName
-    } = _ref68;
+    } = _ref69;
     if (!this.eatContextual(101)) return null;
 
     if (!tokenIsIdentifier(this.state.type)) {
@@ -10928,27 +11082,27 @@ var entities = {
   hearts: "\u2665",
   diams: "\u2666"
 };
-var JsxErrors = ParseErrorEnum(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["jsx"])))(_ => ({
-  AttributeIsEmpty: _("JSX attributes must only be assigned a non-empty expression."),
-  MissingClosingTagElement: _(_ref69 => {
+var JsxErrors = ParseErrorEnum(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["jsx"])))({
+  AttributeIsEmpty: "JSX attributes must only be assigned a non-empty expression.",
+  MissingClosingTagElement: _ref70 => {
     var {
       openingTagName
-    } = _ref69;
+    } = _ref70;
     return "Expected corresponding JSX closing tag for <".concat(openingTagName, ">.");
-  }),
-  MissingClosingTagFragment: _("Expected corresponding JSX closing tag for <>."),
-  UnexpectedSequenceExpression: _("Sequence expressions cannot be directly nested inside JSX. Did you mean to wrap it in parentheses (...)?"),
-  UnexpectedToken: _(_ref70 => {
+  },
+  MissingClosingTagFragment: "Expected corresponding JSX closing tag for <>.",
+  UnexpectedSequenceExpression: "Sequence expressions cannot be directly nested inside JSX. Did you mean to wrap it in parentheses (...)?",
+  UnexpectedToken: _ref71 => {
     var {
       unexpected,
       HTMLEntity
-    } = _ref70;
+    } = _ref71;
     return "Unexpected token `".concat(unexpected, "`. Did you mean `").concat(HTMLEntity, "` or `{'").concat(unexpected, "'}`?");
-  }),
-  UnsupportedJsxValue: _("JSX value should be either an expression or a quoted JSX text."),
-  UnterminatedJsxContent: _("Unterminated JSX contents."),
-  UnwrappedAdjacentJSXElements: _("Adjacent JSX elements must be wrapped in an enclosing tag. Did you want a JSX fragment <>...</>?")
-}));
+  },
+  UnsupportedJsxValue: "JSX value should be either an expression or a quoted JSX text.",
+  UnterminatedJsxContent: "Unterminated JSX contents.",
+  UnwrappedAdjacentJSXElements: "Adjacent JSX elements must be wrapped in an enclosing tag. Did you want a JSX fragment <>...</>?"
+});
 
 function isFragment(object) {
   return object ? object.type === "JSXOpeningFragment" || object.type === "JSXClosingFragment" : false;
@@ -10970,7 +11124,7 @@ function getQualifiedJSXName(object) {
   throw new Error("Node had unexpected type: " + object.type);
 }
 
-var jsx = superClass => class extends superClass {
+var jsx = superClass => class JSXParserMixin extends superClass {
   jsxReadToken() {
     var out = "";
     var chunkStart = this.state.pos;
@@ -11202,7 +11356,7 @@ var jsx = superClass => class extends superClass {
   jsxParseSpreadChild(node) {
     this.next();
     node.expression = this.parseExpression();
-    this.setContext(types.j_oTag);
+    this.setContext(types.j_expr);
     this.state.canStartJSXElement = true;
     this.expect(8);
     return this.finishNode(node, "JSXSpreadChild");
@@ -11465,11 +11619,63 @@ class TypeScriptScope extends Scope {
 }
 
 class TypeScriptScopeHandler extends ScopeHandler {
+  constructor() {
+    super(...arguments);
+    this.importsStack = [];
+  }
+
   createScope(flags) {
+    this.importsStack.push(new Set());
     return new TypeScriptScope(flags);
   }
 
+  enter(flags) {
+    if (flags == SCOPE_TS_MODULE) {
+      this.importsStack.push(new Set());
+    }
+
+    super.enter(flags);
+  }
+
+  exit() {
+    var flags = super.exit();
+
+    if (flags == SCOPE_TS_MODULE) {
+      this.importsStack.pop();
+    }
+
+    return flags;
+  }
+
+  hasImport(name, allowShadow) {
+    var len = this.importsStack.length;
+
+    if (this.importsStack[len - 1].has(name)) {
+      return true;
+    }
+
+    if (!allowShadow && len > 1) {
+      for (var i = 0; i < len - 1; i++) {
+        if (this.importsStack[i].has(name)) return true;
+      }
+    }
+
+    return false;
+  }
+
   declareName(name, bindingType, loc) {
+    if (bindingType & BIND_FLAGS_TS_IMPORT) {
+      if (this.hasImport(name, true)) {
+        this.parser.raise(Errors.VarRedeclaration, {
+          at: loc,
+          identifierName: name
+        });
+      }
+
+      this.importsStack[this.importsStack.length - 1].add(name);
+      return;
+    }
+
     var scope = this.currentScope();
 
     if (bindingType & BIND_FLAGS_TS_EXPORT_ONLY) {
@@ -11478,7 +11684,7 @@ class TypeScriptScopeHandler extends ScopeHandler {
       return;
     }
 
-    super.declareName(...arguments);
+    super.declareName(name, bindingType, loc);
 
     if (bindingType & BIND_KIND_TYPE) {
       if (!(bindingType & BIND_KIND_VALUE)) {
@@ -11517,18 +11723,22 @@ class TypeScriptScopeHandler extends ScopeHandler {
       return true;
     }
 
-    return super.isRedeclaredInScope(...arguments);
+    return super.isRedeclaredInScope(scope, name, bindingType);
   }
 
   checkLocalExport(id) {
-    var topLevelScope = this.scopeStack[0];
     var {
       name
     } = id;
+    if (this.hasImport(name)) return;
+    var len = this.scopeStack.length;
 
-    if (!topLevelScope.types.has(name) && !topLevelScope.exportOnlyBindings.has(name)) {
-      super.checkLocalExport(id);
+    for (var i = len - 1; i >= 0; i--) {
+      var scope = this.scopeStack[i];
+      if (scope.types.has(name) || scope.exportOnlyBindings.has(name)) return;
     }
+
+    super.checkLocalExport(id);
   }
 
 }
@@ -11549,145 +11759,145 @@ function assert(x) {
   }
 }
 
-var TSErrors = ParseErrorEnum(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["typescript"])))(_ => ({
-  AbstractMethodHasImplementation: _(_ref71 => {
+var TSErrors = ParseErrorEnum(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["typescript"])))({
+  AbstractMethodHasImplementation: _ref72 => {
     var {
       methodName
-    } = _ref71;
+    } = _ref72;
     return "Method '".concat(methodName, "' cannot have an implementation because it is marked abstract.");
-  }),
-  AbstractPropertyHasInitializer: _(_ref72 => {
+  },
+  AbstractPropertyHasInitializer: _ref73 => {
     var {
       propertyName
-    } = _ref72;
+    } = _ref73;
     return "Property '".concat(propertyName, "' cannot have an initializer because it is marked abstract.");
-  }),
-  AccesorCannotDeclareThisParameter: _("'get' and 'set' accessors cannot declare 'this' parameters."),
-  AccesorCannotHaveTypeParameters: _("An accessor cannot have type parameters."),
-  CannotFindName: _(_ref73 => {
+  },
+  AccesorCannotDeclareThisParameter: "'get' and 'set' accessors cannot declare 'this' parameters.",
+  AccesorCannotHaveTypeParameters: "An accessor cannot have type parameters.",
+  CannotFindName: _ref74 => {
     var {
       name
-    } = _ref73;
+    } = _ref74;
     return "Cannot find name '".concat(name, "'.");
-  }),
-  ClassMethodHasDeclare: _("Class methods cannot have the 'declare' modifier."),
-  ClassMethodHasReadonly: _("Class methods cannot have the 'readonly' modifier."),
-  ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference: _("A 'const' initializer in an ambient context must be a string or numeric literal or literal enum reference."),
-  ConstructorHasTypeParameters: _("Type parameters cannot appear on a constructor declaration."),
-  DeclareAccessor: _(_ref74 => {
+  },
+  ClassMethodHasDeclare: "Class methods cannot have the 'declare' modifier.",
+  ClassMethodHasReadonly: "Class methods cannot have the 'readonly' modifier.",
+  ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference: "A 'const' initializer in an ambient context must be a string or numeric literal or literal enum reference.",
+  ConstructorHasTypeParameters: "Type parameters cannot appear on a constructor declaration.",
+  DeclareAccessor: _ref75 => {
     var {
       kind
-    } = _ref74;
+    } = _ref75;
     return "'declare' is not allowed in ".concat(kind, "ters.");
-  }),
-  DeclareClassFieldHasInitializer: _("Initializers are not allowed in ambient contexts."),
-  DeclareFunctionHasImplementation: _("An implementation cannot be declared in ambient contexts."),
-  DuplicateAccessibilityModifier: _(_ref75 => {
+  },
+  DeclareClassFieldHasInitializer: "Initializers are not allowed in ambient contexts.",
+  DeclareFunctionHasImplementation: "An implementation cannot be declared in ambient contexts.",
+  DuplicateAccessibilityModifier: _ref76 => {
     return "Accessibility modifier already seen.";
-  }),
-  DuplicateModifier: _(_ref76 => {
+  },
+  DuplicateModifier: _ref77 => {
     var {
       modifier
-    } = _ref76;
+    } = _ref77;
     return "Duplicate modifier: '".concat(modifier, "'.");
-  }),
-  EmptyHeritageClauseType: _(_ref77 => {
+  },
+  EmptyHeritageClauseType: _ref78 => {
     var {
       token
-    } = _ref77;
+    } = _ref78;
     return "'".concat(token, "' list cannot be empty.");
-  }),
-  EmptyTypeArguments: _("Type argument list cannot be empty."),
-  EmptyTypeParameters: _("Type parameter list cannot be empty."),
-  ExpectedAmbientAfterExportDeclare: _("'export declare' must be followed by an ambient declaration."),
-  ImportAliasHasImportType: _("An import alias can not use 'import type'."),
-  IncompatibleModifiers: _(_ref78 => {
+  },
+  EmptyTypeArguments: "Type argument list cannot be empty.",
+  EmptyTypeParameters: "Type parameter list cannot be empty.",
+  ExpectedAmbientAfterExportDeclare: "'export declare' must be followed by an ambient declaration.",
+  ImportAliasHasImportType: "An import alias can not use 'import type'.",
+  IncompatibleModifiers: _ref79 => {
     var {
       modifiers
-    } = _ref78;
+    } = _ref79;
     return "'".concat(modifiers[0], "' modifier cannot be used with '").concat(modifiers[1], "' modifier.");
-  }),
-  IndexSignatureHasAbstract: _("Index signatures cannot have the 'abstract' modifier."),
-  IndexSignatureHasAccessibility: _(_ref79 => {
+  },
+  IndexSignatureHasAbstract: "Index signatures cannot have the 'abstract' modifier.",
+  IndexSignatureHasAccessibility: _ref80 => {
     var {
       modifier
-    } = _ref79;
+    } = _ref80;
     return "Index signatures cannot have an accessibility modifier ('".concat(modifier, "').");
-  }),
-  IndexSignatureHasDeclare: _("Index signatures cannot have the 'declare' modifier."),
-  IndexSignatureHasOverride: _("'override' modifier cannot appear on an index signature."),
-  IndexSignatureHasStatic: _("Index signatures cannot have the 'static' modifier."),
-  InitializerNotAllowedInAmbientContext: _("Initializers are not allowed in ambient contexts."),
-  InvalidModifierOnTypeMember: _(_ref80 => {
+  },
+  IndexSignatureHasDeclare: "Index signatures cannot have the 'declare' modifier.",
+  IndexSignatureHasOverride: "'override' modifier cannot appear on an index signature.",
+  IndexSignatureHasStatic: "Index signatures cannot have the 'static' modifier.",
+  InitializerNotAllowedInAmbientContext: "Initializers are not allowed in ambient contexts.",
+  InvalidModifierOnTypeMember: _ref81 => {
     var {
       modifier
-    } = _ref80;
+    } = _ref81;
     return "'".concat(modifier, "' modifier cannot appear on a type member.");
-  }),
-  InvalidModifierOnTypeParameter: _(_ref81 => {
+  },
+  InvalidModifierOnTypeParameter: _ref82 => {
     var {
       modifier
-    } = _ref81;
+    } = _ref82;
     return "'".concat(modifier, "' modifier cannot appear on a type parameter.");
-  }),
-  InvalidModifierOnTypeParameterPositions: _(_ref82 => {
+  },
+  InvalidModifierOnTypeParameterPositions: _ref83 => {
     var {
       modifier
-    } = _ref82;
+    } = _ref83;
     return "'".concat(modifier, "' modifier can only appear on a type parameter of a class, interface or type alias.");
-  }),
-  InvalidModifiersOrder: _(_ref83 => {
+  },
+  InvalidModifiersOrder: _ref84 => {
     var {
       orderedModifiers
-    } = _ref83;
+    } = _ref84;
     return "'".concat(orderedModifiers[0], "' modifier must precede '").concat(orderedModifiers[1], "' modifier.");
-  }),
-  InvalidPropertyAccessAfterInstantiationExpression: _("Invalid property access after an instantiation expression. " + "You can either wrap the instantiation expression in parentheses, or delete the type arguments."),
-  InvalidTupleMemberLabel: _("Tuple members must be labeled with a simple identifier."),
-  MissingInterfaceName: _("'interface' declarations must be followed by an identifier."),
-  MixedLabeledAndUnlabeledElements: _("Tuple members must all have names or all not have names."),
-  NonAbstractClassHasAbstractMethod: _("Abstract methods can only appear within an abstract class."),
-  NonClassMethodPropertyHasAbstractModifer: _("'abstract' modifier can only appear on a class, method, or property declaration."),
-  OptionalTypeBeforeRequired: _("A required element cannot follow an optional element."),
-  OverrideNotInSubClass: _("This member cannot have an 'override' modifier because its containing class does not extend another class."),
-  PatternIsOptional: _("A binding pattern parameter cannot be optional in an implementation signature."),
-  PrivateElementHasAbstract: _("Private elements cannot have the 'abstract' modifier."),
-  PrivateElementHasAccessibility: _(_ref84 => {
+  },
+  InvalidPropertyAccessAfterInstantiationExpression: "Invalid property access after an instantiation expression. " + "You can either wrap the instantiation expression in parentheses, or delete the type arguments.",
+  InvalidTupleMemberLabel: "Tuple members must be labeled with a simple identifier.",
+  MissingInterfaceName: "'interface' declarations must be followed by an identifier.",
+  MixedLabeledAndUnlabeledElements: "Tuple members must all have names or all not have names.",
+  NonAbstractClassHasAbstractMethod: "Abstract methods can only appear within an abstract class.",
+  NonClassMethodPropertyHasAbstractModifer: "'abstract' modifier can only appear on a class, method, or property declaration.",
+  OptionalTypeBeforeRequired: "A required element cannot follow an optional element.",
+  OverrideNotInSubClass: "This member cannot have an 'override' modifier because its containing class does not extend another class.",
+  PatternIsOptional: "A binding pattern parameter cannot be optional in an implementation signature.",
+  PrivateElementHasAbstract: "Private elements cannot have the 'abstract' modifier.",
+  PrivateElementHasAccessibility: _ref85 => {
     var {
       modifier
-    } = _ref84;
+    } = _ref85;
     return "Private elements cannot have an accessibility modifier ('".concat(modifier, "').");
-  }),
-  ReadonlyForMethodSignature: _("'readonly' modifier can only appear on a property declaration or index signature."),
-  ReservedArrowTypeParam: _("This syntax is reserved in files with the .mts or .cts extension. Add a trailing comma, as in `<T,>() => ...`."),
-  ReservedTypeAssertion: _("This syntax is reserved in files with the .mts or .cts extension. Use an `as` expression instead."),
-  SetAccesorCannotHaveOptionalParameter: _("A 'set' accessor cannot have an optional parameter."),
-  SetAccesorCannotHaveRestParameter: _("A 'set' accessor cannot have rest parameter."),
-  SetAccesorCannotHaveReturnType: _("A 'set' accessor cannot have a return type annotation."),
-  SingleTypeParameterWithoutTrailingComma: _(_ref85 => {
+  },
+  ReadonlyForMethodSignature: "'readonly' modifier can only appear on a property declaration or index signature.",
+  ReservedArrowTypeParam: "This syntax is reserved in files with the .mts or .cts extension. Add a trailing comma, as in `<T,>() => ...`.",
+  ReservedTypeAssertion: "This syntax is reserved in files with the .mts or .cts extension. Use an `as` expression instead.",
+  SetAccesorCannotHaveOptionalParameter: "A 'set' accessor cannot have an optional parameter.",
+  SetAccesorCannotHaveRestParameter: "A 'set' accessor cannot have rest parameter.",
+  SetAccesorCannotHaveReturnType: "A 'set' accessor cannot have a return type annotation.",
+  SingleTypeParameterWithoutTrailingComma: _ref86 => {
     var {
       typeParameterName
-    } = _ref85;
+    } = _ref86;
     return "Single type parameter ".concat(typeParameterName, " should have a trailing comma. Example usage: <").concat(typeParameterName, ",>.");
-  }),
-  StaticBlockCannotHaveModifier: _("Static class blocks cannot have any modifier."),
-  TypeAnnotationAfterAssign: _("Type annotations must come before default assignments, e.g. instead of `age = 25: number` use `age: number = 25`."),
-  TypeImportCannotSpecifyDefaultAndNamed: _("A type-only import can specify a default import or named bindings, but not both."),
-  TypeModifierIsUsedInTypeExports: _("The 'type' modifier cannot be used on a named export when 'export type' is used on its export statement."),
-  TypeModifierIsUsedInTypeImports: _("The 'type' modifier cannot be used on a named import when 'import type' is used on its import statement."),
-  UnexpectedParameterModifier: _("A parameter property is only allowed in a constructor implementation."),
-  UnexpectedReadonly: _("'readonly' type modifier is only permitted on array and tuple literal types."),
-  UnexpectedTypeAnnotation: _("Did not expect a type annotation here."),
-  UnexpectedTypeCastInParameter: _("Unexpected type cast in parameter position."),
-  UnsupportedImportTypeArgument: _("Argument in a type import must be a string literal."),
-  UnsupportedParameterPropertyKind: _("A parameter property may not be declared using a binding pattern."),
-  UnsupportedSignatureParameterKind: _(_ref86 => {
+  },
+  StaticBlockCannotHaveModifier: "Static class blocks cannot have any modifier.",
+  TypeAnnotationAfterAssign: "Type annotations must come before default assignments, e.g. instead of `age = 25: number` use `age: number = 25`.",
+  TypeImportCannotSpecifyDefaultAndNamed: "A type-only import can specify a default import or named bindings, but not both.",
+  TypeModifierIsUsedInTypeExports: "The 'type' modifier cannot be used on a named export when 'export type' is used on its export statement.",
+  TypeModifierIsUsedInTypeImports: "The 'type' modifier cannot be used on a named import when 'import type' is used on its import statement.",
+  UnexpectedParameterModifier: "A parameter property is only allowed in a constructor implementation.",
+  UnexpectedReadonly: "'readonly' type modifier is only permitted on array and tuple literal types.",
+  UnexpectedTypeAnnotation: "Did not expect a type annotation here.",
+  UnexpectedTypeCastInParameter: "Unexpected type cast in parameter position.",
+  UnsupportedImportTypeArgument: "Argument in a type import must be a string literal.",
+  UnsupportedParameterPropertyKind: "A parameter property may not be declared using a binding pattern.",
+  UnsupportedSignatureParameterKind: _ref87 => {
     var {
       type
-    } = _ref86;
+    } = _ref87;
     return "Name in a signature must be an Identifier, ObjectPattern or ArrayPattern, instead got ".concat(type, ".");
-  })
-}));
+  }
+});
 
 function keywordTypeFromName(value) {
   switch (value) {
@@ -11734,7 +11944,7 @@ function tsIsVarianceAnnotations(modifier) {
   return modifier === "in" || modifier === "out";
 }
 
-var typescript = superClass => class extends superClass {
+var typescript = superClass => class TypeScriptParserMixin extends superClass {
   getScopeHandler() {
     return TypeScriptScopeHandler;
   }
@@ -11772,14 +11982,14 @@ var typescript = superClass => class extends superClass {
     return undefined;
   }
 
-  tsParseModifiers(_ref87) {
+  tsParseModifiers(_ref88) {
     var {
       modified,
       allowedModifiers,
       disallowedModifiers,
       stopOnStartOfClassStaticBlock,
       errorTemplate = TSErrors.InvalidModifierOnTypeMember
-    } = _ref87;
+    } = _ref88;
 
     var enforceOrder = (loc, modifier, before, after) => {
       if (modifier === before && modified[after]) {
@@ -11960,7 +12170,7 @@ var typescript = superClass => class extends superClass {
       });
     }
 
-    node.argument = this.parseExprAtom();
+    node.argument = super.parseExprAtom();
     this.expect(11);
 
     if (this.eat(16)) {
@@ -12123,7 +12333,7 @@ var typescript = superClass => class extends superClass {
   }
 
   tsParseBindingListForSignature() {
-    return this.parseBindingList(11, 41).map(pattern => {
+    return super.parseBindingList(11, 41).map(pattern => {
       if (pattern.type !== "Identifier" && pattern.type !== "RestElement" && pattern.type !== "ObjectPattern" && pattern.type !== "ArrayPattern") {
         this.raise(TSErrors.UnsupportedSignatureParameterKind, {
           at: pattern,
@@ -12288,11 +12498,11 @@ var typescript = superClass => class extends superClass {
       return idx;
     }
 
-    this.parsePropertyName(node);
+    super.parsePropertyName(node);
 
     if (!node.computed && node.key.type === "Identifier" && (node.key.name === "get" || node.key.name === "set") && this.tsTokenCanFollowModifier()) {
       node.kind = node.key.name;
-      this.parsePropertyName(node);
+      super.parsePropertyName(node);
     }
 
     return this.tsParsePropertyOrMethodSignature(node, !!node.readonly);
@@ -12392,15 +12602,16 @@ var typescript = superClass => class extends superClass {
         });
       }
 
-      seenOptionalElement = seenOptionalElement || type === "TSNamedTupleMember" && elementNode.optional || type === "TSOptionalType";
+      seenOptionalElement || (seenOptionalElement = type === "TSNamedTupleMember" && elementNode.optional || type === "TSOptionalType");
+      var checkType = type;
 
       if (type === "TSRestType") {
         elementNode = elementNode.typeAnnotation;
-        type = elementNode.type;
+        checkType = elementNode.type;
       }
 
-      var isLabeled = type === "TSNamedTupleMember";
-      labeledElements = (_labeledElements = labeledElements) != null ? _labeledElements : isLabeled;
+      var isLabeled = checkType === "TSNamedTupleMember";
+      (_labeledElements = labeledElements) != null ? _labeledElements : labeledElements = isLabeled;
 
       if (labeledElements !== isLabeled) {
         this.raise(TSErrors.MixedLabeledAndUnlabeledElements, {
@@ -12482,7 +12693,7 @@ var typescript = superClass => class extends superClass {
         case 129:
         case 85:
         case 86:
-          return this.parseExprAtom();
+          return super.parseExprAtom();
 
         default:
           throw this.unexpected();
@@ -12494,7 +12705,7 @@ var typescript = superClass => class extends superClass {
 
   tsParseTemplateLiteralType() {
     var node = this.startNode();
-    node.literal = this.parseTemplate(false);
+    node.literal = super.parseTemplate(false);
     return this.finishNode(node, "TSLiteralType");
   }
 
@@ -12718,7 +12929,7 @@ var typescript = superClass => class extends superClass {
       var _previousErrorCount = _errors.length;
 
       try {
-        this.parseBindingList(3, 93, true);
+        super.parseBindingList(3, 93, true);
         return _errors.length === _previousErrorCount;
       } catch (_unused2) {
         return false;
@@ -13041,10 +13252,10 @@ var typescript = superClass => class extends superClass {
 
   tsParseEnumMember() {
     var node = this.startNode();
-    node.id = this.match(129) ? this.parseExprAtom() : this.parseIdentifier(true);
+    node.id = this.match(129) ? super.parseStringLiteral(this.state.value) : this.parseIdentifier(true);
 
     if (this.eat(29)) {
-      node.initializer = this.parseMaybeAssignAllowIn();
+      node.initializer = super.parseMaybeAssignAllowIn();
     }
 
     return this.finishNode(node, "TSEnumMember");
@@ -13067,7 +13278,8 @@ var typescript = superClass => class extends superClass {
     var node = this.startNode();
     this.scope.enter(SCOPE_OTHER);
     this.expect(5);
-    this.parseBlockOrModuleBlockBody(node.body = [], undefined, true, 8);
+    super.parseBlockOrModuleBlockBody(node.body = [], undefined, true, 8);
+    this.next();
     this.scope.exit();
     return this.finishNode(node, "TSModuleBlock");
   }
@@ -13100,7 +13312,7 @@ var typescript = superClass => class extends superClass {
       node.global = true;
       node.id = this.parseIdentifier();
     } else if (this.match(129)) {
-      node.id = this.parseExprAtom();
+      node.id = super.parseStringLiteral(this.state.value);
     } else {
       this.unexpected();
     }
@@ -13121,7 +13333,7 @@ var typescript = superClass => class extends superClass {
   tsParseImportEqualsDeclaration(node, isExport) {
     node.isExport = isExport || false;
     node.id = this.parseIdentifier();
-    this.checkIdentifier(node.id, BIND_LEXICAL);
+    this.checkIdentifier(node.id, BIND_FLAGS_TS_IMPORT);
     this.expect(29);
     var moduleReference = this.tsParseModuleReference();
 
@@ -13153,7 +13365,7 @@ var typescript = superClass => class extends superClass {
       throw this.unexpected();
     }
 
-    node.expression = this.parseExprAtom();
+    node.expression = super.parseExprAtom();
     this.expect(11);
     return this.finishNode(node, "TSExternalModuleReference");
   }
@@ -13200,7 +13412,7 @@ var typescript = superClass => class extends superClass {
     return this.tsInAmbientContext(() => {
       if (starttype === 68) {
         nany.declare = true;
-        return this.parseFunctionStatement(nany, false, true);
+        return super.parseFunctionStatement(nany, false, true);
       }
 
       if (starttype === 80) {
@@ -13349,7 +13561,7 @@ var typescript = superClass => class extends superClass {
       return undefined;
     }
 
-    return this.parseArrowExpression(res, null, true);
+    return super.parseArrowExpression(res, null, true);
   }
 
   tsParseTypeArgumentsInExpression() {
@@ -13456,8 +13668,7 @@ var typescript = superClass => class extends superClass {
     var bodilessType = type === "FunctionDeclaration" ? "TSDeclareFunction" : type === "ClassMethod" || type === "ClassPrivateMethod" ? "TSDeclareMethod" : undefined;
 
     if (bodilessType && !this.match(5) && this.isLineTerminator()) {
-      this.finishNode(node, bodilessType);
-      return;
+      return this.finishNode(node, bodilessType);
     }
 
     if (bodilessType === "TSDeclareFunction" && this.state.isAmbientContext) {
@@ -13466,19 +13677,18 @@ var typescript = superClass => class extends superClass {
       });
 
       if (node.declare) {
-        super.parseFunctionBodyAndFinish(node, bodilessType, isMethod);
-        return;
+        return super.parseFunctionBodyAndFinish(node, bodilessType, isMethod);
       }
     }
 
-    super.parseFunctionBodyAndFinish(node, type, isMethod);
+    return super.parseFunctionBodyAndFinish(node, type, isMethod);
   }
 
   registerFunctionStatementId(node) {
     if (!node.body && node.id) {
       this.checkIdentifier(node.id, BIND_TS_AMBIENT);
     } else {
-      super.registerFunctionStatementId(...arguments);
+      super.registerFunctionStatementId(node);
     }
   }
 
@@ -13497,8 +13707,8 @@ var typescript = superClass => class extends superClass {
     return exprList;
   }
 
-  parseArrayLike() {
-    var node = super.parseArrayLike(...arguments);
+  parseArrayLike(close, canBePattern, isTuple, refExpressionErrors) {
+    var node = super.parseArrayLike(close, canBePattern, isTuple, refExpressionErrors);
 
     if (node.type === "ArrayExpression") {
       this.tsCheckForInvalidTypeCasts(node.elements);
@@ -13548,7 +13758,7 @@ var typescript = superClass => class extends superClass {
         }
 
         if (tokenIsTemplate(this.state.type)) {
-          var _result = this.parseTaggedTemplateExpression(base, startPos, startLoc, state);
+          var _result = super.parseTaggedTemplateExpression(base, startPos, startLoc, state);
 
           _result.typeParameters = typeArguments;
           return _result;
@@ -13571,7 +13781,7 @@ var typescript = superClass => class extends superClass {
 
         var tokenType = this.state.type;
 
-        if (tokenType === 48 || tokenType !== 10 && tokenCanStartExpression(tokenType) && !this.hasPrecedingLineBreak()) {
+        if (tokenType === 48 || tokenType === 52 || tokenType !== 10 && tokenCanStartExpression(tokenType) && !this.hasPrecedingLineBreak()) {
           return;
         }
 
@@ -13684,7 +13894,7 @@ var typescript = superClass => class extends superClass {
       return this.tsParseImportEqualsDeclaration(node, true);
     } else if (this.eat(29)) {
       var assign = node;
-      assign.expression = this.parseExpression();
+      assign.expression = super.parseExpression();
       this.semicolon();
       return this.finishNode(assign, "TSExportAssignment");
     } else if (this.eatContextual(93)) {
@@ -13714,8 +13924,7 @@ var typescript = superClass => class extends superClass {
       var cls = this.startNode();
       this.next();
       cls.abstract = true;
-      this.parseClass(cls, true, true);
-      return cls;
+      return this.parseClass(cls, true, true);
     }
 
     if (this.match(125)) {
@@ -13814,7 +14023,7 @@ var typescript = superClass => class extends superClass {
           });
         }
 
-        this.parseClassStaticBlock(classBody, member);
+        super.parseClassStaticBlock(classBody, member);
       } else {
         this.parseClassMemberWithIsStatic(classBody, member, state, !!member.static);
       }
@@ -13973,7 +14182,7 @@ var typescript = superClass => class extends superClass {
     return declaration;
   }
 
-  parseClassId(node, isStatement, optionalId) {
+  parseClassId(node, isStatement, optionalId, bindingType) {
     if ((!isStatement || optionalId) && this.isContextual(110)) {
       return;
     }
@@ -13995,7 +14204,7 @@ var typescript = superClass => class extends superClass {
   parseClassProperty(node) {
     this.parseClassPropertyAnnotation(node);
 
-    if (this.state.isAmbientContext && this.match(29)) {
+    if (this.state.isAmbientContext && !(node.readonly && !node.typeAnnotation) && this.match(29)) {
       this.raise(TSErrors.DeclareClassFieldHasInitializer, {
         at: this.state.startLoc
       });
@@ -14081,15 +14290,10 @@ var typescript = superClass => class extends superClass {
     }
   }
 
-  parseObjPropValue(prop) {
+  parseObjPropValue(prop, startPos, startLoc, isGenerator, isAsync, isPattern, isAccessor, refExpressionErrors) {
     var typeParameters = this.tsTryParseTypeParameters();
     if (typeParameters) prop.typeParameters = typeParameters;
-
-    for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-      args[_key4 - 1] = arguments[_key4];
-    }
-
-    super.parseObjPropValue(prop, ...args);
+    return super.parseObjPropValue(prop, startPos, startLoc, isGenerator, isAsync, isPattern, isAccessor, refExpressionErrors);
   }
 
   parseFunctionParams(node, allowModifiers) {
@@ -14121,11 +14325,7 @@ var typescript = superClass => class extends superClass {
     return super.parseAsyncArrowFromCallExpression(node, call);
   }
 
-  parseMaybeAssign() {
-    for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-      args[_key5] = arguments[_key5];
-    }
-
+  parseMaybeAssign(refExpressionErrors, afterLeftParse) {
     var _jsx, _jsx2, _typeCast, _jsx3, _typeCast2, _jsx4, _typeCast3;
 
     var state;
@@ -14134,7 +14334,7 @@ var typescript = superClass => class extends superClass {
 
     if (this.hasPlugin("jsx") && (this.match(138) || this.match(47))) {
       state = this.state.clone();
-      jsx = this.tryParse(() => super.parseMaybeAssign(...args), state);
+      jsx = this.tryParse(() => super.parseMaybeAssign(refExpressionErrors, afterLeftParse), state);
       if (!jsx.error) return jsx.node;
       var {
         context
@@ -14147,7 +14347,7 @@ var typescript = superClass => class extends superClass {
     }
 
     if (!((_jsx = jsx) != null && _jsx.error) && !this.match(47)) {
-      return super.parseMaybeAssign(...args);
+      return super.parseMaybeAssign(refExpressionErrors, afterLeftParse);
     }
 
     if (!state || state === this.state) state = this.state.clone();
@@ -14156,7 +14356,7 @@ var typescript = superClass => class extends superClass {
       var _expr$extra, _typeParameters;
 
       typeParameters = this.tsParseTypeParameters();
-      var expr = super.parseMaybeAssign(...args);
+      var expr = super.parseMaybeAssign(refExpressionErrors, afterLeftParse);
 
       if (expr.type !== "ArrowFunctionExpression" || (_expr$extra = expr.extra) != null && _expr$extra.parenthesized) {
         abort();
@@ -14177,7 +14377,7 @@ var typescript = superClass => class extends superClass {
 
     if (!jsx) {
       assert(!this.hasPlugin("jsx"));
-      typeCast = this.tryParse(() => super.parseMaybeAssign(...args), state);
+      typeCast = this.tryParse(() => super.parseMaybeAssign(refExpressionErrors, afterLeftParse), state);
       if (!typeCast.error) return typeCast.node;
     }
 
@@ -14213,11 +14413,11 @@ var typescript = superClass => class extends superClass {
     }
   }
 
-  parseMaybeUnary(refExpressionErrors) {
+  parseMaybeUnary(refExpressionErrors, sawUnary) {
     if (!this.hasPlugin("jsx") && this.match(47)) {
       return this.tsParseTypeAssertion();
     } else {
-      return super.parseMaybeUnary(refExpressionErrors);
+      return super.parseMaybeUnary(refExpressionErrors, sawUnary);
     }
   }
 
@@ -14383,8 +14583,8 @@ var typescript = superClass => class extends superClass {
     return this.match(35) || this.match(14) || super.isClassProperty();
   }
 
-  parseMaybeDefault() {
-    var node = super.parseMaybeDefault(...arguments);
+  parseMaybeDefault(startPos, startLoc, left) {
+    var node = super.parseMaybeDefault(startPos, startLoc, left);
 
     if (node.type === "AssignmentPattern" && node.typeAnnotation && node.right.start < node.typeAnnotation.start) {
       this.raise(TSErrors.TypeAnnotationAfterAssign, {
@@ -14437,7 +14637,7 @@ var typescript = superClass => class extends superClass {
     return type;
   }
 
-  toAssignableList(exprList) {
+  toAssignableList(exprList, trailingCommaLoc, isLHS) {
     for (var i = 0; i < exprList.length; i++) {
       var expr = exprList[i];
 
@@ -14446,7 +14646,7 @@ var typescript = superClass => class extends superClass {
       }
     }
 
-    super.toAssignableList(...arguments);
+    super.toAssignableList(exprList, trailingCommaLoc, isLHS);
   }
 
   typeCastToParameter(node) {
@@ -14511,16 +14711,12 @@ var typescript = superClass => class extends superClass {
     }
   }
 
-  parseClass(node) {
+  parseClass(node, isStatement, optionalId) {
     var oldInAbstractClass = this.state.inAbstractClass;
     this.state.inAbstractClass = !!node.abstract;
 
     try {
-      for (var _len6 = arguments.length, args = new Array(_len6 > 1 ? _len6 - 1 : 0), _key6 = 1; _key6 < _len6; _key6++) {
-        args[_key6 - 1] = arguments[_key6];
-      }
-
-      return super.parseClass(node, ...args);
+      return super.parseClass(node, isStatement, optionalId);
     } finally {
       this.state.inAbstractClass = oldInAbstractClass;
     }
@@ -14543,8 +14739,8 @@ var typescript = superClass => class extends superClass {
     }
   }
 
-  parseMethod() {
-    var method = super.parseMethod(...arguments);
+  parseMethod(node, isGenerator, isAsync, isConstructor, allowDirectSuper, type, inClassScope) {
+    var method = super.parseMethod(node, isGenerator, isAsync, isConstructor, allowDirectSuper, type, inClassScope);
 
     if (method.abstract) {
       var hasBody = this.hasPlugin("estree") ? !!method.value.body : !!method.body;
@@ -14598,14 +14794,14 @@ var typescript = superClass => class extends superClass {
     return super.parseExportSpecifier(node, isString, isInTypeExport, isMaybeTypeOnly);
   }
 
-  parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly) {
+  parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly, bindingType) {
     if (!importedIsString && isMaybeTypeOnly) {
       this.parseTypeOnlyImportExportSpecifier(specifier, true, isInTypeOnlyImport);
       return this.finishNode(specifier, "ImportSpecifier");
     }
 
     specifier.importKind = "value";
-    return super.parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly);
+    return super.parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly, isInTypeOnlyImport ? BIND_TS_TYPE_IMPORT : BIND_FLAGS_TS_IMPORT);
   }
 
   parseTypeOnlyImportExportSpecifier(node, isImport, isInTypeOnlyImportExport) {
@@ -14673,7 +14869,7 @@ var typescript = superClass => class extends superClass {
     }
 
     if (isImport) {
-      this.checkIdentifier(node[rightOfAsKey], BIND_LEXICAL);
+      this.checkIdentifier(node[rightOfAsKey], hasTypeSpecifier ? BIND_TS_TYPE_IMPORT : BIND_FLAGS_TS_IMPORT);
     }
   }
 
@@ -14700,12 +14896,12 @@ function isUncomputedMemberExpressionChain(expression) {
   return isUncomputedMemberExpressionChain(expression.object);
 }
 
-var PlaceholderErrors = ParseErrorEnum(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["placeholders"])))(_ => ({
-  ClassNameIsRequired: _("A class name is required."),
-  UnexpectedSpace: _("Unexpected space in placeholder.")
-}));
+var PlaceholderErrors = ParseErrorEnum(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["placeholders"])))({
+  ClassNameIsRequired: "A class name is required.",
+  UnexpectedSpace: "Unexpected space in placeholder."
+});
 
-var placeholders = superClass => class extends superClass {
+var placeholders = superClass => class PlaceholdersParserMixin extends superClass {
   parsePlaceholder(expectedNode) {
     if (this.match(140)) {
       var node = this.startNode();
@@ -14729,38 +14925,36 @@ var placeholders = superClass => class extends superClass {
       return this.finishOp(140, 2);
     }
 
-    return super.getTokenFromCode(...arguments);
+    return super.getTokenFromCode(code);
   }
 
-  parseExprAtom() {
-    return this.parsePlaceholder("Expression") || super.parseExprAtom(...arguments);
+  parseExprAtom(refExpressionErrors) {
+    return this.parsePlaceholder("Expression") || super.parseExprAtom(refExpressionErrors);
   }
 
-  parseIdentifier() {
-    return this.parsePlaceholder("Identifier") || super.parseIdentifier(...arguments);
+  parseIdentifier(liberal) {
+    return this.parsePlaceholder("Identifier") || super.parseIdentifier(liberal);
   }
 
-  checkReservedWord(word) {
-    if (word !== undefined) super.checkReservedWord(...arguments);
+  checkReservedWord(word, startLoc, checkKeywords, isBinding) {
+    if (word !== undefined) {
+      super.checkReservedWord(word, startLoc, checkKeywords, isBinding);
+    }
   }
 
   parseBindingAtom() {
-    return this.parsePlaceholder("Pattern") || super.parseBindingAtom(...arguments);
+    return this.parsePlaceholder("Pattern") || super.parseBindingAtom();
   }
 
-  isValidLVal(type) {
-    for (var _len7 = arguments.length, rest = new Array(_len7 > 1 ? _len7 - 1 : 0), _key7 = 1; _key7 < _len7; _key7++) {
-      rest[_key7 - 1] = arguments[_key7];
-    }
-
-    return type === "Placeholder" || super.isValidLVal(type, ...rest);
+  isValidLVal(type, isParenthesized, binding) {
+    return type === "Placeholder" || super.isValidLVal(type, isParenthesized, binding);
   }
 
-  toAssignable(node) {
+  toAssignable(node, isLHS) {
     if (node && node.type === "Placeholder" && node.expectedNode === "Expression") {
       node.expectedNode = "Pattern";
     } else {
-      super.toAssignable(...arguments);
+      super.toAssignable(node, isLHS);
     }
   }
 
@@ -14783,21 +14977,21 @@ var placeholders = superClass => class extends superClass {
     return false;
   }
 
-  verifyBreakContinue(node) {
+  verifyBreakContinue(node, isBreak) {
     if (node.label && node.label.type === "Placeholder") return;
-    super.verifyBreakContinue(...arguments);
+    super.verifyBreakContinue(node, isBreak);
   }
 
   parseExpressionStatement(node, expr) {
     if (expr.type !== "Placeholder" || expr.extra && expr.extra.parenthesized) {
-      return super.parseExpressionStatement(...arguments);
+      return super.parseExpressionStatement(node, expr);
     }
 
     if (this.match(14)) {
       var stmt = node;
       stmt.label = this.finishPlaceholder(expr, "Identifier");
       this.next();
-      stmt.body = this.parseStatement("label");
+      stmt.body = super.parseStatement("label");
       return this.finishNode(stmt, "LabeledStatement");
     }
 
@@ -14806,12 +15000,12 @@ var placeholders = superClass => class extends superClass {
     return this.finishPlaceholder(node, "Statement");
   }
 
-  parseBlock() {
-    return this.parsePlaceholder("BlockStatement") || super.parseBlock(...arguments);
+  parseBlock(allowDirectives, createNewLexicalScope, afterBlockParse) {
+    return this.parsePlaceholder("BlockStatement") || super.parseBlock(allowDirectives, createNewLexicalScope, afterBlockParse);
   }
 
-  parseFunctionId() {
-    return this.parsePlaceholder("Identifier") || super.parseFunctionId(...arguments);
+  parseFunctionId(requireId) {
+    return this.parsePlaceholder("Identifier") || super.parseFunctionId(requireId);
   }
 
   parseClass(node, isStatement, optionalId) {
@@ -14837,14 +15031,14 @@ var placeholders = superClass => class extends superClass {
       this.parseClassId(node, isStatement, optionalId);
     }
 
-    this.parseClassSuper(node);
-    node.body = this.parsePlaceholder("ClassBody") || this.parseClassBody(!!node.superClass, oldStrict);
+    super.parseClassSuper(node);
+    node.body = this.parsePlaceholder("ClassBody") || super.parseClassBody(!!node.superClass, oldStrict);
     return this.finishNode(node, type);
   }
 
   parseExport(node) {
     var placeholder = this.parsePlaceholder("Identifier");
-    if (!placeholder) return super.parseExport(...arguments);
+    if (!placeholder) return super.parseExport(node);
 
     if (!this.isContextual(97) && !this.match(12)) {
       node.specifiers = [];
@@ -14879,7 +15073,7 @@ var placeholders = superClass => class extends superClass {
       return true;
     }
 
-    return super.maybeParseExportDefaultSpecifier(...arguments);
+    return super.maybeParseExportDefaultSpecifier(node);
   }
 
   checkExport(node) {
@@ -14897,7 +15091,7 @@ var placeholders = superClass => class extends superClass {
 
   parseImport(node) {
     var placeholder = this.parsePlaceholder("Identifier");
-    if (!placeholder) return super.parseImport(...arguments);
+    if (!placeholder) return super.parseImport(node);
     node.specifiers = [];
 
     if (!this.isContextual(97) && !this.match(12)) {
@@ -14908,8 +15102,7 @@ var placeholders = superClass => class extends superClass {
 
     var specifier = this.startNodeAtNode(placeholder);
     specifier.local = placeholder;
-    this.finishNode(specifier, "ImportDefaultSpecifier");
-    node.specifiers.push(specifier);
+    node.specifiers.push(this.finishNode(specifier, "ImportDefaultSpecifier"));
 
     if (this.eat(12)) {
       var hasStarImport = this.maybeParseStarImportSpecifier(node);
@@ -14923,7 +15116,7 @@ var placeholders = superClass => class extends superClass {
   }
 
   parseImportSource() {
-    return this.parsePlaceholder("StringLiteral") || super.parseImportSource(...arguments);
+    return this.parsePlaceholder("StringLiteral") || super.parseImportSource();
   }
 
   assertNoSpace() {
@@ -14936,7 +15129,7 @@ var placeholders = superClass => class extends superClass {
 
 };
 
-var v8intrinsic = superClass => class extends superClass {
+var v8intrinsic = superClass => class V8IntrinsicMixin extends superClass {
   parseV8Intrinsic() {
     if (this.match(54)) {
       var v8IntrinsicStartLoc = this.state.startLoc;
@@ -14957,8 +15150,8 @@ var v8intrinsic = superClass => class extends superClass {
     }
   }
 
-  parseExprAtom() {
-    return this.parseV8Intrinsic() || super.parseExprAtom(...arguments);
+  parseExprAtom(refExpressionErrors) {
+    return this.parseV8Intrinsic() || super.parseExprAtom(refExpressionErrors);
   }
 
 };
@@ -14997,7 +15190,7 @@ function getPluginOption(plugins, name, option) {
     }
   });
 
-  if (plugin && Array.isArray(plugin)) {
+  if (plugin && Array.isArray(plugin) && plugin.length > 1) {
     return plugin[1][option];
   }
 
@@ -15016,11 +15209,15 @@ function validatePlugins(plugins) {
 
     var decoratorsBeforeExport = getPluginOption(plugins, "decorators", "decoratorsBeforeExport");
 
-    if (decoratorsBeforeExport == null) {
-      throw new Error("The 'decorators' plugin requires a 'decoratorsBeforeExport' option," + " whose value must be a boolean. If you are migrating from" + " Babylon/Babel 6 or want to use the old decorators proposal, you" + " should use the 'decorators-legacy' plugin instead of 'decorators'.");
-    } else if (typeof decoratorsBeforeExport !== "boolean") {
+    if (decoratorsBeforeExport != null && typeof decoratorsBeforeExport !== "boolean") {
       throw new Error("'decoratorsBeforeExport' must be a boolean.");
     }
+
+    var allowCallParenthesized = getPluginOption(plugins, "decorators", "allowCallParenthesized");
+
+    if (allowCallParenthesized != null && typeof allowCallParenthesized !== "boolean") {
+      throw new Error("'allowCallParenthesized' must be a boolean.");
+    }
   }
 
   if (hasPlugin(plugins, "flow") && hasPlugin(plugins, "typescript")) {
@@ -15081,8 +15278,8 @@ function validatePlugins(plugins) {
     }
   }
 
-  if (hasPlugin(plugins, "recordAndTuple") && !RECORD_AND_TUPLE_SYNTAX_TYPES.includes(getPluginOption(plugins, "recordAndTuple", "syntaxType"))) {
-    throw new Error("'recordAndTuple' requires 'syntaxType' option whose value should be one of: " + RECORD_AND_TUPLE_SYNTAX_TYPES.map(p => "'".concat(p, "'")).join(", "));
+  if (hasPlugin(plugins, "recordAndTuple") && getPluginOption(plugins, "recordAndTuple", "syntaxType") != null && !RECORD_AND_TUPLE_SYNTAX_TYPES.includes(getPluginOption(plugins, "recordAndTuple", "syntaxType"))) {
+    throw new Error("The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: " + RECORD_AND_TUPLE_SYNTAX_TYPES.map(p => "'".concat(p, "'")).join(", "));
   }
 
   if (hasPlugin(plugins, "asyncDoExpressions") && !hasPlugin(plugins, "doExpressions")) {
@@ -15340,10 +15537,10 @@ class LValParser extends NodeUtils {
     }
   }
 
-  parseSpread(refExpressionErrors, refNeedsArrowPos) {
+  parseSpread(refExpressionErrors) {
     var node = this.startNode();
     this.next();
-    node.argument = this.parseMaybeAssignAllowIn(refExpressionErrors, undefined, refNeedsArrowPos);
+    node.argument = this.parseMaybeAssignAllowIn(refExpressionErrors, undefined);
     return this.finishNode(node, "SpreadElement");
   }
 
@@ -15439,8 +15636,7 @@ class LValParser extends NodeUtils {
     }
 
     prop.method = false;
-    this.parseObjPropValue(prop, startPos, startLoc, false, false, true, false);
-    return prop;
+    return this.parseObjPropValue(prop, startPos, startLoc, false, false, true, false);
   }
 
   parseAssignableListItem(allowModifiers, decorators) {
@@ -15483,7 +15679,7 @@ class LValParser extends NodeUtils {
     }, type);
   }
 
-  checkLVal(expression, _ref88) {
+  checkLVal(expression, _ref89) {
     var {
       in: ancestor,
       binding = BIND_NONE,
@@ -15491,7 +15687,7 @@ class LValParser extends NodeUtils {
       strictModeChanged = false,
       allowingSloppyLetBinding = !(binding & BIND_SCOPE_LEXICAL),
       hasParenthesizedAncestor = false
-    } = _ref88;
+    } = _ref89;
 
     var _expression$extra;
 
@@ -15900,7 +16096,7 @@ class ExpressionParser extends LValParser {
         }
 
         node.right = this.parseExprOpRightExpr(op, prec);
-        this.finishNode(node, logical || coalesce ? "LogicalExpression" : "BinaryExpression");
+        var finishedNode = this.finishNode(node, logical || coalesce ? "LogicalExpression" : "BinaryExpression");
         var nextOp = this.state.type;
 
         if (coalesce && (nextOp === 41 || nextOp === 42) || logical && nextOp === 40) {
@@ -15909,7 +16105,7 @@ class ExpressionParser extends LValParser {
           });
         }
 
-        return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec);
+        return this.parseExprOp(finishedNode, leftStartPos, leftStartLoc, minPrec);
       }
     }
 
@@ -16034,7 +16230,10 @@ class ExpressionParser extends LValParser {
       }
 
       if (!update) {
-        if (!sawUnary) this.checkExponentialAfterUnary(node);
+        if (!sawUnary) {
+          this.checkExponentialAfterUnary(node);
+        }
+
         return this.finishNode(node, "UnaryExpression");
       }
     }
@@ -16061,8 +16260,9 @@ class ExpressionParser extends LValParser {
 
   parseUpdate(node, update, refExpressionErrors) {
     if (update) {
-      this.checkLVal(node.argument, {
-        in: this.finishNode(node, "UpdateExpression")
+      var updateExpressionNode = node;
+      this.checkLVal(updateExpressionNode.argument, {
+        in: this.finishNode(updateExpressionNode, "UpdateExpression")
       });
       return node;
     }
@@ -16217,25 +16417,25 @@ class ExpressionParser extends LValParser {
       node.arguments = this.parseCallExpressionArguments(11, base.type === "Import", base.type !== "Super", node, refExpressionErrors);
     }
 
-    this.finishCallExpression(node, optionalChainMember);
+    var finishedNode = this.finishCallExpression(node, optionalChainMember);
 
     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);
+      finishedNode = this.parseAsyncArrowFromCallExpression(this.startNodeAt(startPos, startLoc), finishedNode);
     } else {
       if (maybeAsyncArrow) {
         this.checkExpressionErrors(refExpressionErrors, true);
         this.expressionScope.exit();
       }
 
-      this.toReferencedArguments(node);
+      this.toReferencedArguments(finishedNode);
     }
 
     this.state.maybeInArrowParameters = oldMaybeInArrowParameters;
-    return node;
+    return finishedNode;
   }
 
   toReferencedArguments(node, isParenthesizedExpr) {
@@ -16647,8 +16847,7 @@ class ExpressionParser extends LValParser {
     }
 
     this.expect(19);
-    this.parseArrowExpression(node, params, true);
-    return node;
+    return this.parseArrowExpression(node, params, true);
   }
 
   parseDo(node, isAsync) {
@@ -16900,8 +17099,7 @@ class ExpressionParser extends LValParser {
 
     var parenExpression = this.startNodeAt(startPos, startLoc);
     parenExpression.expression = expression;
-    this.finishNode(parenExpression, "ParenthesizedExpression");
-    return parenExpression;
+    return this.finishNode(parenExpression, "ParenthesizedExpression");
   }
 
   shouldParseArrow(params) {
@@ -16984,7 +17182,7 @@ class ExpressionParser extends LValParser {
     if (value === null) {
       if (!isTagged) {
         this.raise(Errors.InvalidEscapeSequenceTemplate, {
-          at: createPositionWithColumnOffset(startLoc, 2)
+          at: createPositionWithColumnOffset(this.state.firstInvalidTemplateEscapePos, 1)
         });
       }
     }
@@ -16998,9 +17196,9 @@ class ExpressionParser extends LValParser {
     };
     elem.tail = isTail;
     this.next();
-    this.finishNode(elem, "TemplateElement");
-    this.resetEndLocation(elem, createPositionWithColumnOffset(this.state.lastTokEndLoc, endOffset));
-    return elem;
+    var finishedNode = this.finishNode(elem, "TemplateElement");
+    this.resetEndLocation(finishedNode, createPositionWithColumnOffset(this.state.lastTokEndLoc, endOffset));
+    return finishedNode;
   }
 
   parseTemplate(isTagged) {
@@ -17162,8 +17360,7 @@ class ExpressionParser extends LValParser {
       }
     }
 
-    this.parseObjPropValue(prop, startPos, startLoc, isGenerator, isAsync, false, isAccessor, refExpressionErrors);
-    return prop;
+    return this.parseObjPropValue(prop, startPos, startLoc, isGenerator, isAsync, false, isAccessor, refExpressionErrors);
   }
 
   getGetterSetterExpectedParamCount(method) {
@@ -17195,9 +17392,9 @@ class ExpressionParser extends LValParser {
 
   parseObjectMethod(prop, isGenerator, isAsync, isPattern, isAccessor) {
     if (isAccessor) {
-      this.parseMethod(prop, isGenerator, false, false, false, "ObjectMethod");
-      this.checkGetterSetterParams(prop);
-      return prop;
+      var finishedProp = this.parseMethod(prop, isGenerator, false, false, false, "ObjectMethod");
+      this.checkGetterSetterParams(finishedProp);
+      return finishedProp;
     }
 
     if (isAsync || isGenerator || this.match(10)) {
@@ -17329,10 +17526,10 @@ class ExpressionParser extends LValParser {
     this.scope.enter(SCOPE_FUNCTION | SCOPE_SUPER | (inClassScope ? SCOPE_CLASS : 0) | (allowDirectSuper ? SCOPE_DIRECT_SUPER : 0));
     this.prodParam.enter(functionFlags(isAsync, node.generator));
     this.parseFunctionParams(node, allowModifiers);
-    this.parseFunctionBodyAndFinish(node, type, true);
+    var finishedNode = this.parseFunctionBodyAndFinish(node, type, true);
     this.prodParam.exit();
     this.scope.exit();
-    return node;
+    return finishedNode;
   }
 
   parseArrayLike(close, canBePattern, isTuple, refExpressionErrors) {
@@ -17382,7 +17579,7 @@ class ExpressionParser extends LValParser {
   parseFunctionBodyAndFinish(node, type) {
     var isMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     this.parseFunctionBody(node, false, isMethod);
-    this.finishNode(node, type);
+    return this.finishNode(node, type);
   }
 
   parseFunctionBody(node, allowExpression) {
@@ -17702,15 +17899,16 @@ class ExpressionParser extends LValParser {
   }
 
   parseSmartPipelineBodyInStyle(childExpr, startPos, startLoc) {
-    var bodyNode = this.startNodeAt(startPos, startLoc);
-
     if (this.isSimpleReference(childExpr)) {
+      var bodyNode = this.startNodeAt(startPos, startLoc);
       bodyNode.callee = childExpr;
       return this.finishNode(bodyNode, "PipelineBareFunction");
     } else {
+      var _bodyNode2 = this.startNodeAt(startPos, startLoc);
+
       this.checkSmartPipeTopicBodyEarlyErrors(startLoc);
-      bodyNode.expression = childExpr;
-      return this.finishNode(bodyNode, "PipelineTopicExpression");
+      _bodyNode2.expression = childExpr;
+      return this.finishNode(_bodyNode2, "PipelineTopicExpression");
     }
   }
 
@@ -17847,7 +18045,7 @@ class ExpressionParser extends LValParser {
     this.expectPlugin("moduleBlocks");
     var node = this.startNode();
     this.next();
-    this.eat(5);
+    this.expect(5);
     var revertScopes = this.initializeScopes(true);
     this.enterInitialScopes();
     var program = this.startNode();
@@ -18025,6 +18223,10 @@ class StatementParser extends ExpressionParser {
       }
     }
 
+    if (end === 135) {
+      this.next();
+    }
+
     return this.finishNode(program, "Program");
   }
 
@@ -18219,7 +18421,7 @@ class StatementParser extends ExpressionParser {
             }
           }
 
-          this.assertModuleNodeAllowed(node);
+          this.assertModuleNodeAllowed(result);
           return result;
         }
 
@@ -18313,6 +18515,14 @@ class StatementParser extends ExpressionParser {
         expr = this.parseExpression();
         this.expect(11);
         expr = this.wrapParenthesis(_startPos2, _startLoc2, expr);
+        var paramsStartLoc = this.state.startLoc;
+        node.expression = this.parseMaybeDecoratorArguments(expr);
+
+        if (this.getPluginOption("decorators", "allowCallParenthesized") === false && node.expression !== expr) {
+          this.raise(Errors.DecoratorArgumentsOutsideParentheses, {
+            at: paramsStartLoc
+          });
+        }
       } else {
         expr = this.parseIdentifier(false);
 
@@ -18320,13 +18530,21 @@ class StatementParser extends ExpressionParser {
           var _node11 = this.startNodeAt(startPos, startLoc);
 
           _node11.object = expr;
-          _node11.property = this.parseIdentifier(true);
+
+          if (this.match(134)) {
+            this.classScope.usePrivateName(this.state.value, this.state.startLoc);
+            _node11.property = this.parsePrivateName();
+          } else {
+            _node11.property = this.parseIdentifier(true);
+          }
+
           _node11.computed = false;
           expr = this.finishNode(_node11, "MemberExpression");
         }
+
+        node.expression = this.parseMaybeDecoratorArguments(expr);
       }
 
-      node.expression = this.parseMaybeDecoratorArguments(expr);
       this.state.decoratorStack.pop();
     } else {
       node.expression = this.parseExprSubscripts();
@@ -18430,12 +18648,12 @@ class StatementParser extends ExpressionParser {
     var isLet = startsWithLet && this.isLetKeyword();
 
     if (this.match(74) || this.match(75) || isLet) {
-      var _init = this.startNode();
-
+      var initNode = this.startNode();
       var kind = isLet ? "let" : this.state.value;
       this.next();
-      this.parseVar(_init, true, kind);
-      this.finishNode(_init, "VariableDeclaration");
+      this.parseVar(initNode, true, kind);
+
+      var _init = this.finishNode(initNode, "VariableDeclaration");
 
       if ((this.match(58) || this.isContextual(101)) && _init.declarations.length === 1) {
         return this.parseForIn(node, _init, awaitAt);
@@ -18721,6 +18939,7 @@ class StatementParser extends ExpressionParser {
     }
 
     this.parseBlockBody(node, allowDirectives, false, 8, afterBlockParse);
+    this.next();
 
     if (createNewLexicalScope) {
       this.scope.exit();
@@ -18774,8 +18993,6 @@ class StatementParser extends ExpressionParser {
     if (!oldStrict) {
       this.setStrict(false);
     }
-
-    this.next();
   }
 
   parseFor(node, init) {
@@ -19224,6 +19441,7 @@ class StatementParser extends ExpressionParser {
     this.prodParam.enter(PARAM);
     var body = member.body = [];
     this.parseBlockOrModuleBlockBody(body, undefined, false, 8);
+    this.next();
     this.prodParam.exit();
     this.scope.exit();
     this.state.labels = oldLabels;
@@ -19731,11 +19949,11 @@ class StatementParser extends ExpressionParser {
 
   isJSONModuleImport(node) {
     if (node.assertions != null) {
-      return node.assertions.some(_ref89 => {
+      return node.assertions.some(_ref90 => {
         var {
           key,
           value
-        } = _ref89;
+        } = _ref90;
         return value.value === "json" && (key.type === "Identifier" ? key.name === "type" : key.value === "type");
       });
     }
@@ -19749,7 +19967,7 @@ class StatementParser extends ExpressionParser {
         specifiers
       } = node;
 
-      if (node.specifiers != null) {
+      if (specifiers != null) {
         var nonDefaultNamedSpecifier = specifiers.find(specifier => {
           var imported;
 
@@ -19817,9 +20035,10 @@ class StatementParser extends ExpressionParser {
   }
 
   finishImportSpecifier(specifier, type) {
+    var bindingType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : BIND_LEXICAL;
     this.checkLVal(specifier.local, {
       in: specifier,
-      binding: BIND_LEXICAL
+      binding: bindingType
     });
     return this.finishNode(specifier, type);
   }
@@ -19860,8 +20079,7 @@ class StatementParser extends ExpressionParser {
       }
 
       node.value = this.parseStringLiteral(this.state.value);
-      this.finishNode(node, "ImportAttribute");
-      attrs.push(node);
+      attrs.push(this.finishNode(node, "ImportAttribute"));
     } while (this.eat(12));
 
     return attrs;
@@ -19971,12 +20189,12 @@ class StatementParser extends ExpressionParser {
       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);
+      var importSpecifier = this.parseImportSpecifier(specifier, importedIsString, node.importKind === "type" || node.importKind === "typeof", isMaybeTypeOnly, undefined);
       node.specifiers.push(importSpecifier);
     }
   }
 
-  parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly) {
+  parseImportSpecifier(specifier, importedIsString, isInTypeOnlyImport, isMaybeTypeOnly, bindingType) {
     if (this.eatContextual(93)) {
       specifier.local = this.parseIdentifier();
     } else {
@@ -19998,7 +20216,7 @@ class StatementParser extends ExpressionParser {
       }
     }
 
-    return this.finishImportSpecifier(specifier, "ImportSpecifier");
+    return this.finishImportSpecifier(specifier, "ImportSpecifier", bindingType);
   }
 
   isThisParam(param) {