terser 5.16.5 → 5.16.8

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 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`
+ - 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,8 +2450,8 @@ function parse($TEXT, options) {
         if (is("operator", "new")) {
             return new_(allow_calls);
         }
-        if (is("operator", "import")) {
-            return import_meta();
+        if (is("name", "import") && is_token(peek(), "punc", ".")) {
+            return import_meta(allow_calls);
         }
         var start = S.token;
         var peeked;
@@ -2944,15 +2944,15 @@ function parse($TEXT, options) {
         });
     }
 
-    function import_meta() {
+    function import_meta(allow_calls) {
         var start = S.token;
-        expect_token("operator", "import");
+        expect_token("name", "import");
         expect_token("punc", ".");
         expect_token("name", "meta");
         return subscripts(new AST_ImportMeta({
             start: start,
             end: prev()
-        }), false);
+        }), allow_calls);
     }
 
     function map_name(is_import) {
@@ -13489,6 +13489,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 +13593,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 +13957,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);
 });
@@ -15702,17 +15709,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);
 
     var iife;
@@ -15743,17 +15740,90 @@ function mark_lambda(tw, descend, compressor) {
             }
         });
     }
+
     descend();
+    pop(tw);
 
-    if (previous_safe_ids) {
-        tw.safe_ids = previous_safe_ids;
-    } else {
-        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) {
@@ -15874,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) {

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

@@ -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,17 +449,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);
 
     var iife;
@@ -488,17 +480,90 @@ function mark_lambda(tw, descend, compressor) {
             }
         });
     }
+
     descend();
+    pop(tw);
 
-    if (previous_safe_ids) {
-        tw.safe_ids = previous_safe_ids;
-    } else {
-        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) {
@@ -619,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

@@ -2307,8 +2307,8 @@ function parse($TEXT, options) {
         if (is("operator", "new")) {
             return new_(allow_calls);
         }
-        if (is("operator", "import")) {
-            return import_meta();
+        if (is("name", "import") && is_token(peek(), "punc", ".")) {
+            return import_meta(allow_calls);
         }
         var start = S.token;
         var peeked;
@@ -2801,15 +2801,15 @@ function parse($TEXT, options) {
         });
     }
 
-    function import_meta() {
+    function import_meta(allow_calls) {
         var start = S.token;
-        expect_token("operator", "import");
+        expect_token("name", "import");
         expect_token("punc", ".");
         expect_token("name", "meta");
         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.5",
+  "version": "5.16.8",
   "engines": {
     "node": ">=10"
   },