js-confuser 2.0.0-alpha.2 → 2.0.0-alpha.4

package/dist/transforms/deadCode.js

@@ -1,18 +1,16 @@
 "use strict";
 
-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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 var _randomUtils = require("../utils/random-utils");
 var _deadCodeTemplates = require("../templates/deadCodeTemplates");
-var _probability = require("../probability");
 var _order = require("../order");
 var t = _interopRequireWildcard(require("@babel/types"));
 var _template = _interopRequireDefault(require("../templates/template"));
-var _NameGen = require("../utils/NameGen");
 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; }
@@ -22,6 +20,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 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; }
+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); }
 var _default = exports["default"] = function _default(_ref) {
   var Plugin = _ref.Plugin;
   var me = Plugin(_order.Order.DeadCode, {
@@ -29,7 +28,7 @@ var _default = exports["default"] = function _default(_ref) {
       deadCode: 0
     }
   });
-  var created = 0;
+  var predicateGen = new _PredicateGen["default"](me);
   return {
     visitor: {
       Block: {
@@ -37,34 +36,34 @@ var _default = exports["default"] = function _default(_ref) {
           if (blockPath.find(function (p) {
             return me.isSkipped(p);
           })) return;
-          if (!(0, _probability.computeProbabilityMap)(me.options.deadCode)) {
+          if (!me.computeProbabilityMap(me.options.deadCode)) {
             return;
           }
-          if (typeof me.options.deadCode !== "function") {
-            var suggestedMax = 25;
+
+          // Default limit on dead code
+          // May be overridden by user
+          if (typeof me.options.deadCode !== "function" && _typeof(me.options.deadCode) !== "object") {
+            var suggestedMax = 20;
             if (me.obfuscator.parentObfuscator) {
               // RGF should contain less dead code
               suggestedMax = 5;
             }
-            if (created > suggestedMax && (0, _randomUtils.chance)(created - suggestedMax)) return;
-            created++;
+            if (me.changeData.deadCode >= suggestedMax) {
+              return;
+            }
           }
+
+          // Increment dead code counter
+          me.changeData.deadCode++;
           var template = (0, _randomUtils.choice)(_deadCodeTemplates.deadCodeTemplates);
           var nodes = template.compile();
-          var containingFnName = me.getPlaceholder("dead_" + created);
-          var newPath = blockPath.unshiftContainer("body", t.functionDeclaration(t.identifier(containingFnName), [], t.blockStatement(_toConsumableArray(nodes))));
+          var containingFnName = me.getPlaceholder("dead_" + me.changeData.deadCode);
 
-          // Overcomplicated way to get a random property name that doesn't exist on the Function
-          var randomProperty;
-          var nameGen = new _NameGen.NameGen("randomized");
-          function PrototypeCollision() {}
-          PrototypeCollision(); // Call it for code coverage :D
-
-          do {
-            randomProperty = nameGen.generate();
-          } while (!randomProperty || PrototypeCollision[randomProperty] !== undefined);
-          me.changeData.deadCode++;
-          (0, _astUtils.prepend)(blockPath, new _template["default"]("\n              if(\"".concat(randomProperty, "\" in ").concat(containingFnName, ") {\n                ").concat(containingFnName, "()\n              }\n              ")).single());
+          // Insert dummy function
+          (0, _astUtils.prepend)(blockPath, t.functionDeclaration(t.identifier(containingFnName), [], t.blockStatement(_toConsumableArray(nodes))));
+          (0, _astUtils.prepend)(blockPath, new _template["default"]("\n              if({falsePredicate}) {\n                ".concat(containingFnName, "()\n              }\n              ")).single({
+            falsePredicate: predicateGen.generateFalseExpression(blockPath)
+          }));
           me.skip(blockPath);
         }
       }

package/dist/transforms/dispatcher.js

@@ -9,7 +9,6 @@ var t = _interopRequireWildcard(require("@babel/types"));
 var _template = _interopRequireDefault(require("../templates/template"));
 var _assert = require("assert");
 var _randomUtils = require("../utils/random-utils");
-var _probability = require("../probability");
 var _order = require("../order");
 var _constants = require("../constants");
 var _functionUtils = require("../utils/function-utils");
@@ -118,12 +117,38 @@ var _default = exports["default"] = function _default(_ref) {
                   illegalNames.add(name);
                   return;
                 }
+                var hasAssignmentPattern = false;
+                var _iterator = _createForOfIteratorHelper(path.get("params")),
+                  _step;
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    var param = _step.value;
+                    if (param.isAssignmentPattern()) {
+                      hasAssignmentPattern = true;
+                      break;
+                    }
+                    param.traverse({
+                      AssignmentPattern: function AssignmentPattern(innerPath) {
+                        var fn = innerPath.getFunctionParent();
+                        if (fn === path) {
+                          hasAssignmentPattern = true;
+                          innerPath.stop();
+                        } else {
+                          innerPath.skip();
+                        }
+                      }
+                    });
+                    if (hasAssignmentPattern) break;
+                  }
 
-                // Functions with default parameters are not fully supported
-                // (Could be a Function Expression referencing outer scope)
-                if (path.node.params.find(function (x) {
-                  return x.type === "AssignmentPattern";
-                })) {
+                  // Functions with default parameters are not fully supported
+                  // (Could be a Function Expression referencing outer scope)
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
+                }
+                if (hasAssignmentPattern) {
                   illegalNames.add(name);
                   return;
                 }
@@ -131,33 +156,33 @@ var _default = exports["default"] = function _default(_ref) {
               }
             }
           });
-          var _iterator = _createForOfIteratorHelper(illegalNames),
-            _step;
+          var _iterator2 = _createForOfIteratorHelper(illegalNames),
+            _step2;
           try {
-            for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              var _name = _step.value;
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              var _name = _step2.value;
               functionPaths["delete"](_name);
             }
           } catch (err) {
-            _iterator.e(err);
+            _iterator2.e(err);
           } finally {
-            _iterator.f();
+            _iterator2.f();
           }
