terser 3.13.0 → 3.14.1

package/lib/compress.js

@@ -2064,11 +2064,18 @@ merge(Compressor.prototype, {
                 };
                 if (!all(def.value.properties, diff)) break;
                 var p = def.value.properties.filter(function (p) { return p.key === prop; })[0];
-                p.value = new AST_Sequence({
-                    start: p.start,
-                    expressions: [p.value, node.right],
-                    end: p.end
-                });
+                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);
@@ -2757,6 +2764,16 @@ merge(Compressor.prototype, {
                 var exp = this.expression;
                 var val;
                 if (is_undeclared_ref(exp)) {
+
+                    var aa;
+                    var first_arg = exp.name === "hasOwnProperty"
+                        && key === "call"
+                        && (aa = compressor.parent() && compressor.parent().args)
+                        && (aa && aa[0]
+                        && aa[0].evaluate(compressor));
+                    if (first_arg == null || first_arg.thedef && first_arg.thedef.undeclared) {
+                        return this.clone();
+                    }
                     if (!(static_values[exp.name] || return_false)(key)) return this;
                     val = global_objs[exp.name];
                 } else {
@@ -2786,6 +2803,13 @@ merge(Compressor.prototype, {
                 var val;
                 var e = exp.expression;
                 if (is_undeclared_ref(e)) {
+                    var first_arg =
+                        e.name === "hasOwnProperty" &&
+                        key === "call" &&
+                        (this.args[0] && this.args[0].evaluate(compressor));
+                    if ((first_arg == null || first_arg.thedef && first_arg.thedef.undeclared)) {
+                        return this.clone();
+                    }
                     if (!(static_fns[e.name] || return_false)(key)) return this;
                     val = global_objs[e.name];
                 } else {
@@ -2901,6 +2925,13 @@ merge(Compressor.prototype, {
     AST_Call.DEFMETHOD("is_expr_pure", function(compressor) {
         if (compressor.option("unsafe")) {
             var expr = this.expression;
+            var first_arg = (this.args && this.args[0] && this.args[0].evaluate(compressor));
+            if (
+                expr.expression && expr.expression.name === "hasOwnProperty" &&
+                (first_arg == null || first_arg.thedef && first_arg.thedef.undeclared)
+            ) {
+                return false;
+            }
             if (is_undeclared_ref(expr) && global_pure_fns(expr.name)) return true;
             if (expr instanceof AST_Dot
                 && is_undeclared_ref(expr.expression)
@@ -6648,6 +6679,7 @@ merge(Compressor.prototype, {
         if (!(self.key instanceof AST_Constant)) return self;
         // whitelist acceptable props as not all AST_Constants are true constants
         if (self.key instanceof AST_String || self.key instanceof AST_Number) {
+            if (self.key.value === "__proto__") return self;
             if (self.key.value == "constructor"
                 && compressor.parent() instanceof AST_Class) return self;
             if (self instanceof AST_ObjectKeyVal) {

package/lib/output.js

@@ -1228,13 +1228,6 @@ 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);
@@ -1268,7 +1261,7 @@ function OutputStream(options) {
         output.space();
         if (self.alternative) {
             make_then(self, output);
-            if (self.body.print_to_string() !== "") output.space();
+            output.space();
             output.print("else");
             output.space();
             if (self.alternative instanceof AST_If)

package/lib/propmangle.js

@@ -43,8 +43,6 @@
 
 "use strict";
 
-var domprops = require("../tools/domprops.json");
-
 function find_builtins(reserved) {
     reserved.push.apply(reserved, domprops);
 
@@ -168,7 +166,11 @@ function mangle_properties(ast, options) {
             // setter or getter, since KeyVal is handled above
             add(node.key.name);
         } else if (node instanceof AST_Dot) {
-            add(node.property);
+            var root = node;
+            while (root.expression) {
+                root = root.expression;
+            }
+            if (!(root.thedef && root.thedef.undeclared)) add(node.property);
         } else if (node instanceof AST_Sub) {
             addStrings(node.property, add);
         } else if (node instanceof AST_Call

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,9 +4,9 @@
   "homepage": "https://github.com/fabiosantoscode/terser",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "3.13.0",
+  "version": "3.14.1",
   "engines": {
-    "node": ">=0.8.0"
+    "node": ">=4.0.0"
   },
   "maintainers": [
     "Fábio Santos <fabiosantosart@gmail.com>",
@@ -52,7 +52,7 @@
     "coveralls": "coveralls < coverage/lcov.info",
     "lint": "eslint lib",
     "lint-fix": "eslint --fix lib",
-    "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"
+    "prepare": "cd dist && TERSER_NO_BUNDLE=1 ../bin/uglifyjs ../tools/domprops.js ../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",

package/tools/{domprops.json → domprops.js}

@@ -1,4 +1,4 @@
-[
+var domprops = [
     "$&",
     "$'",
     "$*",

package/tools/node.js

@@ -2,6 +2,7 @@ var fs = require("fs");
 
 var UglifyJS = exports;
 var FILES = UglifyJS.FILES = [
+    "./domprops.js",
     "../lib/utils.js",
     "../lib/ast.js",
     "../lib/parse.js",

package/tools/props.html

@@ -45,7 +45,7 @@
       <!-- ta.value = Object.keys(props).sort(cmp).map(function(name){ -->
       <!--   return JSON.stringify(name); -->
       <!-- }).join(",\n"); -->
-      ta.value = JSON.stringify({
+      ta.value = 'var domprops = ' + JSON.stringify({
         vars: [],
         props: Object.keys(props).sort(cmp)
       }, null, 2);