js-confuser 1.7.1 → 1.7.3

package/dist/traverse.js

@@ -8,7 +8,6 @@ exports.default = traverse;
 exports.getBlock = getBlock;
 exports.isBlock = isBlock;
 exports.walk = walk;
-
 /**
  * A block refers to any object that has a **`.body`** property where code is nested.
  *
@@ -21,9 +20,9 @@ function getBlock(object, parents) {
   if (!Array.isArray(parents)) {
     throw new Error("parents must be an array");
   }
-
   return [object, ...parents].find(node => isBlock(node));
 }
+
 /**
  * Must have a **`.body`** property and be an array.
  *
@@ -32,24 +31,23 @@ function getBlock(object, parents) {
  *
  * @param object
  */
-
-
 function isBlock(object) {
   return object && (object.type == "BlockStatement" || object.type == "Program");
 }
-
 function walk(object, parents, onEnter) {
   if (typeof object === "object" && object) {
-    var newParents = [object, ...parents]; // if (!Array.isArray(object)) {
+    var newParents = [object, ...parents];
+
+    // if (!Array.isArray(object)) {
     //   validateChain(object, parents);
     // }
-    // 1. Call `onEnter` function and remember any onExit callback returned
 
-    var onExit = onEnter(object, parents); // 2. Traverse children
+    // 1. Call `onEnter` function and remember any onExit callback returned
+    var onExit = onEnter(object, parents);
 
+    // 2. Traverse children
     if (Array.isArray(object)) {
       var copy = [...object];
-
       for (var element of copy) {
         if (walk(element, newParents, onEnter) === "EXIT") {
           return "EXIT";
@@ -57,7 +55,6 @@ function walk(object, parents, onEnter) {
       }
     } else {
       var keys = Object.keys(object);
-
       for (var key of keys) {
         if (!key.startsWith("$")) {
           if (walk(object[key], newParents, onEnter) === "EXIT") {
@@ -66,17 +63,17 @@ function walk(object, parents, onEnter) {
         }
       }
     }
-
     if (onExit === "EXIT") {
       return "EXIT";
-    } // 3. Done with children, call `onExit` callback
-
+    }
 
+    // 3. Done with children, call `onExit` callback
     if (onExit) {
       onExit();
     }
   }
 }
+
 /**
  * The bare-bones walker.
  *
@@ -91,16 +88,13 @@ function walk(object, parents, onEnter) {
  * @param tree
  * @param onEnter
  */
-
-
 function traverse(tree, onEnter) {
   walk(tree, [], onEnter);
 }
+
 /**
  * This is debugging function used to test for circular references.
  */
-
-
 function assertNoCircular(object) {
   var seen = new Set();
   traverse(object, (node, nodeParents) => {
@@ -110,7 +104,6 @@ function assertNoCircular(object) {
         console.log(node);
         throw new Error("FOUND CIRCULAR REFERENCE");
       }
-
       seen.add(node);
     }
   });

package/dist/util/compare.js

@@ -8,18 +8,17 @@ exports.isEquivalent = isEquivalent;
 exports.isIndependent = isIndependent;
 exports.isInsideType = isInsideType;
 exports.isLoop = isLoop;
+exports.isModuleSource = isModuleSource;
+exports.isMoveable = isMoveable;
 exports.isPrimitive = isPrimitive;
 exports.isValidIdentifier = isValidIdentifier;
-
 var _traverse = require("../traverse");
-
 function isEquivalent(first, second) {
   var extra = {
     start: 1,
     end: 1,
     loc: 1
   };
-
   function removeExtra(obj) {
     if (typeof obj === "object") {
       for (var property in obj) {
@@ -34,88 +33,89 @@ function isEquivalent(first, second) {
         }
       }
     }
-
     return obj;
   }
-
   return JSON.stringify(removeExtra(first)) == JSON.stringify(removeExtra(second));
 }
 /**
  * Statements that allowed `break;` and `continue;` statements
  * @param object
  */
-
-
 function isLoop(object) {
   return ["SwitchStatement", "WhileStatement", "DoWhileStatement", "ForStatement", "ForInStatement", "ForOfStatement"].includes(object.type);
 }
-
 function isValidIdentifier(name) {
   if (typeof name !== "string") {
     return false;
   }
-
   if (name.includes(".") || name.includes(" ")) {
     return false;
   }
-
   var x = name.match(/^[A-Za-z$_][A-Za-z0-9$_]*/);
   return !!(x && x[0] == name);
 }
-
 function isInsideType(type, object, parents) {
   return [object, ...parents].some(x => x.type == type);
 }
-
 function isDirective(object, parents) {
   var dIndex = parents.findIndex(x => x.directive);
-
   if (dIndex == -1) {
     return false;
   }
-
   return parents[dIndex].expression == (parents[dIndex - 1] || object);
 }
-
+function isModuleSource(object, parents) {
+  if (!parents[0]) {
+    return false;
+  }
+  if (parents[0].type == "ImportDeclaration" && parents[0].source == object) {
+    return true;
+  }
+  if (parents[0].type == "ImportExpression" && parents[0].source == object) {
+    return true;
+  }
+  if (parents[1] && parents[1].type == "CallExpression" && parents[1].arguments[0] === object && parents[1].callee.type == "Identifier") {
+    if (parents[1].callee.name == "require" || parents[1].callee.name == "import") {
+      return true;
+    }
+  }
+  return false;
+}
+function isMoveable(object, parents) {
+  return !isDirective(object, parents) && !isModuleSource(object, parents);
+}
 function isIndependent(object, parents) {
   if (object.type == "Literal") {
     return true;
   }
-
-  var parent = parents[0];
-
   if (object.type == "Identifier") {
-    var set = new Set(["null", "undefined"]);
-
-    if (set.has(object.name)) {
+    if (primitiveIdentifiers.has(object.name)) {
       return true;
     }
-
-    if (parent.type == "Property") {
+    var parent = parents[0];
+    if (parent && parent.type == "Property") {
       if (!parent.computed && parent.key == object) {
         return true;
       }
     }
-
     return false;
   }
-
   if (object.type == "ArrayExpression" || object.type == "ObjectExpression" || object.type == "Property") {
     var allowIt = true;
     (0, _traverse.walk)(object, parents, ($object, $parents) => {
       if (object != $object) {
         if (!Array.isArray($object) && !isIndependent($object, $parents)) {
           allowIt = false;
+          return "EXIT";
         }
       }
     });
     return allowIt;
   }
-
   return false;
 }
-
 var primitiveIdentifiers = new Set(["undefined", "NaN"]);
+
 /**
  * booleans, numbers, string, null, undefined, NaN, infinity
  *
@@ -127,7 +127,6 @@ var primitiveIdentifiers = new Set(["undefined", "NaN"]);
  * @param node
  * @returns
  */
-
 function isPrimitive(node) {
   if (node.type == "Literal") {
     if (node.value === null) {
@@ -142,6 +141,5 @@ function isPrimitive(node) {
   } else if (node.type == "Identifier") {
     return primitiveIdentifiers.has(node.name);
   }
-
   return false;
 }