meriyah 7.1.0 → 7.1.1

package/dist/meriyah.mjs

@@ -1,4 +1,4 @@
-var version$1 = "7.1.0";
+var version$1 = "7.1.1";
 
 const unicodeLookup = ((compressed, lookup) => {
     const result = new Uint32Array(69632);
@@ -1548,7 +1548,7 @@ function parseEscape(parser, context, first, isTemplate = 0) {
         }
         case 56:
         case 57:
-            if (isTemplate || !parser.options.webcompat || context & 1)
+            if (isTemplate || context & 1)
                 return -3;
             parser.flags |= 4096;
         default:
@@ -4542,10 +4542,22 @@ function rescanJSXIdentifier(parser) {
     return parser.getToken();
 }
 
+function normalizeRanges(ranges) {
+    if (!ranges)
+        return undefined;
+    if (ranges === true)
+        return { start: true, end: true, range: true };
+    return {
+        start: ranges.start ?? false,
+        end: ranges.end ?? false,
+        range: ranges.range ?? false,
+    };
+}
 function normalizeOptions(rawOptions) {
     const options = {
         validateRegex: true,
         ...rawOptions,
+        ranges: normalizeRanges(rawOptions.ranges),
     };
     if (options.module && !options.sourceType) {
         options.sourceType = 'module';
@@ -4731,6 +4743,7 @@ class Parser {
     exportedBindings = new Set();
     assignable = 0;
     destructible = 0;
+    strictReservedRange = null;
     leadingDecorators = { decorators: [] };
     constructor(source, rawOptions = {}) {
         this.source = source;
@@ -4787,11 +4800,15 @@ class Parser {
         return { index: this.index, line: this.line, column: this.column };
     }
     finishNode(node, start, end) {
-        if (this.options.ranges) {
-            node.start = start.index;
+        const { ranges } = this.options;
+        if (ranges) {
             const endIndex = end ? end.index : this.startIndex;
-            node.end = endIndex;
-            node.range = [start.index, endIndex];
+            if (ranges.start)
+                node.start = start.index;
+            if (ranges.end)
+                node.end = endIndex;
+            if (ranges.range)
+                node.range = [start.index, endIndex];
         }
         if (this.options.loc) {
             node.loc = {
@@ -4842,8 +4859,14 @@ class Parser {
         return this.cloneLocationInformation({ ...original }, original);
     }
     cloneLocationInformation(node, original) {
-        if (this.options.ranges) {
-            node.range = [...original.range];
+        const { ranges } = this.options;
+        if (ranges) {
+            if (ranges.start)
+                node.start = original.start;
+            if (ranges.end)
+                node.end = original.end;
+            if (ranges.range)
+                node.range = [...original.range];
         }
         if (this.options.loc) {
             node.loc = {
@@ -4861,10 +4884,14 @@ function pushComment(comments, options) {
             type,
             value,
         };
-        if (options.ranges) {
-            comment.start = start;
-            comment.end = end;
-            comment.range = [start, end];
+        const { ranges } = options;
+        if (ranges) {
+            if (ranges.start)
+                comment.start = start;
+            if (ranges.end)
+                comment.end = end;
+            if (ranges.range)
+                comment.range = [start, end];
         }
         if (options.loc) {
             comment.loc = loc;
@@ -4877,10 +4904,14 @@ function pushToken(tokens, options) {
         const token = {
             token: type,
         };
-        if (options.ranges) {
-            token.start = start;
-            token.end = end;
-            token.range = [start, end];
+        const { ranges } = options;
+        if (ranges) {
+            if (ranges.start)
+                token.start = start;
+            if (ranges.end)
+                token.end = end;
+            if (ranges.range)
+                token.range = [start, end];
         }
         if (options.loc) {
             token.loc = loc;
@@ -5519,7 +5550,7 @@ function parseVariableDeclaration(parser, context, scope, privateScope, kind, or
     if (parser.getToken() === 1077936155) {
         nextToken(parser, context | 32);
         init = parseExpression(parser, context, privateScope, 1, 0, parser.tokenStart);
-        if (origin & 32 || (token & 2097152) === 0) {
+        if (origin & 32) {
             if (parser.getToken() === 471156 ||
                 (parser.getToken() === 8673330 &&
                     (token & 2097152 || (kind & 4) === 0 || context & 1))) {
@@ -6266,8 +6297,12 @@ function parseFunctionBody(parser, context, scope, privateScope, origin, funcNam
             }
             if (parser.flags & 512)
                 parser.report(119);
-            if (parser.flags & 256)
+            if (parser.flags & 256) {
+                if (parser.strictReservedRange) {
+                    throw new ParseError(parser.strictReservedRange[0], parser.strictReservedRange[1], 118);
+                }
                 parser.report(118);
+            }
         }
     }
     parser.flags =
@@ -6352,6 +6387,10 @@ function parseMemberOrUpdateExpression(parser, context, privateScope, expr, inGr
                 break;
             }
             case 69271571: {
+                if ((parser.flags & 8192) === 8192) {
+                    parser.flags = (parser.flags | 8192) ^ 8192;
+                    return expr;
+                }
                 let restoreHasOptionalChaining = false;
                 if ((parser.flags & 2048) === 2048) {
                     restoreHasOptionalChaining = true;
@@ -6790,11 +6829,16 @@ function parseTemplateElement(parser, cooked, raw, start, tail) {
         tail,
     }, start);
     const tailSize = tail ? 1 : 2;
-    if (parser.options.ranges) {
-        node.start += 1;
-        node.range[0] += 1;
-        node.end -= tailSize;
-        node.range[1] -= tailSize;
+    const { ranges } = parser.options;
+    if (ranges) {
+        if (ranges.start)
+            node.start += 1;
+        if (ranges.end)
+            node.end -= tailSize;
+        if (ranges.range) {
+            node.range[0] += 1;
+            node.range[1] -= tailSize;
+        }
     }
     if (parser.options.loc) {
         node.loc.start.column += 1;
@@ -7884,6 +7928,7 @@ function parseMethodFormals(parser, context, scope, privateScope, kind, type, in
     consume(parser, context, 67174411);
     const params = [];
     parser.flags = (parser.flags | 128) ^ 128;
+    parser.strictReservedRange = null;
     if (parser.getToken() === 16) {
         if (kind & 512) {
             parser.report(37, 'Setter', 'one', '');
@@ -7907,6 +7952,7 @@ function parseMethodFormals(parser, context, scope, privateScope, kind, type, in
             if ((context & 1) === 0) {
                 if ((parser.getToken() & 36864) === 36864) {
                     parser.flags |= 256;
+                    parser.strictReservedRange ??= [tokenStart, parser.currentLocation];
                 }
                 if ((parser.getToken() & 537079808) === 537079808) {
                     parser.flags |= 512;
@@ -8191,6 +8237,7 @@ function parseArrowFunctionExpression(parser, context, scope, privateScope, para
                 if ((parser.flags & 1) === 0) {
                     parser.report(116);
                 }
+                parser.flags |= 8192;
                 break;
             case 67108877:
             case 67174409:
@@ -8221,6 +8268,7 @@ function parseArrowFunctionExpression(parser, context, scope, privateScope, para
 function parseFormalParametersOrFormalList(parser, context, scope, privateScope, inGroup, kind) {
     consume(parser, context, 67174411);
     parser.flags = (parser.flags | 128) ^ 128;
+    parser.strictReservedRange = null;
     const params = [];
     if (consumeOpt(parser, context, 16))
         return params;
@@ -8234,6 +8282,7 @@ function parseFormalParametersOrFormalList(parser, context, scope, privateScope,
             if ((context & 1) === 0) {
                 if ((token & 36864) === 36864) {
                     parser.flags |= 256;
+                    parser.strictReservedRange ??= [tokenStart, parser.currentLocation];
                 }
                 if ((token & 537079808) === 537079808) {
                     parser.flags |= 512;

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.1.0";
+  var version$1 = "7.1.1";
 
   const unicodeLookup = ((compressed, lookup) => {
       const result = new Uint32Array(69632);
@@ -1554,7 +1554,7 @@
           }
           case 56:
           case 57:
-              if (isTemplate || !parser.options.webcompat || context & 1)
+              if (isTemplate || context & 1)
                   return -3;
               parser.flags |= 4096;
           default:
@@ -4548,10 +4548,22 @@
       return parser.getToken();
   }
 
+  function normalizeRanges(ranges) {
+      if (!ranges)
+          return undefined;
+      if (ranges === true)
+          return { start: true, end: true, range: true };
+      return {
+          start: ranges.start ?? false,
+          end: ranges.end ?? false,
+          range: ranges.range ?? false,
+      };
+  }
   function normalizeOptions(rawOptions) {
       const options = {
           validateRegex: true,
           ...rawOptions,
+          ranges: normalizeRanges(rawOptions.ranges),
       };
       if (options.module && !options.sourceType) {
           options.sourceType = 'module';
@@ -4737,6 +4749,7 @@
       exportedBindings = new Set();
       assignable = 0;
       destructible = 0;
+      strictReservedRange = null;
       leadingDecorators = { decorators: [] };
       constructor(source, rawOptions = {}) {
           this.source = source;
@@ -4793,11 +4806,15 @@
           return { index: this.index, line: this.line, column: this.column };
       }
       finishNode(node, start, end) {
-          if (this.options.ranges) {
-              node.start = start.index;
+          const { ranges } = this.options;
+          if (ranges) {
               const endIndex = end ? end.index : this.startIndex;
-              node.end = endIndex;
-              node.range = [start.index, endIndex];
+              if (ranges.start)
+                  node.start = start.index;
+              if (ranges.end)
+                  node.end = endIndex;
+              if (ranges.range)
+                  node.range = [start.index, endIndex];
           }
           if (this.options.loc) {
               node.loc = {
@@ -4848,8 +4865,14 @@
           return this.cloneLocationInformation({ ...original }, original);
       }
       cloneLocationInformation(node, original) {
-          if (this.options.ranges) {
-              node.range = [...original.range];
+          const { ranges } = this.options;
+          if (ranges) {
+              if (ranges.start)
+                  node.start = original.start;
+              if (ranges.end)
+                  node.end = original.end;
+              if (ranges.range)
+                  node.range = [...original.range];
           }
           if (this.options.loc) {
               node.loc = {
@@ -4867,10 +4890,14 @@
               type,
               value,
           };
-          if (options.ranges) {
-              comment.start = start;
-              comment.end = end;
-              comment.range = [start, end];
+          const { ranges } = options;
+          if (ranges) {
+              if (ranges.start)
+                  comment.start = start;
+              if (ranges.end)
+                  comment.end = end;
+              if (ranges.range)
+                  comment.range = [start, end];
           }
           if (options.loc) {
               comment.loc = loc;
@@ -4883,10 +4910,14 @@
           const token = {
               token: type,
           };
-          if (options.ranges) {
-              token.start = start;
-              token.end = end;
-              token.range = [start, end];
+          const { ranges } = options;
+          if (ranges) {
+              if (ranges.start)
+                  token.start = start;
+              if (ranges.end)
+                  token.end = end;
+              if (ranges.range)
+                  token.range = [start, end];
           }
           if (options.loc) {
               token.loc = loc;
@@ -5525,7 +5556,7 @@
       if (parser.getToken() === 1077936155) {
           nextToken(parser, context | 32);
           init = parseExpression(parser, context, privateScope, 1, 0, parser.tokenStart);
-          if (origin & 32 || (token & 2097152) === 0) {
+          if (origin & 32) {
               if (parser.getToken() === 471156 ||
                   (parser.getToken() === 8673330 &&
                       (token & 2097152 || (kind & 4) === 0 || context & 1))) {
@@ -6272,8 +6303,12 @@
               }
               if (parser.flags & 512)
                   parser.report(119);
-              if (parser.flags & 256)
+              if (parser.flags & 256) {
+                  if (parser.strictReservedRange) {
+                      throw new ParseError(parser.strictReservedRange[0], parser.strictReservedRange[1], 118);
+                  }
                   parser.report(118);
+              }
           }
       }
       parser.flags =
@@ -6358,6 +6393,10 @@
                   break;
               }
               case 69271571: {
+                  if ((parser.flags & 8192) === 8192) {
+                      parser.flags = (parser.flags | 8192) ^ 8192;
+                      return expr;
+                  }
                   let restoreHasOptionalChaining = false;
                   if ((parser.flags & 2048) === 2048) {
                       restoreHasOptionalChaining = true;
@@ -6796,11 +6835,16 @@
           tail,
       }, start);
       const tailSize = tail ? 1 : 2;
-      if (parser.options.ranges) {
-          node.start += 1;
-          node.range[0] += 1;
-          node.end -= tailSize;
-          node.range[1] -= tailSize;
+      const { ranges } = parser.options;
+      if (ranges) {
+          if (ranges.start)
+              node.start += 1;
+          if (ranges.end)
+              node.end -= tailSize;
+          if (ranges.range) {
+              node.range[0] += 1;
+              node.range[1] -= tailSize;
+          }
       }
       if (parser.options.loc) {
           node.loc.start.column += 1;
@@ -7890,6 +7934,7 @@
       consume(parser, context, 67174411);
       const params = [];
       parser.flags = (parser.flags | 128) ^ 128;
+      parser.strictReservedRange = null;
       if (parser.getToken() === 16) {
           if (kind & 512) {
               parser.report(37, 'Setter', 'one', '');
@@ -7913,6 +7958,7 @@
               if ((context & 1) === 0) {
                   if ((parser.getToken() & 36864) === 36864) {
                       parser.flags |= 256;
+                      parser.strictReservedRange ??= [tokenStart, parser.currentLocation];
                   }
                   if ((parser.getToken() & 537079808) === 537079808) {
                       parser.flags |= 512;
@@ -8197,6 +8243,7 @@
                   if ((parser.flags & 1) === 0) {
                       parser.report(116);
                   }
+                  parser.flags |= 8192;
                   break;
               case 67108877:
               case 67174409:
@@ -8227,6 +8274,7 @@
   function parseFormalParametersOrFormalList(parser, context, scope, privateScope, inGroup, kind) {
       consume(parser, context, 67174411);
       parser.flags = (parser.flags | 128) ^ 128;
+      parser.strictReservedRange = null;
       const params = [];
       if (consumeOpt(parser, context, 16))
           return params;
@@ -8240,6 +8288,7 @@
               if ((context & 1) === 0) {
                   if ((token & 36864) === 36864) {
                       parser.flags |= 256;
+                      parser.strictReservedRange ??= [tokenStart, parser.currentLocation];
                   }
                   if ((token & 537079808) === 537079808) {
                       parser.flags |= 512;