terser 5.16.1 → 5.17.7

package/lib/mozilla-ast.js

@@ -151,6 +151,7 @@ import {
     AST_Toplevel,
     AST_True,
     AST_Try,
+    AST_TryBlock,
     AST_Unary,
     AST_UnaryPostfix,
     AST_UnaryPrefix,
@@ -344,7 +345,7 @@ import { is_basic_identifier_string } from "./parse.js";
             return new AST_Try({
                 start    : my_start_token(M),
                 end      : my_end_token(M),
-                body     : from_moz(M.block).body,
+                body     : new AST_TryBlock(from_moz(M.block)),
                 bcatch   : from_moz(handlers[0]),
                 bfinally : M.finalizer ? new AST_Finally(from_moz(M.finalizer)) : null
             });
@@ -394,22 +395,25 @@ import { is_basic_identifier_string } from "./parse.js";
         },
 
         MethodDefinition: function(M) {
+            const is_private = M.key.type === "PrivateIdentifier";
+            const key = M.computed ? from_moz(M.key) : new AST_SymbolMethod({ name: M.key.name || M.key.value });
+
             var args = {
                 start    : my_start_token(M),
                 end      : my_end_token(M),
-                key      : M.computed ? from_moz(M.key) : new AST_SymbolMethod({ name: M.key.name || M.key.value }),
+                key,
                 value    : from_moz(M.value),
                 static   : M.static,
             };
             if (M.kind == "get") {
-                return new AST_ObjectGetter(args);
+                return new (is_private ? AST_PrivateGetter : AST_ObjectGetter)(args);
             }
             if (M.kind == "set") {
-                return new AST_ObjectSetter(args);
+                return new (is_private ? AST_PrivateSetter : AST_ObjectSetter)(args);
             }
             args.is_generator = M.value.generator;
             args.async = M.value.async;
-            return new AST_ConciseMethod(args);
+            return new (is_private ? AST_PrivateMethod : AST_ConciseMethod)(args);
         },
 
         FieldDefinition: function(M) {
@@ -433,8 +437,16 @@ import { is_basic_identifier_string } from "./parse.js";
             let key;
             if (M.computed) {
                 key = from_moz(M.key);
+            } else if (M.key.type === "PrivateIdentifier") {
+                return new AST_ClassPrivateProperty({
+                    start    : my_start_token(M),
+                    end      : my_end_token(M),
+                    key      : from_moz(M.key),
+                    value    : from_moz(M.value),
+                    static   : M.static,
+                });
             } else {
-                if (M.key.type !== "Identifier" && M.key.type !== "PrivateIdentifier") {
+                if (M.key.type !== "Identifier") {
                     throw new Error("Non-Identifier key in PropertyDefinition");
                 }
                 key = from_moz(M.key);
@@ -449,6 +461,14 @@ import { is_basic_identifier_string } from "./parse.js";
             });
         },
 
