terser 5.16.5 → 5.16.6

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v5.16.7
+
+ - Become less conservative with analyzing function definitions for `reduce_vars`
+ - Parse `import.meta` as a real AST node and not an `object.property`
+
 ## v5.16.5
 
  - Correctly handle AST transform functions that mutate children arrays

package/dist/bundle.min.js

@@ -2450,7 +2450,7 @@ function parse($TEXT, options) {
         if (is("operator", "new")) {
             return new_(allow_calls);
         }
-        if (is("operator", "import")) {
+        if (is("name", "import") && is_token(peek(), "punc", ".")) {
             return import_meta();
         }
         var start = S.token;
@@ -2946,7 +2946,7 @@ function parse($TEXT, options) {
 
     function import_meta() {
         var start = S.token;
-        expect_token("operator", "import");
+        expect_token("name", "import");
         expect_token("punc", ".");
         expect_token("name", "meta");
         return subscripts(new AST_ImportMeta({
@@ -3850,8 +3850,21 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", function AST_Simple
 
 function walk_body(node, visitor) {
     const body = node.body;
-    for (var i = 0, len = body.length; i < len; i++) {
-        body[i]._walk(visitor);
+    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);
+        }
     }
 }
 
@@ -6630,10 +6643,11 @@ const walk_abort = Symbol("abort walk");
 /* -----[ TreeWalker ]----- */
 
 class TreeWalker {
-    constructor(callback) {
+    constructor(callback, { walk_defun_first = false } = {}) {
         this.visit = callback;
         this.stack = [];
         this.directives = Object.create(null);
+        this.walk_defun_first = walk_defun_first;
     }
 
     _visit(node, descend) {
@@ -13489,6 +13503,7 @@ function is_nullish(node, compressor) {
             || this.body && this.body.has_side_effects(compressor)
             || this.alternative && this.alternative.has_side_effects(compressor);
     });
+    def_has_side_effects(AST_ImportMeta, return_false);
     def_has_side_effects(AST_LabeledStatement, function(compressor) {
         return this.body.has_side_effects(compressor);
     });
@@ -13592,6 +13607,7 @@ function is_nullish(node, compressor) {
     def_may_throw(AST_Lambda, return_false);
     def_may_throw(AST_SymbolDeclaration, return_false);
     def_may_throw(AST_This, return_false);
+    def_may_throw(AST_ImportMeta, return_false);
 
     function any(list, compressor) {
         for (var i = list.length; --i >= 0;)
@@ -13955,6 +13971,11 @@ function is_lhs(node, parent) {
         var name = this.name + suffix;
         if (HOP(defines, name)) return to_node(defines[name], this);
     });
+    def_find_defs(AST_ImportMeta, function(compressor, suffix) {
+        var defines = compressor.option("global_defs");
+        var name = "import.meta" + suffix;
+        if (HOP(defines, name)) return to_node(defines[name], this);
+    });
 })(function(node, func) {
     node.DEFMETHOD("_find_defs", func);
 });
@@ -15703,15 +15724,7 @@ def_reduce_vars(AST_Default, function(tw, descend) {
 function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
 
-    // Sometimes we detach the lambda for safety, and instead of push()
-    // we go to an entirely fresh lineage of safe_ids.
-    let previous_safe_ids;
-    if (this instanceof AST_Defun || this.uses_arguments || this.pinned()) {
-        previous_safe_ids = tw.safe_ids;
-        tw.safe_ids = Object.create(null);
-    } else {
-        push(tw);
-    }
+    push(tw);
 
     reset_variables(tw, compressor, this);
 
@@ -15743,13 +15756,9 @@ function mark_lambda(tw, descend, compressor) {
             }
         });
     }
-    descend();
 
-    if (previous_safe_ids) {
-        tw.safe_ids = previous_safe_ids;
-    } else {
-        pop(tw);
-    }
+    descend();
+    pop(tw);
 
     return true;
 }
@@ -18249,7 +18258,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,8 +249,21 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", function AST_Simple
 
 function walk_body(node, visitor) {
     const body = node.body;
-    for (var i = 0, len = body.length; i < len; i++) {
-        body[i]._walk(visitor);
+    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);
+        }
     }
 }
 
@@ -3029,10 +3042,11 @@ const walk_abort = Symbol("abort walk");
 /* -----[ TreeWalker ]----- */
 
 class TreeWalker {
-    constructor(callback) {
+    constructor(callback, { walk_defun_first = false } = {}) {
         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/inference.js

@@ -67,6 +67,7 @@ import {
   AST_Function,
   AST_If,
   AST_Import,
+  AST_ImportMeta,
   AST_Jump,
   AST_LabeledStatement,
   AST_Lambda,
@@ -310,6 +311,7 @@ export function is_nullish(node, compressor) {
             || this.body && this.body.has_side_effects(compressor)
             || this.alternative && this.alternative.has_side_effects(compressor);
     });
+    def_has_side_effects(AST_ImportMeta, return_false);
     def_has_side_effects(AST_LabeledStatement, function(compressor) {
         return this.body.has_side_effects(compressor);
     });
@@ -413,6 +415,7 @@ export function is_nullish(node, compressor) {
     def_may_throw(AST_Lambda, return_false);
     def_may_throw(AST_SymbolDeclaration, return_false);
     def_may_throw(AST_This, return_false);
+    def_may_throw(AST_ImportMeta, return_false);
 
     function any(list, compressor) {
         for (var i = list.length; --i >= 0;)
@@ -776,6 +779,11 @@ export function is_lhs(node, parent) {
         var name = this.name + suffix;
         if (HOP(defines, name)) return to_node(defines[name], this);
     });
+    def_find_defs(AST_ImportMeta, function(compressor, suffix) {
+        var defines = compressor.option("global_defs");
+        var name = "import.meta" + suffix;
+        if (HOP(defines, name)) return to_node(defines[name], this);
+    });
 })(function(node, func) {
     node.DEFMETHOD("_find_defs", func);
 });

package/lib/compress/reduce-vars.js

@@ -448,15 +448,7 @@ def_reduce_vars(AST_Default, function(tw, descend) {
 function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
 
-    // Sometimes we detach the lambda for safety, and instead of push()
-    // we go to an entirely fresh lineage of safe_ids.
-    let previous_safe_ids;
-    if (this instanceof AST_Defun || this.uses_arguments || this.pinned()) {
-        previous_safe_ids = tw.safe_ids;
-        tw.safe_ids = Object.create(null);
-    } else {
-        push(tw);
-    }
+    push(tw);
 
     reset_variables(tw, compressor, this);
 
@@ -488,13 +480,9 @@ function mark_lambda(tw, descend, compressor) {
             }
         });
     }
-    descend();
 
-    if (previous_safe_ids) {
-        tw.safe_ids = previous_safe_ids;
-    } else {
-        pop(tw);
-    }
+    descend();
+    pop(tw);
 
     return true;
 }

package/lib/parse.js

@@ -2307,7 +2307,7 @@ function parse($TEXT, options) {
         if (is("operator", "new")) {
             return new_(allow_calls);
         }
-        if (is("operator", "import")) {
+        if (is("name", "import") && is_token(peek(), "punc", ".")) {
             return import_meta();
         }
         var start = S.token;
@@ -2803,7 +2803,7 @@ function parse($TEXT, options) {
 
     function import_meta() {
         var start = S.token;
-        expect_token("operator", "import");
+        expect_token("name", "import");
         expect_token("punc", ".");
         expect_token("name", "meta");
         return subscripts(new AST_ImportMeta({

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

package/bin/terser.mjs

@@ -1,21 +0,0 @@
-#!/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;
-});