From 36a825bb4231ab10749cc8dc8dcfbd15472a6cb8 Mon Sep 17 00:00:00 2001 From: sanex3339 Date: Fri, 17 Jun 2016 19:51:24 +0300 Subject: [PATCH] refactoring --- dist/index.js | 14 +++++++------- src/node-obfuscators/CatchClauseObfuscator.ts | 2 +- .../FunctionDeclarationObfuscator.ts | 2 +- src/node-obfuscators/FunctionObfuscator.ts | 2 +- src/node-obfuscators/NodeObfuscator.ts | 11 +++++++++-- .../VariableDeclarationObfuscator.ts | 4 ++-- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dist/index.js b/dist/index.js index 3c4b4f74..414ceb53 100644 --- a/dist/index.js +++ b/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); } } }); diff --git a/src/node-obfuscators/CatchClauseObfuscator.ts b/src/node-obfuscators/CatchClauseObfuscator.ts index 35380b85..81bf7b93 100644 --- a/src/node-obfuscators/CatchClauseObfuscator.ts +++ b/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); } }); } diff --git a/src/node-obfuscators/FunctionDeclarationObfuscator.ts b/src/node-obfuscators/FunctionDeclarationObfuscator.ts index 2e30ee1f..5d6fdc78 100644 --- a/src/node-obfuscators/FunctionDeclarationObfuscator.ts +++ b/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); } }); } diff --git a/src/node-obfuscators/FunctionObfuscator.ts b/src/node-obfuscators/FunctionObfuscator.ts index b91d3187..7b671cb7 100644 --- a/src/node-obfuscators/FunctionObfuscator.ts +++ b/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); } }); } diff --git a/src/node-obfuscators/NodeObfuscator.ts b/src/node-obfuscators/NodeObfuscator.ts index 14d4b1e6..92b812e5 100644 --- a/src/node-obfuscators/NodeObfuscator.ts +++ b/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 ): estraverse.VisitorOption { + protected replaceAndStoreIdentifiersNames ( + node: INode, + namesMap: Map + ): 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 ): void { + protected replaceIdentifiersWithValuesFromNamesMap ( + node: INode, + parentNode: INode, + namesMap: Map + ): void { if (Nodes.isIdentifierNode(node) && namesMap.has(node.name)) { const parentNodeIsPropertyNode: boolean = ( Nodes.isPropertyNode(parentNode) && diff --git a/src/node-obfuscators/VariableDeclarationObfuscator.ts b/src/node-obfuscators/VariableDeclarationObfuscator.ts index 89824ef4..eb69a6b5 100644 --- a/src/node-obfuscators/VariableDeclarationObfuscator.ts +++ b/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); } } });