+        PrivateIdentifier: function (M) {
+            return new AST_SymbolPrivateProperty({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                name: M.name
+            });
+        },
+
         StaticBlock: function(M) {
             return new AST_ClassStaticBlock({
                 start : my_start_token(M),
@@ -490,6 +510,15 @@ import { is_basic_identifier_string } from "./parse.js";
         },
 
         MemberExpression: function(M) {
+            if (M.property.type === "PrivateIdentifier") {
+                return new AST_DotHash({
+                    start      : my_start_token(M),
+                    end        : my_end_token(M),
+                    property   : M.property.name,
+                    expression : from_moz(M.object),
+                    optional   : M.optional || false
+                });
+            }
             return new (M.computed ? AST_Sub : AST_Dot)({
                 start      : my_start_token(M),
                 end        : my_end_token(M),
@@ -529,24 +558,11 @@ import { is_basic_identifier_string } from "./parse.js";
             var imported_name = null;
             var imported_names = null;
             M.specifiers.forEach(function (specifier) {
-                if (specifier.type === "ImportSpecifier") {
+                if (specifier.type === "ImportSpecifier" || specifier.type === "ImportNamespaceSpecifier") {
                     if (!imported_names) { imported_names = []; }
-                    imported_names.push(new AST_NameMapping({
-                        start: my_start_token(specifier),
-                        end: my_end_token(specifier),
-                        foreign_name: from_moz(specifier.imported),
-                        name: from_moz(specifier.local)
-                    }));
+                    imported_names.push(from_moz(specifier));
                 } else if (specifier.type === "ImportDefaultSpecifier") {
-                    imported_name = from_moz(specifier.local);
-                } else if (specifier.type === "ImportNamespaceSpecifier") {
-                    if (!imported_names) { imported_names = []; }
-                    imported_names.push(new AST_NameMapping({
-                        start: my_start_token(specifier),
-                        end: my_end_token(specifier),
-                        foreign_name: new AST_SymbolImportForeign({ name: "*" }),
-                        name: from_moz(specifier.local)
-                    }));
+                    imported_name = from_moz(specifier);
                 }
             });
             return new AST_Import({
@@ -559,14 +575,39 @@ import { is_basic_identifier_string } from "./parse.js";
             });
         },
 
+        ImportSpecifier: function(M) {
+            return new AST_NameMapping({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                foreign_name: from_moz(M.imported),
+                name: from_moz(M.local)
+            });
+        },
+
+        ImportDefaultSpecifier: function(M) {
+            return from_moz(M.local);
+        },
+
+        ImportNamespaceSpecifier: function(M) {
+            return new AST_NameMapping({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                foreign_name: new AST_SymbolImportForeign({ name: "*" }),
+                name: from_moz(M.local)
+            });
+        },
+
         ExportAllDeclaration: function(M) {
+            var foreign_name = M.exported == null ? 
+                new AST_SymbolExportForeign({ name: "*" }) :
+                from_moz(M.exported);
             return new AST_Export({
                 start: my_start_token(M),
                 end: my_end_token(M),
                 exported_names: [
                     new AST_NameMapping({
                         name: new AST_SymbolExportForeign({ name: "*" }),
-                        foreign_name: new AST_SymbolExportForeign({ name: "*" })
+                        foreign_name: foreign_name
                     })
                 ],
                 module_name: from_moz(M.source),
@@ -580,10 +621,7 @@ import { is_basic_identifier_string } from "./parse.js";
                 end: my_end_token(M),
                 exported_definition: from_moz(M.declaration),
                 exported_names: M.specifiers && M.specifiers.length ? M.specifiers.map(function (specifier) {
-                    return new AST_NameMapping({
-                        foreign_name: from_moz(specifier.exported),
-                        name: from_moz(specifier.local)
-                    });
+                    return from_moz(specifier);
                 }) : null,
                 module_name: from_moz(M.source),
                 assert_clause: assert_clause_from_moz(M.assertions)
@@ -599,6 +637,13 @@ import { is_basic_identifier_string } from "./parse.js";
             });
         },
 
+        ExportSpecifier: function(M) {
+            return new AST_NameMapping({
+                foreign_name: from_moz(M.exported),
+                name: from_moz(M.local)
+            });
+        },
+
         Literal: function(M) {
             var val = M.value, args = {
                 start  : my_start_token(M),
@@ -624,6 +669,22 @@ import { is_basic_identifier_string } from "./parse.js";
             if (val === null) return new AST_Null(args);
             switch (typeof val) {
               case "string":
+                args.quote = "\"";
+                var p = FROM_MOZ_STACK[FROM_MOZ_STACK.length - 2];
+                if (p.type == "ImportSpecifier") {
+                    args.name = val;
+                    return new AST_SymbolImportForeign(args);
+                } else if (p.type == "ExportSpecifier") {
+                    args.name = val;
+                    if (M == p.exported) {
+                        return new AST_SymbolExportForeign(args);
+                    } else {
+                        return new AST_SymbolExport(args);
+                    }
+                } else if (p.type == "ExportAllDeclaration" && M == p.exported) {
+                    args.name = val;
+                    return new AST_SymbolExportForeign(args);
+                }
                 args.value = val;
                 return new AST_String(args);
               case "number":
@@ -1283,7 +1344,7 @@ import { is_basic_identifier_string } from "./parse.js";
     def_to_moz(AST_Try, function To_Moz_TryStatement(M) {
         return {
             type: "TryStatement",
-            block: to_moz_block(M),
+            block: to_moz_block(M.body),
             handler: to_moz(M.bcatch),
             guardedHandlers: [],
             finalizer: to_moz(M.bfinally)
@@ -1328,10 +1389,17 @@ import { is_basic_identifier_string } from "./parse.js";
 
     def_to_moz(AST_Export, function To_Moz_ExportDeclaration(M) {
         if (M.exported_names) {
-            if (M.exported_names[0].name.name === "*") {
+            var first_exported = M.exported_names[0];
+            var first_exported_name = first_exported.name;
+            if (first_exported_name.name === "*" && !first_exported_name.quote) {
+                var foreign_name = first_exported.foreign_name;
+                var exported = foreign_name.name === "*" && !foreign_name.quote
+                    ? null
+                    : to_moz(foreign_name);
                 return {
                     type: "ExportAllDeclaration",
                     source: to_moz(M.module_name),
+                    exported: exported,
                     assertions: assert_clause_to_moz(M.assert_clause)
                 };
             }
@@ -1363,19 +1431,22 @@ import { is_basic_identifier_string } from "./parse.js";
                 local: to_moz(M.imported_name)
             });
         }
-        if (M.imported_names && M.imported_names[0].foreign_name.name === "*") {
-            specifiers.push({
-                type: "ImportNamespaceSpecifier",
-                local: to_moz(M.imported_names[0].name)
-            });
-        } else if (M.imported_names) {
-            M.imported_names.forEach(function(name_mapping) {
+        if (M.imported_names) {
+            var first_imported_foreign_name = M.imported_names[0].foreign_name;
+            if (first_imported_foreign_name.name === "*" && !first_imported_foreign_name.quote) {
                 specifiers.push({
-                    type: "ImportSpecifier",
-                    local: to_moz(name_mapping.name),
-                    imported: to_moz(name_mapping.foreign_name)
+                    type: "ImportNamespaceSpecifier",
+                    local: to_moz(M.imported_names[0].name)
                 });
-            });
+            } else {
+                M.imported_names.forEach(function(name_mapping) {
+                    specifiers.push({
+                        type: "ImportSpecifier",
+                        local: to_moz(name_mapping.name),
+                        imported: to_moz(name_mapping.foreign_name)
+                    });
+                });
+            }
         }
         return {
             type: "ImportDeclaration",
@@ -1639,7 +1710,14 @@ import { is_basic_identifier_string } from "./parse.js";
     });
 
     def_to_moz(AST_Symbol, function To_Moz_Identifier(M, parent) {
-        if (M instanceof AST_SymbolMethod && parent.quote) {
+        if (
+            (M instanceof AST_SymbolMethod && parent.quote) ||
+            ((
+                M instanceof AST_SymbolImportForeign ||
+                M instanceof AST_SymbolExportForeign ||
+                M instanceof AST_SymbolExport
+                ) && M.quote)
+         ) {
             return {
                 type: "Literal",
                 value: M.name

package/lib/output.js

@@ -143,6 +143,7 @@ import {
     AST_Throw,
     AST_Toplevel,
     AST_Try,
+    AST_TryBlock,
     AST_Unary,
     AST_UnaryPostfix,
     AST_UnaryPrefix,
@@ -661,14 +662,17 @@ function OutputStream(options) {
         if (!start) return;
         var printed_comments = self.printed_comments;
 
-        // There cannot be a newline between return and its value.
-        const return_with_value = node instanceof AST_Exit && node.value;
+        // There cannot be a newline between return/yield and its value.
+        const keyword_with_value = 
+            node instanceof AST_Exit && node.value
+            || (node instanceof AST_Await || node instanceof AST_Yield)
+                && node.expression;
 
         if (
             start.comments_before
             && printed_comments.has(start.comments_before)
         ) {
-            if (return_with_value) {
+            if (keyword_with_value) {
                 start.comments_before = [];
             } else {
                 return;
@@ -681,10 +685,12 @@ function OutputStream(options) {
         }
         printed_comments.add(comments);
 
-        if (return_with_value) {
+        if (keyword_with_value) {
             var tw = new TreeWalker(function(node) {
                 var parent = tw.parent();
                 if (parent instanceof AST_Exit
+                    || parent instanceof AST_Await
+                    || parent instanceof AST_Yield
                     || parent instanceof AST_Binary && parent.left === node
                     || parent.TYPE == "Call" && parent.expression === node
                     || parent instanceof AST_Conditional && parent.condition === node
@@ -703,7 +709,7 @@ function OutputStream(options) {
                 }
             });
             tw.push(node);
-            node.value.walk(tw);
+            keyword_with_value.walk(tw);
         }
 
         if (current_pos == 0) {
@@ -1079,6 +1085,12 @@ function OutputStream(options) {
             return true;
     });
 
+    PARENS(AST_Chain, function(output) {
+        var p = output.parent();
+        if (!(p instanceof AST_Call || p instanceof AST_PropAccess)) return false;
+        return p.expression === this;
+    });
+
     PARENS(AST_PropAccess, function(output) {
         var p = output.parent();
         if (p instanceof AST_New && p.expression === this) {
@@ -1225,7 +1237,7 @@ function OutputStream(options) {
     }
 
     AST_StatementWithBody.DEFMETHOD("_do_print_body", function(output) {
-        force_statement(this.body, output);
+        print_maybe_braced_body(this.body, output);
     });
 
     DEFPRINT(AST_Statement, function(self, output) {
@@ -1554,7 +1566,7 @@ function OutputStream(options) {
                 b = b.body;
             } else break;
         }
-        force_statement(self.body, output);
+        print_maybe_braced_body(self.body, output);
     }
     DEFPRINT(AST_If, function(self, output) {
         output.print("if");
@@ -1571,7 +1583,7 @@ function OutputStream(options) {
             if (self.alternative instanceof AST_If)
                 self.alternative.print(output);
             else
-                force_statement(self.alternative, output);
+                print_maybe_braced_body(self.alternative, output);
         } else {
             self._do_print_body(output);
         }
@@ -1620,7 +1632,7 @@ function OutputStream(options) {
     DEFPRINT(AST_Try, function(self, output) {
         output.print("try");
         output.space();
-        print_braced(self, output);
+        self.body.print(output);
         if (self.bcatch) {
             output.space();
             self.bcatch.print(output);
@@ -1630,6 +1642,9 @@ function OutputStream(options) {
             self.bfinally.print(output);
         }
     });
+    DEFPRINT(AST_TryBlock, function(self, output) {
+        print_braced(self, output);
+    });
     DEFPRINT(AST_Catch, function(self, output) {
         output.print("catch");
         if (self.argname) {
@@ -1681,7 +1696,9 @@ function OutputStream(options) {
             output.space();
         }
         if (self.imported_names) {
-            if (self.imported_names.length === 1 && self.imported_names[0].foreign_name.name === "*") {
+            if (self.imported_names.length === 1 &&
+                self.imported_names[0].foreign_name.name === "*" &&
+                !self.imported_names[0].foreign_name.quote) {
                 self.imported_names[0].print(output);
             } else {
                 output.print("{");
@@ -1715,14 +1732,31 @@ function OutputStream(options) {
     DEFPRINT(AST_NameMapping, function(self, output) {
         var is_import = output.parent() instanceof AST_Import;
         var definition = self.name.definition();
+        var foreign_name = self.foreign_name;
         var names_are_different =
             (definition && definition.mangled_name || self.name.name) !==
-            self.foreign_name.name;
+            foreign_name.name;
+        if (!names_are_different &&
+            foreign_name.name === "*" &&
+            foreign_name.quote != self.name.quote) {
+                // export * as "*"
+            names_are_different = true;
+        }
+        var foreign_name_is_name = foreign_name.quote == null;
         if (names_are_different) {
             if (is_import) {
-                output.print(self.foreign_name.name);
+                if (foreign_name_is_name) {
+                    output.print(foreign_name.name);
+                } else {
+                    output.print_string(foreign_name.name, foreign_name.quote);
+                }
             } else {
-                self.name.print(output);
+                if (self.name.quote == null) {
+                    self.name.print(output);
+                } else {
+                    output.print_string(self.name.name, self.name.quote);
+                }
+                
             }
             output.space();
             output.print("as");
@@ -1730,10 +1764,18 @@ function OutputStream(options) {
             if (is_import) {
                 self.name.print(output);
             } else {
-                output.print(self.foreign_name.name);
+                if (foreign_name_is_name) {
+                    output.print(foreign_name.name);
+                } else {
+                    output.print_string(foreign_name.name, foreign_name.quote);
+                }
             }
         } else {
-            self.name.print(output);
+            if (self.name.quote == null) {
+                self.name.print(output);
+            } else {
+                output.print_string(self.name.name, self.name.quote);
+            }
         }
     });
 
@@ -1745,8 +1787,10 @@ function OutputStream(options) {
             output.space();
         }
         if (self.exported_names) {
-            if (self.exported_names.length === 1 && self.exported_names[0].name.name === "*") {
-                self.exported_names[0].print(output);
+            if (self.exported_names.length === 1 &&
+                self.exported_names[0].name.name === "*" &&
+                !self.exported_names[0].name.quote) {
+                    self.exported_names[0].print(output);
             } else {
                 output.print("{");
                 self.exported_names.forEach(function(name_export, i) {
@@ -1873,7 +1917,7 @@ function OutputStream(options) {
             ? output.option("ie8")
             : !is_identifier_string(
                 prop,
-                output.option("ecma") >= 2015 || output.option("safari10")
+                output.option("ecma") >= 2015 && !output.option("safari10")
             );
 
         if (self.optional) output.print("?.");
@@ -2041,15 +2085,19 @@ function OutputStream(options) {
         output.print("new.target");
     });
 
+    /** Prints a prop name. Returns whether it can be used as a shorthand. */
     function print_property_name(key, quote, output) {
         if (output.option("quote_keys")) {
-            return output.print_string(key);
+            output.print_string(key);
+            return false;
         }
         if ("" + +key == key && key >= 0) {
             if (output.option("keep_numbers")) {
-                return output.print(key);
+                output.print(key);
+                return false;
             }
-            return output.print(make_num(key));
+            output.print(make_num(key));
+            return false;
         }
         var print_string = ALL_RESERVED_WORDS.has(key)
             ? output.option("ie8")
@@ -2059,9 +2107,11 @@ function OutputStream(options) {
                     : !is_identifier_string(key, true)
             );
         if (print_string || (quote && output.option("keep_quoted_props"))) {
-            return output.print_string(key, quote);
+            output.print_string(key, quote);
+            return false;
         }
-        return output.print_name(key);
+        output.print_name(key);
+        return true;
     }
 
     DEFPRINT(AST_ObjectKeyVal, function(self, output) {
@@ -2070,28 +2120,29 @@ function OutputStream(options) {
             return def ? def.mangled_name || def.name : self.name;
         }
 
-        var allowShortHand = output.option("shorthand");
-        if (allowShortHand &&
-            self.value instanceof AST_Symbol &&
-            is_identifier_string(
-                self.key,
-                output.option("ecma") >= 2015 || output.option("safari10")
-            ) &&
-            get_name(self.value) === self.key &&
-            !ALL_RESERVED_WORDS.has(self.key)
+        const try_shorthand = output.option("shorthand") && !(self.key instanceof AST_Node);
+        if (
+            try_shorthand
+            && self.value instanceof AST_Symbol
+            && get_name(self.value) === self.key
+            && !ALL_RESERVED_WORDS.has(self.key)
         ) {
-            print_property_name(self.key, self.quote, output);
-
-        } else if (allowShortHand &&
-            self.value instanceof AST_DefaultAssign &&
-            self.value.left instanceof AST_Symbol &&
-            is_identifier_string(
-                self.key,
-                output.option("ecma") >= 2015 || output.option("safari10")
-            ) &&
-            get_name(self.value.left) === self.key
+            const was_shorthand = print_property_name(self.key, self.quote, output);
+            if (!was_shorthand) {
+                output.colon();
+                self.value.print(output);
+            }
+        } else if (
+            try_shorthand
+            && self.value instanceof AST_DefaultAssign
+            && self.value.left instanceof AST_Symbol
+            && get_name(self.value.left) === self.key
         ) {
-            print_property_name(self.key, self.quote, output);
+            const was_shorthand = print_property_name(self.key, self.quote, output);
+            if (!was_shorthand) {
+                output.colon();
+                self.value.left.print(output);
+            }
             output.space();
             output.print("=");
             output.space();
@@ -2266,12 +2317,15 @@ function OutputStream(options) {
         }
     });
 
-    function force_statement(stat, output) {
+    /** if, for, while, may or may not have braces surrounding its body */
+    function print_maybe_braced_body(stat, output) {
         if (output.option("braces")) {
             make_block(stat, output);
         } else {
             if (!stat || stat instanceof AST_EmptyStatement)
                 output.force_semicolon();
+            else if (stat instanceof AST_Let || stat instanceof AST_Const || stat instanceof AST_Class)
+                make_block(stat, output);
             else
                 stat.print(output);
         }