From 34d1e9593777885ca7a115c3480cb94eb7da8e89 Mon Sep 17 00:00:00 2001 From: sanex3339 Date: Sun, 18 Dec 2016 14:37:40 +0300 Subject: [PATCH] moving presets to the `options` folder BinaryExpressionControlFlowReplacer spec: increased samples count --- dist/index.js | 26 +++++++++---------- src/cli/JavaScriptObfuscatorCLI.ts | 2 +- .../NodeCallsControllerFunctionNode.ts | 2 +- .../SelfDefendingUnicodeNode.ts | 2 +- .../StringArrayCallsWrapper.ts | 2 +- .../StringArrayRotateFunctionNode.ts | 2 +- src/options/Options.ts | 2 +- .../presets/Default.ts} | 4 +-- .../presets/NoCustomNodes.ts} | 4 +-- .../JavaScriptObfuscator.spec.ts | 3 ++- .../JavaScriptObfuscatorInternal.spec.ts | 2 +- ...ConsoleOutputDisableExpressionNode.spec.ts | 2 +- .../domain-lock-nodes/DomainLockNode.spec.ts | 2 +- .../StringArrayCallsWrapper.spec.ts | 2 +- .../StringArrayNode.spec.ts | 2 +- .../StringArrayRotateFunctionNode.spec.ts | 2 +- ...inaryExpressionControlFlowReplacer.spec.ts | 10 ++++--- .../CatchClauseObfuscator.spec.ts | 2 +- .../FunctionDeclarationObfuscator.spec.ts | 2 +- .../FunctionObfuscator.spec.ts | 2 +- .../LabeledStatementObfuscator.spec.ts | 2 +- .../LiteralObfuscator.spec.ts | 2 +- .../MemberExpressionObfuscator.spec.ts | 2 +- .../MethodDefinitionObfuscator.spec.ts | 2 +- .../ObjectExpressionObfuscator.spec.ts | 2 +- .../VariableDeclarationObfuscator.spec.ts | 2 +- .../options/OptionsNormalizer.spec.ts | 2 +- 27 files changed, 47 insertions(+), 44 deletions(-) rename src/{preset-options/DefaultPreset.ts => options/presets/Default.ts} (82%) rename src/{preset-options/NoCustomNodesPreset.ts => options/presets/NoCustomNodes.ts} (82%) diff --git a/dist/index.js b/dist/index.js index 00650515..0b3541c5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1932,7 +1932,7 @@ var commander = __webpack_require__(118); var path = __webpack_require__(36); var SourceMapMode_1 = __webpack_require__(20); var StringArrayEncoding_1 = __webpack_require__(23); -var DefaultPreset_1 = __webpack_require__(31); +var Default_1 = __webpack_require__(31); var CLIUtils_1 = __webpack_require__(41); var JavaScriptObfuscator_1 = __webpack_require__(16); @@ -1962,7 +1962,7 @@ var JavaScriptObfuscatorCLI = function () { key: "buildOptions", value: function buildOptions() { var inputOptions = {}; - var availableOptions = Object.keys(DefaultPreset_1.DEFAULT_PRESET); + var availableOptions = Object.keys(Default_1.DEFAULT_PRESET); for (var option in this.commands) { if (!this.commands.hasOwnProperty(option)) { continue; @@ -1972,7 +1972,7 @@ var JavaScriptObfuscatorCLI = function () { } inputOptions[option] = this.commands[option]; } - return tslib_1.__assign({}, DefaultPreset_1.DEFAULT_PRESET, inputOptions); + return tslib_1.__assign({}, Default_1.DEFAULT_PRESET, inputOptions); } }, { key: "configureCommands", @@ -3054,7 +3054,7 @@ var format = __webpack_require__(10); var ObfuscationEvents_1 = __webpack_require__(15); var Initializable_1 = __webpack_require__(4); var SingleNodeCallControllerTemplate_1 = __webpack_require__(99); -var NoCustomNodesPreset_1 = __webpack_require__(22); +var NoCustomNodes_1 = __webpack_require__(22); var AbstractCustomNode_1 = __webpack_require__(8); var JavaScriptObfuscator_1 = __webpack_require__(16); var NodeCallsControllerFunctionNode = function (_AbstractCustomNode_) { @@ -3078,7 +3078,7 @@ var NodeCallsControllerFunctionNode = function (_AbstractCustomNode_) { if (this.appendEvent === ObfuscationEvents_1.ObfuscationEvents.AfterObfuscation) { return JavaScriptObfuscator_1.JavaScriptObfuscator.obfuscate(format(SingleNodeCallControllerTemplate_1.SingleNodeCallControllerTemplate(), { singleNodeCallControllerFunctionName: this.callsControllerFunctionName - }), tslib_1.__assign({}, NoCustomNodesPreset_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode(); + }), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode(); } return format(SingleNodeCallControllerTemplate_1.SingleNodeCallControllerTemplate(), { singleNodeCallControllerFunctionName: this.callsControllerFunctionName @@ -3113,7 +3113,7 @@ var inversify_1 = __webpack_require__(0); var ServiceIdentifiers_1 = __webpack_require__(2); var format = __webpack_require__(10); var Initializable_1 = __webpack_require__(4); -var NoCustomNodesPreset_1 = __webpack_require__(22); +var NoCustomNodes_1 = __webpack_require__(22); var SelfDefendingTemplate_1 = __webpack_require__(108); var AbstractCustomNode_1 = __webpack_require__(8); var JavaScriptObfuscator_1 = __webpack_require__(16); @@ -3138,7 +3138,7 @@ var SelfDefendingUnicodeNode = function (_AbstractCustomNode_) { return JavaScriptObfuscator_1.JavaScriptObfuscator.obfuscate(format(SelfDefendingTemplate_1.SelfDefendingTemplate(), { selfDefendingFunctionName: RandomGeneratorUtils_1.RandomGeneratorUtils.getRandomVariableName(), singleNodeCallControllerFunctionName: this.callsControllerFunctionName - }), tslib_1.__assign({}, NoCustomNodesPreset_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode(); + }), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode(); } }]); @@ -3247,7 +3247,7 @@ var ServiceIdentifiers_1 = __webpack_require__(2); var format = __webpack_require__(10); var StringArrayEncoding_1 = __webpack_require__(23); var Initializable_1 = __webpack_require__(4); -var NoCustomNodesPreset_1 = __webpack_require__(22); +var NoCustomNodes_1 = __webpack_require__(22); var AtobTemplate_1 = __webpack_require__(97); var Rc4Template_1 = __webpack_require__(98); var SelfDefendingTemplate_1 = __webpack_require__(109); @@ -3310,7 +3310,7 @@ var StringArrayCallsWrapper = function (_AbstractCustomNode_) { decodeNodeTemplate: decodeNodeTemplate, stringArrayCallsWrapperName: this.stringArrayCallsWrapperName, stringArrayName: this.stringArrayName - }), tslib_1.__assign({}, NoCustomNodesPreset_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode(); + }), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode(); } }]); @@ -3406,7 +3406,7 @@ var inversify_1 = __webpack_require__(0); var ServiceIdentifiers_1 = __webpack_require__(2); var format = __webpack_require__(10); var Initializable_1 = __webpack_require__(4); -var NoCustomNodesPreset_1 = __webpack_require__(22); +var NoCustomNodes_1 = __webpack_require__(22); var SelfDefendingTemplate_1 = __webpack_require__(114); var StringArrayRotateFunctionTemplate_1 = __webpack_require__(115); var AbstractCustomNode_1 = __webpack_require__(8); @@ -3449,7 +3449,7 @@ var StringArrayRotateFunctionNode = function (_AbstractCustomNode_) { stringArrayName: this.stringArrayName, stringArrayRotateValue: Utils_1.Utils.decToHex(this.stringArrayRotateValue), whileFunctionName: whileFunctionName - }), tslib_1.__assign({}, NoCustomNodesPreset_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode(); + }), tslib_1.__assign({}, NoCustomNodes_1.NO_CUSTOM_NODES_PRESET, { seed: this.options.seed })).getObfuscatedCode(); } }]); @@ -4804,13 +4804,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons var tslib_1 = __webpack_require__(1); var inversify_1 = __webpack_require__(0); var class_validator_1 = __webpack_require__(117); -var DefaultPreset_1 = __webpack_require__(31); +var Default_1 = __webpack_require__(31); var OptionsNormalizer_1 = __webpack_require__(87); var ValidationErrorsFormatter_1 = __webpack_require__(88); var Options = Options_1 = function Options(inputOptions) { _classCallCheck(this, Options); - Object.assign(this, DefaultPreset_1.DEFAULT_PRESET, inputOptions); + Object.assign(this, Default_1.DEFAULT_PRESET, inputOptions); var errors = class_validator_1.validateSync(this, Options_1.validatorOptions); if (errors.length) { throw new ReferenceError("Validation failed. errors:\n" + ValidationErrorsFormatter_1.ValidationErrorsFormatter.format(errors)); diff --git a/src/cli/JavaScriptObfuscatorCLI.ts b/src/cli/JavaScriptObfuscatorCLI.ts index 45468abc..b146b5d7 100644 --- a/src/cli/JavaScriptObfuscatorCLI.ts +++ b/src/cli/JavaScriptObfuscatorCLI.ts @@ -9,7 +9,7 @@ import { IObfuscationResult } from '../interfaces/IObfuscationResult'; import { SourceMapMode } from '../enums/SourceMapMode'; import { StringArrayEncoding } from '../enums/StringArrayEncoding'; -import { DEFAULT_PRESET } from '../preset-options/DefaultPreset'; +import { DEFAULT_PRESET } from '../options/presets/Default'; import { CLIUtils } from './CLIUtils'; import { JavaScriptObfuscator } from '../JavaScriptObfuscator'; diff --git a/src/custom-nodes/node-calls-controller-nodes/NodeCallsControllerFunctionNode.ts b/src/custom-nodes/node-calls-controller-nodes/NodeCallsControllerFunctionNode.ts index 725fe919..1714d0fc 100644 --- a/src/custom-nodes/node-calls-controller-nodes/NodeCallsControllerFunctionNode.ts +++ b/src/custom-nodes/node-calls-controller-nodes/NodeCallsControllerFunctionNode.ts @@ -13,7 +13,7 @@ import { initializable } from '../../decorators/Initializable'; import { SingleNodeCallControllerTemplate } from '../../templates/custom-nodes/SingleNodeCallControllerTemplate'; -import { NO_CUSTOM_NODES_PRESET } from '../../preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../options/presets/NoCustomNodes'; import { AbstractCustomNode } from '../AbstractCustomNode'; import { JavaScriptObfuscator } from '../../JavaScriptObfuscator'; diff --git a/src/custom-nodes/self-defending-nodes/SelfDefendingUnicodeNode.ts b/src/custom-nodes/self-defending-nodes/SelfDefendingUnicodeNode.ts index 91f7f724..2daf1f1d 100644 --- a/src/custom-nodes/self-defending-nodes/SelfDefendingUnicodeNode.ts +++ b/src/custom-nodes/self-defending-nodes/SelfDefendingUnicodeNode.ts @@ -7,7 +7,7 @@ import { IOptions } from '../../interfaces/options/IOptions'; import { initializable } from '../../decorators/Initializable'; -import { NO_CUSTOM_NODES_PRESET } from '../../preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../options/presets/NoCustomNodes'; import { SelfDefendingTemplate } from '../../templates/custom-nodes/self-defending-nodes/self-defending-unicode-node/SelfDefendingTemplate'; diff --git a/src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts b/src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts index f87885e1..e557c516 100644 --- a/src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts +++ b/src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts @@ -10,7 +10,7 @@ import { StringArrayEncoding } from '../../enums/StringArrayEncoding'; import { initializable } from '../../decorators/Initializable'; -import { NO_CUSTOM_NODES_PRESET } from '../../preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../options/presets/NoCustomNodes'; import { AtobTemplate } from '../../templates/custom-nodes/AtobTemplate'; import { Rc4Template } from '../../templates/custom-nodes/Rc4Template'; diff --git a/src/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.ts b/src/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.ts index 32eecdbb..8f6fdacc 100644 --- a/src/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.ts +++ b/src/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.ts @@ -8,7 +8,7 @@ import { IStorage } from '../../interfaces/storages/IStorage'; import { initializable } from '../../decorators/Initializable'; -import { NO_CUSTOM_NODES_PRESET } from '../../preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../options/presets/NoCustomNodes'; import { SelfDefendingTemplate } from '../../templates/custom-nodes/string-array-nodes/string-array-rotate-function-node/SelfDefendingTemplate'; import { StringArrayRotateFunctionTemplate } from '../../templates/custom-nodes/string-array-nodes/string-array-rotate-function-node/StringArrayRotateFunctionTemplate'; diff --git a/src/options/Options.ts b/src/options/Options.ts index 97adf9ec..577b864a 100644 --- a/src/options/Options.ts +++ b/src/options/Options.ts @@ -23,7 +23,7 @@ import { IOptions } from '../interfaces/options/IOptions'; import { TSourceMapMode } from '../types/TSourceMapMode'; import { TStringArrayEncoding } from '../types/options/TStringArrayEncoding'; -import { DEFAULT_PRESET } from '../preset-options/DefaultPreset'; +import { DEFAULT_PRESET } from './presets/Default'; import { OptionsNormalizer } from './OptionsNormalizer'; import { ValidationErrorsFormatter } from './ValidationErrorsFormatter'; diff --git a/src/preset-options/DefaultPreset.ts b/src/options/presets/Default.ts similarity index 82% rename from src/preset-options/DefaultPreset.ts rename to src/options/presets/Default.ts index a0e431d4..4fffe922 100644 --- a/src/preset-options/DefaultPreset.ts +++ b/src/options/presets/Default.ts @@ -1,6 +1,6 @@ -import { TInputOptions } from '../types/options/TInputOptions'; +import { TInputOptions } from '../../types/options/TInputOptions'; -import { SourceMapMode } from '../enums/SourceMapMode'; +import { SourceMapMode } from '../../enums/SourceMapMode'; export const DEFAULT_PRESET: TInputOptions = Object.freeze({ compact: true, diff --git a/src/preset-options/NoCustomNodesPreset.ts b/src/options/presets/NoCustomNodes.ts similarity index 82% rename from src/preset-options/NoCustomNodesPreset.ts rename to src/options/presets/NoCustomNodes.ts index 327838ea..cd2ebd3b 100644 --- a/src/preset-options/NoCustomNodesPreset.ts +++ b/src/options/presets/NoCustomNodes.ts @@ -1,6 +1,6 @@ -import { TInputOptions } from '../types/options/TInputOptions'; +import { TInputOptions } from '../../types/options/TInputOptions'; -import { SourceMapMode } from '../enums/SourceMapMode'; +import { SourceMapMode } from '../../enums/SourceMapMode'; export const NO_CUSTOM_NODES_PRESET: TInputOptions = Object.freeze({ compact: true, diff --git a/test/functional-tests/JavaScriptObfuscator.spec.ts b/test/functional-tests/JavaScriptObfuscator.spec.ts index 67f63184..437392f6 100644 --- a/test/functional-tests/JavaScriptObfuscator.spec.ts +++ b/test/functional-tests/JavaScriptObfuscator.spec.ts @@ -6,7 +6,8 @@ import { IObfuscationResult } from '../../src/interfaces/IObfuscationResult'; import { JavaScriptObfuscator } from '../../src/JavaScriptObfuscator'; -import { NO_CUSTOM_NODES_PRESET } from '../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../src/options/presets/NoCustomNodes'; + import { readFileAsString } from '../helpers/readFileAsString'; import { RandomGeneratorUtils } from '../../src/utils/RandomGeneratorUtils'; diff --git a/test/functional-tests/JavaScriptObfuscatorInternal.spec.ts b/test/functional-tests/JavaScriptObfuscatorInternal.spec.ts index fc75e99d..69b02200 100644 --- a/test/functional-tests/JavaScriptObfuscatorInternal.spec.ts +++ b/test/functional-tests/JavaScriptObfuscatorInternal.spec.ts @@ -6,7 +6,7 @@ import { IInversifyContainerFacade } from '../../src/interfaces/container/IInver import { IJavaScriptObfuscator } from '../../src/interfaces/IJavaScriptObfsucator'; import { IObfuscationResult } from '../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../src/options/presets/NoCustomNodes'; import { InversifyContainerFacade } from '../../src/container/InversifyContainerFacade'; diff --git a/test/functional-tests/custom-nodes/console-output-nodes/ConsoleOutputDisableExpressionNode.spec.ts b/test/functional-tests/custom-nodes/console-output-nodes/ConsoleOutputDisableExpressionNode.spec.ts index 11a34d38..6f6edd3c 100644 --- a/test/functional-tests/custom-nodes/console-output-nodes/ConsoleOutputDisableExpressionNode.spec.ts +++ b/test/functional-tests/custom-nodes/console-output-nodes/ConsoleOutputDisableExpressionNode.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/custom-nodes/domain-lock-nodes/DomainLockNode.spec.ts b/test/functional-tests/custom-nodes/domain-lock-nodes/DomainLockNode.spec.ts index bee6314d..946316b1 100644 --- a/test/functional-tests/custom-nodes/domain-lock-nodes/DomainLockNode.spec.ts +++ b/test/functional-tests/custom-nodes/domain-lock-nodes/DomainLockNode.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/custom-nodes/string-array-nodes/StringArrayCallsWrapper.spec.ts b/test/functional-tests/custom-nodes/string-array-nodes/StringArrayCallsWrapper.spec.ts index e4e60052..56287a93 100644 --- a/test/functional-tests/custom-nodes/string-array-nodes/StringArrayCallsWrapper.spec.ts +++ b/test/functional-tests/custom-nodes/string-array-nodes/StringArrayCallsWrapper.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/custom-nodes/string-array-nodes/StringArrayNode.spec.ts b/test/functional-tests/custom-nodes/string-array-nodes/StringArrayNode.spec.ts index 3db50384..1914f291 100644 --- a/test/functional-tests/custom-nodes/string-array-nodes/StringArrayNode.spec.ts +++ b/test/functional-tests/custom-nodes/string-array-nodes/StringArrayNode.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.spec.ts b/test/functional-tests/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.spec.ts index 76bf39a8..20ef9e6e 100644 --- a/test/functional-tests/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.spec.ts +++ b/test/functional-tests/custom-nodes/string-array-nodes/StringArrayRotateFunctionNode.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/node-transformers/node-control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.spec.ts b/test/functional-tests/node-transformers/node-control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.spec.ts index 2c9e02a6..62f631bc 100644 --- a/test/functional-tests/node-transformers/node-control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.spec.ts +++ b/test/functional-tests/node-transformers/node-control-flow-transformers/control-flow-replacers/BinaryExpressionControlFlowReplacer.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../../src/options/presets/NoCustomNodes'; import { readFileAsString } from '../../../../helpers/readFileAsString'; @@ -30,10 +30,12 @@ describe('BinaryExpressionControlFlowReplacer', () => { }); describe('variant #2 - multiple binary expressions with threshold = 1', () => { - it('should replace binary expression node by call to control flow storage node', () => { - const samplesCount: number = 100; + it('should replace binary expression node by call to control flow storage node', function () { + this.timeout(4000); + + const samplesCount: number = 200; const expectedValue: number = 0.5; - const delta: number = 0.08; + const delta: number = 0.06; let equalsValue: number = 0; diff --git a/test/functional-tests/node-transformers/node-obfuscators/CatchClauseObfuscator.spec.ts b/test/functional-tests/node-transformers/node-obfuscators/CatchClauseObfuscator.spec.ts index cb627882..948567a0 100644 --- a/test/functional-tests/node-transformers/node-obfuscators/CatchClauseObfuscator.spec.ts +++ b/test/functional-tests/node-transformers/node-obfuscators/CatchClauseObfuscator.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { readFileAsString } from '../../../helpers/readFileAsString'; diff --git a/test/functional-tests/node-transformers/node-obfuscators/FunctionDeclarationObfuscator.spec.ts b/test/functional-tests/node-transformers/node-obfuscators/FunctionDeclarationObfuscator.spec.ts index 654dd631..f62c9769 100644 --- a/test/functional-tests/node-transformers/node-obfuscators/FunctionDeclarationObfuscator.spec.ts +++ b/test/functional-tests/node-transformers/node-obfuscators/FunctionDeclarationObfuscator.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/node-transformers/node-obfuscators/FunctionObfuscator.spec.ts b/test/functional-tests/node-transformers/node-obfuscators/FunctionObfuscator.spec.ts index 01b51305..eac8171c 100644 --- a/test/functional-tests/node-transformers/node-obfuscators/FunctionObfuscator.spec.ts +++ b/test/functional-tests/node-transformers/node-obfuscators/FunctionObfuscator.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/node-transformers/node-obfuscators/LabeledStatementObfuscator.spec.ts b/test/functional-tests/node-transformers/node-obfuscators/LabeledStatementObfuscator.spec.ts index a74fa29e..dc7f0d9a 100644 --- a/test/functional-tests/node-transformers/node-obfuscators/LabeledStatementObfuscator.spec.ts +++ b/test/functional-tests/node-transformers/node-obfuscators/LabeledStatementObfuscator.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { readFileAsString } from '../../../helpers/readFileAsString'; diff --git a/test/functional-tests/node-transformers/node-obfuscators/LiteralObfuscator.spec.ts b/test/functional-tests/node-transformers/node-obfuscators/LiteralObfuscator.spec.ts index edc710db..669a2601 100644 --- a/test/functional-tests/node-transformers/node-obfuscators/LiteralObfuscator.spec.ts +++ b/test/functional-tests/node-transformers/node-obfuscators/LiteralObfuscator.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/node-transformers/node-obfuscators/MemberExpressionObfuscator.spec.ts b/test/functional-tests/node-transformers/node-obfuscators/MemberExpressionObfuscator.spec.ts index 946998fe..7f2b3dac 100644 --- a/test/functional-tests/node-transformers/node-obfuscators/MemberExpressionObfuscator.spec.ts +++ b/test/functional-tests/node-transformers/node-obfuscators/MemberExpressionObfuscator.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/node-transformers/node-obfuscators/MethodDefinitionObfuscator.spec.ts b/test/functional-tests/node-transformers/node-obfuscators/MethodDefinitionObfuscator.spec.ts index 797f5794..2a5d10d4 100644 --- a/test/functional-tests/node-transformers/node-obfuscators/MethodDefinitionObfuscator.spec.ts +++ b/test/functional-tests/node-transformers/node-obfuscators/MethodDefinitionObfuscator.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/node-transformers/node-obfuscators/ObjectExpressionObfuscator.spec.ts b/test/functional-tests/node-transformers/node-obfuscators/ObjectExpressionObfuscator.spec.ts index e35514e0..b5f96cf1 100644 --- a/test/functional-tests/node-transformers/node-obfuscators/ObjectExpressionObfuscator.spec.ts +++ b/test/functional-tests/node-transformers/node-obfuscators/ObjectExpressionObfuscator.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/functional-tests/node-transformers/node-obfuscators/VariableDeclarationObfuscator.spec.ts b/test/functional-tests/node-transformers/node-obfuscators/VariableDeclarationObfuscator.spec.ts index 6bdbe0e7..18f1d6fc 100644 --- a/test/functional-tests/node-transformers/node-obfuscators/VariableDeclarationObfuscator.spec.ts +++ b/test/functional-tests/node-transformers/node-obfuscators/VariableDeclarationObfuscator.spec.ts @@ -2,7 +2,7 @@ import { assert } from 'chai'; import { IObfuscationResult } from '../../../../src/interfaces/IObfuscationResult'; -import { NO_CUSTOM_NODES_PRESET } from '../../../../src/preset-options/NoCustomNodesPreset'; +import { NO_CUSTOM_NODES_PRESET } from '../../../../src/options/presets/NoCustomNodes'; import { JavaScriptObfuscator } from '../../../../src/JavaScriptObfuscator'; diff --git a/test/unit-tests/options/OptionsNormalizer.spec.ts b/test/unit-tests/options/OptionsNormalizer.spec.ts index f004fcf6..42db235f 100644 --- a/test/unit-tests/options/OptionsNormalizer.spec.ts +++ b/test/unit-tests/options/OptionsNormalizer.spec.ts @@ -4,7 +4,7 @@ import { TInputOptions } from '../../../src/types/options/TInputOptions'; import { IOptions } from '../../../src/interfaces/options/IOptions'; -import { DEFAULT_PRESET } from '../../../src/preset-options/DefaultPreset'; +import { DEFAULT_PRESET } from '../../../src/options/presets/Default'; import { Options } from '../../../src/options/Options'; import { OptionsNormalizer } from '../../../src/options/OptionsNormalizer';