Skip to content

Commit 24375ec

Browse files
sanex3339sanex3339
committed
Moved StackTraceAnalyzer to the analyzers folder
1 parent 0ad3e60 commit 24375ec

39 files changed

Lines changed: 68 additions & 54 deletions

‎dist/index.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Obfuscator.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import { ILogger } from './interfaces/logger/ILogger';
1515
import { IObfuscationEventEmitter } from './interfaces/event-emitters/IObfuscationEventEmitter';
1616
import { IObfuscator } from './interfaces/IObfuscator';
1717
import { IOptions } from './interfaces/options/IOptions';
18-
import { IStackTraceAnalyzer } from './interfaces/stack-trace-analyzer/IStackTraceAnalyzer';
19-
import { IStackTraceData } from './interfaces/stack-trace-analyzer/IStackTraceData';
18+
import { IStackTraceAnalyzer } from './interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer';
19+
import { IStackTraceData } from './interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
2020
import { IStorage } from './interfaces/storages/IStorage';
2121
import { IVisitor } from './interfaces/IVisitor';
2222

@@ -157,6 +157,7 @@ export class Obfuscator implements IObfuscator {
157157

158158
astTree = <ESTree.Program>NodeUtils.parentize(astTree);
159159

160+
this.logger.info(LoggingMessage.StageAnalyzingASTTree);
160161
const stackTraceData: IStackTraceData[] = this.stackTraceAnalyzer.analyze(astTree.body);
161162

162163
// initialize custom node groups and configure custom nodes

src/stack-trace-analyzer/StackTraceAnalyzer.ts renamed to src/analyzers/stack-trace-analyzer/StackTraceAnalyzer.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import { injectable, inject } from 'inversify';
2-
import { ServiceIdentifiers } from '../container/ServiceIdentifiers';
2+
import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
33

44
import * as estraverse from 'estraverse';
55
import * as ESTree from 'estree';
66

7-
import { TCalleeDataExtractorFactory } from '../types/container/stack-trace-analyzer/TCalleeDataExtractorFactory';
7+
import { TCalleeDataExtractorFactory } from '../../types/container/stack-trace-analyzer/TCalleeDataExtractorFactory';
88

9-
import { ICalleeData } from '../interfaces/stack-trace-analyzer/ICalleeData';
10-
import { IStackTraceAnalyzer } from '../interfaces/stack-trace-analyzer/IStackTraceAnalyzer';
11-
import { IStackTraceData } from '../interfaces/stack-trace-analyzer/IStackTraceData';
9+
import { ICalleeData } from '../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
10+
import { IStackTraceAnalyzer } from '../../interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer';
11+
import { IStackTraceData } from '../../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
1212

13-
import { CalleeDataExtractor } from '../enums/container/stack-trace-analyzer/CalleeDataExtractor';
13+
import { CalleeDataExtractor } from '../../enums/container/stack-trace-analyzer/CalleeDataExtractor';
1414

15-
import { Node } from '../node/Node';
16-
import { NodeUtils } from '../node/NodeUtils';
15+
import { Node } from '../../node/Node';
16+
import { NodeUtils } from '../../node/NodeUtils';
1717

1818
/**
1919
* This class generates a data with a stack trace of functions calls

src/stack-trace-analyzer/callee-data-extractors/AbstractCalleeDataExtractor.ts renamed to src/analyzers/stack-trace-analyzer/callee-data-extractors/AbstractCalleeDataExtractor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { injectable } from 'inversify';
22

33
import * as ESTree from 'estree';
44

5-
import { ICalleeData } from '../../interfaces/stack-trace-analyzer/ICalleeData';
6-
import { ICalleeDataExtractor } from '../../interfaces/stack-trace-analyzer/ICalleeDataExtractor';
5+
import { ICalleeData } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
6+
import { ICalleeDataExtractor } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeDataExtractor';
77

88
@injectable()
99
export abstract class AbstractCalleeDataExtractor implements ICalleeDataExtractor {

src/stack-trace-analyzer/callee-data-extractors/FunctionDeclarationCalleeDataExtractor.ts renamed to src/analyzers/stack-trace-analyzer/callee-data-extractors/FunctionDeclarationCalleeDataExtractor.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { injectable } from 'inversify';
33
import * as estraverse from 'estraverse';
44
import * as ESTree from 'estree';
55

6-
import { ICalleeData } from '../../interfaces/stack-trace-analyzer/ICalleeData';
6+
import { ICalleeData } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
77

88
import { AbstractCalleeDataExtractor } from './AbstractCalleeDataExtractor';
9-
import { Node } from '../../node/Node';
10-
import { NodeUtils } from '../../node/NodeUtils';
9+
import { Node } from '../../../node/Node';
10+
import { NodeUtils } from '../../../node/NodeUtils';
1111

1212
@injectable()
1313
export class FunctionDeclarationCalleeDataExtractor extends AbstractCalleeDataExtractor {

src/stack-trace-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor.ts renamed to src/analyzers/stack-trace-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { injectable } from 'inversify';
33
import * as estraverse from 'estraverse';
44
import * as ESTree from 'estree';
55

6-
import { ICalleeData } from '../../interfaces/stack-trace-analyzer/ICalleeData';
6+
import { ICalleeData } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
77

88
import { AbstractCalleeDataExtractor } from './AbstractCalleeDataExtractor';
9-
import { Node } from '../../node/Node';
10-
import { NodeUtils } from '../../node/NodeUtils';
9+
import { Node } from '../../../node/Node';
10+
import { NodeUtils } from '../../../node/NodeUtils';
1111

1212
@injectable()
1313
export class FunctionExpressionCalleeDataExtractor extends AbstractCalleeDataExtractor {

src/stack-trace-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor.ts renamed to src/analyzers/stack-trace-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import { injectable } from 'inversify';
33
import * as estraverse from 'estraverse';
44
import * as ESTree from 'estree';
55

6-
import { TObjectMembersCallsChain } from '../../types/stack-trace-analyzer/TObjectMembersCallsChain';
6+
import { TObjectMembersCallsChain } from '../../../types/analyzers/stack-trace-analyzer/TObjectMembersCallsChain';
77

8-
import { ICalleeData } from '../../interfaces/stack-trace-analyzer/ICalleeData';
8+
import { ICalleeData } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeData';
99

10-
import { Node } from '../../node/Node';
11-
import { NodeUtils } from '../../node/NodeUtils';
10+
import { Node } from '../../../node/Node';
11+
import { NodeUtils } from '../../../node/NodeUtils';
1212
import { AbstractCalleeDataExtractor } from './AbstractCalleeDataExtractor';
1313

1414
@injectable()

‎src/container/InversifyContainerFacade.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Container, interfaces } from 'inversify';
22
import { ServiceIdentifiers } from './ServiceIdentifiers';
33

4+
import { analyzersModule } from './modules/analyzers/AnalyzersModule';
45
import { controlFlowTransformersModule } from './modules/node-transformers/ControlFlowTransformersModule';
56
import { customNodesModule } from './modules/custom-nodes/CustomNodesModule';
67
import { obfuscatingTransformersModule } from './modules/node-transformers/ObfuscatingTransformersModule';
78
import { nodeTransformersModule } from './modules/node-transformers/NodeTransformersModule';
8-
import { stackTraceAnalyzerModule } from './modules/stack-trace-analyzer/StackTraceAnalyzerModule';
99
import { storagesModule } from './modules/storages/StoragesModule';
1010
import { utilsModule } from './modules/utils/UtilsModule';
1111

@@ -191,13 +191,13 @@ export class InversifyContainerFacade implements IInversifyContainerFacade {
191191
.inSingletonScope();
192192

193193
// modules
194-
this.container.load(utilsModule);
195-
this.container.load(storagesModule);
196-
this.container.load(stackTraceAnalyzerModule);
194+
this.container.load(analyzersModule);
195+
this.container.load(controlFlowTransformersModule);
197196
this.container.load(customNodesModule);
198197
this.container.load(nodeTransformersModule);
199-
this.container.load(controlFlowTransformersModule);
200198
this.container.load(obfuscatingTransformersModule);
199+
this.container.load(storagesModule);
200+
this.container.load(utilsModule);
201201
}
202202

203203
public unload (): void {

src/container/modules/stack-trace-analyzer/StackTraceAnalyzerModule.ts renamed to src/container/modules/analyzers/AnalyzersModule.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import { InversifyContainerFacade } from '../../InversifyContainerFacade';
22
import { ContainerModule, interfaces } from 'inversify';
33
import { ServiceIdentifiers } from '../../ServiceIdentifiers';
44

5-
import { ICalleeDataExtractor } from '../../../interfaces/stack-trace-analyzer/ICalleeDataExtractor';
6-
import { IStackTraceAnalyzer } from '../../../interfaces/stack-trace-analyzer/IStackTraceAnalyzer';
5+
import { ICalleeDataExtractor } from '../../../interfaces/analyzers/stack-trace-analyzer/ICalleeDataExtractor';
6+
import { IStackTraceAnalyzer } from '../../../interfaces/analyzers/stack-trace-analyzer/IStackTraceAnalyzer';
77

88
import { CalleeDataExtractor } from '../../../enums/container/stack-trace-analyzer/CalleeDataExtractor';
9-
import { FunctionDeclarationCalleeDataExtractor } from '../../../stack-trace-analyzer/callee-data-extractors/FunctionDeclarationCalleeDataExtractor';
10-
import { FunctionExpressionCalleeDataExtractor } from '../../../stack-trace-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor';
11-
import { ObjectExpressionCalleeDataExtractor } from '../../../stack-trace-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor';
12-
import { StackTraceAnalyzer } from '../../../stack-trace-analyzer/StackTraceAnalyzer';
9+
import { FunctionDeclarationCalleeDataExtractor } from '../../../analyzers/stack-trace-analyzer/callee-data-extractors/FunctionDeclarationCalleeDataExtractor';
10+
import { FunctionExpressionCalleeDataExtractor } from '../../../analyzers/stack-trace-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor';
11+
import { ObjectExpressionCalleeDataExtractor } from '../../../analyzers/stack-trace-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor';
12+
import { StackTraceAnalyzer } from '../../../analyzers/stack-trace-analyzer/StackTraceAnalyzer';
1313

14-
export const stackTraceAnalyzerModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
14+
export const analyzersModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
1515
// stack trace analyzer
1616
bind<IStackTraceAnalyzer>(ServiceIdentifiers.IStackTraceAnalyzer)
1717
.to(StackTraceAnalyzer)

‎src/custom-nodes/AbstractCustomNodeGroup.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ICustomNode } from '../interfaces/custom-nodes/ICustomNode';
77
import { ICustomNodeGroup } from '../interfaces/custom-nodes/ICustomNodeGroup';
88
import { IOptions } from '../interfaces/options/IOptions';
99
import { IRandomGenerator } from '../interfaces/utils/IRandomGenerator';
10-
import { IStackTraceData } from '../interfaces/stack-trace-analyzer/IStackTraceData';
10+
import { IStackTraceData } from '../interfaces/analyzers/stack-trace-analyzer/IStackTraceData';
1111

1212
import { CustomNode } from '../enums/container/custom-nodes/CustomNode';
1313
import { ObfuscationEvent } from '../enums/event-emitters/ObfuscationEvent';

0 commit comments

Comments
 (0)