refactoring

This commit is contained in:
sanex3339
2016-05-20 22:14:09 +03:00
parent c7859167fc
commit bdcb748a19
2 changed files with 10 additions and 17 deletions
@@ -17,15 +17,11 @@ class VariableDeclarationObfuscator extends NodeObfuscator_1.NodeObfuscator {
}
replaceVariableName(variableDeclarationNode) {
variableDeclarationNode.declarations.forEach((declarationNode) => {
estraverse.replace(declarationNode, {
estraverse.replace(declarationNode.id, {
enter: (node) => {
if (NodeUtils_1.NodeUtils.isVariableDeclaratorNode(node)) {
estraverse.replace(node.id, {
enter: (node) => {
this.variableNames.set(node.name, Utils_1.Utils.getRandomVariableName());
node.name = this.variableNames.get(node.name);
}
});
if (NodeUtils_1.NodeUtils.isIdentifierNode(node)) {
this.variableNames.set(node.name, Utils_1.Utils.getRandomVariableName());
node.name = this.variableNames.get(node.name);
return;
}
return estraverse.VisitorOption.Skip;
@@ -7,6 +7,7 @@ import { IVariableDeclarationNode } from "../interfaces/nodes/IVariableDeclarati
import { NodeObfuscator } from './NodeObfuscator';
import { NodeUtils } from "../NodeUtils";
import { Utils } from '../Utils';
import {IVariableDeclaratorNode} from "../interfaces/nodes/IVariableDeclaratorNode";
/**
* replaces:
@@ -41,16 +42,12 @@ export class VariableDeclarationObfuscator extends NodeObfuscator {
* @param variableDeclarationNode
*/
private replaceVariableName (variableDeclarationNode: IVariableDeclarationNode): void {
variableDeclarationNode.declarations.forEach((declarationNode: ITreeNode) => {
estraverse.replace(declarationNode, {
variableDeclarationNode.declarations.forEach((declarationNode: IVariableDeclaratorNode) => {
estraverse.replace(declarationNode.id, {
enter: (node: ITreeNode): any => {
if (NodeUtils.isVariableDeclaratorNode(node)) {
estraverse.replace(node.id, {
enter: (node: IIdentifierNode): any => {
this.variableNames.set(node.name, Utils.getRandomVariableName());
node.name = this.variableNames.get(node.name);
}
});
if (NodeUtils.isIdentifierNode(node)) {
this.variableNames.set(node.name, Utils.getRandomVariableName());
node.name = this.variableNames.get(node.name);
return;
}