js-confuser 2.0.0-alpha.5 → 2.0.1

package/dist/transforms/controlFlowFlattening.js

@@ -16,8 +16,7 @@ var _assert = require("assert");
 var _NameGen = require("../utils/NameGen");
 var _constants = require("../constants");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -39,18 +38,18 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 // Function deemed unsafe for CFF
 var CFF_UNSAFE = Symbol("CFF_UNSAFE");
 
-/**
- * Breaks functions into DAGs (Directed Acyclic Graphs)
- *
- * - 1. Break functions into chunks
- * - 2. Shuffle chunks but remember their original position
- * - 3. Create a Switch statement inside a While loop, each case is a chunk, and the while loops exits on the last transition.
- *
- * The Switch statement:
- *
- * - 1. The state variable controls which case will run next
- * - 2. At the end of each case, the state variable is updated to the next block of code.
- * - 3. The while loop continues until the the state variable is the end state.
+/**
+ * Breaks functions into DAGs (Directed Acyclic Graphs)
+ *
+ * - 1. Break functions into chunks
+ * - 2. Shuffle chunks but remember their original position
+ * - 3. Create a Switch statement inside a While loop, each case is a chunk, and the while loops exits on the last transition.
+ *
+ * The Switch statement:
+ *
+ * - 1. The state variable controls which case will run next
+ * - 2. At the end of each case, the state variable is updated to the next block of code.
+ * - 3. The while loop continues until the the state variable is the end state.
  */
 var _default = exports["default"] = function _default(_ref) {
   var Plugin = _ref.Plugin;
@@ -76,21 +75,23 @@ var _default = exports["default"] = function _default(_ref) {
   var mangleNumericalLiterals = true; // 50 => state + X
   var mangleBooleanLiterals = true; // true => state == X
   var addWithStatement = true; // Disabling not supported yet
+  var addGeneratorFunction = true; // Wrap in generator function?
 
   var cffPrefix = me.getPlaceholder();
 
   // Amount of blocks changed by Control Flow Flattening
   var cffCounter = 0;
-  var functionsModified = new Set();
+  var functionsModified = [];
   function flagFunctionToAvoid(path, reason) {
     var fnOrProgram = (0, _astUtils.getParentFunctionOrProgram)(path);
     fnOrProgram.node[CFF_UNSAFE] = reason;
   }
   return {
     post: function post() {
-      functionsModified.forEach(function (node) {
+      for (var _i = 0, _functionsModified = functionsModified; _i < _functionsModified.length; _i++) {
+        var node = _functionsModified[_i];
         node[_constants.UNSAFE] = true;
-      });
+      }
     },
     visitor: {
       // Unsafe detection
@@ -330,8 +331,8 @@ var _default = exports["default"] = function _default(_ref) {
             });
           };
           var scopeToScopeManager = new Map();
-          /**
-           * A Basic Block is a sequence of instructions with no diversion except at the entry and exit points.
+          /**
+           * A Basic Block is a sequence of instructions with no diversion except at the entry and exit points.
            */
           var BasicBlock = /*#__PURE__*/function () {
             function BasicBlock(label, parentPath) {
@@ -489,16 +490,16 @@ var _default = exports["default"] = function _default(_ref) {
               }
             }]);
           }();
-          /**
-           * Stage 1: Flatten the code into Basic Blocks
-           *
-           * This involves transforming the Control Flow / Scopes into blocks with 'goto' statements
-           *
-           * - A block is simply a sequence of statements
-           * - A block can have a 'goto' statement to another block
-           * - A block original scope is preserved
-           *
-           * 'goto' & Scopes are transformed in Stage 2
+          /**
+           * Stage 1: Flatten the code into Basic Blocks
+           *
+           * This involves transforming the Control Flow / Scopes into blocks with 'goto' statements
+           *
+           * - A block is simply a sequence of statements
+           * - A block can have a 'goto' statement to another block
+           * - A block original scope is preserved
+           *
+           * 'goto' & Scopes are transformed in Stage 2
            */
           var switchLabel = me.getPlaceholder();
           var breakStatement = function breakStatement() {
@@ -654,7 +655,8 @@ var _default = exports["default"] = function _default(_ref) {
                 }
                 if (Number(index) === body.length - 1 && statement.isExpressionStatement() && statement.findParent(function (p) {
                   return p.isBlock();
-                }) === blockPath) {
+                }) === blockPath && programPath // <- ONLY APPLY TO TOP-LEVEL NEVER FUNCTIONS!
+                ) {
                   // Return the result of the last expression for eval() purposes
                   currentBasicBlock.insertAfter(t.returnStatement(statement.get("expression").node));
                   return 0; // continue
@@ -741,7 +743,7 @@ var _default = exports["default"] = function _default(_ref) {
                 me.changeData.deadCode++;
               }
             };
