terser 5.38.0 → 5.38.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v5.38.2
+
+ - internal: Flatten inheritance tree for object/class members
+
+## v5.38.1
+
+ - Fix inlining non-call expressions into an `optional_call?.()`
+
 ## v5.38.0
 
  - Remove `console` method-of-method calls (eg `console.log.apply()`) when `drop_console` option is used (#1585)

package/dist/bundle.min.js

@@ -3286,6 +3286,7 @@ function parse($TEXT, options) {
             return subscripts(call, true, is_chain);
         }
 
+        // Optional chain
         if (is("punc", "?.")) {
             next();
 
@@ -5629,6 +5630,11 @@ var AST_Object = DEFNODE("Object", "properties", function AST_Object(props) {
     },
 });
 
+/* -----[ OBJECT/CLASS PROPERTIES ]----- */
+
+/**
+ * Everything inside the curly braces of an object/class is a subclass of AST_ObjectProperty, except for AST_ClassStaticBlock.
+ **/
 var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", function AST_ObjectProperty(props) {
     if (props) {
         this.key = props.key;
@@ -5643,7 +5649,7 @@ var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", function AST_Obj
     $documentation: "Base class for literal object properties",
     $propdoc: {
         key: "[string|AST_Node] property name. For ObjectKeyVal this is a string. For getters, setters and computed property this is an AST_Node.",
-        value: "[AST_Node] property value.  For getters and setters this is an AST_Accessor."
+        value: "[AST_Node] property value.  For getters, setters and methods this is an AST_Accessor."
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
@@ -5655,7 +5661,7 @@ var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", function AST_Obj
     _children_backwards(push) {
         push(this.value);
         if (this.key instanceof AST_Node) push(this.key);
-    }
+    },
 });
 
 var AST_ObjectKeyVal = DEFNODE("ObjectKeyVal", "quote", function AST_ObjectKeyVal(props) {
@@ -5765,38 +5771,32 @@ var AST_ObjectGetter = DEFNODE("ObjectGetter", "quote static", function AST_Obje
     }
 }, AST_ObjectProperty);
 
