Просмотр исходного кода

Moved StackTraceAnalyzer to the `analyzers` folder

sanex3339 7 лет назад
Родитель
Сommit
24375ecd05
39 измененных файлов с 67 добавлено и 53 удалено
  1. 0 0
      dist/index.js
  2. 3 2
      src/Obfuscator.ts
  3. 8 8
      src/analyzers/stack-trace-analyzer/StackTraceAnalyzer.ts
  4. 2 2
      src/analyzers/stack-trace-analyzer/callee-data-extractors/AbstractCalleeDataExtractor.ts
  5. 3 3
      src/analyzers/stack-trace-analyzer/callee-data-extractors/FunctionDeclarationCalleeDataExtractor.ts
  6. 3 3
      src/analyzers/stack-trace-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor.ts
  7. 4 4
      src/analyzers/stack-trace-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor.ts
  8. 5 5
      src/container/InversifyContainerFacade.ts
  9. 7 7
      src/container/modules/analyzers/AnalyzersModule.ts
  10. 1 1
      src/custom-nodes/AbstractCustomNodeGroup.ts
  11. 1 1
      src/custom-nodes/console-output-nodes/group/ConsoleOutputCustomNodeGroup.ts
  12. 1 1
      src/custom-nodes/debug-protection-nodes/group/DebugProtectionCustomNodeGroup.ts
  13. 1 1
      src/custom-nodes/domain-lock-nodes/group/DomainLockCustomNodeGroup.ts
  14. 1 1
      src/custom-nodes/self-defending-nodes/group/SelfDefendingCustomNodeGroup.ts
  15. 1 1
      src/custom-nodes/string-array-nodes/group/StringArrayCustomNodeGroup.ts
  16. 1 0
      src/enums/logger/LoggingMessage.ts
  17. 9 0
      src/interfaces/analyzers/IAnalyzer.d.ts
  18. 0 0
      src/interfaces/analyzers/stack-trace-analyzer/ICalleeData.d.ts
  19. 0 0
      src/interfaces/analyzers/stack-trace-analyzer/ICalleeDataExtractor.d.ts
  20. 2 1
      src/interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer.d.ts
  21. 0 0
      src/interfaces/analyzers/stack-trace-analyzer/IStackTraceData.d.ts
  22. 1 1
      src/interfaces/custom-nodes/ICustomNodeGroup.d.ts
  23. 1 1
      src/node/NodeAppender.ts
  24. 0 0
      src/types/analyzers/stack-trace-analyzer/TObjectMembersCallsChain.d.ts
  25. 1 1
      src/types/container/stack-trace-analyzer/TCalleeDataExtractorFactory.d.ts
  26. 4 2
      test/functional-tests/analyzers/stack-trace-analyzer/StackTraceAnalyzer.spec.ts
  27. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/basic-1.js
  28. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/basic-2.js
  29. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/call-before-declaration.js
  30. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/call-expression-of-object-member-1.js
  31. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/call-expression-of-object-member-2.js
  32. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/deep-conditions-nesting.js
  33. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/no-call-expressions.js
  34. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/no-recursion.js
  35. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/only-call-expression.js
  36. 0 0
      test/functional-tests/analyzers/stack-trace-analyzer/fixtures/self-invoking-functions.js
  37. 4 4
      test/index.spec.ts
  38. 1 1
      test/unit-tests/analyzers/stack-trace-analyzer/StackTraceAnalyzer.spec.ts
  39. 2 2
      test/unit-tests/node/node-appender/NodeAppender.spec.ts

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/index.js


+ 3 - 2
src/Obfuscator.ts

@@ -15,8 +15,8 @@ import { ILogger } from './interfaces/logger/ILogger';
 import { IObfuscationEventEmitter } from './interfaces/event-emitters/IObfuscationEventEmitter';
 import { IObfuscator } from './interfaces/IObfuscator';
 import { IOptions } from './interfaces/options/IOptions';
-import { IStackTraceAnalyzer } from './interfaces/stack-trace-analyzer/IStackTraceAnalyzer';
-import { IStackTraceData } from './interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceAnalyzer } from './interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer';
+import { IStackTraceData } from './interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 import { IStorage } from './interfaces/storages/IStorage';
 import { IVisitor } from './interfaces/IVisitor';
 
