Merge pull request microsoft#14074 from Microsoft/error-on-decl-of-extends-intersection

sandersn · web-flow · commit 1296f240c63e · 2017-02-15T13:43:51.000-08:00
Error when emitting the declaration for an exported class that extends an intersection
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -21392,6 +21392,9 @@ namespace ts {
             const classType = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(node));
             resolveBaseTypesOfClass(classType);
             const baseType = classType.resolvedBaseTypes.length ? classType.resolvedBaseTypes[0] : unknownType;
+            if (!baseType.symbol) {
+                writer.reportIllegalExtends();
+            }
             getSymbolDisplayBuilder().buildTypeDisplay(baseType, writer, enclosingDeclaration, flags);
         }
 
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -190,6 +190,7 @@ namespace ts {
             const writer = <EmitTextWriterWithSymbolWriter>createTextWriter(newLine);
             writer.trackSymbol = trackSymbol;
             writer.reportInaccessibleThisError = reportInaccessibleThisError;
+            writer.reportIllegalExtends = reportIllegalExtends;
             writer.writeKeyword = writer.write;
             writer.writeOperator = writer.write;
             writer.writePunctuation = writer.write;
@@ -313,6 +314,14 @@ namespace ts {
             recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForSymbol(symbol, meaning));
         }
 
