Browse Source

refactoring

sanex3339 9 years ago
parent
commit
36a825bb42

+ 7 - 7
dist/index.js

@@ -458,8 +458,8 @@ module.exports =
 	            return estraverse.VisitorOption.Skip;
 	        }
 	    }, {
-	        key: "replaceNodeIdentifierWithNewValue",
-	        value: function replaceNodeIdentifierWithNewValue(node, parentNode, namesMap) {
+	        key: "replaceIdentifiersWithValuesFromNamesMap",
+	        value: function replaceIdentifiersWithValuesFromNamesMap(node, parentNode, namesMap) {
 	            if (Nodes_1.Nodes.isIdentifierNode(node) && namesMap.has(node.name)) {
 	                var parentNodeIsPropertyNode = Nodes_1.Nodes.isPropertyNode(parentNode) && parentNode.key === node,
 	                    parentNodeIsMemberExpressionNode = Nodes_1.Nodes.isMemberExpressionNode(parentNode) && parentNode.computed === false && parentNode.property === node;
@@ -1884,7 +1884,7 @@ module.exports =
 	
 	            estraverse.replace(catchClauseNode.body, {
 	                leave: function leave(node, parentNode) {
-	                    _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.catchClauseParam);
+	                    _this3.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, _this3.catchClauseParam);
 	                }
 	            });
 	        }
@@ -1961,7 +1961,7 @@ module.exports =
 	            var scopeNode = NodeUtils_1.NodeUtils.getBlockScopeOfNode(functionDeclarationNode);
 	            estraverse.replace(scopeNode, {
 	                enter: function enter(node, parentNode) {
-	                    _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.functionName);
+	                    _this3.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, _this3.functionName);
 	                }
 	            });
 	        }
@@ -2034,7 +2034,7 @@ module.exports =
 	
 	            estraverse.replace(functionNode.body, {
 	                leave: function leave(node, parentNode) {
-	                    _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.functionParams);
+	                    _this3.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, _this3.functionParams);
 	                }
 	            });
 	        }
@@ -2435,7 +2435,7 @@ module.exports =
 	                    if (Utils_1.Utils.arrayContains(functionNodes, node.type)) {
 	                        estraverse.replace(node, {
 	                            enter: function enter(node, parentNode) {
-	                                _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.variableNames);
+	                                _this3.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, _this3.variableNames);
 	                            }
 	                        });
 	                    }
@@ -2443,7 +2443,7 @@ module.exports =
 	                        isNodeAfterVariableDeclaratorFlag = true;
 	                    }
 	                    if (isNodeAfterVariableDeclaratorFlag) {
-	                        _this3.replaceNodeIdentifierWithNewValue(node, parentNode, _this3.variableNames);
+	                        _this3.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, _this3.variableNames);
 	                    }
 	                }
 	            });

+ 1 - 1
src/node-obfuscators/CatchClauseObfuscator.ts

@@ -45,7 +45,7 @@ export class CatchClauseObfuscator extends NodeObfuscator {
     private replaceCatchClauseParamInBlockStatement (catchClauseNode: ICatchClauseNode): void {
         estraverse.replace(catchClauseNode.body, {
             leave: (node: INode, parentNode: INode): any => {
-                this.replaceNodeIdentifierWithNewValue(node, parentNode, this.catchClauseParam);
+                this.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, this.catchClauseParam);
             }
         });
     }

+ 1 - 1
src/node-obfuscators/FunctionDeclarationObfuscator.ts

@@ -55,7 +55,7 @@ export class FunctionDeclarationObfuscator extends NodeObfuscator {
 
         estraverse.replace(scopeNode, {
             enter: (node: INode, parentNode: INode): any => {
-                this.replaceNodeIdentifierWithNewValue(node, parentNode, this.functionName);
+                this.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, this.functionName);
             }
         });
     }

+ 1 - 1
src/node-obfuscators/FunctionObfuscator.ts

@@ -47,7 +47,7 @@ export class FunctionObfuscator extends NodeObfuscator {
     private replaceFunctionParamsInBlockStatement (functionNode: IFunctionNode): void {
         estraverse.replace(functionNode.body, {
             leave: (node: INode, parentNode: INode): any => {
-                this.replaceNodeIdentifierWithNewValue(node, parentNode, this.functionParams);
+                this.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, this.functionParams);
             }
         });
     }

+ 9 - 2
src/node-obfuscators/NodeObfuscator.ts

@@ -56,7 +56,10 @@ export abstract class NodeObfuscator implements INodeObfuscator {
      * @param namesMap
      * @returns {estraverse.VisitorOption}
      */
-    protected replaceAndStoreIdentifiersNames (node: INode, namesMap: Map <string, string>): estraverse.VisitorOption {
+    protected replaceAndStoreIdentifiersNames (
+        node: INode,
+        namesMap: Map <string, string>
+    ): estraverse.VisitorOption {
         if (Nodes.isIdentifierNode(node) && !this.isReservedName(node.name)) {
             namesMap.set(node.name, Utils.getRandomVariableName());
             node.name = namesMap.get(node.name);
@@ -72,7 +75,11 @@ export abstract class NodeObfuscator implements INodeObfuscator {
      * @param parentNode
      * @param namesMap
      */
-    protected replaceNodeIdentifierWithNewValue (node: INode, parentNode: INode, namesMap: Map <string, string>): void {
+    protected replaceIdentifiersWithValuesFromNamesMap (
+        node: INode,
+        parentNode: INode,
+        namesMap: Map <string, string>
+    ): void {
         if (Nodes.isIdentifierNode(node) && namesMap.has(node.name)) {
             const parentNodeIsPropertyNode: boolean = (
                     Nodes.isPropertyNode(parentNode) &&

+ 2 - 2
src/node-obfuscators/VariableDeclarationObfuscator.ts

@@ -72,7 +72,7 @@ export class VariableDeclarationObfuscator extends NodeObfuscator {
                 if (Utils.arrayContains(functionNodes, node.type)) {
                     estraverse.replace(node, {
                         enter: (node: INode, parentNode: INode): any => {
-                            this.replaceNodeIdentifierWithNewValue(node, parentNode, this.variableNames);
+                            this.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, this.variableNames);
                         }
                     });
                 }
@@ -82,7 +82,7 @@ export class VariableDeclarationObfuscator extends NodeObfuscator {
                 }
 
                 if (isNodeAfterVariableDeclaratorFlag) {
-                    this.replaceNodeIdentifierWithNewValue(node, parentNode, this.variableNames);
+                    this.replaceIdentifiersWithValuesFromNamesMap(node, parentNode, this.variableNames);
                 }
             }
         });