js-confuser 1.5.7 → 1.5.9

package/dist/transforms/flatten.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _assert = require("assert");
+
 var _constants = require("../constants");
 
 var _order = require("../order");
@@ -39,6 +41,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  *   return [ref1, ref2, refN, returnValue];
  * }
  * ```
+ *
+ * Flatten is used to make functions eligible for the RGF transformation.
  */
 class Flatten extends _transform.default {
   constructor(o) {
@@ -46,15 +50,12 @@ class Flatten extends _transform.default {
 
     _defineProperty(this, "definedNames", void 0);
 
-    _defineProperty(this, "flatMapName", void 0);
-
-    _defineProperty(this, "flatNode", void 0);
+    _defineProperty(this, "flattenedFns", void 0);
 
     _defineProperty(this, "gen", void 0);
 
     this.definedNames = new Map();
-    this.flatMapName = null;
-    this.flatNode = null;
+    this.flattenedFns = [];
     this.gen = this.getGenerator();
   }
 
@@ -79,19 +80,43 @@ class Flatten extends _transform.default {
       }
     });
     super.apply(tree);
+
+    if (this.flattenedFns.length) {
+      (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)(this.flattenedFns));
+    }
   }
 
   match(object, parents) {
-    return object.type == "FunctionDeclaration" && object.body.type == "BlockStatement" && !object.generator && !object.async && !object.params.find(x => x.type !== "Identifier");
+    return (object.type == "FunctionDeclaration" || object.type === "FunctionExpression") && object.body.type == "BlockStatement" && !object.generator && !object.params.find(x => x.type !== "Identifier");
   }
 
   transform(object, parents) {
     return () => {
-      //
-      if (parents.find(x => x.type == "ClassExpression" || x.type == "ClassDeclaration" || x.type == "MethodDefinition")) {
-        return;
+      var _object$id, _parents$, _parents$0$id, _parents$0$id2, _parents$2, _parents$3;
+
+      if (parents[0]) {
+        // Don't change class methods
+        if (parents[0].type === "MethodDefinition" && parents[0].value === object) {
+          return;
+        } // Don't change getter/setter methods
+
+
+        if (parents[0].type === "Property" && parents[0].value === object && parents[0].kind !== "init") {
+          return;
+        }
       }
 
+      (0, _assert.ok)(object.type === "FunctionDeclaration" || object.type === "FunctionExpression"); // The name is purely for debugging purposes
+
+      var currentFnName = object.type === "FunctionDeclaration" ? (_object$id = object.id) === null || _object$id === void 0 ? void 0 : _object$id.name : ((_parents$ = parents[0]) === null || _parents$ === void 0 ? void 0 : _parents$.type) === "VariableDeclarator" && ((_parents$0$id = parents[0].id) === null || _parents$0$id === void 0 ? void 0 : _parents$0$id.type) === "Identifier" && ((_parents$0$id2 = parents[0].id) === null || _parents$0$id2 === void 0 ? void 0 : _parents$0$id2.name);
+
+      if (((_parents$2 = parents[0]) === null || _parents$2 === void 0 ? void 0 : _parents$2.type) === "Property" && (_parents$3 = parents[0]) !== null && _parents$3 !== void 0 && _parents$3.key) {
+        var _parents$4, _parents$4$key, _parents$5, _parents$5$key;
+
+        currentFnName = currentFnName || String(((_parents$4 = parents[0]) === null || _parents$4 === void 0 ? void 0 : (_parents$4$key = _parents$4.key) === null || _parents$4$key === void 0 ? void 0 : _parents$4$key.name) || ((_parents$5 = parents[0]) === null || _parents$5 === void 0 ? void 0 : (_parents$5$key = _parents$5.key) === null || _parents$5$key === void 0 ? void 0 : _parents$5$key.value));
+      }
+
+      if (!currentFnName) currentFnName = "unnamed";
       var defined = new Set();
       var references = new Set();
       var modified = new Set();
@@ -119,9 +144,7 @@ class Flatten extends _transform.default {
 
           if (o.hidden) {
             illegal.add(o.name);
-          }
-
-          if (info.spec.isDefined) {
+          } else if (info.spec.isDefined) {
             defined.add(o.name);
           } else if (info.spec.isModified) {
             modified.add(o.name);
@@ -171,9 +194,6 @@ class Flatten extends _transform.default {
         return;
       }
 
-      illegal.forEach(name => {
-        defined.delete(name);
-      });
       defined.forEach(name => {
         references.delete(name);
         modified.delete(name);
@@ -186,65 +206,68 @@ class Flatten extends _transform.default {
       }
 
       var output = Array.from(modified);
-      var newName = this.gen.generate();
-      var valName = this.getPlaceholder();
+      var newName = this.getPlaceholder() + "_flat_" + currentFnName;
       var resultName = this.getPlaceholder();
       var propName = this.gen.generate();
+      var newOutputNames = Object.create(null);
+      output.forEach(name => {
+        newOutputNames[name] = this.gen.generate();
+      });
+      var returnOutputName = this.gen.generate();
       (0, _insert.getBlockBody)(object.body).push((0, _gen.ReturnStatement)());
       (0, _traverse.walk)(object.body, [object, ...parents], (o, p) => {
         return () => {
+          // Change return statements from
+          // return (argument)
+          // to
+          // return [ [modifiedRefs],  ]
           if (o.type == "ReturnStatement" && (0, _insert.getVarContext)(o, p) === object) {
-            var elements = output.map(_gen.Identifier);
+            var returnObject = (0, _gen.ObjectExpression)(output.map(outputName => (0, _gen.Property)((0, _gen.Literal)(newOutputNames[outputName]), (0, _gen.Identifier)(outputName), true)));
 
             if (o.argument && !(o.argument.type == "Identifier" && o.argument.name == "undefined")) {
-              elements.unshift((0, _insert.clone)(o.argument));
+              returnObject.properties.push((0, _gen.Property)((0, _gen.Literal)(returnOutputName), (0, _insert.clone)(o.argument), true));
             }
 
-            o.argument = (0, _gen.ArrayExpression)(elements);
-            o.argument = (0, _gen.AssignmentExpression)("=", (0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(propName), false), o.argument);
+            o.argument = (0, _gen.AssignmentExpression)("=", (0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(propName), false), returnObject);
           }
         };
       });
       var newBody = (0, _insert.getBlockBody)(object.body);
-      newBody.unshift((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)((0, _gen.ArrayPattern)([(0, _gen.ArrayPattern)(input.map(_gen.Identifier)), (0, _gen.ArrayPattern)((0, _insert.clone)(object.params)), (0, _gen.Identifier)(resultName)]), (0, _gen.Identifier)(valName))));
-
-      if (!this.flatMapName) {
-        this.flatMapName = this.getPlaceholder();
-        (0, _insert.prepend)(parents[parents.length - 1], (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.flatMapName, this.flatNode = (0, _gen.ObjectExpression)([]))));
-      }
-
-      var newFunctionExpression = (0, _gen.FunctionExpression)([(0, _gen.Identifier)(valName)], newBody);
+      var newFunctionExpression = (0, _gen.FunctionExpression)([(0, _gen.ArrayPattern)(input.map(_gen.Identifier)), (0, _gen.ArrayPattern)((0, _insert.clone)(object.params)), (0, _gen.Identifier)(resultName)], newBody);
       newFunctionExpression.async = !!object.async;
       newFunctionExpression.generator = !!object.generator;
       var property = (0, _gen.Property)((0, _gen.Identifier)(newName), newFunctionExpression, false);
       property.kind = "set";
-      this.flatNode.properties.push(property);
-      var identifier = (0, _gen.MemberExpression)((0, _gen.Identifier)(this.flatMapName), (0, _gen.Identifier)(newName), false);
-      var newParamNodes = object.params.map(() => (0, _gen.Identifier)(this.getPlaceholder())); // var result = newFn.call([...refs], ...arguments)
+      this.flattenedFns.push((0, _gen.VariableDeclarator)(newName, newFunctionExpression));
+      var newParamNodes = object.params.map(() => (0, _gen.Identifier)(this.getPlaceholder())); // result.pop()
 
-      var call = (0, _gen.VariableDeclaration)([(0, _gen.VariableDeclarator)(resultName, (0, _gen.ArrayExpression)([])), (0, _gen.VariableDeclarator)("_", (0, _gen.AssignmentExpression)("=", identifier, (0, _gen.ArrayExpression)([(0, _gen.ArrayExpression)(input.map(_gen.Identifier)), (0, _gen.ArrayExpression)([...newParamNodes]), (0, _gen.Identifier)(resultName)])))]); // result.pop()
+      var getOutputMemberExpression = outputName => (0, _gen.MemberExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(propName), true), (0, _gen.Literal)(outputName), true); // newFn.call([...refs], ...arguments, resultObject)
 
-      var pop = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(propName), false), (0, _gen.Literal)("pop"), true), []); // var result = newFn.call([...refs], ...arguments)
-      // modified1 = result.pop();
-      // modified2 = result.pop();
-      // ...modifiedN = result.pop();...
-      //
-      // return result.pop()
 
-      var newObjectBody = [call];
-      var outputReversed = [...output].reverse(); // DECOY STATEMENTS
+      var callExpression = (0, _gen.CallExpression)((0, _gen.Identifier)(newName), [(0, _gen.ArrayExpression)(input.map(_gen.Identifier)), (0, _gen.ArrayExpression)([...newParamNodes]), (0, _gen.Identifier)(resultName)]);
+      var newObjectBody = [// var resultObject = {};
+      (0, _gen.VariableDeclaration)([(0, _gen.VariableDeclarator)(resultName, (0, _gen.ObjectExpression)([]))]), (0, _gen.ExpressionStatement)(newFunctionExpression.async ? (0, _gen.AwaitExpression)(callExpression) : callExpression)];
+      var outputReversed = [...output].reverse(); // realVar
+
+      outputReversed.forEach(outputName => {
+        newObjectBody.push((0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(outputName), getOutputMemberExpression(newOutputNames[outputName]))));
+      }); // DECOY STATEMENTS
 
       var decoyKey = this.gen.generate();
-      var decoyNodes = [(0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false), [(0, _gen.ThrowStatement)((0, _gen.NewExpression)((0, _gen.Identifier)("Error"), [(0, _gen.Literal)(this.getPlaceholder())]))]), (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false), [(0, _gen.ReturnStatement)((0, _gen.Identifier)(resultName))]), (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false), [(0, _gen.ReturnStatement)((0, _gen.Identifier)(resultName))]), (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(decoyKey), false), [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(decoyKey), false))]), (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false), [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Identifier)(this.gen.generate()), false))])];
+      var decoyNodes = [// if (result.random) throw result.prop.random
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ThrowStatement)((0, _gen.NewExpression)((0, _gen.Identifier)("Error"), [getOutputMemberExpression(this.gen.generate())]))]), // if (result.random) return true;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ReturnStatement)((0, _gen.Literal)(true))]), // if (result.random) return result;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ReturnStatement)((0, _gen.Identifier)(resultName))]), // if (result.random) return result.random;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(decoyKey), true), [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(decoyKey), true))]), // if(result.random1) return result.random2;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true))]), // if(result.random) return flatFn;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ReturnStatement)((0, _gen.Identifier)(newName))]), // if(result.random) flatFn = undefined;
+      (0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(this.gen.generate()), true), [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(newName), (0, _gen.Identifier)("undefined")))]), // if(!result) return;
+      (0, _gen.IfStatement)((0, _gen.UnaryExpression)("!", (0, _gen.Identifier)(resultName)), [(0, _gen.ReturnStatement)()])].filter(() => Math.random() > 0.25); // if (result.output) return result.output.returnValue;
+      // this is the real return statement, it is always added
+
+      decoyNodes.push((0, _gen.IfStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(resultName), (0, _gen.Literal)(propName), true), [(0, _gen.ReturnStatement)(getOutputMemberExpression(returnOutputName))]));
       (0, _random.shuffle)(decoyNodes);
-      decoyNodes.forEach(decoyNode => {
-        if (Math.random() < 0.5) {
-          newObjectBody.push(decoyNode);
-        }
-      });
-      newObjectBody.push(...outputReversed.map(name => {
-        return (0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(name), (0, _insert.clone)(pop)));
-      }), (0, _gen.ReturnStatement)((0, _insert.clone)(pop)));
+      newObjectBody.push(...decoyNodes);
       object.body = (0, _gen.BlockStatement)(newObjectBody);
       object.params = newParamNodes;
     };

package/dist/transforms/hexadecimalNumbers.js

@@ -13,24 +13,49 @@ var _gen = require("../util/gen");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+/**
+ * The HexadecimalNumbers transformation converts number literals into the hexadecimal form.
+ *
+ * This is done by replacing the number literal with an Identifier to ensure escodegen properly outputs it as such
+ *
+ * This transformation also handles BigInt support, so its always enabled for this reason.
+ */
 class HexadecimalNumbers extends _transform.default {
   constructor(o) {
     super(o, _order.ObfuscateOrder.HexadecimalNumbers);
   }
 
-  match(object, parents) {
+  isNumberLiteral(object) {
     return object.type === "Literal" && typeof object.value === "number" && Math.floor(object.value) === object.value;
   }
 
+  isBigIntLiteral(object) {
+    return object.type === "Literal" && typeof object.value === "bigint";
+  }
+
+  match(object, parents) {
+    return this.options.hexadecimalNumbers && this.isNumberLiteral(object) || this.isBigIntLiteral(object);
+  }
+
   transform(object, parents) {
-    return () => {
-      // Technically, a Literal will never be negative because it's supposed to be inside a UnaryExpression with a "-" operator.
-      // This code handles it regardless
-      var isNegative = object.value < 0;
-      var hex = Math.abs(object.value).toString(16);
-      var newStr = (isNegative ? "-" : "") + "0x" + hex;
-      this.replace(object, (0, _gen.Identifier)(newStr));
-    };
+    if (this.isNumberLiteral(object)) {
+      return () => {
+        // Technically, a Literal will never be negative because it's supposed to be inside a UnaryExpression with a "-" operator.
+        // This code handles it regardless
+        var isNegative = object.value < 0;
+        var hex = Math.abs(object.value).toString(16);
+        var newStr = (isNegative ? "-" : "") + "0x" + hex;
+        this.replace(object, (0, _gen.Identifier)(newStr));
+      };
+    } // https://github.com/MichaelXF/js-confuser/issues/79
+
+
+    if (this.isBigIntLiteral(object)) {
+      return () => {
+        // Use an Identifier with the raw string
+        this.replace(object, (0, _gen.Identifier)(object.raw));
+      };
+    }
   }
 
 }

package/dist/transforms/identifier/movedDeclarations.js

@@ -44,7 +44,7 @@ class MovedDeclarations extends _transform.default {
       var variableDeclarations = Object.create(null);
       (0, _traverse.walk)(object, parents, (o, p) => {
         if (o.type == "Identifier") {
-          if ((0, _scope.getLexicalScope)(o, p) !== object) {
+          if (o.hidden || (0, _scope.getLexicalScope)(o, p) !== object) {
             illegal.add(o.name);
           } else {
             var info = (0, _identifiers.getIdentifierInfo)(o, p);

package/dist/transforms/identifier/nameRecycling.js

@@ -87,7 +87,6 @@ class NameRecycling extends _transform.default {
                 return;
               }
 
-              lastReferenceMap.set(o.name, i);
               var comparingContext = info.spec.isDefined ? (0, _insert.getDefiningContext)(o, p) : (0, _insert.getReferencingContexts)(o, p).find(x => (0, _insert.isVarContext)(x));
 
               if (comparingContext !== context) {
@@ -101,7 +100,12 @@ class NameRecycling extends _transform.default {
                 }
 
                 if (info.spec.isDefined) {
-                  if (defined.has(o.name) || (0, _traverse.getBlock)(o, p) !== object) {
+                  // Function Declarations can be used before they're defined, if so, don't change this
+                  if (info.isFunctionDeclaration && lastReferenceMap.has(o.name)) {
+                    illegal.add(o.name);
+                  }
+
+                  if (defined.has(o.name) || (0, _traverse.getBlock)(o, p) !== object || info.isImportSpecifier) {
                     illegal.add(o.name);
                   }
 
@@ -111,6 +115,8 @@ class NameRecycling extends _transform.default {
                   referencedHere.add(o.name);
                 }
               }
+
+              lastReferenceMap.set(o.name, i);
             };
           }
         }); // console.log(i, definedHere);

package/dist/transforms/identifier/renameVariables.js

@@ -165,6 +165,15 @@ class RenameVariables extends _transform.default {
         if (newName && typeof newName === "string") {
           if (o.$renamed) {
             return;
+          } // Strange behavior where the `local` and `imported` objects are the same
+
+
+          if (info.isImportSpecifier) {
+            var importSpecifierIndex = p.findIndex(x => x.type === "ImportSpecifier");
+
+            if (importSpecifierIndex != -1 && p[importSpecifierIndex].imported === (p[importSpecifierIndex - 1] || o) && p[importSpecifierIndex].imported && p[importSpecifierIndex].imported.type === "Identifier") {
+              p[importSpecifierIndex].imported = (0, _insert.clone)(p[importSpecifierIndex - 1] || o);
+            }
           } // console.log(o.name, "->", newName);
 
 

package/dist/transforms/lock/antiDebug.js

@@ -43,7 +43,7 @@ class AntiDebug extends _transform.default {
     var startTimeName = this.getPlaceholder();
     var endTimeName = this.getPlaceholder();
     var isDevName = this.getPlaceholder();
-    var functionDeclaration = (0, _gen.FunctionDeclaration)(fnName, [], [...(0, _template.default)("\n      var ".concat(startTimeName, " = new Date();\n      debugger;\n      var ").concat(endTimeName, " = new Date();\n      var ").concat(isDevName, " = ").concat(endTimeName, "-").concat(startTimeName, " > 1000;\n      ")).compile(), (0, _gen.IfStatement)((0, _gen.Identifier)(isDevName), this.options.lock.countermeasures ? this.lock.getCounterMeasuresCode() : [(0, _gen.WhileStatement)((0, _gen.Identifier)(isDevName), [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(startTimeName), (0, _gen.Identifier)(endTimeName)))])], null)]);
+    var functionDeclaration = (0, _gen.FunctionDeclaration)(fnName, [], [...(0, _template.default)("\n      var ".concat(startTimeName, " = new Date();\n      debugger;\n      var ").concat(endTimeName, " = new Date();\n      var ").concat(isDevName, " = ").concat(endTimeName, "-").concat(startTimeName, " > 1000;\n      ")).compile(), (0, _gen.IfStatement)((0, _gen.Identifier)(isDevName), this.options.lock.countermeasures ? this.lock.getCounterMeasuresCode(tree.body, [tree]) : [(0, _gen.WhileStatement)((0, _gen.Identifier)(isDevName), [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(startTimeName), (0, _gen.Identifier)(endTimeName)))])], null)]);
     tree.body.unshift(...DevToolsDetection.compile({
       functionName: fnName
     }));

package/dist/transforms/minify.js

@@ -21,6 +21,8 @@ var _assert = require("assert");
 
 var _scope = require("../util/scope");
 
+var _template = _interopRequireDefault(require("../templates/template"));
+
 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; }
@@ -34,12 +36,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * - `x['y']` **->** `x.y`
  */
 class Minify extends _transform.default {
+  /**
+   * A helper function that is introduced preserve function semantics
+   */
   constructor(o) {
     super(o, _order.ObfuscateOrder.Minify);
 
-    _defineProperty(this, "variables", void 0);
-
-    this.variables = new Map();
+    _defineProperty(this, "arrowFunctionName", void 0);
   }
 
   match(object, parents) {
@@ -212,15 +215,28 @@ class Minify extends _transform.default {
         });
 
         if (canTransform) {
+          if (!this.arrowFunctionName) {
+            this.arrowFunctionName = this.getPlaceholder();
+            (0, _insert.append)(parents[parents.length - 1] || object, (0, _template.default)("\n            function ".concat(this.arrowFunctionName, "(arrowFn){\n              return function(){ return arrowFn(...arguments) }\n            }\n            ")).single());
+          }
+
+          const wrap = object => {
+            return (0, _gen.CallExpression)((0, _gen.Identifier)(this.arrowFunctionName), [(0, _insert.clone)(object)]);
+          };
+
           if (object.type == "FunctionExpression") {
             object.type = "ArrowFunctionExpression";
+            this.replace(object, wrap((0, _insert.clone)(object)));
           } else {
             var arrow = { ...(0, _insert.clone)(object),
               type: "ArrowFunctionExpression"
             };
-            this.replace(object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(object.id.name, arrow)));
+            this.replace(object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(object.id.name, wrap(arrow))));
             var x = this.transform(arrow, []);
-            x();
+
+            if (typeof x === "function") {
+              x();
+            }
           }
         }
       };
@@ -372,7 +388,7 @@ class Minify extends _transform.default {
           object.alternate = null;
         }
 
-        if (object.consequent.body.length == 1 && object.alternate && object.alternate.body.length == 1) {
+        if (object.consequent && object.consequent.body && object.consequent.body.length == 1 && object.alternate && object.alternate.body.length == 1) {
           var stmt1 = (0, _insert.clone)(object.consequent.body[0]);
           var stmt2 = (0, _insert.clone)(object.alternate.body[0]); // if (a) {return b;} else {return c;} -> return a ? b : c;
 

package/dist/transforms/rgf.js

@@ -241,7 +241,8 @@ class RGF extends _transform.default {
                     // fn
                     // In most cases the identifier is being used like this (call expression, or referenced to be called later)
                     // Replace it with a simple wrapper function that will pass on the reference array
-                    var conditionalExpression = (0, _gen.ConditionalExpression)((0, _template.default)("typeof ".concat(referenceArray, "[").concat(index, "] === \"function\" && ").concat(referenceArray, "[").concat(index, "][\"").concat(referenceSignatures[index] || "_", "\"]")).single().expression, (0, _gen.FunctionExpression)([], [(0, _gen.ReturnStatement)((0, _gen.CallExpression)(memberExpression, [(0, _gen.Identifier)(referenceArray), (0, _gen.SpreadElement)((0, _gen.Identifier)("arguments"))]))]), memberExpression);
+                    var conditionalExpression = (0, _gen.ConditionalExpression)((0, _template.default)("typeof ".concat(referenceArray, "[").concat(index, "] === \"function\" && ").concat(referenceArray, "[").concat(index, "][\"").concat(referenceSignatures[index] || "_", "\"]")).single().expression, (0, _gen.FunctionExpression)([], [(0, _gen.ReturnStatement)( // clone() is required!
+                    (0, _gen.CallExpression)((0, _insert.clone)(memberExpression), [(0, _gen.Identifier)(referenceArray), (0, _gen.SpreadElement)((0, _gen.Identifier)("arguments"))]))]), memberExpression);
                     this.replace(o, conditionalExpression);
                   }
                 }
@@ -258,8 +259,6 @@ class RGF extends _transform.default {
 
         let [object, parents] = _ref2;
         var name = object === null || object === void 0 ? void 0 : (_object$id2 = object.id) === null || _object$id2 === void 0 ? void 0 : _object$id2.name;
-        var hasName = !!name;
-        var params = object.params.map(x => x.name) || [];
         var signature = referenceSignatures[names.get(name)];
         var embeddedName = name || this.getPlaceholder(); // Since `new Function` is completely isolated, create an entire new obfuscator and run remaining transformations.
         // RGF runs early and needs completed code before converting to a string.
@@ -272,7 +271,8 @@ class RGF extends _transform.default {
             integrity: false
           },
           eval: false,
-          hideInitializingCode: false
+          hideInitializingCode: false,
+          stringEncoding: false
         });
         var transforms = Object.values(obfuscator.transforms).filter(x => x.priority > this.priority);
         var embeddedFunction = { ...object,

package/dist/transforms/stack.js

@@ -44,7 +44,7 @@ class Stack extends _transform.default {
     return () => {
       // Uncaught SyntaxError: Getter must not have any formal parameters.
       // Uncaught SyntaxError: Setter must have exactly one formal parameter
-      var propIndex = parents.findIndex(x => x.type == "Property");
+      var propIndex = parents.findIndex(x => x.type === "Property" || x.type === "MethodDefinition");
 
       if (propIndex !== -1) {
         if (parents[propIndex].value === (parents[propIndex - 1] || object)) {

package/dist/transforms/string/stringConcealing.js

@@ -70,17 +70,20 @@ class StringConcealing extends _transform.default {
 
     _defineProperty(this, "encoding", Object.create(null));
 
+    _defineProperty(this, "gen", void 0);
+
     _defineProperty(this, "hasAllEncodings", void 0);
 
     this.set = new Set();
     this.index = Object.create(null);
     this.arrayExpression = (0, _gen.ArrayExpression)([]);
-    this.hasAllEncodings = false; // Pad array with useless strings
+    this.hasAllEncodings = false;
+    this.gen = this.getGenerator(); // Pad array with useless strings
 
-    var dead = (0, _random.getRandomInteger)(4, 10);
+    var dead = (0, _random.getRandomInteger)(5, 15);
 
     for (var i = 0; i < dead; i++) {
-      var str = (0, _random.getRandomString)((0, _random.getRandomInteger)(4, 20));
+      var str = (0, _random.getRandomString)((0, _random.getRandomInteger)(5, 40));
       var fn = this.transform((0, _gen.Literal)(str), []);
 
       if (fn) {
@@ -104,7 +107,7 @@ class StringConcealing extends _transform.default {
       (0, _insert.append)(tree, (0, _template.default)("\n            \n            function ".concat(getterFn, "(x, y, z, a = ").concat(decodeFn, ", b = ").concat(cacheName, "){\n              if ( z ) {\n                return y[").concat(cacheName, "[z]] = ").concat(getterFn, "(x, y);\n              } else if ( y ) {\n                [b, y] = [a(b), x || z]\n              }\n            \n              return y ? x[b[y]] : ").concat(cacheName, "[x] || (z=(b[x], a), ").concat(cacheName, "[x] = z(").concat(this.arrayName, "[x]))\n            }\n  \n            ")).single());
     });
     var flowIntegrity = this.getPlaceholder();
-    (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)([(0, _gen.VariableDeclarator)(cacheName, (0, _gen.ArrayExpression)([])), (0, _gen.VariableDeclarator)(flowIntegrity, (0, _gen.Literal)(0)), (0, _gen.VariableDeclarator)(this.arrayName, (0, _gen.CallExpression)((0, _gen.FunctionExpression)([], [(0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)("a", this.arrayExpression)), (0, _template.default)("return (".concat(flowIntegrity, " ? a.pop() : ").concat(flowIntegrity, "++, a)")).single()]), []))]));
+    (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)([(0, _gen.VariableDeclarator)(cacheName, (0, _gen.ArrayExpression)([])), (0, _gen.VariableDeclarator)(flowIntegrity, (0, _gen.Literal)(0)), (0, _gen.VariableDeclarator)(this.arrayName, (0, _gen.CallExpression)((0, _gen.FunctionExpression)([], [(0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)("a", this.arrayExpression)), (0, _template.default)("return (".concat(flowIntegrity, " ? a[\"pop\"]() : ").concat(flowIntegrity, "++, a)")).single()]), []))]));
   }
 
   match(object, parents) {
@@ -117,7 +120,7 @@ class StringConcealing extends _transform.default {
   transform(object, parents) {
     return () => {
       // Empty strings are discarded
-      if (!object.value || this.ignore.has(object.value)) {
+      if (!object.value || this.ignore.has(object.value) || object.value.length == 0) {
         return;
       }
 
@@ -143,53 +146,87 @@ class StringConcealing extends _transform.default {
 
       if (encoder.decode(encoded) != object.value) {
         this.ignore.add(object.value);
-        this.warn(object.value.slice(0, 100));
+        this.warn(type, object.value.slice(0, 100));
         return;
-      } // Fix 1. weird undefined error
+      }
+
+      var index = -1;
 
+      if (!this.set.has(object.value)) {
+        this.arrayExpression.elements.push((0, _gen.Literal)(encoded));
+        index = this.arrayExpression.elements.length - 1;
+        this.index[object.value] = [index, fnName];
+        this.set.add(object.value);
+      } else {
+        [index, fnName] = this.index[object.value];
+        (0, _assert.ok)(typeof index === "number");
+      }
 
-      if (object.value && object.value.length > 0) {
-        var index = -1;
+      (0, _assert.ok)(index != -1, "index == -1");
+      var callExpr = (0, _gen.CallExpression)((0, _gen.Identifier)(fnName), [(0, _gen.Literal)(index)]); // use `.apply` to fool automated de-obfuscators
 
-        if (!this.set.has(object.value)) {
-          this.arrayExpression.elements.push((0, _gen.Literal)(encoded));
-          index = this.arrayExpression.elements.length - 1;
-          this.index[object.value] = [index, fnName];
-          this.set.add(object.value);
-        } else {
-          [index, fnName] = this.index[object.value];
-          (0, _assert.ok)(typeof index === "number");
-        }
+      if (Math.random() > 0.5) {
+        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Identifier)("apply"), false), [(0, _gen.Identifier)("undefined"), (0, _gen.ArrayExpression)([(0, _gen.Literal)(index)])]);
+      } // use `.call`
+      else if (Math.random() > 0.5) {
+        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Identifier)("call"), false), [(0, _gen.Identifier)("undefined"), (0, _gen.Literal)(index)]);
+      }
 
-        (0, _assert.ok)(index != -1, "index == -1");
-        var callExpr = (0, _gen.CallExpression)((0, _gen.Identifier)(fnName), [(0, _gen.Literal)(index)]); // use `.apply` to fool automated de-obfuscators
+      var referenceType = "call";
 
-        if (Math.random() > 0.5) {
-          callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Identifier)("apply"), false), [(0, _gen.ThisExpression)(), (0, _gen.ArrayExpression)([(0, _gen.Literal)(index)])]);
-        } // use `.call`
-        else if (Math.random() > 0.5) {
-          callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Identifier)("call"), false), [(0, _gen.ThisExpression)(), (0, _gen.Literal)(index)]);
-        }
+      if (parents.length && Math.random() < 0.5 / this.variablesMade) {
+        referenceType = "constantReference";
+      }
 
-        var constantReference = parents.length && Math.random() > 0.5 / this.variablesMade;
+      var newExpr = callExpr;
 
-        if (constantReference) {
-          // Define the string earlier, reference the name here
-          var name = this.getPlaceholder();
-          var place = (0, _random.choice)(parents.filter(node => (0, _traverse.isBlock)(node)));
+      if (referenceType === "constantReference") {
+        // Define the string earlier, reference the name here
+        this.variablesMade++;
+        var constantReferenceType = (0, _random.choice)(["variable", "array", "object"]);
+        var place = (0, _random.choice)(parents.filter(node => (0, _traverse.isBlock)(node)));
 
-          if (!place) {
-            this.error(Error("No lexical block to insert code"));
-          }
+        if (!place) {
+          this.error(new Error("No lexical block to insert code"));
+        }
 
-          place.body.unshift((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(name, callExpr)));
-          this.replaceIdentifierOrLiteral(object, (0, _gen.Identifier)(name), parents);
-          this.variablesMade++;
-        } else {
-          // Direct call to the getter function
-          this.replaceIdentifierOrLiteral(object, callExpr, parents);
+        switch (constantReferenceType) {
+          case "variable":
+            var name = this.getPlaceholder();
+            (0, _insert.prepend)(place, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(name, callExpr)));
+            newExpr = (0, _gen.Identifier)(name);
+            break;
+
+          case "array":
+            if (!place.$stringConcealingArray) {
+              place.$stringConcealingArray = (0, _gen.ArrayExpression)([]);
+              place.$stringConcealingArrayName = this.getPlaceholder();
+              (0, _insert.prepend)(place, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(place.$stringConcealingArrayName, place.$stringConcealingArray)));
+            }
+
+            var arrayIndex = place.$stringConcealingArray.elements.length;
+            place.$stringConcealingArray.elements.push(callExpr);
+            var memberExpression = (0, _gen.MemberExpression)((0, _gen.Identifier)(place.$stringConcealingArrayName), (0, _gen.Literal)(arrayIndex), true);
+            newExpr = memberExpression;
+            break;
+
+          case "object":
+            if (!place.$stringConcealingObject) {
+              place.$stringConcealingObject = (0, _gen.ObjectExpression)([]);
+              place.$stringConcealingObjectName = this.getPlaceholder();
+              (0, _insert.prepend)(place, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(place.$stringConcealingObjectName, place.$stringConcealingObject)));
+            }
+
+            var propName = this.gen.generate();
+            var property = (0, _gen.Property)((0, _gen.Literal)(propName), callExpr, true);
+            place.$stringConcealingObject.properties.push(property);
+            var memberExpression = (0, _gen.MemberExpression)((0, _gen.Identifier)(place.$stringConcealingObjectName), (0, _gen.Literal)(propName), true);
+            newExpr = memberExpression;
+            break;
         }
       }
+
+      this.replaceIdentifierOrLiteral(object, newExpr, parents);
     };
   }
 

package/dist/transforms/transform.js

@@ -378,7 +378,7 @@ class Transform {
     }
   }
   /**
-   * Verbose logging for warning/importing messages.
+   * Verbose logging for warning/important messages.
    * @param messages
    */
 

package/dist/traverse.js

@@ -40,15 +40,7 @@ function isBlock(object) {
 }
 
 function walk(object, parents, onEnter) {
-  let seen = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : new Set();
-
   if (typeof object === "object" && object) {
-    if (seen.has(object)) {
-      console.log(object);
-      throw new Error("Already seen: " + object.type);
-    }
-
-    seen.add(object);
     var newParents = [object, ...parents];
 
     if (!Array.isArray(object)) {