Browse Source

refactoring

sanex3339 9 years ago
parent
commit
109f31cedf

+ 5 - 2
dist/src/node-obfuscators/NodeObfuscator.js

@@ -9,8 +9,11 @@ class NodeObfuscator {
     }
     }
     replaceNodeIdentifierByNewValue(node, parentNode, namesMap) {
     replaceNodeIdentifierByNewValue(node, parentNode, namesMap) {
         if (NodeUtils_1.NodeUtils.isIdentifierNode(node) && namesMap.has(node.name)) {
         if (NodeUtils_1.NodeUtils.isIdentifierNode(node) && namesMap.has(node.name)) {
-            if ((NodeUtils_1.NodeUtils.isPropertyNode(parentNode) && parentNode.key === node) ||
-                (NodeUtils_1.NodeUtils.isMemberExpressionNode(parentNode) && parentNode.computed === false && parentNode.property === node)) {
+            const parentNodeIsAPropertyNode = (NodeUtils_1.NodeUtils.isPropertyNode(parentNode) &&
+                parentNode.key === node), parentNodeIsAMemberExpressionComputedNode = (NodeUtils_1.NodeUtils.isMemberExpressionNode(parentNode) &&
+                parentNode.computed === false &&
+                parentNode.property === node);
+            if (parentNodeIsAPropertyNode || parentNodeIsAMemberExpressionComputedNode) {
                 return;
                 return;
             }
             }
             node.name = namesMap.get(node.name);
             node.name = namesMap.get(node.name);

+ 11 - 4
src/node-obfuscators/NodeObfuscator.ts

@@ -41,10 +41,17 @@ export abstract class NodeObfuscator implements INodeObfuscator {
      */
      */
     protected replaceNodeIdentifierByNewValue (node: INode, parentNode: INode, namesMap: Map <string, string>): void {
     protected replaceNodeIdentifierByNewValue (node: INode, parentNode: INode, namesMap: Map <string, string>): void {
         if (NodeUtils.isIdentifierNode(node) && namesMap.has(node.name)) {
         if (NodeUtils.isIdentifierNode(node) && namesMap.has(node.name)) {
-            if (
-                (NodeUtils.isPropertyNode(parentNode) && parentNode.key === node) ||
-                (NodeUtils.isMemberExpressionNode(parentNode) && parentNode.computed === false && parentNode.property === node )
-            ) {
+            const parentNodeIsAPropertyNode: boolean = (
+                    NodeUtils.isPropertyNode(parentNode) &&
+                    parentNode.key === node
+                ),
+                parentNodeIsAMemberExpressionComputedNode: boolean = (
+                    NodeUtils.isMemberExpressionNode(parentNode) &&
+                    parentNode.computed === false &&
+                    parentNode.property === node
+                );
+
+            if (parentNodeIsAPropertyNode || parentNodeIsAMemberExpressionComputedNode) {
                 return;
                 return;
             }
             }