@@ -157,6 +157,7 @@ export class Obfuscator implements IObfuscator {
 
         astTree = <ESTree.Program>NodeUtils.parentize(astTree);
 
+        this.logger.info(LoggingMessage.StageAnalyzingASTTree);
         const stackTraceData: IStackTraceData[] = this.stackTraceAnalyzer.analyze(astTree.body);
 
         // initialize custom node groups and configure custom nodes

+ 8 - 8
src/stack-trace-analyzer/StackTraceAnalyzer.ts → src/analyzers/stack-trace-analyzer/StackTraceAnalyzer.ts

@@ -1,19 +1,19 @@
 import { injectable, inject } from 'inversify';
-import { ServiceIdentifiers } from '../container/ServiceIdentifiers';
+import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
 
 import * as estraverse from 'estraverse';
 import * as ESTree from 'estree';
 
-import { TCalleeDataExtractorFactory } from '../types/container/stack-trace-analyzer/TCalleeDataExtractorFactory';
+import { TCalleeDataExtractorFactory } from '../../types/container/stack-trace-analyzer/TCalleeDataExtractorFactory';
 
-import { ICalleeData } from '../interfaces/stack-trace-analyzer/ICalleeData';
-import { IStackTraceAnalyzer } from '../interfaces/stack-trace-analyzer/IStackTraceAnalyzer';
-import { IStackTraceData } from '../interfaces/stack-trace-analyzer/IStackTraceData';
+import { ICalleeData } from '../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
+import { IStackTraceAnalyzer } from '../../interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer';
+import { IStackTraceData } from '../../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 
-import { CalleeDataExtractor } from '../enums/container/stack-trace-analyzer/CalleeDataExtractor';
+import { CalleeDataExtractor } from '../../enums/container/stack-trace-analyzer/CalleeDataExtractor';
 
-import { Node } from '../node/Node';
-import { NodeUtils } from '../node/NodeUtils';
+import { Node } from '../../node/Node';
+import { NodeUtils } from '../../node/NodeUtils';
 
 /**
  * This class generates a data with a stack trace of functions calls

+ 2 - 2
src/stack-trace-analyzer/callee-data-extractors/AbstractCalleeDataExtractor.ts → src/analyzers/stack-trace-analyzer/callee-data-extractors/AbstractCalleeDataExtractor.ts

@@ -2,8 +2,8 @@ import { injectable } from 'inversify';
 
 import * as ESTree from 'estree';
 
-import { ICalleeData } from '../../interfaces/stack-trace-analyzer/ICalleeData';
-import { ICalleeDataExtractor } from '../../interfaces/stack-trace-analyzer/ICalleeDataExtractor';
+import { ICalleeData } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
+import { ICalleeDataExtractor } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeDataExtractor';
 
 @injectable()
 export abstract class AbstractCalleeDataExtractor implements ICalleeDataExtractor {

+ 3 - 3
src/stack-trace-analyzer/callee-data-extractors/FunctionDeclarationCalleeDataExtractor.ts → src/analyzers/stack-trace-analyzer/callee-data-extractors/FunctionDeclarationCalleeDataExtractor.ts

@@ -3,11 +3,11 @@ import { injectable } from 'inversify';
 import * as estraverse from 'estraverse';
 import * as ESTree from 'estree';
 
-import { ICalleeData } from '../../interfaces/stack-trace-analyzer/ICalleeData';
+import { ICalleeData } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
 
 import { AbstractCalleeDataExtractor } from './AbstractCalleeDataExtractor';
-import { Node } from '../../node/Node';
-import { NodeUtils } from '../../node/NodeUtils';
+import { Node } from '../../../node/Node';
+import { NodeUtils } from '../../../node/NodeUtils';
 
 @injectable()
 export class FunctionDeclarationCalleeDataExtractor extends AbstractCalleeDataExtractor {

+ 3 - 3
src/stack-trace-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor.ts → src/analyzers/stack-trace-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor.ts

@@ -3,11 +3,11 @@ import { injectable } from 'inversify';
 import * as estraverse from 'estraverse';
 import * as ESTree from 'estree';
 
-import { ICalleeData } from '../../interfaces/stack-trace-analyzer/ICalleeData';
+import { ICalleeData } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
 
 import { AbstractCalleeDataExtractor } from './AbstractCalleeDataExtractor';
-import { Node } from '../../node/Node';
-import { NodeUtils } from '../../node/NodeUtils';
+import { Node } from '../../../node/Node';
+import { NodeUtils } from '../../../node/NodeUtils';
 
 @injectable()
 export class FunctionExpressionCalleeDataExtractor extends AbstractCalleeDataExtractor {

+ 4 - 4
src/stack-trace-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor.ts → src/analyzers/stack-trace-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor.ts

@@ -3,12 +3,12 @@ import { injectable } from 'inversify';
 import * as estraverse from 'estraverse';
 import * as ESTree from 'estree';
 
-import { TObjectMembersCallsChain } from '../../types/stack-trace-analyzer/TObjectMembersCallsChain';
+import { TObjectMembersCallsChain } from '../../../types/analyzers/stack-trace-analyzer/TObjectMembersCallsChain';
 
-import { ICalleeData } from '../../interfaces/stack-trace-analyzer/ICalleeData';
+import { ICalleeData } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
 
-import { Node } from '../../node/Node';
-import { NodeUtils } from '../../node/NodeUtils';
+import { Node } from '../../../node/Node';
+import { NodeUtils } from '../../../node/NodeUtils';
 import { AbstractCalleeDataExtractor } from './AbstractCalleeDataExtractor';
 
 @injectable()

+ 5 - 5
src/container/InversifyContainerFacade.ts

@@ -1,11 +1,11 @@
 import { Container, interfaces } from 'inversify';
 import { ServiceIdentifiers } from './ServiceIdentifiers';
 
+import { analyzersModule } from './modules/analyzers/AnalyzersModule';
 import { controlFlowTransformersModule } from './modules/node-transformers/ControlFlowTransformersModule';
 import { customNodesModule } from './modules/custom-nodes/CustomNodesModule';
 import { obfuscatingTransformersModule } from './modules/node-transformers/ObfuscatingTransformersModule';
 import { nodeTransformersModule } from './modules/node-transformers/NodeTransformersModule';
-import { stackTraceAnalyzerModule } from './modules/stack-trace-analyzer/StackTraceAnalyzerModule';
 import { storagesModule } from './modules/storages/StoragesModule';
 import { utilsModule } from './modules/utils/UtilsModule';
 
@@ -191,13 +191,13 @@ export class InversifyContainerFacade implements IInversifyContainerFacade {
             .inSingletonScope();
 
         // modules
-        this.container.load(utilsModule);
-        this.container.load(storagesModule);
-        this.container.load(stackTraceAnalyzerModule);
+        this.container.load(analyzersModule);
+        this.container.load(controlFlowTransformersModule);
         this.container.load(customNodesModule);
         this.container.load(nodeTransformersModule);
-        this.container.load(controlFlowTransformersModule);
         this.container.load(obfuscatingTransformersModule);
+        this.container.load(storagesModule);
+        this.container.load(utilsModule);
     }
 
     public unload (): void {

+ 7 - 7
src/container/modules/stack-trace-analyzer/StackTraceAnalyzerModule.ts → src/container/modules/analyzers/AnalyzersModule.ts

@@ -2,16 +2,16 @@ import { InversifyContainerFacade } from '../../InversifyContainerFacade';
 import { ContainerModule, interfaces } from 'inversify';
 import { ServiceIdentifiers } from '../../ServiceIdentifiers';
 
-import { ICalleeDataExtractor } from '../../../interfaces/stack-trace-analyzer/ICalleeDataExtractor';
-import { IStackTraceAnalyzer } from '../../../interfaces/stack-trace-analyzer/IStackTraceAnalyzer';
+import { ICalleeDataExtractor } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeDataExtractor';
+import { IStackTraceAnalyzer } from '../../../interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer';
 
 import { CalleeDataExtractor } from '../../../enums/container/stack-trace-analyzer/CalleeDataExtractor';
-import { FunctionDeclarationCalleeDataExtractor } from '../../../stack-trace-analyzer/callee-data-extractors/FunctionDeclarationCalleeDataExtractor';
-import { FunctionExpressionCalleeDataExtractor } from '../../../stack-trace-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor';
-import { ObjectExpressionCalleeDataExtractor } from '../../../stack-trace-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor';
-import { StackTraceAnalyzer } from '../../../stack-trace-analyzer/StackTraceAnalyzer';
+import { FunctionDeclarationCalleeDataExtractor } from '../../../analyzers/stack-trace-analyzer/callee-data-extractors/FunctionDeclarationCalleeDataExtractor';
+import { FunctionExpressionCalleeDataExtractor } from '../../../analyzers/stack-trace-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor';
+import { ObjectExpressionCalleeDataExtractor } from '../../../analyzers/stack-trace-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor';
+import { StackTraceAnalyzer } from '../../../analyzers/stack-trace-analyzer/StackTraceAnalyzer';
 
-export const stackTraceAnalyzerModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
+export const analyzersModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
     // stack trace analyzer
     bind<IStackTraceAnalyzer>(ServiceIdentifiers.IStackTraceAnalyzer)
         .to(StackTraceAnalyzer)

+ 1 - 1
src/custom-nodes/AbstractCustomNodeGroup.ts

@@ -7,7 +7,7 @@ import { ICustomNode } from '../interfaces/custom-nodes/ICustomNode';
 import { ICustomNodeGroup } from '../interfaces/custom-nodes/ICustomNodeGroup';
 import { IOptions } from '../interfaces/options/IOptions';
 import { IRandomGenerator } from '../interfaces/utils/IRandomGenerator';
-import { IStackTraceData } from '../interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceData } from '../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 
 import { CustomNode } from '../enums/container/custom-nodes/CustomNode';
 import { ObfuscationEvent } from '../enums/event-emitters/ObfuscationEvent';

+ 1 - 1
src/custom-nodes/console-output-nodes/group/ConsoleOutputCustomNodeGroup.ts

@@ -8,7 +8,7 @@ import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode';
 import { IObfuscationEventEmitter } from '../../../interfaces/event-emitters/IObfuscationEventEmitter';
 import { IOptions } from '../../../interfaces/options/IOptions';
 import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator';
-import { IStackTraceData } from '../../../interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceData } from '../../../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 
 import { initializable } from '../../../decorators/Initializable';
 

+ 1 - 1
src/custom-nodes/debug-protection-nodes/group/DebugProtectionCustomNodeGroup.ts

@@ -8,7 +8,7 @@ import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode';
 import { IObfuscationEventEmitter } from '../../../interfaces/event-emitters/IObfuscationEventEmitter';
 import { IOptions } from '../../../interfaces/options/IOptions';
 import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator';
-import { IStackTraceData } from '../../../interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceData } from '../../../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 
 import { initializable } from '../../../decorators/Initializable';
 

+ 1 - 1
src/custom-nodes/domain-lock-nodes/group/DomainLockCustomNodeGroup.ts

@@ -8,7 +8,7 @@ import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode';
 import { IObfuscationEventEmitter } from '../../../interfaces/event-emitters/IObfuscationEventEmitter';
 import { IOptions } from '../../../interfaces/options/IOptions';
 import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator';
-import { IStackTraceData } from '../../../interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceData } from '../../../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 
 import { initializable } from '../../../decorators/Initializable';
 

+ 1 - 1
src/custom-nodes/self-defending-nodes/group/SelfDefendingCustomNodeGroup.ts

@@ -8,7 +8,7 @@ import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode';
 import { IObfuscationEventEmitter } from '../../../interfaces/event-emitters/IObfuscationEventEmitter';
 import { IOptions } from '../../../interfaces/options/IOptions';
 import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator';
-import { IStackTraceData } from '../../../interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceData } from '../../../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 
 import { initializable } from '../../../decorators/Initializable';
 

+ 1 - 1
src/custom-nodes/string-array-nodes/group/StringArrayCustomNodeGroup.ts

@@ -8,7 +8,7 @@ import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode';
 import { IObfuscationEventEmitter } from '../../../interfaces/event-emitters/IObfuscationEventEmitter';
 import { IOptions } from '../../../interfaces/options/IOptions';
 import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator';
-import { IStackTraceData } from '../../../interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceData } from '../../../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 import { IStorage } from '../../../interfaces/storages/IStorage';
 
 import { initializable } from '../../../decorators/Initializable';

+ 1 - 0
src/enums/logger/LoggingMessage.ts

@@ -3,6 +3,7 @@ export enum LoggingMessage {
     ObfuscationCompleted = 'Obfuscation completed. Total time: %s sec.',
     ObfuscationStarted = 'Obfuscation started...',
     RandomGeneratorSeed = 'Random generator seed: %s...',
+    StageAnalyzingASTTree = 'Stage: analyzing AST-tree...',
     StageControlFlowFlattening = 'Stage: control flow flattening...',
     StageDeadCodeInjection = 'Stage: dead code injection...',
     StageObfuscation = 'Stage: obfuscation...'

+ 9 - 0
src/interfaces/analyzers/IAnalyzer.d.ts

@@ -0,0 +1,9 @@
+import * as ESTree from 'estree';
+
+export interface IAnalyzer {
+    /**
+     * @param blockScopeBody
+     * @returns any
+     */
+    analyze (blockScopeBody: ESTree.Node[]): any;
+}

