refactoring

This commit is contained in:
sanex3339
2016-05-30 22:30:41 +03:00
parent ea6023b2ee
commit 109f31cedf
2 changed files with 16 additions and 6 deletions
+5 -2
View File
@@ -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);
+11 -4
View File
@@ -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;
}