terser 5.13.0 → 5.13.1

package/lib/parse.js

@@ -1572,66 +1572,66 @@ function parse($TEXT, options) {
         });
     };
 
-    function track_used_binding_identifiers(is_parameter, strict) {
-        var parameters = new Set();
-        var duplicate = false;
-        var default_assignment = false;
-        var spread = false;
-        var strict_mode = !!strict;
-        var tracker = {
-            add_parameter: function(token) {
-                if (parameters.has(token.value)) {
-                    if (duplicate === false) {
-                        duplicate = token;
-                    }
-                    tracker.check_strict();
-                } else {
-                    parameters.add(token.value);
-                    if (is_parameter) {
-                        switch (token.value) {
-                          case "arguments":
-                          case "eval":
-                          case "yield":
-                            if (strict_mode) {
-                                token_error(token, "Unexpected " + token.value + " identifier as parameter inside strict mode");
-                            }
-                            break;
-                          default:
-                            if (RESERVED_WORDS.has(token.value)) {
-                                unexpected();
-                            }
+    class UsedParametersTracker {
+        constructor(is_parameter, strict, duplicates_ok = false) {
+            this.is_parameter = is_parameter;
+            this.duplicates_ok = duplicates_ok;
+            this.parameters = new Set();
+            this.duplicate = null;
+            this.default_assignment = false;
+            this.spread = false;
+            this.strict_mode = !!strict;
+        }
+        add_parameter(token) {
+            if (this.parameters.has(token.value)) {
+                if (this.duplicate === null) {
+                    this.duplicate = token;
+                }
+                this.check_strict();
+            } else {
+                this.parameters.add(token.value);
+                if (this.is_parameter) {
+                    switch (token.value) {
+                      case "arguments":
+                      case "eval":
+                      case "yield":
+                        if (this.strict_mode) {
+                            token_error(token, "Unexpected " + token.value + " identifier as parameter inside strict mode");
+                        }
+                        break;
+                      default:
+                        if (RESERVED_WORDS.has(token.value)) {
+                            unexpected();
                         }
                     }
                 }
-            },
-            mark_default_assignment: function(token) {
-                if (default_assignment === false) {
-                    default_assignment = token;
-                }
-            },
-            mark_spread: function(token) {
-                if (spread === false) {
-                    spread = token;
-                }
-            },
-            mark_strict_mode: function() {
-                strict_mode = true;
-            },
-            is_strict: function() {
-                return default_assignment !== false || spread !== false || strict_mode;
-            },
-            check_strict: function() {
-                if (tracker.is_strict() && duplicate !== false) {
-                    token_error(duplicate, "Parameter " + duplicate.value + " was used already");
-                }
             }
-        };
-
-        return tracker;
+        }
+        mark_default_assignment(token) {
+            if (this.default_assignment === false) {
+                this.default_assignment = token;
+            }
+        }
+        mark_spread(token) {
+            if (this.spread === false) {
+                this.spread = token;
+            }
+        }
+        mark_strict_mode() {
+            this.strict_mode = true;
+        }
+        is_strict() {
+            return this.default_assignment !== false || this.spread !== false || this.strict_mode;
+        }
+        check_strict() {
+            if (this.is_strict() && this.duplicate !== null && !this.duplicates_ok) {
+                token_error(this.duplicate, "Parameter " + this.duplicate.value + " was used already");
+            }
+        }
     }
 
     function parameters(params) {
-        var used_parameters = track_used_binding_identifiers(true, S.input.has_directive("use strict"));
+        var used_parameters = new UsedParametersTracker(true, S.input.has_directive("use strict"));
 
         expect("(");
 
@@ -1655,7 +1655,7 @@ function parse($TEXT, options) {
         var param;
         var expand = false;
         if (used_parameters === undefined) {
-            used_parameters = track_used_binding_identifiers(true, S.input.has_directive("use strict"));
+            used_parameters = new UsedParametersTracker(true, S.input.has_directive("use strict"));
         }
         if (is("expand", "...")) {
             expand = S.token;
@@ -1698,7 +1698,9 @@ function parse($TEXT, options) {
         var expand_token;
         var first_token = S.token;
         if (used_parameters === undefined) {
-            used_parameters = track_used_binding_identifiers(false, S.input.has_directive("use strict"));
+            const strict = S.input.has_directive("use strict");
+            const duplicates_ok = symbol_type === AST_SymbolVar;
+            used_parameters = new UsedParametersTracker(false, strict, duplicates_ok);
         }
         symbol_type = symbol_type === undefined ? AST_SymbolFunarg : symbol_type;
         if (is("punc", "[")) {
@@ -2091,7 +2093,7 @@ function parse($TEXT, options) {
             if (is("punc", "{") || is("punc", "[")) {
                 def = new AST_VarDef({
                     start: S.token,
-                    name: binding_element(undefined ,sym_type),
+                    name: binding_element(undefined, sym_type),
                     value: is("operator", "=") ? (expect_token("operator", "="), expression(false, no_in)) : null,
                     end: prev()
                 });

package/lib/size.js

@@ -115,6 +115,7 @@ AST_Directive.prototype._size = function () {
     return 2 + this.value.length;
 };
 
+/** Count commas/semicolons necessary to show a list of expressions/statements */
 const list_overhead = (array) => array.length && array.length - 1;
 
 AST_Block.prototype._size = function () {
@@ -167,7 +168,7 @@ AST_Arrow.prototype._size = function () {
             && this.argnames[0] instanceof AST_Symbol
         )
     ) {
-        args_and_arrow += 2;
+        args_and_arrow += 2; // parens around the args
     }
 
     const body_overhead = this.is_braceless() ? 0 : list_overhead(this.body) + 2;
@@ -229,19 +230,16 @@ AST_Finally.prototype._size = function () {
     return 7 + list_overhead(this.body);
 };
 
-/*#__INLINE__*/
-const def_size = (size, def) => size + list_overhead(def.definitions);
-
 AST_Var.prototype._size = function () {
-    return def_size(4, this);
+    return 4 + list_overhead(this.definitions);
 };
 
 AST_Let.prototype._size = function () {
-    return def_size(4, this);
+    return 4 + list_overhead(this.definitions);
 };
 
 AST_Const.prototype._size = function () {
-    return def_size(6, this);
+    return 6 + list_overhead(this.definitions);
 };
 
 AST_VarDef.prototype._size = function () {
@@ -477,7 +475,7 @@ AST_NaN.prototype._size = () => 3;
 
 AST_Undefined.prototype._size = () => 6; // "void 0"
 
-AST_Hole.prototype._size = () => 0;  // comma is taken into account
+AST_Hole.prototype._size = () => 0;  // comma is taken into account by list_overhead()
 
 AST_Infinity.prototype._size = () => 8;
 

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://terser.org",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "5.13.0",
+  "version": "5.13.1",
   "engines": {
     "node": ">=10"
   },