terser 5.19.0 → 5.19.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v5.19.1
+ - Better avoid outputting `</script>` and HTML comments.
+ - Fix unused variables in class static blocks not being dropped correctly.
+ - Fix sourcemap names of methods that are `async` or `static`
+
 ## v5.19.0
  - Allow `/*@__MANGLE_PROP__*/` annotation in `object.property`, in addition to property declarations.
 

package/dist/bundle.min.js

@@ -8954,6 +8954,18 @@ class Rope {
         this.current += str;
     }
 
+    endsWith(str) {
+        const { committed, current } = this;
+        const len = str.length;
+        if (committed.length >= len) {
+            return committed.slice(committed.length - str.length) === str;
+        } else {
+            // `str` is small and this is a rare case so keep it simple
+            const last_bit = committed.slice(-len) + current;
+            return last_bit.endsWith(str);
+        }
+    }
+
     insertAt(char, index) {
         const { committed, current } = this;
         if (index < committed.length) {
@@ -9162,10 +9174,12 @@ function OutputStream(options) {
         mappings.forEach(function(mapping) {
             try {
                 let { name, token } = mapping;
-                if (token.type == "name" || token.type === "privatename") {
-                    name = token.value;
-                } else if (name instanceof AST_Symbol) {
-                    name = token.type === "string" ? token.value : name.name;
+                if (name !== false) {
+                    if (token.type == "name" || token.type === "privatename") {
+                        name = token.value;
+                    } else if (name instanceof AST_Symbol) {
+                        name = token.type === "string" ? token.value : name.name;
+                    }
                 }
                 options.source_map.add(
                     mapping.token.file,
@@ -9333,6 +9347,10 @@ function OutputStream(options) {
         might_need_semicolon = true;
     };
 
+    function ends_with(str) {
+        return OUTPUT.endsWith(str);
+    }
+
     function force_semicolon() {
         might_need_semicolon = false;
         print(";");
@@ -9602,6 +9620,7 @@ function OutputStream(options) {
         comma           : comma,
         colon           : colon,
         last            : function() { return last; },
+        ends_with       : ends_with,
         semicolon       : semicolon,
         force_semicolon : force_semicolon,
         to_utf8         : to_utf8,
@@ -10725,6 +10744,9 @@ function OutputStream(options) {
     });
     DEFPRINT(AST_UnaryPrefix, function(self, output) {
         var op = self.operator;
+        if (op === "--" && output.ends_with("<!")) {
+            output.print(" ");
+        }
         output.print(op);
         if (/^[a-z]/i.test(op)
             || (/[+-]$/.test(op)
@@ -10742,8 +10764,7 @@ function OutputStream(options) {
         var op = self.operator;
         self.left.print(output);
         if (op[0] == ">" /* ">>" ">>>" ">" ">=" */
-            && self.left instanceof AST_UnaryPostfix
-            && self.left.operator == "--") {
+            && output.ends_with("--")) {
             // space is mandatory to avoid outputting -->
             output.print(" ");
         } else {
@@ -10751,17 +10772,7 @@ function OutputStream(options) {
             output.space();
         }
         output.print(op);
-        if ((op == "<" || op == "<<")
-            && self.right instanceof AST_UnaryPrefix
-            && self.right.operator == "!"
-            && self.right.expression instanceof AST_UnaryPrefix
-            && self.right.expression.operator == "--") {
-            // space is mandatory to avoid outputting <!--
-            output.print(" ");
-        } else {
-            // the space is optional depending on "beautify"
-            output.space();
-        }
+        output.space();
         self.right.print(output);
     });
     DEFPRINT(AST_Conditional, function(self, output) {
@@ -10974,6 +10985,7 @@ function OutputStream(options) {
         if (self.key instanceof AST_SymbolMethod) {
             if (is_private) output.print("#");
             print_property_name(self.key.name, self.quote, output);
+            self.key.add_source_map(output);
         } else {
             output.with_square(function() {
                 self.key.print(output);
@@ -11062,12 +11074,18 @@ function OutputStream(options) {
     });
 
     const r_slash_script = /(<\s*\/\s*script)/i;
+    const r_starts_with_script = /^\s*script/i;
     const slash_script_replace = (_, $1) => $1.replace("/", "\\/");
     DEFPRINT(AST_RegExp, function(self, output) {
         let { source, flags } = self.getValue();
         source = regexp_source_fix(source);
         flags = flags ? sort_regexp_flags(flags) : "";
+
+        // Avoid outputting end of script tag
         source = source.replace(r_slash_script, slash_script_replace);
+        if (r_starts_with_script.test(source) && output.ends_with("<")) {
+            output.print(" ");
+        }
 
         output.print(output.to_utf8(`/${source}/${flags}`, false, true));
 
@@ -11191,8 +11209,22 @@ function OutputStream(options) {
         AST_ObjectSetter,
         AST_PrivateGetter,
         AST_PrivateSetter,
+        AST_ConciseMethod,
+        AST_PrivateMethod,
     ], function(output) {
-        output.add_mapping(this.key.end, this.key.name);
+        output.add_mapping(this.start, false /*name handled below*/);
+    });
+
+    DEFMAP([
+        AST_SymbolMethod,
+        AST_SymbolPrivateProperty
+    ], function(output) {
+        const tok_type = this.end && this.end.type;
+        if (tok_type === "name" || tok_type === "privatename") {
+            output.add_mapping(this.end, this.name);
+        } else {
+            output.add_mapping(this.end);
+        }
     });
 
     DEFMAP([ AST_ObjectProperty ], function(output) {
@@ -15281,21 +15313,24 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                     }
                 }
             }
-            if ((node instanceof AST_Defun || node instanceof AST_DefClass) && node !== self) {
+            if (node instanceof AST_DefClass && node !== self) {
+                const def = node.name.definition();
+                descend(node, this);
+                const keep_class = def.global && !drop_funcs || in_use_ids.has(def.id);
+                if (!keep_class) {
+                    const kept = node.drop_side_effect_free(compressor);
+                    if (kept == null) {
+                        def.eliminated++;
+                        return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
+                    }
+                    return kept;
+                }
+                return node;
+            }
+            if (node instanceof AST_Defun && node !== self) {
                 const def = node.name.definition();
                 const keep = def.global && !drop_funcs || in_use_ids.has(def.id);
                 if (!keep) {
-                    // Class "extends" and static blocks may have side effects
-                    if (node instanceof AST_Class) {
-                        const kept = node.drop_side_effect_free(compressor);
-                        if (kept !== node) {
-                            def.eliminated++;
-                            if (kept) return kept;
-                            return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
-                        } else {
-                            return kept;
-                        }
-                    }
                     def.eliminated++;
                     return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
                 }

package/lib/compress/drop-unused.js

@@ -273,21 +273,24 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                     }
                 }
             }
-            if ((node instanceof AST_Defun || node instanceof AST_DefClass) && node !== self) {
+            if (node instanceof AST_DefClass && node !== self) {
+                const def = node.name.definition();
+                descend(node, this);
+                const keep_class = def.global && !drop_funcs || in_use_ids.has(def.id);
+                if (!keep_class) {
+                    const kept = node.drop_side_effect_free(compressor);
+                    if (kept == null) {
+                        def.eliminated++;
+                        return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
+                    }
+                    return kept;
+                }
+                return node;
+            }
+            if (node instanceof AST_Defun && node !== self) {
                 const def = node.name.definition();
                 const keep = def.global && !drop_funcs || in_use_ids.has(def.id);
                 if (!keep) {
-                    // Class "extends" and static blocks may have side effects
-                    if (node instanceof AST_Class) {
-                        const kept = node.drop_side_effect_free(compressor);
-                        if (kept !== node) {
-                            def.eliminated++;
-                            if (kept) return kept;
-                            return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
-                        } else {
-                            return kept;
-                        }
-                    }
                     def.eliminated++;
                     return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
                 }

package/lib/output.js

@@ -190,6 +190,18 @@ class Rope {
         this.current += str;
     }
 
+    endsWith(str) {
+        const { committed, current } = this;
+        const len = str.length;
+        if (committed.length >= len) {
+            return committed.slice(committed.length - str.length) === str;
+        } else {
+            // `str` is small and this is a rare case so keep it simple
+            const last_bit = committed.slice(-len) + current;
+            return last_bit.endsWith(str);
+        }
+    }
+
     insertAt(char, index) {
         const { committed, current } = this;
         if (index < committed.length) {
@@ -398,10 +410,12 @@ function OutputStream(options) {
         mappings.forEach(function(mapping) {
             try {
                 let { name, token } = mapping;
-                if (token.type == "name" || token.type === "privatename") {
-                    name = token.value;
-                } else if (name instanceof AST_Symbol) {
-                    name = token.type === "string" ? token.value : name.name;
+                if (name !== false) {
+                    if (token.type == "name" || token.type === "privatename") {
+                        name = token.value;
+                    } else if (name instanceof AST_Symbol) {
+                        name = token.type === "string" ? token.value : name.name;
+                    }
                 }
                 options.source_map.add(
                     mapping.token.file,
@@ -569,6 +583,10 @@ function OutputStream(options) {
         might_need_semicolon = true;
     };
 
+    function ends_with(str) {
+        return OUTPUT.endsWith(str);
+    }
+
     function force_semicolon() {
         might_need_semicolon = false;
         print(";");
@@ -838,6 +856,7 @@ function OutputStream(options) {
         comma           : comma,
         colon           : colon,
         last            : function() { return last; },
+        ends_with       : ends_with,
         semicolon       : semicolon,
         force_semicolon : force_semicolon,
         to_utf8         : to_utf8,
@@ -1961,6 +1980,9 @@ function OutputStream(options) {
     });
     DEFPRINT(AST_UnaryPrefix, function(self, output) {
         var op = self.operator;
+        if (op === "--" && output.ends_with("<!")) {
+            output.print(" ");
+        }
         output.print(op);
         if (/^[a-z]/i.test(op)
             || (/[+-]$/.test(op)
@@ -1978,8 +2000,7 @@ function OutputStream(options) {
         var op = self.operator;
         self.left.print(output);
         if (op[0] == ">" /* ">>" ">>>" ">" ">=" */
-            && self.left instanceof AST_UnaryPostfix
-            && self.left.operator == "--") {
+            && output.ends_with("--")) {
             // space is mandatory to avoid outputting -->
             output.print(" ");
         } else {
@@ -1987,17 +2008,7 @@ function OutputStream(options) {
             output.space();
         }
         output.print(op);
-        if ((op == "<" || op == "<<")
-            && self.right instanceof AST_UnaryPrefix
-            && self.right.operator == "!"
-            && self.right.expression instanceof AST_UnaryPrefix
-            && self.right.expression.operator == "--") {
-            // space is mandatory to avoid outputting <!--
-            output.print(" ");
-        } else {
-            // the space is optional depending on "beautify"
-            output.space();
-        }
+        output.space();
         self.right.print(output);
     });
     DEFPRINT(AST_Conditional, function(self, output) {
@@ -2210,6 +2221,7 @@ function OutputStream(options) {
         if (self.key instanceof AST_SymbolMethod) {
             if (is_private) output.print("#");
             print_property_name(self.key.name, self.quote, output);
+            self.key.add_source_map(output);
         } else {
             output.with_square(function() {
                 self.key.print(output);
@@ -2298,12 +2310,18 @@ function OutputStream(options) {
     });
 
     const r_slash_script = /(<\s*\/\s*script)/i;
+    const r_starts_with_script = /^\s*script/i;
     const slash_script_replace = (_, $1) => $1.replace("/", "\\/");
     DEFPRINT(AST_RegExp, function(self, output) {
         let { source, flags } = self.getValue();
         source = regexp_source_fix(source);
         flags = flags ? sort_regexp_flags(flags) : "";
+
+        // Avoid outputting end of script tag
         source = source.replace(r_slash_script, slash_script_replace);
+        if (r_starts_with_script.test(source) && output.ends_with("<")) {
+            output.print(" ");
+        }
 
         output.print(output.to_utf8(`/${source}/${flags}`, false, true));
 
@@ -2427,8 +2445,22 @@ function OutputStream(options) {
         AST_ObjectSetter,
         AST_PrivateGetter,
         AST_PrivateSetter,
+        AST_ConciseMethod,
+        AST_PrivateMethod,
     ], function(output) {
-        output.add_mapping(this.key.end, this.key.name);
+        output.add_mapping(this.start, false /*name handled below*/);
+    });
+
+    DEFMAP([
+        AST_SymbolMethod,
+        AST_SymbolPrivateProperty
+    ], function(output) {
+        const tok_type = this.end && this.end.type;
+        if (tok_type === "name" || tok_type === "privatename") {
+            output.add_mapping(this.end, this.name);
+        } else {
+            output.add_mapping(this.end);
+        }
     });
 
     DEFMAP([ AST_ObjectProperty ], function(output) {

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