js-confuser 1.5.8 → 1.6.0

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,67 +206,74 @@ 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 () => {
-          if (o.type == "ReturnStatement" && (0, _insert.getVarContext)(o, p) === object) {
-            var elements = output.map(_gen.Identifier);
+        // Change return statements from
+        // return (argument)
+        // to
+        // return [ [modifiedRefs],  ]
+        if (o.type == "ReturnStatement" && (0, _insert.getVarContext)(o, p) === object) {
+          return () => {
+            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));
+              // FIX: The return argument must be executed first so it must use 'unshift'
+              returnObject.properties.unshift((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))));
+      var newBody = (0, _insert.getBlockBody)(object.body); // Remove 'use strict' directive
 
-      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)([]))));
+      if (newBody.length > 0 && newBody[0].directive) {
+        newBody.shift();
       }
 
-      var newFunctionExpression = (0, _gen.FunctionExpression)([(0, _gen.Identifier)(valName)], newBody);
+      var newFunctionExpression = (0, _gen.FunctionExpression)([(0, _gen.ArrayPattern)(input.map(name => (0, _gen.Identifier)(name))), (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 newParamNames = object.params.map(() => 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(name => (0, _gen.Identifier)(name))), (0, _gen.ArrayExpression)(newParamNames.map(name => (0, _gen.Identifier)(name))), (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(() => (0, _random.chance)(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;
+      object.params = newParamNames.map(name => (0, _gen.Identifier)(name));
     };
   }
 

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/globalAnalysis.js

@@ -0,0 +1,88 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _constants = require("../../constants");
+
+var _identifiers = require("../../util/identifiers");
+
+var _transform = _interopRequireDefault(require("../transform"));
+
+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; }
+
+/**
+ * Global Analysis is responsible for finding all the global variables used in the code.
+ *
+ * A 'global variable' is one that is:
+ * - Referenced
+ * - Never defined or overridden
+ */
+class GlobalAnalysis extends _transform.default {
+  constructor(o) {
+    super(o);
+
+    _defineProperty(this, "notGlobals", void 0);
+
+    _defineProperty(this, "globals", void 0);
+
+    this.globals = Object.create(null);
+    this.notGlobals = new Set();
+  }
+
+  match(object, parents) {
+    return object.type == "Identifier" && !_constants.reservedKeywords.has(object.name);
+  }
+
+  transform(object, parents) {
+    // no touching `import()` or `import x from ...`
+    var importIndex = parents.findIndex(x => x.type == "ImportExpression" || x.type == "ImportDeclaration");
+
+    if (importIndex !== -1) {
+      if (parents[importIndex].source === (parents[importIndex - 1] || object)) {
+        return;
+      }
+    }
+
+    var info = (0, _identifiers.getIdentifierInfo)(object, parents);
+
+    if (!info.spec.isReferenced) {
+      return;
+    } // Cannot be defined or overridden
+
+
+    if (info.spec.isDefined || info.spec.isModified) {
+      delete this.globals[object.name];
+      this.notGlobals.add(object.name);
+      return;
+    } // Add to globals
+
+
+    if (!this.notGlobals.has(object.name)) {
+      if (!this.globals[object.name]) {
+        this.globals[object.name] = [];
+      }
+
+      this.globals[object.name].push([object, parents]);
+    }
+
+    var assignmentIndex = parents.findIndex(x => x.type == "AssignmentExpression");
+    var updateIndex = parents.findIndex(x => x.type == "UpdateExpression");
+
+    if (assignmentIndex != -1 && parents[assignmentIndex].left === (parents[assignmentIndex - 1] || object) || updateIndex != -1) {
+      var memberIndex = parents.findIndex(x => x.type == "MemberExpression");
+
+      if (memberIndex == -1 || memberIndex > (assignmentIndex == -1 ? assignmentIndex : updateIndex)) {
+        delete this.globals[object.name];
+        this.notGlobals.add(object.name);
+      }
+    }
+  }
+
+}
+
+exports.default = GlobalAnalysis;

package/dist/transforms/identifier/globalConcealing.js

@@ -15,92 +15,30 @@ var _gen = require("../../util/gen");
 
 var _insert = require("../../util/insert");
 
-var _identifiers = require("../../util/identifiers");
-
 var _random = require("../../util/random");
 
 var _constants = require("../../constants");
 
 var _probability = require("../../probability");
 
+var _globalAnalysis = _interopRequireDefault(require("./globalAnalysis"));
+
 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 GlobalAnalysis extends _transform.default {
-  constructor(o) {
-    super(o);
-
-    _defineProperty(this, "notGlobals", void 0);
-
-    _defineProperty(this, "globals", void 0);
-
-    this.globals = Object.create(null);
-    this.notGlobals = new Set();
-  }
-
-  match(object, parents) {
-    return object.type == "Identifier" && !_constants.reservedKeywords.has(object.name);
-  }
-
-  transform(object, parents) {
-    // no touching `import()` or `import x from ...`
-    var importIndex = parents.findIndex(x => x.type == "ImportExpression" || x.type == "ImportDeclaration");
-
-    if (importIndex !== -1) {
-      if (parents[importIndex].source === (parents[importIndex - 1] || object)) {
-        return;
-      }
-    }
-
-    var info = (0, _identifiers.getIdentifierInfo)(object, parents);
-
-    if (!info.spec.isReferenced) {
-      return;
-    } // Add to globals
-
-
-    if (!this.notGlobals.has(object.name)) {
-      if (!this.globals[object.name]) {
-        this.globals[object.name] = [];
-      }
-
-      this.globals[object.name].push([object, parents]);
-    }
-
-    if (info.spec.isDefined || info.spec.isModified) {
-      delete this.globals[object.name];
-      this.notGlobals.add(object.name);
-    }
-
-    var assignmentIndex = parents.findIndex(x => x.type == "AssignmentExpression");
-    var updateIndex = parents.findIndex(x => x.type == "UpdateExpression");
-
-    if (assignmentIndex != -1 && parents[assignmentIndex].left === (parents[assignmentIndex - 1] || object) || updateIndex != -1) {
-      var memberIndex = parents.findIndex(x => x.type == "MemberExpression");
-
-      if (memberIndex == -1 || memberIndex > (assignmentIndex == -1 ? assignmentIndex : updateIndex)) {
-        delete this.globals[object.name];
-        this.notGlobals.add(object.name);
-      }
-    }
-  }
-
-}
 /**
  * Global Concealing hides global variables being accessed.
  *
  * - Any variable that is not defined is considered "global"
  */
-
-
 class GlobalConcealing extends _transform.default {
   constructor(o) {
     super(o, _order.ObfuscateOrder.GlobalConcealing);
 
     _defineProperty(this, "globalAnalysis", void 0);
 
-    this.globalAnalysis = new GlobalAnalysis(o);
+    this.globalAnalysis = new _globalAnalysis.default(o);
     this.before.push(this.globalAnalysis);
   }
 
@@ -126,10 +64,10 @@ class GlobalConcealing extends _transform.default {
         } else if (!(0, _probability.ComputeProbabilityMap)(this.options.globalConcealing, x => x, x)) {
           delete globals[x];
         }
-      }); // this.log(Object.keys(globals).join(', '))
+      });
 
       if (Object.keys(globals).length > 0) {
-        var used = new Set(); // 1. Make getter function
+        var used = new Set(); // Make getter function
         // holds "window" or "global"
 
         var globalVar = this.getPlaceholder(); // holds outermost "this"
@@ -137,10 +75,11 @@ class GlobalConcealing extends _transform.default {
         var thisVar = this.getPlaceholder(); // "window" or "global" in node
 
         var global = this.options.globalVariables.values().next().value || "window";
+        var alternateGlobal = global === "window" ? "global" : "window";
         var getGlobalVariableFnName = this.getPlaceholder();
         var getThisVariableFnName = this.getPlaceholder(); // Returns global variable or fall backs to `this`
 
-        var getGlobalVariableFn = (0, _template.default)("\n        var ".concat(getGlobalVariableFnName, " = function(){\n          try {\n            return ").concat(global, ";\n          } catch (e){\n            return ").concat(getThisVariableFnName, "[\"call\"](this);\n          }\n        }")).single();
+        var getGlobalVariableFn = (0, _template.default)("\n        var ".concat(getGlobalVariableFnName, " = function(){\n          try {\n            return ").concat(global, " || ").concat(alternateGlobal, " || (new Function(\"return this\"))();\n          } catch (e){\n            return ").concat(getThisVariableFnName, "[\"call\"](this);\n          }\n        }")).single();
         var getThisVariableFn = (0, _template.default)("\n        var ".concat(getThisVariableFnName, " = function(){\n          try {\n            return this;\n          } catch (e){\n            return null;\n          }\n        }")).single(); // 2. Replace old accessors
 
         var globalFn = this.getPlaceholder();
@@ -157,19 +96,7 @@ class GlobalConcealing extends _transform.default {
           newNames[name] = state;
           locations.forEach(_ref => {
             let [node, parents] = _ref;
-
-            if (!parents.find(x => x.$dispatcherSkip)) {
-              // Do not replace
-              if (parents[0]) {
-                if (parents[0].type == "ClassDeclaration" || parents[0].type == "ClassExpression" || parents[0].type == "FunctionExpression" || parents[0].type == "FunctionDeclaration") {
-                  if (parents[0].id === node) {
-                    return;
-                  }
-                }
-              }
-
-              this.replace(node, (0, _gen.CallExpression)((0, _gen.Identifier)(globalFn), [(0, _gen.Literal)(state)]));
-            }
+            this.replace(node, (0, _gen.CallExpression)((0, _gen.Identifier)(globalFn), [(0, _gen.Literal)(state)]));
           });
         }); // Adds all global variables to the switch statement
 
@@ -178,7 +105,7 @@ class GlobalConcealing extends _transform.default {
             var state;
 
             do {
-              state = (0, _random.getRandomInteger)(-1000, 1000 + used.size + this.options.globalVariables.size * 100);
+              state = (0, _random.getRandomInteger)(0, 1000 + used.size + this.options.globalVariables.size * 100);
             } while (used.has(state));
 
             used.add(state);
@@ -191,7 +118,7 @@ class GlobalConcealing extends _transform.default {
           var code = newNames[name];
           var body = [(0, _gen.ReturnStatement)((0, _gen.LogicalExpression)("||", (0, _gen.MemberExpression)((0, _gen.Identifier)(globalVar), (0, _gen.Literal)(name), true), (0, _gen.MemberExpression)((0, _gen.Identifier)(thisVar), (0, _gen.Literal)(name), true)))];
 
-          if (Math.random() > 0.5 && name) {
+          if ((0, _random.chance)(50)) {
             body = [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(returnName), (0, _gen.LogicalExpression)("||", (0, _gen.Literal)(name), (0, _gen.MemberExpression)((0, _gen.Identifier)(thisVar), (0, _gen.Literal)(name), true)))), (0, _gen.BreakStatement)()];
           }
 

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);
@@ -112,13 +112,7 @@ class MovedDeclarations extends _transform.default {
       var variableDeclaration = (0, _gen.VariableDeclaration)(movingNames.map(name => {
         return (0, _gen.VariableDeclarator)(name);
       }));
-
-      if (object.type == "Program") {
-        (0, _insert.prepend)(object, variableDeclaration);
-      } else {
-        body.unshift(variableDeclaration);
-      }
-
+      (0, _insert.prepend)(object, variableDeclaration);
       movingNames.forEach(name => {
         var {
           location,