+        function reportIllegalExtends() {
+            if (errorNameNode) {
+                reportedDeclarationError = true;
+                emitterDiagnostics.add(createDiagnosticForNode(errorNameNode, Diagnostics.extends_clause_of_exported_class_0_refers_to_a_type_whose_name_cannot_be_referenced,
+                    declarationNameToString(errorNameNode)));
+            }
+        }
+
         function reportInaccessibleThisError() {
             if (errorNameNode) {
                 reportedDeclarationError = true;
@@ -1088,7 +1097,7 @@ namespace ts {
             }
         }
 
-        function emitHeritageClause(typeReferences: ExpressionWithTypeArguments[], isImplementsList: boolean) {
+        function emitHeritageClause(className: Identifier, typeReferences: ExpressionWithTypeArguments[], isImplementsList: boolean) {
             if (typeReferences) {
                 write(isImplementsList ? " implements " : " extends ");
                 emitCommaList(typeReferences, emitTypeOfTypeReference);
@@ -1103,7 +1112,9 @@ namespace ts {
                 }
                 else {
                     writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
+                    errorNameNode = className;
                     resolver.writeBaseConstructorTypeOfClass(<ClassLikeDeclaration>enclosingDeclaration, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction | TypeFormatFlags.UseTypeAliasValue, writer);
+                    errorNameNode = undefined;
                 }
 
                 function getHeritageClauseVisibilityError(): SymbolAccessibilityDiagnostic {
@@ -1113,11 +1124,11 @@ namespace ts {
                         // Class or Interface implemented/extended is inaccessible
                         diagnosticMessage = isImplementsList ?
                             Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
-                            Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
+                            Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
                     }
                     else {
                         // interface is inaccessible
-                        diagnosticMessage = Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1;
+                        diagnosticMessage = Diagnostics.extends_clause_of_exported_interface_0_has_or_is_using_private_name_1;
                     }
 
                     return {
@@ -1153,9 +1164,10 @@ namespace ts {
             emitTypeParameters(node.typeParameters);
             const baseTypeNode = getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
-                emitHeritageClause([baseTypeNode], /*isImplementsList*/ false);
+                node.name
+                emitHeritageClause(node.name, [baseTypeNode], /*isImplementsList*/ false);
             }
-            emitHeritageClause(getClassImplementsHeritageClauseElements(node), /*isImplementsList*/ true);
+            emitHeritageClause(node.name, getClassImplementsHeritageClauseElements(node), /*isImplementsList*/ true);
             write(" {");
             writeLine();
             increaseIndent();
@@ -1177,7 +1189,7 @@ namespace ts {
             emitTypeParameters(node.typeParameters);
             const interfaceExtendsTypes = filter(getInterfaceBaseTypeNodes(node), base => isEntityNameExpression(base.expression));
             if (interfaceExtendsTypes && interfaceExtendsTypes.length) {
-                emitHeritageClause(interfaceExtendsTypes, /*isImplementsList*/ false);
+                emitHeritageClause(node.name, interfaceExtendsTypes, /*isImplementsList*/ false);
             }
             write(" {");
             writeLine();
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2108,11 +2108,11 @@
         "category": "Error",
         "code": 4019
     },
-    "Extends clause of exported class '{0}' has or is using private name '{1}'.": {
+    "'extends' clause of exported class '{0}' has or is using private name '{1}'.": {
         "category": "Error",
         "code": 4020
     },
-    "Extends clause of exported interface '{0}' has or is using private name '{1}'.": {
+    "'extends' clause of exported interface '{0}' has or is using private name '{1}'.": {
         "category": "Error",
         "code": 4022
     },
@@ -2364,6 +2364,10 @@
         "category": "Error",
         "code": 4092
     },
+    "'extends' clause of exported class '{0}' refers to a type whose name cannot be referenced.": {
+        "category": "Error",
+        "code": 4093
+    },
 
     "The current host does not support the '{0}' option.": {
         "category": "Error",
@@ -3177,7 +3181,7 @@
         "category": "Error",
         "code": 8016
     },
-    "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.": {
+    "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clause.": {
         "category": "Error",
         "code": 9002
     },
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2480,6 +2480,7 @@
         // with import statements it previously saw (but chose not to emit).
         trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void;
         reportInaccessibleThisError(): void;
+        reportIllegalExtends(): void;
     }
 
     export const enum TypeFormatFlags {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -67,7 +67,8 @@ namespace ts {
                 decreaseIndent: noop,
                 clear: () => str = "",
                 trackSymbol: noop,
-                reportInaccessibleThisError: noop
+                reportInaccessibleThisError: noop,
+                reportIllegalExtends: noop
             };
         }
 
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -1167,7 +1167,8 @@ namespace ts {
             decreaseIndent: () => { indent--; },
             clear: resetWriter,
             trackSymbol: noop,
-            reportInaccessibleThisError: noop
+            reportInaccessibleThisError: noop,
+            reportIllegalExtends: noop
         };
 
         function writeIndent() {
@@ -1387,4 +1388,4 @@ namespace ts {
         // First token is the open curly, this is where we want to put the 'super' call.
         return constructor.body.getFirstToken(sourceFile).getEnd();
     }
-}
+}
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.errors.txt b/tests/baselines/reference/declarationEmitExpressionInExtends3.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/declarationEmitExpressionInExtends3.ts(29,30): error TS4020: Extends clause of exported class 'MyClass' has or is using private name 'LocalClass'.
-tests/cases/compiler/declarationEmitExpressionInExtends3.ts(37,31): error TS4020: Extends clause of exported class 'MyClass3' has or is using private name 'LocalInterface'.
+tests/cases/compiler/declarationEmitExpressionInExtends3.ts(29,30): error TS4020: 'extends' clause of exported class 'MyClass' has or is using private name 'LocalClass'.
+tests/cases/compiler/declarationEmitExpressionInExtends3.ts(37,31): error TS4020: 'extends' clause of exported class 'MyClass3' has or is using private name 'LocalInterface'.
 
 
 ==== tests/cases/compiler/declarationEmitExpressionInExtends3.ts (2 errors) ====
@@ -33,7 +33,7 @@ tests/cases/compiler/declarationEmitExpressionInExtends3.ts(37,31): error TS4020
     
     export class MyClass extends getLocalClass<LocalInterface>(undefined)<string, number> { // error LocalClass is inaccisible
                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4020: Extends clause of exported class 'MyClass' has or is using private name 'LocalClass'.
+!!! error TS4020: 'extends' clause of exported class 'MyClass' has or is using private name 'LocalClass'.
     }
     
     
@@ -43,7 +43,7 @@ tests/cases/compiler/declarationEmitExpressionInExtends3.ts(37,31): error TS4020
     
     export class MyClass3 extends getExportedClass<LocalInterface>(undefined)<LocalInterface> { // Error LocalInterface is inaccisble
                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4020: Extends clause of exported class 'MyClass3' has or is using private name 'LocalInterface'.
+!!! error TS4020: 'extends' clause of exported class 'MyClass3' has or is using private name 'LocalInterface'.
     }
     
     
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends4.errors.txt b/tests/baselines/reference/declarationEmitExpressionInExtends4.errors.txt
@@ -1,11 +1,13 @@
 tests/cases/compiler/declarationEmitExpressionInExtends4.ts(2,10): error TS4060: Return type of exported function has or is using private name 'D'.
+tests/cases/compiler/declarationEmitExpressionInExtends4.ts(6,7): error TS4093: 'extends' clause of exported class 'C' refers to a type whose name cannot be referenced.
 tests/cases/compiler/declarationEmitExpressionInExtends4.ts(6,17): error TS2315: Type 'D' is not generic.
+tests/cases/compiler/declarationEmitExpressionInExtends4.ts(10,7): error TS4093: 'extends' clause of exported class 'C2' refers to a type whose name cannot be referenced.
 tests/cases/compiler/declarationEmitExpressionInExtends4.ts(10,18): error TS2304: Cannot find name 'SomeUndefinedFunction'.
 tests/cases/compiler/declarationEmitExpressionInExtends4.ts(15,18): error TS2304: Cannot find name 'SomeUndefinedFunction'.
-tests/cases/compiler/declarationEmitExpressionInExtends4.ts(15,18): error TS4020: Extends clause of exported class 'C3' has or is using private name 'SomeUndefinedFunction'.
+tests/cases/compiler/declarationEmitExpressionInExtends4.ts(15,18): error TS4020: 'extends' clause of exported class 'C3' has or is using private name 'SomeUndefinedFunction'.
 
 
-==== tests/cases/compiler/declarationEmitExpressionInExtends4.ts (5 errors) ====
+==== tests/cases/compiler/declarationEmitExpressionInExtends4.ts (7 errors) ====
     
     function getSomething() {
              ~~~~~~~~~~~~
@@ -14,12 +16,16 @@ tests/cases/compiler/declarationEmitExpressionInExtends4.ts(15,18): error TS4020
     }
     
     class C extends getSomething()<number, string> {
+          ~
+!!! error TS4093: 'extends' clause of exported class 'C' refers to a type whose name cannot be referenced.
                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2315: Type 'D' is not generic.
     
     }
     
     class C2 extends SomeUndefinedFunction()<number, string> {
+          ~~
+!!! error TS4093: 'extends' clause of exported class 'C2' refers to a type whose name cannot be referenced.
                      ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2304: Cannot find name 'SomeUndefinedFunction'.
     
@@ -30,6 +36,6 @@ tests/cases/compiler/declarationEmitExpressionInExtends4.ts(15,18): error TS4020
                      ~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2304: Cannot find name 'SomeUndefinedFunction'.
                      ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS4020: Extends clause of exported class 'C3' has or is using private name 'SomeUndefinedFunction'.
+!!! error TS4020: 'extends' clause of exported class 'C3' has or is using private name 'SomeUndefinedFunction'.
     
     }
diff --git a/tests/baselines/reference/exportClassExtendingIntersection.errors.txt b/tests/baselines/reference/exportClassExtendingIntersection.errors.txt
@@ -0,0 +1,39 @@
+tests/cases/compiler/FinalClass.ts(4,14): error TS4093: 'extends' clause of exported class 'MyExtendedClass' refers to a type whose name cannot be referenced.
+
+
+==== tests/cases/compiler/BaseClass.ts (0 errors) ====
+    export type Constructor<T> = new (...args: any[]) => T;
+    
+    export class MyBaseClass<T> {
+        baseProperty: string;
+        constructor(value: T) {}
+    }
+==== tests/cases/compiler/MixinClass.ts (0 errors) ====
+    import { Constructor, MyBaseClass } from './BaseClass';
+    
+    export interface MyMixin {
+        mixinProperty: string;
+    }
+    
+    export function MyMixin<T extends Constructor<MyBaseClass<any>>>(base: T): T & Constructor<MyMixin> {
+        return class extends base {
+            mixinProperty: string;
+        }
+    }
+==== tests/cases/compiler/FinalClass.ts (1 errors) ====
+    import { MyBaseClass } from './BaseClass';
+    import { MyMixin } from './MixinClass';
+    
+    export class MyExtendedClass extends MyMixin(MyBaseClass)<string> {
+                 ~~~~~~~~~~~~~~~
+!!! error TS4093: 'extends' clause of exported class 'MyExtendedClass' refers to a type whose name cannot be referenced.
+        extendedClassProperty: number;
+    }
+==== tests/cases/compiler/Main.ts (0 errors) ====
+    import { MyExtendedClass } from './FinalClass';
+    import { MyMixin } from './MixinClass';
+    
+    const myExtendedClass = new MyExtendedClass('string');
+    
+    const AnotherMixedClass = MyMixin(MyExtendedClass);
+    
diff --git a/tests/baselines/reference/exportClassExtendingIntersection.js b/tests/baselines/reference/exportClassExtendingIntersection.js
@@ -0,0 +1,114 @@
+//// [tests/cases/compiler/exportClassExtendingIntersection.ts] ////
+
+//// [BaseClass.ts]
+export type Constructor<T> = new (...args: any[]) => T;
+
+export class MyBaseClass<T> {
+    baseProperty: string;
+    constructor(value: T) {}
+}
+//// [MixinClass.ts]
+import { Constructor, MyBaseClass } from './BaseClass';
+
+export interface MyMixin {
+    mixinProperty: string;
+}
+
+export function MyMixin<T extends Constructor<MyBaseClass<any>>>(base: T): T & Constructor<MyMixin> {
+    return class extends base {
+        mixinProperty: string;
+    }
+}
+//// [FinalClass.ts]
+import { MyBaseClass } from './BaseClass';
+import { MyMixin } from './MixinClass';
+
+export class MyExtendedClass extends MyMixin(MyBaseClass)<string> {
+    extendedClassProperty: number;
+}
+//// [Main.ts]
+import { MyExtendedClass } from './FinalClass';
+import { MyMixin } from './MixinClass';
+
+const myExtendedClass = new MyExtendedClass('string');
+
+const AnotherMixedClass = MyMixin(MyExtendedClass);
+
+
+//// [BaseClass.js]
+"use strict";
+exports.__esModule = true;
+var MyBaseClass = (function () {
+    function MyBaseClass(value) {
+    }
+    return MyBaseClass;
+}());
+exports.MyBaseClass = MyBaseClass;
+//// [MixinClass.js]
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+function MyMixin(base) {
+    return (function (_super) {
+        __extends(class_1, _super);
+        function class_1() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return class_1;
+    }(base));
+}
+exports.MyMixin = MyMixin;
+//// [FinalClass.js]
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+var BaseClass_1 = require("./BaseClass");
+var MixinClass_1 = require("./MixinClass");
+var MyExtendedClass = (function (_super) {
+    __extends(MyExtendedClass, _super);
+    function MyExtendedClass() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return MyExtendedClass;
+}(MixinClass_1.MyMixin(BaseClass_1.MyBaseClass)));
+exports.MyExtendedClass = MyExtendedClass;
+//// [Main.js]
+"use strict";
+exports.__esModule = true;
+var FinalClass_1 = require("./FinalClass");
+var MixinClass_1 = require("./MixinClass");
+var myExtendedClass = new FinalClass_1.MyExtendedClass('string');
+var AnotherMixedClass = MixinClass_1.MyMixin(FinalClass_1.MyExtendedClass);
+
+
+//// [BaseClass.d.ts]
+export declare type Constructor<T> = new (...args: any[]) => T;
+export declare class MyBaseClass<T> {
+    baseProperty: string;
+    constructor(value: T);
+}
+//// [MixinClass.d.ts]
+import { Constructor, MyBaseClass } from './BaseClass';
+export interface MyMixin {
+    mixinProperty: string;
+}
+export declare function MyMixin<T extends Constructor<MyBaseClass<any>>>(base: T): T & Constructor<MyMixin>;
+//// [Main.d.ts]
diff --git a/tests/baselines/reference/mixinAccessModifiers.errors.txt b/tests/baselines/reference/mixinAccessModifiers.errors.txt
diff --git a/tests/baselines/reference/mixinAccessModifiers.js b/tests/baselines/reference/mixinAccessModifiers.js
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt
diff --git a/tests/cases/compiler/exportClassExtendingIntersection.ts b/tests/cases/compiler/exportClassExtendingIntersection.ts

Original file line number	Diff line number	Diff line change
`@@ -21392,6 +21392,9 @@ namespace ts {`
`21392`	`21392`	`const classType = <InterfaceType>getDeclaredTypeOfSymbol(getSymbolOfNode(node));`
`21393`	`21393`	`resolveBaseTypesOfClass(classType);`
`21394`	`21394`	`const baseType = classType.resolvedBaseTypes.length ? classType.resolvedBaseTypes[0] : unknownType;`
	`21395`	`+ if (!baseType.symbol) {`
	`21396`	`+ writer.reportIllegalExtends();`
	`21397`	`+ }`
`21395`	`21398`	`getSymbolDisplayBuilder().buildTypeDisplay(baseType, writer, enclosingDeclaration, flags);`
`21396`	`21399`	`}`
`21397`	`21400`
Original file line number	Diff line number	Diff line change
`@@ -2480,6 +2480,7 @@`
`2480`	`2480`	`// with import statements it previously saw (but chose not to emit).`
`2481`	`2481`	`trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void;`
`2482`	`2482`	`reportInaccessibleThisError(): void;`
	`2483`	`+ reportIllegalExtends(): void;`
`2483`	`2484`	`}`
`2484`	`2485`
`2485`	`2486`	`export const enum TypeFormatFlags {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ namespace ts {`
`67`	`67`	`decreaseIndent: noop,`
`68`	`68`	`clear: () => str = "",`
`69`	`69`	`trackSymbol: noop,`
`70`		`- reportInaccessibleThisError: noop`
	`70`	`+ reportInaccessibleThisError: noop,`
	`71`	`+ reportIllegalExtends: noop`
`71`	`72`	`};`
`72`	`73`	`}`
`73`	`74`