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

package/.prettierrc

@@ -0,0 +1,4 @@
+{
+  "tabWidth": 2,
+  "singleQuote": false
+}

package/CHANGELOG.md

@@ -69,9 +69,25 @@ const options = {
 
 - - `String Compression` now uses LZ-string compression ([lz-string](https://www.npmjs.com/package/lz-string))
 
+- New Comment Syntax
+
+- - `/* @js-confuser-var */ "name"` for improved variable mappings for eval() calls
+
+```js
+// Input
+var name = "Internet User";
+eval( "console.log(" + /* @js-confuser-var */ "name" + ")" );
+
+// Output
+var zC3PLKu = "Internet User";
+eval("console.log(" + "zC3PLKu" + ")");
+```
+
+The function `__JS_CONFUSER_VAR__` is identical in outcome and still be used, however, the comment syntax is preferred as the comment syntax's preserves the original script's behavior.
+
 ### JS-Confuser.com Revamp
 
-A new UI for JS-Confuser.com, featuring an advanced playground and documentation pages.
+A new UI for [JS-Confuser.com](https://js-confuser.com), featuring an advanced playground and documentation pages.
 
 The previous version will remain available: [old--confuser.netlify.com](https://old--confuser.netlify.app/)
 
@@ -83,7 +99,7 @@ The previous version will remain available: [old--confuser.netlify.com](https://
 
 - Removed `Shuffle`'s Hash option
 
-- Removed `Indent` option. [`@babel/generator`](https://www.npmjs.com/package/@babel/generator) does not allow customizing the indentation size. Use Prettier if you still wish for 4 space or tabs. Be mindful if you have `Integrity` or `Self Defending` enabled, as you should not alter the obfuscated code.
+- Removed `Indent` option
 
 
 # `1.7.3`

package/Migration.md

@@ -6,15 +6,20 @@ JS-Confuser 2.0 is complete rewrite of the original JS-Confuser created in 2020!
 
 ### JSConfuser.obfuscate() returns an object now
 
-The method `JSConfuser.obfuscate()` resolves to a object now instead of a string. This result object contains the obfuscated code on the `code` property.
+The method `JSConfuser.obfuscate()` resolves to a object now instead of a string. This result object contains a property `code` which is the obfuscated code.
 
 ```diff
-+JSConfuser.obfuscate(sourceCode, options).then(result=>{
-+  console.log(result.code);
-+});
--JSConfuser.obfuscate(sourceCode, options).then(obfuscatedCode=>{
--  console.log(obfuscatedCode);
--});
+const sourceCode = `console.log("Hello World")`;
+const options = {
+  target: "node",
+  preset: "high"
+};
+
+JSConfuser.obfuscate(sourceCode, options).then(result=>{
+  // 'result' is now an object
+- console.log(result);
++ console.log(result.code);
+});
 ```
 
 ### Removed Anti Debug Lock / Browser Lock / OS Lock
@@ -54,4 +59,14 @@ These features have been removed but you can still add these locks using the `lo
 
 The option `stack` has been renamed to `variableMasking`
 
-[Similar to JScrambler's Variable Masking](https://docs.jscrambler.com/code-integrity/documentation/transformations/variable-masking)
+[Similar to JScrambler's Variable Masking](https://docs.jscrambler.com/code-integrity/documentation/transformations/variable-masking)
+
+```diff
+const options = {
+  target: "node",
+  preset: "high"
+
+- stack: true,
++ variableMasking: true
+};
+```

package/README.md

@@ -21,9 +21,9 @@ JS-Confuser is a JavaScript obfuscation tool to make your programs _impossible_
 
 - - [FAQ](https://new--confuser.netlify.app/docs/getting-started/faq)
 
-- [Options](https://new--confuser.netlify.app/docs)
+- [Options](https://new--confuser.netlify.app/docs/options)
 
-- [Presets](https://new--confuser.netlify.app/docs)
+- [Presets](https://new--confuser.netlify.app/docs/presets)
 
 ## API Usage
 

package/dist/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.variableFunctionName = exports.reservedObjectPrototype = exports.reservedKeywords = exports.reservedIdentifiers = exports.predictableFunctionTag = exports.placeholderVariablePrefix = exports.noRenameVariablePrefix = exports.WITH_STATEMENT = exports.UNSAFE = exports.SKIP = exports.PREDICTABLE = exports.NO_RENAME = exports.NO_REMOVE = exports.MULTI_TRANSFORM = exports.GEN_NODE = exports.FN_LENGTH = void 0;
+exports.variableFunctionName = exports.reservedObjectPrototype = exports.reservedNodeModuleIdentifiers = exports.reservedKeywords = exports.reservedIdentifiers = exports.predictableFunctionTag = exports.placeholderVariablePrefix = exports.noRenameVariablePrefix = exports.WITH_STATEMENT = exports.UNSAFE = exports.SKIP = exports.PREDICTABLE = exports.NO_RENAME = exports.NO_REMOVE = exports.MULTI_TRANSFORM = exports.GEN_NODE = exports.FN_LENGTH = void 0;
 var predictableFunctionTag = exports.predictableFunctionTag = "__JS_PREDICT__";
 
 /**
@@ -79,6 +79,11 @@ var placeholderVariablePrefix = exports.placeholderVariablePrefix = "__p_";
  * Identifiers that are not actually variables.
  */
 var reservedIdentifiers = exports.reservedIdentifiers = new Set(["undefined", "null", "NaN", "Infinity", "eval", "arguments"]);
+
+/**
+ * Reserved Node.JS module identifiers.
+ */
+var reservedNodeModuleIdentifiers = exports.reservedNodeModuleIdentifiers = new Set(["module", "exports", "require"]);
 var reservedObjectPrototype = exports.reservedObjectPrototype = new Set(["toString", "valueOf", "constructor", "__proto__", "hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable", "toLocaleString"]);
 
 /**

package/dist/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "Obfuscator", {
+  enumerable: true,
+  get: function get() {
+    return _obfuscator["default"];
+  }
+});
 Object.defineProperty(exports, "Template", {
   enumerable: true,
   get: function get() {
@@ -65,15 +71,37 @@ function _obfuscateAST() {
   }));
   return _obfuscateAST.apply(this, arguments);
 }
-function obfuscateWithProfiler(_x5, _x6, _x7) {
+function obfuscateWithProfiler(_x5, _x6) {
   return _obfuscateWithProfiler.apply(this, arguments);
 }
 function _obfuscateWithProfiler() {
-  _obfuscateWithProfiler = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(sourceCode, options, _profiler) {
-    var startTime, obfuscator, totalTransforms, transformMap, beforeParseTime, ast, parseTime, currentTransformTime, beforeCompileTime, code, compileTime, endTime, obfuscationTime;
+  _obfuscateWithProfiler = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(sourceCode, options) {
+    var _profiler,
+      startTime,
+      obfuscator,
+      totalTransforms,
+      transformMap,
+      beforeParseTime,
+      ast,
+      parseTime,
+      currentTransformTime,
+      beforeCompileTime,
+      code,
+      compileTime,
+      endTime,
+      obfuscationTime,
+      _args3 = arguments;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
+          _profiler = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : {};
+          if (!_profiler.performance) {
+            _profiler.performance = {
+              now: function now() {
+                return Date.now();
+              }
+            };
+          }
           startTime = performance.now();
           obfuscator = new _obfuscator["default"](options);
           totalTransforms = obfuscator.plugins.length;
@@ -84,13 +112,15 @@ function _obfuscateWithProfiler() {
           currentTransformTime = performance.now();
           ast = obfuscator.obfuscateAST(ast, {
             profiler: function profiler(log) {
+              var _profiler$callback;
               var nowTime = performance.now();
-              transformMap[log.currentTransform] = {
+              var entry = {
                 transformTime: nowTime - currentTransformTime,
                 changeData: {}
               };
+              transformMap[log.currentTransform] = entry;
               currentTransformTime = nowTime;
-              _profiler.callback(log);
+              (_profiler$callback = _profiler.callback) === null || _profiler$callback === void 0 || _profiler$callback.call(_profiler, log, entry, ast);
             }
           });
           obfuscator.plugins.forEach(function (_ref) {
@@ -115,7 +145,7 @@ function _obfuscateWithProfiler() {
               totalPossibleTransforms: obfuscator.totalPossibleTransforms
             }
           });
-        case 16:
+        case 18:
         case "end":
           return _context3.stop();
       }
@@ -127,6 +157,7 @@ var JsConfuser = {
   obfuscate: obfuscate,
   obfuscateAST: obfuscateAST,
   obfuscateWithProfiler: obfuscateWithProfiler,
+  Obfuscator: _obfuscator["default"],
   presets: _presets["default"],
   Template: _template["default"]
 };

package/dist/obfuscator.js

@@ -12,6 +12,7 @@ var _validateOptions = require("./validateOptions");
 var _NameGen = require("./utils/NameGen");
 var _order = require("./order");
 var _plugin = require("./transforms/plugin");
+var _objectUtils = require("./utils/object-utils");
 var _preparation = _interopRequireDefault(require("./transforms/preparation"));
 var _renameVariables = _interopRequireDefault(require("./transforms/identifier/renameVariables"));
 var _variableMasking = _interopRequireDefault(require("./transforms/variableMasking"));
@@ -37,7 +38,6 @@ var _minify = _interopRequireDefault(require("./transforms/minify"));
 var _finalizer = _interopRequireDefault(require("./transforms/finalizer"));
 var _integrity = _interopRequireDefault(require("./transforms/lock/integrity"));
 var _pack = _interopRequireDefault(require("./transforms/pack"));
-var _objectUtils = require("./utils/object-utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
@@ -165,7 +165,10 @@ var Obfuscator = exports["default"] = /*#__PURE__*/function () {
   }
   return _createClass(Obfuscator, [{
     key: "isInternalVariable",
-    value: function isInternalVariable(name) {
+    value:
+    // Pack Interface for sharing globals across RGF functions
+
+    function isInternalVariable(name) {
       return Object.values(this.globalState.internals).includes(name);
     }
   }, {
@@ -233,9 +236,6 @@ var Obfuscator = exports["default"] = /*#__PURE__*/function () {
         var _this$plugins$i = this.plugins[i],
           plugin = _this$plugins$i.plugin,
           pluginInstance = _this$plugins$i.pluginInstance;
-
-        // Skip pack if disabled
-        if (pluginInstance.order === _order.Order.Pack && options !== null && options !== void 0 && options.disablePack) continue;
         if (this.options.verbose) {
           console.log("Applying ".concat(pluginInstance.name, " (").concat(i + 1, "/").concat(this.plugins.length, ")"));
         }

package/dist/templates/integrityTemplate.js

@@ -27,4 +27,4 @@ function HashFunction(str, seed) {
 }
 
 // In template form to be inserted into code
-var HashTemplate = exports.HashTemplate = new _template["default"]("\n// Must be Function Declaration for hoisting\n// Math.imul polyfill for ES5\nfunction {imul}(opA, opB) {\n  var MathImul = Math[\"imul\"] || function(opA, opB){\n    opB |= 0; // ensure that opB is an integer. opA will automatically be coerced.\n    // floating points give us 53 bits of precision to work with plus 1 sign bit\n    // automatically handled for our convienence:\n    // 1. 0x003fffff /*opA & 0x000fffff*/ * 0x7fffffff /*opB*/ = 0x1fffff7fc00001\n    //    0x1fffff7fc00001 < Number.MAX_SAFE_INTEGER /*0x1fffffffffffff*/\n    var result = (opA & 0x003fffff) * opB;\n    // 2. We can remove an integer coersion from the statement above because:\n    //    0x1fffff7fc00001 + 0xffc00000 = 0x1fffffff800001\n    //    0x1fffffff800001 < Number.MAX_SAFE_INTEGER /*0x1fffffffffffff*/\n    if (opA & 0xffc00000 /*!== 0*/) result += (opA & 0xffc00000) * opB |0;\n    return result |0;\n  };\n\n  var result = MathImul(opA, opB);\n\n  return result;\n}\n\n\nfunction {hashingUtilFnName}(str, seed) {\n  var h1 = 0xdeadbeef ^ seed;\n  var h2 = 0x41c6ce57 ^ seed;\n  for (var i = 0, ch; i < str.length; i++) {\n      ch = str.charCodeAt(i);\n      h1 = {imul}(h1 ^ ch, 2654435761);\n      h2 = {imul}(h2 ^ ch, 1597334677);\n  }\n  h1 = {imul}(h1 ^ (h1>>>16), 2246822507) ^ {imul}(h2 ^ (h2>>>13), 3266489909);\n  h2 = {imul}(h2 ^ (h2>>>16), 2246822507) ^ {imul}(h1 ^ (h1>>>13), 3266489909);\n  return 4294967296 * (2097151 & h2) + (h1>>>0);\n};\n\n// Simple function that returns .toString() value with spaces replaced out\nfunction {name}(fnObject, seed, regex={sensitivityRegex}){\n  var fnStringed = fnObject[\"toString\"]()[\"replace\"](regex, \"\");\n  return {hashingUtilFnName}(fnStringed, seed);\n}\n").addSymbols(_constants.SKIP, _constants.MULTI_TRANSFORM);
+var HashTemplate = exports.HashTemplate = new _template["default"]("\n// Must be Function Declaration for hoisting\n// Math.imul polyfill for ES5\nfunction MathImulPolyfill(opA, opB){\n  opB |= 0; // ensure that opB is an integer. opA will automatically be coerced.\n  // floating points give us 53 bits of precision to work with plus 1 sign bit\n  // automatically handled for our convienence:\n  // 1. 0x003fffff /*opA & 0x000fffff*/ * 0x7fffffff /*opB*/ = 0x1fffff7fc00001\n  //    0x1fffff7fc00001 < Number.MAX_SAFE_INTEGER /*0x1fffffffffffff*/\n  var result = (opA & 0x003fffff) * opB;\n  // 2. We can remove an integer coersion from the statement above because:\n  //    0x1fffff7fc00001 + 0xffc00000 = 0x1fffffff800001\n  //    0x1fffffff800001 < Number.MAX_SAFE_INTEGER /*0x1fffffffffffff*/\n  if (opA & 0xffc00000 /*!== 0*/) result += (opA & 0xffc00000) * opB |0;\n  return result |0;\n};\n\nvar {imul} = Math[\"imul\"] || MathImulPolyfill;\n\nfunction {hashingUtilFnName}(str, seed) {\n  var h1 = 0xdeadbeef ^ seed;\n  var h2 = 0x41c6ce57 ^ seed;\n  for (var i = 0, ch; i < str.length; i++) {\n      ch = str.charCodeAt(i);\n      h1 = {imul}(h1 ^ ch, 2654435761);\n      h2 = {imul}(h2 ^ ch, 1597334677);\n  }\n  h1 = {imul}(h1 ^ (h1>>>16), 2246822507) ^ {imul}(h2 ^ (h2>>>13), 3266489909);\n  h2 = {imul}(h2 ^ (h2>>>16), 2246822507) ^ {imul}(h1 ^ (h1>>>13), 3266489909);\n  return 4294967296 * (2097151 & h2) + (h1>>>0);\n};\n\n// Simple function that returns .toString() value with spaces replaced out\nfunction {name}(fnObject, seed, regex={sensitivityRegex}){\n  var fnStringed = fnObject[\"toString\"]()[\"replace\"](regex, \"\");\n  return {hashingUtilFnName}(fnStringed, seed);\n}\n").addSymbols(_constants.SKIP, _constants.MULTI_TRANSFORM);

package/dist/transforms/controlFlowFlattening.js

@@ -36,6 +36,9 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+// Function deemed unsafe for CFF
+var CFF_UNSAFE = Symbol("CFF_UNSAFE");
+
 /**
  * Breaks functions into DAGs (Directed Acyclic Graphs)
  *
@@ -79,6 +82,10 @@ var _default = exports["default"] = function _default(_ref) {
   // Amount of blocks changed by Control Flow Flattening
   var cffCounter = 0;
   var functionsModified = new Set();
+  function flagFunctionToAvoid(path, reason) {
+    var fnOrProgram = (0, _astUtils.getParentFunctionOrProgram)(path);
+    fnOrProgram.node[CFF_UNSAFE] = reason;
+  }
   return {
     post: function post() {
       functionsModified.forEach(function (node) {
@@ -86,6 +93,26 @@ var _default = exports["default"] = function _default(_ref) {
       });
     },
     visitor: {
+      // Unsafe detection
+      ThisExpression: function ThisExpression(path) {
+        flagFunctionToAvoid(path, "this");
+      },
+      VariableDeclaration: function VariableDeclaration(path) {
+        if (path.node.declarations.length !== 1) {
+          path.getAncestry().forEach(function (p) {
+            p.node[CFF_UNSAFE] = "multipleDeclarations";
+          });
+        }
+      },
+      Identifier: function Identifier(path) {
+        if (path.node.name === _constants.variableFunctionName || path.node.name === "arguments") {
+          flagFunctionToAvoid(path, "arguments");
+        }
+      },
+      "Super|MetaProperty|AwaitExpression|YieldExpression": function SuperMetaPropertyAwaitExpressionYieldExpression(path) {
+        flagFunctionToAvoid(path, "functionSpecific");
+      },
+      // Main CFF transformation
       "Program|Function": {
         exit: function exit(_path) {
           var programOrFunctionPath = _path;
@@ -94,6 +121,9 @@ var _default = exports["default"] = function _default(_ref) {
           if (programOrFunctionPath.find(function (p) {
             return p.isForStatement() || p.isWhile();
           })) return;
+
+          // Exclude 'CFF_UNSAFE' functions
+          if (programOrFunctionPath.node[CFF_UNSAFE]) return;
           var programPath = _path.isProgram() ? _path : null;
           var functionPath = _path.isFunction() ? _path : null;
           var blockPath;
@@ -118,32 +148,17 @@ var _default = exports["default"] = function _default(_ref) {
           if (!me.computeProbabilityMap(me.options.controlFlowFlattening)) {
             return;
           }
-
-          // Avoid unsafe functions
-          if (functionPath && functionPath.node[_constants.UNSAFE]) return;
+          if (functionPath) {
+            // Avoid unsafe functions
+            if (functionPath.node[_constants.UNSAFE]) return;
+            if (functionPath.node.async || functionPath.node.generator) return;
+          }
           programOrFunctionPath.scope.crawl();
           var blockFnParent = (0, _astUtils.getParentFunctionOrProgram)(blockPath);
           var hasIllegalNode = false;
           var bindingNames = new Set();
           blockPath.traverse({
-            "Super|MetaProperty|AwaitExpression|YieldExpression": function SuperMetaPropertyAwaitExpressionYieldExpression(path) {
-              if ((0, _astUtils.getParentFunctionOrProgram)(path).node === blockFnParent.node) {
-                hasIllegalNode = true;
-                path.stop();
-              }
-            },
-            VariableDeclaration: function VariableDeclaration(path) {
-              if (path.node.declarations.length !== 1) {
-                hasIllegalNode = true;
-                path.stop();
-              }
-            },
             Identifier: function Identifier(path) {
-              if (path.node.name === _constants.variableFunctionName || path.node.name === "arguments") {
-                hasIllegalNode = true;
-                path.stop();
-                return;
-              }
               if (!path.isBindingIdentifier()) return;
               var binding = path.scope.getBinding(path.node.name);
               if (!binding) return;
@@ -270,7 +285,7 @@ var _default = exports["default"] = function _default(_ref) {
             }, {
               key: "getInitializingObjectExpression",
               value: function getInitializingObjectExpression() {
-                return isDebug ? new _template["default"]("\n                  ({\n                    identity: \"".concat(this.propertyName, "\"\n                  })\n                    ")).expression() : new _template["default"]("Object[\"create\"](null)").expression();
+                return isDebug ? new _template["default"]("\n                  ({\n                    identity: \"".concat(this.propertyName, "\"\n                  })\n                    ")).expression() : new _template["default"]("({})").expression();
               }
             }, {
               key: "getMemberExpression",
@@ -301,6 +316,13 @@ var _default = exports["default"] = function _default(_ref) {
                 for (var key in propertyMap) {
                   properties.push(t.objectProperty(t.stringLiteral(key), propertyMap[key], true));
                 }
+                if (this === mainScope) {
+                  // Reset With logic
+                  properties.push(t.objectProperty(t.stringLiteral(resetWithProperty), new _template["default"]("\n                        (function(newStateValues, alwaysUndefined){\n                          {withMemberExpression} = alwaysUndefined;\n                          {arrayPattern} = newStateValues\n                        })\n                      ").expression({
+                    withMemberExpression: (0, _node.deepClone)(withMemberExpression),
+                    arrayPattern: t.arrayPattern((0, _node.deepClone)(stateVars))
+                  }), true));
+                }
                 return t.objectExpression(properties);
               }
             }, {
@@ -537,7 +559,7 @@ var _default = exports["default"] = function _default(_ref) {
                 if (statement.isFunctionDeclaration()) {
                   var fnName = statement.node.id.name;
                   var isIllegal = false;
-                  if (!flattenFunctionDeclarations || statement.node.async || statement.node.generator || statement.node[_constants.UNSAFE]) {
+                  if (!flattenFunctionDeclarations || statement.node.async || statement.node.generator || statement.node[_constants.UNSAFE] || statement.node[CFF_UNSAFE] || (0, _astUtils.isStrictMode)(statement)) {
                     isIllegal = true;
                   }
                   var oldBasicBlock = currentBasicBlock;
@@ -673,13 +695,6 @@ var _default = exports["default"] = function _default(_ref) {
             nextBlockPath: defaultBlockPath
           });
           basicBlocks.get(endLabel).allowWithDiscriminant = false;
-
-          // Add with / reset with logic
-          basicBlocks.get(startLabel).body.unshift(new _template["default"]("\n              {resetWithMemberExpression} = function(newStateValues){\n                {withMemberExpression} = undefined;\n                {arrayPattern} = newStateValues\n              }\n              ").single({
-            arrayPattern: t.arrayPattern((0, _node.deepClone)(stateVars)),
-            resetWithMemberExpression: (0, _node.deepClone)(resetWithMemberExpression),
-            withMemberExpression: (0, _node.deepClone)(withMemberExpression)
-          }));
           if (!isDebug && addDeadCode) {
             // DEAD CODE 1/3: Add fake chunks that are never reached
             var fakeChunkCount = (0, _randomUtils.getRandomInteger)(1, 5);
@@ -767,7 +782,7 @@ var _default = exports["default"] = function _default(_ref) {
           var _iterator2 = _createForOfIteratorHelper(basicBlocks.values()),
             _step2;
           try {
-            var _loop5 = function _loop5() {
+            var _loop4 = function _loop4() {
               var basicBlock = _step2.value;
               var currentStateValues = basicBlock.stateValues;
               // Wrap the statement in a Babel path to allow traversal
@@ -854,6 +869,12 @@ var _default = exports["default"] = function _default(_ref) {
                     me.skip(memberExpression);
                     path.replaceWith(memberExpression);
                     path.skip();
+
+                    // Preserve proper 'this' context when directly calling functions
+                    // X.Y.Z() -> (1, X.Y.Z)()
+                    if (path.parentPath.isCallExpression() && path.key === "callee") {
+                      path.replaceWith(t.sequenceExpression([t.numericLiteral(1), path.node]));
+                    }
                   }
                 },
                 // Top-level returns set additional flag to indicate that the function has returned
@@ -889,18 +910,17 @@ var _default = exports["default"] = function _default(_ref) {
                         needsIndividualAssignments = false;
                       }
                       if (needsIndividualAssignments) {
-                        for (var _i7 = 0; _i7 < stateVars.length; _i7++) {
-                          var oldValue = currentStateValues[_i7];
-                          var newValue = newStateValues[_i7];
+                        for (var _i8 = 0; _i8 < stateVars.length; _i8++) {
+                          var oldValue = currentStateValues[_i8];
+                          var newValue = newStateValues[_i8];
 
                           // console.log(oldValue, newValue);
                           if (oldValue === newValue) continue; // No diff needed if the value doesn't change
 
-                          var leftValue = jumpBlock.withDiscriminant ? jumpBlock.withDiscriminant.getMemberExpression(stateVars[_i7].name) : (0, _node.deepClone)(stateVars[_i7]);
-                          var assignment = t.assignmentExpression("=", leftValue, (0, _node.numericLiteral)(newValue));
+                          var assignment = t.assignmentExpression("=", (0, _node.deepClone)(stateVars[_i8]), (0, _node.numericLiteral)(newValue));
                           if (!isDebug && addRelativeAssignments) {
                             // Use diffs to create confusing code
-                            assignment = t.assignmentExpression("+=", (0, _node.deepClone)(stateVars[_i7]), (0, _node.numericLiteral)(newValue - oldValue));
+                            assignment = t.assignmentExpression("+=", (0, _node.deepClone)(stateVars[_i8]), (0, _node.numericLiteral)(newValue - oldValue));
                           }
                           assignments.push(assignment);
                         }
@@ -921,7 +941,7 @@ var _default = exports["default"] = function _default(_ref) {
               basicBlock.thisPath.traverse(visitor);
             };
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              _loop5();
+              _loop4();
             }
 
             /**
@@ -939,32 +959,39 @@ 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)(2, 5);
-          var _loop3 = function _loop3() {
-              var name = mainScope.getNewName(me.getPlaceholder("predicate_" + _i2));
-              var number = (0, _randomUtils.getRandomInteger)(-250, 250);
-              predicateNumbers.set(name, number);
-              var createAssignment = function createAssignment(value) {
-                return new _template["default"]("\n                {memberExpression} = {number}\n                ").single({
-                  memberExpression: mainScope.getMemberExpression(name),
-                  number: (0, _node.numericLiteral)(number)
-                });
-              };
-              basicBlocks.get(startLabel).body.unshift(createAssignment(number));
-
-              // Add random assignments to impossible blocks
-              fakeAssignmentCount = (0, _randomUtils.getRandomInteger)(0, 3);
-              for (var _i8 = 0; _i8 < fakeAssignmentCount; _i8++) {
-                impossibleBlock = (0, _randomUtils.choice)(getImpossibleBasicBlocks());
-                if (impossibleBlock) {
-                  impossibleBlock.body.unshift(createAssignment((0, _randomUtils.getRandomInteger)(-250, 250)));
-                }
-              }
-            },
-            fakeAssignmentCount,
-            impossibleBlock;
+          var predicateNumberCount = isDebug || !addPredicateTests ? 0 : (0, _randomUtils.getRandomInteger)(1, 4);
           for (var _i2 = 0; _i2 < predicateNumberCount; _i2++) {
-            _loop3();
+            var name = mainScope.getNewName(me.getPlaceholder("predicate_" + _i2));
+            var number = (0, _randomUtils.getRandomInteger)(-250, 250);
+            predicateNumbers.set(name, number);
+          }
+          var predicateSymbol = Symbol("predicate");
+          var createAssignment = function createAssignment(values) {
+            var exprStmt = new _template["default"]("\n              ({predicateVariables} = {values})\n              ").single({
+              predicateVariables: t.arrayPattern(Array.from(predicateNumbers.keys()).map(function (name) {
+                return mainScope.getMemberExpression(name);
+              })),
+              values: t.arrayExpression(values.map(function (value) {
+                return (0, _node.numericLiteral)(value);
+              }))
+            });
+            exprStmt[predicateSymbol] = true;
+            return exprStmt;
+          };
+          basicBlocks.get(startLabel).body.unshift(createAssignment(Array.from(predicateNumbers.values())));
+
+          // Add random assignments to impossible blocks
+          var fakeAssignmentCount = (0, _randomUtils.getRandomInteger)(1, 3);
+          for (var _i3 = 0; _i3 < fakeAssignmentCount; _i3++) {
+            var impossibleBlock = (0, _randomUtils.choice)(getImpossibleBasicBlocks());
+            if (impossibleBlock) {
+              var _impossibleBlock$body;
+              if ((_impossibleBlock$body = impossibleBlock.body[0]) !== null && _impossibleBlock$body !== void 0 && _impossibleBlock$body[predicateSymbol]) continue;
+              var fakeValues = new Array(predicateNumberCount).fill(0).map(function () {
+                return (0, _randomUtils.getRandomInteger)(-250, 250);
+              });
+              impossibleBlock.body.unshift(createAssignment(fakeValues));
+            }
           }
 
           // Add scope initializations: scope["_0"] = {identity: "_0"}
@@ -988,8 +1015,8 @@ var _default = exports["default"] = function _default(_ref) {
           if (!isDebug && addFakeTests) {
             (0, _randomUtils.shuffle)(blocks);
           }
-          var _loop4 = function _loop4() {
-            var block = _blocks[_i3];
+          var _loop3 = function _loop3() {
+            var block = _blocks[_i4];
             if (block.label === endLabel) {
               // ok(block.body.length === 0);
               return 1; // continue
@@ -1001,8 +1028,8 @@ var _default = exports["default"] = function _default(_ref) {
             if (!isDebug && addPredicateTests && block.label !== startLabel && (0, _randomUtils.chance)(50)) {
               var predicateName = (0, _randomUtils.choice)(Array.from(predicateNumbers.keys()));
               if (predicateName) {
-                var number = predicateNumbers.get(predicateName);
-                var diff = block.totalState - number;
+                var _number = predicateNumbers.get(predicateName);
+                var diff = block.totalState - _number;
                 test = t.binaryExpression("+", mainScope.getMemberExpression(predicateName), (0, _node.numericLiteral)(diff));
               }
             }
@@ -1054,20 +1081,20 @@ 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 _i4 = 0; _i4 < fakeTestCount; _i4++) {
+              for (var _i5 = 0; _i5 < fakeTestCount; _i5++) {
                 tests.push((0, _node.numericLiteral)(stateIntGen.generate()));
               }
               (0, _randomUtils.shuffle)(tests);
             }
             var lastTest = tests.pop();
-            for (var _i5 = 0, _tests = tests; _i5 < _tests.length; _i5++) {
-              var _test = _tests[_i5];
+            for (var _i6 = 0, _tests = tests; _i6 < _tests.length; _i6++) {
+              var _test = _tests[_i6];
               switchCases.push(t.switchCase(_test, []));
             }
             switchCases.push(t.switchCase(lastTest, block.thisPath.node.body));
           };
-          for (var _i3 = 0, _blocks = blocks; _i3 < _blocks.length; _i3++) {
-            if (_loop4()) continue;
+          for (var _i4 = 0, _blocks = blocks; _i4 < _blocks.length; _i4++) {
+            if (_loop3()) continue;
           }
           if (!isDebug && addFakeTests) {
             // A random test can be 'default'
@@ -1086,7 +1113,7 @@ var _default = exports["default"] = function _default(_ref) {
           var switchStatement = t.labeledStatement(t.identifier(switchLabel), t.switchStatement(discriminant, switchCases));
           var startStateValues = basicBlocks.get(startLabel).stateValues;
           var endTotalState = basicBlocks.get(endLabel).totalState;
-          var whileStatement = t.whileStatement(t.binaryExpression("!==", (0, _node.deepClone)(discriminant), (0, _node.numericLiteral)(endTotalState)), t.blockStatement([t.withStatement(new _template["default"]("{withDiscriminant} || Object[\"create\"](null)").expression({
+          var whileStatement = t.whileStatement(t.binaryExpression("!==", (0, _node.deepClone)(discriminant), (0, _node.numericLiteral)(endTotalState)), t.blockStatement([t.withStatement(new _template["default"]("{withDiscriminant} || {}").expression({
             withDiscriminant: (0, _node.deepClone)(withMemberExpression)
           }), t.blockStatement([switchStatement]))]));
           var parameters = [].concat(_toConsumableArray(stateVars), [argVar, scopeVar]).map(function (id) {
@@ -1095,8 +1122,8 @@ var _default = exports["default"] = function _default(_ref) {
           var parametersNames = parameters.map(function (id) {
             return id.name;
           });
-          for (var _i6 = 0, _functionExpressions = functionExpressions; _i6 < _functionExpressions.length; _i6++) {
-            var _functionExpressions$ = _slicedToArray(_functionExpressions[_i6], 4),
+          for (var _i7 = 0, _functionExpressions = functionExpressions; _i7 < _functionExpressions.length; _i7++) {
+            var _functionExpressions$ = _slicedToArray(_functionExpressions[_i7], 4),
               originalFnName = _functionExpressions$[0],
               fnLabel = _functionExpressions$[1],
               basicBlock = _functionExpressions$[2],
@@ -1134,16 +1161,22 @@ var _default = exports["default"] = function _default(_ref) {
               callExpression: t.callExpression((0, _node.deepClone)(mainFnName), argumentsNodes)
             }));
           }
+          var startProgramObjectExpression = basicBlocks.get(startLabel).scopeManager.getObjectExpression(startLabel);
+          var mainParameters = parameters;
+          var scopeParameter = mainParameters.pop();
+          mainParameters.push(t.assignmentPattern(scopeParameter, startProgramObjectExpression));
           var mainFnDeclaration = t.functionDeclaration((0, _node.deepClone)(mainFnName), parameters, t.blockStatement([whileStatement]));
           mainFnDeclaration[_constants.PREDICTABLE] = true;
           var startProgramExpression = t.callExpression((0, _node.deepClone)(mainFnName), [].concat(_toConsumableArray(startStateValues.map(function (stateValue) {
             return (0, _node.numericLiteral)(stateValue);
-          })), [t.identifier("undefined"), basicBlocks.get(startLabel).scopeManager.getObjectExpression(startLabel)]));
+          })), [t.identifier("undefined")]));
           var _resultVar = withIdentifier("result");
-          var allowReturns = blockPath.find(function (p) {
+          var isTopLevel = blockPath.isProgram();
+          var allowReturns = !isTopLevel && blockPath.find(function (p) {
             return p.isFunction();
           });
-          var startProgramStatements = new _template["default"]("\n            ".concat(allowReturns ? "var {didReturnVar};" : "", "\n            var {resultVar} = {startProgramExpression};\n            ").concat(allowReturns ? "\n            if({didReturnVar}){\n              return {resultVar};\n            }" : "", "\n          ")).compile({
+          var startPrefix = allowReturns ? "var {resultVar} = " : "";
+          var startProgramStatements = new _template["default"]("\n            ".concat(allowReturns ? "var {didReturnVar};" : "", "\n            ").concat(startPrefix, "{startProgramExpression};\n            ").concat(allowReturns ? "\n            if({didReturnVar}){\n              return {resultVar};\n            }" : "", "\n          ")).compile({
             startProgramExpression: startProgramExpression,
             didReturnVar: function didReturnVar() {
               return (0, _node.deepClone)(_didReturnVar);