-          var _iterator2 = _createForOfIteratorHelper(functionPaths.keys()),
-            _step2;
+          var _iterator3 = _createForOfIteratorHelper(functionPaths.keys()),
+            _step3;
           try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              var name = _step2.value;
-              if (!(0, _probability.computeProbabilityMap)(me.options.dispatcher, name)) {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var name = _step3.value;
+              if (!me.computeProbabilityMap(me.options.dispatcher, name)) {
                 functionPaths["delete"](name);
               }
             }
 
             // No functions here to change
           } catch (err) {
-            _iterator2.e(err);
+            _iterator3.e(err);
           } finally {
-            _iterator2.f();
+            _iterator3.f();
           }
           if (functionPaths.size === 0) {
             return;
@@ -174,19 +199,19 @@ var _default = exports["default"] = function _default(_ref) {
             returnAsObject: isDebug ? "returnAsObject" : (0, _randomUtils.getRandomString)(10),
             returnAsObjectProperty: isDebug ? "returnAsObjectProperty" : (0, _randomUtils.getRandomString)(10)
           };
-          var _iterator3 = _createForOfIteratorHelper(functionPaths.keys()),
-            _step3;
+          var _iterator4 = _createForOfIteratorHelper(functionPaths.keys()),
+            _step4;
           try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var name = _step3.value;
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              var name = _step4.value;
               newNameMapping.set(name, isDebug ? "_" + name : (0, _randomUtils.getRandomString)(6) /**  "_" + name */);
             }
 
             // Find identifiers calling/referencing the functions
           } catch (err) {
-            _iterator3.e(err);
+            _iterator4.e(err);
           } finally {
-            _iterator3.f();
+            _iterator4.f();
           }
           blockPath.traverse({
             ReferencedIdentifier: {
@@ -280,17 +305,17 @@ var _default = exports["default"] = function _default(_ref) {
               newBody.unshift(t.expressionStatement(t.stringLiteral("Dispatcher: ".concat(name, " -> ").concat(newName))));
             }
             var functionExpression = t.functionExpression(null, [], t.blockStatement(newBody));
-            var _iterator4 = _createForOfIteratorHelper(Object.getOwnPropertySymbols(originalFn)),
-              _step4;
+            var _iterator5 = _createForOfIteratorHelper(Object.getOwnPropertySymbols(originalFn)),
+              _step5;
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                var symbol = _step4.value;
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                var symbol = _step5.value;
                 functionExpression[symbol] = originalFn[symbol];
               }
             } catch (err) {
-              _iterator4.e(err);
+              _iterator5.e(err);
             } finally {
-              _iterator4.f();
+              _iterator5.f();
             }
             functionExpression[_constants.PREDICTABLE] = true;
             return t.objectProperty(t.stringLiteral(newName), functionExpression);
@@ -321,17 +346,17 @@ var _default = exports["default"] = function _default(_ref) {
           prepend(t.variableDeclaration("var", [t.variableDeclarator(t.identifier(cacheName), new _template["default"]("Object[\"create\"](null)").expression())]));
 
           // Remove original functions
-          var _iterator5 = _createForOfIteratorHelper(functionPaths.values()),
-            _step5;
+          var _iterator6 = _createForOfIteratorHelper(functionPaths.values()),
+            _step6;
           try {
-            for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-              var path = _step5.value;
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+              var path = _step6.value;
               path.remove();
             }
           } catch (err) {
-            _iterator5.e(err);
+            _iterator6.e(err);
           } finally {
-            _iterator5.f();
+            _iterator6.f();
           }
         }
       }

