Skip to content

Check inherited accessors #297

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 4 commits into from
Dec 7, 2018
Merged

Check inherited accessors #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2ad08f
check for inherited accessor methods
TheLartians Dec 2, 2018
4161b57
diversify test
TheLartians Dec 2, 2018
61c6e76
removed FocusTests and repositioned forAllTypes
TheLartians Dec 2, 2018
976c969
rename forTypeOrAnySupertype
TheLartians Dec 7, 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
50 changes: 33 additions & 17 deletions src/TSHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,22 @@ export class TSHelper {
|| (ts.isBinaryExpression(node.parent) && ts.isArrayLiteralExpression(node.parent.left)));
}

// iterate over a type and its bases until the callback returns true.
public static forTypeOrAnySupertype(type: ts.Type, callback: (type: ts.Type) => boolean): boolean {
if (callback(type)) {
return true;
}
const baseTypes = type.getBaseTypes();
if (baseTypes) {
for (const baseType of baseTypes) {
if (this.forTypeOrAnySupertype(baseType, callback)) {
return true;
}
}
}
return false;
}

public static isStringType(type: ts.Type): boolean {
return (type.flags & ts.TypeFlags.String) !== 0
|| (type.flags & ts.TypeFlags.StringLike) !== 0
Expand All @@ -99,13 +115,7 @@ export class TSHelper {
}

public static isArrayType(type: ts.Type, checker: ts.TypeChecker): boolean {
const baseTypes = type.getBaseTypes();
if (baseTypes) {
for (const baseType of baseTypes) {
if (this.isExplicitArrayType(baseType, checker)) { return true; }
}
}
return this.isExplicitArrayType(type, checker);
return this.forTypeOrAnySupertype(type, t => this.isExplicitArrayType(t, checker));
}

public static isTupleReturnCall(node: ts.Node, checker: ts.TypeChecker): boolean {
Expand Down Expand Up @@ -182,28 +192,34 @@ export class TSHelper {
return null;
}

public static hasExplicitGetAccessor(type: ts.Type, name: ts.__String): boolean {
if (type && type.symbol && type.symbol.members) {
const field = type.symbol.members.get(name);
return field && (field.flags & ts.SymbolFlags.GetAccessor) !== 0;
}
}

public static hasGetAccessor(node: ts.Node, checker: ts.TypeChecker): boolean {
if (ts.isPropertyAccessExpression(node)) {
const name = node.name.escapedText;
const type = checker.getTypeAtLocation(node.expression);

if (type && type.symbol && type.symbol.members) {
const field = type.symbol.members.get(name);
return field && (field.flags & ts.SymbolFlags.GetAccessor) !== 0;
}
return this.forTypeOrAnySupertype(type, t => this.hasExplicitGetAccessor(t, name));
}
return false;
}

public static hasExplicitSetAccessor(type: ts.Type, name: ts.__String): boolean {
if (type && type.symbol && type.symbol.members) {
const field = type.symbol.members.get(name);
return field && (field.flags & ts.SymbolFlags.SetAccessor) !== 0;
}
}

public static hasSetAccessor(node: ts.Node, checker: ts.TypeChecker): boolean {
if (ts.isPropertyAccessExpression(node)) {
const name = node.name.escapedText;
const type = checker.getTypeAtLocation(node.expression);

if (type && type.symbol && type.symbol.members) {
const field = type.symbol.members.get(name);
return field && (field.flags & ts.SymbolFlags.SetAccessor) !== 0;
}
return this.forTypeOrAnySupertype(type, t => this.hasExplicitSetAccessor(t, name));
}
return false;
}
Expand Down
31 changes: 31 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 @@ -254,6 +254,37 @@ export class ExpressionTests {
Expect(result).toBe(expected);
}

@TestCase("inst.baseField", 7)
@TestCase("inst.field", 6)
@TestCase("inst.superField", 5)
@Test("Inherited accessors")
public inheritedAccessors(expression: string, expected: any): void {
const source = `class MyBaseClass {`
+ ` public _baseField: number;`
+ ` public get baseField(): number { return this._baseField + 6; }`
+ ` public set baseField(v: number) { this._baseField = v; }`
+ `}`
+ `class MyClass extends MyBaseClass {`
+ ` public _field: number;`
+ ` public get field(): number { return this._field + 4; }`
+ ` public set field(v: number) { this._field = v; }`
+ `}`
+ `class MySuperClass extends MyClass {`
+ ` public _superField: number;`
+ ` public get superField(): number { return this._superField + 2; }`
+ ` public set superField(v: number) { this._superField = v; }`
+ `}`
+ `var inst = new MySuperClass();`
+ `inst.baseField = 1;`
+ `inst.field = 2;`
+ `inst.superField = 3;`
+ `return ${expression};`;

const lua = util.transpileString(source);
const result = util.executeLua(lua);
Expect(result).toBe(expected);
}

@TestCase("i++", 10)
@TestCase("i--", 10)
@TestCase("++i", 11)
Expand Down