Use declared types (#302)

TheLartians · Perryvw · commit c0b73bd056a2 · 2018-12-09T19:55:37.000+01:00
* update forTypeOrAnySupertype() to use declared type

* added test case for accessor using this

* enhance test to use generics
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -81,14 +81,18 @@ export class TSHelper {
     }
 
     // iterate over a type and its bases until the callback returns true.
-    public static forTypeOrAnySupertype(type: ts.Type, callback: (type: ts.Type) => boolean): boolean {
+    public static forTypeOrAnySupertype(type: ts.Type, checker: ts.TypeChecker, callback: (type: ts.Type) => boolean):
+    boolean {
         if (callback(type)) {
             return true;
         }
+        if (!type.isClassOrInterface() && type.symbol) {
+            type = checker.getDeclaredTypeOfSymbol(type.symbol);
+        }
         const baseTypes = type.getBaseTypes();
         if (baseTypes) {
             for (const baseType of baseTypes) {
-                if (this.forTypeOrAnySupertype(baseType, callback)) {
+                if (this.forTypeOrAnySupertype(baseType, checker, callback)) {
                     return true;
                 }
             }
@@ -115,7 +119,7 @@ export class TSHelper {
     }
 
     public static isArrayType(type: ts.Type, checker: ts.TypeChecker): boolean {
-        return this.forTypeOrAnySupertype(type, t => this.isExplicitArrayType(t, checker));
+        return this.forTypeOrAnySupertype(type, checker, t => this.isExplicitArrayType(t, checker));
     }
 
     public static isTupleReturnCall(node: ts.Node, checker: ts.TypeChecker): boolean {
@@ -203,7 +207,7 @@ export class TSHelper {
         if (ts.isPropertyAccessExpression(node)) {
             const name = node.name.escapedText;
             const type = checker.getTypeAtLocation(node.expression);
-            return this.forTypeOrAnySupertype(type, t => this.hasExplicitGetAccessor(t, name));
+            return this.forTypeOrAnySupertype(type, checker, t => this.hasExplicitGetAccessor(t, name));
         }
         return false;
     }
@@ -219,7 +223,7 @@ export class TSHelper {
         if (ts.isPropertyAccessExpression(node)) {
             const name = node.name.escapedText;
             const type = checker.getTypeAtLocation(node.expression);
-            return this.forTypeOrAnySupertype(type, t => this.hasExplicitSetAccessor(t, name));
+            return this.forTypeOrAnySupertype(type, checker, t => this.hasExplicitSetAccessor(t, name));
         }
         return false;
     }
diff --git a/test/unit/array.spec.ts b/test/unit/array.spec.ts
@@ -43,8 +43,8 @@ export class ArrayTests {
     public derivedArrayAccess(): void {
         const lua = `local arr = {firstElement=function(self) return self[1]; end};`
         +  util.transpileString(
-            `interface CustomArray extends Array<number>{ firstElement():number; };
-            declare const arr: CustomArray;
+            `interface CustomArray<T> extends Array<T>{ firstElement():number; };
+            declare const arr: CustomArray<number>;
             arr[0] = 3;
             return arr.firstElement();`
         );
diff --git a/test/unit/expressions.spec.ts b/test/unit/expressions.spec.ts
@@ -257,6 +257,7 @@ export class ExpressionTests {
     @TestCase("inst.baseField", 7)
     @TestCase("inst.field", 6)
     @TestCase("inst.superField", 5)
+    @TestCase("inst.superBaseField", 4)
     @Test("Inherited accessors")
     public inheritedAccessors(expression: string, expected: any): void {
       const source = `class MyBaseClass {`
@@ -273,6 +274,7 @@ export class ExpressionTests {
                    + `    public _superField: number;`
                    + `    public get superField(): number { return this._superField + 2; }`
                    + `    public set superField(v: number) { this._superField = v; }`
+                   + `    public get superBaseField() { return this.baseField - 3; }`
                    + `}`                   
                    + `var inst = new MySuperClass();`
                    + `inst.baseField = 1;`

Original file line number	Diff line number	Diff line change
`@@ -81,14 +81,18 @@ export class TSHelper {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// iterate over a type and its bases until the callback returns true.`
`84`		`- public static forTypeOrAnySupertype(type: ts.Type, callback: (type: ts.Type) => boolean): boolean {`
	`84`	`+ public static forTypeOrAnySupertype(type: ts.Type, checker: ts.TypeChecker, callback: (type: ts.Type) => boolean):`
	`85`	`+ boolean {`
`85`	`86`	`if (callback(type)) {`
`86`	`87`	`return true;`
`87`	`88`	`}`
	`89`	`+ if (!type.isClassOrInterface() && type.symbol) {`
	`90`	`+ type = checker.getDeclaredTypeOfSymbol(type.symbol);`
	`91`	`+ }`
`88`	`92`	`const baseTypes = type.getBaseTypes();`
`89`	`93`	`if (baseTypes) {`
`90`	`94`	`for (const baseType of baseTypes) {`
`91`		`- if (this.forTypeOrAnySupertype(baseType, callback)) {`
	`95`	`+ if (this.forTypeOrAnySupertype(baseType, checker, callback)) {`
`92`	`96`	`return true;`
`93`	`97`	`}`
`94`	`98`	`}`
`@@ -115,7 +119,7 @@ export class TSHelper {`
`115`	`119`	`}`
`116`	`120`
`117`	`121`	`public static isArrayType(type: ts.Type, checker: ts.TypeChecker): boolean {`
`118`		`- return this.forTypeOrAnySupertype(type, t => this.isExplicitArrayType(t, checker));`
	`122`	`+ return this.forTypeOrAnySupertype(type, checker, t => this.isExplicitArrayType(t, checker));`
`119`	`123`	`}`
`120`	`124`
`121`	`125`	`public static isTupleReturnCall(node: ts.Node, checker: ts.TypeChecker): boolean {`
`@@ -203,7 +207,7 @@ export class TSHelper {`
`203`	`207`	`if (ts.isPropertyAccessExpression(node)) {`
`204`	`208`	`const name = node.name.escapedText;`
`205`	`209`	`const type = checker.getTypeAtLocation(node.expression);`
`206`		`- return this.forTypeOrAnySupertype(type, t => this.hasExplicitGetAccessor(t, name));`
	`210`	`+ return this.forTypeOrAnySupertype(type, checker, t => this.hasExplicitGetAccessor(t, name));`
`207`	`211`	`}`
`208`	`212`	`return false;`
`209`	`213`	`}`
`@@ -219,7 +223,7 @@ export class TSHelper {`
`219`	`223`	`if (ts.isPropertyAccessExpression(node)) {`
`220`	`224`	`const name = node.name.escapedText;`
`221`	`225`	`const type = checker.getTypeAtLocation(node.expression);`
`222`		`- return this.forTypeOrAnySupertype(type, t => this.hasExplicitSetAccessor(t, name));`
	`226`	`+ return this.forTypeOrAnySupertype(type, checker, t => this.hasExplicitSetAccessor(t, name));`
`223`	`227`	`}`
`224`	`228`	`return false;`
`225`	`229`	`}`