Fixed manual block visit not being flattened

lolleko · lolleko · commit c62259e332df · 2018-11-27T19:29:19.000+01:00
diff --git a/src/TransformHelper.ts b/src/TransformHelper.ts
@@ -16,4 +16,9 @@ export class TransformHelper {
             ts.createCall(requireIdentifier, [ts.createLiteralTypeNode(moduleSpecifier)], [moduleSpecifier]);
         return this.createLuaVariableStatement(identifier, requireCall);
     }
+
+    public static flatten<T>(arr: T[]): T[] {
+        const flat = [].concat(...arr);
+        return flat.some(Array.isArray) ? this.flatten(flat) : flat;
+    }
 }
diff --git a/src/Transformer.ts b/src/Transformer.ts
@@ -283,8 +283,8 @@ export class LuaTransformer {
 
         // Transform moduleblock to block and visit it
         if (node.body && ts.isModuleBlock(node.body)) {
-            const bodyBlock = this.visitBlock(ts.createBlock(node.body.statements)) as ts.Block;
-            // result.push(bodyBlock);
+            const bodyBlock = this.visitModuleBlock(node.body) as ts.Block;
+            result.push(bodyBlock);
         }
 
         this.currentNamespace = previousNamespace;
@@ -446,11 +446,12 @@ export class LuaTransformer {
     public visitComputedPropertyName(node: ts.ComputedPropertyName): ts.VisitResult<ts.ComputedPropertyName> {
         return node;
     }
-    public visitBlock(node: ts.Block): ts.Block {
-        return ts.updateBlock(node, node.statements.map(s => this.visitor(s)) as ts.Statement[]);
+    public visitBlock(node: ts.Block): ts.VisitResult<ts.Block> {
+        return ts.updateBlock(
+            node, transformHelper.flatten(node.statements.map(s => this.visitor(s)) as ts.Statement[]));
     }
-    public visitModuleBlock(node: ts.ModuleBlock): ts.VisitResult<ts.ModuleBlock> {
-        return node;
+    public visitModuleBlock(node: ts.ModuleBlock): ts.VisitResult<ts.Block> {
+        return this.visitBlock(ts.createBlock(node.statements));
     }
     public visitEndOfFileToken(node: ts.EndOfFileToken): ts.VisitResult<ts.EndOfFileToken> {
         return node;

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,9 @@ export class TransformHelper {`
`16`	`16`	`ts.createCall(requireIdentifier, [ts.createLiteralTypeNode(moduleSpecifier)], [moduleSpecifier]);`
`17`	`17`	`return this.createLuaVariableStatement(identifier, requireCall);`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+ public static flatten<T>(arr: T[]): T[] {`
	`21`	`+ const flat = [].concat(...arr);`
	`22`	`+ return flat.some(Array.isArray) ? this.flatten(flat) : flat;`
	`23`	`+ }`
`19`	`24`	`}`