Project structure reorganized part 2

This commit is contained in:
sanex3339
2017-09-08 18:05:24 +03:00
parent 22756b8b34
commit 2039e196dd
79 changed files with 443 additions and 425 deletions
@@ -16,7 +16,7 @@ import { IStackTraceData } from '../../../../src/interfaces/analyzers/stack-trac
import { readFileAsString } from '../../../helpers/readFileAsString';
import { InversifyContainerFacade } from '../../../../src/container/InversifyContainerFacade';
import { Node } from '../../../../src/node/Node';
import { NodeGuards } from '../../../../src/node/NodeGuards';
import { Nodes } from '../../../../src/node/Nodes';
import { NodeUtils } from '../../../../src/node/NodeUtils';
@@ -31,8 +31,8 @@ function getFunctionDeclarationByName (astTree: ESTree.Node, name: string): ESTr
estraverse.traverse(astTree, {
enter: (node: ESTree.Node): any => {
if (
Node.isFunctionDeclarationNode(node) &&
Node.isIdentifierNode(node.id) &&
NodeGuards.isFunctionDeclarationNode(node) &&
NodeGuards.isIdentifierNode(node.id) &&
node.id.name === name
) {
functionDeclarationNode = node;
@@ -56,10 +56,10 @@ function getFunctionExpressionByName (astTree: ESTree.Node, name: string): ESTre
estraverse.traverse(astTree, {
enter: (node: ESTree.Node): any => {
if (
Node.isVariableDeclaratorNode(node) &&
NodeGuards.isVariableDeclaratorNode(node) &&
node.init &&
Node.isFunctionExpressionNode(node.init) &&
Node.isIdentifierNode(node.id) &&
NodeGuards.isFunctionExpressionNode(node.init) &&
NodeGuards.isIdentifierNode(node.id) &&
node.id.name === name
) {
functionExpressionNode = node.init;
@@ -83,9 +83,9 @@ function getFunctionExpressionById (astTree: ESTree.Node, id: string): ESTree.Fu
estraverse.traverse(astTree, {
enter: (node: ESTree.Node): any => {
if (
Node.isFunctionExpressionNode(node) &&
NodeGuards.isFunctionExpressionNode(node) &&
node.id &&
Node.isIdentifierNode(node.id) &&
NodeGuards.isIdentifierNode(node.id) &&
node.id.name === id
) {
functionExpressionNode = node;
@@ -111,10 +111,10 @@ function getObjectFunctionExpressionByName (astTree: ESTree.Node, objectName: st
estraverse.traverse(astTree, {
enter: (node: ESTree.Node): any => {
if (
Node.isVariableDeclaratorNode(node) &&
Node.isIdentifierNode(node.id) &&
NodeGuards.isVariableDeclaratorNode(node) &&
NodeGuards.isIdentifierNode(node.id) &&
node.init &&
Node.isObjectExpressionNode(node.init) &&
NodeGuards.isObjectExpressionNode(node.init) &&
node.id.name === objectName
) {
targetObjectExpressionNode = node.init;
@@ -131,11 +131,11 @@ function getObjectFunctionExpressionByName (astTree: ESTree.Node, objectName: st
estraverse.traverse(targetObjectExpressionNode, {
enter: (node: ESTree.Node): any => {
if (
Node.isPropertyNode(node) &&
Node.isFunctionExpressionNode(node.value) &&
NodeGuards.isPropertyNode(node) &&
NodeGuards.isFunctionExpressionNode(node.value) &&
(
(Node.isIdentifierNode(node.key) && node.key.name === name) ||
(Node.isLiteralNode(node.key) && node.key.value === name)
(NodeGuards.isIdentifierNode(node.key) && node.key.name === name) ||
(NodeGuards.isLiteralNode(node.key) && node.key.value === name)
)
) {
functionExpressionNode = node.value;
@@ -1,14 +1,14 @@
import { assert } from 'chai';
import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult';
import { IObfuscationResult } from '../../../../../../src/interfaces/IObfuscationResult';
import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscatorFacade';
import { JavaScriptObfuscator } from '../../../../../../src/JavaScriptObfuscatorFacade';
import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes';
import { NO_CUSTOM_NODES_PRESET } from '../../../../../../src/options/presets/NoCustomNodes';
import { readFileAsString } from '../../../helpers/readFileAsString';
import { readFileAsString } from '../../../../../helpers/readFileAsString';
describe('BlackListNodeGuard', () => {
describe('BlackListObfuscatingGuard', () => {
describe('check (node: ESTree.Node): boolean', () => {
describe('`\'use strict\';` operator', () => {
const useStrictOperatorRegExp: RegExp = /'use *strict';/;
+1 -1
View File
@@ -39,7 +39,6 @@ import './functional-tests/custom-nodes/string-array-nodes/StringArrayCallsWrapp
import './functional-tests/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.spec';
import './functional-tests/custom-nodes/string-array-nodes/StringArrayNode.spec';
import './functional-tests/javascript-obfuscator/JavaScriptObfuscator.spec';
import './functional-tests/node-guards/black-list-node-guard/BlackListNodeGuard.spec';
import './functional-tests/node-transformers/control-flow-transformers/block-statement-control-flow-transformer/BlockStatementControlFlowTransformer.spec';
import './functional-tests/node-transformers/control-flow-transformers/function-control-flow-transformer/FunctionControlFlowTransformer.spec';
import './functional-tests/node-transformers/control-flow-transformers/control-flow-replacers/binary-expression-control-flow-replacer/BinaryExpressionControlFlowReplacer.spec';
@@ -58,6 +57,7 @@ import './functional-tests/node-transformers/obfuscating-transformers/labeled-st
import './functional-tests/node-transformers/obfuscating-transformers/literal-transformer/LiteralTransformer.spec';
import './functional-tests/node-transformers/obfuscating-transformers/object-expression-transformer/ObjectExpressionTransformer.spec';
import './functional-tests/node-transformers/obfuscating-transformers/variable-declaration-transformer/VariableDeclarationTransformer.spec';
import './functional-tests/node-transformers/parentizing-transformers/obfuscating-guards/black-list-node-guard/BlackListObfuscatingGuard.spec';
import './functional-tests/templates/custom-nodes/domain-lock-nodes/DomainLockNodeTemplate.spec';
import './functional-tests/templates/custom-nodes/string-array-nodes/StringArrayCallsWrapperNodeTemplate.spec';