terser 5.30.2 → 5.30.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v5.30.4
+ - Fix parsing `#private in ...` when next to other operators
+
+## 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.
 

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);
         }
@@ -3448,7 +3424,7 @@ function parse($TEXT, options) {
         var prec = op != null ? PRECEDENCE[op] : null;
         if (prec != null && (prec > min_prec || (op === "**" && min_prec === prec))) {
             next();
-            var right = expr_op(maybe_unary(true), prec, no_in);
+            var right = expr_ops(no_in, prec, true);
             return expr_op(new AST_Binary({
                 start    : left.start,
                 left     : left,
@@ -3460,13 +3436,38 @@ function parse($TEXT, options) {
         return left;
     };
 
-    function expr_ops(no_in) {
-        return expr_op(maybe_unary(true, true), 0, no_in);
+    function expr_ops(no_in, min_prec, allow_calls, allow_arrows) {
+        // maybe_unary won't return us a AST_SymbolPrivateProperty
+        if (!no_in && min_prec < PRECEDENCE["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_ops(no_in, PRECEDENCE["in"], true),
+                end: prev()
+            });
+
+            return expr_op(private_in, 0, no_in);
+        } else {
+            return expr_op(maybe_unary(allow_calls, allow_arrows), min_prec, no_in);
+        }
     }
 
     var maybe_conditional = function(no_in) {
         var start = S.token;
-        var expr = expr_ops(no_in);
+        var expr = expr_ops(no_in, 0, true, true);
         if (is("operator", "?")) {
             next();
             var yes = expression(false);
@@ -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) {

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);
         }
@@ -3303,7 +3279,7 @@ function parse($TEXT, options) {
         var prec = op != null ? PRECEDENCE[op] : null;
         if (prec != null && (prec > min_prec || (op === "**" && min_prec === prec))) {
             next();
-            var right = expr_op(maybe_unary(true), prec, no_in);
+            var right = expr_ops(no_in, prec, true);
             return expr_op(new AST_Binary({
                 start    : left.start,
                 left     : left,
@@ -3315,13 +3291,38 @@ function parse($TEXT, options) {
         return left;
     };
 
-    function expr_ops(no_in) {
-        return expr_op(maybe_unary(true, true), 0, no_in);
+    function expr_ops(no_in, min_prec, allow_calls, allow_arrows) {
+        // maybe_unary won't return us a AST_SymbolPrivateProperty
+        if (!no_in && min_prec < PRECEDENCE["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_ops(no_in, PRECEDENCE["in"], true),
+                end: prev()
+            });
+
+            return expr_op(private_in, 0, no_in);
+        } else {
+            return expr_op(maybe_unary(allow_calls, allow_arrows), min_prec, no_in);
+        }
     }
 
     var maybe_conditional = function(no_in) {
         var start = S.token;
-        var expr = expr_ops(no_in);
+        var expr = expr_ops(no_in, 0, true, true);
         if (is("operator", "?")) {
             next();
             var yes = expression(false);

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