meriyah 6.1.1 → 6.1.3

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [6.1.3](https://github.com/meriyah/meriyah/compare/v6.1.2...v6.1.3) (2025-06-24)
+
+
+### Bug Fixes
+
+* **parser:** fix line/column where string literal contains `U+2028` or `U+2029` followed by `\` ([#478](https://github.com/meriyah/meriyah/issues/478)) ([1f054a1](https://github.com/meriyah/meriyah/commit/1f054a1cbc18ca593edc73d1787880134e36aa11))
+* **parser:** fix line/column where string literal contains U+2028 or U+2029 ([#477](https://github.com/meriyah/meriyah/issues/477)) ([6117d2f](https://github.com/meriyah/meriyah/commit/6117d2f424bf2f627ff2cf5fe6f65519f4dac072))
+* **parser:** fix location of `SequenceExpression` as `ForStatement.init` ([#476](https://github.com/meriyah/meriyah/issues/476)) ([b79282b](https://github.com/meriyah/meriyah/commit/b79282b5e833440ef3433b612b856e4b1fec1bd5))
+* **parser:** fix location of object method which is a generator ([#474](https://github.com/meriyah/meriyah/issues/474)) ([c11f9dd](https://github.com/meriyah/meriyah/commit/c11f9dd880571f97daea27d2f580e8d9e952d023))
+* **parser:** fix range of static class property named `accessor`, `get`, `set`, and `async` ([#471](https://github.com/meriyah/meriyah/issues/471)) ([27f224c](https://github.com/meriyah/meriyah/commit/27f224c54748e82f4139a2d29f0278b32bc5b9e1))
+
+
+
+## [6.1.2](https://github.com/meriyah/meriyah/compare/v6.1.1...v6.1.2) (2025-06-21)
+
+
+### Bug Fixes
+
+* **parser:** fix column of escaped identifier ([#469](https://github.com/meriyah/meriyah/issues/469)) ([98d3983](https://github.com/meriyah/meriyah/commit/98d398314f03c3c850368bee1ce697b88f070c79))
+* **parser:** fix location of `import.meta` ([#461](https://github.com/meriyah/meriyah/issues/461)) ([6a05b0e](https://github.com/meriyah/meriyah/commit/6a05b0e0183f357ced7b26207a2a2f22ca287e80))
+
+
+
 ## [6.1.1](https://github.com/meriyah/meriyah/compare/v6.1.0...v6.1.1) (2025-06-17)
 
 

package/README.md

@@ -147,9 +147,9 @@ declare function onInsertedSemicolon(position: number): void;
 ## Example usage
 
 ```js
-import { parseScript } from './meriyah';
+import { parse } from './meriyah';
 
-parseScript('({x: [y] = 0} = 1)');
+parse('({x: [y] = 0} = 1)');
 ```
 
 This will return when serialized in json:

package/dist/meriyah.cjs

@@ -180,6 +180,11 @@ const errorMessages = {
     [177]: 'cannot use "await" in static blocks',
 };
 class ParseError extends SyntaxError {
+    start;
+    end;
+    range;
+    loc;
+    description;
     constructor(start, end, type, ...params) {
         const description = errorMessages[type].replace(/%(\d+)/g, (_, i) => params[i]);
         const message = '[' + start.line + ':' + start.column + '-' + end.line + ':' + end.column + ']: ' + description;
@@ -981,6 +986,10 @@ function scanString(parser, context, quote) {
             }
             marker = parser.index + 1;
         }
+        else if (char === 8232 || char === 8233) {
+            parser.column = -1;
+            parser.line++;
+        }
         if (parser.index >= parser.end)
             report(parser, 16);
         char = advanceChar(parser);
@@ -1630,6 +1639,7 @@ function scanIdentifierUnicodeEscape(parser) {
         report(parser, 5);
     }
     parser.currentChar = parser.source.charCodeAt((parser.index += 2));
+    parser.column += 2;
     return scanUnicodeEscape(parser);
 }
 function scanUnicodeEscape(parser) {
@@ -1661,6 +1671,7 @@ function scanUnicodeEscape(parser) {
         report(parser, 7);
     codePoint = (toHex(char) << 12) | (toHex(char2) << 8) | (toHex(char3) << 4) | toHex(char4);
     parser.currentChar = parser.source.charCodeAt((parser.index += 4));
+    parser.column += 4;
     return codePoint;
 }
 
@@ -4713,31 +4724,33 @@ function classifyIdentifier(parser, context, t) {
 }
 
 class Parser {
+    source;
+    options;
+    lastOnToken = null;
+    token = 1048576;
+    flags = 0;
+    index = 0;
+    line = 1;
+    column = 0;
+    startIndex = 0;
+    end = 0;
+    tokenIndex = 0;
+    startColumn = 0;
+    tokenColumn = 0;
+    tokenLine = 1;
+    startLine = 1;
+    tokenValue = '';
+    tokenRaw = '';
+    tokenRegExp = void 0;
+    currentChar = 0;
+    exportedNames = {};
+    exportedBindings = {};
+    assignable = 1;
+    destructible = 0;
+    leadingDecorators = { decorators: [] };
     constructor(source, options = {}) {
         this.source = source;
         this.options = options;
-        this.lastOnToken = null;
-        this.token = 1048576;
-        this.flags = 0;
-        this.index = 0;
-        this.line = 1;
-        this.column = 0;
-        this.startIndex = 0;
-        this.end = 0;
-        this.tokenIndex = 0;
-        this.startColumn = 0;
-        this.tokenColumn = 0;
-        this.tokenLine = 1;
-        this.startLine = 1;
-        this.tokenValue = '';
-        this.tokenRaw = '';
-        this.tokenRegExp = void 0;
-        this.currentChar = 0;
-        this.exportedNames = {};
-        this.exportedBindings = {};
-        this.assignable = 1;
-        this.destructible = 0;
-        this.leadingDecorators = { decorators: [] };
         this.end = source.length;
         this.currentChar = source.charCodeAt(0);
     }
@@ -4989,7 +5002,7 @@ function parseStatementListItem(parser, context, scope, privateScope, origin, la
                 case 67174411:
                     return parseImportCallDeclaration(parser, context, privateScope, start);
                 case 67108877:
-                    return parseImportMetaDeclaration(parser, context);
+                    return parseImportMetaDeclaration(parser, context, start);
                 default:
                     report(parser, 103, 'import');
             }
@@ -5074,7 +5087,7 @@ function parseExpressionOrLabelledStatement(parser, context, scope, privateScope
     }
     return parseExpressionStatement(parser, context, expr, tokenStart);
 }
-function parseBlock(parser, context, scope, privateScope, labels, start, type = 'BlockStatement') {
+function parseBlock(parser, context, scope, privateScope, labels, start = parser.tokenStart, type = 'BlockStatement') {
     const body = [];
     consume(parser, context | 8192, 2162700);
     while (parser.getToken() !== 1074790415) {
@@ -5359,7 +5372,7 @@ function parseTryStatement(parser, context, scope, privateScope, labels) {
     const start = parser.tokenStart;
     nextToken(parser, context | 8192);
     const firstScope = scope ? addChildScope(scope, 32) : void 0;
-    const block = parseBlock(parser, context, firstScope, privateScope, { $: labels }, parser.tokenStart);
+    const block = parseBlock(parser, context, firstScope, privateScope, { $: labels });
     const { tokenStart } = parser;
     const handler = consumeOpt(parser, context | 8192, 20557)
         ? parseCatchBlock(parser, context, scope, privateScope, labels, tokenStart)
@@ -5368,7 +5381,7 @@ function parseTryStatement(parser, context, scope, privateScope, labels) {
     if (parser.getToken() === 20566) {
         nextToken(parser, context | 8192);
         const finalizerScope = firstScope ? addChildScope(scope, 4) : void 0;
-        const block = parseBlock(parser, context, finalizerScope, privateScope, { $: labels }, parser.tokenStart);
+        const block = parseBlock(parser, context, finalizerScope, privateScope, { $: labels });
         finalizer = block;
     }
     if (!handler && !finalizer) {
@@ -5400,7 +5413,7 @@ function parseCatchBlock(parser, context, scope, privateScope, labels, start) {
     }
     if (scope)
         additionalScope = addChildScope(scope, 64);
-    const body = parseBlock(parser, context, additionalScope, privateScope, { $: labels }, parser.tokenStart);
+    const body = parseBlock(parser, context, additionalScope, privateScope, { $: labels });
     return parser.finishNode({
         type: 'CatchClause',
         param,
@@ -5656,7 +5669,7 @@ function parseForStatement(parser, context, scope, privateScope, labels) {
         init = parseAssignmentExpression(parser, context | 33554432, privateScope, 0, 0, tokenStart, init);
     }
     if (parser.getToken() === 18)
-        init = parseSequenceExpression(parser, context, privateScope, 0, parser.tokenStart, init);
+        init = parseSequenceExpression(parser, context, privateScope, 0, tokenStart, init);
     consume(parser, context | 8192, 1074790417);
     if (parser.getToken() !== 1074790417)
         test = parseExpressions(parser, context, privateScope, 0, 1, parser.tokenStart);
@@ -5724,7 +5737,7 @@ function parseImportDeclaration(parser, context, scope) {
                 case 67174411:
                     return parseImportCallDeclaration(parser, context, undefined, start);
                 case 67108877:
-                    return parseImportMetaDeclaration(parser, context);
+                    return parseImportMetaDeclaration(parser, context, start);
                 default:
                     report(parser, 30, KeywordDescTable[parser.getToken() & 255]);
             }
@@ -5797,12 +5810,11 @@ function parseImportSpecifierOrNamedImports(parser, context, scope, specifiers)
     consume(parser, context, 1074790415);
     return specifiers;
 }
-function parseImportMetaDeclaration(parser, context) {
-    const start = parser.tokenStart;
+function parseImportMetaDeclaration(parser, context, start) {
     let expr = parseImportMetaExpression(parser, context, parser.finishNode({
         type: 'Identifier',
         name: 'import',
-    }, start));
+    }, start), start);
     expr = parseMemberOrUpdateExpression(parser, context, undefined, expr, 0, 0, start);
     expr = parseAssignmentExpression(parser, context, undefined, 0, 0, start, expr);
     if (parser.getToken() === 18) {
@@ -6411,7 +6423,7 @@ function parseMemberOrUpdateExpression(parser, context, privateScope, expr, inGr
                     tag: expr,
                     quasi: parser.getToken() === 67174408
                         ? parseTemplate(parser, context | 16384, privateScope)
-                        : parseTemplateLiteral(parser, context, parser.tokenStart),
+                        : parseTemplateLiteral(parser, context),
                 }, start);
         }
         expr = parseMemberOrUpdateExpression(parser, context, privateScope, expr, 0, 1, start);
@@ -6580,7 +6592,7 @@ function parsePrimaryExpression(parser, context, privateScope, kind, inNew, canA
         case 86109:
             return parseSuperExpression(parser, context);
         case 67174409:
-            return parseTemplateLiteral(parser, context, start);
+            return parseTemplateLiteral(parser, context);
         case 67174408:
             return parseTemplate(parser, context, privateScope);
         case 86107:
@@ -6603,7 +6615,7 @@ function parsePrimaryExpression(parser, context, privateScope, kind, inNew, canA
 function parseImportCallOrMetaExpression(parser, context, privateScope, inNew, inGroup, start) {
     let expr = parseIdentifier(parser, context);
     if (parser.getToken() === 67108877) {
-        return parseImportMetaExpression(parser, context, expr);
+        return parseImportMetaExpression(parser, context, expr, start);
     }
     if (inNew)
         report(parser, 142);
@@ -6611,10 +6623,9 @@ function parseImportCallOrMetaExpression(parser, context, privateScope, inNew, i
     parser.assignable = 2;
     return parseMemberOrUpdateExpression(parser, context, privateScope, expr, inGroup, 0, start);
 }
-function parseImportMetaExpression(parser, context, meta) {
+function parseImportMetaExpression(parser, context, meta, start) {
     if ((context & 512) === 0)
         report(parser, 169);
-    const { tokenStart } = parser;
     nextToken(parser, context);
     const token = parser.getToken();
     if (token !== 209030 && parser.tokenValue !== 'meta') {
@@ -6628,7 +6639,7 @@ function parseImportMetaExpression(parser, context, meta) {
         type: 'MetaProperty',
         meta,
         property: parseIdentifier(parser, context),
-    }, tokenStart);
+    }, start);
 }
 function parseImportExpression(parser, context, privateScope, inGroup, start) {
     consume(parser, context | 8192, 67174411);
@@ -6751,7 +6762,7 @@ function parseBigIntLiteral(parser, context) {
     }
     return parser.finishNode(node, tokenStart);
 }
-function parseTemplateLiteral(parser, context, start) {
+function parseTemplateLiteral(parser, context) {
     parser.assignable = 2;
     const { tokenValue, tokenRaw, tokenStart } = parser;
     consume(parser, context, 67174409);
@@ -6760,7 +6771,7 @@ function parseTemplateLiteral(parser, context, start) {
         type: 'TemplateLiteral',
         expressions: [],
         quasis,
-    }, start);
+    }, tokenStart);
 }
 function parseTemplate(parser, context, privateScope) {
     context = (context | 33554432) ^ 33554432;
@@ -7849,7 +7860,7 @@ function parseObjectLiteralOrPattern(parser, context, scope, privateScope, skipI
                     destructible |= 16;
                     key = parseLiteral(parser, context);
                     state |= 1;
-                    value = parseMethodDefinition(parser, context, privateScope, state, inGroup, tokenStart);
+                    value = parseMethodDefinition(parser, context, privateScope, state, inGroup, parser.tokenStart);
                 }
                 else if (parser.getToken() === 69271571) {
                     destructible |= 16;
@@ -8340,7 +8351,7 @@ function parseMemberExpressionNoCall(parser, context, privateScope, expr, inGrou
                 tag: expr,
                 quasi: parser.getToken() === 67174408
                     ? parseTemplate(parser, context | 16384, privateScope)
-                    : parseTemplateLiteral(parser, context | 16384, parser.tokenStart),
+                    : parseTemplateLiteral(parser, context | 16384),
             }, start), 0, start);
         }
     }
@@ -8639,12 +8650,13 @@ function parseDecorators(parser, context, privateScope) {
     const list = [];
     if (context & 1) {
         while (parser.getToken() === 132) {
-            list.push(parseDecoratorList(parser, context, privateScope, parser.tokenStart));
+            list.push(parseDecoratorList(parser, context, privateScope));
         }
     }
     return list;
 }
-function parseDecoratorList(parser, context, privateScope, start) {
+function parseDecoratorList(parser, context, privateScope) {
+    const start = parser.tokenStart;
     nextToken(parser, context | 8192);
     let expression = parsePrimaryExpression(parser, context, privateScope, 2, 0, 1, 0, 1, start);
     expression = parseMemberOrUpdateExpression(parser, context, privateScope, expression, 0, 0, parser.tokenStart);
@@ -8692,7 +8704,6 @@ function parseClassBody(parser, context, inheritedContext, scope, parentScope, k
 function parseClassElementList(parser, context, scope, privateScope, inheritedContext, type, decorators, isStatic, inGroup, start) {
     let kind = isStatic ? 32 : 0;
     let key = null;
-    const { tokenStart } = parser;
     const token = parser.getToken();
     if (token & (143360 | 36864) || token === -2147483528) {
         key = parseIdentifier(parser, context);
@@ -8708,7 +8719,7 @@ function parseClassElementList(parser, context, scope, privateScope, inheritedCo
             case 209005:
                 if (parser.getToken() !== 67174411 && (parser.flags & 1) === 0) {
                     if ((parser.getToken() & 1073741824) === 1073741824) {
-                        return parsePropertyDefinition(parser, context, privateScope, key, kind, decorators, tokenStart);
+                        return parsePropertyDefinition(parser, context, privateScope, key, kind, decorators, start);
                     }
                     kind |= 16 | (optionalBit(parser, context, 8391476) ? 8 : 0);
                 }
@@ -8716,7 +8727,7 @@ function parseClassElementList(parser, context, scope, privateScope, inheritedCo
             case 209008:
                 if (parser.getToken() !== 67174411) {
                     if ((parser.getToken() & 1073741824) === 1073741824) {
-                        return parsePropertyDefinition(parser, context, privateScope, key, kind, decorators, tokenStart);
+                        return parsePropertyDefinition(parser, context, privateScope, key, kind, decorators, start);
                     }
                     kind |= 256;
                 }
@@ -8724,7 +8735,7 @@ function parseClassElementList(parser, context, scope, privateScope, inheritedCo
             case 209009:
                 if (parser.getToken() !== 67174411) {
                     if ((parser.getToken() & 1073741824) === 1073741824) {
-                        return parsePropertyDefinition(parser, context, privateScope, key, kind, decorators, tokenStart);
+                        return parsePropertyDefinition(parser, context, privateScope, key, kind, decorators, start);
                     }
                     kind |= 512;
                 }
@@ -8732,7 +8743,7 @@ function parseClassElementList(parser, context, scope, privateScope, inheritedCo
             case 12402:
                 if (parser.getToken() !== 67174411 && (parser.flags & 1) === 0) {
                     if ((parser.getToken() & 1073741824) === 1073741824) {
-                        return parsePropertyDefinition(parser, context, privateScope, key, kind, decorators, tokenStart);
+                        return parsePropertyDefinition(parser, context, privateScope, key, kind, decorators, start);
                     }
                     if (context & 1)
                         kind |= 1024;
@@ -9240,7 +9251,7 @@ function parseJSXIdentifier(parser, context) {
     }, start);
 }
 
-var version$1 = "6.1.1";
+var version$1 = "6.1.3";
 
 const version = version$1;
 function parseScript(source, options) {