terser 5.16.6 → 5.16.8

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v5.16.8
+
+ - Become even less conservative around function definitions for `reduce_vars`
+ - Fix parsing context of `import.meta` expressions such that method calls are allowed
+
 ## v5.16.7
 
  - Become less conservative with analyzing function definitions for `reduce_vars`

package/bin/terser.mjs

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+
+"use strict";
+
+import "../tools/exit.cjs";
+
+import fs from "fs";
+import path from "path";
+import program from "commander";
+
+import { run_cli } from "../lib/cli.js";
+
+const packageJson = {
+    name: "terser",
+    version: "experimental module CLI"
+};
+
+run_cli({ program, packageJson, fs, path }).catch((error) => {
+    console.error(error);
+    process.exitCode = 1;
+});

package/dist/bundle.min.js

@@ -2451,7 +2451,7 @@ function parse($TEXT, options) {
             return new_(allow_calls);
         }
         if (is("name", "import") && is_token(peek(), "punc", ".")) {
-            return import_meta();
+            return import_meta(allow_calls);
         }
         var start = S.token;
         var peeked;
@@ -2944,7 +2944,7 @@ function parse($TEXT, options) {
         });
     }
 
-    function import_meta() {
+    function import_meta(allow_calls) {
         var start = S.token;
         expect_token("name", "import");
         expect_token("punc", ".");
@@ -2952,7 +2952,7 @@ function parse($TEXT, options) {
         return subscripts(new AST_ImportMeta({
             start: start,
             end: prev()
-        }), false);
+        }), allow_calls);
     }
 
     function map_name(is_import) {
@@ -3850,21 +3850,8 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", function AST_Simple
 
 function walk_body(node, visitor) {
     const body = node.body;
-    if (visitor.walk_defun_first) {
-        for (var i = 0, len = body.length; i < len; i++) {
-            if (body[i] instanceof AST_Defun) {
-                body[i]._walk(visitor);
-            }
-        }
-        for (var i = 0, len = body.length; i < len; i++) {
-            if (!(body[i] instanceof AST_Defun)) {
-                body[i]._walk(visitor);
-            }
-        }
-    } else {
-        for (var i = 0, len = body.length; i < len; i++) {
-            body[i]._walk(visitor);
-        }
+    for (var i = 0, len = body.length; i < len; i++) {
+        body[i]._walk(visitor);
     }
 }
 
@@ -6643,11 +6630,10 @@ const walk_abort = Symbol("abort walk");
 /* -----[ TreeWalker ]----- */
 
 class TreeWalker {
-    constructor(callback, { walk_defun_first = false } = {}) {
+    constructor(callback) {
         this.visit = callback;
         this.stack = [];
         this.directives = Object.create(null);
-        this.walk_defun_first = walk_defun_first;
     }
 
     _visit(node, descend) {
@@ -15723,9 +15709,7 @@ def_reduce_vars(AST_Default, function(tw, descend) {
 
 function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
-
     push(tw);
-
     reset_variables(tw, compressor, this);
 
     var iife;
@@ -15760,9 +15744,86 @@ 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 = ...`
+            // Because `used_in_defun` can no longer be fixed
+            let found_defun = false;
+            let found_def_after_defun = false;
+            walk(parent, node => {
+                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;
+                    }
+                }
+            });
+
+            if (found_def_after_defun) {
+                def.fixed = false;
+            }
+        }
+    }
+}
+
 def_reduce_vars(AST_Lambda, mark_lambda);
 
 def_reduce_vars(AST_Do, function(tw, descend, compressor) {
@@ -15883,6 +15944,9 @@ 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) {
@@ -18258,7 +18322,7 @@ AST_Toplevel.DEFMETHOD("reset_opt_flags", function(compressor) {
             }
             return node.reduce_vars(preparation, descend, compressor);
         }
-    }, { walk_defun_first: true });
+    });
     // Stack of look-up tables to keep track of whether a `SymbolDef` has been
     // properly assigned before use:
     // - `push()` & `pop()` when visiting conditional branches

package/lib/ast.js

@@ -249,21 +249,8 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", function AST_Simple
 
 function walk_body(node, visitor) {
     const body = node.body;
-    if (visitor.walk_defun_first) {
-        for (var i = 0, len = body.length; i < len; i++) {
-            if (body[i] instanceof AST_Defun) {
-                body[i]._walk(visitor);
-            }
-        }
-        for (var i = 0, len = body.length; i < len; i++) {
-            if (!(body[i] instanceof AST_Defun)) {
-                body[i]._walk(visitor);
-            }
-        }
-    } else {
-        for (var i = 0, len = body.length; i < len; i++) {
-            body[i]._walk(visitor);
-        }
+    for (var i = 0, len = body.length; i < len; i++) {
+        body[i]._walk(visitor);
     }
 }
 
@@ -3042,11 +3029,10 @@ const walk_abort = Symbol("abort walk");
 /* -----[ TreeWalker ]----- */
 
 class TreeWalker {
-    constructor(callback, { walk_defun_first = false } = {}) {
+    constructor(callback) {
         this.visit = callback;
         this.stack = [];
         this.directives = Object.create(null);
-        this.walk_defun_first = walk_defun_first;
     }
 
     _visit(node, descend) {

package/lib/compress/index.js

@@ -539,7 +539,7 @@ AST_Toplevel.DEFMETHOD("reset_opt_flags", function(compressor) {
             }
             return node.reduce_vars(preparation, descend, compressor);
         }
-    }, { walk_defun_first: true });
+    });
     // Stack of look-up tables to keep track of whether a `SymbolDef` has been
     // properly assigned before use:
     // - `push()` & `pop()` when visiting conditional branches

package/lib/compress/reduce-vars.js

@@ -71,6 +71,7 @@ import {
     AST_Number,
     AST_ObjectKeyVal,
     AST_PropAccess,
+    AST_Scope,
     AST_Sequence,
     AST_SimpleStatement,
     AST_Symbol,
@@ -91,6 +92,7 @@ import {
     AST_Yield,
 
     walk,
+    walk_abort,
     walk_body,
 
     _INLINE,
@@ -447,9 +449,7 @@ def_reduce_vars(AST_Default, function(tw, descend) {
 
 function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
-
     push(tw);
-
     reset_variables(tw, compressor, this);
 
     var iife;
@@ -484,9 +484,86 @@ 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 = ...`
+            // Because `used_in_defun` can no longer be fixed
+            let found_defun = false;
+            let found_def_after_defun = false;
+            walk(parent, node => {
+                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;
+                    }
+                }
+            });
+
+            if (found_def_after_defun) {
+                def.fixed = false;
+            }
+        }
+    }
+}
+
 def_reduce_vars(AST_Lambda, mark_lambda);
 
 def_reduce_vars(AST_Do, function(tw, descend, compressor) {
@@ -607,6 +684,9 @@ 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) {

package/lib/parse.js

@@ -2308,7 +2308,7 @@ function parse($TEXT, options) {
             return new_(allow_calls);
         }
         if (is("name", "import") && is_token(peek(), "punc", ".")) {
-            return import_meta();
+            return import_meta(allow_calls);
         }
         var start = S.token;
         var peeked;
@@ -2801,7 +2801,7 @@ function parse($TEXT, options) {
         });
     }
 
-    function import_meta() {
+    function import_meta(allow_calls) {
         var start = S.token;
         expect_token("name", "import");
         expect_token("punc", ".");
@@ -2809,7 +2809,7 @@ function parse($TEXT, options) {
         return subscripts(new AST_ImportMeta({
             start: start,
             end: prev()
-        }), false);
+        }), allow_calls);
     }
 
     function map_name(is_import) {

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