Browse Source

reverted last commit

sanex3339 8 years ago
parent
commit
58224c24c7

+ 12 - 3
dist/index.js

@@ -5360,11 +5360,20 @@ var DeadCodeInjectionTransformer = DeadCodeInjectionTransformer_1 = function (_A
         }
         }
     }], [{
     }], [{
         key: "collectBlockStatementNodes",
         key: "collectBlockStatementNodes",
-        value: function collectBlockStatementNodes(targetNode, collectedBlockStatements) {
-            if (!Node_1.Node.isBlockStatementNode(targetNode) || !DeadCodeInjectionTransformer_1.isValidBlockStatementNode(targetNode)) {
+        value: function collectBlockStatementNodes(node, collectedBlockStatements) {
+            if (!Node_1.Node.isBlockStatementNode(node) || !DeadCodeInjectionTransformer_1.isValidBlockStatementNode(node)) {
                 return;
                 return;
             }
             }
-            collectedBlockStatements.push(NodeUtils_1.NodeUtils.clone(targetNode));
+            var clonedBlockStatementNode = NodeUtils_1.NodeUtils.clone(node);
+            estraverse.replace(clonedBlockStatementNode, {
+                enter: function enter(node, parentNode) {
+                    if (Node_1.Node.isIdentifierNode(node)) {
+                        node.name = RandomGeneratorUtils_1.RandomGeneratorUtils.getRandomVariableName(6);
+                    }
+                    return node;
+                }
+            });
+            collectedBlockStatements.push(clonedBlockStatementNode);
         }
         }
     }, {
     }, {
         key: "replaceBlockStatementNodes",
         key: "replaceBlockStatementNodes",

+ 16 - 4
src/node-transformers/dead-code-injection-transformers/DeadCodeInjectionTransformer.ts

@@ -30,15 +30,27 @@ export class DeadCodeInjectionTransformer extends AbstractNodeTransformer {
     }
     }
 
 
     /**
     /**
-     * @param targetNode
+     * @param node
      * @param collectedBlockStatements
      * @param collectedBlockStatements
      */
      */
-    private static collectBlockStatementNodes (targetNode: ESTree.Node, collectedBlockStatements: ESTree.BlockStatement[]): void {
-        if (!Node.isBlockStatementNode(targetNode) || !DeadCodeInjectionTransformer.isValidBlockStatementNode(targetNode)) {
+    private static collectBlockStatementNodes (node: ESTree.Node, collectedBlockStatements: ESTree.BlockStatement[]): void {
+        if (!Node.isBlockStatementNode(node) || !DeadCodeInjectionTransformer.isValidBlockStatementNode(node)) {
             return;
             return;
         }
         }
 
 
-        collectedBlockStatements.push(<ESTree.BlockStatement>NodeUtils.clone(targetNode));
+        const clonedBlockStatementNode: ESTree.BlockStatement = <ESTree.BlockStatement>NodeUtils.clone(node);
+
+        estraverse.replace(clonedBlockStatementNode, {
+            enter: (node: ESTree.Node, parentNode: ESTree.Node): any => {
+                if (Node.isIdentifierNode(node)) {
+                    node.name = RandomGeneratorUtils.getRandomVariableName(6);
+                }
+
+                return node;
+            }
+        });
+
+        collectedBlockStatements.push(clonedBlockStatementNode);
     }
     }
 
 
     /**
     /**