meriyah 7.3.1 → 7.3.2

package/dist/meriyah.umd.js

@@ -4,7 +4,7 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.meriyah = {}));
 })(this, (function (exports) { 'use strict';
 
-  var version$1 = "7.3.1";
+  var version$1 = "7.3.2";
   var packageJson = {
   	version: version$1};
 
@@ -2046,6 +2046,9 @@
                   }
                   case 8390721: {
                       advanceChar(parser);
+                      if (context & 1048576) {
+                          return 8390721;
+                      }
                       const ch = parser.currentChar;
                       if (ch === 61) {
                           advanceChar(parser);
@@ -4569,7 +4572,7 @@
       parser.setToken(138);
   }
   function rescanJSXIdentifier(parser) {
-      if ((parser.getToken() & 143360) === 143360) {
+      if (parser.getToken() & 143360) {
           const { index } = parser;
           let char = parser.currentChar;
           while (CharTypes[char] & (32768 | 2)) {
@@ -4674,18 +4677,18 @@
       createChildScope(type) {
           return new Scope(this.parser, type, this);
       }
-      addVarOrBlock(context, name, kind, origin) {
+      addVarOrBlock(context, name, kind, tokenStart, tokenEnd, origin) {
           if (kind & 4) {
-              this.addVarName(context, name, kind);
+              this.addVarName(context, name, kind, tokenStart, tokenEnd);
           }
           else {
-              this.addBlockName(context, name, kind, origin);
+              this.addBlockName(context, name, kind, tokenStart, tokenEnd, origin);
           }
           if (origin & 64) {
               this.parser.declareUnboundVariable(name);
           }
       }
-      addVarName(context, name, kind) {
+      addVarName(context, name, kind, tokenStart, tokenEnd) {
           const { parser } = this;
           let currentScope = this;
           while (currentScope && (currentScope.type & 128) === 0) {
@@ -4697,17 +4700,17 @@
                       ((kind & 128 && value & 68) ||
                           (value & 128 && kind & 68))) ;
                   else {
-                      parser.report(147, name);
+                      throw new ParseError(tokenStart, tokenEnd, 147, name);
                   }
               }
               if (currentScope === this) {
                   if (value && value & 1 && kind & 1) {
-                      currentScope.recordScopeError(147, name);
+                      currentScope.recordScopeError(147, tokenStart, tokenEnd, name);
                   }
               }
               if (value &&
                   (value & 256 || (value & 512 && !parser.options.webcompat))) {
-                  parser.report(147, name);
+                  throw new ParseError(tokenStart, tokenEnd, 147, name);
               }
               currentScope.variableBindings.set(name, kind);
               currentScope = currentScope.parent;
@@ -4716,12 +4719,12 @@
       hasVariable(name) {
           return this.variableBindings.has(name);
       }
-      addBlockName(context, name, kind, origin = 0) {
+      addBlockName(context, name, kind, tokenStart, tokenEnd, origin = 0) {
           const { parser } = this;
           const value = this.variableBindings.get(name);
           if (value && (value & 2) === 0) {
               if (kind & 1) {
-                  this.recordScopeError(147, name);
+                  this.recordScopeError(147, tokenStart, tokenEnd, name);
               }
               else if (parser.options.webcompat &&
                   (context & 1) === 0 &&
@@ -4729,31 +4732,31 @@
                   value === 64 &&
                   kind === 64) ;
               else {
-                  parser.report(147, name);
+                  throw new ParseError(tokenStart, tokenEnd, 147, name);
               }
           }
           if (this.type & 64 &&
               this.parent?.hasVariable(name) &&
               (this.parent.variableBindings.get(name) & 2) === 0) {
-              parser.report(147, name);
+              throw new ParseError(tokenStart, tokenEnd, 147, name);
           }
           if (this.type & 512 && value && (value & 2) === 0) {
               if (kind & 1) {
-                  this.recordScopeError(147, name);
+                  this.recordScopeError(147, tokenStart, tokenEnd, name);
               }
           }
           if (this.type & 32) {
               if (this.parent.variableBindings.get(name) & 768)
-                  parser.report(161, name);
+                  throw new ParseError(tokenStart, tokenEnd, 161, name);
           }
           this.variableBindings.set(name, kind);
       }
-      recordScopeError(type, ...params) {
-          this.scopeError = {
+      recordScopeError(type, tokenStart, tokenEnd, ...params) {
+          this.scopeError ??= {
               type,
               params,
-              start: this.parser.tokenStart,
-              end: this.parser.currentLocation,
+              start: tokenStart,
+              end: tokenEnd,
           };
       }
       reportScopeError() {
@@ -4764,9 +4767,9 @@
           throw new ParseError(scopeError.start, scopeError.end, scopeError.type, ...scopeError.params);
       }
   }
-  function createArrowHeadParsingScope(parser, context, value) {
+  function createArrowHeadParsingScope(parser, context, value, tokenStart, tokenEnd) {
       const scope = parser.createScope().createChildScope(512);
-      scope.addBlockName(context, value, 1);
+      scope.addBlockName(context, value, 1, tokenStart, tokenEnd);
       return scope;
   }
 
@@ -5528,7 +5531,7 @@
       }, start);
   }
   function parseLetIdentOrVarDeclarationStatement(parser, context, scope, privateScope, origin) {
-      const { tokenValue, tokenStart } = parser;
+      const { tokenValue, tokenStart, currentLocation } = parser;
       const token = parser.getToken();
       let expr = parseIdentifier(parser, context);
       if (parser.getToken() & (143360 | 2097152) &&
@@ -5550,7 +5553,7 @@
       if (parser.getToken() === 10) {
           let scope = void 0;
           if (parser.options.lexical)
-              scope = createArrowHeadParsingScope(parser, context, tokenValue);
+              scope = createArrowHeadParsingScope(parser, context, tokenValue, tokenStart, currentLocation);
           parser.flags = (parser.flags | 128) ^ 128;
           expr = parseArrowFunctionExpression(parser, context, scope, privateScope, [expr], 0, tokenStart);
       }
@@ -5769,6 +5772,7 @@
               }
               else if (parser.getToken() === 471156) {
                   const ofStart = parser.tokenStart;
+                  const ofEnd = parser.currentLocation;
                   const ofToken = parser.getToken();
                   const ofValue = parser.tokenValue;
                   const ofIdentifier = parseIdentifier(parser, context);
@@ -5784,7 +5788,7 @@
                   else {
                       resourceDeclarationKind = 'using';
                       validateBindingIdentifier(parser, context, 16, ofToken, 0);
-                      scope?.addBlockName(context, ofValue, 16, 32);
+                      scope?.addBlockName(context, ofValue, 16, ofStart, ofEnd, 32);
                       let declarationInitializer = null;
                       if (parser.getToken() === 1077936155) {
                           nextToken(parser, context | 32);
@@ -5975,7 +5979,7 @@
           parser.report(120);
       if ((parser.getToken() & 537079808) === 537079808)
           parser.report(121);
-      scope?.addBlockName(context, parser.tokenValue, 8);
+      scope?.addBlockName(context, parser.tokenValue, 8, parser.tokenStart, parser.currentLocation);
       return parseIdentifier(parser, context);
   }
   function parseImportDeclaration(parser, context, scope) {
@@ -5992,7 +5996,7 @@
       else {
           if (parser.getToken() & 143360) {
               const token = parser.getToken();
-              const { tokenValue } = parser;
+              const { tokenValue, tokenStart: start, currentLocation } = parser;
               const isPhaseDefer = parser.features & 2 && (token & -2147483648) === 0 && tokenValue == 'defer';
               const isPhaseSource = parser.features & 4 && (token & -2147483648) === 0 && tokenValue == 'source';
               if (isPhaseDefer || isPhaseSource) {
@@ -6003,7 +6007,7 @@
                           specifiers = [parseImportNamespaceSpecifier(parser, context, scope)];
                       }
                       else if (parser.getToken() === 209011 || parser.getToken() === 18) {
-                          scope?.addBlockName(context, tokenValue, 8);
+                          scope?.addBlockName(context, tokenValue, 8, start, currentLocation);
                           specifiers = [
                               parser.finishNode({
                                   type: 'ImportDefaultSpecifier',
@@ -6018,10 +6022,11 @@
                   else if (parser.getToken() === 209011) {
                       const fromToken = parser.getToken();
                       const fromStart = parser.tokenStart;
+                      const fromEnd = parser.currentLocation;
                       const fromLocal = parseIdentifier(parser, context);
                       if (parser.getToken() === 209011) {
                           validateBindingIdentifier(parser, context, 16, fromToken, 0);
-                          scope?.addBlockName(context, fromLocal.name, 8);
+                          scope?.addBlockName(context, fromLocal.name, 8, fromStart, fromEnd);
                           phase = 'source';
                           specifiers = [
                               parser.finishNode({
@@ -6031,7 +6036,7 @@
                           ];
                       }
                       else {
-                          scope?.addBlockName(context, tokenValue, 8);
+                          scope?.addBlockName(context, tokenValue, 8, start, currentLocation);
                           specifiers = [
                               parser.finishNode({
                                   type: 'ImportDefaultSpecifier',
@@ -6056,7 +6061,7 @@
                       ];
                   }
                   else if (parser.getToken() === 18) {
-                      scope?.addBlockName(context, tokenValue, 8);
+                      scope?.addBlockName(context, tokenValue, 8, start, currentLocation);
                       specifiers = [
                           parser.finishNode({
                               type: 'ImportDefaultSpecifier',
@@ -6141,7 +6146,8 @@
   function parseImportSpecifierOrNamedImports(parser, context, scope, specifiers) {
       nextToken(parser, context);
       while (parser.getToken() & 143360 || parser.getToken() === 134283267) {
-          let { tokenValue, tokenStart } = parser;
+          let { tokenValue, tokenStart, currentLocation } = parser;
+          const start = tokenStart;
           const token = parser.getToken();
           const imported = parseModuleExportName(parser, context);
           let local;
@@ -6154,6 +6160,8 @@
                   validateBindingIdentifier(parser, context, 16, parser.getToken(), 0);
               }
               tokenValue = parser.tokenValue;
+              tokenStart = parser.tokenStart;
+              currentLocation = parser.currentLocation;
               local = parseIdentifier(parser, context);
           }
           else if (imported.type === 'Identifier') {
@@ -6163,12 +6171,12 @@
           else {
               parser.report(25, KeywordDescTable[77932 & 255]);
           }
-          scope?.addBlockName(context, tokenValue, 8);
+          scope?.addBlockName(context, tokenValue, 8, tokenStart, currentLocation);
           specifiers.push(parser.finishNode({
               type: 'ImportSpecifier',
               local,
               imported,
-          }, tokenStart));
+          }, start));
           if (parser.getToken() !== 1074790415)
               consume(parser, context, 18);
       }
@@ -6235,7 +6243,7 @@
                           }
                           else if (parser.getToken() & 143360) {
                               if (scope)
-                                  scope = createArrowHeadParsingScope(parser, context, parser.tokenValue);
+                                  scope = createArrowHeadParsingScope(parser, context, parser.tokenValue, parser.tokenStart, parser.currentLocation);
                               declaration = parseIdentifier(parser, context);
                               declaration = parseArrowFunctionExpression(parser, context, scope, undefined, [declaration], 1, tokenStart);
                           }
@@ -7324,12 +7332,7 @@
               : 64 | (isAsync ? 1024 : 0) | (isGenerator ? 1024 : 0);
           validateFunctionName(parser, context, parser.getToken());
           if (scope) {
-              if (kind & 4) {
-                  scope.addVarName(context, parser.tokenValue, kind);
-              }
-              else {
-                  scope.addBlockName(context, parser.tokenValue, kind, origin);
-              }
+              scope.addVarOrBlock(context, parser.tokenValue, kind, parser.tokenStart, parser.currentLocation, origin);
               functionScope = functionScope?.createChildScope(128);
               if (flags) {
                   if (flags & 2) {
@@ -7434,7 +7437,7 @@
           }
           else {
               let left;
-              const { tokenStart, tokenValue } = parser;
+              const { tokenStart, tokenValue, currentLocation } = parser;
               const token = parser.getToken();
               if (token & 143360) {
                   left = parsePrimaryExpression(parser, context, privateScope, kind, 0, 1, inGroup, 1, tokenStart);
@@ -7442,7 +7445,7 @@
                       if (parser.assignable & 2)
                           parser.report(26);
                       nextToken(parser, context | 32);
-                      scope?.addVarOrBlock(context, tokenValue, kind, origin);
+                      scope?.addVarOrBlock(context, tokenValue, kind, tokenStart, currentLocation, origin);
                       const right = parseExpression(parser, context, privateScope, 1, inGroup, parser.tokenStart);
                       left = parser.finishNode(isPattern
                           ? {
@@ -7468,7 +7471,7 @@
                           destructible |= 16;
                       }
                       else {
-                          scope?.addVarOrBlock(context, tokenValue, kind, origin);
+                          scope?.addVarOrBlock(context, tokenValue, kind, tokenStart, currentLocation, origin);
                       }
                       destructible |=
                           parser.destructible & 256
@@ -7606,7 +7609,7 @@
       nextToken(parser, context | 32);
       let argument = null;
       let destructible = 0;
-      const { tokenValue, tokenStart } = parser;
+      const { tokenValue, tokenStart, currentLocation } = parser;
       let token = parser.getToken();
       if (token & 143360) {
           parser.assignable = 1;
@@ -7623,7 +7626,7 @@
               destructible |= 16;
           }
           else if (token === closingToken || token === 18) {
-              scope?.addVarOrBlock(context, tokenValue, kind, origin);
+              scope?.addVarOrBlock(context, tokenValue, kind, tokenStart, currentLocation, origin);
           }
           else {
               destructible |= 32;
@@ -7778,7 +7781,7 @@
       let prototypeCount = 0;
       context = (context | 131072) ^ 131072;
       while (parser.getToken() !== 1074790415) {
-          const { tokenValue, tokenStart } = parser;
+          const { tokenValue, tokenStart, currentLocation } = parser;
           const token = parser.getToken();
           if (token === 14) {
               properties.push(parseSpreadOrRestElement(parser, context, scope, privateScope, 1074790415, kind, 0, inGroup, isPattern, origin));
@@ -7803,7 +7806,7 @@
                       else {
                           validateBindingIdentifier(parser, context, kind, token, 0);
                       }
-                      scope?.addVarOrBlock(context, tokenValue, kind, origin);
+                      scope?.addVarOrBlock(context, tokenValue, kind, tokenStart, currentLocation, origin);
                       if (consumeOpt(parser, context | 32, 1077936155)) {
                           destructible |= 8;
                           const right = parseExpression(parser, context, privateScope, 1, inGroup, parser.tokenStart);
@@ -7827,7 +7830,7 @@
                       }
                   }
                   else if (consumeOpt(parser, context | 32, 21)) {
-                      const { tokenStart } = parser;
+                      const { tokenStart, currentLocation } = parser;
                       if (tokenValue === '__proto__')
                           prototypeCount++;
                       if (parser.getToken() & 143360) {
@@ -7843,7 +7846,7 @@
                                       destructible |= 16;
                                   }
                                   else if ((tokenAfterColon & 143360) === 143360) {
-                                      scope?.addVarOrBlock(context, valueAfterColon, kind, origin);
+                                      scope?.addVarOrBlock(context, valueAfterColon, kind, tokenStart, currentLocation, origin);
                                   }
                               }
                               else {
@@ -7861,7 +7864,7 @@
                                   destructible |= 32;
                               }
                               else {
-                                  scope?.addVarOrBlock(context, valueAfterColon, kind, origin);
+                                  scope?.addVarOrBlock(context, valueAfterColon, kind, tokenStart, currentLocation, origin);
                               }
                               value = parseAssignmentExpression(parser, context, privateScope, inGroup, isPattern, tokenStart, value);
                           }
@@ -8029,7 +8032,7 @@
                           prototypeCount++;
                       if (parser.getToken() & 143360) {
                           value = parsePrimaryExpression(parser, context, privateScope, kind, 0, 1, inGroup, 1, tokenStart);
-                          const { tokenValue: valueAfterColon } = parser;
+                          const { tokenValue: valueAfterColon, tokenStart: start, currentLocation } = parser;
                           const token = parser.getToken();
                           value = parseMemberOrUpdateExpression(parser, context, privateScope, value, inGroup, 0, tokenStart);
                           if (parser.getToken() === 18 || parser.getToken() === 1074790415) {
@@ -8038,7 +8041,7 @@
                                       destructible |= 16;
                                   }
                                   else {
-                                      scope?.addVarOrBlock(context, valueAfterColon, kind, origin);
+                                      scope?.addVarOrBlock(context, valueAfterColon, kind, start, currentLocation, origin);
                                   }
                               }
                               else {
@@ -8130,7 +8133,7 @@
                   state |= 2;
                   if (parser.getToken() === 21) {
                       nextToken(parser, context | 32);
-                      const { tokenStart, tokenValue } = parser;
+                      const { tokenStart, tokenValue, currentLocation } = parser;
                       const tokenAfterColon = parser.getToken();
                       if (parser.getToken() & 143360) {
                           value = parsePrimaryExpression(parser, context, privateScope, kind, 0, 1, inGroup, 1, tokenStart);
@@ -8151,7 +8154,7 @@
                                       destructible |= 16;
                                   }
                                   else if ((tokenAfterColon & 143360) === 143360) {
-                                      scope?.addVarOrBlock(context, tokenValue, kind, origin);
+                                      scope?.addVarOrBlock(context, tokenValue, kind, tokenStart, currentLocation, origin);
                                   }
                               }
                               else {
@@ -8410,10 +8413,10 @@
       const tokenAfterParenthesesStart = parser.tokenStart;
       parser.assignable = 1;
       while (parser.getToken() !== 16) {
-          const { tokenStart } = parser;
+          const { tokenStart, currentLocation } = parser;
           const token = parser.getToken();
           if (token & 143360) {
-              scope?.addBlockName(context, parser.tokenValue, 1);
+              scope?.addBlockName(context, parser.tokenValue, 1, tokenStart, currentLocation);
               if ((token & 537079808) === 537079808) {
                   isNonSimpleParameterList = 1;
               }
@@ -8570,8 +8573,7 @@
           : expr;
   }
   function parseIdentifierOrArrow(parser, context, privateScope) {
-      const { tokenStart: start } = parser;
-      const { tokenValue } = parser;
+      const { tokenValue, tokenStart, currentLocation } = parser;
       let isNonSimpleParameterList = 0;
       let hasStrictReserved = 0;
       if ((parser.getToken() & 537079808) === 537079808) {
@@ -8583,12 +8585,14 @@
       const expr = parseIdentifier(parser, context);
       parser.assignable = 1;
       if (parser.getToken() === 10) {
-          const scope = parser.options.lexical ? createArrowHeadParsingScope(parser, context, tokenValue) : undefined;
+          const scope = parser.options.lexical
+              ? createArrowHeadParsingScope(parser, context, tokenValue, tokenStart, currentLocation)
+              : undefined;
           if (isNonSimpleParameterList)
               parser.flags |= 128;
           if (hasStrictReserved)
               parser.flags |= 256;
-          return parseArrowFunctionExpression(parser, context, scope, privateScope, [expr], 0, start);
+          return parseArrowFunctionExpression(parser, context, scope, privateScope, [expr], 0, tokenStart);
       }
       return expr;
   }
@@ -8598,7 +8602,9 @@
       if (inNew)
           parser.report(51);
       parser.flags &= -129;
-      const scope = parser.options.lexical ? createArrowHeadParsingScope(parser, context, value) : void 0;
+      const scope = parser.options.lexical
+          ? createArrowHeadParsingScope(parser, context, value, start, parser.currentLocation)
+          : void 0;
       return parseArrowFunctionExpression(parser, context, scope, privateScope, [expr], isAsync, start, origin);
   }
   function parseParenthesizedArrow(parser, context, scope, privateScope, params, canAssign, isAsync, start, origin = 0) {
@@ -8856,10 +8862,10 @@
               (256 | 128);
       const params = [];
       while (parser.getToken() !== 16) {
-          const { tokenStart } = parser;
+          const { tokenStart, currentLocation } = parser;
           const token = parser.getToken();
           if (token & 143360) {
-              scope?.addBlockName(context, parser.tokenValue, kind);
+              scope?.addBlockName(context, parser.tokenValue, kind, tokenStart, currentLocation);
               if ((token & 537079808) === 537079808) {
                   parser.flags |= 512;
               }
@@ -9016,7 +9022,7 @@
       consume(parser, context, 86094);
       let id = null;
       let superClass = null;
-      const { tokenValue } = parser;
+      const { tokenValue, tokenStart, currentLocation } = parser;
       if (parser.getToken() & 4096 && parser.getToken() !== 20565) {
           if (isStrictReservedWord(parser, context, parser.getToken())) {
               parser.report(120);
@@ -9025,7 +9031,7 @@
               parser.report(121);
           }
           if (scope) {
-              scope.addBlockName(context, tokenValue, 32);
+              scope.addBlockName(context, tokenValue, 32, tokenStart, currentLocation);
               if (flags) {
                   if (flags & 2) {
                       parser.declareUnboundVariable(tokenValue);
@@ -9428,13 +9434,13 @@
           if (context & 2)
               parser.report(112);
       }
-      const { tokenValue, tokenStart: start } = parser;
+      const { tokenValue, tokenStart, currentLocation } = parser;
       nextToken(parser, context);
-      scope?.addVarOrBlock(context, tokenValue, kind, origin);
+      scope?.addVarOrBlock(context, tokenValue, kind, tokenStart, currentLocation, origin);
       return parser.finishNode({
           type: 'Identifier',
           name: tokenValue,
-      }, start);
+      }, tokenStart);
   }
   function parseJSXRootElementOrFragment(parser, context, privateScope, inJSXChild, start) {
       if (!inJSXChild)
@@ -9573,7 +9579,7 @@
       const attributes = parseJSXAttributes(parser, context, privateScope);
       const selfClosing = parser.getToken() === 8457014;
       if (selfClosing)
-          consume(parser, context, 8457014);
+          consume(parser, context | 1048576, 8457014);
       if (parser.getToken() !== 8390721) {
           parser.report(25, KeywordDescTable[8390721 & 255]);
       }
@@ -9724,7 +9730,7 @@
           parser.report(30, KeywordDescTable[parser.getToken() & 255]);
       }
       const { tokenValue } = parser;
-      nextToken(parser, context);
+      nextToken(parser, context | 1048576);
       return parser.finishNode({
           type: 'JSXIdentifier',
           name: tokenValue,