moved static field initialization to end of class declaration (#473)

tomblind · Perryvw · commit 0bbae3c40566 · 2019-03-10T19:49:18.000+01:00
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -494,24 +494,6 @@ export class LuaTransformer {
             }
         }
 
-        // Add static declarations
-        for (const field of staticFields) {
-            const fieldName = this.transformPropertyName(field.name);
-            const value = this.transformExpression(field.initializer);
-
-            const classField = tstl.createTableIndexExpression(
-                    this.addExportToIdentifier(tstl.cloneIdentifier(className)),
-                    fieldName
-                );
-
-            const fieldAssign = tstl.createAssignmentStatement(
-                classField,
-                value
-            );
-
-            result.push(fieldAssign);
-        }
-
         // Find first constructor with body
         if (!isExtension && !isMetaExtension) {
             const constructor = statement.members
@@ -573,6 +555,24 @@ export class LuaTransformer {
             result.push(this.transformMethodDeclaration(method, className, isExtension || isMetaExtension));
         });
 
+        // Add static declarations
+        for (const field of staticFields) {
+            const fieldName = this.transformPropertyName(field.name);
+            const value = this.transformExpression(field.initializer);
+
+            const classField = tstl.createTableIndexExpression(
+                    this.addExportToIdentifier(tstl.cloneIdentifier(className)),
+                    fieldName
+                );
+
+            const fieldAssign = tstl.createAssignmentStatement(
+                classField,
+                value
+            );
+
+            result.push(fieldAssign);
+        }
+
         this.classStack.pop();
 
         return result;
diff --git a/test/unit/class.spec.ts b/test/unit/class.spec.ts
@@ -805,4 +805,15 @@ export class ClassTests {
             "Cannot construct classes with decorator '@extension' or '@metaExtension'."
         );
     }
+
+    @Test("Class static instance of self")
+    public classStaticInstanceOfSelf(): void {
+        const code =
+            `class Foo {
+                bar = "foobar";
+                static instance = new Foo();
+            }
+            return Foo.instance.bar;`;
+        Expect(util.transpileAndExecute(code)).toBe("foobar");
+    }
 }
