admin/javascript-obfuscator-javascript-obfuscator
1
0
Fork 0
mirror of https://github.com/javascript-obfuscator/javascript-obfuscator synced 2026-08-09 12:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
sanex3339
2016-05-16 20:17:09 +03:00
parent 8a689ef11b b1bde77732
commit 02691777e6
4 changed files with 17 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/node-obfuscators/VariableDeclarationObfuscator.js
+6 -20
View File
@@ -35,35 +35,21 @@ class VariableDeclarationObfuscator extends NodeObfuscator_1.NodeObfuscator {
}
replaceVariableCalls(variableDeclarationNode, variableParentNode) {
let scopeNode;
if (variableDeclarationNode.kind === 'var') {
scopeNode = NodeUtils_1.NodeUtils.getNodeScope(variableDeclarationNode);
}
else {
scopeNode = variableParentNode;
}
let isNodeAfterVariableDeclaratorFlag = false, isNodeBeforeVariableDeclaratorFlag = true, functionParentScope, functionNextNode, functionIndex = -1;
scopeNode = variableDeclarationNode.kind === 'var' ? NodeUtils_1.NodeUtils.getNodeScope(variableDeclarationNode) : variableParentNode;
let isNodeAfterVariableDeclaratorFlag = false;
estraverse.replace(scopeNode, {
enter: (node, parentNode) => {
if (node.type === 'FunctionDeclaration' ||
node.type === 'FunctionExpression' ||
node.type === 'ArrowFunctionExpression') {
functionParentScope = NodeUtils_1.NodeUtils.getNodeScope(node);
if (NodeUtils_1.NodeUtils.isBlockStatementNode(functionParentScope)) {
functionIndex = functionParentScope.body.indexOf(node);
if (functionIndex >= 0) {
functionNextNode = functionParentScope.body[functionIndex + 1];
estraverse.replace(node, {
enter: (node, parentNode) => {
this.replaceNodeIdentifierByNewValue(node, parentNode, this.variableNames);
}
}
isNodeAfterVariableDeclaratorFlag = true;
}
if (functionNextNode && isNodeBeforeVariableDeclaratorFlag && node === functionNextNode) {
isNodeAfterVariableDeclaratorFlag = false;
functionNextNode = undefined;
functionIndex = -1;
});
}
if (node === variableDeclarationNode) {
isNodeAfterVariableDeclaratorFlag = true;
isNodeBeforeVariableDeclaratorFlag = false;
}
if (isNodeAfterVariableDeclaratorFlag) {
this.replaceNodeIdentifierByNewValue(node, parentNode, this.variableNames);
src/node-obfuscators/VariableDeclarationObfuscator.ts
+9 -31
View File
@@ -68,21 +68,12 @@ export class VariableDeclarationObfuscator extends NodeObfuscator {
private replaceVariableCalls (variableDeclarationNode: IVariableDeclarationNode, variableParentNode: ITreeNode): void {
let scopeNode: ITreeNode;
if (variableDeclarationNode.kind === 'var') {
scopeNode = NodeUtils.getNodeScope(
variableDeclarationNode
);
} else {
scopeNode = variableParentNode;
}
scopeNode = variableDeclarationNode.kind === 'var' ? NodeUtils.getNodeScope(
variableDeclarationNode
) : variableParentNode;
let isNodeAfterVariableDeclaratorFlag: boolean = false,
isNodeBeforeVariableDeclaratorFlag: boolean = true,
functionParentScope: ITreeNode,
functionNextNode: ITreeNode,
functionIndex: number = -1;
let isNodeAfterVariableDeclaratorFlag: boolean = false;
//TODO: REFACTOR THIS
estraverse.replace(scopeNode, {
enter: (node: ITreeNode, parentNode: ITreeNode) => {
if (
@@ -90,28 +81,15 @@ export class VariableDeclarationObfuscator extends NodeObfuscator {
node.type === 'FunctionExpression' ||
node.type === 'ArrowFunctionExpression'
) {
functionParentScope = NodeUtils.getNodeScope(node);
if (NodeUtils.isBlockStatementNode(functionParentScope)) {
functionIndex = functionParentScope.body.indexOf(node);
if (functionIndex >= 0) {
functionNextNode = functionParentScope.body[functionIndex + 1];
estraverse.replace(node, {
enter: (node: ITreeNode, parentNode: ITreeNode) => {
this.replaceNodeIdentifierByNewValue(node, parentNode, this.variableNames);
}
}
isNodeAfterVariableDeclaratorFlag = true;
}
if (functionNextNode && isNodeBeforeVariableDeclaratorFlag && node === functionNextNode) {
isNodeAfterVariableDeclaratorFlag = false;
functionNextNode = undefined;
functionIndex = -1;
});
}
if (node === variableDeclarationNode) {
isNodeAfterVariableDeclaratorFlag = true;
isNodeBeforeVariableDeclaratorFlag = false;
}
if (isNodeAfterVariableDeclaratorFlag) {
@@ -120,4 +98,4 @@ export class VariableDeclarationObfuscator extends NodeObfuscator {
}
});
}
}
}
tests/dev-test.js
+1 -1
View File
@@ -1,6 +1,6 @@
var JavaScriptObfuscator = require('../index.js');
var obfuscatedCode = JavaScriptObfuscator.obfuscate(`
(function(){
(function(){
var result = 1,
term1 = 0,
term2 = 1,
tests/dev-test.ts
+1 -1
View File
@@ -2,7 +2,7 @@ var JavaScriptObfuscator = require('../index.js');
var obfuscatedCode = JavaScriptObfuscator.obfuscate(
`
(function(){
(function(){
var result = 1,
term1 = 0,
term2 = 1,