Fix compileMembersOnly ignoring preceding variable path (#662)

Perryvw · web-flow · commit 082e4939c657 · 2019-07-14T14:49:14.000+02:00
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -1675,16 +1675,27 @@ export class LuaTransformer {
         for (const enumMember of this.computeEnumMembers(enumDeclaration)) {
             const memberName = this.transformPropertyName(enumMember.name);
             if (membersOnly) {
+                const enumSymbol = this.checker.getSymbolAtLocation(enumDeclaration.name);
+                const exportScope = enumSymbol ? this.getSymbolExportScope(enumSymbol) : undefined;
+
                 if (tstl.isIdentifier(memberName)) {
                     result.push(
-                        ...this.createLocalOrExportedOrGlobalDeclaration(memberName, enumMember.value, enumDeclaration)
+                        ...this.createLocalOrExportedOrGlobalDeclaration(
+                            memberName,
+                            enumMember.value,
+                            enumDeclaration,
+                            undefined,
+                            exportScope
+                        )
                     );
                 } else {
                     result.push(
                         ...this.createLocalOrExportedOrGlobalDeclaration(
                             tstl.createIdentifier(enumMember.name.getText(), enumMember.name),
                             enumMember.value,
-                            enumDeclaration
+                            enumDeclaration,
+                            undefined,
+                            exportScope
                         )
                     );
                 }
@@ -4087,7 +4098,16 @@ export class LuaTransformer {
         const decorators = tsHelper.getCustomDecorators(type, this.checker);
         // Do not output path for member only enums
         if (decorators.has(DecoratorKind.CompileMembersOnly)) {
-            return tstl.createIdentifier(property, expression);
+            if (ts.isPropertyAccessExpression(expression.expression)) {
+                // in case of ...x.enum.y transform to ...x.y
+                return tstl.createTableIndexExpression(
+                    this.transformExpression(expression.expression.expression),
+                    tstl.createStringLiteral(property),
+                    expression
+                );
+            } else {
+                return tstl.createIdentifier(property, expression);
+            }
         }
 
         if (decorators.has(DecoratorKind.LuaTable)) {
@@ -5161,7 +5181,8 @@ export class LuaTransformer {
         lhs: tstl.Identifier | tstl.Identifier[],
         rhs?: tstl.Expression | tstl.Expression[],
         tsOriginal?: ts.Node,
-        parent?: tstl.Node
+        parent?: tstl.Node,
+        overrideExportScope?: ts.SourceFile | ts.ModuleDeclaration
     ): tstl.Statement[] {
         let declaration: tstl.VariableDeclarationStatement | undefined;
         let assignment: tstl.AssignmentStatement | undefined;
@@ -5173,7 +5194,7 @@ export class LuaTransformer {
             return [];
         }
 
-        const exportScope = this.getIdentifierExportScope(identifiers[0]);
+        const exportScope = overrideExportScope || this.getIdentifierExportScope(identifiers[0]);
         if (exportScope) {
             // exported
             if (!rhs) {
diff --git a/test/unit/lualib/lualib.spec.ts b/test/unit/lualib/lualib.spec.ts
@@ -150,3 +150,20 @@ test("lualibs should not include tstl header", () => {
 
     expect(util.transpileString(code)).not.toMatch("Generated with");
 });
+
+test("compileMembersOnly in namespace", () => {
+    const header = `
+        namespace wifi {
+            /** @compileMembersOnly */
+            export enum WifiMode {
+                NULLMODE = 0,
+                STATION = 1,
+                SOFTAP = 2
+            }
+        }`;
+    const code = `
+        return wifi.WifiMode.STATION;
+    `;
+
+    expect(util.transpileAndExecute(code, undefined, undefined, header)).toBe(1);
+});
