terser 5.7.0 → 5.7.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v5.7.1
+
+ - Avoided collapsing assignments together if it would place a chain assignment on the left hand side, which is invalid syntax (`a?.b = c`)
+ - Removed undefined from object expansions (`{ ...void 0 }` -> `{}`)
+ - Fix crash when checking if something is nullish or undefined (#1009)
+ - Fixed comparison of private class properties (#1015)
+ - Minor performance improvements (#993)
+ - Fixed scope of function defs in strict mode (they are block scoped)
+
 ## v5.7.0
 
  - Several compile-time evaluation and inlining fixes

package/dist/bundle.min.js

@@ -72,10 +72,8 @@ class DefaultsError extends Error {
 function defaults(args, defs, croak) {
     if (args === true) {
         args = {};
-    }
-
-    if (args != null && typeof args === "object") {
-        args = Object.assign({}, args);
+    } else if (args != null && typeof args === "object") {
+        args = {...args};
     }
 
     const ret = args || {};
@@ -3701,8 +3699,6 @@ function walk_body(node, visitor) {
 function clone_block_scope(deep) {
     var clone = this._clone(deep);
     if (this.block_scope) {
-        // TODO this is sometimes undefined during compression.
-        // But it should always have a value!
         clone.block_scope = this.block_scope.clone();
     }
     return clone;
@@ -3886,7 +3882,6 @@ var AST_Scope = DEFNODE("Scope", "variables functions uses_with uses_eval parent
     $documentation: "Base class for all statements introducing a lexical scope",
     $propdoc: {
         variables: "[Map/S] a map of name -> SymbolDef for all variables/functions defined in this scope",
-        functions: "[Map/S] like `variables`, but only lists function declarations",
         uses_with: "[boolean/S] tells whether this scope uses the `with` statement",
         uses_eval: "[boolean/S] tells whether this scope contains a direct call to the global `eval`",
         parent_scope: "[AST_Scope?/S] link to the parent scope",
@@ -3909,7 +3904,6 @@ var AST_Scope = DEFNODE("Scope", "variables functions uses_with uses_eval parent
             });
         } else {
             if (this.variables) node.variables = new Map(this.variables);
-            if (this.functions) node.functions = new Map(this.functions);
             if (this.enclosed) node.enclosed = this.enclosed.slice();
             if (this._block_scope) node._block_scope = this._block_scope;
         }
@@ -7097,11 +7091,15 @@ function OutputStream(options) {
     var do_add_mapping = mappings ? function() {
         mappings.forEach(function(mapping) {
             try {
+                let name = !mapping.name && mapping.token.type == "name" ? mapping.token.value : mapping.name;
+                if (name instanceof AST_Symbol) {
+                    name = name.name;
+                }
                 options.source_map.add(
                     mapping.token.file,
                     mapping.line, mapping.col,
                     mapping.token.line, mapping.token.col,
-                    !mapping.name && mapping.token.type == "name" ? mapping.token.value : mapping.name
+                    is_basic_identifier_string(name) ? name : undefined
                 );
             } catch(ex) {
                 // Ignore bad mapping
@@ -9196,6 +9194,10 @@ AST_Dot.prototype.shallow_cmp = mkshallow({
     property: "eq"
 });
 
+AST_DotHash.prototype.shallow_cmp = mkshallow({
+    property: "eq"
+});
+
 AST_Unary.prototype.shallow_cmp = mkshallow({
     operator: "eq"
 });
@@ -9501,7 +9503,14 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
             // scope when we encounter the AST_Defun node (which is
             // instanceof AST_Scope) but we get to the symbol a bit
             // later.
-            mark_export((node.scope = defun.parent_scope.get_defun_scope()).def_function(node, defun), 1);
+            const closest_scope = defun.parent_scope;
+
+            // In strict mode, function definitions are block-scoped
+            node.scope = tw.directives["use strict"]
+                ? closest_scope
+                : closest_scope.get_defun_scope();
+
+            mark_export(node.scope.def_function(node, defun), 1);
         } else if (node instanceof AST_SymbolClass) {
             mark_export(defun.def_variable(node, defun), 1);
         } else if (node instanceof AST_SymbolImport) {
@@ -9680,7 +9689,6 @@ AST_Toplevel.DEFMETHOD("def_global", function(node) {
 
 AST_Scope.DEFMETHOD("init_scope_vars", function(parent_scope) {
     this.variables = new Map();         // map name to AST_SymbolVar (variables defined in this scope; includes functions)
-    this.functions = new Map();         // map name to AST_SymbolDefun (functions defined in this scope)
     this.uses_with = false;             // will be set to true if this or some nested scope uses the `with` statement
     this.uses_eval = false;             // will be set to true if this or nested scope uses the global `eval`
     this.parent_scope = parent_scope;   // the parent scope
@@ -9843,7 +9851,6 @@ AST_Scope.DEFMETHOD("find_variable", function(name) {
 AST_Scope.DEFMETHOD("def_function", function(symbol, init) {
     var def = this.def_variable(symbol, init);
     if (!def.init || def.init instanceof AST_Defun) def.init = init;
-    this.functions.set(symbol.name, def);
     return def;
 });
 
@@ -11951,6 +11958,7 @@ function tighten_body(statements, compressor) {
             if (stop_after === node) abort = true;
             if (stop_if_hit === node) stop_if_hit = null;
         });
+
         var multi_replacer = new TreeTransformer(function(node) {
             if (abort) return node;
             // Skip nodes before `candidate` as quickly as possible
@@ -11973,6 +11981,7 @@ function tighten_body(statements, compressor) {
             // Skip (non-executed) functions and (leading) default case in switch statements
             if (node instanceof AST_Default || node instanceof AST_Scope) return node;
         });
+
         while (--stat_index >= 0) {
             // Treat parameters as collapsible in IIFE, i.e.
             //   function(a, b){ ... }(x());
@@ -12148,7 +12157,10 @@ function tighten_body(statements, compressor) {
         function extract_candidates(expr) {
             hit_stack.push(expr);
             if (expr instanceof AST_Assign) {
-                if (!expr.left.has_side_effects(compressor)) {
+                if (
+                    !expr.left.has_side_effects(compressor)
+                    && !(expr.right instanceof AST_Chain)
+                ) {
                     candidates.push(hit_stack.slice());
                 }
                 extract_candidates(expr.right);
@@ -12211,7 +12223,7 @@ function tighten_body(statements, compressor) {
                     candidates.push(hit_stack.slice());
                 }
             } else if (expr instanceof AST_VarDef) {
-                if (expr.value) {
+                if (expr.value && !(expr.value instanceof AST_Chain)) {
                     candidates.push(hit_stack.slice());
                     extract_candidates(expr.value);
                 }
@@ -13919,7 +13931,7 @@ const pure_prop_access_globals = new Set([
             || this.expression.has_side_effects(compressor);
     });
     def_has_side_effects(AST_Sub, function(compressor) {
-        if (this.optional && is_nullish(this.expression)) {
+        if (this.optional && is_nullish(this.expression, compressor)) {
             return false;
         }
 
@@ -13989,7 +14001,7 @@ const pure_prop_access_globals = new Set([
         return any(this.body, compressor);
     });
     def_may_throw(AST_Call, function(compressor) {
-        if (this.optional && is_nullish(this.expression)) return false;
+        if (this.optional && is_nullish(this.expression, compressor)) return false;
         if (any(this.args, compressor)) return true;
         if (this.is_callee_pure(compressor)) return false;
         if (this.expression.may_throw(compressor)) return true;
@@ -14052,7 +14064,7 @@ const pure_prop_access_globals = new Set([
             || this.expression.may_throw(compressor);
     });
     def_may_throw(AST_Sub, function(compressor) {
-        if (this.optional && is_nullish(this.expression)) return false;
+        if (this.optional && is_nullish(this.expression, compressor)) return false;
 
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.may_throw(compressor)
@@ -14865,7 +14877,7 @@ AST_Scope.DEFMETHOD("hoist_properties", function(compressor) {
     def_drop_side_effect_free(AST_Constant, return_null);
     def_drop_side_effect_free(AST_This, return_null);
     def_drop_side_effect_free(AST_Call, function(compressor, first_in_statement) {
-        if (this.optional && is_nullish(this.expression)) {
+        if (this.optional && is_nullish(this.expression, compressor)) {
             return make_node(AST_Undefined, this);
         }
 
@@ -15012,7 +15024,7 @@ AST_Scope.DEFMETHOD("hoist_properties", function(compressor) {
     });
     def_drop_side_effect_free(AST_Dot, function(compressor, first_in_statement) {
         if (this.optional) {
-            return is_nullish(this.expression) ? make_node(AST_Undefined, this) : this;
+            return is_nullish(this.expression, compressor) ? make_node(AST_Undefined, this) : this;
         }
         if (this.expression.may_throw_on_access(compressor)) return this;
 
@@ -15020,7 +15032,7 @@ AST_Scope.DEFMETHOD("hoist_properties", function(compressor) {
     });
     def_drop_side_effect_free(AST_Sub, function(compressor, first_in_statement) {
         if (this.optional) {
-            return is_nullish(this.expression) ? make_node(AST_Undefined, this): this;
+            return is_nullish(this.expression, compressor) ? make_node(AST_Undefined, this): this;
         }
         if (this.expression.may_throw_on_access(compressor)) return this;
 
@@ -15545,11 +15557,11 @@ def_optimize(AST_Definitions, function(self) {
     return self;
 });
 
-def_optimize(AST_VarDef, function(self) {
+def_optimize(AST_VarDef, function(self, compressor) {
     if (
         self.name instanceof AST_SymbolLet
         && self.value != null
-        && is_undefined(self.value)
+        && is_undefined(self.value, compressor)
     ) {
         self.value = null;
     }
@@ -15587,7 +15599,7 @@ def_optimize(AST_Call, function(self, compressor) {
         }
     }
 
-    if (self.optional && is_nullish(fn)) {
+    if (self.optional && is_nullish(fn, compressor)) {
         return make_node(AST_Undefined, self);
     }
 
@@ -16613,7 +16625,7 @@ def_optimize(AST_Binary, function(self, compressor) {
             }
             break;
           case "??":
-            if (is_nullish(self.left)) {
+            if (is_nullish(self.left, compressor)) {
                 return self.right;
             }
 
@@ -17221,20 +17233,20 @@ def_optimize(AST_DefaultAssign, function(self, compressor) {
     return self;
 });
 
-function is_nullish(node) {
+function is_nullish(node, compressor) {
     let fixed;
     return (
         node instanceof AST_Null
-        || is_undefined(node)
+        || is_undefined(node, compressor)
         || (
             node instanceof AST_SymbolRef
             && (fixed = node.definition().fixed) instanceof AST_Node
-            && is_nullish(fixed)
+            && is_nullish(fixed, compressor)
         )
         // Recurse into those optional chains!
-        || node instanceof AST_PropAccess && node.optional && is_nullish(node.expression)
-        || node instanceof AST_Call && node.optional && is_nullish(node.expression)
-        || node instanceof AST_Chain && is_nullish(node.expression)
+        || node instanceof AST_PropAccess && node.optional && is_nullish(node.expression, compressor)
+        || node instanceof AST_Call && node.optional && is_nullish(node.expression, compressor)
+        || node instanceof AST_Chain && is_nullish(node.expression, compressor)
     );
 }
 
@@ -17249,8 +17261,8 @@ function is_nullish_check(check, check_subject, compressor) {
         && check.operator === "=="
         // which side is nullish?
         && (
-            (nullish_side = is_nullish(check.left) && check.left)
-            || (nullish_side = is_nullish(check.right) && check.right)
+            (nullish_side = is_nullish(check.left, compressor) && check.left)
+            || (nullish_side = is_nullish(check.right, compressor) && check.right)
         )
         // is the other side the same as the check_subject
         && (
@@ -17288,12 +17300,12 @@ function is_nullish_check(check, check_subject, compressor) {
                 null_cmp = cmp;
                 defined_side = cmp.left;
             }
-            if (is_undefined(cmp.left)) {
+            if (is_undefined(cmp.left, compressor)) {
                 found++;
                 undefined_cmp = cmp;
                 defined_side = cmp.right;
             }
-            if (is_undefined(cmp.right)) {
+            if (is_undefined(cmp.right, compressor)) {
                 found++;
                 undefined_cmp = cmp;
                 defined_side = cmp.left;
@@ -17794,7 +17806,7 @@ def_optimize(AST_Sub, function(self, compressor) {
         ev = make_node_from_constant(ev, self).optimize(compressor);
         return best_of(compressor, ev, self);
     }
-    if (self.optional && is_nullish(self.expression)) {
+    if (self.optional && is_nullish(self.expression, compressor)) {
         return make_node(AST_Undefined, self);
     }
     return self;
@@ -17868,7 +17880,7 @@ def_optimize(AST_Dot, function(self, compressor) {
         ev = make_node_from_constant(ev, self).optimize(compressor);
         return best_of(compressor, ev, self);
     }
-    if (self.optional && is_nullish(self.expression)) {
+    if (self.optional && is_nullish(self.expression, compressor)) {
         return make_node(AST_Undefined, self);
     }
     return self;
@@ -17912,7 +17924,7 @@ def_optimize(AST_Array, function(self, compressor) {
     return self;
 });
 
-function inline_object_prop_spread(props) {
+function inline_object_prop_spread(props, compressor) {
     for (var i = 0; i < props.length; i++) {
         var prop = props[i];
         if (prop instanceof AST_Expansion) {
@@ -17930,6 +17942,9 @@ function inline_object_prop_spread(props) {
                 // non-iterable value silently does nothing; it is thus safe
                 // to remove. AST_String is the only iterable AST_Constant.
                 props.splice(i, 1);
+            } else if (is_nullish(expr, compressor)) {
+                // Likewise, null and undefined can be silently removed.
+                props.splice(i, 1);
             }
         }
     }
@@ -17940,7 +17955,7 @@ def_optimize(AST_Object, function(self, compressor) {
     if (optimized !== self) {
         return optimized;
     }
-    inline_object_prop_spread(self.properties);
+    inline_object_prop_spread(self.properties, compressor);
     return self;
 });
 
@@ -18033,7 +18048,7 @@ def_optimize(AST_TemplateString, function(self, compressor) {
         && (
             segments[1].is_string(compressor)
             || segments[1].is_number(compressor)
-            || is_nullish(segments[1])
+            || is_nullish(segments[1], compressor)
             || compressor.option("unsafe")
         )
     ) {
@@ -26902,7 +26917,6 @@ async function run_cli({ program, packageJson, fs, path }) {
                   case "enclosed":
                     return value.length ? value.map(symdef) : undefined;
                   case "variables":
-                  case "functions":
                   case "globals":
                     return value.size ? collect_from_map(value, symdef) : undefined;
                 }
@@ -26915,7 +26929,6 @@ async function run_cli({ program, packageJson, fs, path }) {
                     };
                     if (value.block_scope) {
                         result.variables = value.block_scope.variables;
-                        result.functions = value.block_scope.functions;
                         result.enclosed = value.block_scope.enclosed;
                     }
                     value.CTOR.PROPS.forEach(function(prop) {

package/lib/ast.js

@@ -214,8 +214,6 @@ function walk_body(node, visitor) {
 function clone_block_scope(deep) {
     var clone = this._clone(deep);
     if (this.block_scope) {
-        // TODO this is sometimes undefined during compression.
-        // But it should always have a value!
         clone.block_scope = this.block_scope.clone();
     }
     return clone;
@@ -399,7 +397,6 @@ var AST_Scope = DEFNODE("Scope", "variables functions uses_with uses_eval parent
     $documentation: "Base class for all statements introducing a lexical scope",
     $propdoc: {
         variables: "[Map/S] a map of name -> SymbolDef for all variables/functions defined in this scope",
-        functions: "[Map/S] like `variables`, but only lists function declarations",
         uses_with: "[boolean/S] tells whether this scope uses the `with` statement",
         uses_eval: "[boolean/S] tells whether this scope contains a direct call to the global `eval`",
         parent_scope: "[AST_Scope?/S] link to the parent scope",
@@ -422,7 +419,6 @@ var AST_Scope = DEFNODE("Scope", "variables functions uses_with uses_eval parent
             });
         } else {
             if (this.variables) node.variables = new Map(this.variables);
-            if (this.functions) node.functions = new Map(this.functions);
             if (this.enclosed) node.enclosed = this.enclosed.slice();
             if (this._block_scope) node._block_scope = this._block_scope;
         }

package/lib/cli.js

@@ -264,7 +264,6 @@ export async function run_cli({ program, packageJson, fs, path }) {
                   case "enclosed":
                     return value.length ? value.map(symdef) : undefined;
                   case "variables":
-                  case "functions":
                   case "globals":
                     return value.size ? collect_from_map(value, symdef) : undefined;
                 }
@@ -277,7 +276,6 @@ export async function run_cli({ program, packageJson, fs, path }) {
                     };
                     if (value.block_scope) {
                         result.variables = value.block_scope.variables;
-                        result.functions = value.block_scope.functions;
                         result.enclosed = value.block_scope.enclosed;
                     }
                     value.CTOR.PROPS.forEach(function(prop) {

package/lib/compress/index.js

@@ -1508,6 +1508,7 @@ function tighten_body(statements, compressor) {
             if (stop_after === node) abort = true;
             if (stop_if_hit === node) stop_if_hit = null;
         });
+
         var multi_replacer = new TreeTransformer(function(node) {
             if (abort) return node;
             // Skip nodes before `candidate` as quickly as possible
@@ -1530,6 +1531,7 @@ function tighten_body(statements, compressor) {
             // Skip (non-executed) functions and (leading) default case in switch statements
             if (node instanceof AST_Default || node instanceof AST_Scope) return node;
         });
+
         while (--stat_index >= 0) {
             // Treat parameters as collapsible in IIFE, i.e.
             //   function(a, b){ ... }(x());
@@ -1705,7 +1707,10 @@ function tighten_body(statements, compressor) {
         function extract_candidates(expr) {
             hit_stack.push(expr);
             if (expr instanceof AST_Assign) {
-                if (!expr.left.has_side_effects(compressor)) {
+                if (
+                    !expr.left.has_side_effects(compressor)
+                    && !(expr.right instanceof AST_Chain)
+                ) {
                     candidates.push(hit_stack.slice());
                 }
                 extract_candidates(expr.right);
@@ -1768,7 +1773,7 @@ function tighten_body(statements, compressor) {
                     candidates.push(hit_stack.slice());
                 }
             } else if (expr instanceof AST_VarDef) {
-                if (expr.value) {
+                if (expr.value && !(expr.value instanceof AST_Chain)) {
                     candidates.push(hit_stack.slice());
                     extract_candidates(expr.value);
                 }
@@ -3476,7 +3481,7 @@ const pure_prop_access_globals = new Set([
             || this.expression.has_side_effects(compressor);
     });
     def_has_side_effects(AST_Sub, function(compressor) {
-        if (this.optional && is_nullish(this.expression)) {
+        if (this.optional && is_nullish(this.expression, compressor)) {
             return false;
         }
 
@@ -3546,7 +3551,7 @@ const pure_prop_access_globals = new Set([
         return any(this.body, compressor);
     });
     def_may_throw(AST_Call, function(compressor) {
-        if (this.optional && is_nullish(this.expression)) return false;
+        if (this.optional && is_nullish(this.expression, compressor)) return false;
         if (any(this.args, compressor)) return true;
         if (this.is_callee_pure(compressor)) return false;
         if (this.expression.may_throw(compressor)) return true;
@@ -3609,7 +3614,7 @@ const pure_prop_access_globals = new Set([
             || this.expression.may_throw(compressor);
     });
     def_may_throw(AST_Sub, function(compressor) {
-        if (this.optional && is_nullish(this.expression)) return false;
+        if (this.optional && is_nullish(this.expression, compressor)) return false;
 
         return !this.optional && this.expression.may_throw_on_access(compressor)
             || this.expression.may_throw(compressor)
@@ -4422,7 +4427,7 @@ AST_Scope.DEFMETHOD("hoist_properties", function(compressor) {
     def_drop_side_effect_free(AST_Constant, return_null);
     def_drop_side_effect_free(AST_This, return_null);
     def_drop_side_effect_free(AST_Call, function(compressor, first_in_statement) {
-        if (this.optional && is_nullish(this.expression)) {
+        if (this.optional && is_nullish(this.expression, compressor)) {
             return make_node(AST_Undefined, this);
         }
 
@@ -4569,7 +4574,7 @@ AST_Scope.DEFMETHOD("hoist_properties", function(compressor) {
     });
     def_drop_side_effect_free(AST_Dot, function(compressor, first_in_statement) {
         if (this.optional) {
-            return is_nullish(this.expression) ? make_node(AST_Undefined, this) : this;
+            return is_nullish(this.expression, compressor) ? make_node(AST_Undefined, this) : this;
         }
         if (this.expression.may_throw_on_access(compressor)) return this;
 
@@ -4577,7 +4582,7 @@ AST_Scope.DEFMETHOD("hoist_properties", function(compressor) {
     });
     def_drop_side_effect_free(AST_Sub, function(compressor, first_in_statement) {
         if (this.optional) {
-            return is_nullish(this.expression) ? make_node(AST_Undefined, this): this;
+            return is_nullish(this.expression, compressor) ? make_node(AST_Undefined, this): this;
         }
         if (this.expression.may_throw_on_access(compressor)) return this;
 
@@ -5102,11 +5107,11 @@ def_optimize(AST_Definitions, function(self) {
     return self;
 });
 
-def_optimize(AST_VarDef, function(self) {
+def_optimize(AST_VarDef, function(self, compressor) {
     if (
         self.name instanceof AST_SymbolLet
         && self.value != null
-        && is_undefined(self.value)
+        && is_undefined(self.value, compressor)
     ) {
         self.value = null;
     }
@@ -5144,7 +5149,7 @@ def_optimize(AST_Call, function(self, compressor) {
         }
     }
 
-    if (self.optional && is_nullish(fn)) {
+    if (self.optional && is_nullish(fn, compressor)) {
         return make_node(AST_Undefined, self);
     }
 
@@ -6170,7 +6175,7 @@ def_optimize(AST_Binary, function(self, compressor) {
             }
             break;
           case "??":
-            if (is_nullish(self.left)) {
+            if (is_nullish(self.left, compressor)) {
                 return self.right;
             }
 
@@ -6778,20 +6783,20 @@ def_optimize(AST_DefaultAssign, function(self, compressor) {
     return self;
 });
 
-function is_nullish(node) {
+function is_nullish(node, compressor) {
     let fixed;
     return (
         node instanceof AST_Null
-        || is_undefined(node)
+        || is_undefined(node, compressor)
         || (
             node instanceof AST_SymbolRef
             && (fixed = node.definition().fixed) instanceof AST_Node
-            && is_nullish(fixed)
+            && is_nullish(fixed, compressor)
         )
         // Recurse into those optional chains!
-        || node instanceof AST_PropAccess && node.optional && is_nullish(node.expression)
-        || node instanceof AST_Call && node.optional && is_nullish(node.expression)
-        || node instanceof AST_Chain && is_nullish(node.expression)
+        || node instanceof AST_PropAccess && node.optional && is_nullish(node.expression, compressor)
+        || node instanceof AST_Call && node.optional && is_nullish(node.expression, compressor)
+        || node instanceof AST_Chain && is_nullish(node.expression, compressor)
     );
 }
 
@@ -6806,8 +6811,8 @@ function is_nullish_check(check, check_subject, compressor) {
         && check.operator === "=="
         // which side is nullish?
         && (
-            (nullish_side = is_nullish(check.left) && check.left)
-            || (nullish_side = is_nullish(check.right) && check.right)
+            (nullish_side = is_nullish(check.left, compressor) && check.left)
+            || (nullish_side = is_nullish(check.right, compressor) && check.right)
         )
         // is the other side the same as the check_subject
         && (
@@ -6845,12 +6850,12 @@ function is_nullish_check(check, check_subject, compressor) {
                 null_cmp = cmp;
                 defined_side = cmp.left;
             }
-            if (is_undefined(cmp.left)) {
+            if (is_undefined(cmp.left, compressor)) {
                 found++;
                 undefined_cmp = cmp;
                 defined_side = cmp.right;
             }
-            if (is_undefined(cmp.right)) {
+            if (is_undefined(cmp.right, compressor)) {
                 found++;
                 undefined_cmp = cmp;
                 defined_side = cmp.left;
@@ -7351,7 +7356,7 @@ def_optimize(AST_Sub, function(self, compressor) {
         ev = make_node_from_constant(ev, self).optimize(compressor);
         return best_of(compressor, ev, self);
     }
-    if (self.optional && is_nullish(self.expression)) {
+    if (self.optional && is_nullish(self.expression, compressor)) {
         return make_node(AST_Undefined, self);
     }
     return self;
@@ -7425,7 +7430,7 @@ def_optimize(AST_Dot, function(self, compressor) {
         ev = make_node_from_constant(ev, self).optimize(compressor);
         return best_of(compressor, ev, self);
     }
-    if (self.optional && is_nullish(self.expression)) {
+    if (self.optional && is_nullish(self.expression, compressor)) {
         return make_node(AST_Undefined, self);
     }
     return self;
@@ -7469,7 +7474,7 @@ def_optimize(AST_Array, function(self, compressor) {
     return self;
 });
 
-function inline_object_prop_spread(props) {
+function inline_object_prop_spread(props, compressor) {
     for (var i = 0; i < props.length; i++) {
         var prop = props[i];
         if (prop instanceof AST_Expansion) {
@@ -7487,6 +7492,9 @@ function inline_object_prop_spread(props) {
                 // non-iterable value silently does nothing; it is thus safe
                 // to remove. AST_String is the only iterable AST_Constant.
                 props.splice(i, 1);
+            } else if (is_nullish(expr, compressor)) {
+                // Likewise, null and undefined can be silently removed.
+                props.splice(i, 1);
             }
         }
     }
@@ -7497,7 +7505,7 @@ def_optimize(AST_Object, function(self, compressor) {
     if (optimized !== self) {
         return optimized;
     }
-    inline_object_prop_spread(self.properties);
+    inline_object_prop_spread(self.properties, compressor);
     return self;
 });
 
@@ -7590,7 +7598,7 @@ def_optimize(AST_TemplateString, function(self, compressor) {
         && (
             segments[1].is_string(compressor)
             || segments[1].is_number(compressor)
-            || is_nullish(segments[1])
+            || is_nullish(segments[1], compressor)
             || compressor.option("unsafe")
         )
     ) {

package/lib/equivalent-to.js

@@ -18,6 +18,7 @@ import {
     AST_Directive,
     AST_Do,
     AST_Dot,
+    AST_DotHash,
     AST_EmptyStatement,
     AST_Expansion,
     AST_Export,
@@ -233,6 +234,10 @@ AST_Dot.prototype.shallow_cmp = mkshallow({
     property: "eq"
 });
 
+AST_DotHash.prototype.shallow_cmp = mkshallow({
+    property: "eq"
+});
+
 AST_Unary.prototype.shallow_cmp = mkshallow({
     operator: "eq"
 });

package/lib/output.js

@@ -349,11 +349,15 @@ function OutputStream(options) {
     var do_add_mapping = mappings ? function() {
         mappings.forEach(function(mapping) {
             try {
+                let name = !mapping.name && mapping.token.type == "name" ? mapping.token.value : mapping.name;
+                if (name instanceof AST_Symbol) {
+                    name = name.name;
+                }
                 options.source_map.add(
                     mapping.token.file,
                     mapping.line, mapping.col,
                     mapping.token.line, mapping.token.col,
-                    !mapping.name && mapping.token.type == "name" ? mapping.token.value : mapping.name
+                    is_basic_identifier_string(name) ? name : undefined
                 );
             } catch(ex) {
                 // Ignore bad mapping

package/lib/scope.js

@@ -299,7 +299,14 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
             // scope when we encounter the AST_Defun node (which is
             // instanceof AST_Scope) but we get to the symbol a bit
             // later.
-            mark_export((node.scope = defun.parent_scope.get_defun_scope()).def_function(node, defun), 1);
+            const closest_scope = defun.parent_scope;
+
+            // In strict mode, function definitions are block-scoped
+            node.scope = tw.directives["use strict"]
+                ? closest_scope
+                : closest_scope.get_defun_scope();
+
+            mark_export(node.scope.def_function(node, defun), 1);
         } else if (node instanceof AST_SymbolClass) {
             mark_export(defun.def_variable(node, defun), 1);
         } else if (node instanceof AST_SymbolImport) {
@@ -478,7 +485,6 @@ AST_Toplevel.DEFMETHOD("def_global", function(node) {
 
 AST_Scope.DEFMETHOD("init_scope_vars", function(parent_scope) {
     this.variables = new Map();         // map name to AST_SymbolVar (variables defined in this scope; includes functions)
-    this.functions = new Map();         // map name to AST_SymbolDefun (functions defined in this scope)
     this.uses_with = false;             // will be set to true if this or some nested scope uses the `with` statement
     this.uses_eval = false;             // will be set to true if this or nested scope uses the global `eval`
     this.parent_scope = parent_scope;   // the parent scope
@@ -641,7 +647,6 @@ AST_Scope.DEFMETHOD("find_variable", function(name) {
 AST_Scope.DEFMETHOD("def_function", function(symbol, init) {
     var def = this.def_variable(symbol, init);
     if (!def.init || def.init instanceof AST_Defun) def.init = init;
-    this.functions.set(symbol.name, def);
     return def;
 });
 

package/lib/utils/index.js

@@ -64,10 +64,8 @@ class DefaultsError extends Error {
 function defaults(args, defs, croak) {
     if (args === true) {
         args = {};
-    }
-
-    if (args != null && typeof args === "object") {
-        args = Object.assign({}, args);
+    } else if (args != null && typeof args === "object") {
+        args = {...args};
     }
 
     const ret = args || {};

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