js-confuser 1.5.9 → 1.7.0

package/dist/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.reservedKeywords = exports.reservedIdentifiers = void 0;
+exports.reservedKeywords = exports.reservedIdentifiers = exports.placeholderVariablePrefix = exports.noRenameVariablePrefix = void 0;
 
 /**
  * Keywords disallowed for variable names in ES5 and under.
@@ -15,4 +15,8 @@ const reservedKeywords = new Set(["abstract", "arguments", "await", "boolean", "
 
 exports.reservedKeywords = reservedKeywords;
 const reservedIdentifiers = new Set(["undefined", "null", "NaN", "Infinity", "eval", "arguments"]);
-exports.reservedIdentifiers = reservedIdentifiers;
+exports.reservedIdentifiers = reservedIdentifiers;
+const noRenameVariablePrefix = "__NO_JS_CONFUSER_RENAME__";
+exports.noRenameVariablePrefix = noRenameVariablePrefix;
+const placeholderVariablePrefix = "__p_";
+exports.placeholderVariablePrefix = placeholderVariablePrefix;

package/dist/index.js

@@ -37,8 +37,6 @@ var _object = require("./util/object");
 
 var _presets = _interopRequireDefault(require("./presets"));
 
-var _perf_hooks = require("perf_hooks");
-
 var assert = _interopRequireWildcard(require("assert"));
 
 var _options = require("./options");
@@ -136,38 +134,28 @@ const debugTransformations = async function (code, options) {
 
 exports.debugTransformations = debugTransformations;
 
-const debugObfuscation = async function (code, options, callback) {
-  const startTime = _perf_hooks.performance.now();
-
+const debugObfuscation = async function (code, options, callback, performance) {
+  const startTime = performance.now();
   (0, _options.validateOptions)(options);
   options = await (0, _options.correctOptions)(options);
-
-  const beforeParseTime = _perf_hooks.performance.now();
-
+  const beforeParseTime = performance.now();
   var tree = (0, _parser.parseSync)(code);
-  const parseTime = _perf_hooks.performance.now() - beforeParseTime;
+  const parseTime = performance.now() - beforeParseTime;
   var obfuscator = new _obfuscator.default(options);
   var totalTransforms = obfuscator.array.length;
   var transformationTimes = Object.create(null);
-
-  var currentTransformTime = _perf_hooks.performance.now();
-
+  var currentTransformTime = performance.now();
   obfuscator.on("debug", (name, tree, i) => {
-    var nowTime = _perf_hooks.performance.now();
-
+    var nowTime = performance.now();
     transformationTimes[name] = nowTime - currentTransformTime;
     currentTransformTime = nowTime;
     callback(name, i, totalTransforms);
   });
   await obfuscator.apply(tree, true);
-
-  const beforeCompileTime = _perf_hooks.performance.now();
-
+  const beforeCompileTime = performance.now();
   var output = await (0, _compiler.default)(tree, options);
-  const compileTime = _perf_hooks.performance.now() - beforeCompileTime;
-
-  const endTime = _perf_hooks.performance.now();
-
+  const compileTime = performance.now() - beforeCompileTime;
+  const endTime = performance.now();
   return {
     obfuscated: output,
     transformationTimes: transformationTimes,

package/dist/obfuscator.js

@@ -13,7 +13,7 @@ var _traverse = _interopRequireDefault(require("./traverse"));
 
 var _probability = require("./probability");
 
-var _preparation = _interopRequireDefault(require("./transforms/preparation/preparation"));
+var _preparation = _interopRequireDefault(require("./transforms/preparation"));
 
 var _objectExtraction = _interopRequireDefault(require("./transforms/extraction/objectExtraction"));
 
@@ -29,13 +29,13 @@ var _calculator = _interopRequireDefault(require("./transforms/calculator"));
 
 var _controlFlowFlattening = _interopRequireDefault(require("./transforms/controlFlowFlattening/controlFlowFlattening"));
 
-var _eval = _interopRequireDefault(require("./transforms/eval"));
-
 var _globalConcealing = _interopRequireDefault(require("./transforms/identifier/globalConcealing"));
 
+var _stringSplitting = _interopRequireDefault(require("./transforms/string/stringSplitting"));
+
 var _stringConcealing = _interopRequireDefault(require("./transforms/string/stringConcealing"));
 
-var _stringSplitting = _interopRequireDefault(require("./transforms/string/stringSplitting"));
+var _stringCompression = _interopRequireDefault(require("./transforms/string/stringCompression"));
 
 var _duplicateLiteralsRemoval = _interopRequireDefault(require("./transforms/extraction/duplicateLiteralsRemoval"));
 
@@ -51,23 +51,15 @@ var _minify = _interopRequireDefault(require("./transforms/minify"));
 
 var _es = _interopRequireDefault(require("./transforms/es5/es5"));
 
-var _stringEncoding = _interopRequireDefault(require("./transforms/string/stringEncoding"));
-
 var _rgf = _interopRequireDefault(require("./transforms/rgf"));
 
 var _flatten = _interopRequireDefault(require("./transforms/flatten"));
 
 var _stack = _interopRequireDefault(require("./transforms/stack"));
 
-var _stringCompression = _interopRequireDefault(require("./transforms/string/stringCompression"));
-
-var _nameRecycling = _interopRequireDefault(require("./transforms/identifier/nameRecycling"));
-
 var _antiTooling = _interopRequireDefault(require("./transforms/antiTooling"));
 
-var _hideInitializingCode = _interopRequireDefault(require("./transforms/hideInitializingCode"));
-
-var _hexadecimalNumbers = _interopRequireDefault(require("./transforms/hexadecimalNumbers"));
+var _finalizer = _interopRequireDefault(require("./transforms/finalizer"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -100,8 +92,6 @@ class Obfuscator extends _events.EventEmitter {
     this.transforms = Object.create(null);
     this.generated = new Set();
     this.totalPossibleTransforms = 0;
-    this.push(new _preparation.default(this));
-    this.push(new _renameLabels.default(this));
 
     const test = function (map) {
       for (var _len = arguments.length, transformers = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -118,31 +108,29 @@ class Obfuscator extends _events.EventEmitter {
     }; // Optimization: Only add needed transformers. If a probability always return false, no need in running that extra code.
 
 
+    test(true, _preparation.default);
+    test(true, _renameLabels.default);
     test(options.objectExtraction, _objectExtraction.default);
-    test(options.deadCode, _deadCode.default);
+    test(options.flatten, _flatten.default);
+    test(options.rgf, _rgf.default);
     test(options.dispatcher, _dispatcher.default);
+    test(options.deadCode, _deadCode.default);
+    test(options.calculator, _calculator.default);
     test(options.controlFlowFlattening, _controlFlowFlattening.default);
     test(options.globalConcealing, _globalConcealing.default);
-    test(options.stringCompression, _stringCompression.default);
-    test(options.stringConcealing, _stringConcealing.default);
-    test(options.stringEncoding, _stringEncoding.default);
-    test(options.stringSplitting, _stringSplitting.default);
-    test(options.renameVariables, _renameVariables.default);
-    test(options.nameRecycling, _nameRecycling.default);
-    test(options.eval, _eval.default);
     test(options.opaquePredicates, _opaquePredicates.default);
+    test(options.stringSplitting, _stringSplitting.default);
+    test(options.stringConcealing, _stringConcealing.default);
+    test(options.stringCompression, _stringCompression.default);
+    test(options.stack, _stack.default);
     test(options.duplicateLiteralsRemoval, _duplicateLiteralsRemoval.default);
-    test(options.minify, _minify.default);
-    test(options.calculator, _calculator.default);
+    test(options.shuffle, _shuffle.default);
     test(options.movedDeclarations, _movedDeclarations.default);
+    test(options.minify, _minify.default);
+    test(options.renameVariables, _renameVariables.default);
     test(options.es5, _es.default);
-    test(options.shuffle, _shuffle.default);
-    test(options.flatten, _flatten.default);
-    test(options.rgf, _rgf.default);
-    test(options.stack, _stack.default);
     test(true, _antiTooling.default);
-    test(options.hideInitializingCode, _hideInitializingCode.default);
-    test(true, _hexadecimalNumbers.default); // BigInt support is included
+    test(true, _finalizer.default); // String Encoding, Hexadecimal Numbers, BigInt support is included
 
     if (options.lock && Object.keys(options.lock).filter(x => x == "domainLock" ? options.lock.domainLock && options.lock.domainLock.length : options.lock[x]).length) {
       test(true, _lock.default);

package/dist/options.js

@@ -12,12 +12,12 @@ var _presets = _interopRequireDefault(require("./presets"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const validProperties = new Set(["preset", "target", "indent", "compact", "hexadecimalNumbers", "minify", "es5", "renameVariables", "renameGlobals", "identifierGenerator", "nameRecycling", "controlFlowFlattening", "hideInitializingCode", "globalConcealing", "stringCompression", "stringConcealing", "stringEncoding", "stringSplitting", "duplicateLiteralsRemoval", "dispatcher", "eval", "rgf", "objectExtraction", "flatten", "deadCode", "calculator", "lock", "movedDeclarations", "opaquePredicates", "shuffle", "stack", "verbose", "globalVariables", "debugComments"]);
+const validProperties = new Set(["preset", "target", "indent", "compact", "hexadecimalNumbers", "minify", "es5", "renameVariables", "renameGlobals", "identifierGenerator", "controlFlowFlattening", "globalConcealing", "stringCompression", "stringConcealing", "stringEncoding", "stringSplitting", "duplicateLiteralsRemoval", "dispatcher", "rgf", "objectExtraction", "flatten", "deadCode", "calculator", "lock", "movedDeclarations", "opaquePredicates", "shuffle", "stack", "verbose", "globalVariables", "debugComments"]);
 const validOses = new Set(["windows", "linux", "osx", "ios", "android"]);
 const validBrowsers = new Set(["firefox", "chrome", "iexplorer", "edge", "safari", "opera"]);
 
 function validateOptions(options) {
-  if (Object.keys(options).length <= 1) {
+  if (!options || Object.keys(options).length <= 1) {
     /**
      * Give a welcoming introduction to those who skipped the documentation.
      */
