Moved ScopeThroughIdentifiersTransformer to the obfuscation transfo…

…rmers
dgilling · Aug 18, 2020 · 3970513 · 3970513
1 parent 0f2f0c2
commit 3970513
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/dist/index.browser.js b/dist/index.browser.js
diff --git a/dist/index.cli.js b/dist/index.cli.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/container/modules/node-transformers/DeadCodeInjectionTransformersModule.ts b/src/container/modules/node-transformers/DeadCodeInjectionTransformersModule.ts
@@ -6,15 +6,10 @@ import { INodeTransformer } from '../../../interfaces/node-transformers/INodeTra
 import { NodeTransformer } from '../../../enums/node-transformers/NodeTransformer';
 
 import { DeadCodeInjectionTransformer } from '../../../node-transformers/dead-code-injection-transformers/DeadCodeInjectionTransformer';
-import { ScopeThroughIdentifiersTransformer } from '../../../node-transformers/dead-code-injection-transformers/ScopeThroughIdentifiersTransformer';
 
 export const deadCodeInjectionTransformersModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
     // dead code injection
     bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
         .to(DeadCodeInjectionTransformer)
         .whenTargetNamed(NodeTransformer.DeadCodeInjectionTransformer);
-
-    bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
-        .to(ScopeThroughIdentifiersTransformer)
-        .whenTargetNamed(NodeTransformer.ScopeThroughIdentifiersTransformer);
 });
diff --git a/src/container/modules/node-transformers/ObfuscatingTransformersModule.ts b/src/container/modules/node-transformers/ObfuscatingTransformersModule.ts
@@ -17,6 +17,7 @@ import { LiteralTransformer } from '../../../node-transformers/obfuscating-trans
 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 { ScopeIdentifiersTransformer } from '../../../node-transformers/obfuscating-transformers/ScopeIdentifiersTransformer';
+import { ScopeThroughIdentifiersTransformer } from '../../../node-transformers/obfuscating-transformers/ScopeThroughIdentifiersTransformer';
 
 export const obfuscatingTransformersModule: interfaces.ContainerModule = new ContainerModule((bind: interfaces.Bind) => {
     // obfuscating transformers
@@ -32,6 +33,10 @@ export const obfuscatingTransformersModule: interfaces.ContainerModule = new Con
         .to(ScopeIdentifiersTransformer)
         .whenTargetNamed(NodeTransformer.ScopeIdentifiersTransformer);
 
+    bind<INodeTransformer>(ServiceIdentifiers.INodeTransformer)
+        .to(ScopeThroughIdentifiersTransformer)
+        .whenTargetNamed(NodeTransformer.ScopeThroughIdentifiersTransformer);
+
     // literal obfuscating replacers
     bind<IObfuscatingReplacer>(ServiceIdentifiers.IObfuscatingReplacer)
         .to(BooleanLiteralObfuscatingReplacer)

diff --git a/src/node-transformers/dead-code-injection-transformers/DeadCodeInjectionTransformer.ts b/src/node-transformers/dead-code-injection-transformers/DeadCodeInjectionTransformer.ts
@@ -363,12 +363,6 @@ export class DeadCodeInjectionTransformer extends AbstractNodeTransformer {
         NodeUtils.parentizeAst(hostNode);
         NodeUtils.parentizeNode(hostNode, hostNode);
 
-        this.transformersRunner.transform(
-            hostNode,
-            DeadCodeInjectionTransformer.transformersToRenameBlockScopeIdentifiers,
-            NodeTransformationStage.DeadCodeInjection
-        );
-
         this.transformersRunner.transform(
             hostNode,
             DeadCodeInjectionTransformer.transformersToRenameBlockScopeIdentifiers,

diff --git a/...ers/ScopeThroughIdentifiersTransformer.ts → ...ers/ScopeThroughIdentifiersTransformer.ts b/...ers/ScopeThroughIdentifiersTransformer.ts → ...ers/ScopeThroughIdentifiersTransformer.ts
@@ -21,7 +21,7 @@ import { AbstractNodeTransformer } from '../AbstractNodeTransformer';
 import { NodeGuards } from '../../node/NodeGuards';
 
 /**
- * Renames all through identifiers for Dead Code Injection
+ * Renames all through identifiers. Now used directly from Dead Code Injection transformer
  */
 @injectable()
 export class ScopeThroughIdentifiersTransformer extends AbstractNodeTransformer {
@@ -62,7 +62,7 @@ export class ScopeThroughIdentifiersTransformer extends AbstractNodeTransformer
      */
     public getVisitor (nodeTransformationStage: NodeTransformationStage): IVisitor | null {
         switch (nodeTransformationStage) {
-            case NodeTransformationStage.DeadCodeInjection:
+            case NodeTransformationStage.Obfuscating:
                 return {
                     enter: (node: ESTree.Node, parentNode: ESTree.Node | null): ESTree.Node | undefined => {
                         if (parentNode && NodeGuards.isProgramNode(node)) {