Handling modules/namespaces nested via dot in their declaration name (#437)

tomblind · Perryvw · commit 29fe5e496e04 · 2019-02-21T22:02:52.000+01:00
fixes #434
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -1322,9 +1322,12 @@ export class LuaTransformer {
         this.currentNamespace = statement;
 
         // Transform moduleblock to block and visit it
-        if (statement.body && ts.isModuleBlock(statement.body)) {
+        if (statement.body && (ts.isModuleBlock(statement.body) || ts.isModuleDeclaration(statement.body))) {
             this.pushScope(ScopeType.Block, statement);
-            const statements = this.performHoisting(this.transformStatements(statement.body.statements));
+            let statements = ts.isModuleBlock(statement.body)
+                ? this.transformStatements(statement.body.statements)
+                : this.transformModuleDeclaration(statement.body);
+            statements = this.performHoisting(statements);
             this.popScope();
             result.push(tstl.createDoStatement(statements));
         }
diff --git a/test/unit/modules.spec.ts b/test/unit/modules.spec.ts
@@ -55,4 +55,13 @@ export class LuaModuleTests {
         // Assert
         Expect(lua).toBe(``);
     }
+
+    @Test("Nested module with dot in name")
+    public nestedModuleWithDotInName(): void {
+        const code =
+            `module a.b {
+                export const foo = "foo";
+            }`;
+        Expect(util.transpileAndExecute("return a.b.foo;", undefined, undefined, code)).toBe("foo");
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,13 @@ export class LuaModuleTests {`
`55`	`55`	`// Assert`
`56`	`56`	Expect(lua).toBe(``);
`57`	`57`	`}`
	`58`	`+`
	`59`	`+ @Test("Nested module with dot in name")`
	`60`	`+ public nestedModuleWithDotInName(): void {`
	`61`	`+ const code =`
	`62`	+ `module a.b {
	`63`	`+ export const foo = "foo";`
	`64`	+ }`;
	`65`	`+ Expect(util.transpileAndExecute("return a.b.foo;", undefined, undefined, code)).toBe("foo");`
	`66`	`+ }`
`58`	`67`	`}`