@@ -117,13 +117,13 @@ async function correctOptions(options) {
 
     if (options.target == "browser") {
       // browser
-      ["window", "document", "postMessage", "alert", "confirm", "location"].forEach(x => options.globalVariables.add(x));
+      ["window", "document", "postMessage", "alert", "confirm", "location", "btoa", "atob", "unescape", "encodeURIComponent"].forEach(x => options.globalVariables.add(x));
     } else {
       // node
-      ["global", "Buffer", "require", "process", "__dirname", "__filename"].forEach(x => options.globalVariables.add(x));
+      ["global", "Buffer", "require", "process", "exports", "module", "__dirname", "__filename"].forEach(x => options.globalVariables.add(x));
     }
 
-    ["globalThis", "console", "parseInt", "parseFloat", "Math", "Promise", "String", "Boolean", "Function", "Object", "Array", "Proxy", "Error", "TypeError", "ReferenceError", "RangeError", "EvalError", "setTimeout", "clearTimeout", "setInterval", "clearInterval", "setImmediate", "clearImmediate", "queueMicrotask", "exports", "module", "isNaN", "isFinite", "Set", "Map", "WeakSet", "WeakMap", "Symbol"].forEach(x => options.globalVariables.add(x));
+    ["globalThis", "console", "parseInt", "parseFloat", "Math", "JSON", "Promise", "String", "Boolean", "Function", "Object", "Array", "Proxy", "Error", "TypeError", "ReferenceError", "RangeError", "EvalError", "setTimeout", "clearTimeout", "setInterval", "clearInterval", "setImmediate", "clearImmediate", "queueMicrotask", "isNaN", "isFinite", "Set", "Map", "WeakSet", "WeakMap", "Symbol"].forEach(x => options.globalVariables.add(x));
   }
 
   return options;

