From 109f31cedfd6d08ca294ec5802cbb2173e4e8308 Mon Sep 17 00:00:00 2001
From: sanex3339 <sanex3339@yandex.ru>
Date: Mon, 30 May 2016 22:30:41 +0300
Subject: [PATCH] refactoring

---
 dist/src/node-obfuscators/NodeObfuscator.js |  7 +++++--
 src/node-obfuscators/NodeObfuscator.ts      | 15 +++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/dist/src/node-obfuscators/NodeObfuscator.js b/dist/src/node-obfuscators/NodeObfuscator.js
index 92ae72df..b90d61e2 100644
--- a/dist/src/node-obfuscators/NodeObfuscator.js
+++ b/dist/src/node-obfuscators/NodeObfuscator.js
@@ -9,8 +9,11 @@ class NodeObfuscator {
     }
     replaceNodeIdentifierByNewValue(node, parentNode, namesMap) {
         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;
             }
             node.name = namesMap.get(node.name);
diff --git a/src/node-obfuscators/NodeObfuscator.ts b/src/node-obfuscators/NodeObfuscator.ts
index 6be489ad..549c9c6e 100644
--- a/src/node-obfuscators/NodeObfuscator.ts
+++ b/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 {
         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;
             }