npm - terser - Versions diffs - 5.46.0 → 5.46.1 - Mend

terser 5.46.0 → 5.46.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/CHANGELOG.md +6 -0
package/dist/bundle.min.js +58 -40
package/lib/compress/evaluate.js +24 -17
package/lib/compress/inference.js +5 -2
package/lib/output.js +15 -15
package/lib/parse.js +15 -6
package/package.json +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,11 @@
 # Changelog
+## v5.46.1
+ - Fix extremely slow (seemed like a freeze) `evaluate` of method chains
+ - Parse extremely large floating-point number literals as `Infinity`
+ - Remove parens from comma expressions in computed property access (`foo[(1, 2)]`)
 ## v5.46.0
  - Add "observedAttributes" domprop (#1652)

package/dist/bundle.min.js CHANGED Viewed

@@ -2464,12 +2464,20 @@ function parse($TEXT, options) {
             ret = _make_symbol(AST_SymbolRef);
             break;
           case "num":
-            ret = new AST_Number({
-                start: tok,
-                end: tok,
-                value: tok.value,
-                raw: LATEST_RAW
-            });
+            if (tok.value === Infinity) {
+                // very large float values are parsed as Infinity
+                ret = new AST_Infinity({
+                    start: tok,
+                    end: tok,
+                });
+            } else {
+                ret = new AST_Number({
+                    start: tok,
+                    end: tok,
+                    value: tok.value,
+                    raw: LATEST_RAW
+                });
+            }
             break;
           case "big_int":
             ret = new AST_BigInt({
@@ -10272,21 +10280,21 @@ function OutputStream(options) {
     PARENS(AST_Sequence, function(output) {
         var p = output.parent();
-        return p instanceof AST_Call                          // (foo, bar)() or foo(1, (2, 3), 4)
-            || p instanceof AST_Unary                         // !(foo, bar, baz)
-            || p instanceof AST_Binary                        // 1 + (2, 3) + 4 ==> 8
-            || p instanceof AST_VarDefLike                    // var a = (1, 2), b = a + a; ==> b == 4
-            || p instanceof AST_PropAccess                    // (1, {foo:2}).foo or (1, {foo:2})["foo"] ==> 2
-            || p instanceof AST_Array                         // [ 1, (2, 3), 4 ] ==> [ 1, 3, 4 ]
-            || p instanceof AST_ObjectProperty                // { foo: (1, 2) }.foo ==> 2
-            || p instanceof AST_Conditional                   /* (false, true) ? (a = 10, b = 20) : (c = 30)
-                                                               * ==> 20 (side effect, set a := 10 and b := 20) */
-            || p instanceof AST_Arrow                         // x => (x, x)
-            || p instanceof AST_DefaultAssign                 // x => (x = (0, function(){}))
-            || p instanceof AST_Expansion                     // [...(a, b)]
-            || p instanceof AST_ForOf && this === p.object    // for (e of (foo, bar)) {}
-            || p instanceof AST_Yield                         // yield (foo, bar)
-            || p instanceof AST_Export                        // export default (foo, bar)
+        return p instanceof AST_Call                              // (foo, bar)() or foo(1, (2, 3), 4)
+            || p instanceof AST_Unary                             // !(foo, bar, baz)
+            || p instanceof AST_Binary                            // 1 + (2, 3) + 4 ==> 8
+            || p instanceof AST_VarDefLike                        // var a = (1, 2), b = a + a; ==> b == 4
+            || p instanceof AST_PropAccess && this !== p.property // (1, {foo:2}).foo, (1, {foo:2})["foo"], not foo[1, 2]
+            || p instanceof AST_Array                             // [ 1, (2, 3), 4 ] ==> [ 1, 3, 4 ]
+            || p instanceof AST_ObjectProperty                    // { foo: (1, 2) }.foo ==> 2
+            || p instanceof AST_Conditional                       /* (false, true) ? (a = 10, b = 20) : (c = 30)
+                                                                   * ==> 20 (side effect, set a := 10 and b := 20) */
+            || p instanceof AST_Arrow                             // x => (x, x)
+            || p instanceof AST_DefaultAssign                     // x => (x = (0, function(){}))
+            || p instanceof AST_Expansion                         // [...(a, b)]
+            || p instanceof AST_ForOf && this === p.object        // for (e of (foo, bar)) {}
+            || p instanceof AST_Yield                             // yield (foo, bar)
+            || p instanceof AST_Export                            // export default (foo, bar)
         ;
     });
@@ -14869,10 +14877,13 @@ var global_pure_fns = makePredicate("Boolean decodeURI decodeURIComponent Date e
 AST_Call.DEFMETHOD("is_callee_pure", function(compressor) {
     if (compressor.option("unsafe")) {
         var expr = this.expression;
-        var first_arg = (this.args && this.args[0] && this.args[0].evaluate(compressor));
+        var first_arg;
         if (
             expr.expression && expr.expression.name === "hasOwnProperty" &&
-            (first_arg == null || first_arg.thedef && first_arg.thedef.undeclared)
+            (
+                (first_arg = (this.args && this.args[0] && this.args[0].evaluate(compressor))) == null
+                || first_arg.thedef && first_arg.thedef.undeclared
+            )
         ) {
             return false;
         }
@@ -15375,6 +15386,15 @@ def_eval(AST_SymbolRef, function (compressor, depth) {
     return value;
 });
+def_eval(AST_Chain, function (compressor, depth) {
+    const evaluated = this.expression._eval(compressor, depth, /*ast_chain=*/true);
+    return evaluated === nullish
+        ? undefined
+        : evaluated === this.expression
+          ? this
+          : evaluated;
+});
 const global_objs = { Array, Math, Number, Object, String };
 const regexp_flags = new Set([
@@ -15386,9 +15406,13 @@ const regexp_flags = new Set([
     "unicode",
 ]);
-def_eval(AST_PropAccess, function (compressor, depth) {
-    let obj = this.expression._eval(compressor, depth + 1);
-    if (obj === nullish || (this.optional && obj == null)) return nullish;
+def_eval(AST_PropAccess, function (compressor, depth, ast_chain) {
+    let obj = (ast_chain || this.property === "length" || compressor.option("unsafe"))
+        && this.expression._eval(compressor, depth + 1, ast_chain);
+    if (ast_chain) {
+        if (obj === nullish || (this.optional && obj == null)) return nullish;
+    }
     // `.length` of strings and arrays is always safe
     if (this.property === "length") {
@@ -15459,26 +15483,19 @@ def_eval(AST_PropAccess, function (compressor, depth) {
     return this;
 });
-def_eval(AST_Chain, function (compressor, depth) {
-    const evaluated = this.expression._eval(compressor, depth);
-    return evaluated === nullish
-        ? undefined
-        : evaluated === this.expression
-          ? this
-          : evaluated;
-});
-def_eval(AST_Call, function (compressor, depth) {
+def_eval(AST_Call, function (compressor, depth, ast_chain) {
     var exp = this.expression;
-    const callee = exp._eval(compressor, depth);
-    if (callee === nullish || (this.optional && callee == null)) return nullish;
+    if (ast_chain) {
+        const callee = exp._eval(compressor, depth, ast_chain);
+        if (callee === nullish || (this.optional && callee == null)) return nullish;
+    }
     if (compressor.option("unsafe") && exp instanceof AST_PropAccess) {
         var key = exp.property;
         if (key instanceof AST_Node) {
             key = key._eval(compressor, depth);
-            if (key === exp.property)
+            if (typeof key !== "string" && typeof key !== "number")
                 return this;
         }
         var val;
@@ -15496,7 +15513,8 @@ def_eval(AST_Call, function (compressor, depth) {
             if (!is_pure_native_fn(e.name, key)) return this;
             val = global_objs[e.name];
         } else {
-            val = e._eval(compressor, depth + 1);
+            val = e._eval(compressor, depth + 1, /* don't pass ast_chain (exponential work) */);
             if (val === e || !val)
                 return this;
             if (!is_pure_native_method(val.constructor.name, key))

package/lib/compress/evaluate.js CHANGED Viewed

@@ -371,6 +371,15 @@ def_eval(AST_SymbolRef, function (compressor, depth) {
     return value;
 });
+def_eval(AST_Chain, function (compressor, depth) {
+    const evaluated = this.expression._eval(compressor, depth, /*ast_chain=*/true);
+    return evaluated === nullish
+        ? undefined
+        : evaluated === this.expression
+          ? this
+          : evaluated;
+});
 const global_objs = { Array, Math, Number, Object, String };
 const regexp_flags = new Set([
@@ -382,9 +391,13 @@ const regexp_flags = new Set([
     "unicode",
 ]);
-def_eval(AST_PropAccess, function (compressor, depth) {
-    let obj = this.expression._eval(compressor, depth + 1);
-    if (obj === nullish || (this.optional && obj == null)) return nullish;
+def_eval(AST_PropAccess, function (compressor, depth, ast_chain) {
+    let obj = (ast_chain || this.property === "length" || compressor.option("unsafe"))
+        && this.expression._eval(compressor, depth + 1, ast_chain);
+    if (ast_chain) {
+        if (obj === nullish || (this.optional && obj == null)) return nullish;
+    }
     // `.length` of strings and arrays is always safe
     if (this.property === "length") {
@@ -455,26 +468,19 @@ def_eval(AST_PropAccess, function (compressor, depth) {
     return this;
 });
-def_eval(AST_Chain, function (compressor, depth) {
-    const evaluated = this.expression._eval(compressor, depth);
-    return evaluated === nullish
-        ? undefined
-        : evaluated === this.expression
-          ? this
-          : evaluated;
-});
-def_eval(AST_Call, function (compressor, depth) {
+def_eval(AST_Call, function (compressor, depth, ast_chain) {
     var exp = this.expression;
-    const callee = exp._eval(compressor, depth);
-    if (callee === nullish || (this.optional && callee == null)) return nullish;
+    if (ast_chain) {
+        const callee = exp._eval(compressor, depth, ast_chain);
+        if (callee === nullish || (this.optional && callee == null)) return nullish;
+    }
     if (compressor.option("unsafe") && exp instanceof AST_PropAccess) {
         var key = exp.property;
         if (key instanceof AST_Node) {
             key = key._eval(compressor, depth);
-            if (key === exp.property)
+            if (typeof key !== "string" && typeof key !== "number")
                 return this;
         }
         var val;
@@ -492,7 +498,8 @@ def_eval(AST_Call, function (compressor, depth) {
             if (!is_pure_native_fn(e.name, key)) return this;
             val = global_objs[e.name];
         } else {
-            val = e._eval(compressor, depth + 1);
+            val = e._eval(compressor, depth + 1, /* don't pass ast_chain (exponential work) */);
             if (val === e || !val)
                 return this;
             if (!is_pure_native_method(val.constructor.name, key))

package/lib/compress/inference.js CHANGED Viewed

@@ -958,10 +958,13 @@ var global_pure_fns = makePredicate("Boolean decodeURI decodeURIComponent Date e
 AST_Call.DEFMETHOD("is_callee_pure", function(compressor) {
     if (compressor.option("unsafe")) {
         var expr = this.expression;
-        var first_arg = (this.args && this.args[0] && this.args[0].evaluate(compressor));
+        var first_arg;
         if (
             expr.expression && expr.expression.name === "hasOwnProperty" &&
-            (first_arg == null || first_arg.thedef && first_arg.thedef.undeclared)
+            (
+                (first_arg = (this.args && this.args[0] && this.args[0].evaluate(compressor))) == null
+                || first_arg.thedef && first_arg.thedef.undeclared
+            )
         ) {
             return false;
         }

package/lib/output.js CHANGED Viewed

@@ -1043,21 +1043,21 @@ function OutputStream(options) {
     PARENS(AST_Sequence, function(output) {
         var p = output.parent();
-        return p instanceof AST_Call                          // (foo, bar)() or foo(1, (2, 3), 4)
-            || p instanceof AST_Unary                         // !(foo, bar, baz)
-            || p instanceof AST_Binary                        // 1 + (2, 3) + 4 ==> 8
-            || p instanceof AST_VarDefLike                    // var a = (1, 2), b = a + a; ==> b == 4
-            || p instanceof AST_PropAccess                    // (1, {foo:2}).foo or (1, {foo:2})["foo"] ==> 2
-            || p instanceof AST_Array                         // [ 1, (2, 3), 4 ] ==> [ 1, 3, 4 ]
-            || p instanceof AST_ObjectProperty                // { foo: (1, 2) }.foo ==> 2
-            || p instanceof AST_Conditional                   /* (false, true) ? (a = 10, b = 20) : (c = 30)
-                                                               * ==> 20 (side effect, set a := 10 and b := 20) */
-            || p instanceof AST_Arrow                         // x => (x, x)
-            || p instanceof AST_DefaultAssign                 // x => (x = (0, function(){}))
-            || p instanceof AST_Expansion                     // [...(a, b)]
-            || p instanceof AST_ForOf && this === p.object    // for (e of (foo, bar)) {}
-            || p instanceof AST_Yield                         // yield (foo, bar)
-            || p instanceof AST_Export                        // export default (foo, bar)
+        return p instanceof AST_Call                              // (foo, bar)() or foo(1, (2, 3), 4)
+            || p instanceof AST_Unary                             // !(foo, bar, baz)
+            || p instanceof AST_Binary                            // 1 + (2, 3) + 4 ==> 8
+            || p instanceof AST_VarDefLike                        // var a = (1, 2), b = a + a; ==> b == 4
+            || p instanceof AST_PropAccess && this !== p.property // (1, {foo:2}).foo, (1, {foo:2})["foo"], not foo[1, 2]
+            || p instanceof AST_Array                             // [ 1, (2, 3), 4 ] ==> [ 1, 3, 4 ]
+            || p instanceof AST_ObjectProperty                    // { foo: (1, 2) }.foo ==> 2
+            || p instanceof AST_Conditional                       /* (false, true) ? (a = 10, b = 20) : (c = 30)
+                                                                   * ==> 20 (side effect, set a := 10 and b := 20) */
+            || p instanceof AST_Arrow                             // x => (x, x)
+            || p instanceof AST_DefaultAssign                     // x => (x = (0, function(){}))
+            || p instanceof AST_Expansion                         // [...(a, b)]
+            || p instanceof AST_ForOf && this === p.object        // for (e of (foo, bar)) {}
+            || p instanceof AST_Yield                             // yield (foo, bar)
+            || p instanceof AST_Export                            // export default (foo, bar)
         ;
     });

package/lib/parse.js CHANGED Viewed

@@ -101,6 +101,7 @@ import {
     AST_If,
     AST_Import,
     AST_ImportMeta,
+    AST_Infinity,
     AST_IterationStatement,
     AST_Label,
     AST_LabeledStatement,
@@ -2313,12 +2314,20 @@ function parse($TEXT, options) {
             ret = _make_symbol(AST_SymbolRef);
             break;
           case "num":
-            ret = new AST_Number({
-                start: tok,
-                end: tok,
-                value: tok.value,
-                raw: LATEST_RAW
-            });
+            if (tok.value === Infinity) {
+                // very large float values are parsed as Infinity
+                ret = new AST_Infinity({
+                    start: tok,
+                    end: tok,
+                });
+            } else {
+                ret = new AST_Number({
+                    start: tok,
+                    end: tok,
+                    value: tok.value,
+                    raw: LATEST_RAW
+                });
+            }
             break;
           case "big_int":
             ret = new AST_BigInt({

package/package.json CHANGED Viewed

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