Fix derived get accessor (#419)

TheLartians · Perryvw · commit 1691f2383495 · 2019-02-18T21:04:20.000+01:00
* fix derived get accessor

* update tests
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -540,7 +540,7 @@ export class LuaTransformer {
             createClassPrototype(),
             tstl.createStringLiteral("__index")
         );
-        if (statement.members.some(ts.isGetAccessor)) {
+        if (tsHelper.hasGetAccessorInClassOrAncestor(statement, this.checker)) {
             // className.prototype.____getters = {}
             const classPrototypeGetters = tstl.createTableIndexExpression(
                 createClassPrototype(),
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -385,6 +385,18 @@ export class TSHelper {
         ) !== undefined;
     }
 
+    public static hasGetAccessorInClassOrAncestor(
+        classDeclaration: ts.ClassLikeDeclarationBase,
+        checker: ts.TypeChecker
+    ): boolean
+    {
+        return TSHelper.findInClassOrAncestor(
+            classDeclaration,
+            c => c.members.some(ts.isGetAccessor),
+            checker
+        ) !== undefined;
+    }
+
     public static getPropertyName(propertyName: ts.PropertyName): string | number | undefined {
         if (ts.isIdentifier(propertyName) || ts.isStringLiteral(propertyName) || ts.isNumericLiteral(propertyName)) {
             return propertyName.text;
diff --git a/test/unit/accessors.spec.ts b/test/unit/accessors.spec.ts
@@ -6,7 +6,9 @@ export class AccessorTests {
     public getAccessor(): void {
         const code =
             `class Foo {
-                get foo() { return "foo"; }
+                _foo;
+                get foo() { return this._foo; }
+                constructor(){ this._foo = "foo"; }
             }
             const f = new Foo();
             return f.foo;`;
@@ -17,7 +19,9 @@ export class AccessorTests {
     public getAccessorInBaseClass(): void {
         const code =
             `class Foo {
-                get foo() { return "foo"; }
+                _foo;
+                get foo() { return this._foo; }
+                constructor(){ this._foo = "foo"; }
             }
             class Bar extends Foo {}
             const b = new Bar();
