js-confuser 1.2.1 → 1.4.1

package/dist/transforms/controlFlowFlattening/expressionObfuscation.js

@@ -80,6 +80,10 @@ class ExpressionObfuscation extends _transform.default {
               stmt.argument = (0, _gen.SequenceExpression)([...exprs, { ...stmt.argument
               }]);
               deleteExprs.push(...exprs);
+            } else if (stmt.type == "ReturnStatement") {
+              stmt.argument = (0, _gen.SequenceExpression)([...exprs, { ...(stmt.argument || (0, _gen.Identifier)("undefined"))
+              }]);
+              deleteExprs.push(...exprs);
             }
           }
 

package/dist/transforms/controlFlowFlattening/{switchCaseObfucation.js → switchCaseObfuscation.js}

@@ -35,7 +35,7 @@ class SwitchCaseObfuscation extends _transform.default {
     var types = new Set();
     (0, _traverse.walk)(object.discriminant, [object, ...parents], (o, p) => {
       if (o.type) {
-        if (o.type == "BinaryExpression" && o.operator === "+") {} else {
+        if (object.$controlFlowFlattening && o.type == "BinaryExpression" && o.operator === "+") {} else {
           types.add(o.type);
         }
       }
@@ -64,7 +64,7 @@ class SwitchCaseObfuscation extends _transform.default {
       return;
     }
 
-    var factor = (0, _random.getRandomInteger)(-250, 250);
+    var factor = (0, _random.getRandomInteger)(-150, 150);
 
     if (factor == 0) {
       factor = 2;

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  }")];
+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  ")];
 /**
  * Adds dead code to blocks.
  *

package/dist/transforms/dispatcher.js

@@ -87,17 +87,13 @@ class Dispatcher extends _transform.default {
 
         var newFnNames = {}; // [old name]: randomized name
 
-        var context = (0, _insert.getVarContext)(object, parents);
+        var context = (0, _insert.isVarContext)(object) ? object : (0, _insert.getVarContext)(object, parents);
         (0, _traverse.walk)(object, parents, (o, p) => {
           if (object == o) {
             // Fix 1
             return;
           }
 
-          if ((0, _identifiers.isWithinClass)(o, p)) {
-            return;
-          }
-
           var c = (0, _insert.getVarContext)(o, p);
 
           if (o.type == "FunctionDeclaration") {
@@ -106,7 +102,7 @@ class Dispatcher extends _transform.default {
 
           if (context === c) {
             if (o.type == "FunctionDeclaration" && o.id.name) {
-              if (p.find(x => x.$dispatcherSkip) || o.body.type != "BlockStatement") {
+              if (o.$requiresEval || o.async || o.generator || p.find(x => x.$dispatcherSkip || x.type == "MethodDefinition") || o.body.type != "BlockStatement") {
                 illegalFnNames.add(name);
               }
 
@@ -118,10 +114,11 @@ class Dispatcher extends _transform.default {
               }
 
               (0, _traverse.walk)(o, p, (oo, pp) => {
-                if (oo.type == "Identifier" && oo.name == "arguments") {
-                  illegalFnNames.add(name);
-                } else if (oo.type == "ThisExpression") {
-                  illegalFnNames.add(name);
+                if (oo.type == "Identifier" && oo.name == "arguments" || oo.type == "ThisExpression" || oo.type == "Super") {
+                  if ((0, _insert.getVarContext)(oo, pp) === o) {
+                    illegalFnNames.add(name);
+                    return "EXIT";
+                  }
                 }
               });
               functionDeclarations[name] = [o, p];
@@ -135,6 +132,10 @@ class Dispatcher extends _transform.default {
 
             var info = (0, _identifiers.getIdentifierInfo)(o, p);
 
+            if (!info.spec.isReferenced) {
+              return;
+            }
+
             if (info.spec.isDefined) {
               if (info.isFunctionDeclaration) {
                 if (p[0].id && (!functionDeclarations[p[0].id.name] || functionDeclarations[p[0].id.name][0] !== p[0])) {
@@ -145,7 +146,7 @@ class Dispatcher extends _transform.default {
               }
             } else if (info.spec.isModified) {
               illegalFnNames.add(o.name);
-            } else if (info.spec.isReferenced) {
+            } else {
               identifiers.push([o, p]);
             }
           }
@@ -184,10 +185,10 @@ class Dispatcher extends _transform.default {
               type: "FunctionExpression",
               id: null
             };
+            this.addComment(functionExpression, name);
 
             if (def.params.length > 0) {
               const fixParam = param => {
-                this.addComment(param, "Unloader(param): " + param.name);
                 return param;
               };
 
@@ -271,7 +272,7 @@ class Dispatcher extends _transform.default {
 
             var info = (0, _identifiers.getIdentifierInfo)(o, p);
 
-            if (info.isFunctionCall && p[0].type == "CallExpression") {
+            if (info.isFunctionCall && p[0].type == "CallExpression" && p[0].callee === o) {
               // Invoking call expression: `a();`
               if (o.name == dispatcherFnName) {
                 return;

package/dist/transforms/extraction/duplicateLiteralsRemoval.js

@@ -78,7 +78,9 @@ class DuplicateLiteralsRemoval extends _transform.default {
     super.apply(tree);
 
     if (this.arrayName && this.arrayExpression.elements.length) {
-      (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.arrayName, this.arrayExpression)));
+      var getArrayFn = this.getPlaceholder();
+      (0, _insert.append)(tree, (0, _gen.FunctionDeclaration)(getArrayFn, [], [(0, _gen.ReturnStatement)(this.arrayExpression)]));
+      (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.arrayName, (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(getArrayFn), (0, _gen.Identifier)("call"), false), [(0, _gen.ThisExpression)()]))));
     }
   }
 
@@ -125,18 +127,11 @@ class DuplicateLiteralsRemoval extends _transform.default {
       }
 
       this.fnGetters.set(lexContext, getterName);
-      (0, _insert.prepend)(lexContext, (0, _gen.FunctionDeclaration)(getterName, [(0, _gen.Identifier)("index")], body));
+      (0, _insert.prepend)(lexContext, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(getterName, (0, _gen.CallExpression)((0, _gen.FunctionExpression)([], [(0, _gen.ReturnStatement)((0, _gen.FunctionExpression)([(0, _gen.Identifier)("index")], body))]), []))));
     }
 
     var theShift = this.fnShifts.get(getterName);
-    this.replace(object, (0, _gen.CallExpression)((0, _gen.Identifier)(getterName), [(0, _gen.Literal)(index - theShift)]));
-    var propertyIndex = parents.findIndex(x => x.type == "Property" || x.type == "MethodDefinition");
-
-    if (propertyIndex != -1) {
-      if (!parents[propertyIndex].computed && parents[propertyIndex].key == (parents[propertyIndex - 1] || object)) {
-        parents[propertyIndex].computed = true;
-      }
-    }
+    this.replaceIdentifierOrLiteral(object, (0, _gen.CallExpression)((0, _gen.Identifier)(getterName), [(0, _gen.Literal)(index - theShift)]), parents);
   }
 
   transform(object, parents) {

package/dist/transforms/flatten.js

@@ -71,12 +71,16 @@ class Flatten extends _transform.default {
   }
 
   match(object, parents) {
-    return (0, _insert.isFunction)(object) && object.body.type == "BlockStatement" && !object.generator;
+    return object.type == "FunctionDeclaration" && object.body.type == "BlockStatement" && !object.generator && !object.async && !object.params.find(x => x.type !== "Identifier");
   }
 
   transform(object, parents) {
     return () => {
       //
+      if (parents.find(x => x.type == "ClassExpression" || x.type == "ClassDeclaration" || x.type == "MethodDefinition")) {
+        return;
+      }
+
       var defined = new Set();
       var references = new Set();
       var modified = new Set();

package/dist/transforms/hideInitializingCode.js

@@ -129,12 +129,15 @@ class HideInitializingCode extends _transform.default {
       });
       var map = new Map();
       var fnsToMake = (0, _random.getRandomInteger)(1, 5);
+      var numberLiteralsMade = 1;
 
       function numberLiteral(num, depth = 1) {
-        if (depth > 6 || Math.random() > 0.8 / depth) {
+        if (depth > 6 || Math.random() > 0.8 / depth || Math.random() > 80 / numberLiteralsMade) {
           return (0, _gen.Literal)(num);
         }
 
+        numberLiteralsMade++;
+
         function ternaryCall(name, param = (0, _random.getRandomInteger)(-250, 250)) {
           return (0, _gen.ConditionalExpression)((0, _gen.BinaryExpression)("==", (0, _gen.UnaryExpression)("typeof", (0, _gen.Identifier)(name)), (0, _gen.Literal)("function")), (0, _gen.CallExpression)((0, _gen.Identifier)(name), [numberLiteral(param, depth + 1)]), (0, _gen.Identifier)(name));
         }
@@ -202,7 +205,19 @@ class HideInitializingCode extends _transform.default {
       var deadNameArray = Object.keys(deadValues);
       var sampledArray = Array.from(sampledNames);
       var check = (0, _random.getRandomInteger)(-250, 250);
-      var initName = "init" + this.getPlaceholder();
+      var initName = "init" + this.getPlaceholder(); // Entangle number literals
+
+      var made = 1; // Limit frequency
+
+      (0, _traverse.walk)(stmts, [], (o, p) => {
+        if (o.type == "Literal" && typeof o.value === "number" && Math.floor(o.value) === o.value && Math.abs(o.value) < 100000 && Math.random() < 4 / made) {
+          made++;
+          return () => {
+            this.replaceIdentifierOrLiteral(o, numberLiteral(o.value), p);
+          };
+        }
+      }); // Create the new function
+
       addNodes.push((0, _gen.FunctionDeclaration)(initName, [], [...stmts]));
 
       function truePredicate() {

package/dist/transforms/identifier/globalConcealing.js

@@ -100,11 +100,8 @@ class GlobalConcealing extends _transform.default {
 
     _defineProperty(this, "globalAnalysis", void 0);
 
-    _defineProperty(this, "globalVar", void 0);
-
     this.globalAnalysis = new GlobalAnalysis(o);
     this.before.push(this.globalAnalysis);
-    this.globalVar = null;
   }
 
   match(object, parents) {
@@ -117,6 +114,7 @@ class GlobalConcealing extends _transform.default {
       this.globalAnalysis.notGlobals.forEach(del => {
         delete globals[del];
       });
+      delete globals["require"];
 
       _constants.reservedIdentifiers.forEach(x => {
         delete globals[x];
@@ -132,15 +130,19 @@ class GlobalConcealing extends _transform.default {
 
       if (Object.keys(globals).length > 0) {
         var used = new Set(); // 1. Make getter function
+        // holds "window" or "global"
+
+        var globalVar = this.getPlaceholder(); // holds outermost "this"
 
-        this.globalVar = this.getPlaceholder(); // "window" or "global" in node
+        var thisVar = this.getPlaceholder(); // "window" or "global" in node
 
         var global = this.options.globalVariables.values().next().value || "window";
-        var callee = this.getPlaceholder(); // Returns global variable or fall backs to `this`
+        var getGlobalVariableFnName = this.getPlaceholder();
+        var getThisVariableFnName = this.getPlaceholder(); // Returns global variable or fall backs to `this`
 
-        var functionDeclaration = (0, _template.default)("\n        function ".concat(callee, "(){\n          try {\n            return ").concat(global, ";\n          } catch (e){\n            return this;\n          }\n        }")).single(); // 2. Replace old accessors
+        var getGlobalVariableFn = (0, _template.default)("\n        var ".concat(getGlobalVariableFnName, " = function(){\n          try {\n            return ").concat(global, ";\n          } catch (e){\n            return ").concat(getThisVariableFnName, "[\"call\"](this);\n          }\n        }")).single();
+        var getThisVariableFn = (0, _template.default)("\n        var ".concat(getThisVariableFnName, " = function(){\n          try {\n            return this;\n          } catch (e){\n            return null;\n          }\n        }")).single(); // 2. Replace old accessors
 
-        var variableDeclaration = (0, _template.default)("\n        var ".concat(this.globalVar, " = ").concat(callee, ".call(this);\n        ")).single();
         var globalFn = this.getPlaceholder();
         var newNames = Object.create(null);
         Object.keys(globals).forEach(name => {
@@ -155,30 +157,49 @@ class GlobalConcealing extends _transform.default {
           newNames[name] = state;
           locations.forEach(([node, parents]) => {
             if (!parents.find(x => x.$dispatcherSkip)) {
+              // Do not replace
+              if (parents[0]) {
+                if (parents[0].type == "ClassDeclaration" || parents[0].type == "ClassExpression" || parents[0].type == "FunctionExpression" || parents[0].type == "FunctionDeclaration") {
+                  if (parents[0].id === node) {
+                    return;
+                  }
+                }
+              }
+
               this.replace(node, (0, _gen.CallExpression)((0, _gen.Identifier)(globalFn), [(0, _gen.Literal)(state)]));
             }
           });
         }); // Adds all global variables to the switch statement
-        // this.options.globalVariables.forEach((name) => {
-        //   if (!newNames[name]) {
-        //     var state;
-        //     do {
-        //       state = getRandomInteger(
-        //         -1000,
-        //         1000 + used.size + this.options.globalVariables.size
-        //       );
-        //     } while (used.has(state));
-        //     used.add(state);
-        //     newNames[name] = state;
-        //   }
-        // });
-
-        (0, _insert.prepend)(object, (0, _gen.FunctionDeclaration)(globalFn, [(0, _gen.Identifier)("index")], [(0, _gen.SwitchStatement)((0, _gen.Identifier)("index"), Object.keys(newNames).map(name => {
+
+        this.options.globalVariables.forEach(name => {
+          if (!newNames[name]) {
+            var state;
+
+            do {
+              state = (0, _random.getRandomInteger)(-1000, 1000 + used.size + this.options.globalVariables.size * 100);
+            } while (used.has(state));
+
+            used.add(state);
+            newNames[name] = state;
+          }
+        });
+        var indexParamName = this.getPlaceholder();
+        var returnName = this.getPlaceholder();
+        var functionDeclaration = (0, _gen.FunctionDeclaration)(globalFn, [(0, _gen.Identifier)(indexParamName)], [(0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(returnName)), (0, _gen.SwitchStatement)((0, _gen.Identifier)(indexParamName), Object.keys(newNames).map(name => {
           var code = newNames[name];
-          return (0, _gen.SwitchCase)((0, _gen.Literal)(code), [(0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(this.globalVar), (0, _gen.Literal)(name), true))]);
-        }))]));
+          var body = [(0, _gen.ReturnStatement)((0, _gen.LogicalExpression)("||", (0, _gen.MemberExpression)((0, _gen.Identifier)(globalVar), (0, _gen.Literal)(name), true), (0, _gen.MemberExpression)((0, _gen.Identifier)(thisVar), (0, _gen.Literal)(name), true)))];
+
+          if (Math.random() > 0.5 && name) {
+            body = [(0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(returnName), (0, _gen.LogicalExpression)("||", (0, _gen.Literal)(name), (0, _gen.MemberExpression)((0, _gen.Identifier)(thisVar), (0, _gen.Literal)(name), true)))), (0, _gen.BreakStatement)()];
+          }
+
+          return (0, _gen.SwitchCase)((0, _gen.Literal)(code), body);
+        })), (0, _gen.ReturnStatement)((0, _gen.LogicalExpression)("||", (0, _gen.MemberExpression)((0, _gen.Identifier)(globalVar), (0, _gen.Identifier)(returnName), true), (0, _gen.MemberExpression)((0, _gen.Identifier)(thisVar), (0, _gen.Identifier)(returnName), true)))]);
+        var tempVar = this.getPlaceholder();
+        var variableDeclaration = (0, _template.default)("\n        var ".concat(globalVar, ", ").concat(thisVar, ";\n        ")).single();
+        variableDeclaration.declarations.push((0, _gen.VariableDeclarator)(tempVar, (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.FunctionExpression)([], [getGlobalVariableFn, getThisVariableFn, (0, _template.default)("return ".concat(thisVar, " = ").concat(getThisVariableFnName, "[\"call\"](this, ").concat(globalFn, "), ").concat(globalVar, " = ").concat(getGlobalVariableFnName, "[\"call\"](this)")).single()]), (0, _gen.Literal)("call"), true), [])));
         (0, _insert.prepend)(object, variableDeclaration);
-        (0, _insert.prepend)(object, functionDeclaration);
+        (0, _insert.append)(object, functionDeclaration);
       }
     };
   }

package/dist/transforms/identifier/movedDeclarations.js

@@ -19,7 +19,7 @@ var _order = require("../../order");
 
 var _identifiers = require("../../util/identifiers");
 
-var _compare = require("../../util/compare");
+var _scope = require("../../util/scope");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -32,99 +32,100 @@ class MovedDeclarations extends _transform.default {
   }
 
   match(object, parents) {
-    return (0, _traverse.isBlock)(object) && (!parents[0] || !(0, _compare.isLoop)(parents[0]));
+    return (0, _scope.isLexicalScope)(object);
   }
 
   transform(object, parents) {
     return () => {
-      var block = (0, _traverse.getBlock)(object, parents);
-      var varDecs = [];
-      var varNames = new Set();
+      var body = (0, _traverse.isBlock)(object) ? object.body : object.consequent;
+      (0, _assert.ok)(Array.isArray(body));
       var illegal = new Set();
-      var toReplace = [];
-      var definingIdentifiers = new Map();
+      var defined = new Set();
+      var variableDeclarations = Object.create(null);
       (0, _traverse.walk)(object, parents, (o, p) => {
-        if (o.type == "Identifier" && !illegal.has(o.name)) {
-          var info = (0, _identifiers.getIdentifierInfo)(o, p);
-
-          if (info.spec.isDefined && definingIdentifiers.has(o.name)) {
+        if (o.type == "Identifier") {
+          if ((0, _scope.getLexicalScope)(o, p) !== object) {
             illegal.add(o.name);
-            this.log(o.name, "is illegal due to detected being redefined");
-          }
+          } else {
+            var info = (0, _identifiers.getIdentifierInfo)(o, p);
 
-          if (info.spec.isDefined && p.find(x => x.type == "SwitchCase")) {
-            illegal.add(o.name);
-            this.log(o.name, "is illegal due being in switch case");
-          }
+            if (!info.spec.isReferenced) {
+              return;
+            }
 
-          if (o.hidden) {
-            illegal.add(o.name);
+            if (info.spec.isDefined) {
+              if (info.isFunctionDeclaration || info.isClassDeclaration) {
+                illegal.add(o.name);
+              } else {
+                if (defined.has(o.name)) {
+                  illegal.add(o.name);
+                } else {
+                  defined.add(o.name);
+                }
+              }
+            }
           }
         }
 
-        var s = (0, _traverse.getBlock)(o, p);
-
-        if (s == block) {
+        if (o.type == "VariableDeclaration") {
           return () => {
-            if (o.type == "VariableDeclaration" && o.declarations.length && o.kind !== "let" && !o.declarations.find(x => x.id.type !== "Identifier" || illegal.has(x.id.name))) {
-              var index = block.body.indexOf(o);
-
-              if (index === 0 || o.hidden) {
-                o.declarations.forEach(x => {
-                  illegal.add(x.id.name);
-                });
-                this.log(o.declarations.map(x => x.id.name).join(", "), "is/are illegal due to already being at the top");
+            if (o.declarations.length === 1 && o.declarations[0].id.type === "Identifier") {
+              var name = o.declarations[0].id.name; // Check if duplicate
+
+              if (variableDeclarations[name] || o.kind !== "var") {
+                illegal.add(name);
                 return;
-              }
+              } // Check if already at top
 
-              if ((0, _insert.isForInitialize)(o, p)) {
-                this.log(o.declarations.map(x => x.id.name).join(", "), "is/are illegal due to being in for initializer");
+
+              if (body[0] === o) {
+                illegal.add(name);
                 return;
               }
 
-              var isIllegal = false;
-              o.declarations.forEach(x => {
-                if (varNames.has(x.id.name)) {
-                  illegal.add(x.id.name);
-                  isIllegal = true;
-                  this.log(x.id.name, "is illegal due to already being defined");
-                }
-              });
-
-              if (!isIllegal) {
-                varDecs.push([o, p]);
-                o.declarations.forEach(x => {
-                  (0, _assert.ok)(x.id.name);
-                  varNames.add(x.id.name);
-                  definingIdentifiers.set(x.id.name, x.id);
-                }); // Change this line to assignment expressions
-
-                var assignmentExpressions = o.declarations.map(x => (0, _gen.AssignmentExpression)("=", (0, _insert.clone)(x.id), (0, _insert.clone)(x.init) || (0, _gen.Identifier)("undefined")));
-                (0, _assert.ok)(assignmentExpressions.length, "Should be at least 1");
-                var value = (0, _gen.SequenceExpression)(assignmentExpressions);
-                value = (0, _gen.ExpressionStatement)(value);
-                toReplace.push([o.declarations.map(x => x.id.name), o, value]);
+              var replace = (0, _gen.AssignmentExpression)("=", (0, _gen.Identifier)(name), o.declarations[0].init || (0, _gen.Identifier)("undefined"));
+              var forType = (0, _insert.isForInitialize)(o, p);
+
+              if (forType === "left-hand") {
+                replace = (0, _gen.Identifier)(name);
+              } else if (!forType) {
+                replace = (0, _gen.ExpressionStatement)(replace);
               }
+
+              variableDeclarations[name] = {
+                location: [o, p],
+                replace: replace
+              };
             }
           };
         }
       });
       illegal.forEach(name => {
-        varNames.delete(name);
+        delete variableDeclarations[name];
       });
-      toReplace.forEach(x => {
-        if (!x[0].find(x => illegal.has(x))) {
-          this.replace(x[1], x[2]);
-        }
-      }); // Define the names in this block as 1 variable declaration
-
-      if (varNames.size > 0) {
-        this.log("Moved", varNames);
-        var variableDeclaration = (0, _gen.VariableDeclaration)(Array.from(varNames).map(x => {
-          return (0, _gen.VariableDeclarator)(x);
-        }));
-        (0, _insert.prepend)(block, variableDeclaration);
+      var movingNames = Object.keys(variableDeclarations);
+
+      if (movingNames.length === 0) {
+        return;
       }
+
+      var variableDeclaration = (0, _gen.VariableDeclaration)(movingNames.map(name => {
+        return (0, _gen.VariableDeclarator)(name);
+      }));
+
+      if (object.type == "Program") {
+        (0, _insert.prepend)(object, variableDeclaration);
+      } else {
+        body.unshift(variableDeclaration);
+      }
+
+      movingNames.forEach(name => {
+        var {
+          location,
+          replace
+        } = variableDeclarations[name];
+        this.replace(location[0], replace);
+      });
     };
   }