terser 3.10.4 → 3.10.8

package/lib/compress.js

@@ -3430,10 +3430,12 @@ merge(Compressor.prototype, {
                     }
                 }
                 if (scope !== self) return;
+                var def;
                 if (node.name
-                    && (!compressor.option("keep_classnames") && node instanceof AST_ClassExpression
-                        || !compressor.option("keep_fnames") && node instanceof AST_Function)) {
-                    var def = node.name.definition();
+                    && (node instanceof AST_ClassExpression
+                        && !keep_name(compressor.option("keep_classnames"), (def = node.name.definition()).name)
+                    || node instanceof AST_Function
+                        && !keep_name(compressor.option("keep_fnames"), (def = node.name.definition()).name))) {
                     // any declarations with same name will overshadow
                     // name of this anonymous function and can therefore
                     // never be used anywhere
@@ -4172,8 +4174,22 @@ merge(Compressor.prototype, {
         }
     }
 
+    function use_increment(self) {
+        if (self.step instanceof AST_Assign
+            && self.step.operator === "+="
+            && self.step.left instanceof AST_Symbol
+            && self.step.right.print_to_string() === "1"
+        ) {
+            self.step = make_node(AST_UnaryPrefix, self.step, {
+                operator: "++",
+                expression: self.step.left
+            });
+        }
+    }
+
     OPT(AST_For, function(self, compressor) {
         if (!compressor.option("loops")) return self;
+        use_increment(self);
         if (compressor.option("side_effects") && self.init) {
             self.init = self.init.drop_side_effect_free(compressor);
         }
@@ -5031,7 +5047,7 @@ merge(Compressor.prototype, {
             if (value) expressions.push(make_node(AST_Assign, self, {
                 operator: "=",
                 left: sym,
-                right: value
+                right: value.clone(true)
             }));
         }
 

package/lib/scope.js

@@ -68,13 +68,11 @@ SymbolDef.prototype = {
             || this.export
             || this.undeclared
             || !options.eval && this.scope.pinned()
-            || (options.keep_fnames instanceof RegExp && options.keep_fnames.test(this.orig[0].name) || options.keep_fnames === true)
-                && (this.orig[0] instanceof AST_SymbolLambda
-                    || this.orig[0] instanceof AST_SymbolDefun)
+            || (this.orig[0] instanceof AST_SymbolLambda
+                  || this.orig[0] instanceof AST_SymbolDefun) && keep_name(options.keep_fnames, this.orig[0].name)
             || this.orig[0] instanceof AST_SymbolMethod
-            || (options.keep_classnames instanceof RegExp && options.keep_classnames.test(this.orig[0].name) || options.keep_classnames === true)
-                && (this.orig[0] instanceof AST_SymbolClass
-                    || this.orig[0] instanceof AST_SymbolDefClass);
+            || (this.orig[0] instanceof AST_SymbolClass
+                  || this.orig[0] instanceof AST_SymbolDefClass) && keep_name(options.keep_classnames, this.orig[0].name);
     },
     mangle: function(options) {
         var cache = options.cache && options.cache.props;
@@ -387,7 +385,9 @@ AST_Symbol.DEFMETHOD("mark_enclosed", function(options) {
         push_uniq(s.enclosed, def);
         if (options.keep_fnames) {
             s.functions.each(function(d) {
-                push_uniq(def.scope.enclosed, d);
+                if (keep_name(options.keep_fnames, d.name)) {
+                    push_uniq(def.scope.enclosed, d);
+                }
             });
         }
         if (s === def.scope) break;

package/lib/utils.js

@@ -342,3 +342,8 @@ function first_in_statement(stack) {
         }
     }
 }
+
+function keep_name(keep_setting, name) {
+    return keep_setting === true
+        || (keep_setting instanceof RegExp && keep_setting.test(name));
+}

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.4",
+  "version": "3.10.8",
   "engines": {
     "node": ">=0.8.0"
   },
@@ -22,6 +22,7 @@
     "bin",
     "lib",
     "dist",
+    "!dist/bundle.instrumented.js",
     "tools",
     "LICENSE"
   ],
@@ -38,7 +39,7 @@
     "eslint": "^4.19.1",
     "istanbul": "^0.4.5",
     "mocha": "^3.0.0",
-    "mochallel": "^1.7.8",
+    "mochallel": "^1.7.9",
     "multiprocess-map": "^1.4.2",
     "pre-commit": "^1.2.2",
     "semver": "~5.5.0"

package/tools/node.js

@@ -1,5 +1,4 @@
 var fs = require("fs");
-var istanbul = require("istanbul");
 
 var UglifyJS = exports;
 var FILES = UglifyJS.FILES = [
@@ -19,12 +18,15 @@ var FILES = UglifyJS.FILES = [
     return require.resolve(file);
 });
 
-var instrumenter = new istanbul.Instrumenter();
+try {
+    var istanbul = require("istanbul");
+    var instrumenter = new istanbul.Instrumenter();
+} catch (ex) {}
 
 new Function("MOZ_SourceMap", "exports", function() {
     var code = FILES.map(function(file) {
         var contents = fs.readFileSync(file, "utf8");
-        if (global.__IS_TESTING__) return instrumenter.instrumentSync(contents, file);
+        if (instrumenter && global.__IS_TESTING__) return instrumenter.instrumentSync(contents, file);
         return contents;
     });
     return code.join("\n\n");