terser 5.30.1 → 5.30.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v5.30.3
+ - Fix precedence of `#private in ...` operator
+
+## v5.30.2
+ - Avoid optimizations inside computed keys, because they can cause js-engine-specific bugs.
+
 ## v5.30.1
  - Removed useless `\` escapes for non-ascii characters
  - Make modern identifier characters quoted for older environments (#1512)

package/dist/bundle.min.js

@@ -1172,9 +1172,8 @@ var LOGICAL_ASSIGNMENT = makePredicate([ "??=", "&&=", "||=" ]);
 
 var PRECEDENCE = (function(a, ret) {
     for (var i = 0; i < a.length; ++i) {
-        var b = a[i];
-        for (var j = 0; j < b.length; ++j) {
-            ret[b[j]] = i + 1;
+        for (const op of a[i]) {
+            ret[op] = i + 1;
         }
     }
     return ret;
@@ -2526,29 +2525,6 @@ function parse($TEXT, options) {
         if (is("template_head")) {
             return subscripts(template_string(), allow_calls);
         }
-        if (is("privatename")) {
-            if(!S.in_class) {
-                croak("Private field must be used in an enclosing class");
-            }
-
-            const start = S.token;
-            const key = new AST_SymbolPrivateProperty({
-                start,
-                name: start.value,
-                end: start
-            });
-            next();
-            expect_token("operator", "in");
-
-            const private_in = new AST_PrivateIn({
-                start,
-                key,
-                value: subscripts(as_atom_node(), allow_calls),
-                end: prev()
-            });
-
-            return subscripts(private_in, allow_calls);
-        }
         if (ATOMIC_START_TOKEN.has(S.token.type)) {
             return subscripts(as_atom_node(), allow_calls);
         }
@@ -3461,7 +3437,32 @@ function parse($TEXT, options) {
     };
 
     function expr_ops(no_in) {
-        return expr_op(maybe_unary(true, true), 0, no_in);
+        // maybe_unary won't return us a AST_SymbolPrivateProperty
+        if (!no_in && is("privatename")) {
+            if(!S.in_class) {
+                croak("Private field must be used in an enclosing class");
+            }
+
+            const start = S.token;
+            const key = new AST_SymbolPrivateProperty({
+                start,
+                name: start.value,
+                end: start
+            });
+            next();
+            expect_token("operator", "in");
+
+            const private_in = new AST_PrivateIn({
+                start,
+                key,
+                value: expr_op(maybe_unary(true), PRECEDENCE["in"], no_in),
+                end: prev()
+            });
+
+            return expr_op(private_in, 0, no_in);
+        } else {
+            return expr_op(maybe_unary(true, true), 0, no_in);
+        }
     }
 
     var maybe_conditional = function(no_in) {
@@ -9846,25 +9847,66 @@ function OutputStream(options) {
             return true;
         // this deals with precedence: 3 * (2 + 1)
         if (p instanceof AST_Binary) {
-            const po = p.operator;
-            const so = this.operator;
+            const parent_op = p.operator;
+            const op = this.operator;
 
-            if (so === "??" && (po === "||" || po === "&&")) {
+            // It is forbidden for ?? to be used with || or && without parens.
+            if (op === "??" && (parent_op === "||" || parent_op === "&&")) {
+                return true;
+            }
+            if (parent_op === "??" && (op === "||" || op === "&&")) {
                 return true;
             }
 
-            if (po === "??" && (so === "||" || so === "&&")) {
+            const pp = PRECEDENCE[parent_op];
+            const sp = PRECEDENCE[op];
+            if (pp > sp
+                || (pp == sp
+                    && (this === p.right || parent_op == "**"))) {
                 return true;
             }
+        }
+        if (p instanceof AST_PrivateIn) {
+            const op = this.operator;
 
-            const pp = PRECEDENCE[po];
-            const sp = PRECEDENCE[so];
+            const pp = PRECEDENCE["in"];
+            const sp = PRECEDENCE[op];
+            if (pp > sp || (pp == sp && this === p.value)) {
+                return true;
+            }
+        }
+    });
+
+    PARENS(AST_PrivateIn, function(output) {
+        var p = output.parent();
+        // (#x in this)()
+        if (p instanceof AST_Call && p.expression === this) {
+            return true;
+        }
+        // typeof (#x in this)
+        if (p instanceof AST_Unary) {
+            return true;
+        }
+        // (#x in this)["prop"], (#x in this).prop
+        if (p instanceof AST_PropAccess && p.expression === this) {
+            return true;
+        }
+        // same precedence as regular in operator
+        if (p instanceof AST_Binary) {
+            const parent_op = p.operator;
+
+            const pp = PRECEDENCE[parent_op];
+            const sp = PRECEDENCE["in"];
             if (pp > sp
                 || (pp == sp
-                    && (this === p.right || po == "**"))) {
+                    && (this === p.right || parent_op == "**"))) {
                 return true;
             }
         }
+        // rules are the same as binary in, but the class differs
+        if (p instanceof AST_PrivateIn && this === p.value) {
+            return true;
+        }
     });
 
     PARENS(AST_Yield, function(output) {
@@ -16560,6 +16602,7 @@ function tighten_body(statements, compressor) {
                 || node instanceof AST_SymbolRef
                     && parent instanceof AST_Call
                     && has_annotation(parent, _NOINLINE)
+                || node instanceof AST_ObjectProperty && node.key instanceof AST_Node
             ) {
                 abort = true;
                 return node;
@@ -17842,6 +17885,8 @@ function is_const_symbol_short_than_init_value(def, fixed_value) {
 }
 
 function inline_into_symbolref(self, compressor) {
+    if (compressor.in_computed_key()) return self;
+
     const parent = compressor.parent();
     const def = self.definition();
     const nearest_scope = compressor.find_scope();
@@ -17991,6 +18036,8 @@ function inline_into_symbolref(self, compressor) {
 }
 
 function inline_into_call(self, compressor) {
+    if (compressor.in_computed_key()) return self;
+
     var exp = self.expression;
     var fn = exp;
     var simple_args = self.args.every((arg) => !(arg instanceof AST_Expansion));
@@ -18646,6 +18693,17 @@ class Compressor extends TreeWalker {
         }
     }
 
+    in_computed_key() {
+        if (!this.option("evaluate")) return false;
+        var self = this.self();
+        for (var i = 0, p; p = this.parent(i); i++) {
+            if (p instanceof AST_ObjectProperty && p.key === self) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     get_toplevel() {
         return this._toplevel;
     }

package/lib/compress/index.js

@@ -401,6 +401,17 @@ class Compressor extends TreeWalker {
         }
     }
 
+    in_computed_key() {
+        if (!this.option("evaluate")) return false;
+        var self = this.self();
+        for (var i = 0, p; p = this.parent(i); i++) {
+            if (p instanceof AST_ObjectProperty && p.key === self) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     get_toplevel() {
         return this._toplevel;
     }

package/lib/compress/inline.js

@@ -167,6 +167,8 @@ function is_const_symbol_short_than_init_value(def, fixed_value) {
 }
 
 export function inline_into_symbolref(self, compressor) {
+    if (compressor.in_computed_key()) return self;
+
     const parent = compressor.parent();
     const def = self.definition();
     const nearest_scope = compressor.find_scope();
@@ -316,6 +318,8 @@ export function inline_into_symbolref(self, compressor) {
 }
 
 export function inline_into_call(self, compressor) {
+    if (compressor.in_computed_key()) return self;
+
     var exp = self.expression;
     var fn = exp;
     var simple_args = self.args.every((arg) => !(arg instanceof AST_Expansion));

package/lib/compress/tighten-body.js

@@ -82,6 +82,7 @@ import {
     AST_Number,
     AST_Object,
     AST_ObjectKeyVal,
+    AST_ObjectProperty,
     AST_PropAccess,
     AST_RegExp,
     AST_Return,
@@ -116,7 +117,7 @@ import {
     walk,
     walk_abort,
 
-    _NOINLINE
+    _NOINLINE,
 } from "../ast.js";
 import {
     make_node,
@@ -328,6 +329,7 @@ export function tighten_body(statements, compressor) {
                 || node instanceof AST_SymbolRef
                     && parent instanceof AST_Call
                     && has_annotation(parent, _NOINLINE)
+                || node instanceof AST_ObjectProperty && node.key instanceof AST_Node
             ) {
                 abort = true;
                 return node;

package/lib/output.js

@@ -1072,25 +1072,66 @@ function OutputStream(options) {
             return true;
         // this deals with precedence: 3 * (2 + 1)
         if (p instanceof AST_Binary) {
-            const po = p.operator;
-            const so = this.operator;
+            const parent_op = p.operator;
+            const op = this.operator;
 
-            if (so === "??" && (po === "||" || po === "&&")) {
+            // It is forbidden for ?? to be used with || or && without parens.
+            if (op === "??" && (parent_op === "||" || parent_op === "&&")) {
+                return true;
+            }
+            if (parent_op === "??" && (op === "||" || op === "&&")) {
                 return true;
             }
 
-            if (po === "??" && (so === "||" || so === "&&")) {
+            const pp = PRECEDENCE[parent_op];
+            const sp = PRECEDENCE[op];
+            if (pp > sp
+                || (pp == sp
+                    && (this === p.right || parent_op == "**"))) {
                 return true;
             }
+        }
+        if (p instanceof AST_PrivateIn) {
+            const op = this.operator;
+
+            const pp = PRECEDENCE["in"];
+            const sp = PRECEDENCE[op];
+            if (pp > sp || (pp == sp && this === p.value)) {
+                return true;
+            }
+        }
+    });
+
+    PARENS(AST_PrivateIn, function(output) {
+        var p = output.parent();
+        // (#x in this)()
+        if (p instanceof AST_Call && p.expression === this) {
+            return true;
+        }
+        // typeof (#x in this)
+        if (p instanceof AST_Unary) {
+            return true;
+        }
+        // (#x in this)["prop"], (#x in this).prop
+        if (p instanceof AST_PropAccess && p.expression === this) {
+            return true;
+        }
+        // same precedence as regular in operator
+        if (p instanceof AST_Binary) {
+            const parent_op = p.operator;
 
-            const pp = PRECEDENCE[po];
-            const sp = PRECEDENCE[so];
+            const pp = PRECEDENCE[parent_op];
+            const sp = PRECEDENCE["in"];
             if (pp > sp
                 || (pp == sp
-                    && (this === p.right || po == "**"))) {
+                    && (this === p.right || parent_op == "**"))) {
                 return true;
             }
         }
+        // rules are the same as binary in, but the class differs
+        if (p instanceof AST_PrivateIn && this === p.value) {
+            return true;
+        }
     });
 
     PARENS(AST_Yield, function(output) {

package/lib/parse.js

@@ -1027,9 +1027,8 @@ var LOGICAL_ASSIGNMENT = makePredicate([ "??=", "&&=", "||=" ]);
 
 var PRECEDENCE = (function(a, ret) {
     for (var i = 0; i < a.length; ++i) {
-        var b = a[i];
-        for (var j = 0; j < b.length; ++j) {
-            ret[b[j]] = i + 1;
+        for (const op of a[i]) {
+            ret[op] = i + 1;
         }
     }
     return ret;
@@ -2381,29 +2380,6 @@ function parse($TEXT, options) {
         if (is("template_head")) {
             return subscripts(template_string(), allow_calls);
         }
-        if (is("privatename")) {
-            if(!S.in_class) {
-                croak("Private field must be used in an enclosing class");
-            }
-
-            const start = S.token;
-            const key = new AST_SymbolPrivateProperty({
-                start,
-                name: start.value,
-                end: start
-            });
-            next();
-            expect_token("operator", "in");
-
-            const private_in = new AST_PrivateIn({
-                start,
-                key,
-                value: subscripts(as_atom_node(), allow_calls),
-                end: prev()
-            });
-
-            return subscripts(private_in, allow_calls);
-        }
         if (ATOMIC_START_TOKEN.has(S.token.type)) {
             return subscripts(as_atom_node(), allow_calls);
         }
@@ -3316,7 +3292,32 @@ function parse($TEXT, options) {
     };
 
     function expr_ops(no_in) {
-        return expr_op(maybe_unary(true, true), 0, no_in);
+        // maybe_unary won't return us a AST_SymbolPrivateProperty
+        if (!no_in && is("privatename")) {
+            if(!S.in_class) {
+                croak("Private field must be used in an enclosing class");
+            }
+
+            const start = S.token;
+            const key = new AST_SymbolPrivateProperty({
+                start,
+                name: start.value,
+                end: start
+            });
+            next();
+            expect_token("operator", "in");
+
+            const private_in = new AST_PrivateIn({
+                start,
+                key,
+                value: expr_op(maybe_unary(true), PRECEDENCE["in"], no_in),
+                end: prev()
+            });
+
+            return expr_op(private_in, 0, no_in);
+        } else {
+            return expr_op(maybe_unary(true, true), 0, no_in);
+        }
     }
 
     var maybe_conditional = function(no_in) {

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.30.1",
+  "version": "5.30.3",
   "engines": {
     "node": ">=10"
   },