-var AST_ConciseMethod = DEFNODE(
-    "ConciseMethod",
-    "quote static is_generator async",
-    function AST_ConciseMethod(props) {
-        if (props) {
-            this.quote = props.quote;
-            this.static = props.static;
-            this.is_generator = props.is_generator;
-            this.async = props.async;
-            this.key = props.key;
-            this.value = props.value;
-            this.start = props.start;
-            this.end = props.end;
-            this._annotations = props._annotations;
-        }
+var AST_ConciseMethod = DEFNODE("ConciseMethod", "quote static is_generator async", function AST_ConciseMethod(props) {
+    if (props) {
+        this.quote = props.quote;
+        this.static = props.static;
+        this.is_generator = props.is_generator;
+        this.async = props.async;
+        this.key = props.key;
+        this.value = props.value;
+        this.start = props.start;
+        this.end = props.end;
+        this._annotations = props._annotations;
+    }
 
-        this.flags = 0;
-    },
-    {
-        $propdoc: {
-            quote: "[string|undefined] the original quote character, if any",
-            static: "[boolean] is this method static (classes only)",
-            is_generator: "[boolean] is this a generator method",
-            async: "[boolean] is this method async",
-        },
-        $documentation: "An ES6 concise method inside an object or class",
-        computed_key() {
-            return !(this.key instanceof AST_SymbolMethod);
-        }
+    this.flags = 0;
+}, {
+    $propdoc: {
+        quote: "[string|undefined] the original quote character, if any",
+        static: "[boolean] is this method static (classes only)",
+        is_generator: "[boolean] is this a generator method",
+        async: "[boolean] is this method async",
     },
-    AST_ObjectProperty
-);
+    $documentation: "An ES6 concise method inside an object or class",
+    computed_key() {
+        return !(this.key instanceof AST_SymbolMethod);
+    }
+}, AST_ObjectProperty);
 
 var AST_PrivateMethod = DEFNODE("PrivateMethod", "", function AST_PrivateMethod(props) {
     if (props) {
@@ -5813,7 +5813,10 @@ var AST_PrivateMethod = DEFNODE("PrivateMethod", "", function AST_PrivateMethod(
     this.flags = 0;
 }, {
     $documentation: "A private class method inside a class",
-}, AST_ConciseMethod);
+    computed_key() {
+        return false;
+    },
+}, AST_ObjectProperty);
 
 var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(props) {
     if (props) {
@@ -5837,7 +5840,7 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
     $propdoc: {
         name: "[AST_SymbolClass|AST_SymbolDefClass?] optional class name.",
         extends: "[AST_Node]? optional parent class",
-        properties: "[AST_ObjectProperty*] array of properties"
+        properties: "[AST_ObjectProperty|AST_ClassStaticBlock]* array of properties or static blocks"
     },
     $documentation: "An ES6 class",
     _walk: function(visitor) {
@@ -5872,7 +5875,10 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
                 prop.key._walk(visitor);
                 visitor.pop();
             }
-            if ((prop instanceof AST_ClassPrivateProperty || prop instanceof AST_ClassProperty) && prop.static && prop.value) {
+            if (
+                prop instanceof AST_ClassPrivateProperty && prop.static && prop.value
+                || prop instanceof AST_ClassProperty && prop.static && prop.value
+            ) {
                 visitor.push(prop);
                 prop.value._walk(visitor);
                 visitor.pop();
@@ -5882,9 +5888,15 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
     /** go through the bits that are executed later, when the class is `new`'d or a static method is called */
     visit_deferred_class_parts(visitor) {
         this.properties.forEach((prop) => {
-            if (prop instanceof AST_ConciseMethod) {
+            if (
+                prop instanceof AST_ConciseMethod
+                || prop instanceof AST_PrivateMethod
+            ) {
                 prop.walk(visitor);
-            } else if (prop instanceof AST_ClassProperty && !prop.static && prop.value) {
+            } else if (
+                prop instanceof AST_ClassProperty && !prop.static && prop.value
+                || prop instanceof AST_ClassPrivateProperty && !prop.static && prop.value
+            ) {
                 visitor.push(prop);
                 prop.value._walk(visitor);
                 visitor.pop();
@@ -5959,7 +5971,19 @@ var AST_ClassPrivateProperty = DEFNODE("ClassPrivateProperty", "", function AST_
     this.flags = 0;
 }, {
     $documentation: "A class property for a private property",
-}, AST_ClassProperty);
+    _walk: function(visitor) {
+        return visitor._visit(this, function() {
+            if (this.value instanceof AST_Node)
+                this.value._walk(visitor);
+        });
+    },
+    _children_backwards(push) {
+        if (this.value instanceof AST_Node) push(this.value);
+    },
+    computed_key() {
+        return false;
+    },
+}, AST_ObjectProperty);
 
 var AST_PrivateIn = DEFNODE("PrivateIn", "key value", function AST_PrivateIn(props) {
     if (props) {
@@ -6026,7 +6050,9 @@ var AST_ClassStaticBlock = DEFNODE("ClassStaticBlock", "body block_scope", funct
         while (i--) push(this.body[i]);
     },
     clone: clone_block_scope,
-    computed_key: () => false
+    computed_key() {
+        return false;
+    },
 }, AST_Scope);
 
 var AST_ClassExpression = DEFNODE("ClassExpression", null, function AST_ClassExpression(props) {
@@ -8657,23 +8683,27 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             };
         }
 
-        const key = M instanceof AST_PrivateMethod
-            ? {
-                type: "PrivateIdentifier",
-                name: M.key.name
-            }
-            : to_moz(M.key);
-
         return {
             type: "MethodDefinition",
             kind: M.key === "constructor" ? "constructor" : "method",
-            key,
+            key: to_moz(M.key),
             value: to_moz(M.value),
             computed: !(M.key instanceof AST_Symbol) || M.key instanceof AST_SymbolRef,
             static: M.static,
         };
     });
 
+    def_to_moz(AST_PrivateMethod, function To_Moz_MethodDefinition(M) {
+        return {
+            type: "MethodDefinition",
+            kind: "method",
+            key: { type: "PrivateIdentifier", name: M.key.name },
+            value: to_moz(M.value),
+            computed: false,
+            static: M.static,
+        };
+    });
+
     def_to_moz(AST_Class, function To_Moz_Class(M) {
         var type = M instanceof AST_ClassExpression ? "ClassExpression" : "ClassDeclaration";
         return {
@@ -11103,6 +11133,17 @@ function OutputStream(options) {
     DEFPRINT(AST_PrivateGetter, function(self, output) {
         self._print_getter_setter("get", true, output);
     });
+    DEFPRINT(AST_ConciseMethod, function(self, output) {
+        var type;
+        if (self.is_generator && self.async) {
+            type = "async*";
+        } else if (self.is_generator) {
+            type = "*";
+        } else if (self.async) {
+            type = "async";
+        }
+        self._print_getter_setter(type, false, output);
+    });
     DEFPRINT(AST_PrivateMethod, function(self, output) {
         var type;
         if (self.is_generator && self.async) {
@@ -11124,17 +11165,6 @@ function OutputStream(options) {
     DEFPRINT(AST_SymbolPrivateProperty, function(self, output) {
         output.print("#" + self.name);
     });
-    DEFPRINT(AST_ConciseMethod, function(self, output) {
-        var type;
-        if (self.is_generator && self.async) {
-            type = "async*";
-        } else if (self.is_generator) {
-            type = "*";
-        } else if (self.async) {
-            type = "async";
-        }
-        self._print_getter_setter(type, false, output);
-    });
     DEFPRINT(AST_ClassStaticBlock, function (self, output) {
         output.print("static");
         output.space();
@@ -11513,11 +11543,22 @@ AST_ConciseMethod.prototype.shallow_cmp = function(other) {
     return this.static === other.static && this.is_generator === other.is_generator && this.async === other.async;
 };
 
+AST_PrivateMethod.prototype.shallow_cmp = function(other) {
+    return this.static === other.static && this.is_generator === other.is_generator && this.async === other.async;
+};
+
 AST_Class.prototype.shallow_cmp = function(other) {
     return (this.name == null ? other.name == null : this.name === other.name) && (this.extends == null ? other.extends == null : this.extends === other.extends);
 };
 
 AST_ClassProperty.prototype.shallow_cmp = function(other) {
+    return this.static === other.static
+        && (typeof this.key === "string"
+            ? this.key === other.key
+            : true /* AST_Node handled elsewhere */);
+};
+
+AST_ClassPrivateProperty.prototype.shallow_cmp = function(other) {
     return this.static === other.static;
 };
 
@@ -12846,7 +12887,11 @@ AST_PrivateMethod.prototype._size = function () {
     return AST_ConciseMethod.prototype._size.call(this) + 1;
 };
 
-AST_PrivateGetter.prototype._size = AST_PrivateSetter.prototype._size = function () {
+AST_PrivateGetter.prototype._size = function () {
+    return AST_ConciseMethod.prototype._size.call(this) + 4;
+};
+
+AST_PrivateSetter.prototype._size = function () {
     return AST_ConciseMethod.prototype._size.call(this) + 4;
 };
 
@@ -13828,25 +13873,29 @@ function is_nullish(node, compressor) {
     def_has_side_effects(AST_Object, function(compressor) {
         return any(this.properties, compressor);
     });
-    def_has_side_effects(AST_ObjectProperty, function(compressor) {
+    def_has_side_effects(AST_ObjectKeyVal, function(compressor) {
         return (
             this.computed_key() && this.key.has_side_effects(compressor)
             || this.value && this.value.has_side_effects(compressor)
         );
     });
-    def_has_side_effects(AST_ClassProperty, function(compressor) {
+    def_has_side_effects([
+        AST_ClassProperty,
+        AST_ClassPrivateProperty,
+    ], function(compressor) {
         return (
             this.computed_key() && this.key.has_side_effects(compressor)
             || this.static && this.value && this.value.has_side_effects(compressor)
         );
     });
-    def_has_side_effects(AST_ConciseMethod, function(compressor) {
-        return this.computed_key() && this.key.has_side_effects(compressor);
-    });
-    def_has_side_effects(AST_ObjectGetter, function(compressor) {
-        return this.computed_key() && this.key.has_side_effects(compressor);
-    });
-    def_has_side_effects(AST_ObjectSetter, function(compressor) {
+    def_has_side_effects([
+        AST_PrivateMethod,
+        AST_PrivateGetter,
+        AST_PrivateSetter,
+        AST_ConciseMethod,
+        AST_ObjectGetter,
+        AST_ObjectSetter,
+    ], function(compressor) {
         return this.computed_key() && this.key.has_side_effects(compressor);
     });
     def_has_side_effects(AST_Array, function(compressor) {
@@ -13891,8 +13940,10 @@ function is_nullish(node, compressor) {
     def_has_side_effects(AST_TemplateString, function(compressor) {
         return any(this.segments, compressor);
     });
-})(function(node, func) {
-    node.DEFMETHOD("has_side_effects", func);
+})(function(node_or_nodes, func) {
+    for (const node of [].concat(node_or_nodes)) {
+        node.DEFMETHOD("has_side_effects", func);
+    }
 });
 
 // determine if expression may throw
@@ -13971,25 +14022,33 @@ function is_nullish(node, compressor) {
     def_may_throw(AST_Object, function(compressor) {
         return any(this.properties, compressor);
     });
-    def_may_throw(AST_ObjectProperty, function(compressor) {
-        // TODO key may throw too
-        return this.value ? this.value.may_throw(compressor) : false;
+    def_may_throw(AST_ObjectKeyVal, function(compressor) {
+        return (
+            this.computed_key() && this.key.may_throw(compressor)
+            || this.value ? this.value.may_throw(compressor) : false
+        );
     });
-    def_may_throw(AST_ClassProperty, function(compressor) {
+    def_may_throw([
+        AST_ClassProperty,
+        AST_ClassPrivateProperty,
+    ], function(compressor) {
         return (
             this.computed_key() && this.key.may_throw(compressor)
             || this.static && this.value && this.value.may_throw(compressor)
         );
     });
-    def_may_throw(AST_ConciseMethod, function(compressor) {
-        return this.computed_key() && this.key.may_throw(compressor);
-    });
-    def_may_throw(AST_ObjectGetter, function(compressor) {
-        return this.computed_key() && this.key.may_throw(compressor);
-    });
-    def_may_throw(AST_ObjectSetter, function(compressor) {
+    def_may_throw([
+        AST_ConciseMethod,
+        AST_ObjectGetter,
+        AST_ObjectSetter,
+    ], function(compressor) {
         return this.computed_key() && this.key.may_throw(compressor);
     });
+    def_may_throw([
+        AST_PrivateMethod,
+        AST_PrivateGetter,
+        AST_PrivateSetter,
+    ], return_false);
     def_may_throw(AST_Return, function(compressor) {
         return this.value && this.value.may_throw(compressor);
     });
@@ -14034,8 +14093,10 @@ function is_nullish(node, compressor) {
         if (!this.value) return false;
         return this.value.may_throw(compressor);
     });
-})(function(node, func) {
-    node.DEFMETHOD("may_throw", func);
+})(function(node_or_nodes, func) {
+    for (const node of [].concat(node_or_nodes)) {
+        node.DEFMETHOD("may_throw", func);
+    }
 });
 
 // determine if expression is constant
@@ -15030,8 +15091,10 @@ def_eval(AST_New, return_this);
 // 10 -> (nothing)
 // knownPureFunc(foo++) -> foo++
 
-function def_drop_side_effect_free(node, func) {
-    node.DEFMETHOD("drop_side_effect_free", func);
+function def_drop_side_effect_free(node_or_nodes, func) {
+    for (const node of [].concat(node_or_nodes)) {
+        node.DEFMETHOD("drop_side_effect_free", func);
+    }
 }
 
 // Drop side-effect-free elements from an array of expressions.
@@ -15122,7 +15185,10 @@ def_drop_side_effect_free(AST_Class, function (compressor) {
     }
 });
 
-def_drop_side_effect_free(AST_ClassProperty, function (compressor) {
+def_drop_side_effect_free([
+    AST_ClassProperty,
+    AST_ClassPrivateProperty,
+], function (compressor) {
     const key = this.computed_key() && this.key.drop_side_effect_free(compressor);
 
     const value = this.static && this.value
@@ -15226,26 +15292,30 @@ def_drop_side_effect_free(AST_Object, function (compressor, first_in_statement)
     return values && make_sequence(this, values);
 });
 
-def_drop_side_effect_free(AST_ObjectProperty, function (compressor, first_in_statement) {
-    const computed_key = this instanceof AST_ObjectKeyVal && this.key instanceof AST_Node;
+def_drop_side_effect_free(AST_ObjectKeyVal, function (compressor, first_in_statement) {
+    const computed_key = this.key instanceof AST_Node;
     const key = computed_key && this.key.drop_side_effect_free(compressor, first_in_statement);
-    const value = this.value && this.value.drop_side_effect_free(compressor, first_in_statement);
+    const value = this.value.drop_side_effect_free(compressor, first_in_statement);
     if (key && value) {
         return make_sequence(this, [key, value]);
     }
     return key || value;
 });
 
-def_drop_side_effect_free(AST_ConciseMethod, function () {
-    return this.computed_key() ? this.key : null;
-});
-
-def_drop_side_effect_free(AST_ObjectGetter, function () {
+def_drop_side_effect_free([
+    AST_ConciseMethod,
+    AST_ObjectGetter,
+    AST_ObjectSetter,
+], function () {
     return this.computed_key() ? this.key : null;
 });
 
-def_drop_side_effect_free(AST_ObjectSetter, function () {
-    return this.computed_key() ? this.key : null;
+def_drop_side_effect_free([
+    AST_PrivateMethod,
+    AST_PrivateGetter,
+    AST_PrivateSetter,
+], function () {
+    return null;
 });
 
 def_drop_side_effect_free(AST_Array, function (compressor, first_in_statement) {
@@ -21950,6 +22020,7 @@ function safe_to_flatten(value, compressor) {
 AST_PropAccess.DEFMETHOD("flatten_object", function(key, compressor) {
     if (!compressor.option("properties")) return;
     if (key === "__proto__") return;
+    if (this instanceof AST_DotHash) return;
 
     var arrows = compressor.option("unsafe_arrows") && compressor.option("ecma") >= 2015;
     var expr = this.expression;
@@ -22137,7 +22208,15 @@ def_optimize(AST_Chain, function (self, compressor) {
         }
         return make_node(AST_Undefined, self);
     }
-    return self;
+    if (
+        self.expression instanceof AST_PropAccess
+        || self.expression instanceof AST_Call
+    ) {
+        return self;
+    } else {
+        // Keep the AST valid, in case the child swapped itself
+        return self.expression;
+    }
 });
 
 def_optimize(AST_Dot, function(self, compressor) {

package/lib/ast.js

@@ -2009,6 +2009,11 @@ var AST_Object = DEFNODE("Object", "properties", function AST_Object(props) {
     },
 });
 
+/* -----[ OBJECT/CLASS PROPERTIES ]----- */
+
+/**
+ * Everything inside the curly braces of an object/class is a subclass of AST_ObjectProperty, except for AST_ClassStaticBlock.
+ **/
 var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", function AST_ObjectProperty(props) {
     if (props) {
         this.key = props.key;
@@ -2023,7 +2028,7 @@ var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", function AST_Obj
     $documentation: "Base class for literal object properties",
     $propdoc: {
         key: "[string|AST_Node] property name. For ObjectKeyVal this is a string. For getters, setters and computed property this is an AST_Node.",
-        value: "[AST_Node] property value.  For getters and setters this is an AST_Accessor."
+        value: "[AST_Node] property value.  For getters, setters and methods this is an AST_Accessor."
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
@@ -2035,7 +2040,7 @@ var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", function AST_Obj
     _children_backwards(push) {
         push(this.value);
         if (this.key instanceof AST_Node) push(this.key);
-    }
+    },
 });
 
 var AST_ObjectKeyVal = DEFNODE("ObjectKeyVal", "quote", function AST_ObjectKeyVal(props) {
@@ -2145,38 +2150,32 @@ var AST_ObjectGetter = DEFNODE("ObjectGetter", "quote static", function AST_Obje
     }
 }, AST_ObjectProperty);
 
-var AST_ConciseMethod = DEFNODE(
-    "ConciseMethod",
-    "quote static is_generator async",
-    function AST_ConciseMethod(props) {
-        if (props) {
-            this.quote = props.quote;
-            this.static = props.static;
-            this.is_generator = props.is_generator;
-            this.async = props.async;
-            this.key = props.key;
-            this.value = props.value;
-            this.start = props.start;
-            this.end = props.end;
-            this._annotations = props._annotations;
-        }
+var AST_ConciseMethod = DEFNODE("ConciseMethod", "quote static is_generator async", function AST_ConciseMethod(props) {
+    if (props) {
+        this.quote = props.quote;
+        this.static = props.static;
+        this.is_generator = props.is_generator;
+        this.async = props.async;
+        this.key = props.key;
+        this.value = props.value;
+        this.start = props.start;
+        this.end = props.end;
+        this._annotations = props._annotations;
+    }
 
-        this.flags = 0;
-    },
-    {
-        $propdoc: {
-            quote: "[string|undefined] the original quote character, if any",
-            static: "[boolean] is this method static (classes only)",
-            is_generator: "[boolean] is this a generator method",
-            async: "[boolean] is this method async",
-        },
-        $documentation: "An ES6 concise method inside an object or class",
-        computed_key() {
-            return !(this.key instanceof AST_SymbolMethod);
-        }
+    this.flags = 0;
+}, {
+    $propdoc: {
+        quote: "[string|undefined] the original quote character, if any",
+        static: "[boolean] is this method static (classes only)",
+        is_generator: "[boolean] is this a generator method",
+        async: "[boolean] is this method async",
     },
-    AST_ObjectProperty
-);
+    $documentation: "An ES6 concise method inside an object or class",
+    computed_key() {
+        return !(this.key instanceof AST_SymbolMethod);
+    }
+}, AST_ObjectProperty);
 
 var AST_PrivateMethod = DEFNODE("PrivateMethod", "", function AST_PrivateMethod(props) {
     if (props) {
@@ -2193,7 +2192,10 @@ var AST_PrivateMethod = DEFNODE("PrivateMethod", "", function AST_PrivateMethod(
     this.flags = 0;
 }, {
     $documentation: "A private class method inside a class",
-}, AST_ConciseMethod);
+    computed_key() {
+        return false;
+    },
+}, AST_ObjectProperty);
 
 var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(props) {
     if (props) {
@@ -2217,7 +2219,7 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
     $propdoc: {
         name: "[AST_SymbolClass|AST_SymbolDefClass?] optional class name.",
         extends: "[AST_Node]? optional parent class",
-        properties: "[AST_ObjectProperty*] array of properties"
+        properties: "[AST_ObjectProperty|AST_ClassStaticBlock]* array of properties or static blocks"
     },
     $documentation: "An ES6 class",
     _walk: function(visitor) {
@@ -2252,7 +2254,10 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
                 prop.key._walk(visitor);
                 visitor.pop();
             }
-            if ((prop instanceof AST_ClassPrivateProperty || prop instanceof AST_ClassProperty) && prop.static && prop.value) {
+            if (
+                prop instanceof AST_ClassPrivateProperty && prop.static && prop.value
+                || prop instanceof AST_ClassProperty && prop.static && prop.value
+            ) {
                 visitor.push(prop);
                 prop.value._walk(visitor);
                 visitor.pop();
@@ -2262,9 +2267,15 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
     /** go through the bits that are executed later, when the class is `new`'d or a static method is called */
     visit_deferred_class_parts(visitor) {
         this.properties.forEach((prop) => {
-            if (prop instanceof AST_ConciseMethod) {
+            if (
+                prop instanceof AST_ConciseMethod
+                || prop instanceof AST_PrivateMethod
+            ) {
                 prop.walk(visitor);
-            } else if (prop instanceof AST_ClassProperty && !prop.static && prop.value) {
+            } else if (
+                prop instanceof AST_ClassProperty && !prop.static && prop.value
+                || prop instanceof AST_ClassPrivateProperty && !prop.static && prop.value
+            ) {
                 visitor.push(prop);
                 prop.value._walk(visitor);
                 visitor.pop();
@@ -2339,7 +2350,19 @@ var AST_ClassPrivateProperty = DEFNODE("ClassPrivateProperty", "", function AST_
     this.flags = 0;
 }, {
     $documentation: "A class property for a private property",
-}, AST_ClassProperty);
+    _walk: function(visitor) {
+        return visitor._visit(this, function() {
+            if (this.value instanceof AST_Node)
+                this.value._walk(visitor);
+        });
+    },
+    _children_backwards(push) {
+        if (this.value instanceof AST_Node) push(this.value);
+    },
+    computed_key() {
+        return false;
+    },
+}, AST_ObjectProperty);
 
 var AST_PrivateIn = DEFNODE("PrivateIn", "key value", function AST_PrivateIn(props) {
     if (props) {
@@ -2406,7 +2429,9 @@ var AST_ClassStaticBlock = DEFNODE("ClassStaticBlock", "body block_scope", funct
         while (i--) push(this.body[i]);
     },
     clone: clone_block_scope,
-    computed_key: () => false
+    computed_key() {
+        return false;
+    },
 }, AST_Scope);
 
 var AST_ClassExpression = DEFNODE("ClassExpression", null, function AST_ClassExpression(props) {

package/lib/compress/drop-side-effect-free.js

@@ -50,8 +50,9 @@ import {
     AST_Call,
     AST_Chain,
     AST_Class,
-    AST_ClassStaticBlock,
+    AST_ClassPrivateProperty,
     AST_ClassProperty,
+    AST_ClassStaticBlock,
     AST_ConciseMethod,
     AST_Conditional,
     AST_Constant,
@@ -64,8 +65,10 @@ import {
     AST_Object,
     AST_ObjectGetter,
     AST_ObjectKeyVal,
-    AST_ObjectProperty,
     AST_ObjectSetter,
+    AST_PrivateGetter,
+    AST_PrivateSetter,
+    AST_PrivateMethod,
     AST_PropAccess,
     AST_Scope,
     AST_Sequence,
@@ -94,8 +97,10 @@ import { make_sequence, is_func_expr, is_iife_call } from "./common.js";
 // 10 -> (nothing)
 // knownPureFunc(foo++) -> foo++
 
-function def_drop_side_effect_free(node, func) {
-    node.DEFMETHOD("drop_side_effect_free", func);
+function def_drop_side_effect_free(node_or_nodes, func) {
+    for (const node of [].concat(node_or_nodes)) {
+        node.DEFMETHOD("drop_side_effect_free", func);
+    }
 }
 
 // Drop side-effect-free elements from an array of expressions.
@@ -186,7 +191,10 @@ def_drop_side_effect_free(AST_Class, function (compressor) {
     }
 });
 
-def_drop_side_effect_free(AST_ClassProperty, function (compressor) {
+def_drop_side_effect_free([
+    AST_ClassProperty,
+    AST_ClassPrivateProperty,
+], function (compressor) {
     const key = this.computed_key() && this.key.drop_side_effect_free(compressor);
 
     const value = this.static && this.value
@@ -290,26 +298,30 @@ def_drop_side_effect_free(AST_Object, function (compressor, first_in_statement)
     return values && make_sequence(this, values);
 });
 
-def_drop_side_effect_free(AST_ObjectProperty, function (compressor, first_in_statement) {
-    const computed_key = this instanceof AST_ObjectKeyVal && this.key instanceof AST_Node;
+def_drop_side_effect_free(AST_ObjectKeyVal, function (compressor, first_in_statement) {
+    const computed_key = this.key instanceof AST_Node;
     const key = computed_key && this.key.drop_side_effect_free(compressor, first_in_statement);
-    const value = this.value && this.value.drop_side_effect_free(compressor, first_in_statement);
+    const value = this.value.drop_side_effect_free(compressor, first_in_statement);
     if (key && value) {
         return make_sequence(this, [key, value]);
     }
     return key || value;
 });
 
-def_drop_side_effect_free(AST_ConciseMethod, function () {
-    return this.computed_key() ? this.key : null;
-});
-
-def_drop_side_effect_free(AST_ObjectGetter, function () {
+def_drop_side_effect_free([
+    AST_ConciseMethod,
+    AST_ObjectGetter,
+    AST_ObjectSetter,
+], function () {
     return this.computed_key() ? this.key : null;
 });
 
-def_drop_side_effect_free(AST_ObjectSetter, function () {
-    return this.computed_key() ? this.key : null;
+def_drop_side_effect_free([
+    AST_PrivateMethod,
+    AST_PrivateGetter,
+    AST_PrivateSetter,
+], function () {
+    return null;
 });
 
 def_drop_side_effect_free(AST_Array, function (compressor, first_in_statement) {

package/lib/compress/index.js

@@ -71,6 +71,7 @@ import {
     AST_Directive,
     AST_Do,
     AST_Dot,
+    AST_DotHash,
     AST_DWLoop,
     AST_EmptyStatement,
     AST_Exit,
@@ -3487,6 +3488,7 @@ function safe_to_flatten(value, compressor) {
 AST_PropAccess.DEFMETHOD("flatten_object", function(key, compressor) {
     if (!compressor.option("properties")) return;
     if (key === "__proto__") return;
+    if (this instanceof AST_DotHash) return;
 
     var arrows = compressor.option("unsafe_arrows") && compressor.option("ecma") >= 2015;
     var expr = this.expression;
@@ -3674,7 +3676,15 @@ def_optimize(AST_Chain, function (self, compressor) {
         }
         return make_node(AST_Undefined, self);
     }
-    return self;
+    if (
+        self.expression instanceof AST_PropAccess
+        || self.expression instanceof AST_Call
+    ) {
+        return self;
+    } else {
+        // Keep the AST valid, in case the child swapped itself
+        return self.expression;
+    }
 });
 
 def_optimize(AST_Dot, function(self, compressor) {

package/lib/compress/inference.js

@@ -55,6 +55,7 @@ import {
   AST_Class,
   AST_DefClass,
   AST_ClassStaticBlock,
+  AST_ClassPrivateProperty,
   AST_ClassProperty,
   AST_ConciseMethod,
   AST_Conditional,
@@ -81,6 +82,9 @@ import {
   AST_ObjectKeyVal,
   AST_ObjectProperty,
   AST_ObjectSetter,
+  AST_PrivateGetter,
+  AST_PrivateMethod,
+  AST_PrivateSetter,
   AST_PropAccess,
   AST_RegExp,
   AST_Return,
@@ -367,25 +371,29 @@ export function is_nullish(node, compressor) {
     def_has_side_effects(AST_Object, function(compressor) {
         return any(this.properties, compressor);
     });
-    def_has_side_effects(AST_ObjectProperty, function(compressor) {
+    def_has_side_effects(AST_ObjectKeyVal, function(compressor) {
         return (
             this.computed_key() && this.key.has_side_effects(compressor)
             || this.value && this.value.has_side_effects(compressor)
         );
     });
-    def_has_side_effects(AST_ClassProperty, function(compressor) {
+    def_has_side_effects([
+        AST_ClassProperty,
+        AST_ClassPrivateProperty,
+    ], function(compressor) {
         return (
             this.computed_key() && this.key.has_side_effects(compressor)
             || this.static && this.value && this.value.has_side_effects(compressor)
         );
     });
-    def_has_side_effects(AST_ConciseMethod, function(compressor) {
-        return this.computed_key() && this.key.has_side_effects(compressor);
-    });
-    def_has_side_effects(AST_ObjectGetter, function(compressor) {
-        return this.computed_key() && this.key.has_side_effects(compressor);
-    });
-    def_has_side_effects(AST_ObjectSetter, function(compressor) {
+    def_has_side_effects([
+        AST_PrivateMethod,
+        AST_PrivateGetter,
+        AST_PrivateSetter,
+        AST_ConciseMethod,
+        AST_ObjectGetter,
+        AST_ObjectSetter,
+    ], function(compressor) {
         return this.computed_key() && this.key.has_side_effects(compressor);
     });
     def_has_side_effects(AST_Array, function(compressor) {
@@ -430,8 +438,10 @@ export function is_nullish(node, compressor) {
     def_has_side_effects(AST_TemplateString, function(compressor) {
         return any(this.segments, compressor);
     });
-})(function(node, func) {
-    node.DEFMETHOD("has_side_effects", func);
+})(function(node_or_nodes, func) {
+    for (const node of [].concat(node_or_nodes)) {
+        node.DEFMETHOD("has_side_effects", func);
+    }
 });
 
 // determine if expression may throw
@@ -510,25 +520,33 @@ export function is_nullish(node, compressor) {
     def_may_throw(AST_Object, function(compressor) {
         return any(this.properties, compressor);
     });
-    def_may_throw(AST_ObjectProperty, function(compressor) {
-        // TODO key may throw too
-        return this.value ? this.value.may_throw(compressor) : false;
+    def_may_throw(AST_ObjectKeyVal, function(compressor) {
+        return (
+            this.computed_key() && this.key.may_throw(compressor)
+            || this.value ? this.value.may_throw(compressor) : false
+        );
     });
-    def_may_throw(AST_ClassProperty, function(compressor) {
+    def_may_throw([
+        AST_ClassProperty,
+        AST_ClassPrivateProperty,
+    ], function(compressor) {
         return (
             this.computed_key() && this.key.may_throw(compressor)
             || this.static && this.value && this.value.may_throw(compressor)
         );
     });
-    def_may_throw(AST_ConciseMethod, function(compressor) {
-        return this.computed_key() && this.key.may_throw(compressor);
-    });
-    def_may_throw(AST_ObjectGetter, function(compressor) {
-        return this.computed_key() && this.key.may_throw(compressor);
-    });
-    def_may_throw(AST_ObjectSetter, function(compressor) {
+    def_may_throw([
+        AST_ConciseMethod,
+        AST_ObjectGetter,
+        AST_ObjectSetter,
+    ], function(compressor) {
         return this.computed_key() && this.key.may_throw(compressor);
     });
+    def_may_throw([
+        AST_PrivateMethod,
+        AST_PrivateGetter,
+        AST_PrivateSetter,
+    ], return_false);
     def_may_throw(AST_Return, function(compressor) {
         return this.value && this.value.may_throw(compressor);
     });
@@ -573,8 +591,10 @@ export function is_nullish(node, compressor) {
         if (!this.value) return false;
         return this.value.may_throw(compressor);
     });
-})(function(node, func) {
-    node.DEFMETHOD("may_throw", func);
+})(function(node_or_nodes, func) {
+    for (const node of [].concat(node_or_nodes)) {
+        node.DEFMETHOD("may_throw", func);
+    }
 });
 
 // determine if expression is constant

package/lib/equivalent-to.js

@@ -10,6 +10,7 @@ import {
     AST_Chain,
     AST_Class,
     AST_ClassProperty,
+    AST_ClassPrivateProperty,
     AST_ConciseMethod,
     AST_Conditional,
     AST_Debugger,
@@ -43,6 +44,7 @@ import {
     AST_ObjectProperty,
     AST_ObjectSetter,
     AST_PrefixedTemplateString,
+    AST_PrivateMethod,
     AST_PropAccess,
     AST_RegExp,
     AST_Sequence,
@@ -247,11 +249,22 @@ AST_ConciseMethod.prototype.shallow_cmp = function(other) {
     return this.static === other.static && this.is_generator === other.is_generator && this.async === other.async;
 };
 
+AST_PrivateMethod.prototype.shallow_cmp = function(other) {
+    return this.static === other.static && this.is_generator === other.is_generator && this.async === other.async;
+};
+
 AST_Class.prototype.shallow_cmp = function(other) {
     return (this.name == null ? other.name == null : this.name === other.name) && (this.extends == null ? other.extends == null : this.extends === other.extends);
 };
 
 AST_ClassProperty.prototype.shallow_cmp = function(other) {
+    return this.static === other.static
+        && (typeof this.key === "string"
+            ? this.key === other.key
+            : true /* AST_Node handled elsewhere */);
+};
+
+AST_ClassPrivateProperty.prototype.shallow_cmp = function(other) {
     return this.static === other.static;
 };
 

package/lib/mozilla-ast.js

@@ -1677,23 +1677,27 @@ import { is_basic_identifier_string } from "./parse.js";
             };
         }
 
-        const key = M instanceof AST_PrivateMethod
-            ? {
-                type: "PrivateIdentifier",
-                name: M.key.name
-            }
-            : to_moz(M.key);
-
         return {
             type: "MethodDefinition",
             kind: M.key === "constructor" ? "constructor" : "method",
-            key,
+            key: to_moz(M.key),
             value: to_moz(M.value),
             computed: !(M.key instanceof AST_Symbol) || M.key instanceof AST_SymbolRef,
             static: M.static,
         };
     });
 
+    def_to_moz(AST_PrivateMethod, function To_Moz_MethodDefinition(M) {
+        return {
+            type: "MethodDefinition",
+            kind: "method",
+            key: { type: "PrivateIdentifier", name: M.key.name },
+            value: to_moz(M.value),
+            computed: false,
+            static: M.static,
+        };
+    });
+
     def_to_moz(AST_Class, function To_Moz_Class(M) {
         var type = M instanceof AST_ClassExpression ? "ClassExpression" : "ClassDeclaration";
         return {

package/lib/output.js

@@ -2296,6 +2296,17 @@ function OutputStream(options) {
     DEFPRINT(AST_PrivateGetter, function(self, output) {
         self._print_getter_setter("get", true, output);
     });
+    DEFPRINT(AST_ConciseMethod, function(self, output) {
+        var type;
+        if (self.is_generator && self.async) {
+            type = "async*";
+        } else if (self.is_generator) {
+            type = "*";
+        } else if (self.async) {
+            type = "async";
+        }
+        self._print_getter_setter(type, false, output);
+    });
     DEFPRINT(AST_PrivateMethod, function(self, output) {
         var type;
         if (self.is_generator && self.async) {
@@ -2317,17 +2328,6 @@ function OutputStream(options) {
     DEFPRINT(AST_SymbolPrivateProperty, function(self, output) {
         output.print("#" + self.name);
     });
-    DEFPRINT(AST_ConciseMethod, function(self, output) {
-        var type;
-        if (self.is_generator && self.async) {
-            type = "async*";
-        } else if (self.is_generator) {
-            type = "*";
-        } else if (self.async) {
-            type = "async";
-        }
-        self._print_getter_setter(type, false, output);
-    });
     DEFPRINT(AST_ClassStaticBlock, function (self, output) {
         output.print("static");
         output.space();

package/lib/parse.js

@@ -3141,6 +3141,7 @@ function parse($TEXT, options) {
             return subscripts(call, true, is_chain);
         }
 
+        // Optional chain
         if (is("punc", "?.")) {
             next();
 

package/lib/size.js

@@ -390,7 +390,11 @@ AST_PrivateMethod.prototype._size = function () {
     return AST_ConciseMethod.prototype._size.call(this) + 1;
 };
 
-AST_PrivateGetter.prototype._size = AST_PrivateSetter.prototype._size = function () {
+AST_PrivateGetter.prototype._size = function () {
+    return AST_ConciseMethod.prototype._size.call(this) + 4;
+};
+
+AST_PrivateSetter.prototype._size = function () {
     return AST_ConciseMethod.prototype._size.call(this) + 4;
 };
 

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