terser 3.10.13 → 3.13.1

package/lib/compress.js

@@ -2063,10 +2063,19 @@ merge(Compressor.prototype, {
                     return node.key.name != prop;
                 };
                 if (!all(def.value.properties, diff)) break;
-                def.value.properties.push(make_node(AST_ObjectKeyVal, node, {
-                    key: prop,
-                    value: node.right
-                }));
+                var p = def.value.properties.filter(function (p) { return p.key === prop; })[0];
+                if (!p) {
+                    def.value.properties.push(make_node(AST_ObjectKeyVal, node, {
+                        key: prop,
+                        value: node.right
+                    }));
+                } else {
+                    p.value = new AST_Sequence({
+                        start: p.start,
+                        expressions: [p.value.clone(), node.right.clone()],
+                        end: p.end
+                    });
+                }
                 exprs.shift();
                 trimmed = true;
             } while (exprs.length);
@@ -4556,8 +4565,8 @@ merge(Compressor.prototype, {
 
     function retain_top_func(fn, compressor) {
         return compressor.top_retain
-            && fn._top
             && fn instanceof AST_Defun
+            && fn._top
             && fn.name
             && compressor.top_retain(fn.name);
     }
@@ -4902,7 +4911,8 @@ merge(Compressor.prototype, {
                         && fn.is_constant_expression(exp.scope))
                 && !self.pure
                 && !fn.contains_this()
-                && can_inject_symbols()) {
+                && can_inject_symbols()
+                && !(scope instanceof AST_Class)) {
                 fn._squeezed = true;
                 return make_sequence(self, flatten_fn()).optimize(compressor);
             }

package/lib/output.js

@@ -1228,6 +1228,13 @@ function OutputStream(options) {
     /* -----[ if ]----- */
     function make_then(self, output) {
         var b = self.body;
+        if (b.print_to_string() === "") {
+            output.newline();
+            var indent = new Array(output.next_indent()).join(" ");
+            output.print(indent + ";");
+            output.newline();
+            return;
+        }
         if (output.option("braces")
             || output.option("ie8") && b instanceof AST_Do)
             return make_block(b, output);
@@ -1261,7 +1268,7 @@ function OutputStream(options) {
         output.space();
         if (self.alternative) {
             make_then(self, output);
-            output.space();
+            if (self.body.print_to_string() !== "") output.space();
             output.print("else");
             output.space();
             if (self.alternative instanceof AST_If)

package/lib/parse.js

@@ -2906,6 +2906,7 @@ function parse($TEXT, options) {
 
     // In ES6, AssignmentExpression can also be an ArrowFunction
     var maybe_assign = function(no_in) {
+        handle_regexp();
         var start = S.token;
 
         if (start.type == "name" && start.value == "yield") {

package/lib/propmangle.js

@@ -43,7 +43,10 @@
 
 "use strict";
 
+var domprops = require("../tools/domprops.json");
+
 function find_builtins(reserved) {
+    reserved.push.apply(reserved, domprops);
 
     // Compatibility fix for some standard defined globals not defined on every js environment
     var new_globals = ["Symbol", "Map", "Promise", "Proxy", "Reflect", "Set", "WeakMap", "WeakSet"];
@@ -127,7 +130,7 @@ function mangle_properties(ast, options) {
     }, true);
 
     var reserved = options.reserved;
-    if (!Array.isArray(reserved)) reserved = [];
+    if (!Array.isArray(reserved)) reserved = [reserved];
     if (!options.builtins) find_builtins(reserved);
 
     var cname = -1;

package/lib/scope.js

@@ -60,12 +60,15 @@ function SymbolDef(scope, orig, init) {
 
 SymbolDef.next_id = 1;
 
+var MASK_EXPORT_DONT_MANGLE = 1 << 0;
+var MASK_EXPORT_WANT_MANGLE = 1 << 1;
+
 SymbolDef.prototype = {
     unmangleable: function(options) {
         if (!options) options = {};
 
         return this.global && !options.toplevel
-            || this.export
+            || (this.export & MASK_EXPORT_DONT_MANGLE)
             || this.undeclared
             || !options.eval && this.scope.pinned()
             || (this.orig[0] instanceof AST_SymbolLambda
@@ -252,7 +255,12 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
                 } while (tw.parent(i++) !== in_destructuring);
             }
             var node = tw.parent(level);
-            def.export = node instanceof AST_Export;
+            if (def.export = node instanceof AST_Export && MASK_EXPORT_DONT_MANGLE) {
+                var exported = node.exported_definition;
+                if ((exported instanceof AST_Defun || exported instanceof AST_DefClass) && node.is_default) {
+                    def.export = MASK_EXPORT_WANT_MANGLE;
+                }
+            }
         }
     });
     self.walk(tw);
@@ -275,7 +283,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;
+                if (node instanceof AST_SymbolExport) sym.export = MASK_EXPORT_DONT_MANGLE;
             } else if (sym.scope instanceof AST_Lambda && name == "arguments") {
                 sym.scope.uses_arguments = true;
             }
@@ -571,7 +579,9 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
 
     function collect(symbol) {
         if (!member(symbol.name, options.reserved)) {
-            if (!symbol.export) to_mangle.push(symbol);
+            if (!(symbol.export & MASK_EXPORT_DONT_MANGLE)) {
+                to_mangle.push(symbol);
+            }
         }
     }
 });

package/lib/utils.js

@@ -315,6 +315,7 @@ Dictionary.fromObject = function(obj) {
     dict._size = merge(dict._values, obj);
     return dict;
 };
+exports.Dictionary = Dictionary;
 
 function HOP(obj, prop) {
     return Object.prototype.hasOwnProperty.call(obj, prop);

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.13",
+  "version": "3.13.1",
   "engines": {
     "node": ">=0.8.0"
   },
@@ -15,6 +15,7 @@
   ],
   "repository": "https://github.com/fabiosantoscode/terser.git",
   "main": "dist/bundle.js",
+  "types": "tools/terser.d.ts",
   "bin": {
     "terser": "bin/uglifyjs"
   },
@@ -32,11 +33,13 @@
     "source-map-support": "~0.5.6"
   },
   "devDependencies": {
-    "acorn": "~5.7.1",
+    "acorn": "^6.0.4",
     "coveralls": "^3.0.2",
+    "csv": "^5.0.0",
     "es6-promise": "^4.2.5",
     "escodegen": "^1.9.1",
     "eslint": "^4.19.1",
+    "eslump": "^2.0.0",
     "istanbul": "^0.4.5",
     "mocha": "^3.0.0",
     "mochallel": "^1.8.2",
@@ -98,7 +101,7 @@
     }
   },
   "pre-commit": [
-    "lint",
+    "lint-fix",
     "test"
   ]
 }

package/tools/colorless-console.js

@@ -1,8 +1,6 @@
 "use strict"
 
-var semver = require("semver");
-
-if (semver.satisfies(process.version, ">=10")) {
+if (Number((/([0-9]+)\./.exec(process.version) || [])[1]) >= 10) {
     var Console = require("console").Console;
     global.console = new Console({
         stdout: process.stdout,

package/tools/node.js

@@ -23,7 +23,7 @@ try {
     var instrumenter = new istanbul.Instrumenter();
 } catch (ex) {}
 
-new Function("MOZ_SourceMap", "exports", function() {
+new Function("MOZ_SourceMap", "exports", "require", function() {
     var code = FILES.map(function(file) {
         var contents = fs.readFileSync(file, "utf8");
         if (instrumenter && global.__IS_TESTING__) return instrumenter.instrumentSync(contents, file);
@@ -32,7 +32,8 @@ new Function("MOZ_SourceMap", "exports", function() {
     return code.join("\n\n");
 }())(
     require("source-map"),
-    UglifyJS
+    UglifyJS,
+    require
 );
 
 function infer_options(options) {