js-confuser 1.4.2 → 1.5.1

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+# `1.5.1`
+Object Extraction Fix
+
+- Fixed [#37](https://github.com/MichaelXF/js-confuser/issues/37)
+- - Object Extraction was applying to objects with get/set methods, fixed in this version.
+
+- Slight improvement to `Flatten`
+
+# `1.5.0`
+Hexadecimal Numbers
+
+- The hexadecimal representation can now be used. [#29](https://github.com/MichaelXF/js-confuser/issues/29)
+- New option `hexadecimalNumbers` to control this behavior.
+
+### `hexadecimalNumbers`
+
+Uses the hexadecimal representation (`50` -> `0x32`) for numbers. (`true/false`) -->
+
+- Slight improvement to `Control Flow Flattening`
+- Slight improvement to `Calculator`
+
+# `1.4.3`
+Minify Fix
+
+- Fixed [#34](https://github.com/MichaelXF/js-confuser/issues/34)
+- - Minify was removing `return` statements too aggressively, fixed in this version.
+
+- Slight improvement to Control Flow Flattening
+
 # `1.4.2`
 Eval Fix
 

package/README.md

@@ -2,6 +2,8 @@
 
 JS-Confuser is a JavaScript obfuscation tool to make your programs _impossible_ to read. [Try the web version](https://jsconfuser.com).
 
+  [![NPM](https://img.shields.io/badge/NPM-%23000000.svg?style=for-the-badge&logo=npm&logoColor=white)](https://npmjs.com/package/js-confuser) [![GitHub](https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white)](https://github.com/MichaelXF/js-confuser) [![Netlify](https://img.shields.io/badge/netlify-%23000000.svg?style=for-the-badge&logo=netlify&logoColor=#00C7B7)](https://jsconfuser.com)
+
 ## Key features
 
 - Variable renaming
@@ -115,6 +117,10 @@ JsConfuser.obfuscate(`<source code>`, {
 
 Remove's whitespace from the final output. Enabled by default. (`true/false`)
 
+### `hexadecimalNumbers`
+
+Uses the hexadecimal representation (`50` -> `0x32`) for numbers. (`true/false`)
+
 ### `minify`
 
 Minifies redundant code. (`true/false`)
@@ -528,6 +534,7 @@ function iVQoGQD(...iVQoGQD){
 
   calculator: true,
   compact: true,
+  hexadecimalNumbers: true,
   controlFlowFlattening: 0.75,
   deadCode: 0.2,
   dispatcher: true,
@@ -562,6 +569,7 @@ function iVQoGQD(...iVQoGQD){
 
   calculator: true,
   compact: true,
+  hexadecimalNumbers: true,
   controlFlowFlattening: 0.5,
   deadCode: 0.025,
   dispatcher: 0.75,
@@ -590,6 +598,7 @@ function iVQoGQD(...iVQoGQD){
 
   calculator: true,
   compact: true,
+  hexadecimalNumbers: true,
   controlFlowFlattening: 0.25,
   deadCode: 0.01,
   dispatcher: 0.5,

package/dev.js

@@ -1,9 +1,8 @@
 require("@babel/register")({
-  presets: [
-    ["@babel/preset-env", { targets: { esmodules: true } }],
-    "@babel/preset-typescript",
-  ],
-  extensions: [".js", ".jsx", ".ts", ".tsx"],
+  presets: ["@babel/preset-typescript"],
+  extensions: [".js", ".ts"],
+  cache: true,
+  retainLines: true,
 });
 
 module.exports = require("./dev.ts");

package/dist/compiler.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = compileJs;
 exports.compileJsSync = compileJsSync;
+exports.default = compileJs;
 
 const escodegen = require("escodegen");
 
@@ -14,7 +14,8 @@ async function compileJs(tree, options) {
 
 function compileJsSync(tree, options) {
   var api = {
-    format: escodegen.FORMAT_MINIFY
+    format: { ...escodegen.FORMAT_MINIFY
+    }
   };
 
   if (!options.compact) {

package/dist/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.reservedIdentifiers = exports.reservedKeywords = void 0;
+exports.reservedKeywords = exports.reservedIdentifiers = void 0;
 
 /**
  * Keywords disallowed for variable names in ES5 and under.

package/dist/index.js

@@ -3,8 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.obfuscate = obfuscate;
-exports.obfuscateAST = obfuscateAST;
 Object.defineProperty(exports, "Obfuscator", {
   enumerable: true,
   get: function () {
@@ -17,13 +15,15 @@ Object.defineProperty(exports, "Transform", {
     return _transform.default;
   }
 });
+exports.default = exports.debugTransformations = exports.debugObfuscation = void 0;
+exports.obfuscate = obfuscate;
+exports.obfuscateAST = obfuscateAST;
 Object.defineProperty(exports, "presets", {
   enumerable: true,
   get: function () {
     return _presets.default;
   }
 });
-exports.default = exports.debugObfuscation = exports.debugTransformations = void 0;
 
 var _compiler = _interopRequireWildcard(require("./compiler"));
 
@@ -43,9 +43,9 @@ var _options = require("./options");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 /**
  * **JsConfuser**: Obfuscates JavaScript.

package/dist/obfuscator.js

@@ -67,6 +67,8 @@ var _antiTooling = _interopRequireDefault(require("./transforms/antiTooling"));
 
 var _hideInitializingCode = _interopRequireDefault(require("./transforms/hideInitializingCode"));
 
+var _hexadecimalNumbers = _interopRequireDefault(require("./transforms/hexadecimalNumbers"));
+
 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; }
@@ -76,7 +78,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  */
 class Obfuscator extends _events.EventEmitter {
   constructor(options) {
+    var _this;
+
     super();
+    _this = this;
     this.options = options;
 
     _defineProperty(this, "varCount", void 0);
@@ -95,10 +100,14 @@ class Obfuscator extends _events.EventEmitter {
     this.push(new _preparation.default(this));
     this.push(new _renameLabels.default(this));
 
-    const test = (map, ...transformers) => {
+    const test = function (map) {
       if ((0, _probability.isProbabilityMapProbable)(map)) {
+        for (var _len = arguments.length, transformers = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          transformers[_key - 1] = arguments[_key];
+        }
+
         // options.verbose && console.log("+ Added " + transformer.name);
-        transformers.forEach(Transformer => this.push(new Transformer(this)));
+        transformers.forEach(Transformer => _this.push(new Transformer(_this)));
       } else {// options.verbose && console.log("- Skipped adding " + transformer.name);
       }
     }; // Optimization: Only add needed transformers. If a probability always return false, no need in running that extra code.
@@ -128,6 +137,7 @@ class Obfuscator extends _events.EventEmitter {
     test(options.stack, _stack.default);
     test(true, _antiTooling.default);
     test(options.hideInitializingCode, _hideInitializingCode.default);
+    test(options.hexadecimalNumbers, _hexadecimalNumbers.default);
 
     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);
@@ -153,7 +163,8 @@ class Obfuscator extends _events.EventEmitter {
     this.state = "transform";
   }
 
-  async apply(tree, debugMode = false) {
+  async apply(tree) {
+    let debugMode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     (0, _assert.ok)(tree.type == "Program", "The root node must be type 'Program'");
     (0, _assert.ok)(Array.isArray(tree.body), "The root's body property must be an array");
     (0, _assert.ok)(Array.isArray(this.array));

package/dist/options.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateOptions = validateOptions;
 exports.correctOptions = correctOptions;
+exports.validateOptions = validateOptions;
 
 var _assert = require("assert");
 
@@ -12,7 +12,7 @@ var _presets = _interopRequireDefault(require("./presets"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const validProperties = new Set(["preset", "target", "indent", "compact", "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", "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 validOses = new Set(["windows", "linux", "osx", "ios", "android"]);
 const validBrowsers = new Set(["firefox", "chrome", "iexplorer", "edge", "safari", "opera"]);
 

package/dist/order.js

@@ -39,4 +39,5 @@ exports.ObfuscateOrder = ObfuscateOrder;
   ObfuscateOrder[ObfuscateOrder["ES5"] = 31] = "ES5";
   ObfuscateOrder[ObfuscateOrder["StringEncoding"] = 32] = "StringEncoding";
   ObfuscateOrder[ObfuscateOrder["AntiTooling"] = 34] = "AntiTooling";
+  ObfuscateOrder[ObfuscateOrder["HexadecimalNumbers"] = 35] = "HexadecimalNumbers";
 })(ObfuscateOrder || (exports.ObfuscateOrder = ObfuscateOrder = {}));

package/dist/parser.js

@@ -9,9 +9,9 @@ exports.parseSync = parseSync;
 
 var assert = _interopRequireWildcard(require("assert"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 const acorn = require("acorn");
 /**

package/dist/precedence.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EXPRESSIONS_PRECEDENCE = exports.NEEDS_PARENTHESES = exports.OPERATOR_PRECEDENCE = void 0;
+exports.OPERATOR_PRECEDENCE = exports.NEEDS_PARENTHESES = exports.EXPRESSIONS_PRECEDENCE = void 0;
 const OPERATOR_PRECEDENCE = {
   "||": 3,
   "&&": 4,

package/dist/presets.js

@@ -33,6 +33,7 @@ const highPreset = {
   preset: "high",
   calculator: true,
   compact: true,
+  hexadecimalNumbers: true,
   controlFlowFlattening: 0.75,
   deadCode: 0.2,
   dispatcher: true,
@@ -69,6 +70,7 @@ const mediumPreset = {
   preset: "medium",
   calculator: true,
   compact: true,
+  hexadecimalNumbers: true,
   controlFlowFlattening: 0.5,
   deadCode: 0.025,
   dispatcher: 0.75,
@@ -96,6 +98,7 @@ const lowPreset = {
   preset: "low",
   calculator: true,
   compact: true,
+  hexadecimalNumbers: true,
   controlFlowFlattening: 0.25,
   deadCode: 0.01,
   dispatcher: 0.5,

package/dist/probability.js

@@ -16,7 +16,9 @@ var _object = require("./util/object");
  * @param runner Custom function to determine return value
  * @param customFnArgs Args given to user-implemented function, such as a variable name.
  */
-function ComputeProbabilityMap(map, runner = x => x, ...customFnArgs) {
+function ComputeProbabilityMap(map) {
+  let runner = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : x => x;
+
   if (!map) {
     return runner();
   }
@@ -30,6 +32,10 @@ function ComputeProbabilityMap(map, runner = x => x, ...customFnArgs) {
   }
 
   if (typeof map === "function") {
+    for (var _len = arguments.length, customFnArgs = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+      customFnArgs[_key - 2] = arguments[_key];
+    }
+
     return map(...customFnArgs);
   }
 

package/dist/transforms/calculator.js

@@ -19,6 +19,8 @@ var _assert = require("assert");
 
 var _precedence = require("../precedence");
 
+var _template = _interopRequireDefault(require("../templates/template"));
+
 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; }
@@ -35,9 +37,15 @@ class Calculator extends _transform.default {
 
     _defineProperty(this, "calculatorFn", void 0);
 
+    _defineProperty(this, "calculatorOpVar", void 0);
+
+    _defineProperty(this, "calculatorSetOpFn", void 0);
+
     this.ops = Object.create(null);
     this.statesUsed = new Set();
     this.calculatorFn = this.getPlaceholder();
+    this.calculatorOpVar = this.getPlaceholder();
+    this.calculatorSetOpFn = this.getPlaceholder();
     this.gen = this.getGenerator();
   }
 
@@ -48,7 +56,6 @@ class Calculator extends _transform.default {
       return;
     }
 
-    var opArg = this.getPlaceholder();
     var leftArg = this.getPlaceholder();
     var rightArg = this.getPlaceholder();
     var switchCases = [];
@@ -58,7 +65,12 @@ class Calculator extends _transform.default {
       var body = [(0, _gen.ReturnStatement)(factory(operator, (0, _gen.Identifier)(leftArg), (0, _gen.Identifier)(rightArg)))];
       switchCases.push((0, _gen.SwitchCase)((0, _gen.Literal)(code), body));
     });
-    var func = (0, _gen.FunctionDeclaration)(this.calculatorFn, [opArg, leftArg, rightArg].map(x => (0, _gen.Identifier)(x)), [(0, _gen.SwitchStatement)((0, _gen.Identifier)(opArg), switchCases)]);
+    var func = (0, _gen.FunctionDeclaration)(this.calculatorFn, [leftArg, rightArg].map(x => (0, _gen.Identifier)(x)), [(0, _gen.SwitchStatement)((0, _gen.Identifier)(this.calculatorOpVar), switchCases)]);
+    (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.calculatorOpVar)));
+    (0, _insert.prepend)(tree, (0, _template.default)("function {name}(a){\n        a = {b} + ({b}=a, 0);\n        return a;\n      }").single({
+      name: this.calculatorSetOpFn,
+      b: this.calculatorOpVar
+    }));
     (0, _insert.prepend)(tree, func);
   }
 
@@ -99,7 +111,7 @@ class Calculator extends _transform.default {
         this.log(operator, "calc(".concat(newState, ", left, right)"));
       }
 
-      this.replace(object, (0, _gen.CallExpression)((0, _gen.Identifier)(this.calculatorFn), [(0, _gen.Literal)(this.ops[operator]), object.left, object.right]));
+      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])])])]));
     };
   }
 

package/dist/transforms/controlFlowFlattening/controlFlowFlattening.js

@@ -71,6 +71,8 @@ class ControlFlowFlattening extends _transform.default {
   }
 
   transform(object, parents) {
+    var _this = this;
+
     return () => {
       if (object.body.length < 3) {
         return;
@@ -193,20 +195,30 @@ class ControlFlowFlattening extends _transform.default {
 
       var resultVar = this.getPlaceholder();
       var argVar = this.getPlaceholder();
+      var testVar = this.getPlaceholder();
+      var stringBankVar = this.getPlaceholder();
+      var stringBank = Object.create(null);
+      var stringBankByLabels = Object.create(null);
+      let stringBankGen = this.getGenerator();
+      var needsTestVar = false;
       var needsResultAndArgVar = false;
+      var needsStringBankVar = false;
       var fnToLabel = Object.create(null);
       fnNames.forEach(fnName => {
         fnToLabel[fnName] = this.getPlaceholder();
       });
 
-      const flattenBody = (body, startingLabel = this.getPlaceholder()) => {
+      const flattenBody = function (body) {
+        let startingLabel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _this.getPlaceholder();
         var chunks = [];
         var currentBody = [];
         var currentLabel = startingLabel;
 
-        const finishCurrentChunk = (pointingLabel, newLabel, addGotoStatement = true) => {
+        const finishCurrentChunk = function (pointingLabel, newLabel) {
+          let addGotoStatement = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+
           if (!newLabel) {
-            newLabel = this.getPlaceholder();
+            newLabel = _this.getPlaceholder();
           }
 
           if (!pointingLabel) {
@@ -224,6 +236,25 @@ class ControlFlowFlattening extends _transform.default {
             label: currentLabel,
             body: [...currentBody]
           });
+          (0, _traverse.walk)(currentBody, [], (o, p) => {
+            if (o.type == "Literal" && typeof o.value == "string" && !o.regex && Math.random() / (Object.keys(stringBank).length / 2 + 1) > 0.5) {
+              needsStringBankVar = true;
+
+              if (!stringBankByLabels[currentLabel]) {
+                stringBankByLabels[currentLabel] = new Set();
+              }
+
+              stringBankByLabels[currentLabel].add(o.value);
+
+              if (typeof stringBank[o.value] === "undefined") {
+                stringBank[o.value] = stringBankGen.generate();
+              }
+
+              return () => {
+                _this.replaceIdentifierOrLiteral(o, (0, _gen.MemberExpression)((0, _gen.Identifier)(stringBankVar), (0, _gen.Literal)(stringBank[o.value]), true), p);
+              };
+            }
+          });
           currentLabel = newLabel;
           currentBody = [];
         };
@@ -241,7 +272,8 @@ class ControlFlowFlattening extends _transform.default {
           }
 
           if (stmt.$callExpression && fnToLabel[stmt.$fnName]) {
-            var afterPath = this.getPlaceholder();
+            var afterPath = _this.getPlaceholder();
+
             var args = [];
 
             switch (stmt.$callExpression) {
@@ -298,10 +330,15 @@ class ControlFlowFlattening extends _transform.default {
 
               var isLoop = !isSwitchStatement;
               var supportContinueStatement = isLoop;
-              var testPath = this.getPlaceholder();
-              var updatePath = this.getPlaceholder();
-              var bodyPath = this.getPlaceholder();
-              var afterPath = this.getPlaceholder();
+
+              var testPath = _this.getPlaceholder();
+
+              var updatePath = _this.getPlaceholder();
+
+              var bodyPath = _this.getPlaceholder();
+
+              var afterPath = _this.getPlaceholder();
+
               var possible = true;
               var toReplace = [];
               (0, _traverse.walk)(control.body, [], (o, p) => {
@@ -327,15 +364,19 @@ class ControlFlowFlattening extends _transform.default {
                 return;
               }
 
-              toReplace.forEach(v => this.replace(v[0], v[1]));
+              toReplace.forEach(v => _this.replace(v[0], v[1]));
 
               if (isSwitchStatement) {
-                var switchVarName = this.getPlaceholder();
+                var switchVarName = _this.getPlaceholder();
+
                 currentBody.push((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(switchVarName, control.discriminant)));
-                var afterPath = this.getPlaceholder();
+
+                var afterPath = _this.getPlaceholder();
+
                 finishCurrentChunk();
                 control.cases.forEach((switchCase, i) => {
-                  var entryPath = this.getPlaceholder();
+                  var entryPath = _this.getPlaceholder();
+
                   currentBody.push((0, _gen.IfStatement)((0, _gen.BinaryExpression)("===", (0, _gen.Identifier)(switchVarName), switchCase.test), [{
                     type: "GotoStatement",
                     label: entryPath
@@ -364,13 +405,18 @@ class ControlFlowFlattening extends _transform.default {
 
 
                 finishCurrentChunk(isPostTest ? bodyPath : testPath, testPath);
-                currentBody.push((0, _gen.IfStatement)(control.test || (0, _gen.Literal)(true), [{
+                currentBody.push((0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(testVar), control.test || (0, _gen.Literal)(true))));
+                needsTestVar = true;
+                finishCurrentChunk();
+                currentBody.push((0, _gen.IfStatement)((0, _gen.Identifier)(testVar), [{
                   type: "GotoStatement",
                   label: bodyPath
                 }])); // create new label called `bodyPath` and have test body point to afterPath (goto afterPath)
 
                 finishCurrentChunk(afterPath, bodyPath);
-                var innerBothPath = this.getPlaceholder();
+
+                var innerBothPath = _this.getPlaceholder();
+
                 chunks.push(...flattenBody([...control.body.body, {
                   type: "GotoStatement",
                   label: updatePath
@@ -388,13 +434,20 @@ class ControlFlowFlattening extends _transform.default {
           }
 
           if (stmt.type == "IfStatement" && stmt.consequent.type == "BlockStatement" && (!stmt.alternate || stmt.alternate.type == "BlockStatement")) {
+            finishCurrentChunk();
+            currentBody.push((0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(testVar), stmt.test)));
+            needsTestVar = true;
             finishCurrentChunk();
             var hasAlternate = !!stmt.alternate;
             (0, _assert.ok)(!(hasAlternate && stmt.alternate.type !== "BlockStatement"));
-            var yesPath = this.getPlaceholder();
-            var noPath = this.getPlaceholder();
-            var afterPath = this.getPlaceholder();
-            currentBody.push((0, _gen.IfStatement)(stmt.test, [{
+
+            var yesPath = _this.getPlaceholder();
+
+            var noPath = _this.getPlaceholder();
+
+            var afterPath = _this.getPlaceholder();
+
+            currentBody.push((0, _gen.IfStatement)((0, _gen.Identifier)(testVar), [{
               type: "GotoStatement",
               label: yesPath
             }]));
@@ -574,6 +627,7 @@ class ControlFlowFlattening extends _transform.default {
         var made = 1;
         var breaksInsertion = [];
         var staticStateValues = [...labelToStates[chunk.label]];
+        var potentialBranches = new Set();
         chunk.body.forEach((stmt, stmtIndex) => {
           var addBreak = false;
           (0, _traverse.walk)(stmt, [], (o, p) => {
@@ -603,6 +657,7 @@ class ControlFlowFlattening extends _transform.default {
                   p[blockIndex].body.splice(childIndex + 1, 0, (0, _gen.BreakStatement)(switchLabel));
                 }
 
+                potentialBranches.add(o.label);
                 var mutatingStateValues = [...labelToStates[chunk.label]];
                 var nextStateValues = labelToStates[o.label];
                 (0, _assert.ok)(nextStateValues, o.label);
@@ -622,10 +677,21 @@ class ControlFlowFlattening extends _transform.default {
         breaksInsertion.reverse();
         breaksInsertion.forEach(index => {
           chunk.body.splice(index + 1, 0, (0, _gen.BreakStatement)(switchLabel));
-        }); // var c = Identifier("undefined");
+        });
+
+        for (var branch of Array.from(potentialBranches)) {
+          var strings = stringBankByLabels[branch];
+
+          if (strings) {
+            chunk.body.unshift((0, _gen.ExpressionStatement)((0, _gen.SequenceExpression)(Array.from(strings).map(strValue => {
+              return (0, _gen.AssignmentExpression)("=", (0, _gen.MemberExpression)((0, _gen.Identifier)(stringBankVar), (0, _gen.Literal)(stringBank[strValue]), true), (0, _gen.Literal)(strValue));
+            }))));
+          }
+        } // var c = Identifier("undefined");
         // this.addComment(c, stateValues.join(", "));
         // transitionStatements.push(c);
 
+
         var caseObject = {
           body: chunk.body,
           state: state,
@@ -658,11 +724,19 @@ class ControlFlowFlattening extends _transform.default {
       }));
       var declarations = [];
 
+      if (needsTestVar) {
+        declarations.push((0, _gen.VariableDeclarator)(testVar));
+      }
+
       if (needsResultAndArgVar) {
         declarations.push((0, _gen.VariableDeclarator)(resultVar));
         declarations.push((0, _gen.VariableDeclarator)(argVar));
       }
 
+      if (needsStringBankVar) {
+        declarations.push((0, _gen.VariableDeclarator)(stringBankVar, (0, _gen.ObjectExpression)(stringBankByLabels[startLabel] ? Array.from(stringBankByLabels[startLabel]).map(strValue => (0, _gen.Property)((0, _gen.Literal)(stringBank[strValue]), (0, _gen.Literal)(strValue), false)) : [])));
+      }
+
       declarations.push(...stateVars.map((stateVar, i) => {
         return (0, _gen.VariableDeclarator)(stateVar, (0, _gen.Literal)(initStateValues[i]));
       }));

package/dist/transforms/deadCode.js

@@ -25,7 +25,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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 templates = [(0, _template.default)("\n  function curCSS( elem, name, computed ) {\n    var ret;\n  \n    computed = computed || getStyles( elem );\n  \n    if ( computed ) {\n      ret = computed.getPropertyValue( name ) || computed[ name ];\n  \n      if ( ret === \"\" && !isAttached( elem ) ) {\n        ret = redacted.style( elem, name );\n      }\n    }\n  \n    return ret !== undefined ?\n  \n      // Support: IE <=9 - 11+\n      // IE returns zIndex value as an integer.\n      ret + \"\" :\n      ret;\n  }"), (0, _template.default)("\n  function Example() {\n    var state = redacted.useState(false);\n    return x(\n      ErrorBoundary,\n      null,\n      x(\n        DisplayName,\n        null,\n      )\n    );\n  }"), (0, _template.default)("\n  const path = require('path');\nconst { version } = require('../../package');\nconst { version: dashboardPluginVersion } = require('@redacted/enterprise-plugin/package');\nconst { version: componentsVersion } = require('@redacted/components/package');\nconst { sdkVersion } = require('@redacted/enterprise-plugin');\nconst isStandaloneExecutable = require('../utils/isStandaloneExecutable');\nconst resolveLocalRedactedPath = require('./resolve-local-redacted-path');\n\nconst redactedPath = path.resolve(__dirname, '../redacted.js');"), (0, _template.default)("\nmodule.exports = async (resolveLocalRedactedPath = ()=>{throw new Error(\"No redacted path provided\")}) => {\n  const cliParams = new Set(process.argv.slice(2));\n  if (!cliParams.has('--version')) {\n    if (cliParams.size !== 1) return false;\n    if (!cliParams.has('-v')) return false;\n  }\n\n  const installationModePostfix = await (async (isStandaloneExecutable, redactedPath) => {\n    if (isStandaloneExecutable) return ' (standalone)';\n    if (redactedPath === (await resolveLocalRedactedPath())) return ' (local)';\n    return '';\n  })();\n\n  return true;\n};"), (0, _template.default)("\nfunction setCookie(cname, cvalue, exdays) {\n  var d = new Date();\n  d.setTime(d.getTime() + (exdays*24*60*60*1000));\n  var expires = \"expires=\"+ d.toUTCString();\n  document.cookie = cname + \"=\" + cvalue + \";\" + expires + \";path=/\";\n}"), (0, _template.default)("function getCookie(cname) {\n  var name = cname + \"=\";\n  var decodedCookie = decodeURIComponent(document.cookie);\n  var ca = decodedCookie.split(';');\n  for(var i = 0; i <ca.length; i++) {\n    var c = ca[i];\n    while (c.charAt(0) == ' ') {\n      c = c.substring(1);\n    }\n    if (c.indexOf(name) == 0) {\n      return c.substring(name.length, c.length);\n    }\n  }\n  return \"\";\n}"), (0, _template.default)("function getLocalStorageValue(key, cb){\n    if ( typeof key !== \"string\" ) {\n      throw new Error(\"Invalid data key provided (not type string)\")\n    }\n    if ( !key ) {\n      throw new Error(\"Invalid data key provided (empty string)\")\n    }\n    var value = window.localStorage.getItem(key)\n    try {\n      value = JSON.parse(value)\n    } catch ( e ) {\n      cb(new Error(\"Serialization error for data '\" + key + \"': \" + e.message))\n    }\n\n    cb(null, value)\n  }"), (0, _template.default)("\n  \n    var __ = \"(c=ak(<~F$VU'9f)~><&85dBPL-module/from\";\n    var s = \"q:function(){var ad=ad=>b(ad-29);if(!T.r[(typeof ab==ad(123)?\";\n    var g = \"return U[c[c[d(-199)]-b(205)]]||V[ae(b(166))];case T.o[c[c[c[d(-199)]+d(-174)]-(c[b(119)]-(c[d(-199)]-163))]+ae(b(146))](0)==b(167)?d(-130):-d(-144)\";\n\n    __.match(s + g);\n  ")];
+const templates = [(0, _template.default)("\n  function curCSS( elem, name, computed ) {\n    var ret;\n  \n    computed = computed || getStyles( elem );\n  \n    if ( computed ) {\n      ret = computed.getPropertyValue( name ) || computed[ name ];\n  \n      if ( ret === \"\" && !isAttached( elem ) ) {\n        ret = redacted.style( elem, name );\n      }\n    }\n  \n    return ret !== undefined ?\n  \n      // Support: IE <=9 - 11+\n      // IE returns zIndex value as an integer.\n      ret + \"\" :\n      ret;\n  }"), (0, _template.default)("\n  function Example() {\n    var state = redacted.useState(false);\n    return x(\n      ErrorBoundary,\n      null,\n      x(\n        DisplayName,\n        null,\n      )\n    );\n  }"), (0, _template.default)("\n  const path = require('path');\nconst { version } = require('../../package');\nconst { version: dashboardPluginVersion } = require('@redacted/enterprise-plugin/package');\nconst { version: componentsVersion } = require('@redacted/components/package');\nconst { sdkVersion } = require('@redacted/enterprise-plugin');\nconst isStandaloneExecutable = require('../utils/isStandaloneExecutable');\nconst resolveLocalRedactedPath = require('./resolve-local-redacted-path');\n\nconst redactedPath = path.resolve(__dirname, '../redacted.js');"), (0, _template.default)("\nmodule.exports = async (resolveLocalRedactedPath = ()=>{throw new Error(\"No redacted path provided\")}) => {\n  const cliParams = new Set(process.argv.slice(2));\n  if (!cliParams.has('--version')) {\n    if (cliParams.size !== 1) return false;\n    if (!cliParams.has('-v')) return false;\n  }\n\n  const installationModePostfix = await (async (isStandaloneExecutable, redactedPath) => {\n    if (isStandaloneExecutable) return ' (standalone)';\n    if (redactedPath === (await resolveLocalRedactedPath())) return ' (local)';\n    return '';\n  })();\n\n  return true;\n};"), (0, _template.default)("\nfunction setCookie(cname, cvalue, exdays) {\n  var d = new Date();\n  d.setTime(d.getTime() + (exdays*24*60*60*1000));\n  var expires = \"expires=\"+ d.toUTCString();\n  document.cookie = cname + \"=\" + cvalue + \";\" + expires + \";path=/\";\n}"), (0, _template.default)("function getCookie(cname) {\n  var name = cname + \"=\";\n  var decodedCookie = decodeURIComponent(document.cookie);\n  var ca = decodedCookie.split(';');\n  for(var i = 0; i <ca.length; i++) {\n    var c = ca[i];\n    while (c.charAt(0) == ' ') {\n      c = c.substring(1);\n    }\n    if (c.indexOf(name) == 0) {\n      return c.substring(name.length, c.length);\n    }\n  }\n  return \"\";\n}"), (0, _template.default)("function getLocalStorageValue(key, cb){\n    if ( typeof key !== \"string\" ) {\n      throw new Error(\"Invalid data key provided (not type string)\")\n    }\n    if ( !key ) {\n      throw new Error(\"Invalid data key provided (empty string)\")\n    }\n    var value = window.localStorage.getItem(key)\n    try {\n      value = JSON.parse(value)\n    } catch ( e ) {\n      cb(new Error(\"Serialization error for data '\" + key + \"': \" + e.message))\n    }\n\n    cb(null, value)\n  }"), (0, _template.default)("\n  \n    var __ = \"(c=ak(<~F$VU'9f)~><&85dBPL-module/from\";\n    var s = \"q:function(){var ad=ad=>b(ad-29);if(!T.r[(typeof ab==ad(123)?\";\n    var g = \"return U[c[c[d(-199)]-b(205)]]||V[ae(b(166))];case T.o[c[c[c[d(-199)]+d(-174)]-(c[b(119)]-(c[d(-199)]-163))]+ae(b(146))](0)==b(167)?d(-130):-d(-144)\";\n\n    __.match(s + g);\n  "), (0, _template.default)("\n  function vec_pack(vec) {\n    return vec[1] * 67108864 + (vec[0] < 0 ? 33554432 | vec[0] : vec[0]);\n  }\n  \n  function vec_unpack(number) {\n    switch (((number & 33554432) !== 0) * 1 + (number < 0) * 2) {\n      case 0:\n        return [number % 33554432, Math.trunc(number / 67108864)];\n      case 1:\n        return [\n          (number % 33554432) - 33554432,\n          Math.trunc(number / 67108864) + 1,\n        ];\n      case 2:\n        return [\n          (((number + 33554432) % 33554432) + 33554432) % 33554432,\n          Math.round(number / 67108864),\n        ];\n      case 3:\n        return [number % 33554432, Math.trunc(number / 67108864)];\n    }\n  }\n  \n  let a = vec_pack([2, 4]);\n  let b = vec_pack([1, 2]);\n  \n  let c = a + b; // Vector addition\n  let d = c - b; // Vector subtraction\n  let e = d * 2; // Scalar multiplication\n  let f = e / 2; // Scalar division\n  \n  console.log(vec_unpack(c)); // [3, 6]\n  console.log(vec_unpack(d)); // [2, 4]\n  console.log(vec_unpack(e)); // [4, 8]\n  console.log(vec_unpack(f)); // [2, 4]\n  "), (0, _template.default)("\n  function buildCharacterMap(str) {\n    const characterMap = {};\n  \n    for (let char of str.replace(/[^w]/g, \"\").toLowerCase())\n      characterMap[char] = characterMap[char] + 1 || 1;\n  \n    return characterMap;\n  }\n  \n  function isAnagrams(stringA, stringB) {\n    const stringAMap = buildCharMap(stringA);\n    const stringBMap = buildCharMap(stringB);\n  \n    for (let char in stringAMap) {\n      if (stringAMap[char] !== stringBMap[char]) {\n        return false;\n      }\n    }\n  \n    if (Object.keys(stringAMap).length !== Object.keys(stringBMap).length) {\n      return false;\n    }\n  \n    return true;\n  }\n  \n  /**\n   * @param {TreeNode} root\n   * @return {boolean}\n   */\n  function isBalanced(root) {\n    const height = getHeightBalanced(root);\n    return height !== Infinity;\n  }\n  \n  function getHeightBalanced(node) {\n    if (!node) {\n      return -1;\n    }\n  \n    const leftTreeHeight = getHeightBalanced(node.left);\n    const rightTreeHeight = getHeightBalanced(node.right);\n  \n    const heightDiff = Math.abs(leftTreeHeight - rightTreeHeight);\n  \n    if (\n      leftTreeHeight === Infinity ||\n      rightTreeHeight === Infinity ||\n      heightDiff > 1\n    ) {\n      return Infinity;\n    }\n  \n    const currentHeight = Math.max(leftTreeHeight, rightTreeHeight) + 1;\n    return currentHeight;\n  }\n  \n  window[\"__GLOBAL__HELPERS__\"] = {\n    buildCharacterMap,\n    isAnagrams,\n    isBalanced,\n    getHeightBalanced,\n  };\n  ")];
 /**
  * Adds dead code to blocks.
  *

package/dist/transforms/dispatcher.js

@@ -255,7 +255,9 @@ class Dispatcher extends _transform.default {
             (0, _insert.prepend)(object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(payloadArg, (0, _gen.ArrayExpression)([]))));
           }
 
-          identifiers.forEach(([o, p]) => {
+          identifiers.forEach(_ref => {
+            let [o, p] = _ref;
+
             if (o.type != "Identifier") {
               return;
             }