terser 3.10.9 → 3.10.13

package/lib/compress.js

@@ -854,11 +854,20 @@ merge(Compressor.prototype, {
     });
 
     AST_Toplevel.DEFMETHOD("reset_opt_flags", function(compressor) {
+        var self = this;
         var reduce_vars = compressor.option("reduce_vars");
         var tw = new TreeWalker(function(node, descend) {
             node._squeezed = false;
             node._optimized = false;
-            if (reduce_vars) return node.reduce_vars(tw, descend, compressor);
+            if (reduce_vars) {
+                if (compressor.top_retain) {
+                    if (tw.parent() === self)
+                        node._top = true;
+                    else
+                        delete node._top;
+                }
+                return node.reduce_vars(tw, descend, compressor);
+            }
         });
         // Stack of look-up tables to keep track of whether a `SymbolDef` has been
         // properly assigned before use:
@@ -867,7 +876,7 @@ merge(Compressor.prototype, {
         tw.safe_ids = Object.create(null);
         tw.in_loop = null;
         tw.loop_ids = Object.create(null);
-        this.walk(tw);
+        self.walk(tw);
     });
 
     AST_Symbol.DEFMETHOD("fixed_value", function() {
@@ -4545,6 +4554,14 @@ merge(Compressor.prototype, {
         return self;
     });
 
+    function retain_top_func(fn, compressor) {
+        return compressor.top_retain
+            && fn._top
+            && fn instanceof AST_Defun
+            && fn.name
+            && compressor.top_retain(fn.name);
+    }
+
     OPT(AST_Call, function(self, compressor) {
         var exp = self.expression;
         var fn = exp;
@@ -4553,6 +4570,7 @@ merge(Compressor.prototype, {
         });
         if (compressor.option("reduce_vars") && fn instanceof AST_SymbolRef) {
             fn = fn.fixed_value();
+            if (retain_top_func(fn, compressor)) fn = exp;
         }
         var is_func = fn instanceof AST_Lambda;
         if (compressor.option("unused")
@@ -5033,7 +5051,7 @@ merge(Compressor.prototype, {
             if (value) expressions.push(make_node(AST_Assign, self, {
                 operator: "=",
                 left: sym,
-                right: value.clone(true)
+                right: value.clone()
             }));
         }
 
@@ -5730,6 +5748,19 @@ merge(Compressor.prototype, {
         return node;
     }
 
+    function within_array_or_object_literal(compressor) {
+        var node, level = 0;
+        while (node = compressor.parent(level++)) {
+            if (node instanceof AST_Statement) return false;
+            if (node instanceof AST_Array
+                || node instanceof AST_ObjectKeyVal
+                || node instanceof AST_Object) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     OPT(AST_SymbolRef, function(self, compressor) {
         if (!compressor.option("ie8")
             && is_undeclared_ref(self)
@@ -5746,14 +5777,23 @@ merge(Compressor.prototype, {
         var parent = compressor.parent();
         if (compressor.option("reduce_vars") && is_lhs(self, parent) !== self) {
             var d = self.definition();
+            if (compressor.top_retain && d.global && compressor.top_retain(d)) {
+                d.fixed = false;
+                d.should_replace = false;
+                d.single_use = false;
+                return self;
+            }
             var fixed = self.fixed_value();
             var single_use = d.single_use
                 && !(parent instanceof AST_Call && parent.is_expr_pure(compressor));
             if (single_use && (fixed instanceof AST_Lambda || fixed instanceof AST_Class)) {
-                if (d.scope !== self.scope
+                if (retain_top_func(fixed, compressor)) {
+                    single_use = false;
+                } else if (d.scope !== self.scope
                     && (!compressor.option("reduce_funcs") && fixed instanceof AST_Lambda
                         || d.escaped == 1
-                        || fixed.inlined)) {
+                        || fixed.inlined
+                        || within_array_or_object_literal(compressor))) {
                     single_use = false;
                 } else if (recursive_ref(compressor, d)) {
                     single_use = false;

package/lib/parse.js

@@ -2530,7 +2530,7 @@ function parse($TEXT, options) {
             next();
             if (is_import && is("name", "as")) {
                 next();  // The "as" word
-                name = as_symbol(is_import ? AST_SymbolImportForeign : AST_SymbolExportForeign);
+                name = as_symbol(is_import ? AST_SymbolImport : AST_SymbolExportForeign);
             }
             names = [map_nameAsterisk(is_import, name)];
         }

package/lib/scope.js

@@ -275,6 +275,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
             if (tw.parent() instanceof AST_NameMapping && tw.parent(1).module_name
                 || !(sym = node.scope.find_variable(name))) {
                 sym = self.def_global(node);
+                if (node instanceof AST_SymbolExport) sym.export = node.TYPE;
             } else if (sym.scope instanceof AST_Lambda && name == "arguments") {
                 sym.scope.uses_arguments = true;
             }
@@ -570,7 +571,7 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
 
     function collect(symbol) {
         if (!member(symbol.name, options.reserved)) {
-            to_mangle.push(symbol);
+            if (!symbol.export) to_mangle.push(symbol);
         }
     }
 });

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://github.com/fabiosantoscode/terser",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "3.10.9",
+  "version": "3.10.13",
   "engines": {
     "node": ">=0.8.0"
   },
@@ -49,7 +49,7 @@
     "coveralls": "coveralls < coverage/lcov.info",
     "lint": "eslint lib",
     "lint-fix": "eslint --fix lib",
-    "prepare": "cd dist && TERSER_NO_BUNDLE=1 node ../bin/uglifyjs ../lib/utils.js ../lib/ast.js ../lib/parse.js ../lib/transform.js ../lib/scope.js ../lib/output.js ../lib/compress.js ../lib/sourcemap.js ../lib/mozilla-ast.js ../lib/propmangle.js ../lib/minify.js ../tools/exports.js -c defaults=false -d \"MOZ_SourceMap=require('source-map')\" --source-map \"includeSources=true,url='bundle.js.map'\" -e \"exports:(typeof module != 'undefined' ? module.exports : Terser = {})\" -b ascii_only --comments /license/ -o ../dist/bundle.js"
+    "prepare": "cd dist && TERSER_NO_BUNDLE=1 ../bin/uglifyjs ../lib/utils.js ../lib/ast.js ../lib/parse.js ../lib/transform.js ../lib/scope.js ../lib/output.js ../lib/compress.js ../lib/sourcemap.js ../lib/mozilla-ast.js ../lib/propmangle.js ../lib/minify.js ../tools/exports.js -mc -d \"MOZ_SourceMap=require('source-map')\" --source-map \"includeSources=true,url='bundle.js.map'\" -e \"exports:(typeof module != 'undefined' ? module.exports : Terser = {})\" -b beautify=false,ascii_only --comments /license/ -o ../dist/bundle.js"
   },
   "keywords": [
     "uglify",