From 86c79ae69a3519977decd0720dd966612e1a8d15 Mon Sep 17 00:00:00 2001 From: sanex3339 Date: Sat, 17 Mar 2018 01:24:19 +0300 Subject: [PATCH] Types refactoring --- .../ControlFlowStorageNode.ts | 10 +++++----- .../string-array-nodes/StringArrayNode.ts | 10 +++++----- .../group/StringArrayCustomNodeGroup.ts | 10 +++++----- .../IControlFlowReplacer.d.ts | 5 ++--- .../FunctionControlFlowTransformer.ts | 20 +++++++++---------- .../AbstractControlFlowReplacer.ts | 10 +++++----- .../BinaryExpressionControlFlowReplacer.ts | 6 +++--- .../CallExpressionControlFlowReplacer.ts | 6 +++--- .../LogicalExpressionControlFlowReplacer.ts | 6 +++--- .../StringLiteralControlFlowReplacer.ts | 6 +++--- .../StringLiteralObfuscatingReplacer.ts | 11 +++++----- .../CustomNodesTransformer.ts | 11 +++++----- .../TInversifyContainerModuleFactory.d.ts | 5 ----- .../TControlFlowStorageFactory.d.ts | 5 ++--- .../node-transformers/TNodeTransformer.d.ts | 6 ------ src/types/storages/TControlFlowStorage.d.ts | 2 +- .../storages/TCustomNodeGroupStorage.d.ts | 2 +- src/types/storages/TStringArrayStorage.d.ts | 2 +- 18 files changed, 61 insertions(+), 72 deletions(-) delete mode 100644 src/types/container/TInversifyContainerModuleFactory.d.ts delete mode 100644 src/types/node-transformers/TNodeTransformer.d.ts diff --git a/src/custom-nodes/control-flow-flattening-nodes/control-flow-storage-nodes/ControlFlowStorageNode.ts b/src/custom-nodes/control-flow-flattening-nodes/control-flow-storage-nodes/ControlFlowStorageNode.ts index 06389b18..3dc05f5c 100644 --- a/src/custom-nodes/control-flow-flattening-nodes/control-flow-storage-nodes/ControlFlowStorageNode.ts +++ b/src/custom-nodes/control-flow-flattening-nodes/control-flow-storage-nodes/ControlFlowStorageNode.ts @@ -3,13 +3,13 @@ import { ServiceIdentifiers } from '../../../container/ServiceIdentifiers'; import * as ESTree from 'estree'; +import { TControlFlowStorage } from '../../../types/storages/TControlFlowStorage'; import { TIdentifierNamesGeneratorFactory } from '../../../types/container/generators/TIdentifierNamesGeneratorFactory'; import { TStatement } from '../../../types/node/TStatement'; import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode'; import { IOptions } from '../../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator'; -import { IStorage } from '../../../interfaces/storages/IStorage'; import { initializable } from '../../../decorators/Initializable'; @@ -21,10 +21,10 @@ import { NodeUtils } from '../../../node/NodeUtils'; @injectable() export class ControlFlowStorageNode extends AbstractCustomNode { /** - * @type {IStorage } + * @type {TControlFlowStorage} */ @initializable() - private controlFlowStorage!: IStorage ; + private controlFlowStorage!: TControlFlowStorage; /** * @param {TIdentifierNamesGeneratorFactory} identifierNamesGeneratorFactory @@ -41,9 +41,9 @@ export class ControlFlowStorageNode extends AbstractCustomNode { } /** - * @param {IStorage} controlFlowStorage + * @param {TControlFlowStorage} controlFlowStorage */ - public initialize (controlFlowStorage: IStorage ): void { + public initialize (controlFlowStorage: TControlFlowStorage): void { this.controlFlowStorage = controlFlowStorage; } diff --git a/src/custom-nodes/string-array-nodes/StringArrayNode.ts b/src/custom-nodes/string-array-nodes/StringArrayNode.ts index 60fb1b8f..42ca5042 100644 --- a/src/custom-nodes/string-array-nodes/StringArrayNode.ts +++ b/src/custom-nodes/string-array-nodes/StringArrayNode.ts @@ -5,10 +5,10 @@ import format from 'string-template'; import { TIdentifierNamesGeneratorFactory } from '../../types/container/generators/TIdentifierNamesGeneratorFactory'; import { TStatement } from '../../types/node/TStatement'; +import { TStringArrayStorage } from '../../types/storages/TStringArrayStorage'; import { IOptions } from '../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator'; -import { IStorage } from '../../interfaces/storages/IStorage'; import { initializable } from '../../decorators/Initializable'; @@ -21,10 +21,10 @@ import { StringArrayStorage } from '../../storages/string-array/StringArrayStora @injectable() export class StringArrayNode extends AbstractCustomNode { /** - * @type {IStorage } + * @type {TStringArrayStorage} */ @initializable() - private stringArrayStorage!: IStorage ; + private stringArrayStorage!: TStringArrayStorage; /** * @type {string} @@ -53,12 +53,12 @@ export class StringArrayNode extends AbstractCustomNode { } /** - * @param {IStorage} stringArrayStorage + * @param {TStringArrayStorage} stringArrayStorage * @param {string} stringArrayName * @param {number} stringArrayRotateValue */ public initialize ( - stringArrayStorage: IStorage , + stringArrayStorage: TStringArrayStorage, stringArrayName: string, stringArrayRotateValue: number ): void { diff --git a/src/custom-nodes/string-array-nodes/group/StringArrayCustomNodeGroup.ts b/src/custom-nodes/string-array-nodes/group/StringArrayCustomNodeGroup.ts index f03a65ca..d1845689 100644 --- a/src/custom-nodes/string-array-nodes/group/StringArrayCustomNodeGroup.ts +++ b/src/custom-nodes/string-array-nodes/group/StringArrayCustomNodeGroup.ts @@ -4,12 +4,12 @@ import { ServiceIdentifiers } from '../../../container/ServiceIdentifiers'; import { TCustomNodeFactory } from '../../../types/container/custom-nodes/TCustomNodeFactory'; import { TIdentifierNamesGeneratorFactory } from '../../../types/container/generators/TIdentifierNamesGeneratorFactory'; import { TNodeWithBlockScope } from '../../../types/node/TNodeWithBlockScope'; +import { TStringArrayStorage } from '../../../types/storages/TStringArrayStorage'; import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode'; import { IOptions } from '../../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator'; import { IStackTraceData } from '../../../interfaces/analyzers/stack-trace-analyzer/IStackTraceData'; -import { IStorage } from '../../../interfaces/storages/IStorage'; import { initializable } from '../../../decorators/Initializable'; @@ -38,20 +38,20 @@ export class StringArrayCustomNodeGroup extends AbstractCustomNodeGroup { private readonly customNodeFactory: TCustomNodeFactory; /** - * @type {IStorage } + * @type {TStringArrayStorage} */ - private readonly stringArrayStorage: IStorage ; + private readonly stringArrayStorage: TStringArrayStorage; /** * @param {TCustomNodeFactory} customNodeFactory - * @param {IStorage} stringArrayStorage + * @param {TStringArrayStorage} stringArrayStorage * @param {TIdentifierNamesGeneratorFactory} identifierNamesGeneratorFactory * @param {IRandomGenerator} randomGenerator * @param {IOptions} options */ constructor ( @inject(ServiceIdentifiers.Factory__ICustomNode) customNodeFactory: TCustomNodeFactory, - @inject(ServiceIdentifiers.TStringArrayStorage) stringArrayStorage: IStorage, + @inject(ServiceIdentifiers.TStringArrayStorage) stringArrayStorage: TStringArrayStorage, @inject(ServiceIdentifiers.Factory__IIdentifierNamesGenerator) identifierNamesGeneratorFactory: TIdentifierNamesGeneratorFactory, @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator, diff --git a/src/interfaces/node-transformers/control-flow-transformers/IControlFlowReplacer.d.ts b/src/interfaces/node-transformers/control-flow-transformers/IControlFlowReplacer.d.ts index 5ea8fdd6..bd868ff2 100644 --- a/src/interfaces/node-transformers/control-flow-transformers/IControlFlowReplacer.d.ts +++ b/src/interfaces/node-transformers/control-flow-transformers/IControlFlowReplacer.d.ts @@ -1,7 +1,6 @@ import * as ESTree from 'estree'; -import { ICustomNode } from '../../custom-nodes/ICustomNode'; -import { IStorage } from '../../storages/IStorage'; +import { TControlFlowStorage } from '../../../types/storages/TControlFlowStorage'; export interface IControlFlowReplacer { /** @@ -13,6 +12,6 @@ export interface IControlFlowReplacer { replace ( node: ESTree.Node, parentNode: ESTree.Node, - controlFlowStorage: IStorage + controlFlowStorage: TControlFlowStorage ): ESTree.Node; } diff --git a/src/node-transformers/control-flow-transformers/FunctionControlFlowTransformer.ts b/src/node-transformers/control-flow-transformers/FunctionControlFlowTransformer.ts index 946f03fe..464ffe92 100644 --- a/src/node-transformers/control-flow-transformers/FunctionControlFlowTransformer.ts +++ b/src/node-transformers/control-flow-transformers/FunctionControlFlowTransformer.ts @@ -6,13 +6,13 @@ import * as ESTree from 'estree'; import { TControlFlowCustomNodeFactory } from '../../types/container/custom-nodes/TControlFlowCustomNodeFactory'; import { TControlFlowReplacerFactory } from '../../types/container/node-transformers/TControlFlowReplacerFactory'; +import { TControlFlowStorage } from '../../types/storages/TControlFlowStorage'; import { TControlFlowStorageFactory } from '../../types/container/node-transformers/TControlFlowStorageFactory'; import { TNodeWithBlockScope } from '../../types/node/TNodeWithBlockScope'; import { ICustomNode } from '../../interfaces/custom-nodes/ICustomNode'; import { IOptions } from '../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator'; -import { IStorage } from '../../interfaces/storages/IStorage'; import { IVisitor } from '../../interfaces/node-transformers/IVisitor'; import { ControlFlowCustomNode } from '../../enums/custom-nodes/ControlFlowCustomNode'; @@ -49,9 +49,9 @@ export class FunctionControlFlowTransformer extends AbstractNodeTransformer { private static readonly hostNodeSearchMaxDepth: number = 2; /** - * @type {Map>} + * @type {Map} */ - private readonly controlFlowData: Map > = new Map(); + private readonly controlFlowData: Map = new Map(); /** * @type {Set} @@ -141,7 +141,7 @@ export class FunctionControlFlowTransformer extends AbstractNodeTransformer { } const hostNode: TNodeWithBlockScope = this.getHostNode(functionNode.body); - const controlFlowStorage: IStorage = this.getControlFlowStorage(hostNode); + const controlFlowStorage: TControlFlowStorage = this.getControlFlowStorage(hostNode); this.controlFlowData.set(hostNode, controlFlowStorage); this.transformFunctionBody(functionNode.body, controlFlowStorage); @@ -163,17 +163,17 @@ export class FunctionControlFlowTransformer extends AbstractNodeTransformer { /** * @param {TNodeWithBlockScope} hostNode - * @returns {IStorage} + * @returns {TControlFlowStorage} */ - private getControlFlowStorage (hostNode: TNodeWithBlockScope): IStorage { - const controlFlowStorage: IStorage = this.controlFlowStorageFactory(); + private getControlFlowStorage (hostNode: TNodeWithBlockScope): TControlFlowStorage { + const controlFlowStorage: TControlFlowStorage = this.controlFlowStorageFactory(); if (this.controlFlowData.has(hostNode)) { if (this.hostNodesWithControlFlowNode.has(hostNode)) { hostNode.body.shift(); } - const hostControlFlowStorage: IStorage = >this.controlFlowData.get(hostNode); + const hostControlFlowStorage: TControlFlowStorage = this.controlFlowData.get(hostNode); controlFlowStorage.mergeWith(hostControlFlowStorage, true); } @@ -219,9 +219,9 @@ export class FunctionControlFlowTransformer extends AbstractNodeTransformer { /** * @param {BlockStatement} functionNodeBody - * @param {IStorage} controlFlowStorage + * @param {TControlFlowStorage} controlFlowStorage */ - private transformFunctionBody (functionNodeBody: ESTree.BlockStatement, controlFlowStorage: IStorage): void { + private transformFunctionBody (functionNodeBody: ESTree.BlockStatement, controlFlowStorage: TControlFlowStorage): void { estraverse.replace(functionNodeBody, { enter: (node: ESTree.Node, parentNode: ESTree.Node | null): estraverse.VisitorOption | ESTree.Node => { if (NodeMetadata.isIgnoredNode(node)) { diff --git a/src/node-transformers/control-flow-transformers/control-flow-replacers/AbstractControlFlowReplacer.ts b/src/node-transformers/control-flow-transformers/control-flow-replacers/AbstractControlFlowReplacer.ts index f584b27a..9e72aef9 100644 --- a/src/node-transformers/control-flow-transformers/control-flow-replacers/AbstractControlFlowReplacer.ts +++ b/src/node-transformers/control-flow-transformers/control-flow-replacers/AbstractControlFlowReplacer.ts @@ -4,12 +4,12 @@ import { ServiceIdentifiers } from '../../../container/ServiceIdentifiers'; import * as ESTree from 'estree'; import { TControlFlowCustomNodeFactory } from '../../../types/container/custom-nodes/TControlFlowCustomNodeFactory'; +import { TControlFlowStorage } from '../../../types/storages/TControlFlowStorage'; import { IControlFlowReplacer } from '../../../interfaces/node-transformers/control-flow-transformers/IControlFlowReplacer'; import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode'; import { IOptions } from '../../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator'; -import { IStorage } from '../../../interfaces/storages/IStorage'; @injectable() export abstract class AbstractControlFlowReplacer implements IControlFlowReplacer { @@ -72,21 +72,21 @@ export abstract class AbstractControlFlowReplacer implements IControlFlowReplace /** * @param {Node} node * @param {Node} parentNode - * @param {IStorage} controlFlowStorage + * @param {TControlFlowStorage} controlFlowStorage * @returns {Node} */ - public abstract replace (node: ESTree.Node, parentNode: ESTree.Node, controlFlowStorage: IStorage ): ESTree.Node; + public abstract replace (node: ESTree.Node, parentNode: ESTree.Node, controlFlowStorage: TControlFlowStorage): ESTree.Node; /** * @param {ICustomNode} customNode - * @param {IStorage} controlFlowStorage + * @param {TControlFlowStorage} controlFlowStorage * @param {string} replacerId * @param {number} usingExistingIdentifierChance * @returns {string} */ protected insertCustomNodeToControlFlowStorage ( customNode: ICustomNode, - controlFlowStorage: IStorage , + controlFlowStorage: TControlFlowStorage, replacerId: string, usingExistingIdentifierChance: number ): string { diff --git a/src/node-transformers/control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.ts b/src/node-transformers/control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.ts index 3ffe7a5e..e00f7b19 100644 --- a/src/node-transformers/control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.ts +++ b/src/node-transformers/control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.ts @@ -4,11 +4,11 @@ import { ServiceIdentifiers } from '../../../container/ServiceIdentifiers'; import * as ESTree from 'estree'; import { TControlFlowCustomNodeFactory } from '../../../types/container/custom-nodes/TControlFlowCustomNodeFactory'; +import { TControlFlowStorage } from '../../../types/storages/TControlFlowStorage'; import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode'; import { IOptions } from '../../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator'; -import { IStorage } from '../../../interfaces/storages/IStorage'; import { ControlFlowCustomNode } from '../../../enums/custom-nodes/ControlFlowCustomNode'; @@ -38,13 +38,13 @@ export class BinaryExpressionControlFlowReplacer extends ExpressionWithOperatorC /** * @param {BinaryExpression} binaryExpressionNode * @param {Node} parentNode - * @param {IStorage} controlFlowStorage + * @param {TControlFlowStorage} controlFlowStorage * @returns {Node} */ public replace ( binaryExpressionNode: ESTree.BinaryExpression, parentNode: ESTree.Node, - controlFlowStorage: IStorage + controlFlowStorage: TControlFlowStorage ): ESTree.Node { const replacerId: string = binaryExpressionNode.operator; const binaryExpressionFunctionCustomNode: ICustomNode = this.controlFlowCustomNodeFactory( diff --git a/src/node-transformers/control-flow-transformers/control-flow-replacers/CallExpressionControlFlowReplacer.ts b/src/node-transformers/control-flow-transformers/control-flow-replacers/CallExpressionControlFlowReplacer.ts index 557711e1..546a04e3 100644 --- a/src/node-transformers/control-flow-transformers/control-flow-replacers/CallExpressionControlFlowReplacer.ts +++ b/src/node-transformers/control-flow-transformers/control-flow-replacers/CallExpressionControlFlowReplacer.ts @@ -4,12 +4,12 @@ import { ServiceIdentifiers } from '../../../container/ServiceIdentifiers'; import * as ESTree from 'estree'; import { TControlFlowCustomNodeFactory } from '../../../types/container/custom-nodes/TControlFlowCustomNodeFactory'; +import { TControlFlowStorage } from '../../../types/storages/TControlFlowStorage'; import { TStatement } from '../../../types/node/TStatement'; import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode'; import { IOptions } from '../../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator'; -import { IStorage } from '../../../interfaces/storages/IStorage'; import { ControlFlowCustomNode } from '../../../enums/custom-nodes/ControlFlowCustomNode'; @@ -40,13 +40,13 @@ export class CallExpressionControlFlowReplacer extends AbstractControlFlowReplac /** * @param {CallExpression} callExpressionNode * @param {NodeGuards} parentNode - * @param {IStorage} controlFlowStorage + * @param {TControlFlowStorage} controlFlowStorage * @returns {NodeGuards} */ public replace ( callExpressionNode: ESTree.CallExpression, parentNode: ESTree.Node, - controlFlowStorage: IStorage + controlFlowStorage: TControlFlowStorage ): ESTree.Node { const callee: ESTree.Expression = callExpressionNode.callee; diff --git a/src/node-transformers/control-flow-transformers/control-flow-replacers/LogicalExpressionControlFlowReplacer.ts b/src/node-transformers/control-flow-transformers/control-flow-replacers/LogicalExpressionControlFlowReplacer.ts index 898c5687..4a3212cc 100644 --- a/src/node-transformers/control-flow-transformers/control-flow-replacers/LogicalExpressionControlFlowReplacer.ts +++ b/src/node-transformers/control-flow-transformers/control-flow-replacers/LogicalExpressionControlFlowReplacer.ts @@ -4,11 +4,11 @@ import { ServiceIdentifiers } from '../../../container/ServiceIdentifiers'; import * as ESTree from 'estree'; import { TControlFlowCustomNodeFactory } from '../../../types/container/custom-nodes/TControlFlowCustomNodeFactory'; +import { TControlFlowStorage } from '../../../types/storages/TControlFlowStorage'; import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode'; import { IOptions } from '../../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator'; -import { IStorage } from '../../../interfaces/storages/IStorage'; import { ControlFlowCustomNode } from '../../../enums/custom-nodes/ControlFlowCustomNode'; @@ -40,13 +40,13 @@ export class LogicalExpressionControlFlowReplacer extends ExpressionWithOperator /** * @param {LogicalExpression} logicalExpressionNode * @param {NodeGuards} parentNode - * @param {IStorage} controlFlowStorage + * @param {TControlFlowStorage} controlFlowStorage * @returns {NodeGuards} */ public replace ( logicalExpressionNode: ESTree.LogicalExpression, parentNode: ESTree.Node, - controlFlowStorage: IStorage + controlFlowStorage: TControlFlowStorage ): ESTree.Node { if (this.checkForProhibitedExpressions(logicalExpressionNode.left, logicalExpressionNode.right)) { return logicalExpressionNode; diff --git a/src/node-transformers/control-flow-transformers/control-flow-replacers/StringLiteralControlFlowReplacer.ts b/src/node-transformers/control-flow-transformers/control-flow-replacers/StringLiteralControlFlowReplacer.ts index 47eeb6b2..af9d9c0e 100644 --- a/src/node-transformers/control-flow-transformers/control-flow-replacers/StringLiteralControlFlowReplacer.ts +++ b/src/node-transformers/control-flow-transformers/control-flow-replacers/StringLiteralControlFlowReplacer.ts @@ -4,12 +4,12 @@ import { ServiceIdentifiers } from '../../../container/ServiceIdentifiers'; import * as ESTree from 'estree'; import { TControlFlowCustomNodeFactory } from '../../../types/container/custom-nodes/TControlFlowCustomNodeFactory'; +import { TControlFlowStorage } from '../../../types/storages/TControlFlowStorage'; import { TStatement } from '../../../types/node/TStatement'; import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode'; import { IOptions } from '../../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../../interfaces/utils/IRandomGenerator'; -import { IStorage } from '../../../interfaces/storages/IStorage'; import { ControlFlowCustomNode } from '../../../enums/custom-nodes/ControlFlowCustomNode'; @@ -40,13 +40,13 @@ export class StringLiteralControlFlowReplacer extends AbstractControlFlowReplace /** * @param {Literal} literalNode * @param {NodeGuards} parentNode - * @param {IStorage} controlFlowStorage + * @param {TControlFlowStorage} controlFlowStorage * @returns {NodeGuards} */ public replace ( literalNode: ESTree.Literal, parentNode: ESTree.Node, - controlFlowStorage: IStorage + controlFlowStorage: TControlFlowStorage ): ESTree.Node { if (NodeGuards.isPropertyNode(parentNode) && parentNode.key === literalNode) { return literalNode; diff --git a/src/node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/StringLiteralObfuscatingReplacer.ts b/src/node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/StringLiteralObfuscatingReplacer.ts index 385b434b..6f84c41b 100644 --- a/src/node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/StringLiteralObfuscatingReplacer.ts +++ b/src/node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/StringLiteralObfuscatingReplacer.ts @@ -3,12 +3,13 @@ import { ServiceIdentifiers } from '../../../../container/ServiceIdentifiers'; import * as ESTree from 'estree'; +import { TStringArrayStorage } from '../../../../types/storages/TStringArrayStorage'; + import { ICryptUtils } from '../../../../interfaces/utils/ICryptUtils'; import { IEncodedValue } from '../../../../interfaces/node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/IEncodedValue'; import { IEscapeSequenceEncoder } from '../../../../interfaces/utils/IEscapeSequenceEncoder'; import { IOptions } from '../../../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../../../interfaces/utils/IRandomGenerator'; -import { IStorage } from '../../../../interfaces/storages/IStorage'; import { IStringArrayIndexData } from '../../../../interfaces/node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/IStringArrayIndexData'; import { StringArrayEncoding } from '../../../../enums/StringArrayEncoding'; @@ -66,19 +67,19 @@ export class StringLiteralObfuscatingReplacer extends AbstractObfuscatingReplace private readonly stringLiteralHexadecimalIndexCache: Map = new Map(); /** - * @type {IStorage} + * @type {TStringArrayStorage} */ - private readonly stringArrayStorage: IStorage; + private readonly stringArrayStorage: TStringArrayStorage; /** - * @param {IStorage} stringArrayStorage + * @param {TStringArrayStorage} stringArrayStorage * @param {IEscapeSequenceEncoder} escapeSequenceEncoder * @param {IRandomGenerator} randomGenerator * @param {ICryptUtils} cryptUtils * @param {IOptions} options */ constructor ( - @inject(ServiceIdentifiers.TStringArrayStorage) stringArrayStorage: IStorage, + @inject(ServiceIdentifiers.TStringArrayStorage) stringArrayStorage: TStringArrayStorage, @inject(ServiceIdentifiers.IEscapeSequenceEncoder) escapeSequenceEncoder: IEscapeSequenceEncoder, @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator, @inject(ServiceIdentifiers.ICryptUtils) cryptUtils: ICryptUtils, diff --git a/src/node-transformers/preparing-transformers/CustomNodesTransformer.ts b/src/node-transformers/preparing-transformers/CustomNodesTransformer.ts index 442b59d0..be6e6f30 100644 --- a/src/node-transformers/preparing-transformers/CustomNodesTransformer.ts +++ b/src/node-transformers/preparing-transformers/CustomNodesTransformer.ts @@ -3,13 +3,14 @@ import { ServiceIdentifiers } from '../../container/ServiceIdentifiers'; import * as ESTree from 'estree'; +import { TCustomNodeGroupStorage } from '../../types/storages/TCustomNodeGroupStorage'; + import { ICustomNodeGroup } from '../../interfaces/custom-nodes/ICustomNodeGroup'; import { IObfuscationEventEmitter } from '../../interfaces/event-emitters/IObfuscationEventEmitter'; import { IOptions } from '../../interfaces/options/IOptions'; import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator'; 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/node-transformers/IVisitor'; import { ObfuscationEvent } from '../../enums/event-emitters/ObfuscationEvent'; @@ -24,9 +25,9 @@ import { NodeGuards } from '../../node/NodeGuards'; @injectable() export class CustomNodesTransformer extends AbstractNodeTransformer { /** - * @type {IStorage} + * @type {TCustomNodeGroupStorage} */ - private readonly customNodeGroupStorage: IStorage; + private readonly customNodeGroupStorage: TCustomNodeGroupStorage; /** * @type {IObfuscationEventEmitter} @@ -46,14 +47,14 @@ export class CustomNodesTransformer extends AbstractNodeTransformer { /** * @param {IStackTraceAnalyzer} stackTraceAnalyzer * @param {IObfuscationEventEmitter} obfuscationEventEmitter - * @param {IStorage} customNodeGroupStorage + * @param {TCustomNodeGroupStorage} customNodeGroupStorage * @param {IRandomGenerator} randomGenerator * @param {IOptions} options */ constructor ( @inject(ServiceIdentifiers.IStackTraceAnalyzer) stackTraceAnalyzer: IStackTraceAnalyzer, @inject(ServiceIdentifiers.IObfuscationEventEmitter) obfuscationEventEmitter: IObfuscationEventEmitter, - @inject(ServiceIdentifiers.TCustomNodeGroupStorage) customNodeGroupStorage: IStorage, + @inject(ServiceIdentifiers.TCustomNodeGroupStorage) customNodeGroupStorage: TCustomNodeGroupStorage, @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator, @inject(ServiceIdentifiers.IOptions) options: IOptions ) { diff --git a/src/types/container/TInversifyContainerModuleFactory.d.ts b/src/types/container/TInversifyContainerModuleFactory.d.ts deleted file mode 100644 index 46effdc4..00000000 --- a/src/types/container/TInversifyContainerModuleFactory.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { interfaces } from 'inversify'; - -import { TInputOptions } from '../options/TInputOptions'; - -export type TInversifyContainerModuleFactory = (options: TInputOptions) => interfaces.ContainerModule; diff --git a/src/types/container/node-transformers/TControlFlowStorageFactory.d.ts b/src/types/container/node-transformers/TControlFlowStorageFactory.d.ts index 9a2cacdd..5b1b9e43 100644 --- a/src/types/container/node-transformers/TControlFlowStorageFactory.d.ts +++ b/src/types/container/node-transformers/TControlFlowStorageFactory.d.ts @@ -1,4 +1,3 @@ -import { ICustomNode } from '../../../interfaces/custom-nodes/ICustomNode'; -import { IStorage } from '../../../interfaces/storages/IStorage'; +import { TControlFlowStorage } from '../../storages/TControlFlowStorage'; -export type TControlFlowStorageFactory = () => IStorage; +export type TControlFlowStorageFactory = () => TControlFlowStorage; diff --git a/src/types/node-transformers/TNodeTransformer.d.ts b/src/types/node-transformers/TNodeTransformer.d.ts deleted file mode 100644 index fe82ea15..00000000 --- a/src/types/node-transformers/TNodeTransformer.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { ICustomNode } from '../../interfaces/custom-nodes/ICustomNode'; -import { INodeTransformer } from '../../interfaces/node-transformers/INodeTransformer'; -import { IOptions } from '../../interfaces/options/IOptions'; -import { IStorage } from '../../interfaces/storages/IStorage'; - -export type TNodeTransformer = (new (customNodesStorage: IStorage, options: IOptions) => INodeTransformer); diff --git a/src/types/storages/TControlFlowStorage.d.ts b/src/types/storages/TControlFlowStorage.d.ts index 6f7eff3f..333a448e 100644 --- a/src/types/storages/TControlFlowStorage.d.ts +++ b/src/types/storages/TControlFlowStorage.d.ts @@ -1,4 +1,4 @@ import { ICustomNode } from '../../interfaces/custom-nodes/ICustomNode'; import { IStorage } from '../../interfaces/storages/IStorage'; -export type TControlFlowStorage = IStorage; +export type TControlFlowStorage = IStorage ; diff --git a/src/types/storages/TCustomNodeGroupStorage.d.ts b/src/types/storages/TCustomNodeGroupStorage.d.ts index e5dfd0f7..2fe6ff58 100644 --- a/src/types/storages/TCustomNodeGroupStorage.d.ts +++ b/src/types/storages/TCustomNodeGroupStorage.d.ts @@ -1,4 +1,4 @@ import { ICustomNodeGroup } from '../../interfaces/custom-nodes/ICustomNodeGroup'; import { IStorage } from '../../interfaces/storages/IStorage'; -export type TCustomNodeGroupStorage = IStorage; +export type TCustomNodeGroupStorage = IStorage ; diff --git a/src/types/storages/TStringArrayStorage.d.ts b/src/types/storages/TStringArrayStorage.d.ts index 0e021e79..2868c135 100644 --- a/src/types/storages/TStringArrayStorage.d.ts +++ b/src/types/storages/TStringArrayStorage.d.ts @@ -1,3 +1,3 @@ import { IStorage } from '../../interfaces/storages/IStorage'; -export type TStringArrayStorage = IStorage; +export type TStringArrayStorage = IStorage ;