+ 0 - 0
src/interfaces/stack-trace-analyzer/ICalleeData.d.ts → src/interfaces/analyzers/stack-trace-analyzer/ICalleeData.d.ts


+ 0 - 0
src/interfaces/stack-trace-analyzer/ICalleeDataExtractor.d.ts → src/interfaces/analyzers/stack-trace-analyzer/ICalleeDataExtractor.d.ts


+ 2 - 1
src/interfaces/stack-trace-analyzer/IStackTraceAnalyzer.d.ts → src/interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer.d.ts

@@ -1,8 +1,9 @@
 import * as ESTree from 'estree';
 
+import { IAnalyzer } from '../IAnalyzer';
 import { IStackTraceData } from './IStackTraceData';
 
-export interface IStackTraceAnalyzer {
+export interface IStackTraceAnalyzer extends IAnalyzer {
     /**
      * @param blockScopeBody
      * @returns IStackTraceData[]

+ 0 - 0
src/interfaces/stack-trace-analyzer/IStackTraceData.d.ts → src/interfaces/analyzers/stack-trace-analyzer/IStackTraceData.d.ts


+ 1 - 1
src/interfaces/custom-nodes/ICustomNodeGroup.d.ts

@@ -2,7 +2,7 @@ import { TNodeWithBlockStatement } from '../../types/node/TNodeWithBlockStatemen
 
 import { ICustomNode } from './ICustomNode';
 import { IInitializable } from '../IInitializable';
-import { IStackTraceData } from '../stack-trace-analyzer/IStackTraceData';
+import { IStackTraceData } from '../analyzers/stack-trace-analyzer/IStackTraceData';
 
 import { CustomNode } from '../../enums/container/custom-nodes/CustomNode';
 import { ObfuscationEvent } from '../../enums/event-emitters/ObfuscationEvent';

+ 1 - 1
src/node/NodeAppender.ts

@@ -3,7 +3,7 @@ import * as ESTree from 'estree';
 import { TNodeWithBlockStatement } from '../types/node/TNodeWithBlockStatement';
 import { TStatement } from '../types/node/TStatement';
 
-import { IStackTraceData } from '../interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceData } from '../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 
 /**
  * This class appends node into a first deepest BlockStatement in order of function calls

+ 0 - 0
src/types/stack-trace-analyzer/TObjectMembersCallsChain.d.ts → src/types/analyzers/stack-trace-analyzer/TObjectMembersCallsChain.d.ts


+ 1 - 1
src/types/container/stack-trace-analyzer/TCalleeDataExtractorFactory.d.ts

@@ -1,4 +1,4 @@
-import { ICalleeDataExtractor } from '../../../interfaces/stack-trace-analyzer/ICalleeDataExtractor';
+import { ICalleeDataExtractor } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeDataExtractor';
 
 import { CalleeDataExtractor } from '../../../enums/container/stack-trace-analyzer/CalleeDataExtractor';
 

+ 4 - 2
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/StackTraceAnalyzer.spec.ts → test/functional-tests/analyzers/stack-trace-analyzer/StackTraceAnalyzer.spec.ts

@@ -1,3 +1,5 @@
+import 'reflect-metadata';
+
 import { ServiceIdentifiers } from '../../../../src/container/ServiceIdentifiers';
 
 import * as estraverse from 'estraverse';
@@ -8,8 +10,8 @@ import { assert } from 'chai';
 import { TNodeWithBlockStatement } from '../../../../src/types/node/TNodeWithBlockStatement';
 
 import { IInversifyContainerFacade } from '../../../../src/interfaces/container/IInversifyContainerFacade';
-import { IStackTraceAnalyzer } from '../../../../src/interfaces/stack-trace-analyzer/IStackTraceAnalyzer';
-import { IStackTraceData } from '../../../../src/interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceAnalyzer } from '../../../../src/interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer';
+import { IStackTraceData } from '../../../../src/interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 
 import { readFileAsString } from '../../../helpers/readFileAsString';
 

+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/basic-1.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/basic-1.js


+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/basic-2.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/basic-2.js


+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/call-before-declaration.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/call-before-declaration.js


+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/call-expression-of-object-member-1.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/call-expression-of-object-member-1.js


+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/call-expression-of-object-member-2.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/call-expression-of-object-member-2.js


+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/deep-conditions-nesting.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/deep-conditions-nesting.js


+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/no-call-expressions.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/no-call-expressions.js


+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/no-recursion.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/no-recursion.js


+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/only-call-expression.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/only-call-expression.js


+ 0 - 0
test/functional-tests/stack-trace-analyzer/stack-trace-analyzer/fixtures/self-invoking-functions.js → test/functional-tests/analyzers/stack-trace-analyzer/fixtures/self-invoking-functions.js


+ 4 - 4
test/index.spec.ts

@@ -5,6 +5,7 @@ require('source-map-support').install();
 /**
  * Unit tests
  */
+import './unit-tests/analyzers/stack-trace-analyzer/StackTraceAnalyzer.spec';
 import './unit-tests/cli/sanitizers/ArraySanitizer.spec';
 import './unit-tests/cli/sanitizers/BooleanSanitizer.spec';
 import './unit-tests/cli/sanitizers/SourceMapModeSanitizer.spec';
@@ -18,7 +19,6 @@ import './unit-tests/obfuscation-result/ObfuscationResult.spec';
 import './unit-tests/options/OptionsNormalizer.spec';
 import './unit-tests/options/ValidationErrorsFormatter.spec';
 import './unit-tests/source-map-corrector/SourceMapCorrector.spec';
-import './unit-tests/stack-trace-analyzer/stack-trace-analyzer/StackTraceAnalyzer.spec';
 import './unit-tests/storages/ArrayStorage.spec';
 import './unit-tests/storages/MapStorage.spec';
 import './unit-tests/utils/ArrayUtils.spec';
@@ -30,14 +30,15 @@ import './unit-tests/utils/Utils.spec';
 /**
  * Functional tests
  */
-import './functional-tests/javascript-obfuscator/JavaScriptObfuscator.spec';
+import './functional-tests/analyzers/stack-trace-analyzer/StackTraceAnalyzer.spec';
 import './functional-tests/cli/JavaScriptObfuscatorCLI.spec';
-import './functional-tests/javascript-obfuscator-internal/JavaScriptObfuscatorInternal.spec';
 import './functional-tests/custom-nodes/console-output-nodes/ConsoleOutputDisableExpressionNode.spec';
 import './functional-tests/custom-nodes/domain-lock-nodes/DomainLockNode.spec';
 import './functional-tests/custom-nodes/string-array-nodes/StringArrayCallsWrapper.spec';
 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/javascript-obfuscator-internal/JavaScriptObfuscatorInternal.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';
@@ -55,7 +56,6 @@ 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/stack-trace-analyzer/stack-trace-analyzer/StackTraceAnalyzer.spec';
 import './functional-tests/templates/custom-nodes/domain-lock-nodes/DomainLockNodeTemplate.spec';
 import './functional-tests/templates/custom-nodes/string-array-nodes/StringArrayCallsWrapperNodeTemplate.spec';
 

+ 1 - 1
test/unit-tests/stack-trace-analyzer/stack-trace-analyzer/StackTraceAnalyzer.spec.ts → test/unit-tests/analyzers/stack-trace-analyzer/StackTraceAnalyzer.spec.ts

@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import { StackTraceAnalyzer } from '../../../../src/stack-trace-analyzer/StackTraceAnalyzer';
+import { StackTraceAnalyzer } from '../../../../src/analyzers/stack-trace-analyzer/StackTraceAnalyzer';
 
 describe('StackTraceAnalyzer', () => {
     describe('getLimitIndex (blockScopeBodyLength: number): number', () => {

+ 2 - 2
test/unit-tests/node/node-appender/NodeAppender.spec.ts

@@ -7,8 +7,8 @@ import { assert } from 'chai';
 import { TStatement } from '../../../../src/types/node/TStatement';
 
 import { IInversifyContainerFacade } from '../../../../src/interfaces/container/IInversifyContainerFacade';
-import { IStackTraceAnalyzer } from '../../../../src/interfaces/stack-trace-analyzer/IStackTraceAnalyzer';
-import { IStackTraceData } from '../../../../src/interfaces/stack-trace-analyzer/IStackTraceData';
+import { IStackTraceAnalyzer } from '../../../../src/interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer';
+import { IStackTraceData } from '../../../../src/interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
 
 import { readFileAsString } from '../../../helpers/readFileAsString';
 

Некоторые файлы не были показаны из-за большого количества измененных файлов