diff --git a/src/node-obfuscators/VariableDeclarationObfuscator.js b/src/node-obfuscators/VariableDeclarationObfuscator.js index 3a3c853f..68236ebe 100644 --- a/src/node-obfuscators/VariableDeclarationObfuscator.js +++ b/src/node-obfuscators/VariableDeclarationObfuscator.js @@ -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; diff --git a/src/node-obfuscators/VariableDeclarationObfuscator.ts b/src/node-obfuscators/VariableDeclarationObfuscator.ts index 700932ed..741f2e7c 100644 --- a/src/node-obfuscators/VariableDeclarationObfuscator.ts +++ b/src/node-obfuscators/VariableDeclarationObfuscator.ts @@ -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; }