package/dist/order.js

@@ -27,7 +27,6 @@ exports.ObfuscateOrder = ObfuscateOrder;
   ObfuscateOrder[ObfuscateOrder["StringSplitting"] = 16] = "StringSplitting";
   ObfuscateOrder[ObfuscateOrder["StringConcealing"] = 17] = "StringConcealing";
   ObfuscateOrder[ObfuscateOrder["StringCompression"] = 18] = "StringCompression";
-  ObfuscateOrder[ObfuscateOrder["HideInitializingCode"] = 19] = "HideInitializingCode";
   ObfuscateOrder[ObfuscateOrder["Stack"] = 20] = "Stack";
   ObfuscateOrder[ObfuscateOrder["DuplicateLiteralsRemoval"] = 22] = "DuplicateLiteralsRemoval";
   ObfuscateOrder[ObfuscateOrder["Shuffle"] = 24] = "Shuffle";
@@ -37,7 +36,6 @@ exports.ObfuscateOrder = ObfuscateOrder;
   ObfuscateOrder[ObfuscateOrder["Minify"] = 28] = "Minify";
   ObfuscateOrder[ObfuscateOrder["RenameVariables"] = 30] = "RenameVariables";
   ObfuscateOrder[ObfuscateOrder["ES5"] = 31] = "ES5";
