terser 5.5.0 → 5.6.1

package/lib/ast.js

@@ -522,6 +522,9 @@ var AST_Lambda = DEFNODE("Lambda", "name argnames uses_arguments is_generator as
 
         if (this.name) push(this.name);
     },
+    is_braceless() {
+        return this.body[0] instanceof AST_Return && this.body[0].value;
+    }
 }, AST_Scope);
 
 var AST_Accessor = DEFNODE("Accessor", null, {
@@ -1007,7 +1010,7 @@ var AST_PropAccess = DEFNODE("PropAccess", "expression property optional", {
     $documentation: "Base class for property access expressions, i.e. `a.foo` or `a[\"foo\"]`",
     $propdoc: {
         expression: "[AST_Node] the “container” expression",
-        property: "[AST_Node|string] the property to access.  For AST_Dot this is always a plain string, while for AST_Sub it's an arbitrary AST_Node",
+        property: "[AST_Node|string] the property to access.  For AST_Dot & AST_DotHash this is always a plain string, while for AST_Sub it's an arbitrary AST_Node",
 
         optional: "[boolean] whether this is an optional property access (IE ?.)"
     }
@@ -1028,6 +1031,18 @@ var AST_Dot = DEFNODE("Dot", "quote", {
     },
 }, AST_PropAccess);
 
+var AST_DotHash = DEFNODE("DotHash", "", {
+    $documentation: "A dotted property access to a private property",
+    _walk: function(visitor) {
+        return visitor._visit(this, function() {
+            this.expression._walk(visitor);
+        });
+    },
+    _children_backwards(push) {
+        push(this.expression);
+    },
+}, AST_PropAccess);
+
 var AST_Sub = DEFNODE("Sub", null, {
     $documentation: "Index-style property access, i.e. `a[\"foo\"]`",
     _walk: function(visitor) {
@@ -1045,7 +1060,7 @@ var AST_Sub = DEFNODE("Sub", null, {
 var AST_Chain = DEFNODE("Chain", "expression", {
     $documentation: "A chain expression like a?.b?.(c)?.[d]",
     $propdoc: {
-        expression: "[AST_Call|AST_Dot|AST_Sub] chain element."
+        expression: "[AST_Call|AST_Dot|AST_DotHash|AST_Sub] chain element."
     },
     _walk: function (visitor) {
         return visitor._visit(this, function() {
@@ -1201,6 +1216,26 @@ var AST_ObjectKeyVal = DEFNODE("ObjectKeyVal", "quote", {
     }
 }, AST_ObjectProperty);
 
+var AST_PrivateSetter = DEFNODE("PrivateSetter", "static", {
+    $propdoc: {
+        static: "[boolean] whether this is a static private setter"
+    },
+    $documentation: "A private setter property",
+    computed_key() {
+        return false;
+    }
+}, AST_ObjectProperty);
+
+var AST_PrivateGetter = DEFNODE("PrivateGetter", "static", {
+    $propdoc: {
+        static: "[boolean] whether this is a static private getter"
+    },
+    $documentation: "A private getter property",
+    computed_key() {
+        return false;
+    }
+}, AST_ObjectProperty);
+
 var AST_ObjectSetter = DEFNODE("ObjectSetter", "quote static", {
     $propdoc: {
         quote: "[string|undefined] the original quote character, if any",
@@ -1236,6 +1271,10 @@ var AST_ConciseMethod = DEFNODE("ConciseMethod", "quote static is_generator asyn
     }
 }, AST_ObjectProperty);
 
+var AST_PrivateMethod = DEFNODE("PrivateMethod", "", {
+    $documentation: "A private class method inside a class",
+}, AST_ConciseMethod);
+
 var AST_Class = DEFNODE("Class", "name extends properties", {
     $propdoc: {
         name: "[AST_SymbolClass|AST_SymbolDefClass?] optional class name.",
@@ -1285,6 +1324,10 @@ var AST_ClassProperty = DEFNODE("ClassProperty", "static quote", {
     }
 }, AST_ObjectProperty);
 
+var AST_ClassPrivateProperty = DEFNODE("ClassProperty", "", {
+    $documentation: "A class property for a private property",
+}, AST_ClassProperty);
+
 var AST_DefClass = DEFNODE("DefClass", null, {
     $documentation: "A class definition",
 }, AST_Class);
@@ -1684,6 +1727,7 @@ export {
     AST_Chain,
     AST_Class,
     AST_ClassExpression,
+    AST_ClassPrivateProperty,
     AST_ClassProperty,
     AST_ConciseMethod,
     AST_Conditional,
@@ -1700,6 +1744,7 @@ export {
     AST_Directive,
     AST_Do,
     AST_Dot,
+    AST_DotHash,
     AST_DWLoop,
     AST_EmptyStatement,
     AST_Exit,
@@ -1737,6 +1782,9 @@ export {
     AST_ObjectProperty,
     AST_ObjectSetter,
     AST_PrefixedTemplateString,
+    AST_PrivateGetter,
+    AST_PrivateMethod,
+    AST_PrivateSetter,
     AST_PropAccess,
     AST_RegExp,
     AST_Return,

package/lib/cli.js

@@ -42,7 +42,7 @@ export async function run_cli({ program, packageJson, fs, path }) {
     program.option("-m, --mangle [options]", "Mangle names/specify mangler options.", parse_js());
     program.option("--mangle-props [options]", "Mangle properties/specify mangler options.", parse_js());
     program.option("-f, --format [options]", "Format options.", parse_js());
-    program.option("-b, --beautify [options]", "Alias for --format beautify=true.", parse_js());
+    program.option("-b, --beautify [options]", "Alias for --format.", parse_js());
     program.option("-o, --output <file>", "Output file (default STDOUT).");
     program.option("--comments [filter]", "Preserve copyright comments in the output.");
     program.option("--config-file <file>", "Read minify() options from JSON file.");
@@ -93,19 +93,9 @@ export async function run_cli({ program, packageJson, fs, path }) {
         else
             options.ecma = ecma;
     }
-    if (program.beautify || program.format) {
-        if (program.beautify && program.format) {
-            fatal("Please only specify one of --beautify or --format");
-        }
-        if (program.beautify) {
-            options.format = typeof program.beautify == "object" ? program.beautify : {};
-            if (!("beautify" in options.format)) {
-                options.format.beautify = true;
-            }
-        }
-        if (program.format) {
-            options.format = typeof program.format == "object" ? program.format : {};
-        }
+    if (program.format || program.beautify) {
+        const chosenOption = program.format || program.beautify;
+        options.format = typeof chosenOption === "object" ? chosenOption : {};
     }
     if (program.comments) {
         if (typeof options.format != "object") options.format = {};

package/lib/compress/index.js

@@ -1416,8 +1416,11 @@ function tighten_body(statements, compressor) {
                 || node instanceof AST_Debugger
                 || node instanceof AST_Destructuring
                 || node instanceof AST_Expansion
-                   && node.expression instanceof AST_Symbol
-                   && node.expression.definition().references.length > 1
+                    && node.expression instanceof AST_Symbol
+                    && (
+                        node.expression instanceof AST_This
+                        || node.expression.definition().references.length > 1
+                    )
                 || node instanceof AST_IterationStatement && !(node instanceof AST_For)
                 || node instanceof AST_LoopControl
                 || node instanceof AST_Try
@@ -2586,7 +2589,13 @@ function is_undefined(node, compressor) {
     });
     def_may_throw_on_access(AST_Dot, function(compressor) {
         if (!is_strict(compressor)) return false;
-        if (this.expression instanceof AST_Function && this.property == "prototype") return false;
+
+        if (this.property == "prototype") {
+            return !(
+                this.expression instanceof AST_Function
+                || this.expression instanceof AST_Class
+            );
+        }
         return true;
     });
     def_may_throw_on_access(AST_Chain, function(compressor) {
@@ -3433,7 +3442,7 @@ const pure_prop_access_globals = new Set([
     def_has_side_effects(AST_ObjectProperty, function(compressor) {
         return (
             this.computed_key() && this.key.has_side_effects(compressor)
-            || this.value.has_side_effects(compressor)
+            || this.value && this.value.has_side_effects(compressor)
         );
     });
     def_has_side_effects(AST_ClassProperty, function(compressor) {
@@ -3561,7 +3570,7 @@ const pure_prop_access_globals = new Set([
     });
     def_may_throw(AST_ObjectProperty, function(compressor) {
         // TODO key may throw too
-        return this.value.may_throw(compressor);
+        return this.value ? this.value.may_throw(compressor) : false;
     });
     def_may_throw(AST_ClassProperty, function(compressor) {
         return (
@@ -3695,7 +3704,7 @@ const pure_prop_access_globals = new Set([
         return this.properties.every((l) => l.is_constant_expression());
     });
     def_is_constant_expression(AST_ObjectProperty, function() {
-        return !(this.key instanceof AST_Node) && this.value.is_constant_expression();
+        return !!(!(this.key instanceof AST_Node) && this.value && this.value.is_constant_expression());
     });
 })(function(node, func) {
     node.DEFMETHOD("is_constant_expression", func);
@@ -4522,7 +4531,7 @@ AST_Scope.DEFMETHOD("hoist_properties", function(compressor) {
     def_drop_side_effect_free(AST_ObjectProperty, function(compressor, first_in_statement) {
         const computed_key = this instanceof AST_ObjectKeyVal && this.key instanceof AST_Node;
         const key = computed_key && this.key.drop_side_effect_free(compressor, first_in_statement);
-        const value = this.value.drop_side_effect_free(compressor, first_in_statement);
+        const value = this.value && this.value.drop_side_effect_free(compressor, first_in_statement);
         if (key && value) {
             return make_sequence(this, [key, value]);
         }

package/lib/mozilla-ast.js

@@ -63,6 +63,7 @@ import {
     AST_Class,
     AST_ClassExpression,
     AST_ClassProperty,
+    AST_ClassPrivateProperty,
     AST_ConciseMethod,
     AST_Conditional,
     AST_Const,
@@ -78,6 +79,7 @@ import {
     AST_Directive,
     AST_Do,
     AST_Dot,
+    AST_DotHash,
     AST_EmptyStatement,
     AST_Expansion,
     AST_Export,
@@ -108,6 +110,9 @@ import {
     AST_ObjectProperty,
     AST_ObjectSetter,
     AST_PrefixedTemplateString,
+    AST_PrivateGetter,
+    AST_PrivateMethod,
+    AST_PrivateSetter,
     AST_PropAccess,
     AST_RegExp,
     AST_Return,
@@ -386,6 +391,23 @@ import {
                 static   : M.static,
             });
         },
+        PropertyDefinition: function(M) {
+            let key;
+            if (M.computed) {
+                key = from_moz(M.key);
+            } else {
+                if (M.key.type !== "Identifier") throw new Error("Non-Identifier key in PropertyDefinition");
+                key = from_moz(M.key);
+            }
+
+            return new AST_ClassProperty({
+                start    : my_start_token(M),
+                end      : my_end_token(M),
+                key,
+                value    : from_moz(M.value),
+                static   : M.static,
+            });
+        },
         ArrayExpression: function(M) {
             return new AST_Array({
                 start    : my_start_token(M),
@@ -574,7 +596,7 @@ import {
                         : p.type == "ArrowFunctionExpression" ? (p.params.includes(M)) ? AST_SymbolFunarg : AST_SymbolRef
                         : p.type == "ClassExpression" ? (p.id === M ? AST_SymbolClass : AST_SymbolRef)
                         : p.type == "Property" ? (p.key === M && p.computed || p.value === M ? AST_SymbolRef : AST_SymbolMethod)
-                        : p.type == "FieldDefinition" ? (p.key === M && p.computed || p.value === M ? AST_SymbolRef : AST_SymbolClassProperty)
+                        : p.type == "PropertyDefinition" || p.type === "FieldDefinition" ? (p.key === M && p.computed || p.value === M ? AST_SymbolRef : AST_SymbolClassProperty)
                         : p.type == "ClassDeclaration" ? (p.id === M ? AST_SymbolDefClass : AST_SymbolRef)
                         : p.type == "MethodDefinition" ? (p.computed ? AST_SymbolRef : AST_SymbolMethod)
                         : p.type == "CatchClause" ? AST_SymbolCatch
@@ -873,6 +895,19 @@ import {
         };
     });
 
+    def_to_moz(AST_DotHash, function To_Moz_PrivateMemberExpression(M) {
+        return {
+            type: "MemberExpression",
+            object: to_moz(M.expression),
+            computed: false,
+            property: {
+                type: "PrivateIdentifier",
+                name: M.property
+            },
+            optional: M.optional
+        };
+    });
+
     def_to_moz(AST_PropAccess, function To_Moz_MemberExpression(M) {
         var isComputed = M instanceof AST_Sub;
         return {
@@ -965,12 +1000,38 @@ import {
         if (M instanceof AST_ObjectSetter) {
             kind = "set";
         }
+        if (M instanceof AST_PrivateGetter || M instanceof AST_PrivateSetter) {
+            const kind = M instanceof AST_PrivateGetter ? "get" : "set";
+            return {
+                type: "MethodDefinition",
+                computed: false,
+                kind: kind,
+                static: M.static,
+                key: {
+                    type: "PrivateIdentifier",
+                    name: M.key.name
+                },
+                value: to_moz(M.value)
+            };
+        }
+        if (M instanceof AST_ClassPrivateProperty) {
+            return {
+                type: "PropertyDefinition",
+                key: {
+                    type: "PrivateIdentifier",
+                    name: M.key.name
+                },
+                value: to_moz(M.value),
+                computed: false,
+                static: M.static
+            };
+        }
         if (M instanceof AST_ClassProperty) {
             return {
-                type: "FieldDefinition",
-                computed,
+                type: "PropertyDefinition",
                 key,
                 value: to_moz(M.value),
+                computed,
                 static: M.static
             };
         }
@@ -1005,13 +1066,21 @@ import {
                 value: to_moz(M.value)
             };
         }
+
+        const key = M instanceof AST_PrivateMethod
+            ? {
+                type: "PrivateIdentifier",
+                name: M.key.name
+            }
+            : to_moz(M.key);
+
         return {
             type: "MethodDefinition",
-            computed: !(M.key instanceof AST_Symbol) || M.key instanceof AST_SymbolRef,
             kind: M.key === "constructor" ? "constructor" : "method",
+            key,
+            value: to_moz(M.value),
+            computed: !(M.key instanceof AST_Symbol) || M.key instanceof AST_SymbolRef,
             static: M.static,
-            key: to_moz(M.key),
-            value: to_moz(M.value)
         };
     });
 

package/lib/output.js

@@ -68,8 +68,12 @@ import {
     AST_Chain,
     AST_Class,
     AST_ClassExpression,
+    AST_ClassPrivateProperty,
     AST_ClassProperty,
     AST_ConciseMethod,
+    AST_PrivateGetter,
+    AST_PrivateMethod,
+    AST_PrivateSetter,
     AST_Conditional,
     AST_Const,
     AST_Constant,
@@ -83,6 +87,7 @@ import {
     AST_Directive,
     AST_Do,
     AST_Dot,
+    AST_DotHash,
     AST_EmptyStatement,
     AST_Exit,
     AST_Expansion,
@@ -239,7 +244,7 @@ function OutputStream(options) {
     let printed_comments = new Set();
 
     var to_utf8 = options.ascii_only ? function(str, identifier) {
-        if (options.ecma >= 2015) {
+        if (options.ecma >= 2015 && !options.safari10) {
             str = str.replace(/[\ud800-\udbff][\udc00-\udfff]/g, function(ch) {
                 var code = get_full_char_code(ch, 0).toString(16);
                 return "\\u{" + code + "}";
@@ -928,6 +933,7 @@ function OutputStream(options) {
         var p = output.parent();
         return p instanceof AST_PropAccess && p.expression === this
             || p instanceof AST_Call && p.expression === this
+            || p instanceof AST_Binary && p.operator === "**" && p.left === this
             || output.option("safari10") && p instanceof AST_UnaryPrefix;
     });
 
@@ -1779,7 +1785,10 @@ function OutputStream(options) {
         var prop = self.property;
         var print_computed = RESERVED_WORDS.has(prop)
             ? output.option("ie8")
-            : !is_identifier_string(prop, output.option("ecma") >= 2015);
+            : !is_identifier_string(
+                prop,
+                output.option("ecma") >= 2015 || output.option("safari10")
+            );
 
         if (self.optional) output.print("?.");
 
@@ -1800,6 +1809,15 @@ function OutputStream(options) {
             output.print_name(prop);
         }
     });
+    DEFPRINT(AST_DotHash, function(self, output) {
+        var expr = self.expression;
+        expr.print(output);
+        var prop = self.property;
+
+        if (self.optional) output.print("?");
+        output.print(".#");
+        output.print_name(prop);
+    });
     DEFPRINT(AST_Sub, function(self, output) {
         self.expression.print(output);
         if (self.optional) output.print("?.");
@@ -1949,7 +1967,7 @@ function OutputStream(options) {
         var print_string = RESERVED_WORDS.has(key)
             ? output.option("ie8")
             : (
-                output.option("ecma") < 2015
+                output.option("ecma") < 2015 || output.option("safari10")
                     ? !is_basic_identifier_string(key)
                     : !is_identifier_string(key, true)
             );
@@ -1968,7 +1986,10 @@ function OutputStream(options) {
         var allowShortHand = output.option("shorthand");
         if (allowShortHand &&
             self.value instanceof AST_Symbol &&
-            is_identifier_string(self.key, output.option("ecma") >= 2015) &&
+            is_identifier_string(
+                self.key,
+                output.option("ecma") >= 2015 || output.option("safari10")
+            ) &&
             get_name(self.value) === self.key &&
             !RESERVED_WORDS.has(self.key)
         ) {
@@ -1977,7 +1998,10 @@ function OutputStream(options) {
         } else if (allowShortHand &&
             self.value instanceof AST_DefaultAssign &&
             self.value.left instanceof AST_Symbol &&
-            is_identifier_string(self.key, output.option("ecma") >= 2015) &&
+            is_identifier_string(
+                self.key,
+                output.option("ecma") >= 2015 || output.option("safari10")
+            ) &&
             get_name(self.value.left) === self.key
         ) {
             print_property_name(self.key, self.quote, output);
@@ -1997,6 +2021,23 @@ function OutputStream(options) {
             self.value.print(output);
         }
     });
+    DEFPRINT(AST_ClassPrivateProperty, (self, output) => {
+        if (self.static) {
+            output.print("static");
+            output.space();
+        }
+
+        output.print("#");
+        
+        print_property_name(self.key.name, self.quote, output);
+
+        if (self.value) {
+            output.print("=");
+            self.value.print(output);
+        }
+
+        output.semicolon();
+    });
     DEFPRINT(AST_ClassProperty, (self, output) => {
         if (self.static) {
             output.print("static");
@@ -2018,7 +2059,7 @@ function OutputStream(options) {
 
         output.semicolon();
     });
-    AST_ObjectProperty.DEFMETHOD("_print_getter_setter", function(type, output) {
+    AST_ObjectProperty.DEFMETHOD("_print_getter_setter", function(type, is_private, output) {
         var self = this;
         if (self.static) {
             output.print("static");
@@ -2029,6 +2070,7 @@ function OutputStream(options) {
             output.space();
         }
         if (self.key instanceof AST_SymbolMethod) {
+            if (is_private) output.print("#");
             print_property_name(self.key.name, self.quote, output);
         } else {
             output.with_square(function() {
@@ -2038,10 +2080,27 @@ function OutputStream(options) {
         self.value._do_print(output, true);
     });
     DEFPRINT(AST_ObjectSetter, function(self, output) {
-        self._print_getter_setter("set", output);
+        self._print_getter_setter("set", false, output);
     });
     DEFPRINT(AST_ObjectGetter, function(self, output) {
-        self._print_getter_setter("get", output);
+        self._print_getter_setter("get", false, output);
+    });
+    DEFPRINT(AST_PrivateSetter, function(self, output) {
+        self._print_getter_setter("set", true, output);
+    });
+    DEFPRINT(AST_PrivateGetter, function(self, output) {
+        self._print_getter_setter("get", true, output);
+    });
+    DEFPRINT(AST_PrivateMethod, 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, true, output);
     });
     DEFPRINT(AST_ConciseMethod, function(self, output) {
         var type;
@@ -2052,7 +2111,7 @@ function OutputStream(options) {
         } else if (self.async) {
             type = "async";
         }
-        self._print_getter_setter(type, output);
+        self._print_getter_setter(type, false, output);
     });
     AST_Symbol.DEFMETHOD("_do_print", function(output) {
         var def = this.definition();
@@ -2092,7 +2151,9 @@ function OutputStream(options) {
         source = regexp_source_fix(source);
         flags = flags ? sort_regexp_flags(flags) : "";
         source = source.replace(r_slash_script, slash_script_replace);
+
         output.print(output.to_utf8(`/${source}/${flags}`));
+
         const parent = output.parent();
         if (
             parent instanceof AST_Binary