meriyah 7.3.1 → 7.3.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [7.3.2](https://github.com/meriyah/meriyah/compare/v7.3.1...v7.3.2) (2026-08-17)
+
+### Bug Fixes
+
+* **jsx:** fix pasring jsx contextual identifier ([#630](https://github.com/meriyah/meriyah/issues/630)) ([503bc24](https://github.com/meriyah/meriyah/commit/503bc2425d4af95df328f6c1e676269aaeccb54d)), closes [#629](https://github.com/meriyah/meriyah/issues/629)
+* **jsx:** fix tokenizing ">" when "=" is after ([#632](https://github.com/meriyah/meriyah/issues/632)) ([6d419ac](https://github.com/meriyah/meriyah/commit/6d419aca1b76c36b379c595ca26a3fe96ed1cf77)), closes [#631](https://github.com/meriyah/meriyah/issues/631)
+* **parser:** fix error location for duplicate binding ([#628](https://github.com/meriyah/meriyah/issues/628)) ([49500e1](https://github.com/meriyah/meriyah/commit/49500e17acfff303dff4768523cbecfd66e09dba))
+
 ## [7.3.1](https://github.com/meriyah/meriyah/compare/v7.3.0...v7.3.1) (2026-08-06)
 
 ### Bug Fixes

package/dist/meriyah.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var version$1 = "7.3.1";
+var version$1 = "7.3.2";
 var packageJson = {
 	version: version$1};
 
@@ -2042,6 +2042,9 @@ function scanSingleToken(parser, context, state) {
                 }
                 case 8390721: {
                     advanceChar(parser);
+                    if (context & 1048576) {
+                        return 8390721;
+                    }
                     const ch = parser.currentChar;
                     if (ch === 61) {
                         advanceChar(parser);
@@ -4565,7 +4568,7 @@ function nextJSXToken(parser) {
     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)) {
@@ -4670,18 +4673,18 @@ class Scope {
     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) {
@@ -4693,17 +4696,17 @@ class Scope {
                     ((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;
@@ -4712,12 +4715,12 @@ class Scope {
     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 &&
@@ -4725,31 +4728,31 @@ class Scope {
                 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() {
@@ -4760,9 +4763,9 @@ class Scope {
         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;
 }
 
@@ -5524,7 +5527,7 @@ function parseDoWhileStatement(parser, context, scope, privateScope, labels) {
     }, 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) &&
@@ -5546,7 +5549,7 @@ function parseLetIdentOrVarDeclarationStatement(parser, context, scope, privateS
     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);
     }
@@ -5765,6 +5768,7 @@ function parseForStatement(parser, context, scope, privateScope, labels) {
             }
             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);
@@ -5780,7 +5784,7 @@ function parseForStatement(parser, context, scope, privateScope, labels) {
                 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);
@@ -5971,7 +5975,7 @@ function parseRestrictedIdentifier(parser, context, scope) {
         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) {
@@ -5988,7 +5992,7 @@ function parseImportDeclaration(parser, context, scope) {
     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) {
@@ -5999,7 +6003,7 @@ function parseImportDeclaration(parser, context, scope) {
                         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',
@@ -6014,10 +6018,11 @@ function parseImportDeclaration(parser, context, scope) {
                 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({
@@ -6027,7 +6032,7 @@ function parseImportDeclaration(parser, context, scope) {
                         ];
                     }
                     else {
-                        scope?.addBlockName(context, tokenValue, 8);
+                        scope?.addBlockName(context, tokenValue, 8, start, currentLocation);
                         specifiers = [
                             parser.finishNode({
                                 type: 'ImportDefaultSpecifier',
@@ -6052,7 +6057,7 @@ function parseImportDeclaration(parser, context, scope) {
                     ];
                 }
                 else if (parser.getToken() === 18) {
-                    scope?.addBlockName(context, tokenValue, 8);
+                    scope?.addBlockName(context, tokenValue, 8, start, currentLocation);
                     specifiers = [
                         parser.finishNode({
                             type: 'ImportDefaultSpecifier',
@@ -6137,7 +6142,8 @@ function parseModuleSpecifier(parser, context) {
 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;
@@ -6150,6 +6156,8 @@ function parseImportSpecifierOrNamedImports(parser, context, scope, specifiers)
                 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') {
@@ -6159,12 +6167,12 @@ function parseImportSpecifierOrNamedImports(parser, context, scope, specifiers)
         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);
     }
@@ -6231,7 +6239,7 @@ function parseExportDeclaration(parser, context, scope) {
                         }
                         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);
                         }
@@ -7320,12 +7328,7 @@ function parseFunctionDeclaration(parser, context, scope, privateScope, allowGen
             : 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) {
@@ -7430,7 +7433,7 @@ function parseArrayExpressionOrPattern(parser, context, scope, privateScope, ski
         }
         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);
@@ -7438,7 +7441,7 @@ function parseArrayExpressionOrPattern(parser, context, scope, privateScope, ski
                     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
                         ? {
@@ -7464,7 +7467,7 @@ function parseArrayExpressionOrPattern(parser, context, scope, privateScope, ski
                         destructible |= 16;
                     }
                     else {
-                        scope?.addVarOrBlock(context, tokenValue, kind, origin);
+                        scope?.addVarOrBlock(context, tokenValue, kind, tokenStart, currentLocation, origin);
                     }
                     destructible |=
                         parser.destructible & 256
@@ -7602,7 +7605,7 @@ function parseSpreadOrRestElement(parser, context, scope, privateScope, closingT
     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;
@@ -7619,7 +7622,7 @@ function parseSpreadOrRestElement(parser, context, scope, privateScope, closingT
             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;
@@ -7774,7 +7777,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
     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));
@@ -7799,7 +7802,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
                     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);
@@ -7823,7 +7826,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
                     }
                 }
                 else if (consumeOpt(parser, context | 32, 21)) {
-                    const { tokenStart } = parser;
+                    const { tokenStart, currentLocation } = parser;
                     if (tokenValue === '__proto__')
                         prototypeCount++;
                     if (parser.getToken() & 143360) {
@@ -7839,7 +7842,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
                                     destructible |= 16;
                                 }
                                 else if ((tokenAfterColon & 143360) === 143360) {
-                                    scope?.addVarOrBlock(context, valueAfterColon, kind, origin);
+                                    scope?.addVarOrBlock(context, valueAfterColon, kind, tokenStart, currentLocation, origin);
                                 }
                             }
                             else {
@@ -7857,7 +7860,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
                                 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);
                         }
@@ -8025,7 +8028,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
                         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) {
@@ -8034,7 +8037,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
                                     destructible |= 16;
                                 }
                                 else {
-                                    scope?.addVarOrBlock(context, valueAfterColon, kind, origin);
+                                    scope?.addVarOrBlock(context, valueAfterColon, kind, start, currentLocation, origin);
                                 }
                             }
                             else {
@@ -8126,7 +8129,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
                 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);
@@ -8147,7 +8150,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
                                     destructible |= 16;
                                 }
                                 else if ((tokenAfterColon & 143360) === 143360) {
-                                    scope?.addVarOrBlock(context, tokenValue, kind, origin);
+                                    scope?.addVarOrBlock(context, tokenValue, kind, tokenStart, currentLocation, origin);
                                 }
                             }
                             else {
@@ -8406,10 +8409,10 @@ function parseParenthesizedExpression(parser, context, privateScope, canAssign,
     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;
             }
@@ -8566,8 +8569,7 @@ function parseParenthesizedExpression(parser, context, privateScope, canAssign,
         : 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) {
@@ -8579,12 +8581,14 @@ function parseIdentifierOrArrow(parser, context, privateScope) {
     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;
 }
@@ -8594,7 +8598,9 @@ function parseArrowFromIdentifier(parser, context, privateScope, value, expr, in
     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) {
@@ -8852,10 +8858,10 @@ function parseAsyncArrowOrCallExpression(parser, context, privateScope, callee,
             (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;
             }
@@ -9012,7 +9018,7 @@ function parseClassDeclaration(parser, context, scope, privateScope, flags) {
     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);
@@ -9021,7 +9027,7 @@ function parseClassDeclaration(parser, context, scope, privateScope, flags) {
             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);
@@ -9424,13 +9430,13 @@ function parseAndClassifyIdentifier(parser, context, scope, kind, origin = 0) {
         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)
@@ -9569,7 +9575,7 @@ function parseJSXOpeningElementOrSelfCloseElement(parser, context, privateScope,
     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]);
     }
@@ -9720,7 +9726,7 @@ function parseJSXIdentifier(parser, context) {
         parser.report(30, KeywordDescTable[parser.getToken() & 255]);
     }
     const { tokenValue } = parser;
-    nextToken(parser, context);
+    nextToken(parser, context | 1048576);
     return parser.finishNode({
         type: 'JSXIdentifier',
         name: tokenValue,