-  ObfuscateOrder[ObfuscateOrder["StringEncoding"] = 32] = "StringEncoding";
   ObfuscateOrder[ObfuscateOrder["AntiTooling"] = 34] = "AntiTooling";
-  ObfuscateOrder[ObfuscateOrder["HexadecimalNumbers"] = 35] = "HexadecimalNumbers";
+  ObfuscateOrder[ObfuscateOrder["Finalizer"] = 35] = "Finalizer";
 })(ObfuscateOrder || (exports.ObfuscateOrder = ObfuscateOrder = {}));

package/dist/presets.js

@@ -22,7 +22,7 @@ exports.default = void 0;
  * 10. Minified output
  *
  * ## **`Disabled features`**
- * - `eval` Use at your own risk!
+ * - `rgf` Use at your own risk!
  *
  * ### Potential Issues
  * 1. *String Encoding* can corrupt files. Disable `stringEncoding` manually if this happens.
@@ -57,7 +57,6 @@ const highPreset = {
   stringEncoding: true,
   stringSplitting: 0.75,
   // Use at own risk
-  eval: false,
   rgf: false
 };
 /**
@@ -71,9 +70,9 @@ const mediumPreset = {
   calculator: true,
   compact: true,
   hexadecimalNumbers: true,
-  controlFlowFlattening: 0.5,
+  controlFlowFlattening: 0.25,
   deadCode: 0.025,
-  dispatcher: 0.75,
+  dispatcher: 0.5,
   duplicateLiteralsRemoval: 0.5,
   globalConcealing: true,
   identifierGenerator: "randomized",
@@ -99,10 +98,10 @@ const lowPreset = {
   calculator: true,
   compact: true,
   hexadecimalNumbers: true,
-  controlFlowFlattening: 0.25,
+  controlFlowFlattening: 0.1,
   deadCode: 0.01,
-  dispatcher: 0.5,
-  duplicateLiteralsRemoval: true,
+  dispatcher: 0.25,
+  duplicateLiteralsRemoval: 0.5,
   identifierGenerator: "randomized",
   minify: true,
   movedDeclarations: true,

package/dist/probability.js

@@ -77,6 +77,8 @@ function ComputeProbabilityMap(map) {
 
 
 function isProbabilityMapProbable(map) {
+  (0, _assert.ok)(!Number.isNaN(map), "Numbers cannot be NaN");
+
   if (!map || typeof map === "undefined") {
     return false;
   }
@@ -89,10 +91,6 @@ function isProbabilityMapProbable(map) {
     if (map > 1 || map < 0) {
       throw new Error("Numbers must be between 0 and 1 for 0% - 100%");
     }
-
-    if (isNaN(map)) {
-      throw new Error("Numbers cannot be NaN");
-    }
   }
 
   if (Array.isArray(map)) {

package/dist/templates/bufferToString.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BufferToStringTemplate = void 0;
+
+var _template = _interopRequireDefault(require("./template"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const BufferToStringTemplate = (0, _template.default)("\n  function __getGlobal(){\n    try {\n      return global||window|| ( new Function(\"return this\") )();\n    } catch ( e ) {\n      try {\n        return this;\n      } catch ( e ) {\n        return {};\n      }\n    }\n  }\n\n  var __globalObject = __getGlobal() || {};\n  var __TextDecoder = __globalObject[\"TextDecoder\"];\n  var __Uint8Array = __globalObject[\"Uint8Array\"];\n  var __Buffer = __globalObject[\"Buffer\"];\n  var __String = __globalObject[\"String\"] || String;\n  var __Array = __globalObject[\"Array\"] || Array;\n\n  var utf8ArrayToStr = (function () {\n    var charCache = new __Array(128);  // Preallocate the cache for the common single byte chars\n    var charFromCodePt = __String[\"fromCodePoint\"] || __String[\"fromCharCode\"];\n    var result = [];\n\n    return function (array) {\n        var codePt, byte1;\n        var buffLen = array[\"length\"];\n\n        result[\"length\"] = 0;\n\n        for (var i = 0; i < buffLen;) {\n            byte1 = array[i++];\n\n            if (byte1 <= 0x7F) {\n                codePt = byte1;\n            } else if (byte1 <= 0xDF) {\n                codePt = ((byte1 & 0x1F) << 6) | (array[i++] & 0x3F);\n            } else if (byte1 <= 0xEF) {\n                codePt = ((byte1 & 0x0F) << 12) | ((array[i++] & 0x3F) << 6) | (array[i++] & 0x3F);\n            } else if (__String[\"fromCodePoint\"]) {\n                codePt = ((byte1 & 0x07) << 18) | ((array[i++] & 0x3F) << 12) | ((array[i++] & 0x3F) << 6) | (array[i++] & 0x3F);\n            } else {\n                codePt = 63;    // Cannot convert four byte code points, so use \"?\" instead\n                i += 3;\n            }\n\n            result[\"push\"](charCache[codePt] || (charCache[codePt] = charFromCodePt(codePt)));\n        }\n\n        return result[\"join\"]('');\n    };\n  })();\n\n  function {name}(buffer){\n    if(typeof __TextDecoder !== \"undefined\" && __TextDecoder) {\n      return new __TextDecoder()[\"decode\"](new __Uint8Array(buffer));\n    } else if(typeof __Buffer !== \"undefined\" && __Buffer) {\n      return __Buffer[\"from\"](buffer)[\"toString\"](\"utf-8\");\n    } else {          \n      return utf8ArrayToStr(buffer);\n    }\n  }\n\n  \n");
+exports.BufferToStringTemplate = BufferToStringTemplate;

package/dist/templates/crash.js

@@ -9,9 +9,9 @@ var _template = _interopRequireDefault(require("./template"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const CrashTemplate1 = (0, _template.default)("\ntry {\n    if(typeof process !== \"undefined\") {\n        Math.random() > 0.5 && process && process.exit();\n    }\n} catch ( e ) {\n    \n}\n\nvar {var} = \"a\";\nwhile(1){\n    {var} = {var} += \"a\";    //add as much as the browser can handle\n}\n");
+const CrashTemplate1 = (0, _template.default)("\nvar {var} = \"a\";\nwhile(1){\n    {var} = {var} += \"a\";\n}\n");
 exports.CrashTemplate1 = CrashTemplate1;
-const CrashTemplate2 = (0, _template.default)("\nwhile(true) {\n    for(var {var} = 99; {var} == {var}; {var} *= {var}) {\n        !{var} && console.log({var});\n        if ({var} <= 10){\n            break;\n        }\n    };\n };");
+const CrashTemplate2 = (0, _template.default)("\nwhile(true) {\n    var {var} = 99;\n    for({var} = 99; {var} == {var}; {var} *= {var}) {\n        !{var} && console.log({var});\n        if ({var} <= 10){\n            break;\n        }\n    };\n    if({var} === 100) {\n        {var}--\n    }\n };");
 exports.CrashTemplate2 = CrashTemplate2;
-const CrashTemplate3 = (0, _template.default)("\ntry {\n    function {$2}(y, x){\n        return x;\n      }\n      \n      var {$1} = {$2}(this, function () {\n        var {$3} = function () {\n            var regExp = {$3}\n                .constructor('return /\" + this + \"/')()\n                .constructor('^([^ ]+( +[^ ]+)+)+[^ ]}');\n            \n            return !regExp.call({$1});\n        };\n        \n        return {$3}();\n      });\n      \n      {$1}();\n} catch ( e ) {\n    while(e ? e : !e){\n        var b;\n        var c = 0;\n        (e ? !e : e) ? (function(e){\n            c = e ? 0 : !e ? 1 : 0;\n        })(e) : b = 1;\n\n        if(b&&c){break;}\n        if(b){continue;}\n    }\n}\n");
+const CrashTemplate3 = (0, _template.default)("\ntry {\n    function {$2}(y, x){\n        return x;\n      }\n      \n      var {$1} = {$2}(this, function () {\n        var {$3} = function () {\n            var regExp = {$3}\n                .constructor('return /\" + this + \"/')()\n                .constructor('^([^ ]+( +[^ ]+)+)+[^ ]}');\n            \n            return !regExp.call({$1});\n        };\n        \n        return {$3}();\n      });\n      \n      {$1}();\n} catch ( {$1}e ) {\n    while({$1}e ? {$1}e : !{$1}e){\n        var {$1}b;\n        var {$1}c = 0;\n        ({$1}e ? !{$1}e : {$1}e) ? (function({$1}e){\n            {$1}c = {$1}e ? 0 : !{$1}e ? 1 : 0;\n        })({$1}e) : {$1}b = 1;\n\n        if({$1}b&&{$1}c){break;}\n        if({$1}b){continue;}\n    }\n}\n");
 exports.CrashTemplate3 = CrashTemplate3;

package/dist/templates/es5.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ES5Template = void 0;
+
+var _template = _interopRequireDefault(require("./template"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Provides ES5 polyfills for Array methods
+ *
+ * Source: https://vanillajstoolkit.com/polyfills/
+ */
+const ES5Template = (0, _template.default)("\nif (!Array.prototype.forEach) {\n  Array.prototype.forEach = function forEach (callback, thisArg) {\n    if (typeof callback !== 'function') {\n      throw new TypeError(callback + ' is not a function');\n    }\n    var array = this;\n    thisArg = thisArg || this;\n    for (var i = 0, l = array.length; i !== l; ++i) {\n      callback.call(thisArg, array[i], i, array);\n    }\n  };\n}\nif (!Array.prototype.filter)\n  Array.prototype.filter = function(func, thisArg) {\n\t'use strict';\n\tif ( ! ((typeof func === 'Function' || typeof func === 'function') && this) )\n\t\tthrow new TypeError();\n\n\tvar len = this.length >>> 0,\n\t\tres = new Array(len), // preallocate array\n\t\tt = this, c = 0, i = -1;\n\tif (thisArg === undefined)\n\t  while (++i !== len)\n\t\t// checks to see if the key was set\n\t\tif (i in this)\n\t\t  if (func(t[i], i, t))\n\t\t\tres[c++] = t[i];\n\telse\n\t  while (++i !== len)\n\t\t// checks to see if the key was set\n\t\tif (i in this)\n\t\t  if (func.call(thisArg, t[i], i, t))\n\t\t\tres[c++] = t[i];\n\n\tres.length = c; // shrink down array to proper size\n\treturn res;\n};\nif (!Array.prototype.map) {\n  Array.prototype.map = function(callback, thisArg) {\n    var T, A, k;\n\n    if (this == null) {\n      throw new TypeError('this is null or not defined');\n    }\n\n    // 1. Let O be the result of calling ToObject passing the |this|\n    //    value as the argument.\n    var O = Object(this);\n\n    // 2. Let lenValue be the result of calling the Get internal\n    //    method of O with the argument \"length\".\n    // 3. Let len be ToUint32(lenValue).\n    var len = O.length >>> 0;\n\n    // 4. If IsCallable(callback) is false, throw a TypeError exception.\n    // See: http://es5.github.com/#x9.11\n    if (typeof callback !== 'function') {\n      throw new TypeError(callback + ' is not a function');\n    }\n\n    // 5. If thisArg was supplied, let T be thisArg; else let T be undefined.\n    if (arguments.length > 1) {\n      T = arguments[1];\n    }\n\n    // 6. Let A be a new array created as if by the expression new Array(len)\n    //    where Array is the standard built-in constructor with that name and\n    //    len is the value of len.\n    A = new Array(len);\n\n    // 7. Let k be 0\n    k = 0;\n\n    // 8. Repeat, while k < len\n    while (k < len) {\n\n      var kValue, mappedValue;\n\n      // a. Let Pk be ToString(k).\n      //   This is implicit for LHS operands of the in operator\n      // b. Let kPresent be the result of calling the HasProperty internal\n      //    method of O with argument Pk.\n      //   This step can be combined with c\n      // c. If kPresent is true, then\n      if (k in O) {\n\n        // i. Let kValue be the result of calling the Get internal\n        //    method of O with argument Pk.\n        kValue = O[k];\n\n        // ii. Let mappedValue be the result of calling the Call internal\n        //     method of callback with T as the this value and argument\n        //     list containing kValue, k, and O.\n        mappedValue = callback.call(T, kValue, k, O);\n\n        // iii. Call the DefineOwnProperty internal method of A with arguments\n        // Pk, Property Descriptor\n        // { Value: mappedValue,\n        //   Writable: true,\n        //   Enumerable: true,\n        //   Configurable: true },\n        // and false.\n\n        // In browsers that support Object.defineProperty, use the following:\n        // Object.defineProperty(A, k, {\n        //   value: mappedValue,\n        //   writable: true,\n        //   enumerable: true,\n        //   configurable: true\n        // });\n\n        // For best browser support, use the following:\n        A[k] = mappedValue;\n      }\n      // d. Increase k by 1.\n      k++;\n    }\n\n    // 9. return A\n    return A;\n  };\n}\n");
+exports.ES5Template = ES5Template;