package/dist/transforms/extraction/duplicateLiteralsRemoval.js

@@ -40,6 +40,11 @@ var _default = exports["default"] = function _default(_ref) {
           programPath.traverse({
             "StringLiteral|BooleanLiteral|NumericLiteral|NullLiteral|Identifier": function StringLiteralBooleanLiteralNumericLiteralNullLiteralIdentifier(_path) {
               var literalPath = _path;
+
+              // Don't change module imports
+              if (literalPath.isStringLiteral()) {
+                if ((0, _astUtils.isModuleImport)(literalPath)) return;
+              }
               var node = literalPath.node;
               var isUndefined = false;
               if (literalPath.isIdentifier()) {

package/dist/transforms/extraction/objectExtraction.js

@@ -8,7 +8,6 @@ exports["default"] = void 0;
 var _order = require("../../order");
 var t = _interopRequireWildcard(require("@babel/types"));
 var _astUtils = require("../../utils/ast-utils");
-var _probability = require("../../probability");
 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 _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; } } }; }
@@ -134,7 +133,7 @@ var _default = exports["default"] = function _default(_ref) {
 
         // Object references are too complex to safely extract
         if (!isObjectSafe) return;
-        if (!(0, _probability.computeProbabilityMap)(me.options.objectExtraction, identifier.node.name)) return;
+        if (!me.computeProbabilityMap(me.options.objectExtraction, identifier.node.name)) return;
         var newDeclarationKind = varDecPath.node.kind === "const" ? "let" : varDecPath.node.kind;
         varDecPath.replaceWithMultiple(newDeclarations.map(function (declaration) {
           return t.variableDeclaration(newDeclarationKind, [declaration]);

package/dist/transforms/finalizer.js

@@ -40,7 +40,7 @@ var _default = exports["default"] = function _default(_ref) {
       }
     }), {}, {
       // Hexadecimal numbers
-      NumberLiteral: {
+      NumericLiteral: {
         exit: function exit(path) {
           if (me.options.hexadecimalNumbers) {
             var value = path.node.value;

package/dist/transforms/flatten.js

@@ -7,11 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var t = _interopRequireWildcard(require("@babel/types"));
 var _astUtils = require("../utils/ast-utils");
-var _probability = require("../probability");
 var _order = require("../order");
 var _constants = require("../constants");
 var _functionUtils = require("../utils/function-utils");
-var _assert = require("assert");
 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; }
@@ -59,7 +57,7 @@ var _default = exports["default"] = function _default(_ref) {
     if (!t.isValidIdentifier(functionName, true)) {
       functionName = "anonymous";
     }
-    if (!(0, _probability.computeProbabilityMap)(me.options.flatten, functionName)) {
+    if (!me.computeProbabilityMap(me.options.flatten, functionName)) {
       return;
     }
     var strictMode = fnPath.find(function (path) {
@@ -99,22 +97,7 @@ var _default = exports["default"] = function _default(_ref) {
           if (!binding) {
             return;
           }
-          var definedLocal = identifierPath.scope;
-          do {
-            if (definedLocal.hasOwnBinding(identifierName)) return;
-            if (definedLocal === fnPath.scope) break;
-            definedLocal = definedLocal.parent;
-            if (definedLocal === program.scope) (0, _assert.ok)(functionName + ":" + identifierName);
-          } while (definedLocal);
-          var cursor = fnPath.scope.parent;
-          var isOutsideVariable = false;
-          do {
-            if (cursor.hasBinding(identifierName)) {
-              isOutsideVariable = true;
-              break;
-            }
-            cursor = cursor.parent;
-          } while (cursor);
+          var isOutsideVariable = fnPath.scope.parent.getBinding(identifierName) === binding;
           if (!isOutsideVariable) {
             return;
           }

package/dist/transforms/identifier/globalConcealing.js

@@ -9,7 +9,6 @@ var t = _interopRequireWildcard(require("@babel/types"));
 var _NameGen = require("../../utils/NameGen");
 var _template = _interopRequireDefault(require("../../templates/template"));
 var _order = require("../../order");
-var _probability = require("../../probability");
 var _constants = require("../../constants");
 var _astUtils = require("../../utils/ast-utils");
 var _getGlobalTemplate = require("../../templates/getGlobalTemplate");
@@ -29,7 +28,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 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; }
-var ignoreGlobals = new Set(["require", "__dirname", "eval", "arguments", _constants.variableFunctionName].concat(_toConsumableArray(_constants.reservedIdentifiers)));
+var ignoreGlobals = new Set([].concat(_toConsumableArray(_constants.reservedNodeModuleIdentifiers), ["__dirname", "eval", "arguments", _constants.variableFunctionName], _toConsumableArray(_constants.reservedIdentifiers)));
 var _default = exports["default"] = function _default(_ref) {
   var Plugin = _ref.Plugin;
   var me = Plugin(_order.Order.GlobalConcealing, {
@@ -53,7 +52,7 @@ var _default = exports["default"] = function _default(_ref) {
       globalMapping.set(gen.generate(), fakeName);
     }
     var createSwitchStatement = function createSwitchStatement() {
-      var cases = Array.from(globalMapping.keys()).map(function (originalName) {
+      var cases = (0, _randomUtils.shuffle)(Array.from(globalMapping.keys())).map(function (originalName) {
         var mappedKey = globalMapping.get(originalName);
         return t.switchCase(t.stringLiteral(mappedKey), [t.returnStatement(t.memberExpression(t.identifier(globalVarName), t.stringLiteral(originalName), true))]);
       });
@@ -110,7 +109,7 @@ var _default = exports["default"] = function _default(_ref) {
               var mapping = globalMapping.get(globalName);
               if (!mapping) {
                 // Allow user to disable custom global variables
-                if (!(0, _probability.computeProbabilityMap)(me.options.globalConcealing, globalName)) continue;
+                if (!me.computeProbabilityMap(me.options.globalConcealing, globalName)) continue;
                 mapping = gen.generate();
                 globalMapping.set(globalName, mapping);
               }

package/dist/transforms/identifier/movedDeclarations.js

@@ -60,9 +60,11 @@ var _default = exports["default"] = function _default(_ref) {
             return path.isFunction();
           });
           if (!functionPath || !functionPath.node[_constants.PREDICTABLE]) return;
+          var fnBody = functionPath.get("body");
+          if (!fnBody.isBlockStatement()) return;
 
           // Must be direct child of the function
-          if (path.parentPath !== functionPath.get("body")) return;
+          if (path.parentPath !== fnBody) return;
           var functionName = path.node.id.name;
 
           // Must be eligible for parameter packing
@@ -85,7 +87,7 @@ var _default = exports["default"] = function _default(_ref) {
             binding.path = paramPath;
             binding.identifier = identifier;
           }
-          (0, _astUtils.prepend)(functionPath, new _template["default"]("\n              if(!".concat(functionName, ") {\n                ").concat(functionName, " = {functionExpression};\n              }\n              ")).single({
+          (0, _astUtils.prepend)(fnBody, new _template["default"]("\n              if(!".concat(functionName, ") {\n                ").concat(functionName, " = {functionExpression};\n              }\n              ")).single({
             functionExpression: functionExpression
           }));
           path.remove();
@@ -94,6 +96,7 @@ var _default = exports["default"] = function _default(_ref) {
       },
       VariableDeclaration: {
         exit: function exit(path) {
+          if (me.isSkipped(path)) return;
           if (path.node.kind !== "var") return;
           if (path.node.declarations.length !== 1) return;
           var insertionMethod = "variableDeclaration";
@@ -125,7 +128,9 @@ var _default = exports["default"] = function _default(_ref) {
           var isDefinedAtTop = false;
           var parentPath = path.parentPath;
           if (parentPath.isBlock()) {
-            isDefinedAtTop = parentPath.get("body").indexOf(path) === 0;
+            isDefinedAtTop = parentPath.get("body").filter(function (x) {
+              return x.type !== "ImportDeclaration";
+            }).indexOf(path) === 0;
           }
 
           // Already at the top - nothing will change
@@ -167,13 +172,15 @@ var _default = exports["default"] = function _default(_ref) {
               var block = path.findParent(function (path) {
                 return path.isBlock();
               });
-              var topNode = block.node.body[0];
+              var topNode = block.node.body.filter(function (x) {
+                return x.type !== "ImportDeclaration";
+              })[0];
               var variableDeclarator = t.variableDeclarator(t.identifier(name));
               if (t.isVariableDeclaration(topNode) && topNode.kind === "var") {
                 topNode.declarations.push(variableDeclarator);
                 break;
               } else {
-                block.node.body.unshift(t.variableDeclaration("var", [variableDeclarator]));
+                (0, _astUtils.prepend)(block, me.skip(t.variableDeclaration("var", [variableDeclarator])));
               }
               me.changeData.variableDeclarations++;
               break;

package/dist/transforms/identifier/renameVariables.js

@@ -8,7 +8,6 @@ exports["default"] = void 0;
 var t = _interopRequireWildcard(require("@babel/types"));
 var _order = require("../../order");
 var _constants = require("../../constants");
-var _probability = require("../../probability");
 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); }
@@ -36,6 +35,7 @@ var _default = exports["default"] = function _default(_ref) {
   });
   var definedMap = new Map();
   var referencedMap = new Map();
+  var paramMap = new Map(); // Used for default function parameter special case
   var bindingMap = new Map();
   var renamedVariables = new Map();
   me.obfuscator.globalState.renamedVariables = renamedVariables;
@@ -49,8 +49,11 @@ 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()) {
@@ -102,11 +105,29 @@ var _default = exports["default"] = function _default(_ref) {
         });
       }
       var newName = null;
+      var skippedPaths = new Set();
       var _iterator = _createForOfIteratorHelper(contextPaths),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var contextPath = _step.value;
+          if (skippedPaths.has(contextPath)) continue;
+          if (contextPath.isFunction()) {
+            var _assignmentPattern;
+            var assignmentPattern = contextPath.find(function (p) {
+              return p.listKey === "params" && p.parentPath.isFunction();
+            });
+            if ((_assignmentPattern = assignmentPattern) !== null && _assignmentPattern !== void 0 && _assignmentPattern.isAssignmentPattern()) {
+              var functionPath = assignmentPattern.getFunctionParent();
+              if (functionPath) {
+                // The parameters can be still accessed...
+                var params = paramMap.get(functionPath.node);
+                if (params !== null && params !== void 0 && params.has(identifierName)) {} else {
+                  skippedPaths.add(functionPath);
+                }
+              }
+            }
+          }
           var _node = contextPath.node;
           var defined = definedMap.get(_node);
           if (defined !== null && defined !== void 0 && defined.has(identifierName)) {
@@ -132,6 +153,17 @@ var _default = exports["default"] = function _default(_ref) {
         // 5. Update Identifier node's 'name' property
         node.name = newName;
         node[RENAMED] = true;
+
+        // 6. Additional parameter mapping
+        var binding = identifierPath.scope.getBinding(identifierName);
+        if ((binding === null || binding === void 0 ? void 0 : binding.kind) === "param") {
+          var mapNode = binding.scope.path.node;
+          if (!paramMap.has(mapNode)) {
+            paramMap.set(mapNode, new Set([identifierName]));
+          } else {
+            paramMap.get(mapNode).add(identifierName);
+          }
+        }
       }
     },
     Scopable: function Scopable(scopePath) {
@@ -211,16 +243,18 @@ var _default = exports["default"] = function _default(_ref) {
 
         // Placeholder variables should always be renamed
         if (name.startsWith(_constants.placeholderVariablePrefix)) return true;
-
-        // Do not rename exports
-        if ((0, _astUtils.isExportedIdentifier)(bindings === null || bindings === void 0 ? void 0 : bindings.get(name))) return false;
+        var binding = bindings === null || bindings === void 0 ? void 0 : bindings.get(name);
+        if (binding) {
+          // Do not rename exports
+          if ((0, _astUtils.isExportedIdentifier)(binding)) return false;
+        }
         if (name === me.obfuscator.getStringCompressionLibraryName()) return false;
 
         // Global variables are additionally checked against user option
         if (isGlobal) {
-          if (!(0, _probability.computeProbabilityMap)(me.options.renameGlobals, name)) return false;
+          if (!me.computeProbabilityMap(me.options.renameGlobals, name)) return false;
         }
-        if (!(0, _probability.computeProbabilityMap)(me.options.renameVariables, name, isGlobal)) return false;
+        if (!me.computeProbabilityMap(me.options.renameVariables, name, isGlobal)) return false;
         return true;
       }
 

package/dist/transforms/lock/integrity.js

@@ -10,6 +10,7 @@ var _randomUtils = require("../../utils/random-utils");
 var _integrityTemplate = require("../../templates/integrityTemplate");
 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; }
@@ -29,6 +30,10 @@ var _default = exports["default"] = function _default(_ref) {
       functions: 0
     }
   });
+  var nameGen = new _NameGen.NameGen(me.options.identifierGenerator, {
+    avoidObjectPrototype: true,
+    avoidReserved: true
+  });
   return {
     visitor: {
       Program: {
@@ -57,10 +62,13 @@ var _default = exports["default"] = function _default(_ref) {
           var codeTrimmed = code.replace(me.globalState.lock.integrity.sensitivityRegex, "");
           var seed = (0, _randomUtils.getRandomInteger)(0, 10000000);
           var hashCode = (0, _integrityTemplate.HashFunction)(codeTrimmed, seed);
+          var selfName = funcDecPath.node.id.name;
+          var selfCacheProperty = nameGen.generate();
+          var selfCacheString = "".concat(selfName, ".").concat(selfCacheProperty);
 
           // me.log(codeTrimmed, hashCode);
           me.changeData.functions++;
-          funcDecPath.node.body = t.blockStatement(new _template["default"]("\n              var hash = ".concat(obfuscatedHashFnName, "(").concat(newFunctionDeclaration.id.name, ", ").concat(seed, ");\n          if(hash === ").concat(hashCode, ") {\n            {originalBody}\n          } else {\n            {countermeasures}  \n          }\n          ")).compile({
+          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({
             originalBody: funcDecPath.node.body.body,
             countermeasures: function countermeasures() {
               return me.globalState.lock.createCountermeasuresCode();