Skip to content

Merge inherits interface members #5359

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
merged 8 commits into from
Oct 23, 2015
Merged

Merge inherits interface members #5359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c072a5f
`getBaseTypes` handles interfaces merged w/classes
sandersn Oct 21, 2015
36ddd02
Tests for interfaces merged w/classes
sandersn Oct 21, 2015
7f98931
Accept baselines
sandersn Oct 21, 2015
4d05189
Improve naming of test members
sandersn Oct 21, 2015
ae6ebe1
Accept new baselines
sandersn Oct 22, 2015
56322d2
Root class merged with interface can be extended
sandersn Oct 22, 2015
1651f18
Improve mergedInheritedClassInterface test case
sandersn Oct 22, 2015
742c701
Use emptyArray instead of [] for no base types.
sandersn Oct 23, 2015
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
36 changes: 26 additions & 10 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2845,23 +2845,29 @@ namespace ts {
return type.resolvedBaseConstructorType;
}

function hasClassBaseType(type: InterfaceType): boolean {
return !!forEach(getBaseTypes(type), t => !!(t.symbol.flags & SymbolFlags.Class));
}

function getBaseTypes(type: InterfaceType): ObjectType[] {
let isClass = type.symbol.flags & SymbolFlags.Class;
let isInterface = type.symbol.flags & SymbolFlags.Interface;
if (!type.resolvedBaseTypes) {
if (type.symbol.flags & SymbolFlags.Class) {
if (!isClass && !isInterface) {
Debug.fail("type must be class or interface");
}
if (isClass) {
resolveBaseTypesOfClass(type);
}
else if (type.symbol.flags & SymbolFlags.Interface) {
if (isInterface) {
resolveBaseTypesOfInterface(type);
}
else {
Debug.fail("type must be class or interface");
}
}
return type.resolvedBaseTypes;
}

function resolveBaseTypesOfClass(type: InterfaceType): void {
type.resolvedBaseTypes = emptyArray;
type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
let baseContructorType = getBaseConstructorTypeOfClass(type);
if (!(baseContructorType.flags & TypeFlags.ObjectType)) {
return;
Expand Down Expand Up @@ -2897,19 +2903,29 @@ namespace ts {
typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType));
return;
}
type.resolvedBaseTypes = [baseType];
if (type.resolvedBaseTypes === emptyArray) {
type.resolvedBaseTypes = [baseType];
}
else {
type.resolvedBaseTypes.push(baseType);
}
}

function resolveBaseTypesOfInterface(type: InterfaceType): void {
type.resolvedBaseTypes = [];
type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
for (let declaration of type.symbol.declarations) {
if (declaration.kind === SyntaxKind.InterfaceDeclaration && getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration)) {
for (let node of getInterfaceBaseTypeNodes(<InterfaceDeclaration>declaration)) {
let baseType = getTypeFromTypeNode(node);
if (baseType !== unknownType) {
if (getTargetType(baseType).flags & (TypeFlags.Class | TypeFlags.Interface)) {
if (type !== baseType && !hasBaseType(<InterfaceType>baseType, type)) {
type.resolvedBaseTypes.push(baseType);
if (type.resolvedBaseTypes === emptyArray) {
type.resolvedBaseTypes = [baseType];
}
else {
type.resolvedBaseTypes.push(baseType);
}
}
else {
error(declaration, Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType));
Expand Down Expand Up @@ -3252,7 +3268,7 @@ namespace ts {
}

function getDefaultConstructSignatures(classType: InterfaceType): Signature[] {
if (!getBaseTypes(classType).length) {
if (!hasClassBaseType(classType)) {
return [createSignature(undefined, classType.localTypeParameters, emptyArray, classType, undefined, 0, false, false)];
}
let baseConstructorType = getBaseConstructorTypeOfClass(classType);
Expand Down
96 changes: 96 additions & 0 deletions tests/baselines/reference/mergedInheritedClassInterface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
//// [mergedInheritedClassInterface.ts]
interface BaseInterface {
required: number;
optional?: number;
}

class BaseClass {
baseMethod() { }
baseNumber: number;
}

interface Child extends BaseInterface {
additional: number;
}

class Child extends BaseClass {
classNumber: number;
method() { }
}

interface ChildNoBaseClass extends BaseInterface {
additional2: string;
}
class ChildNoBaseClass {
classString: string;
method2() { }
}
class Grandchild extends ChildNoBaseClass {
}

// checks if properties actually were merged
var child : Child;
child.required;
child.optional;
child.additional;
child.baseNumber;
child.classNumber;
child.baseMethod();
child.method();

var grandchild: Grandchild;
grandchild.required;
grandchild.optional;
grandchild.additional2;
grandchild.classString;
grandchild.method2();


//// [mergedInheritedClassInterface.js]
var __extends = (this && this.__extends) || function (d, b) {
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var BaseClass = (function () {
function BaseClass() {
}
BaseClass.prototype.baseMethod = function () { };
return BaseClass;
})();
var Child = (function (_super) {
__extends(Child, _super);
function Child() {
_super.apply(this, arguments);
}
Child.prototype.method = function () { };
return Child;
})(BaseClass);
var ChildNoBaseClass = (function () {
function ChildNoBaseClass() {
}
ChildNoBaseClass.prototype.method2 = function () { };
return ChildNoBaseClass;
})();
var Grandchild = (function (_super) {
__extends(Grandchild, _super);
function Grandchild() {
_super.apply(this, arguments);
}
return Grandchild;
})(ChildNoBaseClass);
// checks if properties actually were merged
var child;
child.required;
child.optional;
child.additional;
child.baseNumber;
child.classNumber;
child.baseMethod();
child.method();
var grandchild;
grandchild.required;
grandchild.optional;
grandchild.additional2;
grandchild.classString;
grandchild.method2();
130 changes: 130 additions & 0 deletions tests/baselines/reference/mergedInheritedClassInterface.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
=== tests/cases/conformance/classes/classDeclarations/mergedInheritedClassInterface.ts ===
interface BaseInterface {
>BaseInterface : Symbol(BaseInterface, Decl(mergedInheritedClassInterface.ts, 0, 0))

required: number;
>required : Symbol(required, Decl(mergedInheritedClassInterface.ts, 0, 25))

optional?: number;
>optional : Symbol(optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
}

class BaseClass {
>BaseClass : Symbol(BaseClass, Decl(mergedInheritedClassInterface.ts, 3, 1))

baseMethod() { }
>baseMethod : Symbol(baseMethod, Decl(mergedInheritedClassInterface.ts, 5, 17))

baseNumber: number;
>baseNumber : Symbol(baseNumber, Decl(mergedInheritedClassInterface.ts, 6, 20))
}

interface Child extends BaseInterface {
>Child : Symbol(Child, Decl(mergedInheritedClassInterface.ts, 8, 1), Decl(mergedInheritedClassInterface.ts, 12, 1))
>BaseInterface : Symbol(BaseInterface, Decl(mergedInheritedClassInterface.ts, 0, 0))

additional: number;
>additional : Symbol(additional, Decl(mergedInheritedClassInterface.ts, 10, 39))
}

class Child extends BaseClass {
>Child : Symbol(Child, Decl(mergedInheritedClassInterface.ts, 8, 1), Decl(mergedInheritedClassInterface.ts, 12, 1))
>BaseClass : Symbol(BaseClass, Decl(mergedInheritedClassInterface.ts, 3, 1))

classNumber: number;
>classNumber : Symbol(classNumber, Decl(mergedInheritedClassInterface.ts, 14, 31))

method() { }
>method : Symbol(method, Decl(mergedInheritedClassInterface.ts, 15, 24))
}

interface ChildNoBaseClass extends BaseInterface {
>ChildNoBaseClass : Symbol(ChildNoBaseClass, Decl(mergedInheritedClassInterface.ts, 17, 1), Decl(mergedInheritedClassInterface.ts, 21, 1))
>BaseInterface : Symbol(BaseInterface, Decl(mergedInheritedClassInterface.ts, 0, 0))

additional2: string;
>additional2 : Symbol(additional2, Decl(mergedInheritedClassInterface.ts, 19, 50))
}
class ChildNoBaseClass {
>ChildNoBaseClass : Symbol(ChildNoBaseClass, Decl(mergedInheritedClassInterface.ts, 17, 1), Decl(mergedInheritedClassInterface.ts, 21, 1))

classString: string;
>classString : Symbol(classString, Decl(mergedInheritedClassInterface.ts, 22, 24))

method2() { }
>method2 : Symbol(method2, Decl(mergedInheritedClassInterface.ts, 23, 24))
}
class Grandchild extends ChildNoBaseClass {
>Grandchild : Symbol(Grandchild, Decl(mergedInheritedClassInterface.ts, 25, 1))
>ChildNoBaseClass : Symbol(ChildNoBaseClass, Decl(mergedInheritedClassInterface.ts, 17, 1), Decl(mergedInheritedClassInterface.ts, 21, 1))
}

// checks if properties actually were merged
var child : Child;
>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
>Child : Symbol(Child, Decl(mergedInheritedClassInterface.ts, 8, 1), Decl(mergedInheritedClassInterface.ts, 12, 1))

child.required;
>child.required : Symbol(BaseInterface.required, Decl(mergedInheritedClassInterface.ts, 0, 25))
>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
>required : Symbol(BaseInterface.required, Decl(mergedInheritedClassInterface.ts, 0, 25))

child.optional;
>child.optional : Symbol(BaseInterface.optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
>optional : Symbol(BaseInterface.optional, Decl(mergedInheritedClassInterface.ts, 1, 21))

child.additional;
>child.additional : Symbol(Child.additional, Decl(mergedInheritedClassInterface.ts, 10, 39))
>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
>additional : Symbol(Child.additional, Decl(mergedInheritedClassInterface.ts, 10, 39))

child.baseNumber;
>child.baseNumber : Symbol(BaseClass.baseNumber, Decl(mergedInheritedClassInterface.ts, 6, 20))
>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
>baseNumber : Symbol(BaseClass.baseNumber, Decl(mergedInheritedClassInterface.ts, 6, 20))

child.classNumber;
>child.classNumber : Symbol(Child.classNumber, Decl(mergedInheritedClassInterface.ts, 14, 31))
>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
>classNumber : Symbol(Child.classNumber, Decl(mergedInheritedClassInterface.ts, 14, 31))

child.baseMethod();
>child.baseMethod : Symbol(BaseClass.baseMethod, Decl(mergedInheritedClassInterface.ts, 5, 17))
>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
>baseMethod : Symbol(BaseClass.baseMethod, Decl(mergedInheritedClassInterface.ts, 5, 17))

child.method();
>child.method : Symbol(Child.method, Decl(mergedInheritedClassInterface.ts, 15, 24))
>child : Symbol(child, Decl(mergedInheritedClassInterface.ts, 30, 3))
>method : Symbol(Child.method, Decl(mergedInheritedClassInterface.ts, 15, 24))

var grandchild: Grandchild;
>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
>Grandchild : Symbol(Grandchild, Decl(mergedInheritedClassInterface.ts, 25, 1))

grandchild.required;
>grandchild.required : Symbol(BaseInterface.required, Decl(mergedInheritedClassInterface.ts, 0, 25))
>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
>required : Symbol(BaseInterface.required, Decl(mergedInheritedClassInterface.ts, 0, 25))

grandchild.optional;
>grandchild.optional : Symbol(BaseInterface.optional, Decl(mergedInheritedClassInterface.ts, 1, 21))
>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
>optional : Symbol(BaseInterface.optional, Decl(mergedInheritedClassInterface.ts, 1, 21))

grandchild.additional2;
>grandchild.additional2 : Symbol(ChildNoBaseClass.additional2, Decl(mergedInheritedClassInterface.ts, 19, 50))
>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
>additional2 : Symbol(ChildNoBaseClass.additional2, Decl(mergedInheritedClassInterface.ts, 19, 50))

grandchild.classString;
>grandchild.classString : Symbol(ChildNoBaseClass.classString, Decl(mergedInheritedClassInterface.ts, 22, 24))
>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
>classString : Symbol(ChildNoBaseClass.classString, Decl(mergedInheritedClassInterface.ts, 22, 24))

grandchild.method2();
>grandchild.method2 : Symbol(ChildNoBaseClass.method2, Decl(mergedInheritedClassInterface.ts, 23, 24))
>grandchild : Symbol(grandchild, Decl(mergedInheritedClassInterface.ts, 39, 3))
>method2 : Symbol(ChildNoBaseClass.method2, Decl(mergedInheritedClassInterface.ts, 23, 24))

Loading