package/dist/templates/functionLength.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FunctionLengthTemplate = void 0;
+
+var _template = _interopRequireDefault(require("./template"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Helper function to set `function.length` property.
+ */
+const FunctionLengthTemplate = (0, _template.default)("\nfunction {name}(functionObject, functionLength){\n  Object[\"defineProperty\"](functionObject, \"length\", {\n    \"value\": functionLength,\n    \"configurable\": true\n  });\n  return functionObject;\n}\n");
+exports.FunctionLengthTemplate = FunctionLengthTemplate;

package/dist/transforms/calculator.js

@@ -21,10 +21,15 @@ var _precedence = require("../precedence");
 
 var _template = _interopRequireDefault(require("../templates/template"));
 
+var _probability = require("../probability");
+
 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; }
 
+const allowedBinaryOperators = new Set(["+", "-", "*", "/"]);
+const allowedUnaryOperators = new Set(["!", "void", "typeof", "-", "~", "+"]);
+
 class Calculator extends _transform.default {
   constructor(o) {
     super(o, _order.ObfuscateOrder.Calculator);
@@ -43,7 +48,7 @@ class Calculator extends _transform.default {
 
     this.ops = Object.create(null);
     this.statesUsed = new Set();
-    this.calculatorFn = this.getPlaceholder();
+    this.calculatorFn = this.getPlaceholder() + "_calc";
     this.calculatorOpVar = this.getPlaceholder();
     this.calculatorSetOpFn = this.getPlaceholder();
     this.gen = this.getGenerator();
@@ -59,10 +64,19 @@ class Calculator extends _transform.default {
     var leftArg = this.getPlaceholder();
     var rightArg = this.getPlaceholder();
     var switchCases = [];
-    Object.keys(this.ops).forEach(operator => {
-      var code = this.ops[operator];
-      var factory = operator == "&&" || operator == "||" ? _gen.LogicalExpression : _gen.BinaryExpression;
-      var body = [(0, _gen.ReturnStatement)(factory(operator, (0, _gen.Identifier)(leftArg), (0, _gen.Identifier)(rightArg)))];
+    Object.keys(this.ops).forEach(opKey => {
+      var [type, operator] = opKey.split("_");
+      var code = this.ops[opKey];
+      var body = [];
+
+      if (type === "Binary") {
+        body = [(0, _gen.ReturnStatement)((0, _gen.BinaryExpression)(operator, (0, _gen.Identifier)(leftArg), (0, _gen.Identifier)(rightArg)))];
+      } else if (type === "Unary") {
+        body = [(0, _gen.ReturnStatement)((0, _gen.UnaryExpression)(operator, (0, _gen.Identifier)(leftArg)))];
+      } else {
+        throw new Error("Unknown type: " + type);
+      }
+
       switchCases.push((0, _gen.SwitchCase)((0, _gen.Literal)(code), body));
     });
     var func = (0, _gen.FunctionDeclaration)(this.calculatorFn, [leftArg, rightArg].map(x => (0, _gen.Identifier)(x)), [(0, _gen.SwitchStatement)((0, _gen.Identifier)(this.calculatorOpVar), switchCases)]);
@@ -75,43 +89,85 @@ class Calculator extends _transform.default {
   }
 
   match(object, parents) {
-    return object.type == "BinaryExpression";
+    return object.type === "BinaryExpression" || object.type === "UnaryExpression";
   }
 
   transform(object, parents) {
-    var operator = object.operator;
-    var allowedOperators = new Set(["+", "-", "*", "/"]);
-
-    if (!allowedOperators.has(operator)) {
+    // Allow percentage
+    if (!(0, _probability.ComputeProbabilityMap)(this.options.calculator)) {
       return;
     }
 
-    var myPrecedence = _precedence.OPERATOR_PRECEDENCE[operator] + Object.keys(_precedence.OPERATOR_PRECEDENCE).indexOf(operator) / 100;
-    var precedences = parents.map(x => x.type == "BinaryExpression" && _precedence.OPERATOR_PRECEDENCE[x.operator] + Object.keys(_precedence.OPERATOR_PRECEDENCE).indexOf(x.operator) / 100); // corrupt AST
+    var operator = object.operator;
+    var type;
 
-    if (precedences.find(x => x >= myPrecedence)) {
-      return;
+    if (object.type === "BinaryExpression") {
+      type = "Binary";
+
+      if (!allowedBinaryOperators.has(operator)) {
+        return;
+      } // Additional checks to ensure complex expressions still work
+
+
+      var myPrecedence = _precedence.OPERATOR_PRECEDENCE[operator] + Object.keys(_precedence.OPERATOR_PRECEDENCE).indexOf(operator) / 100;
+      var precedences = parents.map(x => x.type == "BinaryExpression" && _precedence.OPERATOR_PRECEDENCE[x.operator] + Object.keys(_precedence.OPERATOR_PRECEDENCE).indexOf(x.operator) / 100); // corrupt AST
+
+      if (precedences.find(x => x >= myPrecedence)) {
+        return;
+      }
+
+      if (parents.find(x => x.$dispatcherSkip || x.type == "BinaryExpression")) {
+        return;
+      }
     }
 
-    if (parents.find(x => x.$dispatcherSkip || x.type == "BinaryExpression")) {
-      return;
+    if (object.type === "UnaryExpression") {
+      type = "Unary";
+
+      if (!allowedUnaryOperators.has(operator)) {
+        return;
+      } // Typeof expression fix
+
+
+      if (operator === "typeof" && object.argument.type === "Identifier") {
+        // `typeof name` is special because it can reference the variable `name` without
+        // throwing any errors. If changed, an error could be thrown, breaking the users code
+        return;
+      }
     }
 
     return () => {
-      if (typeof this.ops[operator] !== "number") {
+      const opKey = type + "_" + operator;
+
+      if (typeof this.ops[opKey] !== "number") {
         var newState;
 
         do {
-          newState = (0, _random.getRandomInteger)(-1000, 1000 + Object.keys(this.ops).length * 5);
+          newState = (0, _random.getRandomInteger)(-50, 50 + Object.keys(this.ops).length * 5);
         } while (this.statesUsed.has(newState));
 
         (0, _assert.ok)(!isNaN(newState));
         this.statesUsed.add(newState);
-        this.ops[operator] = newState;
-        this.log(operator, "calc(".concat(newState, ", left, right)"));
+        this.ops[opKey] = newState;
+
+        if (type === "Binary") {
+          this.log("left ".concat(operator, " right ->"), "".concat(this.calculatorFn, "((").concat(newState, ", left, right)"));
+        } else if (type === "Unary") {
+          this.log("".concat(operator, "(argument) ->"), "".concat(this.calculatorFn, "(").concat(newState, ", argument)"));
+        }
+      } // The operator expression sets the operator to be used
+
+
+      var operatorExpression = (0, _random.choice)([(0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(this.calculatorOpVar), (0, _gen.Literal)(this.ops[opKey])), (0, _gen.CallExpression)((0, _gen.Identifier)(this.calculatorSetOpFn), [(0, _gen.Literal)(this.ops[opKey])])]);
+      var newExpression;
+
+      if (type === "Binary") {
+        newExpression = (0, _gen.CallExpression)((0, _gen.Identifier)(this.calculatorFn), [object.left, object.right, operatorExpression]);
+      } else {
+        newExpression = (0, _gen.CallExpression)((0, _gen.Identifier)(this.calculatorFn), [object.argument, operatorExpression]);
       }
 
-      this.replace(object, (0, _gen.CallExpression)((0, _gen.Identifier)(this.calculatorFn), [object.left, object.right, (0, _random.choice)([(0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(this.calculatorOpVar), (0, _gen.Literal)(this.ops[operator])), (0, _gen.CallExpression)((0, _gen.Identifier)(this.calculatorSetOpFn), [(0, _gen.Literal)(this.ops[operator])])])]));
+      this.replace(object, newExpression);
     };
   }