Skip to content

Use declared types #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 3 commits into from
Dec 9, 2018
Merged

Use declared types #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5685ab1
update forTypeOrAnySupertype() to use declared type
TheLartians Dec 9, 2018
a0e4a6c
added test case for accessor using this
TheLartians Dec 9, 2018
d1e3d58
enhance test to use generics
TheLartians Dec 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/TSHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions test/unit/array.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();`
);
Expand Down
2 changes: 2 additions & 0 deletions test/unit/expressions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {`
Expand All @@ -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;`
Expand Down