js-confuser 1.2.1 → 1.4.1

package/dist/transforms/minify.js

@@ -19,153 +19,138 @@ var _traverse = require("../traverse");
 
 var _assert = require("assert");
 
+var _scope = require("../util/scope");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-class MinifyBlock extends _transform.default {
+/**
+ * Basic transformations to reduce code size.
+ *
+ * Examples:
+ * - `if(a) { b() }` **->** `a && b()`
+ * - `if(a){b()}else{c()}` **->** `a?b():c()`
+ * - `x['y']` **->** `x.y`
+ */
+class Minify extends _transform.default {
   constructor(o) {
-    super(o);
+    super(o, _order.ObfuscateOrder.Minify);
+
+    _defineProperty(this, "variables", void 0);
+
+    this.variables = new Map();
   }
 
   match(object, parents) {
-    return (0, _traverse.isBlock)(object) || object.type == "SwitchCase";
+    return object.hasOwnProperty("type");
   }
 
   transform(object, parents) {
-    return () => {
-      var body = object.type == "SwitchCase" ? object.consequent : (0, _insert.getBlockBody)(object);
-      var earlyReturn = body.length;
-      var fnDecs = [];
-      body.forEach((stmt, i) => {
-        if (stmt.type == "ReturnStatement" || stmt.type == "BreakStatement" || stmt.type == "ContinueStatement") {
-          if (earlyReturn > i + 1) {
-            earlyReturn = i + 1;
+    if ((0, _scope.isLexicalScope)(object)) {
+      return () => {
+        var body = object.type == "SwitchCase" ? object.consequent : (0, _insert.getBlockBody)(object);
+        var earlyReturn = body.length;
+        var fnDecs = [];
+        body.forEach((stmt, i) => {
+          if (stmt.type == "ReturnStatement" || stmt.type == "BreakStatement" || stmt.type == "ContinueStatement") {
+            if (earlyReturn > i + 1) {
+              earlyReturn = i + 1;
+            }
           }
-        }
 
-        if (stmt.type == "FunctionDeclaration") {
-          fnDecs.push([stmt, i]);
-        }
-      });
+          if (stmt.type == "FunctionDeclaration") {
+            fnDecs.push([stmt, i]);
+          }
+        });
 
-      if (earlyReturn < body.length) {
-        body.length = earlyReturn;
-        body.push(...fnDecs.filter(x => x[1] >= earlyReturn).map(x => x[0]));
-      } // Now combine ExpressionStatements
+        if (earlyReturn < body.length) {
+          body.length = earlyReturn;
+          body.push(...fnDecs.filter(x => x[1] >= earlyReturn).map(x => x[0]));
+        } // Now combine ExpressionStatements
 
 
-      if (body.length > 1) {
-        var exprs = [];
-        var startIndex = -1;
-        var sequences = [];
-        body.forEach((stmt, i) => {
-          if (stmt.type == "ExpressionStatement") {
-            exprs.push(stmt.expression);
+        if (body.length > 1) {
+          var exprs = [];
+          var startIndex = -1;
+          var sequences = [];
+          body.forEach((stmt, i) => {
+            if (stmt.type == "ExpressionStatement") {
+              exprs.push(stmt.expression);
 
-            if (startIndex == -1) {
-              startIndex = i;
-            }
-          } else {
-            if (exprs.length) {
-              sequences.push({
-                exprs: exprs,
-                index: startIndex
-              });
+              if (startIndex == -1) {
+                startIndex = i;
+              }
+            } else {
+              if (exprs.length) {
+                sequences.push({
+                  exprs: exprs,
+                  index: startIndex
+                });
+              }
+
+              exprs = [];
+              startIndex = -1;
             }
+          });
 
-            exprs = [];
-            startIndex = -1;
+          if (exprs.length) {
+            sequences.push({
+              exprs: exprs,
+              index: startIndex
+            });
           }
-        });
 
-        if (exprs.length) {
-          sequences.push({
-            exprs: exprs,
-            index: startIndex
+          sequences.reverse().forEach(seq => {
+            (0, _assert.ok)(seq.index != -1);
+            body.splice(seq.index, seq.exprs.length, (0, _gen.ExpressionStatement)(seq.exprs.length == 1 ? seq.exprs[0] : (0, _gen.SequenceExpression)(seq.exprs)));
           });
         }
 
-        sequences.reverse().forEach(seq => {
-          (0, _assert.ok)(seq.index != -1);
-          body.splice(seq.index, seq.exprs.length, (0, _gen.ExpressionStatement)(seq.exprs.length == 1 ? seq.exprs[0] : (0, _gen.SequenceExpression)(seq.exprs)));
-        });
-      }
-
-      if (object.type != "SwitchCase") {
-        // Unnecessary return
-        if (body.length && body[body.length - 1]) {
-          var last = body[body.length - 1];
-          var isUndefined = last.argument == null;
+        if (object.type != "SwitchCase") {
+          // Unnecessary return
+          if (body.length && body[body.length - 1]) {
+            var last = body[body.length - 1];
+            var isUndefined = last.argument == null;
 
-          if (last.type == "ReturnStatement" && isUndefined) {
-            body.pop();
-          }
-        } // Variable declaration grouping
-        // var a = 1;
-        // var b = 1;
-        // var c = 1;
-        //
-        // var a=1,b=1,c=1;
-
-
-        var lastDec = null;
-        var remove = [];
-        body.forEach((x, i) => {
-          if (x.type === "VariableDeclaration") {
-            if (!lastDec || lastDec.kind !== x.kind || !lastDec.declarations.length) {
-              lastDec = x;
+            if (last.type == "ReturnStatement" && isUndefined) {
+              body.pop();
+            }
+          } // Variable declaration grouping
+          // var a = 1;
+          // var b = 1;
+          // var c = 1;
+          //
+          // var a=1,b=1,c=1;
+
+
+          var lastDec = null;
+          var remove = [];
+          body.forEach((x, i) => {
+            if (x.type === "VariableDeclaration") {
+              if (!lastDec || lastDec.kind !== x.kind || !lastDec.declarations.length) {
+                lastDec = x;
+              } else {
+                lastDec.declarations.push(...x.declarations);
+                remove.unshift(i);
+              }
             } else {
-              lastDec.declarations.push(...x.declarations);
-              remove.unshift(i);
+              lastDec = null;
             }
-          } else {
-            lastDec = null;
-          }
-        });
-        remove.forEach(x => {
-          body.splice(x, 1);
-        });
-      }
-    };
-  }
-
-}
-/**
- * Basic transformations to reduce code size.
- *
- * Examples:
- * - `if(a) { b() }` **->** `a && b()`
- * - `if(a){b()}else{c()}` **->** `a?b():c()`
- * - `x['y']` **->** `x.y`
- */
-
-
-class Minify extends _transform.default {
-  constructor(o) {
-    super(o, _order.ObfuscateOrder.Minify);
-
-    _defineProperty(this, "variables", void 0);
-
-    this.variables = new Map();
-    /**
-     * Minify runs at every Node, making Expression-based minification.
-     * MinifyBlock runs only on Blocks, making Statement-based minification.
-     */
-
-    this.after.push(new MinifyBlock(o));
-  }
-
-  match(object, parents) {
-    return object.hasOwnProperty("type");
-  }
-
-  transform(object, parents) {
+          });
+          remove.forEach(x => {
+            body.splice(x, 1);
+          });
+        }
+      };
+    }
     /**
      * ES6 and higher only
      * - `function(){}` -> `()=>{}`
      * - `function abc(){}` -> `var abc = ()=>{}`
      */
+
+
     if (!this.options.es5 && (object.type == "FunctionExpression" || object.type == "FunctionDeclaration")) {
       return () => {
         // Don't touch `{get key(){...}}`
@@ -329,7 +314,7 @@ class Minify extends _transform.default {
       if (last) {
         var lastStatement = last.consequent[last.consequent.length - 1];
 
-        if (lastStatement.type == "BreakStatement" && lastStatement.label == null) {
+        if (lastStatement && lastStatement.type == "BreakStatement" && lastStatement.label == null) {
           last.consequent.pop();
         }
       } else {
@@ -425,7 +410,7 @@ class Minify extends _transform.default {
         var key = object.callee.computed ? object.callee.property.value : object.callee.property.name;
 
         if (key == "toString" && object.arguments.length == 0) {
-          this.replace(object, (0, _gen.BinaryExpression)("+", (0, _insert.clone)(object.callee.object), (0, _gen.Literal)("")));
+          this.replace(object, (0, _gen.BinaryExpression)("+", (0, _gen.Literal)(""), (0, _insert.clone)(object.callee.object)));
         }
       }
     } // { "x": 1 } -> {x: 1}
@@ -452,6 +437,18 @@ class Minify extends _transform.default {
         if (object.init.name == "undefined") {
           object.init = null;
         }
+      }
+
+      if (object.id.type == "ObjectPattern" && object.init.type == "ObjectExpression") {
+        if (object.id.properties.length === 1 && object.init.properties.length === 1) {
+          var key1 = object.id.properties[0].computed ? object.id.properties[0].key.value : object.id.properties[0].key.name;
+          var key2 = object.init.properties[0].computed ? object.init.properties[0].key.value : object.init.properties[0].key.name; // console.log(key1, key2);
+
+          if (key1 && key2 && key1 === key2) {
+            object.id = object.id.properties[0].value;
+            object.init = object.init.properties[0].value;
+          }
+        }
       } // check for redundant patterns
 
 
@@ -467,7 +464,7 @@ class Minify extends _transform.default {
       return () => {
         switch (typeof object.value) {
           case "boolean":
-            // this.replace(object, UnaryExpression("!", Literal(object.value ? 0 : 1)));
+            this.replaceIdentifierOrLiteral(object, (0, _gen.UnaryExpression)("!", (0, _gen.Literal)(object.value ? 0 : 1)), parents);
             break;
         }
       };
@@ -476,9 +473,9 @@ class Minify extends _transform.default {
     if (object.type == "Identifier") {
       return () => {
         if (object.name == "undefined" && !(0, _insert.isForInitialize)(object, parents)) {
-          this.replace(object, (0, _gen.UnaryExpression)("void", (0, _gen.Literal)(0)));
+          this.replaceIdentifierOrLiteral(object, (0, _gen.UnaryExpression)("void", (0, _gen.Literal)(0)), parents);
         } else if (object.name == "Infinity") {
-          this.replace(object, (0, _gen.BinaryExpression)("/", (0, _gen.Literal)(1), (0, _gen.Literal)(0)));
+          this.replaceIdentifierOrLiteral(object, (0, _gen.BinaryExpression)("/", (0, _gen.Literal)(1), (0, _gen.Literal)(0)), parents);
         }
       };
     }

package/dist/transforms/opaquePredicates.js

@@ -89,7 +89,8 @@ class OpaquePredicates extends _transform.default {
       if (!this.predicate) {
         this.predicateName = this.getPlaceholder();
         this.predicate = (0, _gen.ObjectExpression)([]);
-        (0, _insert.prepend)(parents[parents.length - 1] || object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.predicateName, this.predicate)));
+        var tempName = this.getPlaceholder();
+        (0, _insert.prepend)(parents[parents.length - 1] || object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.predicateName, (0, _gen.CallExpression)((0, _gen.FunctionExpression)([], [(0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(tempName, this.predicate)), (0, _gen.ReturnStatement)((0, _gen.Identifier)(tempName))]), []))));
       }
 
       var expr = (0, _random.choice)(Object.values(this.predicates));
@@ -102,7 +103,8 @@ class OpaquePredicates extends _transform.default {
           case "array":
             var arrayProp = this.gen.generate();
             this.predicate.properties.push((0, _gen.Property)((0, _gen.Identifier)(arrayProp), (0, _gen.ArrayExpression)([])));
-            this.predicate.properties.push((0, _gen.Property)((0, _gen.Identifier)(prop), (0, _gen.FunctionExpression)([], (0, _template.default)("\n                  if ( !".concat(this.predicateName, ".").concat(arrayProp, "[0] ) {\n                    ").concat(this.predicateName, ".").concat(arrayProp, ".push(").concat((0, _random.getRandomInteger)(-100, 100), ");\n                  }\n                  return ").concat(this.predicateName, ".").concat(arrayProp, ".length;\n                ")).compile())));
+            var paramName = this.getPlaceholder();
+            this.predicate.properties.push((0, _gen.Property)((0, _gen.Identifier)(prop), (0, _gen.FunctionExpression)([(0, _gen.AssignmentPattern)((0, _gen.Identifier)(paramName), (0, _gen.Literal)("length"))], (0, _template.default)("\n                  if ( !".concat(this.predicateName, ".").concat(arrayProp, "[0] ) {\n                    ").concat(this.predicateName, ".").concat(arrayProp, ".push(").concat((0, _random.getRandomInteger)(-100, 100), ");\n                  }\n                  return ").concat(this.predicateName, ".").concat(arrayProp, "[").concat(paramName, "];\n                ")).compile())));
             expr = (0, _gen.CallExpression)(accessor, []);
             break;
 

package/dist/transforms/preparation/preparation.js

@@ -88,6 +88,14 @@ class ExplicitIdentifiers extends _transform.default {
   }
 
   transform(object, parents) {
+    if (object.name === "eval") {
+      var fn = (0, _insert.getFunction)(object, parents);
+
+      if (fn) {
+        fn.$requiresEval = true;
+      }
+    }
+
     var info = (0, _identifiers.getIdentifierInfo)(object, parents);
 
     if (info.isPropertyKey || info.isAccessor) {

package/dist/transforms/renameLabels.js

@@ -40,12 +40,25 @@ class RenameLabels extends _transform.default {
   transform(object, parents) {
     return () => {
       var newName = null;
+      var isRemovable = object.body.type !== "BlockStatement";
+      var labelNeverUsed = true;
       (0, _traverse.walk)(object, parents, (o, p) => {
         if (o.type == "BreakStatement" || o.type == "ContinueStatement") {
-          var labelStatement = p.find(x => (0, _compare.isLoop)(x));
+          function isContinuableStatement(x, stmtParents) {
+            return (0, _compare.isLoop)(x) && x.type !== "SwitchStatement";
+          }
+
+          function isBreakableStatement(x, stmtParents) {
+            return (0, _compare.isLoop)(x) || x.type == "BlockStatement" && o.label && stmtParents[0] && stmtParents[0].type == "LabeledStatement";
+          }
+
+          var fn = o.type == "ContinueStatement" ? isContinuableStatement : isBreakableStatement;
+          var labelStatement = p.find((node, i) => {
+            return fn(node, p.slice(i + 1));
+          });
 
           if (o.label && o.label.name == object.label.name) {
-            if (object.body == labelStatement) {
+            if (object.body == labelStatement && isRemovable) {
               // In same loop
               o.label = null;
             } else {
@@ -54,6 +67,7 @@ class RenameLabels extends _transform.default {
               }
 
               o.label = (0, _gen.Identifier)(newName);
+              labelNeverUsed = false;
             }
           }
         }
@@ -61,7 +75,7 @@ class RenameLabels extends _transform.default {
 
       if (newName) {
         object.label = (0, _gen.Identifier)(newName);
-      } else {
+      } else if (isRemovable || labelNeverUsed) {
         this.replace(object, (0, _insert.clone)(object.body));
       }
     };

package/dist/transforms/rgf.js

@@ -71,7 +71,7 @@ class RGF extends _transform.default {
       var names = new Map();
       var definingNodes = new Map();
       (0, _traverse.walk)(contextObject, contextParents, (object, parents) => {
-        if (object !== contextObject && (0, _insert.isFunction)(object) && !object.async && !object.generator && (0, _insert.getVarContext)(parents[0], parents.slice(1)) === contextObject) {
+        if (object !== contextObject && (0, _insert.isFunction)(object) && !object.$requiresEval && !object.async && !object.generator && (0, _insert.getVarContext)(parents[0], parents.slice(1)) === contextObject) {
           var defined = new Set(),
               referenced = new Set();
           var isBound = false;
@@ -79,9 +79,13 @@ class RGF extends _transform.default {
             if (o.type == "Identifier" && !_constants.reservedIdentifiers.has(o.name) && !this.options.globalVariables.has(o.name)) {
               var info = (0, _identifiers.getIdentifierInfo)(o, p);
 
+              if (!info.spec.isReferenced) {
+                return;
+              }
+
               if (info.spec.isDefined) {
                 defined.add(o.name);
-              } else if (info.spec.isReferenced || info.spec.isModified) {
+              } else {
                 referenced.add(o.name);
               }
             }
@@ -205,7 +209,8 @@ class RGF extends _transform.default {
           lock: {
             integrity: false
           },
-          eval: false
+          eval: false,
+          hideInitializingCode: false
         });
         var transforms = Object.values(obfuscator.transforms).filter(x => x.priority > this.priority);
         var embeddedFunction = { ...object,

package/dist/transforms/shuffle.js

@@ -85,15 +85,16 @@ class Shuffle extends _transform.default {
         return;
       }
 
-      var mode = (0, _probability.ComputeProbabilityMap)(this.options.shuffle, x => x, object.elements.map(x => x.value));
+      var mapped = object.elements.map(x => x.value);
+      var mode = (0, _probability.ComputeProbabilityMap)(this.options.shuffle, x => x, mapped);
 
       if (mode) {
-        var shift = (0, _random.getRandomInteger)(1, Math.min(100, object.elements.length * 6));
+        var shift = (0, _random.getRandomInteger)(1, Math.min(60, object.elements.length * 6));
         var expr = (0, _gen.Literal)(shift);
         var name = this.getPlaceholder();
 
         if (mode == "hash") {
-          var str = object.elements.map(x => x.value + "").join("");
+          var str = mapped.join("");
           shift = Hash(str);
 
           if (!this.hashName) {
@@ -116,8 +117,10 @@ class Shuffle extends _transform.default {
 
         var code = [];
         var iName = this.getPlaceholder();
-        code.push((0, _gen.ForStatement)((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(iName, expr)), (0, _gen.Identifier)(iName), (0, _gen.UpdateExpression)("--", (0, _gen.Identifier)(iName), false), [(0, _template.default)("".concat(name, ".unshift(").concat(name, ".pop())")).single()]));
         var inPlace = false;
+        var inPlaceName;
+        var inPlaceBody;
+        var inPlaceIndex;
         var varDeclarator = parents[0];
 
         if (varDeclarator.type == "VariableDeclarator") {
@@ -126,15 +129,28 @@ class Shuffle extends _transform.default {
           if (varDec.type == "VariableDeclaration") {
             var body = parents[3];
 
-            if (varDec.declarations.length == 1 && Array.isArray(body)) {
-              inPlace = true;
-              var i = body.indexOf(varDec);
-              (0, _assert.ok)(i != -1);
-              body.splice(i + 1, 0, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(name, (0, _gen.Identifier)(varDeclarator.id.name))), ...code);
+            if (varDec.declarations.length == 1 && Array.isArray(body) && varDeclarator.id.type === "Identifier" && varDeclarator.init === object) {
+              inPlaceIndex = body.indexOf(varDec);
+              inPlaceBody = body;
+              inPlace = inPlaceIndex !== -1;
+              inPlaceName = varDeclarator.id.name;
             }
           }
         }
 
+        if (mode !== "hash") {
+          code.push((0, _template.default)("\n            for ( var x = 16; x%4 === 0; x++) {\n              var z = 0;\n              ".concat(inPlace ? "".concat(inPlaceName, " = ").concat(name) : name, " = ").concat(name, ".concat((function(){\n                z++;\n                if(z === 1){\n                  return [];\n                }\n\n                for( var i = ").concat((0, _random.getRandomInteger)(5, 105), "; i; i-- ){\n                  ").concat(name, ".unshift(").concat(name, ".pop());\n                }\n                return [];\n              })());\n            }\n            ")).single());
+        }
+
+        code.push((0, _gen.ForStatement)((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(iName, expr)), (0, _gen.Identifier)(iName), (0, _gen.UpdateExpression)("--", (0, _gen.Identifier)(iName), false), [// ${name}.unshift(${name}.pop());
+        (0, _gen.ExpressionStatement)((0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(name), (0, _gen.Identifier)("unshift"), false), [(0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(name), (0, _gen.Identifier)("pop"), false), [])]))]));
+
+        if (inPlace) {
+          var varDeclarator = parents[0];
+          (0, _assert.ok)(i != -1);
+          inPlaceBody.splice(inPlaceIndex + 1, 0, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(name, (0, _gen.Identifier)(varDeclarator.id.name))), ...code);
+        }
+
         if (!inPlace) {
           this.replace(object, (0, _gen.CallExpression)((0, _gen.FunctionExpression)([(0, _gen.Identifier)(name)], [...code, (0, _gen.ReturnStatement)((0, _gen.Identifier)(name))]), [(0, _insert.clone)(object)]));
         }

package/dist/transforms/stack.js

@@ -37,7 +37,7 @@ class Stack extends _transform.default {
   }
 
   match(object, parents) {
-    return (0, _insert.isFunction)(object) && !object.params.find(x => x.type !== "Identifier") && object.body.type === "BlockStatement" && !parents.find(x => x.$dispatcherSkip);
+    return (0, _insert.isFunction)(object) && !object.params.find(x => x.type !== "Identifier") && object.body.type === "BlockStatement" && !parents.find(x => x.$dispatcherSkip) && !object.$requiresEval;
   }
 
   transform(object, parents) {
@@ -160,6 +160,7 @@ class Stack extends _transform.default {
       }
 
       var stackName = this.getPlaceholder();
+      var made = 1;
 
       const scan = (o, p) => {
         if (o.type == "Identifier") {
@@ -214,15 +215,10 @@ class Stack extends _transform.default {
           }
         }
 
-        if (o.type == "Literal" && typeof o.value === "number" && Math.floor(o.value) === o.value && Math.abs(o.value) < 100000 && Math.random() > 0.5 && p.find(x => (0, _insert.isFunction)(x)) === object) {
+        if (o.type == "Literal" && typeof o.value === "number" && Math.floor(o.value) === o.value && Math.abs(o.value) < 100000 && Math.random() < 4 / made && p.find(x => (0, _insert.isFunction)(x)) === object) {
+          made++;
           return () => {
-            if (p[0].type == "Property" || p[0].type == "MethodDefinition") {
-              if (!p[0].computed) {
-                p[0].computed = true;
-              }
-            }
-
-            this.replace(o, numberLiteral(o.value, 0));
+            this.replaceIdentifierOrLiteral(o, numberLiteral(o.value, 0), p);
           };
         }
       };