Procházet zdrojové kódy

Renamed option: minify -> simplify

sanex3339 před 4 roky
rodič
revize
87e23748f0
61 změnil soubory, kde provedl 108 přidání a 110 odebrání
  1. 1 1
      CHANGELOG.md
  2. 7 9
      README.md
  3. 0 0
      dist/index.browser.js
  4. 0 0
      dist/index.cli.js
  5. 0 0
      dist/index.js
  6. 2 2
      package.json
  7. 2 2
      src/JavaScriptObfuscator.ts
  8. 4 4
      src/cli/JavaScriptObfuscatorCLI.ts
  9. 2 2
      src/container/InversifyContainerFacade.ts
  10. 4 4
      src/container/modules/node-transformers/SimplifyingTransformersModule.ts
  11. 1 1
      src/enums/node-transformers/NodeTransformationStage.ts
  12. 0 0
      src/interfaces/node-transformers/simplifying-transformers/IIfStatementIteratedStatementsData.ts
  13. 0 0
      src/interfaces/node-transformers/simplifying-transformers/IIfStatementSimplifyData.ts
  14. 1 1
      src/interfaces/options/IOptions.ts
  15. 1 1
      src/node-transformers/rename-properties-transformers/RenamePropertiesTransformer.ts
  16. 3 3
      src/node-transformers/simplifying-transformers/IfStatementSimplifyTransformer.ts
  17. 1 1
      src/node-transformers/simplifying-transformers/VariableDeclarationsMergeTransformer.ts
  18. 6 6
      src/options/Options.ts
  19. 1 1
      src/options/presets/Default.ts
  20. 1 1
      src/options/presets/NoCustomNodes.ts
  21. 1 1
      test/dev/dev.ts
  22. 1 1
      test/functional-tests/javascript-obfuscator/JavaScriptObfuscator.spec.ts
  23. 27 27
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/IfStatementSimplifyTransformer.spec.ts
  24. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-alternate-return-multiple-statements.js
  25. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-alternate-return-single-statement.js
  26. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-consequent-return-multiple-statements.js
  27. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-consequent-return-single-statement.js
  28. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-no-return-multiple-statements.js
  29. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-no-return-single-statement.js
  30. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-return-multiple-statements.js
  31. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-return-single-statement.js
  32. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-no-return-multiple-statements.js
  33. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-no-return-single-statement.js
  34. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-return-multiple-statements.js
  35. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-return-single-statement.js
  36. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/function-declaration-as-prohibited-single-statement.js
  37. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/if-statement-as-prohibited-single-statement.js
  38. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-alternate-return-multiple-statements.js
  39. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-alternate-return-single-statement.js
  40. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-consequent-return-multiple-statements.js
  41. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-consequent-return-single-statement.js
  42. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-mixed-statements-1.js
  43. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-mixed-statements-2.js
  44. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-multiple-statements.js
  45. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-single-statement.js
  46. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-return-multiple-statements.js
  47. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-only-no-return-multiple-statements.js
  48. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-only-no-return-single-statement.js
  49. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-only-return-multiple-statements.js
  50. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/variable-declarations-merge-transformer-integration-1.js
  51. 7 7
      test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/VariableDeclarationsMergeTransformer.spec.ts
  52. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/different-variables-kind.js
  53. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/multiple-declarations-with-multiple-declarators.js
  54. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/multiple-declarations-without-declarators.js
  55. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/multiple-declarations.js
  56. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/object-pattern-as-initializer.js
  57. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/single-declaration.js
  58. 0 0
      test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/splitted-declarations-with-other-statement.js
  59. 2 2
      test/index.spec.ts
  60. 1 1
      test/runtime-tests/JavaScriptObfuscatorRuntime.spec.ts
  61. 32 32
      yarn.lock

+ 1 - 1
CHANGELOG.md

@@ -2,7 +2,7 @@ Change Log
 
 v1.4.0
 ---
-* **New option:** `minify` enables code minification.
+* **New option:** `simplify` enables additional code obfuscation through simplification.
 
 v1.3.0
 ---

+ 7 - 9
README.md

@@ -329,7 +329,6 @@ Following options are available for the JS Obfuscator:
     identifiersPrefix: '',
     inputFileName: '',
     log: false,
