terser 5.16.1 → 5.17.7

package/lib/compress/reduce-vars.js

@@ -71,11 +71,13 @@ import {
     AST_Number,
     AST_ObjectKeyVal,
     AST_PropAccess,
+    AST_Scope,
     AST_Sequence,
     AST_SimpleStatement,
     AST_Symbol,
     AST_SymbolCatch,
     AST_SymbolConst,
+    AST_SymbolDeclaration,
     AST_SymbolDefun,
     AST_SymbolFunarg,
     AST_SymbolLambda,
@@ -91,6 +93,8 @@ import {
     AST_Yield,
 
     walk,
+    walk_parent,
+    walk_abort,
     walk_body,
 
     _INLINE,
@@ -99,19 +103,21 @@ import {
 } from "../ast.js";
 import { HOP, make_node, noop } from "../utils/index.js";
 
-import { lazy_op, is_modified } from "./inference.js";
+import { lazy_op, is_modified, is_lhs } from "./inference.js";
 import { INLINED, clear_flag } from "./compressor-flags.js";
 import { read_property, has_break_or_continue, is_recursive_ref } from "./common.js";
 
-// Define the method AST_Node#reduce_vars, which goes through the AST in
-// execution order to perform basic flow analysis
-
+/**
+ * Define the method AST_Node#reduce_vars, which goes through the AST in
+ * execution order to perform basic flow analysis
+ */
 function def_reduce_vars(node, func) {
     node.DEFMETHOD("reduce_vars", func);
 }
 
 def_reduce_vars(AST_Node, noop);
 
+/** Clear definition properties */
 function reset_def(compressor, def) {
     def.assignments = 0;
     def.chained = false;
@@ -120,7 +126,10 @@ function reset_def(compressor, def) {
     def.recursive_refs = 0;
     def.references = [];
     def.single_use = undefined;
-    if (def.scope.pinned()) {
+    if (
+        def.scope.pinned()
+        || (def.orig[0] instanceof AST_SymbolFunarg && def.scope.uses_arguments)
+    ) {
         def.fixed = false;
     } else if (def.orig[0] instanceof AST_SymbolConst || !compressor.exposed(def)) {
         def.fixed = def.init;
@@ -444,13 +453,11 @@ function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
     push(tw);
     reset_variables(tw, compressor, this);
-    if (this.uses_arguments) {
-        descend();
-        pop(tw);
-        return;
-    }
+
     var iife;
     if (!this.name
+        && !this.uses_arguments
+        && !this.pinned()
         && (iife = tw.parent()) instanceof AST_Call
         && iife.expression === this
         && !iife.args.some(arg => arg instanceof AST_Expansion)
@@ -475,11 +482,101 @@ function mark_lambda(tw, descend, compressor) {
             }
         });
     }
+
     descend();
     pop(tw);
+
+    handle_defined_after_hoist(this);
+
     return true;
 }
 
+/**
+ * It's possible for a hoisted function to use something that's not defined yet. Example:
+ *
+ * hoisted();
+ * var defined_after = true;
+ * function hoisted() {
+ *   // use defined_after
+ * }
+ *
+ * This function is called on the parent to handle this issue.
+ */
+function handle_defined_after_hoist(parent) {
+    const defuns = [];
+    walk(parent, node => {
+        if (node === parent) return;
+        if (node instanceof AST_Defun) defuns.push(node);
+        if (
+            node instanceof AST_Scope
+            || node instanceof AST_SimpleStatement
+        ) return true;
+    });
+
+    for (const defun of defuns) {
+        const fname_def = defun.name.definition();
+        const found_self_ref_in_other_defuns = defuns.some(
+            d => d !== defun && d.enclosed.indexOf(fname_def) !== -1
+        );
+
+        for (const def of defun.enclosed) {
+            if (
+                def.fixed === false
+                || def === fname_def
+                || def.scope.get_defun_scope() !== parent
+            ) {
+                continue;
+            }
+
+            // defun is hoisted, so always safe
+            if (
+                def.assignments === 0
+                && def.orig.length === 1
+                && def.orig[0] instanceof AST_SymbolDefun
+            ) {
+                continue;
+            }
+
+            if (found_self_ref_in_other_defuns) {
+                def.fixed = false;
+                continue;
+            }
+
+            // Detect `call_defun(); var used_in_defun = X`
+            // Because `used_in_defun` is not certainly X when it's defined after.
+            let found_defun_ref = false;
+            let found_def_after_defun = false;
+            walk_parent(parent, (node, info) => {
+                if (node === defun) return true;
+
+                // Step 1: find `call_defun()` or other refs to the defun
+                if (
+                    !found_defun_ref
+                    && node.thedef === fname_def
+                    && node instanceof AST_Symbol
+                ) {
+                    found_defun_ref = true;
+                }
+
+                // Step 2: if Step 1 occurred, find a var the defun uses
+                if (
+                    found_defun_ref
+                    && node.thedef === def
+                    && (node instanceof AST_SymbolDeclaration
+                        || is_lhs(node, info))
+                ) {
+                    found_def_after_defun = true;
+                    return walk_abort;
+                }
+            });
+
+            if (found_def_after_defun) {
+                def.fixed = false;
+            }
+        }
+    }
+}
+
 def_reduce_vars(AST_Lambda, mark_lambda);
 
 def_reduce_vars(AST_Do, function(tw, descend, compressor) {
@@ -600,12 +697,15 @@ def_reduce_vars(AST_Toplevel, function(tw, descend, compressor) {
         reset_def(compressor, def);
     });
     reset_variables(tw, compressor, this);
+    descend();
+    handle_defined_after_hoist(this);
+    return true;
 });
 
 def_reduce_vars(AST_Try, function(tw, descend, compressor) {
     reset_block_variables(compressor, this);
     push(tw);
-    walk_body(this, tw);
+    this.body.walk(tw);
     pop(tw);
     if (this.bcatch) {
         push(tw);

package/lib/compress/tighten-body.js

@@ -52,7 +52,6 @@ import {
     AST_Break,
     AST_Call,
     AST_Case,
-    AST_Catch,
     AST_Chain,
     AST_Class,
     AST_Conditional,
@@ -71,7 +70,6 @@ import {
     AST_Exit,
     AST_Expansion,
     AST_Export,
-    AST_Finally,
     AST_For,
     AST_ForIn,
     AST_If,
@@ -103,6 +101,7 @@ import {
     AST_SymbolVar,
     AST_This,
     AST_Try,
+    AST_TryBlock,
     AST_Unary,
     AST_UnaryPostfix,
     AST_UnaryPrefix,
@@ -171,12 +170,31 @@ function is_lhs_read_only(lhs) {
     return false;
 }
 
-// Remove code which we know is unreachable.
+/** var a = 1 --> var a*/
+function remove_initializers(var_statement) {
+    var decls = [];
+    var_statement.definitions.forEach(function(def) {
+        if (def.name instanceof AST_SymbolDeclaration) {
+            def.value = null;
+            decls.push(def);
+        } else {
+            def.declarations_as_names().forEach(name => {
+                decls.push(make_node(AST_VarDef, def, {
+                    name,
+                    value: null
+                }));
+            });
+        }
+    });
+    return decls.length ? make_node(AST_Var, var_statement, { definitions: decls }) : null;
+}
+
+/** Called on code which we know is unreachable, to keep elements that affect outside of it. */
 export function trim_unreachable_code(compressor, stat, target) {
     walk(stat, node => {
         if (node instanceof AST_Var) {
-            node.remove_initializers();
-            target.push(node);
+            const no_initializers = remove_initializers(node);
+            if (no_initializers) target.push(no_initializers);
             return true;
         }
         if (
@@ -234,13 +252,11 @@ export function tighten_body(statements, compressor) {
     function find_loop_scope_try() {
         var node = compressor.self(), level = 0, in_loop = false, in_try = false;
         do {
-            if (node instanceof AST_Catch || node instanceof AST_Finally) {
-                level++;
-            } else if (node instanceof AST_IterationStatement) {
+            if (node instanceof AST_IterationStatement) {
                 in_loop = true;
             } else if (node instanceof AST_Scope) {
                 break;
-            } else if (node instanceof AST_Try) {
+            } else if (node instanceof AST_TryBlock) {
                 in_try = true;
             }
         } while (node = compressor.parent(level++));
@@ -284,6 +300,9 @@ export function tighten_body(statements, compressor) {
                     && (node.logical || node.operator != "=" && lhs.equivalent_to(node.left))
                 || node instanceof AST_Await
                 || node instanceof AST_Call && lhs instanceof AST_PropAccess && lhs.equivalent_to(node.expression)
+                ||
+                    (node instanceof AST_Call || node instanceof AST_PropAccess)
+                    && node.optional
                 || node instanceof AST_Debugger
                 || node instanceof AST_Destructuring
                 || node instanceof AST_Expansion
@@ -457,7 +476,11 @@ export function tighten_body(statements, compressor) {
                 var hit = funarg;
                 var abort = false, replaced = 0, can_replace = !args || !hit;
                 if (!can_replace) {
-                    for (var j = compressor.self().argnames.lastIndexOf(candidate.name) + 1; !abort && j < args.length; j++) {
+                    for (
+                        let j = compressor.self().argnames.lastIndexOf(candidate.name) + 1;
+                        !abort && j < args.length;
+                        j++
+                    ) {
                         args[j].transform(scanner);
                     }
                     can_replace = true;
@@ -979,27 +1002,34 @@ export function tighten_body(statements, compressor) {
             }
 
             if (stat instanceof AST_If) {
-                var ab = aborts(stat.body);
-                if (can_merge_flow(ab)) {
+                let ab, new_else;
+
+                ab = aborts(stat.body);
+                if (
+                    can_merge_flow(ab)
+                    && (new_else = as_statement_array_with_return(stat.body, ab))
+                ) {
                     if (ab.label) {
                         remove(ab.label.thedef.references, ab);
                     }
                     CHANGED = true;
                     stat = stat.clone();
                     stat.condition = stat.condition.negate(compressor);
-                    var body = as_statement_array_with_return(stat.body, ab);
                     stat.body = make_node(AST_BlockStatement, stat, {
                         body: as_statement_array(stat.alternative).concat(extract_functions())
                     });
                     stat.alternative = make_node(AST_BlockStatement, stat, {
-                        body: body
+                        body: new_else
                     });
                     statements[i] = stat.transform(compressor);
                     continue;
                 }
 
-                var ab = aborts(stat.alternative);
-                if (can_merge_flow(ab)) {
+                ab = aborts(stat.alternative);
+                if (
+                    can_merge_flow(ab)
+                    && (new_else = as_statement_array_with_return(stat.alternative, ab))
+                ) {
                     if (ab.label) {
                         remove(ab.label.thedef.references, ab);
                     }
@@ -1008,9 +1038,8 @@ export function tighten_body(statements, compressor) {
                     stat.body = make_node(AST_BlockStatement, stat.body, {
                         body: as_statement_array(stat.body).concat(extract_functions())
                     });
-                    var body = as_statement_array_with_return(stat.alternative, ab);
                     stat.alternative = make_node(AST_BlockStatement, stat.alternative, {
-                        body: body
+                        body: new_else
                     });
                     statements[i] = stat.transform(compressor);
                     continue;
@@ -1125,7 +1154,11 @@ export function tighten_body(statements, compressor) {
         }
 
         function as_statement_array_with_return(node, ab) {
-            var body = as_statement_array(node).slice(0, -1);
+            var body = as_statement_array(node);
+            if (ab !== body[body.length - 1]) {
+                return undefined;
+            }
+            body = body.slice(0, -1);
             if (ab.value) {
                 body.push(make_node(AST_SimpleStatement, ab.value, {
                     body: ab.value.expression
@@ -1404,14 +1437,21 @@ export function tighten_body(statements, compressor) {
                     CHANGED = true;
                     stat.init = exprs.length ? make_sequence(stat.init, exprs) : null;
                     statements[++j] = stat;
-                } else if (prev instanceof AST_Var && (!stat.init || stat.init.TYPE == prev.TYPE)) {
+                } else if (
+                    prev instanceof AST_Var
+                    && (!stat.init || stat.init.TYPE == prev.TYPE)
+                ) {
                     if (stat.init) {
                         prev.definitions = prev.definitions.concat(stat.init.definitions);
                     }
                     stat.init = prev;
                     statements[j] = stat;
                     CHANGED = true;
-                } else if (defs && stat.init && defs.TYPE == stat.init.TYPE && declarations_only(stat.init)) {
+                } else if (
+                    defs instanceof AST_Var
+                    && stat.init instanceof AST_Var
+                    && declarations_only(stat.init)
+                ) {
                     defs.definitions = defs.definitions.concat(stat.init.definitions);
                     stat.init = null;
                     statements[++j] = stat;

package/lib/equivalent-to.js

@@ -172,7 +172,7 @@ AST_Switch.prototype.shallow_cmp = pass_through;
 AST_SwitchBranch.prototype.shallow_cmp = pass_through;
 
 AST_Try.prototype.shallow_cmp = function(other) {
-    return (this.bcatch == null ? other.bcatch == null : this.bcatch === other.bcatch) && (this.bfinally == null ? other.bfinally == null : this.bfinally === other.bfinally);
+    return (this.body === other.body) && (this.bcatch == null ? other.bcatch == null : this.bcatch === other.bcatch) && (this.bfinally == null ? other.bfinally == null : this.bfinally === other.bfinally);
 };
 
 AST_Catch.prototype.shallow_cmp = function(other) {

package/lib/minify.js

@@ -19,12 +19,15 @@ import {
     reserve_quoted_keys,
 } from "./propmangle.js";
 
-var to_ascii = typeof atob == "undefined" ? function(b64) {
-    return Buffer.from(b64, "base64").toString();
-} : atob;
-var to_base64 = typeof btoa == "undefined" ? function(str) {
-    return Buffer.from(str).toString("base64");
-} : btoa;
+// to/from base64 functions
+// Prefer built-in Buffer, if available, then use hack
+// https://developer.mozilla.org/en-US/docs/Glossary/Base64#The_Unicode_Problem
+var to_ascii = typeof Buffer !== "undefined"
+    ? (b64) => Buffer.from(b64, "base64").toString()
+    : (b64) => decodeURIComponent(escape(atob(b64)));
+var to_base64 = typeof Buffer !== "undefined"
+    ? (str) => Buffer.from(str).toString("base64")
+    : (str) => btoa(unescape(encodeURIComponent(str)));
 
 function read_source_map(code) {
     var match = /(?:^|[^.])\/\/# sourceMappingURL=data:application\/json(;[\w=-]*)?;base64,([+/0-9A-Za-z]*=*)\s*$/.exec(code);
@@ -277,10 +280,13 @@ async function minify(files, options, _fs_module) {
     if (options.format.spidermonkey) {
         result.ast = toplevel.to_mozilla_ast();
     }
+    let format_options;
     if (!HOP(options.format, "code") || options.format.code) {
-        if (!options.format.ast) {
+        // Make a shallow copy so that we can modify without mutating the user's input.
+        format_options = {...options.format};
+        if (!format_options.ast) {
             // Destroy stuff to save RAM. (unless the deprecated `ast` option is on)
-            options.format._destroy_ast = true;
+            format_options._destroy_ast = true;
 
             walk(toplevel, node => {
                 if (node instanceof AST_Scope) {
@@ -300,17 +306,17 @@ async function minify(files, options, _fs_module) {
             if (options.sourceMap.includeSources && files instanceof AST_Toplevel) {
                 throw new Error("original source content unavailable");
             }
-            options.format.source_map = await SourceMap({
+            format_options.source_map = await SourceMap({
                 file: options.sourceMap.filename,
                 orig: options.sourceMap.content,
                 root: options.sourceMap.root,
                 files: options.sourceMap.includeSources ? files : null,
             });
         }
-        delete options.format.ast;
-        delete options.format.code;
-        delete options.format.spidermonkey;
-        var stream = OutputStream(options.format);
+        delete format_options.ast;
+        delete format_options.code;
+        delete format_options.spidermonkey;
+        var stream = OutputStream(format_options);
         toplevel.print(stream);
         result.code = stream.get();
         if (options.sourceMap) {
@@ -318,7 +324,7 @@ async function minify(files, options, _fs_module) {
                 configurable: true,
                 enumerable: true,
                 get() {
-                    const map = options.format.source_map.getEncoded();
+                    const map = format_options.source_map.getEncoded();
                     return (result.map = options.sourceMap.asObject ? map : JSON.stringify(map));
                 },
                 set(value) {
@@ -328,7 +334,7 @@ async function minify(files, options, _fs_module) {
                     });
                 }
             });
-            result.decoded_map = options.format.source_map.getDecoded();
+            result.decoded_map = format_options.source_map.getDecoded();
             if (options.sourceMap.url == "inline") {
                 var sourceMap = typeof result.map === "object" ? JSON.stringify(result.map) : result.map;
                 result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(sourceMap);
@@ -343,8 +349,8 @@ async function minify(files, options, _fs_module) {
             options.nameCache.props = cache_to_json(options.mangle.properties.cache);
         }
     }
-    if (options.format && options.format.source_map) {
-        options.format.source_map.destroy();
+    if (format_options && format_options.source_map) {
+        format_options.source_map.destroy();
     }
     if (timings) {
         timings.end = Date.now();