Merge pull request #503 from javascript-obfuscator/eslint-scope

`eslint-scope` and ScopeIdentifiersTransformer: rename identifiers in more easy way

CHANGELOG.md

@@ -1,5 +1,10 @@
 Change Log
 
+v0.24.0
+---
+* **Internal refactoring:** completely new mechanism to rename variable names
+* Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/496
+
 v0.23.2
 ---
 * Fixed https://github.com/javascript-obfuscator/javascript-obfuscator/issues/475

package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-obfuscator",
-  "version": "0.23.2",
+  "version": "0.24.0",
   "description": "JavaScript obfuscator",
   "keywords": [
     "obfuscator",
@@ -29,6 +29,7 @@
     "class-validator": "0.11.0",
     "commander": "4.1.0",
     "escodegen": "1.13.0",
+    "eslint-scope": "5.0.0",
     "estraverse": "4.3.0",
     "eventemitter3": "4.0.0",
     "inversify": "5.0.1",
@@ -45,6 +46,7 @@
     "@types/chai": "4.2.7",
     "@types/chance": "1.0.8",
     "@types/escodegen": "0.0.6",
+    "@types/eslint-scope": "3.7.0",
     "@types/estraverse": "0.0.6",
     "@types/estree": "0.0.42",
     "@types/md5": "2.1.33",

src/JavaScriptObfuscator.ts

@@ -50,16 +50,11 @@ export class JavaScriptObfuscator implements IJavaScriptObfuscator {
      */
     private static readonly transformersList: NodeTransformer[] = [
         NodeTransformer.BlockStatementControlFlowTransformer,
-        NodeTransformer.ClassDeclarationTransformer,
         NodeTransformer.CommentsTransformer,
         NodeTransformer.CustomNodesTransformer,
         NodeTransformer.DeadCodeInjectionTransformer,
         NodeTransformer.EvalCallExpressionTransformer,
         NodeTransformer.FunctionControlFlowTransformer,
-        NodeTransformer.CatchClauseTransformer,
-        NodeTransformer.FunctionDeclarationTransformer,
-        NodeTransformer.FunctionTransformer,
-        NodeTransformer.ImportDeclarationTransformer,
         NodeTransformer.LabeledStatementTransformer,
         NodeTransformer.LiteralTransformer,
         NodeTransformer.MemberExpressionTransformer,
@@ -69,9 +64,9 @@ export class JavaScriptObfuscator implements IJavaScriptObfuscator {
         NodeTransformer.ObjectExpressionKeysTransformer,
         NodeTransformer.ObjectExpressionTransformer,
         NodeTransformer.ParentificationTransformer,
+        NodeTransformer.ScopeIdentifiersTransformer,
         NodeTransformer.SplitStringTransformer,
         NodeTransformer.TemplateLiteralTransformer,
-        NodeTransformer.VariableDeclarationTransformer,
         NodeTransformer.VariablePreserveTransformer
     ];
 

src/analyzers/scope-analyzer/ScopeAnalyzer.ts

@@ -0,0 +1,135 @@
+import { inject, injectable, } from 'inversify';
+import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
+
+import * as eslintScope from 'eslint-scope';
+import * as estraverse from 'estraverse';
+import * as ESTree from 'estree';
+
+import { IOptions } from '../../interfaces/options/IOptions';
+import { IScopeAnalyzer } from '../../interfaces/analyzers/scope-analyzer/IScopeAnalyzer';
+
+import { ObfuscationTarget } from '../../enums/ObfuscationTarget';
+
+import { NodeGuards } from '../../node/NodeGuards';
+
+@injectable()
+export class ScopeAnalyzer implements IScopeAnalyzer {
+    /**
+     * @type {eslintScope.AnalysisOptions}
+     */
+    private static readonly eslintScopeOptions: eslintScope.AnalysisOptions = {
+        ecmaVersion: 10,
+        optimistic: true
+    };
+
+    /**
+     * @type {acorn.Options['sourceType'][]}
+     */
+    private static readonly sourceTypes: acorn.Options['sourceType'][] = [
+        'script',
+        'module'
+    ];
+
+    /**
+     * @type {number}
+     */
+    private static readonly emptyRangeValue: number = 0;
+
+    /**
+     * @type {IOptions}
+     */
+    private readonly options: IOptions;
+
+    /**
+     * @type {eslintScope.ScopeManager | null}
+     */
+    private scopeManager: eslintScope.ScopeManager | null = null;
+
+    /**
+     * @param {IOptions} options
+     */
+    constructor (
+        @inject(ServiceIdentifiers.IOptions) options: IOptions
+    ) {
+        this.options = options;
+    }
+
+    /**
+     * `eslint-scope` reads `ranges` property of a nodes
+     * Should attach that property to the some custom nodes
+     *
+     * @param {Node} astTree
+     */
+    private static attachMissingRanges (astTree: ESTree.Node): void {
+        estraverse.replace(astTree, {
+            enter: (node: ESTree.Node): ESTree.Node => {
+                if (!node.range) {
+                    node.range = [
+                        ScopeAnalyzer.emptyRangeValue,
+                        ScopeAnalyzer.emptyRangeValue
+                    ];
+                }
+
+                return node;
+            }
+        });
+    }
+
+    /**
+     * @param {Node} node
+     * @returns {boolean}
+     */
+    private static isRootNode (node: ESTree.Node): boolean {
+        return NodeGuards.isProgramNode(node) || node.parentNode === node;
+    }
+
+    /**
+     * @param {Program} astTree
+     */
+    public analyze (astTree: ESTree.Node): void {
+        const sourceTypeLength: number = ScopeAnalyzer.sourceTypes.length;
+
+        ScopeAnalyzer.attachMissingRanges(astTree);
+
+        for (let i: number = 0; i < sourceTypeLength; i++) {
+            try {
+                this.scopeManager = eslintScope.analyze(astTree, {
+                    ...ScopeAnalyzer.eslintScopeOptions,
+                    nodejsScope: this.options.target === ObfuscationTarget.Node,
+                    sourceType: ScopeAnalyzer.sourceTypes[i]
+                });
+
+                return;
+            } catch (error) {
+                if (i < sourceTypeLength - 1) {
+                    continue;
+                }
+
+                throw new Error(error);
+            }
+        }
+
+        throw new Error(`Scope analyzing error`);
+    }
+
+    /**
+     * @param {Node} node
+     * @returns {Scope}
+     */
+    public acquireScope (node: ESTree.Node): eslintScope.Scope {
+        if (!this.scopeManager) {
+            throw new Error('Scope manager is not defined');
+        }
+
+        const scope: eslintScope.Scope | null = this.scopeManager.acquire(
+            node,
+            ScopeAnalyzer.isRootNode(node)
+        );
+
+        if (!scope) {
+            throw new Error('Cannot acquire scope for node');
+        }
+
+        return scope;
+    }
+}

src/container/ServiceIdentifiers.ts

@@ -41,6 +41,7 @@ export enum ServiceIdentifiers {
     IRandomGenerator = 'IRandomGenerator',
     ISourceCode = 'ISourceCode',
     ISourceMapCorrector = 'ISourceMapCorrector',
+    IScopeAnalyzer = 'IScopeAnalyzer',
     IStringArrayStorageAnalyzer = 'IStringArrayStorageAnalyzer',
     ITransformersRunner = 'ITransformersRunner',
     Newable__ICustomNode = 'Newable<ICustomNode>',

src/container/modules/analyzers/AnalyzersModule.ts

@@ -5,6 +5,7 @@ import { ServiceIdentifiers } from '../../ServiceIdentifiers';
 import { ICalleeDataExtractor } from '../../../interfaces/analyzers/calls-graph-analyzer/ICalleeDataExtractor';
 import { ICallsGraphAnalyzer } from '../../../interfaces/analyzers/calls-graph-analyzer/ICallsGraphAnalyzer';
 import { IPrevailingKindOfVariablesAnalyzer } from '../../../interfaces/analyzers/calls-graph-analyzer/IPrevailingKindOfVariablesAnalyzer';
+import { IScopeAnalyzer } from '../../../interfaces/analyzers/scope-analyzer/IScopeAnalyzer';
 import { IStringArrayStorageAnalyzer } from '../../../interfaces/analyzers/string-array-storage-analyzer/IStringArrayStorageAnalyzer';
 
 import { CalleeDataExtractor } from '../../../enums/analyzers/calls-graph-analyzer/CalleeDataExtractor';
@@ -13,6 +14,7 @@ import { FunctionDeclarationCalleeDataExtractor } from '../../../analyzers/calls
 import { FunctionExpressionCalleeDataExtractor } from '../../../analyzers/calls-graph-analyzer/callee-data-extractors/FunctionExpressionCalleeDataExtractor';
 import { ObjectExpressionCalleeDataExtractor } from '../../../analyzers/calls-graph-analyzer/callee-data-extractors/ObjectExpressionCalleeDataExtractor';
 import { PrevailingKindOfVariablesAnalyzer } from '../../../analyzers/prevailing-kind-of-variables-analyzer/PrevailingKindOfVariablesAnalyzer';
+import { ScopeAnalyzer } from '../../../analyzers/scope-analyzer/ScopeAnalyzer';
 import { StringArrayStorageAnalyzer } from '../../../analyzers/string-array-storage-analyzer/StringArrayStorageAnalyzer';
 
 export const analyzersModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
@@ -26,6 +28,11 @@ export const analyzersModule: interfaces.ContainerModule = new ContainerModule((
         .to(PrevailingKindOfVariablesAnalyzer)
         .inSingletonScope();
 
+    // scope analyzer
+    bind<IScopeAnalyzer>(ServiceIdentifiers.IScopeAnalyzer)
+        .to(ScopeAnalyzer)
+        .inSingletonScope();
+
     // string array storage analyzer
     bind<IStringArrayStorageAnalyzer>(ServiceIdentifiers.IStringArrayStorageAnalyzer)
         .to(StringArrayStorageAnalyzer)

src/container/modules/node-transformers/ObfuscatingTransformersModule.ts

@@ -12,39 +12,14 @@ import { NodeTransformer } from '../../../enums/node-transformers/NodeTransforme
 
 import { BaseIdentifierObfuscatingReplacer } from '../../../node-transformers/obfuscating-transformers/obfuscating-replacers/identifier-obfuscating-replacers/BaseIdentifierObfuscatingReplacer';
 import { BooleanLiteralObfuscatingReplacer } from '../../../node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/BooleanLiteralObfuscatingReplacer';
-import { CatchClauseTransformer } from '../../../node-transformers/obfuscating-transformers/CatchClauseTransformer';
-import { ClassDeclarationTransformer } from '../../../node-transformers/obfuscating-transformers/ClassDeclarationTransformer';
-import { FunctionDeclarationTransformer } from '../../../node-transformers/obfuscating-transformers/FunctionDeclarationTransformer';
-import { FunctionTransformer } from '../../../node-transformers/obfuscating-transformers/FunctionTransformer';
-import { ImportDeclarationTransformer } from '../../../node-transformers/obfuscating-transformers/ImportDeclarationTransformer';
 import { LabeledStatementTransformer } from '../../../node-transformers/obfuscating-transformers/LabeledStatementTransformer';
 import { LiteralTransformer } from '../../../node-transformers/obfuscating-transformers/LiteralTransformer';
 import { NumberLiteralObfuscatingReplacer } from '../../../node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/NumberLiteralObfuscatingReplacer';
 import { StringLiteralObfuscatingReplacer } from '../../../node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/StringLiteralObfuscatingReplacer';
-import { VariableDeclarationTransformer } from '../../../node-transformers/obfuscating-transformers/VariableDeclarationTransformer';
+import { ScopeIdentifiersTransformer } from '../../../node-transformers/obfuscating-transformers/ScopeIdentifiersTransformer';
 
 export const obfuscatingTransformersModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
     // obfuscating transformers
-    bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
-        .to(CatchClauseTransformer)
-        .whenTargetNamed(NodeTransformer.CatchClauseTransformer);
-
-    bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
-        .to(ClassDeclarationTransformer)
-        .whenTargetNamed(NodeTransformer.ClassDeclarationTransformer);
-
-    bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
-        .to(FunctionDeclarationTransformer)
-        .whenTargetNamed(NodeTransformer.FunctionDeclarationTransformer);
-
-    bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
-        .to(FunctionTransformer)
-        .whenTargetNamed(NodeTransformer.FunctionTransformer);
-
-    bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
-        .to(ImportDeclarationTransformer)
-        .whenTargetNamed(NodeTransformer.ImportDeclarationTransformer);
-
     bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
         .to(LabeledStatementTransformer)
         .whenTargetNamed(NodeTransformer.LabeledStatementTransformer);
@@ -54,8 +29,8 @@ export const obfuscatingTransformersModule: interfaces.ContainerModule = new Con
         .whenTargetNamed(NodeTransformer.LiteralTransformer);
 
     bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
-        .to(VariableDeclarationTransformer)
-        .whenTargetNamed(NodeTransformer.VariableDeclarationTransformer);
+        .to(ScopeIdentifiersTransformer)
+        .whenTargetNamed(NodeTransformer.ScopeIdentifiersTransformer);
 
     // literal obfuscating replacers
     bind<IObfuscatingReplacer>(ServiceIdentifiers.IObfuscatingReplacer)

src/declarations/ESTree.d.ts

@@ -2,6 +2,7 @@
 
 import * as acorn from 'acorn';
 import * as escodegen from 'escodegen';
+import * as eslintScope from 'eslint-scope';
 
 declare module 'estree' {
     export interface BaseNodeMetadata {
@@ -14,10 +15,6 @@ declare module 'estree' {
         loc?: acorn.SourceLocation;
     }
 
-    export interface IdentifierNodeMetadata extends BaseNodeMetadata {
-        renamedIdentifier?: boolean;
-    }
-
     export interface LiteralNodeMetadata extends BaseNodeMetadata {
         replacedLiteral?: boolean;
     }
@@ -27,8 +24,8 @@ declare module 'estree' {
         parentNode?: Node;
     }
 
-    interface Identifier extends BaseNode {
-        metadata?: IdentifierNodeMetadata;
+    interface Program extends BaseNode {
+        scope?: eslintScope.Scope | null;
     }
 
     interface SimpleLiteral extends BaseNode {

src/declarations/eslint-scope.d.ts

@@ -0,0 +1,15 @@
+/* tslint:disable:interface-name */
+/* tslint:disable:no-empty-interface */
+
+import * as eslint from 'eslint';
+import * as eslintScope from 'eslint-scope';
+
+declare module 'eslint-scope' {
+    interface Variable {
+        scope: Scope;
+    }
+
+    interface Definition {
+        type: eslint.Scope.Definition['type'];
+    }
+}

src/enums/node-transformers/NodeTransformer.ts

@@ -1,15 +1,10 @@
 export enum NodeTransformer {
     BlockStatementControlFlowTransformer = 'BlockStatementControlFlowTransformer',
-    ClassDeclarationTransformer = 'ClassDeclarationTransformer',
     CommentsTransformer = 'CommentsTransformer',
     CustomNodesTransformer = 'CustomNodesTransformer',
     DeadCodeInjectionTransformer = 'DeadCodeInjectionTransformer',
     EvalCallExpressionTransformer = 'EvalCallExpressionTransformer',
     FunctionControlFlowTransformer = 'FunctionControlFlowTransformer',
-    CatchClauseTransformer = 'CatchClauseTransformer',
-    FunctionDeclarationTransformer = 'FunctionDeclarationTransformer',
-    FunctionTransformer = 'FunctionTransformer',
-    ImportDeclarationTransformer = 'ImportDeclarationTransformer',
     LabeledStatementTransformer = 'LabeledStatementTransformer',
     LiteralTransformer = 'LiteralTransformer',
     MemberExpressionTransformer = 'MemberExpressionTransformer',
@@ -19,8 +14,8 @@ export enum NodeTransformer {
     ObjectExpressionKeysTransformer = 'ObjectExpressionKeysTransformer',
     ObjectExpressionTransformer = 'ObjectExpressionTransformer',
     ParentificationTransformer = 'ParentificationTransformer',
+    ScopeIdentifiersTransformer = 'ScopeIdentifiersTransformer',
     SplitStringTransformer = 'SplitStringTransformer',
     TemplateLiteralTransformer = 'TemplateLiteralTransformer',
-    VariableDeclarationTransformer = 'VariableDeclarationTransformer',
-    VariablePreserveTransformer = 'VariablePreserveTransformer',
+    VariablePreserveTransformer = 'VariablePreserveTransformer'
 }

src/interfaces/analyzers/scope-analyzer/IScopeAnalyzer.d.ts

@@ -0,0 +1,17 @@
+import * as eslintScope from 'eslint-scope';
+import * as ESTree from 'estree';
+
+import { IAnalyzer } from '../IAnalyzer';
+
+export interface IScopeAnalyzer extends IAnalyzer<void> {
+    /**
+     * @param {Program} astTree
+     */
+    analyze (astTree: ESTree.Node): void;
+
+    /**
+     * @param {Node} node
+     * @returns {Scope}
+     */
+    acquireScope (node: ESTree.Node): eslintScope.Scope;
+}

src/node-transformers/dead-code-injection-transformers/DeadCodeInjectionTransformer.ts

@@ -47,12 +47,8 @@ export class DeadCodeInjectionTransformer extends AbstractNodeTransformer {
      * @type {NodeTransformer[]}
      */
     private static readonly transformersToRenameBlockScopeIdentifiers: NodeTransformer[] = [
-        NodeTransformer.CatchClauseTransformer,
-        NodeTransformer.ClassDeclarationTransformer,
-        NodeTransformer.FunctionDeclarationTransformer,
-        NodeTransformer.FunctionTransformer,
         NodeTransformer.LabeledStatementTransformer,
-        NodeTransformer.VariableDeclarationTransformer
+        NodeTransformer.ScopeIdentifiersTransformer
     ];
 
     /**

src/node-transformers/obfuscating-transformers/CatchClauseTransformer.ts

@@ -1,131 +0,0 @@
-import { inject, injectable, } from 'inversify';
-import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
-
-import * as estraverse from 'estraverse';
-import * as ESTree from 'estree';
-
-import { TIdentifierObfuscatingReplacerFactory } from '../../types/container/node-transformers/TIdentifierObfuscatingReplacerFactory';
-import { TNodeWithLexicalScope } from '../../types/node/TNodeWithLexicalScope';
-
-import { IIdentifierObfuscatingReplacer } from '../../interfaces/node-transformers/obfuscating-transformers/obfuscating-replacers/IIdentifierObfuscatingReplacer';
-import { IOptions } from '../../interfaces/options/IOptions';
-import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator';
-import { IVisitor } from '../../interfaces/node-transformers/IVisitor';
-
-import { IdentifierObfuscatingReplacer } from '../../enums/node-transformers/obfuscating-transformers/obfuscating-replacers/IdentifierObfuscatingReplacer';
-import { TransformationStage } from '../../enums/node-transformers/TransformationStage';
-
-import { AbstractNodeTransformer } from '../AbstractNodeTransformer';
-import { NodeGuards } from '../../node/NodeGuards';
-import { NodeLexicalScopeUtils } from '../../node/NodeLexicalScopeUtils';
-import { NodeMetadata } from '../../node/NodeMetadata';
-
-/**
- * replaces:
- *     try {} catch (e) { console.log(e); };
- *
- * on:
- *     try {} catch (_0x12d45f) { console.log(_0x12d45f); };
- *
- */
-@injectable()
-export class CatchClauseTransformer extends AbstractNodeTransformer {
-    /**
-     * @type {IIdentifierObfuscatingReplacer}
-     */
-    private readonly identifierObfuscatingReplacer: IIdentifierObfuscatingReplacer;
-
-    /**
-     * @param {TIdentifierObfuscatingReplacerFactory} identifierObfuscatingReplacerFactory
-     * @param {IRandomGenerator} randomGenerator
-     * @param {IOptions} options
-     */
-    constructor (
-        @inject(ServiceIdentifiers.Factory__IIdentifierObfuscatingReplacer)
-            identifierObfuscatingReplacerFactory: TIdentifierObfuscatingReplacerFactory,
-        @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator,
-        @inject(ServiceIdentifiers.IOptions) options: IOptions
-    ) {
-        super(randomGenerator, options);
-
-        this.identifierObfuscatingReplacer = identifierObfuscatingReplacerFactory(
-            IdentifierObfuscatingReplacer.BaseIdentifierObfuscatingReplacer
-        );
-    }
-
-    /**
-     * @param {TransformationStage} transformationStage
-     * @returns {IVisitor | null}
-     */
-    public getVisitor (transformationStage: TransformationStage): IVisitor | null {
-        switch (transformationStage) {
-            case TransformationStage.Obfuscating:
-                return {
-                    enter: (node: ESTree.Node, parentNode: ESTree.Node | null) => {
-                        if (parentNode && NodeGuards.isCatchClauseNode(node)) {
-                            return this.transformNode(node, parentNode);
-                        }
-                    }
-                };
-
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * @param {CatchClause} catchClauseNode
-     * @param {NodeGuards} parentNode
-     * @returns {NodeGuards}
-     */
-    public transformNode (catchClauseNode: ESTree.CatchClause, parentNode: ESTree.Node): ESTree.Node {
-        const lexicalScopeNode: TNodeWithLexicalScope | undefined = NodeLexicalScopeUtils.getLexicalScope(catchClauseNode);
-
-        if (!lexicalScopeNode) {
-            return catchClauseNode;
-        }
-
-        this.storeCatchClauseParam(catchClauseNode, lexicalScopeNode);
-        this.replaceCatchClauseParam(catchClauseNode, lexicalScopeNode);
-
-        return catchClauseNode;
-    }
-
-    /**
-     * @param {CatchClause} catchClauseNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private storeCatchClauseParam (
-        catchClauseNode: ESTree.CatchClause,
-        lexicalScopeNode: TNodeWithLexicalScope
-    ): void {
-        if (catchClauseNode.param && NodeGuards.isIdentifierNode(catchClauseNode.param)) {
-            this.identifierObfuscatingReplacer.storeLocalName(catchClauseNode.param, lexicalScopeNode);
-        }
-    }
-
-    /**
-     * @param {CatchClause} catchClauseNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private replaceCatchClauseParam (
-        catchClauseNode: ESTree.CatchClause,
-        lexicalScopeNode: TNodeWithLexicalScope
-    ): void {
-        estraverse.replace(catchClauseNode, {
-            enter: (node: ESTree.Node, parentNode: ESTree.Node | null): void => {
-                if (parentNode && NodeGuards.isReplaceableIdentifierNode(node, parentNode)) {
-                    const newIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                        .replace(node, lexicalScopeNode);
-                    const newIdentifierName: string = newIdentifier.name;
-
-                    if (node.name !== newIdentifierName) {
-                        node.name = newIdentifierName;
-
-                        NodeMetadata.set(node, { renamedIdentifier: true });
-                    }
-                }
-            }
-        });
-    }
-}

src/node-transformers/obfuscating-transformers/ClassDeclarationTransformer.ts

@@ -1,202 +0,0 @@
-import { inject, injectable, } from 'inversify';
-import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
-
-import * as estraverse from 'estraverse';
-import * as ESTree from 'estree';
-
-import { TIdentifierObfuscatingReplacerFactory } from "../../types/container/node-transformers/TIdentifierObfuscatingReplacerFactory";
-import { TNodeWithLexicalScope } from '../../types/node/TNodeWithLexicalScope';
-import { TReplaceableIdentifiers } from '../../types/node-transformers/TReplaceableIdentifiers';
-import { TReplaceableIdentifiersNames } from '../../types/node-transformers/TReplaceableIdentifiersNames';
-
-import { IIdentifierObfuscatingReplacer } from '../../interfaces/node-transformers/obfuscating-transformers/obfuscating-replacers/IIdentifierObfuscatingReplacer';
-import { IOptions } from '../../interfaces/options/IOptions';
-import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator';
-import { IVisitor } from '../../interfaces/node-transformers/IVisitor';
-
-import { IdentifierObfuscatingReplacer } from "../../enums/node-transformers/obfuscating-transformers/obfuscating-replacers/IdentifierObfuscatingReplacer";
-import { NodeType } from '../../enums/node/NodeType';
-import { TransformationStage } from '../../enums/node-transformers/TransformationStage';
-
-import { AbstractNodeTransformer } from '../AbstractNodeTransformer';
-import { NodeGuards } from '../../node/NodeGuards';
-import { NodeLexicalScopeUtils } from '../../node/NodeLexicalScopeUtils';
-import { NodeMetadata } from '../../node/NodeMetadata';
-
-/**
- * replaces:
- *     class Foo { //... };
- *     new Foo();
- *
- * on:
- *     class _0x12d45f { //... };
- *     new _0x12d45f();
- */
-@injectable()
-export class ClassDeclarationTransformer extends AbstractNodeTransformer {
-    /**
-     * @type {IIdentifierObfuscatingReplacer}
-     */
-    private readonly identifierObfuscatingReplacer: IIdentifierObfuscatingReplacer;
-
-    /**
-     * @type {Map<ESTree.Node, ESTree.Identifier[]>}
-     */
-    private readonly replaceableIdentifiers: TReplaceableIdentifiers = new Map();
-
-    /**
-     * @param {TIdentifierObfuscatingReplacerFactory} identifierObfuscatingReplacerFactory
-     * @param {IRandomGenerator} randomGenerator
-     * @param {IOptions} options
-     */
-    constructor (
-        @inject(ServiceIdentifiers.Factory__IIdentifierObfuscatingReplacer)
-            identifierObfuscatingReplacerFactory: TIdentifierObfuscatingReplacerFactory,
-        @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator,
-        @inject(ServiceIdentifiers.IOptions) options: IOptions
-    ) {
-        super(randomGenerator, options);
-
-        this.identifierObfuscatingReplacer = identifierObfuscatingReplacerFactory(
-            IdentifierObfuscatingReplacer.BaseIdentifierObfuscatingReplacer
-        );
-    }
-
-    /**
-     * @param {TransformationStage} transformationStage
-     * @returns {IVisitor | null}
-     */
-    public getVisitor (transformationStage: TransformationStage): IVisitor | null {
-        switch (transformationStage) {
-            case TransformationStage.Obfuscating:
-                return {
-                    enter: (node: ESTree.Node, parentNode: ESTree.Node | null) => {
-                        if (
-                            parentNode
-                            && NodeGuards.isClassDeclarationNode(node)
-                            && !NodeGuards.isExportNamedDeclarationNode(parentNode)
-                        ) {
-                            return this.transformNode(node, parentNode);
-                        }
-                    }
-                };
-
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * @param {ClassDeclaration} classDeclarationNode
-     * @param {NodeGuards} parentNode
-     * @returns {NodeGuards}
-     */
-    public transformNode (
-        classDeclarationNode: ESTree.ClassDeclaration & { id: ESTree.Identifier },
-        parentNode: ESTree.Node
-    ): ESTree.Node {
-        const lexicalScopeNode: TNodeWithLexicalScope | undefined = NodeLexicalScopeUtils.getLexicalScope(classDeclarationNode);
-
-        if (!lexicalScopeNode) {
-            return classDeclarationNode;
-        }
-
-        const isGlobalDeclaration: boolean = lexicalScopeNode.type === NodeType.Program;
-
-        if (!this.options.renameGlobals && isGlobalDeclaration) {
-            return classDeclarationNode;
-        }
-
-        this.storeClassName(classDeclarationNode, lexicalScopeNode, isGlobalDeclaration);
-
-        // check for cached identifiers for current scope node. If exist - loop through them.
-        if (this.replaceableIdentifiers.has(lexicalScopeNode)) {
-            this.replaceScopeCachedIdentifiers(classDeclarationNode, lexicalScopeNode);
-        } else {
-            this.replaceScopeIdentifiers(lexicalScopeNode);
-        }
-
-        return classDeclarationNode;
-    }
-
-    /**
-     * @param {ClassDeclaration} classDeclarationNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     * @param {boolean} isGlobalDeclaration
-     */
-    private storeClassName (
-        classDeclarationNode: ESTree.ClassDeclaration & { id: ESTree.Identifier },
-        lexicalScopeNode: TNodeWithLexicalScope,
-        isGlobalDeclaration: boolean
-    ): void {
-        if (isGlobalDeclaration) {
-            this.identifierObfuscatingReplacer.storeGlobalName(classDeclarationNode.id, lexicalScopeNode);
-        } else {
-            this.identifierObfuscatingReplacer.storeLocalName(classDeclarationNode.id, lexicalScopeNode);
-        }
-    }
-
-    /**
-     * @param {ClassDeclaration} classDeclarationNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private replaceScopeCachedIdentifiers (
-        classDeclarationNode: ESTree.ClassDeclaration & { id: ESTree.Identifier },
-        lexicalScopeNode: TNodeWithLexicalScope
-    ): void {
-        const cachedReplaceableIdentifiersNamesMap: TReplaceableIdentifiersNames =
-            <TReplaceableIdentifiersNames>this.replaceableIdentifiers.get(lexicalScopeNode);
-
-        const cachedReplaceableIdentifiers: ESTree.Identifier[] | undefined = cachedReplaceableIdentifiersNamesMap
-            .get(classDeclarationNode.id.name);
-
-        if (!cachedReplaceableIdentifiers) {
-            return;
-        }
-
-        const cachedReplaceableIdentifierLength: number = cachedReplaceableIdentifiers.length;
-
-        for (let i: number = 0; i < cachedReplaceableIdentifierLength; i++) {
-            const replaceableIdentifier: ESTree.Identifier = cachedReplaceableIdentifiers[i];
-            const newReplaceableIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                .replace(replaceableIdentifier, lexicalScopeNode);
-
-            replaceableIdentifier.name = newReplaceableIdentifier.name;
-            NodeMetadata.set(replaceableIdentifier, { renamedIdentifier: true });
-        }
-    }
-
-    /**
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private replaceScopeIdentifiers (lexicalScopeNode: TNodeWithLexicalScope): void {
-        const storedReplaceableIdentifiersNamesMap: TReplaceableIdentifiersNames = new Map();
-
-        estraverse.replace(lexicalScopeNode, {
-            enter: (node: ESTree.Node, parentNode: ESTree.Node | null): void => {
-                if (
-                    parentNode
-                    && NodeGuards.isReplaceableIdentifierNode(node, parentNode)
-                    && !NodeMetadata.isRenamedIdentifier(node)
-                ) {
-                    const newIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                        .replace(node, lexicalScopeNode);
-                    const newIdentifierName: string = newIdentifier.name;
-
-                    if (node.name !== newIdentifierName) {
-                        node.name = newIdentifierName;
-                        NodeMetadata.set(node, { renamedIdentifier: true });
-                    } else {
-                        const storedReplaceableIdentifiers: ESTree.Identifier[] =
-                            storedReplaceableIdentifiersNamesMap.get(node.name) || [];
-
-                        storedReplaceableIdentifiers.push(node);
-                        storedReplaceableIdentifiersNamesMap.set(node.name, storedReplaceableIdentifiers);
-                    }
-                }
-            }
-        });
-
-        this.replaceableIdentifiers.set(lexicalScopeNode, storedReplaceableIdentifiersNamesMap);
-    }
-}

src/node-transformers/obfuscating-transformers/FunctionDeclarationTransformer.ts

@@ -1,203 +0,0 @@
-import { inject, injectable, } from 'inversify';
-import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
-
-import * as estraverse from 'estraverse';
-import * as ESTree from 'estree';
-
-import { TIdentifierObfuscatingReplacerFactory } from "../../types/container/node-transformers/TIdentifierObfuscatingReplacerFactory";
-import { TNodeWithLexicalScope } from '../../types/node/TNodeWithLexicalScope';
-import { TReplaceableIdentifiers } from '../../types/node-transformers/TReplaceableIdentifiers';
-import { TReplaceableIdentifiersNames } from '../../types/node-transformers/TReplaceableIdentifiersNames';
-
-import { IIdentifierObfuscatingReplacer } from '../../interfaces/node-transformers/obfuscating-transformers/obfuscating-replacers/IIdentifierObfuscatingReplacer';
-import { IOptions } from '../../interfaces/options/IOptions';
-import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator';
-import { IVisitor } from '../../interfaces/node-transformers/IVisitor';
-
-import { IdentifierObfuscatingReplacer } from "../../enums/node-transformers/obfuscating-transformers/obfuscating-replacers/IdentifierObfuscatingReplacer";
-import { NodeType } from '../../enums/node/NodeType';
-import { TransformationStage } from '../../enums/node-transformers/TransformationStage';
-
-import { AbstractNodeTransformer } from '../AbstractNodeTransformer';
-import { NodeGuards } from '../../node/NodeGuards';
-import { NodeLexicalScopeUtils } from '../../node/NodeLexicalScopeUtils';
-import { NodeMetadata } from '../../node/NodeMetadata';
-
-/**
- * replaces:
- *     function foo () { //... };
- *     foo();
- *
- * on:
- *     function _0x12d45f () { //... };
- *     _0x12d45f();
- */
-@injectable()
-export class FunctionDeclarationTransformer extends AbstractNodeTransformer {
-    /**
-     * @type {IIdentifierObfuscatingReplacer}
-     */
-    private readonly identifierObfuscatingReplacer: IIdentifierObfuscatingReplacer;
-
-    /**
-     * @type {Map<ESTree.Node, ESTree.Identifier[]>}
-     */
-    private readonly replaceableIdentifiers: TReplaceableIdentifiers = new Map();
-
-    /**
-     * @param {TIdentifierObfuscatingReplacerFactory} identifierObfuscatingReplacerFactory
-     * @param {IRandomGenerator} randomGenerator
-     * @param {IOptions} options
-     */
-    constructor (
-        @inject(ServiceIdentifiers.Factory__IIdentifierObfuscatingReplacer)
-            identifierObfuscatingReplacerFactory: TIdentifierObfuscatingReplacerFactory,
-        @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator,
-        @inject(ServiceIdentifiers.IOptions) options: IOptions
-    ) {
-        super(randomGenerator, options);
-
-        this.identifierObfuscatingReplacer = identifierObfuscatingReplacerFactory(
-            IdentifierObfuscatingReplacer.BaseIdentifierObfuscatingReplacer
-        );
-    }
-
-    /**
-     * @param {TransformationStage} transformationStage
-     * @returns {IVisitor | null}
-     */
-    public getVisitor (transformationStage: TransformationStage): IVisitor | null {
-        switch (transformationStage) {
-            case TransformationStage.Obfuscating:
-                return {
-                    enter: (node: ESTree.Node, parentNode: ESTree.Node | null) => {
-                        if (
-                            parentNode
-                            && NodeGuards.isFunctionDeclarationNode(node)
-                            && !NodeGuards.isExportNamedDeclarationNode(parentNode)
-                        ) {
-                            return this.transformNode(node, parentNode);
-                        }
-                    }
-                };
-
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * @param {FunctionDeclaration} functionDeclarationNode
-     * @param {NodeGuards} parentNode
-     * @returns {NodeGuards}
-     */
-    public transformNode (
-        functionDeclarationNode: ESTree.FunctionDeclaration & { id: ESTree.Identifier },
-        parentNode: ESTree.Node
-    ): ESTree.Node {
-        const lexicalScopeNode: TNodeWithLexicalScope | undefined = NodeLexicalScopeUtils.getLexicalScope(parentNode);
-
-        if (!lexicalScopeNode) {
-            return functionDeclarationNode;
-        }
-
-        const isGlobalDeclaration: boolean = lexicalScopeNode.type === NodeType.Program;
-
-        if (!this.options.renameGlobals && isGlobalDeclaration) {
-            return functionDeclarationNode;
-        }
-
-        this.storeFunctionName(functionDeclarationNode, lexicalScopeNode, isGlobalDeclaration);
-
-        // check for cached identifiers for current scope node. If exist - loop through them.
-        if (this.replaceableIdentifiers.has(lexicalScopeNode)) {
-            this.replaceScopeCachedIdentifiers(functionDeclarationNode, lexicalScopeNode);
-        } else {
-            this.replaceScopeIdentifiers(lexicalScopeNode);
-        }
-
-        return functionDeclarationNode;
-    }
-
-    /**
-     * @param {FunctionDeclaration} functionDeclarationNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     * @param {boolean} isGlobalDeclaration
-     */
-    private storeFunctionName (
-        functionDeclarationNode: ESTree.FunctionDeclaration & { id: ESTree.Identifier },
-        lexicalScopeNode: TNodeWithLexicalScope,
-        isGlobalDeclaration: boolean
-    ): void {
-        if (isGlobalDeclaration) {
-            this.identifierObfuscatingReplacer.storeGlobalName(functionDeclarationNode.id, lexicalScopeNode);
-        } else {
-            this.identifierObfuscatingReplacer.storeLocalName(functionDeclarationNode.id, lexicalScopeNode);
-        }
-    }
-
-    /**
-     * @param {FunctionDeclaration} functionDeclarationNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private replaceScopeCachedIdentifiers (
-        functionDeclarationNode: ESTree.FunctionDeclaration & { id: ESTree.Identifier },
-        lexicalScopeNode: TNodeWithLexicalScope
-    ): void {
-        const cachedReplaceableIdentifiersNamesMap: TReplaceableIdentifiersNames =
-            <TReplaceableIdentifiersNames>this.replaceableIdentifiers.get(lexicalScopeNode);
-
-        const cachedReplaceableIdentifiers: ESTree.Identifier[] | undefined = cachedReplaceableIdentifiersNamesMap
-            .get(functionDeclarationNode.id.name);
-
-        if (!cachedReplaceableIdentifiers) {
-            return;
-        }
-
-        const cachedReplaceableIdentifierLength: number = cachedReplaceableIdentifiers.length;
-
-        for (let i: number = 0; i < cachedReplaceableIdentifierLength; i++) {
-            const replaceableIdentifier: ESTree.Identifier = cachedReplaceableIdentifiers[i];
-            const newReplaceableIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                .replace(replaceableIdentifier, lexicalScopeNode);
-
-            replaceableIdentifier.name = newReplaceableIdentifier.name;
-            NodeMetadata.set(replaceableIdentifier, { renamedIdentifier: true });
-        }
-    }
-
-    /**
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private replaceScopeIdentifiers (lexicalScopeNode: TNodeWithLexicalScope): void {
-        const storedReplaceableIdentifiersNamesMap: TReplaceableIdentifiersNames = new Map();
-
-        estraverse.replace(lexicalScopeNode, {
-            enter: (node: ESTree.Node, parentNode: ESTree.Node | null): void => {
-                if (
-                    parentNode
-                    && (parentNode !== lexicalScopeNode)
-                    && NodeGuards.isReplaceableIdentifierNode(node, parentNode)
-                    && !NodeMetadata.isRenamedIdentifier(node)
-                ) {
-                    const newIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                        .replace(node, lexicalScopeNode);
-                    const newIdentifierName: string = newIdentifier.name;
-
-                    if (node.name !== newIdentifierName) {
-                        node.name = newIdentifierName;
-                        NodeMetadata.set(node, { renamedIdentifier: true });
-                    } else {
-                        const storedReplaceableIdentifiers: ESTree.Identifier[] =
-                            storedReplaceableIdentifiersNamesMap.get(node.name) || [];
-
-                        storedReplaceableIdentifiers.push(node);
-                        storedReplaceableIdentifiersNamesMap.set(node.name, storedReplaceableIdentifiers);
-                    }
-                }
-            }
-        });
-
-        this.replaceableIdentifiers.set(lexicalScopeNode, storedReplaceableIdentifiersNamesMap);
-    }
-}

src/node-transformers/obfuscating-transformers/FunctionTransformer.ts

@@ -1,228 +0,0 @@
-import { inject, injectable, } from 'inversify';
-import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
-
-import * as estraverse from 'estraverse';
-import * as ESTree from 'estree';
-
-import { TIdentifierObfuscatingReplacerFactory } from '../../types/container/node-transformers/TIdentifierObfuscatingReplacerFactory';
-import { TNodeWithLexicalScope } from '../../types/node/TNodeWithLexicalScope';
-
-import { IIdentifierObfuscatingReplacer } from '../../interfaces/node-transformers/obfuscating-transformers/obfuscating-replacers/IIdentifierObfuscatingReplacer';
-import { IOptions } from '../../interfaces/options/IOptions';
-import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator';
-import { IVisitor } from '../../interfaces/node-transformers/IVisitor';
-
-import { IdentifierObfuscatingReplacer } from '../../enums/node-transformers/obfuscating-transformers/obfuscating-replacers/IdentifierObfuscatingReplacer';
-import { TransformationStage } from '../../enums/node-transformers/TransformationStage';
-
-import { AbstractNodeTransformer } from '../AbstractNodeTransformer';
-import { NodeGuards } from '../../node/NodeGuards';
-import { NodeLexicalScopeUtils } from '../../node/NodeLexicalScopeUtils';
-import { NodeMetadata } from '../../node/NodeMetadata';
-import { NodeType } from '../../enums/node/NodeType';
-
-/**
- * replaces:
- *     function foo (argument1) { return argument1; };
- *
- * on:
- *     function foo (_0x12d45f) { return _0x12d45f; };
- *
- */
-@injectable()
-export class FunctionTransformer extends AbstractNodeTransformer {
-    /**
-     * @type {IIdentifierObfuscatingReplacer}
-     */
-    private readonly identifierObfuscatingReplacer: IIdentifierObfuscatingReplacer;
-
-    /**
-     * @param {TIdentifierObfuscatingReplacerFactory} identifierObfuscatingReplacerFactory
-     * @param {IRandomGenerator} randomGenerator
-     * @param {IOptions} options
-     */
-    constructor (
-        @inject(ServiceIdentifiers.Factory__IIdentifierObfuscatingReplacer)
-            identifierObfuscatingReplacerFactory: TIdentifierObfuscatingReplacerFactory,
-        @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator,
-        @inject(ServiceIdentifiers.IOptions) options: IOptions
-    ) {
-        super(randomGenerator, options);
-
-        this.identifierObfuscatingReplacer = identifierObfuscatingReplacerFactory(
-            IdentifierObfuscatingReplacer.BaseIdentifierObfuscatingReplacer
-        );
-    }
-
-    /**
-     * @param {Node} node
-     * @param {Node} parentNode
-     * @returns {boolean}
-     */
-    private static isProhibitedIdentifierOfPropertyNode (
-        node: ESTree.Node,
-        parentNode: ESTree.Node | null
-    ): node is ESTree.Identifier {
-        return NodeGuards.isIdentifierNode(node)
-            && !!parentNode
-            && NodeGuards.isPropertyNode(parentNode)
-            && parentNode.key === node;
-    }
-
-    /**
-     * @param {Node} node
-     * @returns {boolean}
-     */
-    private static isProhibitedIdentifierOfShorthandPropertyNode (
-        node: ESTree.Node,
-    ): node is ESTree.Property & {key: ESTree.Identifier} {
-        return NodeGuards.isPropertyNode(node)
-            && node.shorthand
-            && NodeGuards.isIdentifierNode(node.key);
-    }
-
-    /**
-     * @param {TransformationStage} transformationStage
-     * @returns {IVisitor | null}
-     */
-    public getVisitor (transformationStage: TransformationStage): IVisitor | null {
-        switch (transformationStage) {
-            case TransformationStage.Obfuscating:
-                return {
-                    enter: (node: ESTree.Node, parentNode: ESTree.Node | null) => {
-                        if (parentNode && NodeGuards.isFunctionNode(node)) {
-                            return this.transformNode(node, parentNode);
-                        }
-                    }
-                };
-
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * @param {Function} functionNode
-     * @param {NodeGuards} parentNode
-     * @returns {NodeGuards}
-     */
-    public transformNode (functionNode: ESTree.Function, parentNode: ESTree.Node): ESTree.Node {
-        const lexicalScopeNode: TNodeWithLexicalScope | undefined = NodeLexicalScopeUtils.getLexicalScope(functionNode);
-
-        if (!lexicalScopeNode) {
-            return functionNode;
-        }
-
-        this.storeFunctionParams(functionNode, lexicalScopeNode);
-        this.replaceFunctionParams(functionNode, lexicalScopeNode);
-
-        return functionNode;
-    }
-
-    /**
-     * @param {Identifier} node
-     * @param {Node} parentNode
-     * @returns {boolean}
-     */
-    private isGlobalFunctionDeclarationIdentifier (node: ESTree.Identifier, parentNode: ESTree.Node): boolean {
-        if (!NodeGuards.isFunctionDeclarationNode(parentNode) || parentNode.id !== node) {
-            return false;
-        }
-
-        const lexicalScopeNode: TNodeWithLexicalScope | undefined = NodeLexicalScopeUtils.getLexicalScopes(parentNode)[1];
-
-        if (!lexicalScopeNode) {
-            return false;
-        }
-
-        const isGlobalDeclaration: boolean = lexicalScopeNode.type === NodeType.Program;
-
-        return !this.options.renameGlobals && isGlobalDeclaration;
-    }
-
-    /**
-     * @param {Function} functionNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private storeFunctionParams (functionNode: ESTree.Function, lexicalScopeNode: TNodeWithLexicalScope): void {
-        const visitor: estraverse.Visitor = {
-            enter: (node: ESTree.Node, parentNode: ESTree.Node | null): estraverse.VisitorOption | void => {
-                // should check with identifier as first argument,
-                // because prohibited identifier can be easily ignored
-                if (FunctionTransformer.isProhibitedIdentifierOfPropertyNode(node, parentNode)) {
-                    return;
-                }
-
-                if (NodeGuards.isAssignmentPatternNode(node) && NodeGuards.isIdentifierNode(node.left)) {
-                    this.identifierObfuscatingReplacer.storeLocalName(node.left, lexicalScopeNode);
-
-                    return estraverse.VisitorOption.Skip;
-                }
-
-                if (NodeGuards.isIdentifierNode(node)) {
-                    this.identifierObfuscatingReplacer.storeLocalName(node, lexicalScopeNode);
-                }
-            }
-        };
-
-        functionNode.params.forEach((paramsNode: ESTree.Node) => {
-            estraverse.traverse(paramsNode, visitor);
-        });
-    }
-
-    /**
-     * @param {Function} functionNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     * @param {Set<string>} ignoredIdentifierNamesSet
-     */
-    private replaceFunctionParams (
-        functionNode: ESTree.Function,
-        lexicalScopeNode: TNodeWithLexicalScope,
-        ignoredIdentifierNamesSet: Set <string> = new Set()
-    ): void {
-        const visitor: estraverse.Visitor = {
-            enter: (node: ESTree.Node, parentNode: ESTree.Node | null): void | estraverse.VisitorOption => {
-                /**
-                 * should process nested functions in different traverse loop to avoid wrong code generation
-                 */
-                if (NodeGuards.isFunctionNode(node) && node !== functionNode) {
-                    this.replaceFunctionParams(node, lexicalScopeNode, new Set(ignoredIdentifierNamesSet));
-
-                    return estraverse.VisitorOption.Skip;
-                }
-
-                /**
-                 * should ignore all shorthand `key` identifiers of the `PropertyNode`
-                 */
-                if (FunctionTransformer.isProhibitedIdentifierOfShorthandPropertyNode(node)) {
-                    ignoredIdentifierNamesSet.add(node.key.name);
-
-                    return;
-                }
-
-                if (
-                    parentNode
-                    && NodeGuards.isReplaceableIdentifierNode(node, parentNode)
-                    && !NodeMetadata.isRenamedIdentifier(node)
-                    && !ignoredIdentifierNamesSet.has(node.name)
-                ) {
-                    // should ignore identifiers of global function declarations
-                    if (this.isGlobalFunctionDeclarationIdentifier(node, parentNode)) {
-                        return;
-                    }
-
-                    const newIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                        .replace(node, lexicalScopeNode);
-                    const newIdentifierName: string = newIdentifier.name;
-
-                    if (node.name !== newIdentifierName) {
-                        node.name = newIdentifierName;
-                        NodeMetadata.set(node, { renamedIdentifier: true });
-                    }
-                }
-            }
-        };
-
-        estraverse.replace(functionNode, visitor);
-    }
-}

src/node-transformers/obfuscating-transformers/ImportDeclarationTransformer.ts

@@ -1,180 +0,0 @@
-import { inject, injectable, } from 'inversify';
-import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
-
-import * as estraverse from 'estraverse';
-import * as ESTree from 'estree';
-
-import { TIdentifierObfuscatingReplacerFactory } from "../../types/container/node-transformers/TIdentifierObfuscatingReplacerFactory";
-import { TImportSpecifier } from '../../types/node/TimportSpecifier';
-import { TNodeWithLexicalScope } from '../../types/node/TNodeWithLexicalScope';
-
-import { IIdentifierObfuscatingReplacer } from '../../interfaces/node-transformers/obfuscating-transformers/obfuscating-replacers/IIdentifierObfuscatingReplacer';
-import { IOptions } from '../../interfaces/options/IOptions';
-import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator';
-import { IVisitor } from '../../interfaces/node-transformers/IVisitor';
-
-import { IdentifierObfuscatingReplacer } from "../../enums/node-transformers/obfuscating-transformers/obfuscating-replacers/IdentifierObfuscatingReplacer";
-import { TransformationStage } from '../../enums/node-transformers/TransformationStage';
-
-import { AbstractNodeTransformer } from '../AbstractNodeTransformer';
-import { NodeGuards } from '../../node/NodeGuards';
-import { NodeLexicalScopeUtils } from '../../node/NodeLexicalScopeUtils';
-import { NodeMetadata } from '../../node/NodeMetadata';
-
-/**
- * replaces:
- *     import foo from './foo';
- *     import * as bar from './bar';
- *
- * on:
- *     import _0x12d45f from './foo';
- *     import * as _0x12d45f from './bar';
- */
-@injectable()
-export class ImportDeclarationTransformer extends AbstractNodeTransformer {
-    /**
-     * @type {IIdentifierObfuscatingReplacer}
-     */
-    private readonly identifierObfuscatingReplacer: IIdentifierObfuscatingReplacer;
-
-    /**
-     * @type {Map<ESTree.Node, ESTree.Identifier[]>}
-     */
-    private readonly replaceableIdentifiers: Map <ESTree.Node, ESTree.Identifier[]> = new Map();
-
-    /**
-     * @param {TIdentifierObfuscatingReplacerFactory} identifierObfuscatingReplacerFactory
-     * @param {IRandomGenerator} randomGenerator
-     * @param {IOptions} options
-     */
-    constructor (
-        @inject(ServiceIdentifiers.Factory__IIdentifierObfuscatingReplacer)
-            identifierObfuscatingReplacerFactory: TIdentifierObfuscatingReplacerFactory,
-        @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator,
-        @inject(ServiceIdentifiers.IOptions) options: IOptions
-    ) {
-        super(randomGenerator, options);
-
-        this.identifierObfuscatingReplacer = identifierObfuscatingReplacerFactory(
-            IdentifierObfuscatingReplacer.BaseIdentifierObfuscatingReplacer
-        );
-    }
-
-    /**
-     * @param {TImportSpecifier} importSpecifierNode
-     * @returns {boolean}
-     */
-    private static isProhibitedImportSpecifierNode (importSpecifierNode: TImportSpecifier): boolean {
-        return NodeGuards.isImportSpecifierNode(importSpecifierNode)
-            && importSpecifierNode.imported.name === importSpecifierNode.local.name;
-    }
-
-    /**
-     * @param {TransformationStage} transformationStage
-     * @returns {IVisitor | null}
-     */
-    public getVisitor (transformationStage: TransformationStage): IVisitor | null {
-        switch (transformationStage) {
-            case TransformationStage.Obfuscating:
-                return {
-                    enter: (node: ESTree.Node, parentNode: ESTree.Node | null) => {
-                        if (parentNode && NodeGuards.isImportDeclarationNode(node)) {
-                            return this.transformNode(node, parentNode);
-                        }
-                    }
-                };
-
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * @param {ImportDeclaration} importDeclarationNode
-     * @param {Node} parentNode
-     * @returns {Node}
-     */
-    public transformNode (importDeclarationNode: ESTree.ImportDeclaration, parentNode: ESTree.Node): ESTree.Node {
-        const lexicalScopeNode: TNodeWithLexicalScope | undefined = NodeLexicalScopeUtils.getLexicalScope(importDeclarationNode);
-
-        if (!lexicalScopeNode) {
-            return importDeclarationNode;
-        }
-
-        this.storeImportSpecifierNames(importDeclarationNode, lexicalScopeNode);
-
-        // check for cached identifiers for current scope node. If exist - loop through them.
-        if (this.replaceableIdentifiers.has(lexicalScopeNode)) {
-            this.replaceScopeCachedIdentifiers(lexicalScopeNode);
-        } else {
-            this.replaceScopeIdentifiers(lexicalScopeNode);
-        }
-
-        return importDeclarationNode;
-    }
-
-    /**
-     * @param {ImportDeclaration} importDeclarationNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private storeImportSpecifierNames (
-        importDeclarationNode: ESTree.ImportDeclaration,
-        lexicalScopeNode: TNodeWithLexicalScope
-    ): void {
-        importDeclarationNode.specifiers.forEach((importSpecifierNode: TImportSpecifier) => {
-            if (ImportDeclarationTransformer.isProhibitedImportSpecifierNode(importSpecifierNode)) {
-                return;
-            }
-
-            this.identifierObfuscatingReplacer.storeGlobalName(importSpecifierNode.local, lexicalScopeNode);
-        });
-    }
-
-    /**
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private replaceScopeCachedIdentifiers (lexicalScopeNode: TNodeWithLexicalScope): void {
-        const cachedReplaceableIdentifiers: ESTree.Identifier[] =
-            <ESTree.Identifier[]>this.replaceableIdentifiers.get(lexicalScopeNode);
-
-        cachedReplaceableIdentifiers.forEach((replaceableIdentifier: ESTree.Identifier) => {
-            const newReplaceableIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                .replace(replaceableIdentifier, lexicalScopeNode);
-
-            if (replaceableIdentifier.name !== newReplaceableIdentifier.name) {
-                replaceableIdentifier.name = newReplaceableIdentifier.name;
-                NodeMetadata.set(replaceableIdentifier, { renamedIdentifier: true });
-            }
-        });
-    }
-
-    /**
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private replaceScopeIdentifiers (lexicalScopeNode: TNodeWithLexicalScope): void {
-        const storedReplaceableIdentifiers: ESTree.Identifier[] = [];
-
-        estraverse.replace(lexicalScopeNode, {
-            enter: (node: ESTree.Node, parentNode: ESTree.Node | null): void => {
-                if (
-                    parentNode
-                    && NodeGuards.isReplaceableIdentifierNode(node, parentNode)
-                    && !NodeMetadata.isRenamedIdentifier(node)
-                ) {
-                    const newIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                        .replace(node, lexicalScopeNode);
-                    const newIdentifierName: string = newIdentifier.name;
-
-                    if (node.name !== newIdentifierName) {
-                        node.name = newIdentifierName;
-                        NodeMetadata.set(node, { renamedIdentifier: true });
-                    } else {
-                        storedReplaceableIdentifiers.push(node);
-                    }
-                }
-            }
-        });
-
-        this.replaceableIdentifiers.set(lexicalScopeNode, storedReplaceableIdentifiers);
-    }
-}

src/node-transformers/obfuscating-transformers/ScopeIdentifiersTransformer.ts

@@ -0,0 +1,400 @@
+import { inject, injectable, } from 'inversify';
+import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
+
+import * as eslintScope from 'eslint-scope';
+import * as ESTree from 'estree';
+import * as estraverse from 'estraverse';
+
+import { TIdentifierObfuscatingReplacerFactory } from '../../types/container/node-transformers/TIdentifierObfuscatingReplacerFactory';
+import { TNodeWithLexicalScope } from '../../types/node/TNodeWithLexicalScope';
+
+import { IIdentifierObfuscatingReplacer } from '../../interfaces/node-transformers/obfuscating-transformers/obfuscating-replacers/IIdentifierObfuscatingReplacer';
+import { IOptions } from '../../interfaces/options/IOptions';
+import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator';
+import { IScopeAnalyzer } from '../../interfaces/analyzers/scope-analyzer/IScopeAnalyzer';
+import { IVisitor } from '../../interfaces/node-transformers/IVisitor';
+
+import { IdentifierObfuscatingReplacer } from '../../enums/node-transformers/obfuscating-transformers/obfuscating-replacers/IdentifierObfuscatingReplacer';
+import { TransformationStage } from '../../enums/node-transformers/TransformationStage';
+
+import { AbstractNodeTransformer } from '../AbstractNodeTransformer';
+import { NodeGuards } from '../../node/NodeGuards';
+import { NodeMetadata } from '../../node/NodeMetadata';
+
+/**
+ * Replaces all replaceable identifiers in scope
+ */
+@injectable()
+export class ScopeIdentifiersTransformer extends AbstractNodeTransformer {
+    /**
+     * @type {string}
+     */
+    private static readonly argumentsVariableName: string = 'arguments';
+
+    /**
+     * @type {string[]}
+     */
+    private static readonly globalScopeNames: string[] = [
+        'global',
+        'module'
+    ];
+
+    /**
+     * @type {IIdentifierObfuscatingReplacer}
+     */
+    private readonly identifierObfuscatingReplacer: IIdentifierObfuscatingReplacer;
+
+    /**
+     * @type {Map<TNodeWithLexicalScope, boolean>}
+     */
+    private readonly lexicalScopesWithObjectPatternWithoutDeclarationMap: Map<TNodeWithLexicalScope, boolean> = new Map();
+
+    /**
+     * @type {IScopeAnalyzer}
+     */
+    private readonly scopeAnalyzer: IScopeAnalyzer;
+
+    /**
+     * @param {TIdentifierObfuscatingReplacerFactory} identifierObfuscatingReplacerFactory
+     * @param {IRandomGenerator} randomGenerator
+     * @param {IOptions} options
+     * @param {IScopeAnalyzer} scopeAnalyzer
+     */
+    constructor (
+        @inject(ServiceIdentifiers.Factory__IIdentifierObfuscatingReplacer)
+            identifierObfuscatingReplacerFactory: TIdentifierObfuscatingReplacerFactory,
+        @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator,
+        @inject(ServiceIdentifiers.IOptions) options: IOptions,
+        @inject(ServiceIdentifiers.IScopeAnalyzer) scopeAnalyzer: IScopeAnalyzer
+    ) {
+        super(randomGenerator, options);
+
+        this.identifierObfuscatingReplacer = identifierObfuscatingReplacerFactory(
+            IdentifierObfuscatingReplacer.BaseIdentifierObfuscatingReplacer
+        );
+        this.scopeAnalyzer = scopeAnalyzer;
+    }
+
+    /**
+     * @param {TransformationStage} transformationStage
+     * @returns {IVisitor | null}
+     */
+    public getVisitor (transformationStage: TransformationStage): IVisitor | null {
+        switch (transformationStage) {
+            case TransformationStage.Obfuscating:
+                return {
+                    enter: (node: ESTree.Node, parentNode: ESTree.Node | null) => {
+                        if (parentNode && NodeGuards.isProgramNode(node)) {
+                            this.analyzeNode(node, parentNode);
+
+                            return this.transformNode(node, parentNode);
+                        }
+                    }
+                };
+
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * @param {Program} programNode
+     * @param {Node | null} parentNode
+     * @returns {Node}
+     */
+    public analyzeNode (programNode: ESTree.Program, parentNode: ESTree.Node | null): void {
+        this.scopeAnalyzer.analyze(programNode);
+    }
+
+    /**
+     * @param {VariableDeclaration} programNode
+     * @param {NodeGuards} parentNode
+     * @returns {NodeGuards}
+     */
+    public transformNode (programNode: ESTree.Program, parentNode: ESTree.Node): ESTree.Node {
+        const globalScope: eslintScope.Scope = this.scopeAnalyzer.acquireScope(programNode);
+
+        this.traverseScopeVariables(globalScope);
+
+        return programNode;
+    }
+
+    /**
+     * @param {Scope} scope
+     */
+    private traverseScopeVariables (scope: eslintScope.Scope): void {
+        const lexicalScope: eslintScope.Scope = scope.variableScope;
+        const nodeWithLexicalScope: TNodeWithLexicalScope | null = NodeGuards.isNodeWithBlockLexicalScope(lexicalScope.block)
+            ? lexicalScope.block
+            : null;
+        const isGlobalDeclaration: boolean = ScopeIdentifiersTransformer.globalScopeNames.includes(lexicalScope.type);
+
+        if (!nodeWithLexicalScope) {
+            return;
+        }
+
+        for (const variable of scope.variables) {
+            if (variable.name === ScopeIdentifiersTransformer.argumentsVariableName) {
+                continue;
+            }
+
+            if (!this.options.renameGlobals && isGlobalDeclaration) {
+                const isImportBindingOrCatchClauseIdentifier: boolean = variable.defs
+                    .every((definition: eslintScope.Definition) =>
+                        definition.type === 'ImportBinding'
+                        || definition.type === 'CatchClause'
+                    );
+
+                // skip all global identifiers except import statement and catch clause parameter identifiers
+                if (!isImportBindingOrCatchClauseIdentifier) {
+                    continue;
+                }
+            }
+
+            this.transformScopeVariableIdentifiers(variable, nodeWithLexicalScope, isGlobalDeclaration);
+        }
+
+        for (const childScope of scope.childScopes) {
+            this.traverseScopeVariables(childScope);
+        }
+    }
+
+    /**
+     * @param {Variable} variable
+     * @param {TNodeWithLexicalScope} lexicalScopeNode
+     * @param {boolean} isGlobalDeclaration
+     */
+    private transformScopeVariableIdentifiers (
+        variable: eslintScope.Variable,
+        lexicalScopeNode: TNodeWithLexicalScope,
+        isGlobalDeclaration: boolean
+    ): void {
+        for (const identifier of variable.identifiers) {
+            if (!this.isReplaceableIdentifierNode(identifier, lexicalScopeNode, variable)) {
+                continue;
+            }
+
+            this.storeIdentifierName(identifier, lexicalScopeNode, isGlobalDeclaration);
+            this.replaceIdentifierName(identifier, lexicalScopeNode, variable);
+        }
+    }
+
+    /**
+     * @param {Identifier} identifierNode
+     * @param {TNodeWithLexicalScope} lexicalScopeNode
+     * @param {boolean} isGlobalDeclaration
+     */
+    private storeIdentifierName (
+        identifierNode: ESTree.Identifier,
+        lexicalScopeNode: TNodeWithLexicalScope,
+        isGlobalDeclaration: boolean
+    ): void {
+        if (isGlobalDeclaration) {
+            this.identifierObfuscatingReplacer.storeGlobalName(identifierNode, lexicalScopeNode);
+        } else {
+            this.identifierObfuscatingReplacer.storeLocalName(identifierNode, lexicalScopeNode);
+        }
+    }
+
+    /**
+     * @param {Identifier} identifierNode
+     * @param {TNodeWithLexicalScope} lexicalScopeNode
+     * @param {Variable} variable
+     */
+    private replaceIdentifierName (
+        identifierNode: ESTree.Identifier,
+        lexicalScopeNode: TNodeWithLexicalScope,
+        variable: eslintScope.Variable
+    ): void {
+        const newIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
+            .replace(identifierNode, lexicalScopeNode);
+
+        identifierNode.name = newIdentifier.name;
+
+        // rename of references
+        variable.references.forEach((reference: eslintScope.Reference) => {
+            reference.identifier.name = identifierNode.name;
+        });
+    }
+
+    /**
+     * @param {Identifier} identifierNode
+     * @param {TNodeWithLexicalScope} lexicalScopeNode
+     * @param {Variable} variable
+     * @returns {boolean}
+     */
+    private isReplaceableIdentifierNode (
+        identifierNode: ESTree.Identifier,
+        lexicalScopeNode: TNodeWithLexicalScope,
+        variable: eslintScope.Variable
+    ): identifierNode is ESTree.Identifier & { parentNode: ESTree.Node } {
+        const parentNode: ESTree.Node | undefined = identifierNode.parentNode;
+
+        return !!parentNode
+            && !NodeMetadata.isIgnoredNode(identifierNode)
+            && !this.isProhibitedPropertyNode(identifierNode, parentNode)
+            && !this.isProhibitedClassDeclarationNameIdentifierNode(variable, identifierNode, parentNode)
+            && !this.isProhibitedExportNamedClassDeclarationIdentifierNode(identifierNode, parentNode)
+            && !this.isProhibitedExportNamedFunctionDeclarationIdentifierNode(identifierNode, parentNode)
+            && !this.isProhibitedExportNamedVariableDeclarationIdentifierNode(identifierNode, parentNode)
+            && !this.isProhibitedImportSpecifierNode(identifierNode, parentNode)
+            && !this.isProhibitedVariableNameUsedInObjectPatternNode(variable, identifierNode, lexicalScopeNode)
+            && !NodeGuards.isLabelIdentifierNode(identifierNode, parentNode);
+    }
+
+    /**
+     * @param {Variable} variable
+     * @param {Identifier} identifierNode
+     * @param {Node} parentNode
+     * @returns {identifierNode is Identifier}
+     */
+    private isProhibitedClassDeclarationNameIdentifierNode (
+        variable: eslintScope.Variable,
+        identifierNode: ESTree.Identifier,
+        parentNode: ESTree.Node
+    ): identifierNode is ESTree.Identifier {
+        return NodeGuards.isClassDeclarationNode(variable.scope.block)
+            && NodeGuards.isClassDeclarationNode(parentNode)
+            && parentNode.id === identifierNode;
+    }
+
+    /**
+     * @param {Identifier} identifierNode
+     * @param {Node} parentNode
+     * @returns {identifierNode is Identifier}
+     */
+    private isProhibitedExportNamedClassDeclarationIdentifierNode (
+        identifierNode: ESTree.Identifier,
+        parentNode: ESTree.Node
+    ): identifierNode is ESTree.Identifier {
+        return NodeGuards.isClassDeclarationNode(parentNode)
+            && parentNode.id === identifierNode
+            && !!parentNode.parentNode
+            && NodeGuards.isExportNamedDeclarationNode(parentNode.parentNode);
+    }
+
+    /**
+     * @param {Identifier} identifierNode
+     * @param {Node} parentNode
+     * @returns {identifierNode is Identifier}
+     */
+    private isProhibitedExportNamedFunctionDeclarationIdentifierNode (
+        identifierNode: ESTree.Identifier,
+        parentNode: ESTree.Node
+    ): identifierNode is ESTree.Identifier {
+        return NodeGuards.isFunctionDeclarationNode(parentNode)
+            && parentNode.id === identifierNode
+            && !!parentNode.parentNode
+            && NodeGuards.isExportNamedDeclarationNode(parentNode.parentNode);
+    }
+
+    /**
+     * @param {Identifier} identifierNode
+     * @param {Node} parentNode
+     * @returns {identifierNode is Identifier}
+     */
+    private isProhibitedExportNamedVariableDeclarationIdentifierNode (
+        identifierNode: ESTree.Identifier,
+        parentNode: ESTree.Node
+    ): identifierNode is ESTree.Identifier {
+        return NodeGuards.isVariableDeclaratorNode(parentNode)
+            && parentNode.id === identifierNode
+            && !!parentNode.parentNode
+            && NodeGuards.isVariableDeclarationNode(parentNode.parentNode)
+            && !!parentNode.parentNode.parentNode
+            && NodeGuards.isExportNamedDeclarationNode(parentNode.parentNode.parentNode);
+    }
+
+    /**
+     * @param {Identifier} identifierNode
+     * @param {Node} parentNode
+     * @returns {boolean}
+     */
+    private isProhibitedImportSpecifierNode (identifierNode: ESTree.Identifier, parentNode: ESTree.Node): boolean {
+        return NodeGuards.isImportSpecifierNode(parentNode)
+            && parentNode.imported.name === parentNode.local.name;
+    }
+
+    /**
+     * @param {Node} node
+     * @param {Node} parentNode
+     * @returns {boolean}
+     */
+    private isProhibitedPropertyNode (node: ESTree.Node, parentNode: ESTree.Node): node is ESTree.Identifier {
+        return NodeGuards.isPropertyNode(parentNode)
+            && !parentNode.computed
+            && parentNode.key === node;
+    }
+
+    /**
+     * Should not rename identifiers that used inside destructing assignment without declaration
+     *
+     * var a, b; // should not be renamed
+     * ({a, b} = {a: 1, b: 2});
+     *
+     * @param {Variable} variable
+     * @param {Identifier} identifierNode
+     * @param {TNodeWithLexicalScope} lexicalScopeNode
+     * @returns {boolean}
+     */
+    private isProhibitedVariableNameUsedInObjectPatternNode (
+        variable: eslintScope.Variable,
+        identifierNode: ESTree.Identifier,
+        lexicalScopeNode: TNodeWithLexicalScope
+    ): boolean {
+        let isLexicalScopeHasObjectPatternWithoutDeclaration: boolean | undefined =
+            this.lexicalScopesWithObjectPatternWithoutDeclarationMap.get(lexicalScopeNode);
+
+        // lexical scope was traversed before and object pattern without declaration was not found
+        if (isLexicalScopeHasObjectPatternWithoutDeclaration === false) {
+            return false;
+        }
+
+        const hasVarDefinitions: boolean = variable.defs.some((definition: eslintScope.Definition) => (<any>definition).kind === 'var');
+
+        if (!hasVarDefinitions) {
+            return false;
+        }
+
+        let isProhibitedVariableDeclaration: boolean = false;
+
+        estraverse.traverse(lexicalScopeNode, {
+            enter: (node: ESTree.Node, parentNode: ESTree.Node | null): void | estraverse.VisitorOption => {
+                if (
+                    NodeGuards.isObjectPatternNode(node)
+                    && parentNode
+                    && NodeGuards.isAssignmentExpressionNode(parentNode)
+                ) {
+                    isLexicalScopeHasObjectPatternWithoutDeclaration = true;
+
+                    const properties: ESTree.Property[] = node.properties;
+
+                    for (const property of properties) {
+                        if (property.computed || !property.shorthand) {
+                            continue;
+                        }
+
+                        if (!NodeGuards.isIdentifierNode(property.key)) {
+                            continue;
+                        }
+
+                        if (identifierNode.name !== property.key.name) {
+                            continue;
+                        }
+
+                        isProhibitedVariableDeclaration = true;
+
+                        return estraverse.VisitorOption.Break;
+                    }
+                }
+            }
+        });
+
+        this.lexicalScopesWithObjectPatternWithoutDeclarationMap.set(
+            lexicalScopeNode,
+            isLexicalScopeHasObjectPatternWithoutDeclaration ?? false
+        );
+
+        return isProhibitedVariableDeclaration;
+    }
+}

src/node-transformers/obfuscating-transformers/VariableDeclarationTransformer.ts

@@ -1,359 +0,0 @@
-import { inject, injectable, } from 'inversify';
-import { ServiceIdentifiers } from '../../container/ServiceIdentifiers';
-
-import * as estraverse from 'estraverse';
-import * as ESTree from 'estree';
-
-import { TIdentifierObfuscatingReplacerFactory } from '../../types/container/node-transformers/TIdentifierObfuscatingReplacerFactory';
-import { TNodeWithLexicalScope } from '../../types/node/TNodeWithLexicalScope';
-import { TReplaceableIdentifiers } from '../../types/node-transformers/TReplaceableIdentifiers';
-import { TReplaceableIdentifiersNames } from '../../types/node-transformers/TReplaceableIdentifiersNames';
-
-import { IIdentifierObfuscatingReplacer } from '../../interfaces/node-transformers/obfuscating-transformers/obfuscating-replacers/IIdentifierObfuscatingReplacer';
-import { IOptions } from '../../interfaces/options/IOptions';
-import { IRandomGenerator } from '../../interfaces/utils/IRandomGenerator';
-import { IVisitor } from '../../interfaces/node-transformers/IVisitor';
-
-import { IdentifierObfuscatingReplacer } from "../../enums/node-transformers/obfuscating-transformers/obfuscating-replacers/IdentifierObfuscatingReplacer";
-import { NodeType } from '../../enums/node/NodeType';
-import { TransformationStage } from '../../enums/node-transformers/TransformationStage';
-
-import { AbstractNodeTransformer } from '../AbstractNodeTransformer';
-import { NodeGuards } from '../../node/NodeGuards';
-import { NodeLexicalScopeUtils } from '../../node/NodeLexicalScopeUtils';
-import { NodeBlockLexicalScopeUtils } from '../../node/NodeBlockLexicalScopeUtils';
-import { NodeMetadata } from '../../node/NodeMetadata';
-
-/**
- * replaces:
- *     var variable = 1;
- *     variable++;
- *
- * on:
- *     var _0x12d45f = 1;
- *     _0x12d45f++;
- *
- */
-@injectable()
-export class VariableDeclarationTransformer extends AbstractNodeTransformer {
-    /**
-     * @type {IIdentifierObfuscatingReplacer}
-     */
-    private readonly identifierObfuscatingReplacer: IIdentifierObfuscatingReplacer;
-
-    /**
-     * @type {Map<TNodeWithLexicalScope, boolean>}
-     */
-    private readonly lexicalScopesWithObjectPatternWithoutDeclarationMap: Map<TNodeWithLexicalScope, boolean> = new Map();
-
-    /**
-     * @type {TReplaceableIdentifiers}
-     */
-    private readonly replaceableIdentifiers: TReplaceableIdentifiers = new Map();
-
-    /**
-     * @param {TIdentifierObfuscatingReplacerFactory} identifierObfuscatingReplacerFactory
-     * @param {IRandomGenerator} randomGenerator
-     * @param {IOptions} options
-     */
-    constructor (
-        @inject(ServiceIdentifiers.Factory__IIdentifierObfuscatingReplacer)
-            identifierObfuscatingReplacerFactory: TIdentifierObfuscatingReplacerFactory,
-        @inject(ServiceIdentifiers.IRandomGenerator) randomGenerator: IRandomGenerator,
-        @inject(ServiceIdentifiers.IOptions) options: IOptions
-    ) {
-        super(randomGenerator, options);
-
-        this.identifierObfuscatingReplacer = identifierObfuscatingReplacerFactory(
-            IdentifierObfuscatingReplacer.BaseIdentifierObfuscatingReplacer
-        );
-    }
-
-    /**
-     * @param {TransformationStage} transformationStage
-     * @returns {IVisitor | null}
-     */
-    public getVisitor (transformationStage: TransformationStage): IVisitor | null {
-        switch (transformationStage) {
-            case TransformationStage.Obfuscating:
-                return {
-                    enter: (node: ESTree.Node, parentNode: ESTree.Node | null) => {
-                        if (
-                            parentNode
-                            && NodeGuards.isVariableDeclarationNode(node)
-                            && !NodeGuards.isExportNamedDeclarationNode(parentNode)
-                        ) {
-                            return this.transformNode(node, parentNode);
-                        }
-                    }
-                };
-
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * @param {VariableDeclaration} variableDeclarationNode
-     * @param {NodeGuards} parentNode
-     * @returns {NodeGuards}
-     */
-    public transformNode (variableDeclarationNode: ESTree.VariableDeclaration, parentNode: ESTree.Node): ESTree.Node {
-        const lexicalScopeNode: TNodeWithLexicalScope | undefined = variableDeclarationNode.kind === 'var'
-            ? NodeLexicalScopeUtils.getLexicalScope(variableDeclarationNode)
-            : NodeBlockLexicalScopeUtils.getLexicalScope(variableDeclarationNode);
-
-        if (!lexicalScopeNode) {
-            return variableDeclarationNode;
-        }
-
-        const isGlobalDeclaration: boolean = lexicalScopeNode.type === NodeType.Program;
-
-        if (!this.options.renameGlobals && isGlobalDeclaration) {
-            return variableDeclarationNode;
-        }
-
-        const scopeNode: ESTree.Node = variableDeclarationNode.kind === 'var'
-            ? lexicalScopeNode
-            : parentNode;
-
-        this.storeVariableNames(variableDeclarationNode, lexicalScopeNode, isGlobalDeclaration);
-
-        // check for cached identifiers for current scope node. If exist - loop through them.
-        if (this.replaceableIdentifiers.has(scopeNode)) {
-            this.replaceScopeCachedIdentifiers(variableDeclarationNode, lexicalScopeNode, scopeNode);
-        } else {
-            this.replaceScopeIdentifiers(scopeNode, lexicalScopeNode);
-        }
-
-        return variableDeclarationNode;
-    }
-
-    /**
-     * @param {VariableDeclaration} variableDeclarationNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     * @param {boolean} isGlobalDeclaration
-     */
-    private storeVariableNames (
-        variableDeclarationNode: ESTree.VariableDeclaration,
-        lexicalScopeNode: TNodeWithLexicalScope,
-        isGlobalDeclaration: boolean
-    ): void {
-        this.traverseDeclarationIdentifiers(
-            variableDeclarationNode,
-            (identifierNode: ESTree.Identifier) => {
-                if (
-                    this.isProhibitedVariableName(
-                        identifierNode,
-                        lexicalScopeNode,
-                        variableDeclarationNode
-                    )
-                ) {
-                    return;
-                }
-
-                if (isGlobalDeclaration) {
-                    this.identifierObfuscatingReplacer.storeGlobalName(identifierNode, lexicalScopeNode);
-                } else {
-                    this.identifierObfuscatingReplacer.storeLocalName(identifierNode, lexicalScopeNode);
-                }
-            }
-        );
-    }
-
-    /**
-     * @param {Identifier} identifierNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     * @param {VariableDeclaration} hostVariableDeclarationNode
-     * @returns {boolean}
-     */
-    private isProhibitedVariableName (
-        identifierNode: ESTree.Identifier,
-        lexicalScopeNode: TNodeWithLexicalScope,
-        hostVariableDeclarationNode: ESTree.VariableDeclaration
-    ): boolean {
-        return this.isProhibitedVariableNameUsedInObjectPatternNode(
-            identifierNode,
-            lexicalScopeNode,
-            hostVariableDeclarationNode
-        );
-    }
-
-    /**
-     * Should not rename identifiers that used inside destructing assignment without declaration
-     *
-     * var a, b; // should not be renamed
-     * ({a, b} = {a: 1, b: 2});
-     *
-     * @param {Identifier} identifierNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     * @param {VariableDeclaration} hostVariableDeclarationNode
-     * @returns {boolean}
-     */
-    private isProhibitedVariableNameUsedInObjectPatternNode (
-        identifierNode: ESTree.Identifier,
-        lexicalScopeNode: TNodeWithLexicalScope,
-        hostVariableDeclarationNode: ESTree.VariableDeclaration
-    ): boolean {
-        // should transform variable declarations that cannot be reassigned
-        if (hostVariableDeclarationNode.kind === 'const') {
-            return false;
-        }
-
-        let isLexicalScopeHasObjectPatternWithoutDeclaration: boolean | undefined =
-            this.lexicalScopesWithObjectPatternWithoutDeclarationMap.get(lexicalScopeNode);
-
-        // lexical scope was traversed before and object pattern without declaration was not found
-        if (isLexicalScopeHasObjectPatternWithoutDeclaration === false) {
-            return false;
-        }
-
-        let isProhibitedVariableDeclaration: boolean = false;
-
-        estraverse.traverse(lexicalScopeNode, {
-            enter: (node: ESTree.Node, parentNode: ESTree.Node | null): void | estraverse.VisitorOption => {
-                if (
-                    NodeGuards.isObjectPatternNode(node)
-                    && parentNode
-                    && NodeGuards.isAssignmentExpressionNode(parentNode)
-                ) {
-                    isLexicalScopeHasObjectPatternWithoutDeclaration = true;
-
-                    const properties: ESTree.Property[] = node.properties;
-
-                    for (const property of properties) {
-                        if (property.computed || !property.shorthand) {
-                            continue;
-                        }
-
-                        if (!NodeGuards.isIdentifierNode(property.key)) {
-                            continue;
-                        }
-
-                        if (identifierNode.name !== property.key.name) {
-                            continue;
-                        }
-
-                        isProhibitedVariableDeclaration = true;
-
-                        return estraverse.VisitorOption.Break;
-                    }
-                }
-            }
-        });
-
-        this.lexicalScopesWithObjectPatternWithoutDeclarationMap.set(
-            lexicalScopeNode,
-            isLexicalScopeHasObjectPatternWithoutDeclaration ?? false
-        );
-
-        return isProhibitedVariableDeclaration;
-    }
-
-    /**
-     * @param {VariableDeclaration} variableDeclarationNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     * @param {Node} scopeNode
-     */
-    private replaceScopeCachedIdentifiers (
-        variableDeclarationNode: ESTree.VariableDeclaration,
-        lexicalScopeNode: TNodeWithLexicalScope,
-        scopeNode: ESTree.Node
-    ): void {
-        const cachedReplaceableIdentifiersNamesMap: TReplaceableIdentifiersNames =
-            <TReplaceableIdentifiersNames>this.replaceableIdentifiers.get(scopeNode);
-
-        const identifierNames: string[] = [];
-
-        this.traverseDeclarationIdentifiers(variableDeclarationNode, (identifierNode: ESTree.Identifier) => {
-            identifierNames.push(identifierNode.name);
-        });
-
-        identifierNames.forEach((identifierName: string) => {
-            const cachedReplaceableIdentifiers: ESTree.Identifier[] | undefined =
-                cachedReplaceableIdentifiersNamesMap.get(identifierName);
-
-            if (!cachedReplaceableIdentifiers) {
-                return;
-            }
-
-            const cachedReplaceableIdentifierLength: number = cachedReplaceableIdentifiers.length;
-
-            for (let i: number = 0; i < cachedReplaceableIdentifierLength; i++) {
-                const replaceableIdentifier: ESTree.Identifier = cachedReplaceableIdentifiers[i];
-
-                if (identifierName !== replaceableIdentifier.name) {
-                    continue;
-                }
-
-                const newReplaceableIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                    .replace(replaceableIdentifier, lexicalScopeNode);
-
-                replaceableIdentifier.name = newReplaceableIdentifier.name;
-                NodeMetadata.set(replaceableIdentifier, { renamedIdentifier: true });
-            }
-        });
-    }
-
-    /**
-     * @param {Node} scopeNode
-     * @param {TNodeWithLexicalScope} lexicalScopeNode
-     */
-    private replaceScopeIdentifiers (scopeNode: ESTree.Node, lexicalScopeNode: TNodeWithLexicalScope): void {
-        const storedReplaceableIdentifiersNamesMap: TReplaceableIdentifiersNames = new Map();
-
-        estraverse.replace(scopeNode, {
-            enter: (node: ESTree.Node, parentNode: ESTree.Node | null): void => {
-                if (
-                    parentNode
-                    && NodeGuards.isReplaceableIdentifierNode(node, parentNode)
-                    && !NodeMetadata.isRenamedIdentifier(node)
-                ) {
-                    const newIdentifier: ESTree.Identifier = this.identifierObfuscatingReplacer
-                        .replace(node, lexicalScopeNode);
-                    const newIdentifierName: string = newIdentifier.name;
-
-                    if (node.name !== newIdentifierName) {
-                        node.name = newIdentifierName;
-                        NodeMetadata.set(node, { renamedIdentifier: true });
-                    } else {
-                        const storedReplaceableIdentifiers: ESTree.Identifier[] =
-                            storedReplaceableIdentifiersNamesMap.get(node.name) || [];
-
-                        storedReplaceableIdentifiers.push(node);
-                        storedReplaceableIdentifiersNamesMap.set(node.name, storedReplaceableIdentifiers);
-                    }
-                }
-            }
-        });
-
-        this.replaceableIdentifiers.set(scopeNode, storedReplaceableIdentifiersNamesMap);
-    }
-
-    /**
-     * @param {VariableDeclaration} variableDeclarationNode
-     * @param {(identifier: Identifier) => void} callback
-     */
-    private traverseDeclarationIdentifiers (
-        variableDeclarationNode: ESTree.VariableDeclaration,
-        callback: (
-            identifier: ESTree.Identifier,
-            variableDeclarator: ESTree.VariableDeclarator
-        ) => void
-    ): void {
-        variableDeclarationNode.declarations
-            .forEach((variableDeclaratorNode: ESTree.VariableDeclarator) => {
-                estraverse.traverse(variableDeclaratorNode.id, {
-                    enter: (node: ESTree.Node) => {
-                        if (NodeGuards.isPropertyNode(node)) {
-                            return estraverse.VisitorOption.Skip;
-                        }
-
-                        if (NodeGuards.isIdentifierNode(node)) {
-                            callback(node, variableDeclaratorNode);
-                        }
-                    }
-                });
-            });
-    }
-}

src/node-transformers/obfuscating-transformers/obfuscating-replacers/literal-obfuscating-replacers/StringLiteralObfuscatingReplacer.ts

@@ -163,9 +163,6 @@ export class StringLiteralObfuscatingReplacer extends AbstractObfuscatingReplace
 
         const stringArrayIdentifierNode: ESTree.Identifier = NodeFactory.identifierNode(this.stringArrayStorageCallsWrapperName);
 
-        // prevent obfuscation of this identifier
-        NodeMetadata.set(stringArrayIdentifierNode, { renamedIdentifier: true });
-
         return NodeFactory.callExpressionNode(
             stringArrayIdentifierNode,
             callExpressionArgs

src/node-transformers/preparing-transformers/MetadataTransformer.ts

@@ -55,10 +55,6 @@ export class MetadataTransformer extends AbstractNodeTransformer {
     public transformNode (node: ESTree.Node, parentNode: ESTree.Node | null): ESTree.Node {
         NodeMetadata.set(node, { ignoredNode: false });
 
-        if (NodeGuards.isIdentifierNode(node)) {
-            NodeMetadata.set(node, { renamedIdentifier: false });
-        }
-
         if (NodeGuards.isLiteralNode(node)) {
             NodeMetadata.set(node, { replacedLiteral: false });
         }

src/node/NodeBlockLexicalScopeUtils.ts

@@ -1,57 +0,0 @@
-import * as ESTree from 'estree';
-
-import { TNodeWithLexicalScope } from '../types/node/TNodeWithLexicalScope';
-
-import { NodeGuards } from './NodeGuards';
-
-export class NodeBlockLexicalScopeUtils {
-    /**
-     * @param {Node} node
-     * @returns {TNodeWithLexicalScope}
-     */
-    public static getLexicalScope (node: ESTree.Node): TNodeWithLexicalScope | undefined {
-        return NodeBlockLexicalScopeUtils.getLexicalScopesRecursive(node, 1)[0];
-    }
-
-    /**
-     * @param {Node} node
-     * @returns {TNodeWithLexicalScope[]}
-     */
-    public static getLexicalScopes (node: ESTree.Node): TNodeWithLexicalScope[] {
-        return NodeBlockLexicalScopeUtils.getLexicalScopesRecursive(node);
-    }
-
-    /***
-     * @param {Node} node
-     * @param {number} maxSize
-     * @param {TNodeWithLexicalScope[]} nodesWithLexicalScope
-     * @param {number} depth
-     * @returns {TNodeWithLexicalScope[]}
-     */
-    private static getLexicalScopesRecursive (
-        node: ESTree.Node,
-        maxSize: number = Infinity,
-        nodesWithLexicalScope: TNodeWithLexicalScope[] = [],
-        depth: number = 0
-    ): TNodeWithLexicalScope[] {
-        if (nodesWithLexicalScope.length >= maxSize) {
-            return nodesWithLexicalScope;
-        }
-
-        const parentNode: ESTree.Node | undefined = node.parentNode;
-
-        if (!parentNode) {
-            throw new ReferenceError('`parentNode` property of given node is `undefined`');
-        }
-
-        if (NodeGuards.isNodeWithBlockLexicalScope(node)) {
-            nodesWithLexicalScope.push(node);
-        }
-
-        if (node !== parentNode) {
-            return NodeBlockLexicalScopeUtils.getLexicalScopesRecursive(parentNode, maxSize, nodesWithLexicalScope, ++depth);
-        }
-
-        return nodesWithLexicalScope;
-    }
-}

src/node/NodeGuards.ts

@@ -394,19 +394,6 @@ export class NodeGuards {
             && !parentNode.computed;
     }
 
-    /**
-     * @param {Node} node
-     * @param {Node} parentNode
-     * @returns {boolean}
-     */
-    public static isReplaceableIdentifierNode (node: ESTree.Node, parentNode: ESTree.Node): node is ESTree.Identifier {
-        return NodeGuards.isIdentifierNode(node)
-            && !NodeGuards.parentNodeIsPropertyNode(node, parentNode)
-            && !NodeGuards.parentNodeIsMemberExpressionNode(node, parentNode)
-            && !NodeGuards.parentNodeIsMethodDefinitionNode(node, parentNode)
-            && !NodeGuards.isLabelIdentifierNode(node, parentNode);
-    }
-
     /**
      * @param {Node} node
      * @returns {boolean}

src/node/NodeMetadata.ts

@@ -28,14 +28,6 @@ export class NodeMetadata {
         return NodeMetadata.get(node, 'ignoredNode') === true;
     }
 
-    /**
-     * @param {Node} identifierNode
-     * @returns {boolean}
-     */
-    public static isRenamedIdentifier (identifierNode: ESTree.Identifier): boolean {
-        return NodeMetadata.get<ESTree.IdentifierNodeMetadata>(identifierNode, 'renamedIdentifier') === true;
-    }
-
     /**
      * @param {Node} literalNode
      * @returns {boolean}

test/dev/dev.ts

@@ -1,24 +1,22 @@
 'use strict';
 
 import { NO_ADDITIONAL_NODES_PRESET } from '../../src/options/presets/NoCustomNodes';
+import { IdentifierNamesGenerator } from '../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
 
 (function () {
     const JavaScriptObfuscator: any = require('../../index');
 
     let obfuscatedCode: string = JavaScriptObfuscator.obfuscate(
         `
-            var foo = 'foo';
-            var bar = 'bar';
-            var baz = 'baz';
-            var bark = 'bark';
-            
-            console.log(foo, bar, baz, bark);
+            function f(obj) {
+                const {c} = obj;
+            }
         `,
         {
             ...NO_ADDITIONAL_NODES_PRESET,
-            stringArray: true,
-            stringArrayThreshold: 1,
-            shuffleStringArray: true
+            compact: false,
+            renameGlobals: true,
+            identifierNamesGenerator: IdentifierNamesGenerator.MangledIdentifierNamesGenerator
         }
     ).getObfuscatedCode();
 

test/functional-tests/node-transformers/converting-transformers/object-expression-keys-transformer/ObjectExpressionKeysTransformer.spec.ts

@@ -99,7 +99,7 @@ describe('ObjectExpressionKeysTransformer', () => {
                 `${variableMatch}\\['foo'] *= *'bar';` +
                 `${variableMatch}\\['baz'] *= *'bark';` +
                 `var *${variableMatch} *= *\\[${variableMatch}];` +
-                ``;
+            ``;
             const regExp: RegExp = new RegExp(match);
 
             let obfuscatedCode: string;

test/functional-tests/node-transformers/obfuscating-transformers/catch-clause-transformer/CatchClauseTransformer.spec.ts → test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/catch-clause/CatchClause.spec.ts

@@ -1,13 +1,13 @@
 import { assert } from 'chai';
 
-import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../src/options/presets/NoCustomNodes';
+import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../../src/options/presets/NoCustomNodes';
 
-import { getRegExpMatch } from '../../../../helpers/getRegExpMatch';
-import { readFileAsString } from '../../../../helpers/readFileAsString';
+import { getRegExpMatch } from '../../../../../helpers/getRegExpMatch';
+import { readFileAsString } from '../../../../../helpers/readFileAsString';
 
-import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade';
+import { JavaScriptObfuscator } from '../../../../../../src/JavaScriptObfuscatorFacade';
 
-describe('CatchClauseTransformer', () => {
+describe('ScopeIdentifiersTransformer CatchClause identifiers', () => {
     let obfuscatedCode: string;
 
     describe('Variant #1: base transform of catch clause parameter', () => {
@@ -90,4 +90,45 @@ describe('CatchClauseTransformer', () => {
             assert.match(obfuscatedCode, bodyParamNameRegExp);
         });
     });
+
+    describe('Variant #4: global variable scope', () => {
+        describe('Variant #1: `renameGlobals` is disabled', () => {
+            const globalVariableRegExp: RegExp = /var test *= *0x1;/;
+
+            before(() => {
+                const code: string = readFileAsString(__dirname + '/fixtures/global-variable-scope.js');
+
+                obfuscatedCode = JavaScriptObfuscator.obfuscate(
+                    code,
+                    {
+                        ...NO_ADDITIONAL_NODES_PRESET
+                    }
+                ).getObfuscatedCode();
+            });
+
+            it('match #1: shouldn\'t transform variable identifier if `renameGlobals` option is disabled', () => {
+                assert.match(obfuscatedCode, globalVariableRegExp);
+            });
+        });
+
+        describe('Variant #2: `renameGlobals` is enabled', () => {
+            const globalVariableRegExp: RegExp = /var _0x([a-f0-9]){4,6} *= *0x1;/;
+
+            before(() => {
+                const code: string = readFileAsString(__dirname + '/fixtures/global-variable-scope.js');
+
+                obfuscatedCode = JavaScriptObfuscator.obfuscate(
+                    code,
+                    {
+                        ...NO_ADDITIONAL_NODES_PRESET,
+                        renameGlobals: true
+                    }
+                ).getObfuscatedCode();
+            });
+
+            it('match #1: should transform variable identifier if `renameGlobals` option is enabled', () => {
+                assert.match(obfuscatedCode, globalVariableRegExp);
+            });
+        });
+    });
 });

test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/catch-clause/fixtures/global-variable-scope.js

@@ -0,0 +1,5 @@
+try {
+
+} catch (e) {
+    var test = 1;
+}

test/functional-tests/node-transformers/obfuscating-transformers/class-declaration-transformer/ClassDeclarationTransformer.spec.ts → test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/class-declaration/ClassDeclaration.spec.ts

@@ -1,14 +1,14 @@
 import { assert } from 'chai';
 
-import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../src/options/presets/NoCustomNodes';
+import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../../src/options/presets/NoCustomNodes';
 
-import { getRegExpMatch } from '../../../../helpers/getRegExpMatch';
-import { readFileAsString } from '../../../../helpers/readFileAsString';
+import { getRegExpMatch } from '../../../../../helpers/getRegExpMatch';
+import { readFileAsString } from '../../../../../helpers/readFileAsString';
 
-import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade';
-import { IdentifierNamesGenerator } from '../../../../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
+import { JavaScriptObfuscator } from '../../../../../../src/JavaScriptObfuscatorFacade';
+import { IdentifierNamesGenerator } from '../../../../../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
 
-describe('ClassDeclarationTransformer', () => {
+describe('ScopeIdentifiersTransformer ClassDeclaration identifiers', () => {
     describe('transformation of `classDeclaration` node names', () => {
         describe('Variant #1: `classDeclaration` parent block scope is not a `ProgramNode`', () => {
             const classNameIdentifierRegExp: RegExp = /class *(_0x[a-f0-9]{4,6}) *\{/;
@@ -123,6 +123,7 @@ describe('ClassDeclarationTransformer', () => {
         describe('Variant #3: already renamed identifiers shouldn\'t be renamed twice', () => {
             const classDeclarationRegExp: RegExp = /class *d *{/;
             const variableDeclarationsRegExp: RegExp = /let *e, *f, *g, *h;/;
+            const classReferenceRegExp: RegExp = /new d\(\);/;
 
             let obfuscatedCode: string;
 
@@ -145,6 +146,10 @@ describe('ClassDeclarationTransformer', () => {
             it('Match #2: should correctly rename variable declarations', () => {
                 assert.match(obfuscatedCode, variableDeclarationsRegExp);
             });
+
+            it('Match #3: should correctly rename class reference identifier', () => {
+                assert.match(obfuscatedCode, classReferenceRegExp);
+            });
         });
 
         describe('Variant #5: named export', () => {

test/functional-tests/node-transformers/obfuscating-transformers/class-declaration-transformer/fixtures/prevent-renaming-of-renamed-identifiers.js → test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/class-declaration/fixtures/prevent-renaming-of-renamed-identifiers.js

@@ -2,5 +2,6 @@
     function test() {
         class inner {}
         let a, b, c, d;
+        new inner();
     }
 })();

test/functional-tests/node-transformers/obfuscating-transformers/function-declaration-transformer/FunctionDeclarationTransformer.spec.ts → test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/function-declaration/FunctionDeclaration.spec.ts

@@ -1,14 +1,14 @@
 import { assert } from 'chai';
 
-import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../src/options/presets/NoCustomNodes';
+import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../../src/options/presets/NoCustomNodes';
 
-import { getRegExpMatch } from '../../../../helpers/getRegExpMatch';
-import { readFileAsString } from '../../../../helpers/readFileAsString';
+import { getRegExpMatch } from '../../../../../helpers/getRegExpMatch';
+import { readFileAsString } from '../../../../../helpers/readFileAsString';
 
-import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade';
-import { IdentifierNamesGenerator } from '../../../../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
+import { JavaScriptObfuscator } from '../../../../../../src/JavaScriptObfuscatorFacade';
+import { IdentifierNamesGenerator } from '../../../../../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
 
-describe('FunctionDeclarationTransformer', () => {
+describe('ScopeIdentifiersTransformer FunctionDeclaration identifiers', () => {
     describe('transformation of `functionDeclaration` node names', () => {
         describe('Variant #1: `functionDeclaration` parent block scope is not a `ProgramNode`', () => {
             const functionNameIdentifierRegExp: RegExp = /function *(_0x[a-f0-9]{4,6}) *\(\) *\{/;

test/functional-tests/node-transformers/obfuscating-transformers/function-transformer/FunctionTransformer.spec.ts → test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/function/Function.spec.ts

@@ -1,21 +1,25 @@
 import { assert } from 'chai';
 
-import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../src/options/presets/NoCustomNodes';
+import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../../src/options/presets/NoCustomNodes';
 
-import { readFileAsString } from '../../../../helpers/readFileAsString';
+import { readFileAsString } from '../../../../../helpers/readFileAsString';
 
-import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade';
-import { getRegExpMatch } from '../../../../helpers/getRegExpMatch';
+import { JavaScriptObfuscator } from '../../../../../../src/JavaScriptObfuscatorFacade';
+import { getRegExpMatch } from '../../../../../helpers/getRegExpMatch';
 
-describe('FunctionTransformer', () => {
+describe('ScopeIdentifiersTransformer Function identifiers', () => {
     describe('identifiers transformation inside `FunctionDeclaration` and `FunctionExpression` node body', () => {
         const functionParamIdentifierRegExp: RegExp = /var _0x[a-f0-9]{4,6} *= *function *\((_0x[a-f0-9]{4,6})\) *\{/;
         const functionBodyIdentifierRegExp: RegExp = /console\['log'\]\((_0x[a-f0-9]{4,6})\)/;
-        const variableRegExp: RegExp = /variable *= *0x6;/;
+        const variableDeclarationRegExp: RegExp = /var (_0x[a-f0-9]{4,6}) *= *0x5;/;
+        const variableReferenceRegExp: RegExp = /variable *= *0x6;/;
+        const returnStatementIdentifierRegExp: RegExp = /return (_0x[a-f0-9]{4,6});/;
 
         let obfuscatedCode: string,
             functionParamIdentifierName: string,
-            functionBodyIdentifierName: string;
+            functionBodyIdentifierName: string,
+            variableDeclarationIdentifierName: string,
+            returnStatementIdentifierName: string;
 
         before(() => {
             const code: string = readFileAsString(__dirname + '/fixtures/input.js');
@@ -31,29 +35,43 @@ describe('FunctionTransformer', () => {
                 .match(functionParamIdentifierRegExp);
             const functionBodyIdentifierMatch: RegExpMatchArray|null = obfuscatedCode
                 .match(functionBodyIdentifierRegExp);
+            const variableDeclarationIdentifierMatch: RegExpMatchArray|null = obfuscatedCode
+                .match(variableDeclarationRegExp);
+            const returnStatementIdentifierMatch: RegExpMatchArray|null = obfuscatedCode
+                .match(returnStatementIdentifierRegExp);
 
             functionParamIdentifierName = (<RegExpMatchArray>functionParamIdentifierMatch)[1];
             functionBodyIdentifierName = (<RegExpMatchArray>functionBodyIdentifierMatch)[1];
+            variableDeclarationIdentifierName = (<RegExpMatchArray>variableDeclarationIdentifierMatch)[1];
+            returnStatementIdentifierName = (<RegExpMatchArray>returnStatementIdentifierMatch)[1];
         });
 
-        it('should correctly transform both function parameter identifier and function body identifier with same name', () => {
-            assert.equal(functionParamIdentifierName, functionBodyIdentifierName);
+        it('should generate different names for function parameter identifier and function body identifier with same name', () => {
+            assert.notEqual(functionParamIdentifierName, functionBodyIdentifierName);
+        });
+
+        it('should generate different names for function parameter identifier and variable declaration identifier with same name', () => {
+            assert.notEqual(functionParamIdentifierName, variableDeclarationIdentifierName);
+        });
+
+        it('should correctly transform both variable declaration identifier and return statement identifier with same name', () => {
+            assert.equal(variableDeclarationIdentifierName, returnStatementIdentifierName);
         });
 
         it('shouldn\'t transform other variables in function body', () => {
-            assert.match(obfuscatedCode, variableRegExp);
+            assert.match(obfuscatedCode, variableReferenceRegExp);
         });
     });
 
     describe('function id name obfuscation', () => {
         describe('Variant #1', () => {
             const functionExpressionParamIdentifierRegExp: RegExp = /\(function *\((_0x[a-f0-9]{4,6})\) *\{/;
-            const functionParamIdentifierRegExp: RegExp = /function *(_0x[a-f0-9]{4,6}) *\(\) *\{/;
+            const innerFunctionNameIdentifierRegExp: RegExp = /function *(_0x[a-f0-9]{4,6}) *\(\) *\{/;
             const functionObjectIdentifierRegExp: RegExp = /return new (_0x[a-f0-9]{4,6}) *\(\);/;
 
             let obfuscatedCode: string,
                 functionExpressionParamIdentifierName: string,
-                functionParamIdentifierName: string,
+                innerFunctionNameIdentifierName: string,
                 functionObjectIdentifierName: string;
 
             before(() => {
@@ -68,13 +86,13 @@ describe('FunctionTransformer', () => {
 
                 const functionExpressionParamIdentifierMatch: RegExpMatchArray|null = obfuscatedCode
                     .match(functionExpressionParamIdentifierRegExp);
-                const functionParamIdentifierMatch: RegExpMatchArray|null = obfuscatedCode
-                    .match(functionParamIdentifierRegExp);
+                const innerFunctionNameIdentifierMatch: RegExpMatchArray|null = obfuscatedCode
+                    .match(innerFunctionNameIdentifierRegExp);
                 const functionObjectIdentifierMatch: RegExpMatchArray|null = obfuscatedCode
                     .match(functionObjectIdentifierRegExp);
 
-                functionParamIdentifierName = (<RegExpMatchArray>functionParamIdentifierMatch)[1];
                 functionExpressionParamIdentifierName = (<RegExpMatchArray>functionExpressionParamIdentifierMatch)[1];
+                innerFunctionNameIdentifierName = (<RegExpMatchArray>innerFunctionNameIdentifierMatch)[1];
                 functionObjectIdentifierName = (<RegExpMatchArray>functionObjectIdentifierMatch)[1];
             });
 
@@ -83,7 +101,7 @@ describe('FunctionTransformer', () => {
             });
 
             it('should correctly transform function parameter identifier', () => {
-                assert.match(obfuscatedCode, functionParamIdentifierRegExp);
+                assert.match(obfuscatedCode, innerFunctionNameIdentifierRegExp);
             });
 
             it('should correctly transform function object parameter identifier', () => {
@@ -91,15 +109,15 @@ describe('FunctionTransformer', () => {
             });
 
             it('should generate same names for function parameter and function object identifiers', () => {
-                assert.equal(functionParamIdentifierName, functionObjectIdentifierName);
+                assert.equal(innerFunctionNameIdentifierName, functionObjectIdentifierName);
             });
 
-            it('should generate same names for function parameter identifiers', () => {
-                assert.equal(functionExpressionParamIdentifierName, functionParamIdentifierName);
+            it('shouldn\'t generate same names for function parameter identifiers', () => {
+                assert.notEqual(functionExpressionParamIdentifierName, innerFunctionNameIdentifierName);
             });
 
-            it('should generate same names for function expression parameter and function object identifiers', () => {
-                assert.equal(functionExpressionParamIdentifierName, functionObjectIdentifierName);
+            it('shouldn\'t generate same names for function expression parameter and function object identifiers', () => {
+                assert.notEqual(functionExpressionParamIdentifierName, functionObjectIdentifierName);
             });
         });
 
@@ -144,8 +162,8 @@ describe('FunctionTransformer', () => {
                 assert.equal(functionIdentifierName, functionObjectIdentifierName);
             });
 
-            it('should generate same names for function id and parameter identifiers', () => {
-                assert.equal(functionIdentifierName, functionParamIdentifierName);
+            it('should\'t generate same names for function id and parameter identifiers', () => {
+                assert.notEqual(functionIdentifierName, functionParamIdentifierName);
             });
         });
 
@@ -243,12 +261,12 @@ describe('FunctionTransformer', () => {
                     assert.equal(functionIdentifierName, functionObjectIdentifierName);
                 });
 
-                it('should generate same names for function parameter and function object identifiers', () => {
-                    assert.equal(functionParamIdentifierName, functionObjectIdentifierName);
+                it('shouldn\'t generate same names for function parameter and function object identifiers', () => {
+                    assert.notEqual(functionParamIdentifierName, functionObjectIdentifierName);
                 });
 
-                it('should generate same names for function id and parameter identifiers', () => {
-                    assert.equal(functionIdentifierName, functionParamIdentifierName);
+                it('shouldn\'t generate same names for function id and parameter identifiers', () => {
+                    assert.notEqual(functionIdentifierName, functionParamIdentifierName);
                 });
             });
         });
@@ -388,6 +406,26 @@ describe('FunctionTransformer', () => {
                 assert.match(obfuscatedCode, returnRegExp);
             });
         });
+
+        describe('Variant #5: skip rename of object pattern referenced identifier', () => {
+            const objectPatternRegExp: RegExp = /const _0x[a-f0-9]{4,6} *= *\[]\['map']\(\({ *foo *}\) *=> *foo\);/;
+            let obfuscatedCode: string;
+
+            before(() => {
+                const code: string = readFileAsString(__dirname + '/fixtures/object-pattern-as-parameter-5.js');
+
+                obfuscatedCode = JavaScriptObfuscator.obfuscate(
+                    code,
+                    {
+                        ...NO_ADDITIONAL_NODES_PRESET
+                    }
+                ).getObfuscatedCode();
+            });
+
+            it('match #1: shouldn\'t transform function parameter identifier and reference identifier', () => {
+                assert.match(obfuscatedCode, objectPatternRegExp);
+            });
+        });
     });
 
     describe('assignment pattern as parameter', () => {
@@ -508,16 +546,16 @@ describe('FunctionTransformer', () => {
                 assert.match(obfuscatedCode, functionBodyRegExp);
             });
 
-            it('equal #1: should keep same names for variable declaration identifier and function parameters identifiers', () => {
-                assert.equal(variableDeclarationIdentifierName, functionParameterIdentifierName);
+            it('equal #1:shouldn\'t keep same names for variable declaration identifier and function parameters identifiers', () => {
+                assert.notEqual(variableDeclarationIdentifierName, functionParameterIdentifierName);
             });
 
             it('equal #2: shouldn\'t keep same names for variable declaration identifier and function parameters identifiers', () => {
                 assert.notEqual(variableDeclarationIdentifierName, functionDefaultParameterIdentifierName1);
             });
 
-            it('equal #3: should keep same names for variable declaration identifier and function parameters identifiers', () => {
-                assert.equal(variableDeclarationIdentifierName, functionDefaultParameterIdentifierName2);
+            it('equal #3: shouldn\'t keep same names for variable declaration identifier and function parameters identifiers', () => {
+                assert.notEqual(variableDeclarationIdentifierName, functionDefaultParameterIdentifierName2);
             });
 
             it('equal #4: should keep same names for identifier in first function parameter and default value identifier of second function parameter', () => {
@@ -646,6 +684,41 @@ describe('FunctionTransformer', () => {
         });
     });
 
+    describe('parameter default value', () => {
+        describe('Variant #1: default parameter as identifier', () => {
+            const variableDeclarationRegExp: RegExp = /var bar *= *0x1;/;
+            const functionParameterRegExp: RegExp = /function func *\(_0x[a-f0-9]{4,6} *= *bar\) *\{/;
+            const functionBodyRegExp: RegExp = /return *_0x[a-f0-9]{4,6} *\+ *bar;/;
+
+            let obfuscatedCode: string;
+
+            before(() => {
+                const code: string = readFileAsString(__dirname + '/fixtures/default-parameter-as-identifier.js');
+
+                obfuscatedCode = JavaScriptObfuscator.obfuscate(
+                    code,
+                    {
+                        ...NO_ADDITIONAL_NODES_PRESET
+                    }
+                ).getObfuscatedCode();
+            });
+
+            it('match #1: shouldn transform variable declaration', () => {
+                assert.match(obfuscatedCode, variableDeclarationRegExp);
+            });
+
+            it('match #2: shouldn transform function parameters', () => {
+                assert.match(obfuscatedCode, functionParameterRegExp);
+            });
+
+            it('match #3: shouldn transform function body', () => {
+                assert.match(obfuscatedCode, functionBodyRegExp);
+            });
+        });
+
+
+    });
+
     describe('ignored identifier names set', () => {
         describe('Variant #1: avoid to add `ObjectPattern` identifier to the set when same identifier exist in function parameter', () => {
             const functionBodyRegExp: RegExp = /\[]\['find']\(\({bar: *_0x[a-f0-9]{4,6}}\) *=> *_0x[a-f0-9]{4,6}\);/;

test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/function/fixtures/default-parameter-as-identifier.js

@@ -0,0 +1,4 @@
+var bar = 1;
+function func (foo = bar) {
+    return foo + bar;
+}

test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/function/fixtures/object-pattern-as-parameter-5.js

@@ -0,0 +1,3 @@
+(function(){
+    const foo = [].map(({ foo }) => foo);
+})();

test/functional-tests/node-transformers/obfuscating-transformers/impot-declaration-transformer/ImportDeclarationTransformer.spec.ts → test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/import-declaration/ImportDeclaration.spec.ts

@@ -1,13 +1,13 @@
 import { assert } from 'chai';
 
-import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../src/options/presets/NoCustomNodes';
+import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../../src/options/presets/NoCustomNodes';
 
-import { getRegExpMatch } from '../../../../helpers/getRegExpMatch';
-import { readFileAsString } from '../../../../helpers/readFileAsString';
+import { getRegExpMatch } from '../../../../../helpers/getRegExpMatch';
+import { readFileAsString } from '../../../../../helpers/readFileAsString';
 
-import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade';
+import { JavaScriptObfuscator } from '../../../../../../src/JavaScriptObfuscatorFacade';
 
-describe('ImportDeclarationTransformer', () => {
+describe('ScopeIdentifiersTransformer ImportDeclaration identifiers', () => {
     describe('transformation of `importSpecifier` node identifiers', () => {
         describe('Variant #1: `defaultImportSpecifier` node', () => {
             const importSpecifierRegExp: RegExp = /import (_0x[a-f0-9]{4,6}) from *'\.\/foo';/;

test/functional-tests/node-transformers/obfuscating-transformers/variable-declaration-transformer/VariableDeclarationTransformer.spec.ts → test/functional-tests/node-transformers/obfuscating-transformers/scope-identifiers-transformer/variable-declaration/VariableDeclaration.spec.ts

@@ -1,15 +1,15 @@
 import { assert } from 'chai';
 
-import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../src/options/presets/NoCustomNodes';
+import { NO_ADDITIONAL_NODES_PRESET } from '../../../../../../src/options/presets/NoCustomNodes';
 
-import { getRegExpMatch } from '../../../../helpers/getRegExpMatch';
-import { readFileAsString } from '../../../../helpers/readFileAsString';
+import { getRegExpMatch } from '../../../../../helpers/getRegExpMatch';
+import { readFileAsString } from '../../../../../helpers/readFileAsString';
 
-import { IdentifierNamesGenerator } from '../../../../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
+import { IdentifierNamesGenerator } from '../../../../../../src/enums/generators/identifier-names-generators/IdentifierNamesGenerator';
 
-import { JavaScriptObfuscator } from '../../../../../src/JavaScriptObfuscatorFacade';
+import { JavaScriptObfuscator } from '../../../../../../src/JavaScriptObfuscatorFacade';
 
-describe('VariableDeclarationTransformer', () => {
+describe('ScopeIdentifiersTransformer VariableDeclaration identifiers', () => {
     describe('Variant #1: default behaviour', () => {
         const variableDeclarationRegExp: RegExp = /var *_0x([a-f0-9]){4,6} *= *'abc';/;
         const variableCallRegExp: RegExp = /console\['log'\]\(_0x([a-f0-9]){4,6}\);/;
@@ -189,28 +189,28 @@ describe('VariableDeclarationTransformer', () => {
             variableDeclarationIdentifierName = getRegExpMatch(obfuscatedCode, variableDeclarationIdentifierRegExp);
         });
 
-        it('equal #1: should generate same names for identifiers inside inner function and outer function params', () => {
-            assert.equal(outerFunctionParamIdentifierName, consoleLogIdentifierName);
+        it('equal #1: should generate different names for identifiers inside inner function and outer function params', () => {
+            assert.notEqual(outerFunctionParamIdentifierName, consoleLogIdentifierName);
         });
 
-        it('equal #2: should generate same names for identifiers inside inner function and inner function params', () => {
-            assert.equal(outerFunctionParamIdentifierName, innerFunctionParamIdentifierName);
+        it('equal #2: should generate same names for identifiers of outer function params and inner function params', () => {
+            assert.notEqual(outerFunctionParamIdentifierName, innerFunctionParamIdentifierName);
         });
 
         it('equal #1: should correct transform variables inside outer function body', () => {
-            assert.equal(outerFunctionParamIdentifierName, objectIdentifierName);
+            assert.notEqual(outerFunctionParamIdentifierName, objectIdentifierName);
         });
 
         it('equal #2: should correct transform variables inside outer function body', () => {
-            assert.equal(outerFunctionParamIdentifierName, variableDeclarationIdentifierName);
+            assert.notEqual(outerFunctionParamIdentifierName, variableDeclarationIdentifierName);
         });
 
-        it('should correct transform variables inside inner function body', () => {
-            assert.equal(innerFunctionParamIdentifierName, consoleLogIdentifierName);
+        it('equal #3: should correct transform variables inside outer function body', () => {
+            assert.equal(variableDeclarationIdentifierName, objectIdentifierName);
         });
 
-        it('should keep equal names after transformation for variables with same names', () => {
-            assert.equal(variableDeclarationIdentifierName, objectIdentifierName);
+        it('should correct transform variables inside inner function body', () => {
+            assert.equal(innerFunctionParamIdentifierName, consoleLogIdentifierName);
         });
     });
 
@@ -244,20 +244,20 @@ describe('VariableDeclarationTransformer', () => {
             variableDeclarationIdentifierName = getRegExpMatch(obfuscatedCode, variableDeclarationIdentifierRegExp);
         });
 
-        it('match #1: should generate same names for identifiers inside inner function and catch clause param', () => {
-            assert.equal(catchClauseParamIdentifierName, consoleLogIdentifierName);
+        it('match #1: should generate different names for identifiers inside inner function and catch clause param', () => {
+            assert.notEqual(catchClauseParamIdentifierName, consoleLogIdentifierName);
         });
 
-        it('match #2: should generate same names for identifiers inside inner function and catch clause param', () => {
-            assert.equal(catchClauseParamIdentifierName, innerFunctionParamIdentifierName);
+        it('match #2: should generate different names for identifiers inside inner function and catch clause param', () => {
+            assert.notEqual(catchClauseParamIdentifierName, innerFunctionParamIdentifierName);
         });
 
         it('equal #1: should correct transform variables inside catch clause body', () => {
-            assert.equal(catchClauseParamIdentifierName, objectIdentifierName);
+            assert.notEqual(catchClauseParamIdentifierName, objectIdentifierName);
         });
 
         it('equal #2: should correct transform variables inside catch clause body', () => {
-            assert.equal(catchClauseParamIdentifierName, variableDeclarationIdentifierName);
+            assert.notEqual(catchClauseParamIdentifierName, variableDeclarationIdentifierName);
         });
 
         it('should correct transform variables inside inner function body', () => {
@@ -471,7 +471,7 @@ describe('VariableDeclarationTransformer', () => {
             const variableDeclarationRegExp1: RegExp = /var *d *= *0x1;/;
             const variableDeclarationRegExp2: RegExp = /var *e;/;
             const functionDeclarationRegExp: RegExp = /function *f *\(\) *{/;
-            const variableDeclarationRegExp3: RegExp = /var *f *= *function *\(\) *{}/;
+            const variableDeclarationRegExp3: RegExp = /var *g *= *function *\(\) *{}/;
 
             let obfuscatedCode: string;