-    minify: true,
     renameGlobals: false,
     renameProperties: false,
     reservedNames: [],
@@ -338,6 +337,7 @@ Following options are available for the JS Obfuscator:
     seed: 0,
     selfDefending: false,
     shuffleStringArray: true,
+    simplify: true,
     sourceMap: false,
     sourceMapBaseUrl: '',
     sourceMapFileName: '',
@@ -375,7 +375,6 @@ Following options are available for the JS Obfuscator:
     --identifiers-dictionary '<list>' (comma separated)
     --identifiers-prefix <string>
     --log <boolean>
-    --minify <boolean>
     --rename-globals <boolean>
     --rename-properties <boolean>
     --reserved-names '<list>' (comma separated)
@@ -384,6 +383,7 @@ Following options are available for the JS Obfuscator:
     --seed <string|number>
     --self-defending <boolean>
     --shuffle-string-array <boolean>
+    --simplify <boolean>
     --source-map <boolean>
     --source-map-base-url <string>
     --source-map-file-name <string>
@@ -666,12 +666,10 @@ Type: `boolean` Default: `false`
 
 Enables logging of the information to the console.
 
-### `minify`
+### `simplify`
 Type: `boolean` Default: `true`
 
-Enables code minification.
-
-##### :warning: this option doesn't affect identifier names.
+Enables additional code obfuscation through simplification.
 
 ### `renameGlobals`
 Type: `boolean` Default: `false`
@@ -956,11 +954,11 @@ Performance will 50-100% slower than without obfuscation
     disableConsoleOutput: true,
     identifierNamesGenerator: 'hexadecimal',
     log: false,
-    minify: true,
     renameGlobals: false,
     rotateStringArray: true,
     selfDefending: true,
     shuffleStringArray: true,
+    simplify: true,
     splitStrings: true,
     splitStringsChunkLength: 5,
     stringArray: true,
@@ -987,11 +985,11 @@ Performance will 30-35% slower than without obfuscation
     disableConsoleOutput: true,
     identifierNamesGenerator: 'hexadecimal',
     log: false,
-    minify: true,
     renameGlobals: false,
     rotateStringArray: true,
     selfDefending: true,
     shuffleStringArray: true,
+    simplify: true,
     splitStrings: true,
     splitStringsChunkLength: 10,
     stringArray: true,
@@ -1016,11 +1014,11 @@ Performance will slightly slower than without obfuscation
     disableConsoleOutput: true,
     identifierNamesGenerator: 'hexadecimal',
     log: false,
-    minify: true,
     renameGlobals: false,
     rotateStringArray: true,
     selfDefending: true,
     shuffleStringArray: true,
+    simplify: true,
     splitStrings: false,
     stringArray: true,
     stringArrayEncoding: false,

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/index.browser.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/index.cli.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/index.js


+ 2 - 2
package.json

@@ -59,8 +59,8 @@
     "@types/sinon": "9.0.4",
     "@types/string-template": "1.0.2",
     "@types/webpack-env": "1.15.2",
-    "@typescript-eslint/eslint-plugin": "3.5.0",
-    "@typescript-eslint/parser": "3.5.0",
+    "@typescript-eslint/eslint-plugin": "3.6.0",
+    "@typescript-eslint/parser": "3.6.0",
     "chai": "4.2.0",
     "coveralls": "3.1.0",
     "eslint": "7.4.0",

+ 2 - 2
src/JavaScriptObfuscator.ts