-            for (var _i = 0; _i < cloneChunkCount; _i++) {
+            for (var _i2 = 0; _i2 < cloneChunkCount; _i2++) {
               _loop2();
             }
           }
@@ -759,11 +761,11 @@ var _default = exports["default"] = function _default(_ref) {
               }
             }
 
-            /**
-             * Stage 2: Transform 'goto' statements into valid JavaScript
-             *
-             * - 'goto' is replaced with equivalent state updates and break statements
-             * - Original identifiers are converted into member expressions
+            /**
+             * Stage 2: Transform 'goto' statements into valid JavaScript
+             *
+             * - 'goto' is replaced with equivalent state updates and break statements
+             * - Original identifiers are converted into member expressions
              */
 
             // Remap 'GotoStatement' to actual state assignments and Break statements
@@ -913,19 +915,38 @@ var _default = exports["default"] = function _default(_ref) {
                         var fakeProperty = scopeNameGen.generate();
                         assignments.push(t.assignmentExpression("=", (0, _node.deepClone)(withMemberExpression), t.memberExpression((0, _node.deepClone)(scopeVar), t.stringLiteral(fakeProperty), true)));
                       }
-                      for (var _i8 = 0; _i8 < stateVars.length; _i8++) {
-                        var oldValue = currentStateValues[_i8];
-                        var newValue = newStateValues[_i8];
+                      var mutatingStateValues = _toConsumableArray(currentStateValues);
+                      var _loop5 = function _loop5(_i9) {
+                        var oldValue = currentStateValues[_i9];
+                        var newValue = newStateValues[_i9];
 
                         // console.log(oldValue, newValue);
-                        if (oldValue === newValue) continue; // No diff needed if the value doesn't change
+                        if (oldValue === newValue) return 1; // continue
+                        // No diff needed if the value doesn't change
 
-                        var assignment = t.assignmentExpression("=", (0, _node.deepClone)(stateVars[_i8]), (0, _node.numericLiteral)(newValue));
+                        var assignment = t.assignmentExpression("=", (0, _node.deepClone)(stateVars[_i9]), (0, _node.numericLiteral)(newValue));
                         if (!isDebug && addRelativeAssignments) {
-                          // Use diffs to create confusing code
-                          assignment = t.assignmentExpression("+=", (0, _node.deepClone)(stateVars[_i8]), (0, _node.numericLiteral)(newValue - oldValue));
+                          // Use two level of diffs to create confusing code:
+                          // stateVar += anotherStateVar - diff
+                          // has the effect of:
+                          // stateVar = newState
+                          var mangledNumericLiteral = function mangledNumericLiteral(value) {
+                            var stateVarIndex;
+                            do {
+                              stateVarIndex = (0, _randomUtils.getRandomInteger)(0, stateVars.length);
+                            } while (stateVarIndex === _i9 && stateVars.length > 1);
+                            var stateVarId = stateVars[stateVarIndex];
+                            var stateVarValue = mutatingStateValues[stateVarIndex];
+                            var diff = stateVarValue - value;
+                            return t.binaryExpression("-", (0, _node.deepClone)(stateVarId), (0, _node.numericLiteral)(diff));
+                          };
+                          assignment = t.assignmentExpression("+=", (0, _node.deepClone)(stateVars[_i9]), mangledNumericLiteral(newValue - oldValue));
                         }
+                        mutatingStateValues[_i9] = newValue;
                         assignments.push(assignment);
+                      };
+                      for (var _i9 = 0; _i9 < stateVars.length; _i9++) {
+                        if (_loop5(_i9)) continue;
                       }
 
                       // Add debug label
@@ -946,11 +967,11 @@ var _default = exports["default"] = function _default(_ref) {
               _loop4();
             }
 
-            /**
-             * Stage 3: Create a switch statement to handle the control flow
-             *
-             * - Add fake / impossible blocks
-             * - Add fake / predicates to the switch cases tests
+            /**
+             * Stage 3: Create a switch statement to handle the control flow
+             *
+             * - Add fake / impossible blocks
+             * - Add fake / predicates to the switch cases tests
              */
 
             // Create global numbers for predicates
@@ -962,8 +983,8 @@ var _default = exports["default"] = function _default(_ref) {
           var mainScope = basicBlocks.get(startLabel).scopeManager;
           var predicateNumbers = new Map();
           var predicateNumberCount = isDebug || !addPredicateTests ? 0 : (0, _randomUtils.getRandomInteger)(1, 4);
-          for (var _i2 = 0; _i2 < predicateNumberCount; _i2++) {
-            var name = mainScope.getNewName(me.getPlaceholder("predicate_" + _i2));
+          for (var _i3 = 0; _i3 < predicateNumberCount; _i3++) {
+            var name = mainScope.getNewName(me.getPlaceholder("predicate_" + _i3));
             var number = (0, _randomUtils.getRandomInteger)(-250, 250);
             predicateNumbers.set(name, number);
           }
@@ -984,7 +1005,7 @@ var _default = exports["default"] = function _default(_ref) {
 
           // Add random assignments to impossible blocks
           var fakeAssignmentCount = (0, _randomUtils.getRandomInteger)(1, 3);
-          for (var _i3 = 0; _i3 < fakeAssignmentCount; _i3++) {
+          for (var _i4 = 0; _i4 < fakeAssignmentCount; _i4++) {
             var impossibleBlock = (0, _randomUtils.choice)(getImpossibleBasicBlocks());
             if (impossibleBlock) {
               var _impossibleBlock$body;
@@ -1018,7 +1039,7 @@ var _default = exports["default"] = function _default(_ref) {
             (0, _randomUtils.shuffle)(blocks);
           }
           var _loop3 = function _loop3() {
-            var block = _blocks[_i4];
+            var block = _blocks[_i5];
             if (block.label === endLabel) {
               // ok(block.body.length === 0);
               return 1; // continue
@@ -1083,19 +1104,19 @@ var _default = exports["default"] = function _default(_ref) {
             if (!isDebug && addFakeTests && (0, _randomUtils.chance)(50)) {
               // Add fake tests
               var fakeTestCount = (0, _randomUtils.getRandomInteger)(1, 3);
-              for (var _i5 = 0; _i5 < fakeTestCount; _i5++) {
+              for (var _i6 = 0; _i6 < fakeTestCount; _i6++) {
                 tests.push((0, _node.numericLiteral)(stateIntGen.generate()));
               }
               (0, _randomUtils.shuffle)(tests);
             }
             var lastTest = tests.pop();
-            for (var _i6 = 0, _tests = tests; _i6 < _tests.length; _i6++) {
-              var _test = _tests[_i6];
+            for (var _i7 = 0, _tests = tests; _i7 < _tests.length; _i7++) {
+              var _test = _tests[_i7];
               switchCases.push(t.switchCase(_test, []));
             }
             switchCases.push(t.switchCase(lastTest, block.thisPath.node.body));
           };
-          for (var _i4 = 0, _blocks = blocks; _i4 < _blocks.length; _i4++) {
+          for (var _i5 = 0, _blocks = blocks; _i5 < _blocks.length; _i5++) {
             if (_loop3()) continue;
           }
           if (!isDebug && addFakeTests) {
@@ -1125,8 +1146,8 @@ var _default = exports["default"] = function _default(_ref) {
           var parametersNames = parameters.map(function (id) {
             return id.name;
           });
-          for (var _i7 = 0, _functionExpressions = functionExpressions; _i7 < _functionExpressions.length; _i7++) {
-            var _functionExpressions$ = _slicedToArray(_functionExpressions[_i7], 4),
+          for (var _i8 = 0, _functionExpressions = functionExpressions; _i8 < _functionExpressions.length; _i8++) {
+            var _functionExpressions$ = _slicedToArray(_functionExpressions[_i8], 4),
               originalFnName = _functionExpressions$[0],
               fnLabel = _functionExpressions$[1],
               basicBlock = _functionExpressions$[2],
@@ -1164,7 +1185,7 @@ var _default = exports["default"] = function _default(_ref) {
             }
             usedArgVar = true;
             Object.assign(fn, new _template["default"]("\n              (function (...".concat(argumentsRestName, "){\n                ").concat(isDebug ? "\"Calling ".concat(originalFnName, ", Label: ").concat(fnLabel, "\";") : "", "\n                return {callExpression}\n              })\n              \n              ")).expression({
-              callExpression: t.callExpression((0, _node.deepClone)(mainFnName), argumentsNodes)
+              callExpression: createCallExpression(argumentsNodes)
             }));
           }
           var startProgramObjectExpression = basicBlocks.get(startLabel).scopeManager.getObjectExpression(startLabel);
@@ -1180,13 +1201,22 @@ var _default = exports["default"] = function _default(_ref) {
           if (!usedArgVar) {
             mainParameters.pop();
           }
-          var mainFnDeclaration = t.functionDeclaration((0, _node.deepClone)(mainFnName), parameters, t.blockStatement([whileStatement]));
+          var mainFnDeclaration = t.functionDeclaration((0, _node.deepClone)(mainFnName), parameters, t.blockStatement([whileStatement]), addGeneratorFunction);
 
           // The main function is always called with same number of arguments
           mainFnDeclaration[_constants.PREDICTABLE] = true;
-          var startProgramExpression = t.callExpression((0, _node.deepClone)(mainFnName), _toConsumableArray(startStateValues.map(function (stateValue) {
+          function createCallExpression(argumentNodes) {
+            var callExpression = t.callExpression((0, _node.deepClone)(mainFnName), argumentNodes);
+            if (!addGeneratorFunction) {
+              return callExpression;
+            }
+            return new _template["default"]("\n              ({callExpression})[\"next\"]()[\"value\"];\n              ").expression({
+              callExpression: callExpression
+            });
+          }
+          var startProgramExpression = createCallExpression(startStateValues.map(function (stateValue) {
             return (0, _node.numericLiteral)(stateValue);
-          })));
+          }));
           var _resultVar = withIdentifier("result");
           var isTopLevel = blockPath.isProgram();
           var allowReturns = !isTopLevel && blockPath.find(function (p) {
@@ -1203,7 +1233,7 @@ var _default = exports["default"] = function _default(_ref) {
             }
           });
           blockPath.node.body = [].concat(prependNodes, [mainFnDeclaration], _toConsumableArray(startProgramStatements));
-          functionsModified.add(programOrFunctionPath.node);
+          functionsModified.push(programOrFunctionPath.node);
 
           // Reset all bindings here
           blockPath.scope.bindings = Object.create(null);

package/dist/transforms/deadCode.js

@@ -12,8 +12,7 @@ var _template = _interopRequireDefault(require("../templates/template"));
 var _astUtils = require("../utils/ast-utils");
 var _PredicateGen = _interopRequireDefault(require("../utils/PredicateGen"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }

package/dist/transforms/dispatcher.js

@@ -16,8 +16,7 @@ var _setFunctionLengthTemplate = require("../templates/setFunctionLengthTemplate
 var _node = require("../utils/node");
 var _astUtils = require("../utils/ast-utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -327,9 +326,9 @@ var _default = exports["default"] = function _default(_ref) {
           });
           dispatcher[_constants.PREDICTABLE] = true;
 
-          /**
-           * Prepends the node into the block. (And registers the declaration)
-           * @param node
+          /**
+           * Prepends the node into the block. (And registers the declaration)
+           * @param node
            */
           function prepend(node) {
             var newPath = blockStatement.unshiftContainer("body", node)[0];

package/dist/transforms/extraction/duplicateLiteralsRemoval.js

@@ -10,8 +10,7 @@ var _assert = require("assert");
 var _order = require("../../order");
 var _astUtils = require("../../utils/ast-utils");
 var _node = require("../../utils/node");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function fail() {
   throw new Error("Assertion failed");
 }

package/dist/transforms/extraction/objectExtraction.js

@@ -8,8 +8,7 @@ exports["default"] = void 0;
 var _order = require("../../order");
 var t = _interopRequireWildcard(require("@babel/types"));
 var _astUtils = require("../../utils/ast-utils");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }

package/dist/transforms/finalizer.js

@@ -10,8 +10,7 @@ var _stringEncoding = _interopRequireDefault(require("./string/stringEncoding"))
 var _constants = require("../constants");
 var _assert = require("assert");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }

package/dist/transforms/flatten.js

@@ -11,8 +11,7 @@ var _order = require("../order");
 var _constants = require("../constants");
 var _functionUtils = require("../utils/function-utils");
 var _NameGen = require("../utils/NameGen");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }

package/dist/transforms/identifier/globalConcealing.js

@@ -15,8 +15,7 @@ var _getGlobalTemplate = require("../../templates/getGlobalTemplate");
 var _randomUtils = require("../../utils/random-utils");
 var _assert = require("assert");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
@@ -79,6 +78,9 @@ var _default = exports["default"] = function _default(_ref) {
               if (!identifierPath.scope.hasGlobal(identifierName)) {
                 return;
               }
+
+              // Do not transform:
+              // identifier = "value"
               var assignmentChild = identifierPath.find(function (p) {
                 var _p$parentPath;
                 return (_p$parentPath = p.parentPath) === null || _p$parentPath === void 0 ? void 0 : _p$parentPath.isAssignmentExpression();
@@ -87,6 +89,17 @@ var _default = exports["default"] = function _default(_ref) {
                 illegalGlobals.add(identifierName);
                 return;
               }
+
+              // Do not transform:
+              // for(identifier in object) or for(identifier of object)
+              var forInOfChild = identifierPath.find(function (p) {
+                var _p$parentPath2, _p$parentPath3;
+                return p.key === "left" && (((_p$parentPath2 = p.parentPath) === null || _p$parentPath2 === void 0 ? void 0 : _p$parentPath2.isForInStatement()) || ((_p$parentPath3 = p.parentPath) === null || _p$parentPath3 === void 0 ? void 0 : _p$parentPath3.isForOfStatement()));
+              });
+              if (forInOfChild && (t.isForInStatement(forInOfChild.parent) || t.isForOfStatement(forInOfChild.parent)) && forInOfChild.parent.left === forInOfChild.node) {
+                illegalGlobals.add(identifierName);
+                return;
+              }
               if (!pendingReplacements.has(identifierName)) {
                 pendingReplacements.set(identifierName, [identifierPath]);
               } else {

package/dist/transforms/identifier/movedDeclarations.js

@@ -12,13 +12,12 @@ var _staticUtils = require("../../utils/static-utils");
 var _astUtils = require("../../utils/ast-utils");
 var _template = _interopRequireDefault(require("../../templates/template"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-/**
- * Moved Declarations moves variables in two ways:
- *
- * 1) Move variables to top of the current block
- * 2) Move variables as unused function parameters
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+/**
+ * Moved Declarations moves variables in two ways:
+ *
+ * 1) Move variables to top of the current block
+ * 2) Move variables as unused function parameters
  */
 var _default = exports["default"] = function _default(_ref) {
   var Plugin = _ref.Plugin;
@@ -96,9 +95,11 @@ var _default = exports["default"] = function _default(_ref) {
       },
       VariableDeclaration: {
         exit: function exit(path) {
+          var _path$parentPath;
           if (me.isSkipped(path)) return;
           if (path.node.kind !== "var") return;
           if (path.node.declarations.length !== 1) return;
+          if ((_path$parentPath = path.parentPath) !== null && _path$parentPath !== void 0 && _path$parentPath.isExportDeclaration()) return;
           var insertionMethod = "variableDeclaration";
           var functionPath = path.findParent(function (path) {
             return path.isFunction();

package/dist/transforms/identifier/renameVariables.js

@@ -10,8 +10,7 @@ var _order = require("../../order");
 var _constants = require("../../constants");
 var _astUtils = require("../../utils/ast-utils");
 var _functionUtils = require("../../utils/function-utils");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -49,16 +48,17 @@ var _default = exports["default"] = function _default(_ref) {
             if (!(0, _astUtils.isVariableIdentifier)(path)) return;
             var contextPaths = [(0, _astUtils.getParentFunctionOrProgram)(path)];
             var isDefined = false;
-            var isParameter = false;
             if (path.isBindingIdentifier() && (0, _astUtils.isDefiningIdentifier)(path)) {
               isDefined = true;
               var binding = path.scope.getBinding(path.node.name);
-              if ((binding === null || binding === void 0 ? void 0 : binding.kind) === "param") isParameter = true;
 
               // Function ID is defined in the parent's function declaration
               if (path.key === "id" && path.parentPath.isFunctionDeclaration()) {
                 contextPaths = [(0, _astUtils.getParentFunctionOrProgram)(path.parentPath)];
               }
+              if (binding && binding.kind === "let" && binding.path.key === "handler" && binding.path.isCatchClause()) {
+                contextPaths = [path];
+              }
             }
             contextPaths.forEach(function (contextPath) {
               // console.log(contextPath.node.type, path.node.name, isDefined);
@@ -93,9 +93,9 @@ var _default = exports["default"] = function _default(_ref) {
       if (!(0, _astUtils.isVariableIdentifier)(identifierPath)) return;
       var node = identifierPath.node;
       var identifierName = node.name;
-      if (node[RENAMED]) {
-        return;
-      }
+      if (node[RENAMED]) return;
+      if (node[_constants.WITH_STATEMENT]) return; // Exclude CFF identifiers
+
       var contextPaths = identifierPath.getAncestry();
 
       // A Function ID is not in the same context as it's body

package/dist/transforms/lock/integrity.js

@@ -12,16 +12,15 @@ var t = _interopRequireWildcard(require("@babel/types"));
 var _template = _interopRequireDefault(require("../../templates/template"));
 var _NameGen = require("../../utils/NameGen");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var INTEGRITY = exports.INTEGRITY = Symbol("Integrity");
-/**
- * Integrity has two passes:
- *
- * - First in the 'lock' plugin to select functions and prepare them for Integrity
- * - Secondly here to apply the integrity check
- *
- * This transformation must run last as any changes to the code will break the hash
+/**
+ * Integrity has two passes:
+ *
+ * - First in the 'lock' plugin to select functions and prepare them for Integrity
+ * - Secondly here to apply the integrity check
+ *
+ * This transformation must run last as any changes to the code will break the hash
  */
 var _default = exports["default"] = function _default(_ref) {
   var Plugin = _ref.Plugin;
@@ -68,8 +67,10 @@ var _default = exports["default"] = function _default(_ref) {
 
           // me.log(codeTrimmed, hashCode);
           me.changeData.functions++;
-          funcDecPath.node.body = t.blockStatement(new _template["default"]("\n              var hash = ".concat(selfCacheString, " || (").concat(selfCacheString, " = ").concat(obfuscatedHashFnName, "(").concat(newFunctionDeclaration.id.name, ", ").concat(seed, "));\n          if(hash === ").concat(hashCode, ") {\n            {originalBody}\n          } else {\n            {countermeasures}  \n          }\n          ")).compile({
+          var hashName = nameGen.generate();
+          funcDecPath.node.body = t.blockStatement(new _template["default"]("\n              var {hashName} = ".concat(selfCacheString, " || (").concat(selfCacheString, " = ").concat(obfuscatedHashFnName, "(").concat(newFunctionDeclaration.id.name, ", ").concat(seed, "));\n          if({hashName} === ").concat(hashCode, ") {\n            {originalBody}\n          } else {\n            {countermeasures}  \n          }\n          ")).compile({
             originalBody: funcDecPath.node.body.body,
+            hashName: hashName,
             countermeasures: function countermeasures() {
               return me.globalState.lock.createCountermeasuresCode();
             }

package/dist/transforms/lock/lock.js

@@ -14,8 +14,7 @@ var _integrity = require("./integrity");
 var _integrityTemplate = require("../../templates/integrityTemplate");
 var _constants = require("../../constants");
 var _tamperProtectionTemplates = require("../../templates/tamperProtectionTemplates");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -79,7 +78,7 @@ var _default = exports["default"] = function _default(_ref) {
   }
   if (me.options.lock.selfDefending) {
     me.options.lock.customLocks.push({
-      code: "\n      (\n        function(){\n          // Breaks any code formatter\n          var namedFunction = function(){\n            const test = function(){\n              const regExp=new RegExp('\\n');\n              return regExp['test'](namedFunction)\n            };\n\n            if(test()) {\n              {countermeasures}\n            }\n          }\n\n          // Prepack Breaker\n          if(Math.random() > 1) {\n            while(true) {\n            console.log(\"Prepack Breaker\");\n            }\n          }\n\n          return namedFunction();\n        }\n    )();\n      ",
+      code: "\n      (\n        function(){\n          // Breaks any code formatter\n          var namedFunction = function(){\n            const test = function(){\n              const regExp= new RegExp('\\n');\n              return regExp['test'](namedFunction)\n            };\n\n            if(test()) {\n              {countermeasures}\n            }\n          }\n\n          return namedFunction();\n        }\n    )();\n      ",
       percentagePerBlock: 0.5
     });
   }