terser 5.17.1 → 5.17.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v5.17.2
+ - Be less conservative when detecting use-before-definition of `var` in hoisted functions.
+ - Support unusual (but perfectly valid) initializers of for-in and for-of loops.
+ - Fix issue where hoisted function would be dropped if it was after a `continue` statement
+
 ## v5.17.1
  - Fix evaluating `.length` when the source array might've been mutated
 

package/dist/bundle.min.js

@@ -13918,6 +13918,7 @@ function is_nullish(node, compressor) {
 function is_lhs(node, parent) {
     if (parent instanceof AST_Unary && unary_side_effects.has(parent.operator)) return parent.expression;
     if (parent instanceof AST_Assign && parent.left === node) return node;
+    if (parent instanceof AST_ForIn && parent.init === node) return node;
 }
 
 (function(def_find_defs) {
@@ -15847,20 +15848,31 @@ function handle_defined_after_hoist(parent) {
                 continue;
             }
 
-            // Detect `call_defun(); var used_in_defun = ...`
-            // Because `used_in_defun` can no longer be fixed
-            let found_defun = false;
+            // 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, node => {
+            walk_parent(parent, (node, info) => {
                 if (node === defun) return true;
 
-                if (node instanceof AST_Symbol) {
-                    if (!found_defun && node.thedef === fname_def) {
-                        found_defun = true;
-                    } else if (found_defun && node.thedef === def) {
-                        found_def_after_defun = true;
-                        return walk_abort;
-                    }
+                // 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;
                 }
             });
 
@@ -16972,27 +16984,34 @@ 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);
                     }
@@ -17001,9 +17020,8 @@ 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;
@@ -17118,7 +17136,11 @@ 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

package/lib/compress/inference.js

@@ -64,6 +64,7 @@ import {
   AST_EmptyStatement,
   AST_Expansion,
   AST_False,
+  AST_ForIn,
   AST_Function,
   AST_If,
   AST_Import,
@@ -712,6 +713,7 @@ export function is_nullish(node, compressor) {
 export function is_lhs(node, parent) {
     if (parent instanceof AST_Unary && unary_side_effects.has(parent.operator)) return parent.expression;
     if (parent instanceof AST_Assign && parent.left === node) return node;
+    if (parent instanceof AST_ForIn && parent.init === node) return node;
 }
 
 (function(def_find_defs) {

package/lib/compress/reduce-vars.js

@@ -77,6 +77,7 @@ import {
     AST_Symbol,
     AST_SymbolCatch,
     AST_SymbolConst,
+    AST_SymbolDeclaration,
     AST_SymbolDefun,
     AST_SymbolFunarg,
     AST_SymbolLambda,
@@ -92,6 +93,7 @@ import {
     AST_Yield,
 
     walk,
+    walk_parent,
     walk_abort,
     walk_body,
 
@@ -101,7 +103,7 @@ 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";
 
@@ -540,20 +542,31 @@ function handle_defined_after_hoist(parent) {
                 continue;
             }
 
-            // Detect `call_defun(); var used_in_defun = ...`
-            // Because `used_in_defun` can no longer be fixed
-            let found_defun = false;
+            // 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, node => {
+            walk_parent(parent, (node, info) => {
                 if (node === defun) return true;
 
-                if (node instanceof AST_Symbol) {
-                    if (!found_defun && node.thedef === fname_def) {
-                        found_defun = true;
-                    } else if (found_defun && node.thedef === def) {
-                        found_def_after_defun = true;
-                        return walk_abort;
-                    }
+                // 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;
                 }
             });
 

package/lib/compress/tighten-body.js

@@ -1002,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);
                     }
@@ -1031,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;
@@ -1148,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

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