control flow flattening: update to master

src/ControlFlowStorage.ts

@@ -39,12 +39,13 @@ export class ControlFlowStorage {
      * @returns {string}
      */
     public toString (): string {
-        return `{
-            ${Array.from(this.storage).reduce((string: string, [key, value]: [string, ICustomNode]) => {
-                string += `${key}: ${value.getCode()},`;
-    
-                return string;
-            }, '')}
-        }`;
+        return Array
+            .from(this.storage)
+            .reduce((controlFlowStorageItems: string[], [key, value]: [string, ICustomNode]) => {
+                controlFlowStorageItems.push(`${key}: ${value.getCode()}`);
+
+                return controlFlowStorageItems;
+            }, [])
+            .join(',');
     }
 }

src/templates/custom-nodes/control-flow-storage-nodes/ControlFlowStorageTemplate.ts

@@ -3,6 +3,6 @@
  */
 export function ControlFlowStorageTemplate (): string {
     return `
-        var {controlFlowStorageName} = {controlFlowStorage};
+        var {controlFlowStorageName} = { {controlFlowStorage} };
     `;
 }

test/unit-tests/node-obfuscators/FunctionDeclarationObfuscator.spec.ts

@@ -59,7 +59,7 @@ describe('FunctionDeclarationObfuscator', () => {
                 functionDeclarationNode['parentNode'] = blockStatementNode;
                 expressionStatementNode['parentNode'] = blockStatementNode;
 
-                functionDeclarationObfuscator.obfuscateNode(
+                functionDeclarationObfuscator.transformNode(
                     functionDeclarationNode,
                     blockStatementNode
                 );
@@ -83,7 +83,7 @@ describe('FunctionDeclarationObfuscator', () => {
                 functionDeclarationNode['parentNode'] = programNode;
                 expressionStatementNode['parentNode'] = programNode;
 
-                functionDeclarationObfuscator.obfuscateNode(
+                functionDeclarationObfuscator.transformNode(
                     functionDeclarationNode,
                     programNode
                 );

test/unit-tests/node-obfuscators/FunctionObfuscator.spec.ts

@@ -66,7 +66,7 @@ describe('FunctionObfuscator', () => {
                 new Options(DEFAULT_PRESET)
             );
 
-            functionObfuscator.obfuscateNode(functionDeclarationNode);
+            functionObfuscator.transformNode(functionDeclarationNode);
         });
 
         it('should obfuscate function parameter', () => {