@@ -218,8 +218,8 @@ export class JavaScriptObfuscator implements IJavaScriptObfuscator {
         astTree = this.runNodeTransformationStage(astTree, NodeTransformationStage.Converting);
         astTree = this.runNodeTransformationStage(astTree, NodeTransformationStage.Obfuscating);
 
-        if (this.options.minify) {
-            astTree = this.runNodeTransformationStage(astTree, NodeTransformationStage.Minification);
+        if (this.options.simplify) {
+            astTree = this.runNodeTransformationStage(astTree, NodeTransformationStage.Simplifying);
         }
 
         astTree = this.runNodeTransformationStage(astTree, NodeTransformationStage.Finalizing);

+ 4 - 4
src/cli/JavaScriptObfuscatorCLI.ts

@@ -249,10 +249,6 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
                 '--log <boolean>', 'Enables logging of the information to the console',
                 BooleanSanitizer
             )
-            .option(
-                '--minify <boolean>', 'Enables code minification',
-                BooleanSanitizer
-            )
             .option(
                 '--reserved-names <list> (comma separated, without whitespaces)',
                 'Disables obfuscation and generation of identifiers, which being matched by passed RegExp patterns (comma separated)',
@@ -289,6 +285,10 @@ export class JavaScriptObfuscatorCLI implements IInitializable {
                 '--shuffle-string-array <boolean>', 'Randomly shuffles string array items',
                 BooleanSanitizer
             )
+            .option(
+                '--simplify <boolean>', 'Enables additional code obfuscation through simplification',
+                BooleanSanitizer
+            )
             .option(
                 '--source-map <boolean>',
                 'Enables source map generation',

+ 2 - 2
src/container/InversifyContainerFacade.ts

@@ -10,13 +10,13 @@ import { customNodesModule } from './modules/custom-nodes/CustomNodesModule';
 import { finalizingTransformersModule } from './modules/node-transformers/FinalizingTransformersModule';
 import { generatorsModule } from './modules/generators/GeneratorsModule';
 import { initializingTransformersModule } from './modules/node-transformers/InitializingTransformersModule';
-import { minificationTransformersModule } from './modules/node-transformers/MinificationTransformersModule';
 import { nodeModule } from './modules/node/NodeModule';
 import { nodeTransformersModule } from './modules/node-transformers/NodeTransformersModule';
 import { obfuscatingTransformersModule } from './modules/node-transformers/ObfuscatingTransformersModule';
 import { optionsModule } from './modules/options/OptionsModule';
 import { preparingTransformersModule } from './modules/node-transformers/PreparingTransformersModule';
 import { renamePropertiesTransformersModule } from './modules/node-transformers/RenamePropertiesTransformersModule';
+import { simplifyingTransformersModule } from './modules/node-transformers/SimplifyingTransformersModule';
 import { storagesModule } from './modules/storages/StoragesModule';
 import { utilsModule } from './modules/utils/UtilsModule';
 
@@ -212,13 +212,13 @@ export class InversifyContainerFacade implements IInversifyContainerFacade {
         this.container.load(finalizingTransformersModule);
         this.container.load(generatorsModule);
         this.container.load(initializingTransformersModule);
-        this.container.load(minificationTransformersModule);
         this.container.load(nodeModule);
         this.container.load(nodeTransformersModule);
         this.container.load(obfuscatingTransformersModule);
         this.container.load(optionsModule);
         this.container.load(preparingTransformersModule);
         this.container.load(renamePropertiesTransformersModule);
+        this.container.load(simplifyingTransformersModule);
         this.container.load(storagesModule);
         this.container.load(utilsModule);
     }

+ 4 - 4
src/container/modules/node-transformers/MinificationTransformersModule.ts → src/container/modules/node-transformers/SimplifyingTransformersModule.ts

@@ -5,11 +5,11 @@ import { INodeTransformer } from '../../../interfaces/node-transformers/INodeTra
 
 import { NodeTransformer } from '../../../enums/node-transformers/NodeTransformer';
 
-import { IfStatementSimplifyTransformer } from '../../../node-transformers/minification-transformers/IfStatementSimplifyTransformer';
-import { VariableDeclarationsMergeTransformer } from '../../../node-transformers/minification-transformers/VariableDeclarationsMergeTransformer';
+import { IfStatementSimplifyTransformer } from '../../../node-transformers/simplifying-transformers/IfStatementSimplifyTransformer';
+import { VariableDeclarationsMergeTransformer } from '../../../node-transformers/simplifying-transformers/VariableDeclarationsMergeTransformer';
 
-export const minificationTransformersModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
-    // minification transformers
+export const simplifyingTransformersModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
+    // simplifying transformers
     bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
         .to(IfStatementSimplifyTransformer)
         .whenTargetNamed(NodeTransformer.IfStatementSimplifyTransformer);

+ 1 - 1
src/enums/node-transformers/NodeTransformationStage.ts

@@ -6,6 +6,6 @@ export enum NodeTransformationStage {
     RenameProperties = 'RenameProperties',
     Converting = 'Converting',
     Obfuscating = 'Obfuscating',
-    Minification = 'Minification',
+    Simplifying = 'Simplifying',
     Finalizing = 'Finalizing'
 }

+ 0 - 0
src/interfaces/node-transformers/minification-transformers/IIfStatementIteratedStatementsData.ts → src/interfaces/node-transformers/simplifying-transformers/IIfStatementIteratedStatementsData.ts


+ 0 - 0
src/interfaces/node-transformers/minification-transformers/IIfStatementSimplifyData.ts → src/interfaces/node-transformers/simplifying-transformers/IIfStatementSimplifyData.ts


+ 1 - 1
src/interfaces/options/IOptions.ts

@@ -21,7 +21,6 @@ export interface IOptions {
     readonly identifiersPrefix: string;
     readonly inputFileName: string;
     readonly log: boolean;
-    readonly minify: boolean;
     readonly renameGlobals: boolean;
     readonly renameProperties: boolean;
     readonly reservedNames: string[];
@@ -30,6 +29,7 @@ export interface IOptions {
     readonly seed: string | number;
     readonly selfDefending: boolean;
     readonly shuffleStringArray: boolean;
+    readonly simplify: boolean;
     readonly sourceMap: boolean;
     readonly sourceMapBaseUrl: string;
     readonly sourceMapFileName: string;

+ 1 - 1
src/node-transformers/rename-properties-transformers/RenamePropertiesTransformer.ts

@@ -42,7 +42,7 @@ export class RenamePropertiesTransformer extends AbstractNodeTransformer {
      */
     private static isValidPropertyNode<
         TNode extends ESTree.Property | ESTree.MemberExpression | ESTree.MethodDefinition
-    >(
+    > (
         propertyNode: TNode,
         propertyKeyNode: ESTree.Expression
     ): propertyKeyNode is ESTree.Identifier | ESTree.Literal {

+ 3 - 3
src/node-transformers/minification-transformers/IfStatementSimplifyTransformer.ts → src/node-transformers/simplifying-transformers/IfStatementSimplifyTransformer.ts

@@ -3,8 +3,8 @@ import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
 
 import * as ESTree from 'estree';
 
-import { IIfStatementSimplifyData } from '../../interfaces/node-transformers/minification-transformers/IIfStatementSimplifyData';
-import { IIfStatementIteratedStatementsData } from '../../interfaces/node-transformers/minification-transformers/IIfStatementIteratedStatementsData';
+import { IIfStatementSimplifyData } from '../../interfaces/node-transformers/simplifying-transformers/IIfStatementSimplifyData';
+import { IIfStatementIteratedStatementsData } from '../../interfaces/node-transformers/simplifying-transformers/IIfStatementIteratedStatementsData';
 import { IOptions } from '../../interfaces/options/IOptions';
 import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator';
 import { IVisitor } from '../../interfaces/node-transformers/IVisitor';
@@ -46,7 +46,7 @@ export class IfStatementSimplifyTransformer extends AbstractNodeTransformer {
      */
     public getVisitor (nodeTransformationStage: NodeTransformationStage): IVisitor | null {
         switch (nodeTransformationStage) {
-            case NodeTransformationStage.Minification:
+            case NodeTransformationStage.Simplifying:
                 return {
                     leave: (
                         node: ESTree.Node,

+ 1 - 1
src/node-transformers/minification-transformers/VariableDeclarationsMergeTransformer.ts → src/node-transformers/simplifying-transformers/VariableDeclarationsMergeTransformer.ts

@@ -44,7 +44,7 @@ export class VariableDeclarationsMergeTransformer extends AbstractNodeTransforme
      */
     public getVisitor (nodeTransformationStage: NodeTransformationStage): IVisitor | null {
         switch (nodeTransformationStage) {
-            case NodeTransformationStage.Minification:
+            case NodeTransformationStage.Simplifying:
                 return {
                     enter: (
                         node: ESTree.Node,

+ 6 - 6
src/options/Options.ts

@@ -150,12 +150,6 @@ export class Options implements IOptions {
     @IsBoolean()
     public readonly log!: boolean;
 
-    /**
-     * @type {boolean}
-     */
-    @IsBoolean()
-    public readonly minify!: boolean;
-
     /**
      * @type {boolean}
      */
@@ -206,6 +200,12 @@ export class Options implements IOptions {
     @IsBoolean()
     public readonly shuffleStringArray!: boolean;
 
+    /**
+     * @type {boolean}
+     */
+    @IsBoolean()
+    public readonly simplify!: boolean;
+
     /**
      * @type {boolean}
      */

+ 1 - 1
src/options/presets/Default.ts

@@ -21,7 +21,6 @@ export const DEFAULT_PRESET: TInputOptions = Object.freeze({
     identifiersDictionary: [],
     inputFileName: '',
     log: false,
-    minify: true,
     renameGlobals: false,
     renameProperties: false,
     reservedNames: [],
@@ -30,6 +29,7 @@ export const DEFAULT_PRESET: TInputOptions = Object.freeze({
     seed: 0,
     selfDefending: false,
     shuffleStringArray: true,
+    simplify: true,
     sourceMap: false,
     sourceMapBaseUrl: '',
     sourceMapFileName: '',

+ 1 - 1
src/options/presets/NoCustomNodes.ts

@@ -20,7 +20,6 @@ export const NO_ADDITIONAL_NODES_PRESET: TInputOptions = Object.freeze({
     identifiersDictionary: [],
     inputFileName: '',
     log: false,
-    minify: false,
     renameGlobals: false,
     renameProperties: false,
     reservedNames: [],
@@ -29,6 +28,7 @@ export const NO_ADDITIONAL_NODES_PRESET: TInputOptions = Object.freeze({
     seed: 0,
     selfDefending: false,
     shuffleStringArray: false,
+    simplify: false,
     sourceMap: false,
     sourceMapBaseUrl: '',
     sourceMapFileName: '',

+ 1 - 1
test/dev/dev.ts

@@ -20,7 +20,7 @@ import { NO_ADDITIONAL_NODES_PRESET } from '../../src/options/presets/NoCustomNo
         {
             ...NO_ADDITIONAL_NODES_PRESET,
             compact: false,
-            minify: true
+            simplify: true
         }
     ).getObfuscatedCode();
 

+ 1 - 1
test/functional-tests/javascript-obfuscator/JavaScriptObfuscator.spec.ts

@@ -789,7 +789,7 @@ describe('JavaScriptObfuscator', () => {
                         deadCodeInjection: true,
                         deadCodeInjectionThreshold: 1,
                         disableConsoleOutput: false,
-                        minify: true,
+                        simplify: true,
                         renameProperties: true,
                         rotateStringArray: true,
                         stringArray: true,

+ 27 - 27
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/IfStatementSimplifyTransformer.spec.ts → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/IfStatementSimplifyTransformer.spec.ts

@@ -25,7 +25,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -50,7 +50,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -78,7 +78,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -104,7 +104,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -135,7 +135,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -162,7 +162,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -192,7 +192,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -220,7 +220,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -250,7 +250,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -278,7 +278,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -307,7 +307,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -334,7 +334,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -366,7 +366,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -394,7 +394,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -424,7 +424,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -456,7 +456,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -488,7 +488,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -518,7 +518,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -548,7 +548,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -578,7 +578,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -610,7 +610,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -640,7 +640,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -672,7 +672,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -707,7 +707,7 @@ describe('IfStatementSimplifyTransformer', () => {
                             code,
                             {
                                 ...NO_ADDITIONAL_NODES_PRESET,
-                                minify: true
+                                simplify: true
                             }
                         ).getObfuscatedCode();
                     });
@@ -740,7 +740,7 @@ describe('IfStatementSimplifyTransformer', () => {
                         code,
                         {
                             ...NO_ADDITIONAL_NODES_PRESET,
-                            minify: true
+                            simplify: true
                         }
                     ).getObfuscatedCode();
                 });
@@ -771,7 +771,7 @@ describe('IfStatementSimplifyTransformer', () => {
                         code,
                         {
                             ...NO_ADDITIONAL_NODES_PRESET,
-                            minify: true
+                            simplify: true
                         }
                     ).getObfuscatedCode();
                 });
@@ -800,7 +800,7 @@ describe('IfStatementSimplifyTransformer', () => {
                         code,
                         {
                             ...NO_ADDITIONAL_NODES_PRESET,
-                            minify: true
+                            simplify: true
                         }
                     ).getObfuscatedCode();
                 });

+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-alternate-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-alternate-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-alternate-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-alternate-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-consequent-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-consequent-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-consequent-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-consequent-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-no-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-no-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-no-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-no-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-and-alternate-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-no-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-no-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-no-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-no-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/full-consequent-only-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/function-declaration-as-prohibited-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/function-declaration-as-prohibited-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/if-statement-as-prohibited-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/if-statement-as-prohibited-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-alternate-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-alternate-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-alternate-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-alternate-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-consequent-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-consequent-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-consequent-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-consequent-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-mixed-statements-1.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-mixed-statements-1.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-mixed-statements-2.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-mixed-statements-2.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-no-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-and-alternate-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-only-no-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-only-no-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-only-no-return-single-statement.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-only-no-return-single-statement.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-only-return-multiple-statements.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/partial-consequent-only-return-multiple-statements.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/fixtures/variable-declarations-merge-transformer-integration-1.js → test/functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/fixtures/variable-declarations-merge-transformer-integration-1.js


+ 7 - 7
test/functional-tests/node-transformers/minification-transformers/variable-declarations-merge-transformer/VariableDeclarationsMergeTransformer.spec.ts → test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/VariableDeclarationsMergeTransformer.spec.ts

@@ -23,7 +23,7 @@ describe('VariableDeclarationsMergeTransformer', () => {
                     code,
                     {
                         ...NO_ADDITIONAL_NODES_PRESET,
-                        minify: true
+                        simplify: true
                     }
                 ).getObfuscatedCode();
             });
@@ -50,7 +50,7 @@ describe('VariableDeclarationsMergeTransformer', () => {
                     code,
                     {
                         ...NO_ADDITIONAL_NODES_PRESET,
-                        minify: true
+                        simplify: true
                     }
                 ).getObfuscatedCode();
             });
@@ -77,7 +77,7 @@ describe('VariableDeclarationsMergeTransformer', () => {
                     code,
                     {
                         ...NO_ADDITIONAL_NODES_PRESET,
-                        minify: true
+                        simplify: true
                     }
                 ).getObfuscatedCode();
             });
@@ -105,7 +105,7 @@ describe('VariableDeclarationsMergeTransformer', () => {
                     code,
                     {
                         ...NO_ADDITIONAL_NODES_PRESET,
-                        minify: true
+                        simplify: true
                     }
                 ).getObfuscatedCode();
             });
@@ -132,7 +132,7 @@ describe('VariableDeclarationsMergeTransformer', () => {
                     code,
                     {
                         ...NO_ADDITIONAL_NODES_PRESET,
-                        minify: true
+                        simplify: true
                     }
                 ).getObfuscatedCode();
             });
@@ -159,7 +159,7 @@ describe('VariableDeclarationsMergeTransformer', () => {
                 code,
                 {
                     ...NO_ADDITIONAL_NODES_PRESET,
-                    minify: true
+                    simplify: true
                 }
             ).getObfuscatedCode();
         });
@@ -188,7 +188,7 @@ describe('VariableDeclarationsMergeTransformer', () => {
                 code,
                 {
                     ...NO_ADDITIONAL_NODES_PRESET,
-                    minify: true
+                    simplify: true
                 }
             ).getObfuscatedCode();
         });

+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/variable-declarations-merge-transformer/fixtures/different-variables-kind.js → test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/different-variables-kind.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/variable-declarations-merge-transformer/fixtures/multiple-declarations-with-multiple-declarators.js → test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/multiple-declarations-with-multiple-declarators.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/variable-declarations-merge-transformer/fixtures/multiple-declarations-without-declarators.js → test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/multiple-declarations-without-declarators.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/variable-declarations-merge-transformer/fixtures/multiple-declarations.js → test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/multiple-declarations.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/variable-declarations-merge-transformer/fixtures/object-pattern-as-initializer.js → test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/object-pattern-as-initializer.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/variable-declarations-merge-transformer/fixtures/single-declaration.js → test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/single-declaration.js


+ 0 - 0
test/functional-tests/node-transformers/minification-transformers/variable-declarations-merge-transformer/fixtures/splitted-declarations-with-other-statement.js → test/functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/fixtures/splitted-declarations-with-other-statement.js


+ 2 - 2
test/index.spec.ts

@@ -90,8 +90,8 @@ import './functional-tests/node-transformers/converting-transformers/split-strin
 import './functional-tests/node-transformers/converting-transformers/template-literal-transformer/TemplateLiteralTransformer.spec';
 import './functional-tests/node-transformers/dead-code-injection-transformers/DeadCodeInjectionTransformer.spec';
 import './functional-tests/node-transformers/initializing-transformers/comments-transformer/CommentsTransformer.spec';
-import './functional-tests/node-transformers/minification-transformers/if-statement-simplify-transformer/IfStatementSimplifyTransformer.spec';
-import './functional-tests/node-transformers/minification-transformers/variable-declarations-merge-transformer/VariableDeclarationsMergeTransformer.spec';
+import './functional-tests/node-transformers/simplifying-transformers/if-statement-simplify-transformer/IfStatementSimplifyTransformer.spec';
+import './functional-tests/node-transformers/simplifying-transformers/variable-declarations-merge-transformer/VariableDeclarationsMergeTransformer.spec';
 import './functional-tests/node-transformers/obfuscating-transformers/labeled-statement-transformer/LabeledStatementTransformer.spec';
 import './functional-tests/node-transformers/obfuscating-transformers/literal-transformer/LiteralTransformer.spec';
 import './functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/catch-clause/CatchClause.spec';

+ 1 - 1
test/runtime-tests/JavaScriptObfuscatorRuntime.spec.ts

@@ -25,7 +25,7 @@ describe('JavaScriptObfuscator runtime eval', function () {
         debugProtection: true,
         disableConsoleOutput: true,
         domainLock: ['obfuscator.io'],
-        minify: true,
+        simplify: true,
         renameProperties: true,
         reservedNames: ['generate', 'sha256'],
         rotateStringArray: true,

+ 32 - 32
yarn.lock

@@ -419,52 +419,52 @@
   resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.2.tgz#927997342bb9f4a5185a86e6579a0a18afc33b0a"
   integrity sha512-67ZgZpAlhIICIdfQrB5fnDvaKFcDxpKibxznfYRVAT4mQE41Dido/3Ty+E3xGBmTogc5+0Qb8tWhna+5B8z1iQ==
 
-"@typescript-eslint/eslint-plugin@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.5.0.tgz#e7736e0808b5fb947a5f9dd949ae6736a7226b84"
-  integrity sha512-m4erZ8AkSjoIUOf8s4k2V1xdL2c1Vy0D3dN6/jC9d7+nEqjY3gxXCkgi3gW/GAxPaA4hV8biaCoTVdQmfAeTCQ==
+"@typescript-eslint/eslint-plugin@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.6.0.tgz#ba2b6cae478b8fca3f2e58ff1313e4198eea2d8a"
+  integrity sha512-ubHlHVt1lsPQB/CZdEov9XuOFhNG9YRC//kuiS1cMQI6Bs1SsqKrEmZnpgRwthGR09/kEDtr9MywlqXyyYd8GA==
   dependencies:
-    "@typescript-eslint/experimental-utils" "3.5.0"
+    "@typescript-eslint/experimental-utils" "3.6.0"
     debug "^4.1.1"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.5.0.tgz#d09f9ffb890d1b15a7ffa9975fae92eee05597c4"
-  integrity sha512-zGNOrVi5Wz0jcjUnFZ6QUD0MCox5hBuVwemGCew2qJzUX5xPoyR+0EzS5qD5qQXL/vnQ8Eu+nv03tpeFRwLrDg==
+"@typescript-eslint/experimental-utils@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.6.0.tgz#0138152d66e3e53a6340f606793fb257bf2d76a1"
+  integrity sha512-4Vdf2hvYMUnTdkCNZu+yYlFtL2v+N2R7JOynIOkFbPjf9o9wQvRwRkzUdWlFd2YiiUwJLbuuLnl5civNg5ykOQ==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/types" "3.5.0"
-    "@typescript-eslint/typescript-estree" "3.5.0"
+    "@typescript-eslint/types" "3.6.0"
+    "@typescript-eslint/typescript-estree" "3.6.0"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/parser@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.5.0.tgz#9ff8c11877c48df24e10e19d7bf542ee0359500d"
-  integrity sha512-sU07VbYB70WZHtgOjH/qfAp1+OwaWgrvD1Km1VXqRpcVxt971PMTU7gJtlrCje0M+Sdz7xKAbtiyIu+Y6QdnVA==
+"@typescript-eslint/parser@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.6.0.tgz#79b5232e1a2d06f1fc745942b690cd87aca7b60e"
+  integrity sha512-taghDxuLhbDAD1U5Fk8vF+MnR0yiFE9Z3v2/bYScFb0N1I9SK8eKHkdJl1DAD48OGFDMFTeOTX0z7g0W6SYUXw==
   dependencies:
     "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "3.5.0"
-    "@typescript-eslint/types" "3.5.0"
-    "@typescript-eslint/typescript-estree" "3.5.0"
+    "@typescript-eslint/experimental-utils" "3.6.0"
+    "@typescript-eslint/types" "3.6.0"
+    "@typescript-eslint/typescript-estree" "3.6.0"
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/types@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.5.0.tgz#4e3d2a2272268d8ec3e3e4a37152a64956682639"
-  integrity sha512-Dreqb5idi66VVs1QkbAwVeDmdJG+sDtofJtKwKCZXIaBsINuCN7Jv5eDIHrS0hFMMiOvPH9UuOs4splW0iZe4Q==
+"@typescript-eslint/types@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.6.0.tgz#4bd6eee55d2f9d35a4b36c4804be1880bf68f7bc"
+  integrity sha512-JwVj74ohUSt0ZPG+LZ7hb95fW8DFOqBuR6gE7qzq55KDI3BepqsCtHfBIoa0+Xi1AI7fq5nCu2VQL8z4eYftqg==
 
-"@typescript-eslint/typescript-estree@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.5.0.tgz#dfc895db21a381b84f24c2a719f5bf9c600dcfdc"
-  integrity sha512-Na71ezI6QP5WVR4EHxwcBJgYiD+Sre9BZO5iJK2QhrmRPo/42+b0no/HZIrdD1sjghzlYv7t+7Jis05M1uMxQg==
+"@typescript-eslint/typescript-estree@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.6.0.tgz#9b4cab43f1192b64ff51530815b8919f166ce177"
+  integrity sha512-G57NDSABHjvob7zVV09ehWyD1K6/YUKjz5+AufObFyjNO4DVmKejj47MHjVHHlZZKgmpJD2yyH9lfCXHrPITFg==
   dependencies:
-    "@typescript-eslint/types" "3.5.0"
-    "@typescript-eslint/visitor-keys" "3.5.0"
+    "@typescript-eslint/types" "3.6.0"
+    "@typescript-eslint/visitor-keys" "3.6.0"
     debug "^4.1.1"
     glob "^7.1.6"
     is-glob "^4.0.1"
@@ -472,10 +472,10 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/visitor-keys@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.5.0.tgz#73c1ea2582f814735e4afdc1cf6f5e3af78db60a"
-  integrity sha512-7cTp9rcX2sz9Z+zua9MCOX4cqp5rYyFD5o8LlbSpXrMTXoRdngTtotRZEkm8+FNMHPWYFhitFK+qt/brK8BVJQ==
+"@typescript-eslint/visitor-keys@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.6.0.tgz#44185eb0cc47651034faa95c5e2e8b314ecebb26"
+  integrity sha512-p1izllL2Ubwunite0ITjubuMQRBGgjdVYwyG7lXPX8GbrA6qF0uwSRz9MnXZaHMxID4948gX0Ez8v9tUDi/KfQ==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů