Fix declaration/quick info for abstract construct signatures

rbuckton · rbuckton · commit d88027d8a9b4 · 2021-01-07T14:30:07.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3816,6 +3816,23 @@ namespace ts {
                 members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
         }
 
+        function getResolvedTypeWithoutAbstractConstructSignatures(type: ResolvedType) {
+            if (type.constructSignatures.length === 0) return type;
+            if (type.objectTypeWithoutAbstractConstructSignatures) return type.objectTypeWithoutAbstractConstructSignatures;
+            const constructSignatures = filter(type.constructSignatures, signature => !(signature.flags & SignatureFlags.Abstract));
+            if (type.constructSignatures === constructSignatures) return type;
+            const typeCopy = createAnonymousType(
+                type.symbol,
+                type.members,
+                type.callSignatures,
+                some(constructSignatures) ? constructSignatures : emptyArray,
+                type.stringIndexInfo,
+                type.numberIndexInfo);
+            type.objectTypeWithoutAbstractConstructSignatures = typeCopy;
+            typeCopy.objectTypeWithoutAbstractConstructSignatures = typeCopy;
+            return typeCopy;
+        }
+
         function forEachSymbolTableInScope<T>(enclosingDeclaration: Node | undefined, callback: (symbolTable: SymbolTable) => T): T {
             let result: T;
             for (let location = enclosingDeclaration; location; location = location.parent) {
@@ -4762,13 +4779,38 @@ namespace ts {
                         }
                     }
 
+                    const abstractSignatures = filter(resolved.constructSignatures, signature => !!(signature.flags & SignatureFlags.Abstract));
+                    if (some(abstractSignatures)) {
+                        const types = map(abstractSignatures, getOrCreateTypeFromSignature);
+                        // count the number of type elements excluding abstract constructors
+                        const typeElementCount =
+                            resolved.callSignatures.length +
+                            (resolved.constructSignatures.length - abstractSignatures.length) +
+                            (resolved.stringIndexInfo ? 1 : 0) +
+                            (resolved.numberIndexInfo ? 1 : 0) +
+                            // exclude `prototype` when writing a class expression as a type literal, as per
+                            // the logic in `createTypeNodesFromResolvedType`.
+                            (context.flags & NodeBuilderFlags.WriteClassExpressionAsTypeLiteral ?
+                                countWhere(resolved.properties, p => !(p.flags & SymbolFlags.Prototype)) :
+                                length(resolved.properties));
+                        // don't include an empty object literal if there were no other static-side 
+                        // properties to write, i.e. `abstract class C { }` becomes `abstract new () => {}`
+                        // and not `(abstract new () => {}) & {}`
+                        if (typeElementCount) {
+                            // create a copy of the object type without any abstract construct signatures.
+                            types.push(getResolvedTypeWithoutAbstractConstructSignatures(resolved));
+                        }
+                        return typeToTypeNodeHelper(getIntersectionType(types), context);
+                    }
+
                     const savedFlags = context.flags;
                     context.flags |= NodeBuilderFlags.InObjectTypeLiteral;
                     const members = createTypeNodesFromResolvedType(resolved);
                     context.flags = savedFlags;
                     const typeLiteralNode = factory.createTypeLiteralNode(members);
                     context.approximateLength += 2;
-                    return setEmitFlags(typeLiteralNode, (context.flags & NodeBuilderFlags.MultilineObjectLiterals) ? 0 : EmitFlags.SingleLine);
+                    setEmitFlags(typeLiteralNode, (context.flags & NodeBuilderFlags.MultilineObjectLiterals) ? 0 : EmitFlags.SingleLine);
+                    return typeLiteralNode;
                 }
 
                 function typeReferenceToTypeNode(type: TypeReference) {
@@ -4938,6 +4980,7 @@ namespace ts {
                         typeElements.push(<CallSignatureDeclaration>signatureToSignatureDeclarationHelper(signature, SyntaxKind.CallSignature, context));
                     }
                     for (const signature of resolvedType.constructSignatures) {
+                        if (signature.flags & SignatureFlags.Abstract) continue;
                         typeElements.push(<ConstructSignatureDeclaration>signatureToSignatureDeclarationHelper(signature, SyntaxKind.ConstructSignature, context));
                     }
                     if (resolvedType.stringIndexInfo) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -5172,6 +5172,7 @@ namespace ts {
         /* @internal */ constructSignatures?: readonly Signature[]; // Construct signatures of type
         /* @internal */ stringIndexInfo?: IndexInfo;      // String indexing info
         /* @internal */ numberIndexInfo?: IndexInfo;      // Numeric indexing info
+        /* @internal */ objectTypeWithoutAbstractConstructSignatures?: ObjectType;
     }
 
     /** Class and interface types (ObjectFlags.Class and ObjectFlags.Interface). */
diff --git a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
@@ -104,12 +104,10 @@ export declare const Mixed: {
         bar: number;
     };
 } & typeof Unmixed;
-declare const FilteredThing_base: {
-    new (...args: any[]): {
-        match(path: string): boolean;
-        thing: number;
-    };
-} & typeof Unmixed;
+declare const FilteredThing_base: (abstract new (...args: any[]) => {
+    match(path: string): boolean;
+    thing: number;
+}) & typeof Unmixed;
 export declare class FilteredThing extends FilteredThing_base {
     match(path: string): boolean;
 }
diff --git a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.types b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.types
@@ -33,7 +33,7 @@ export const Mixed = mixin(Unmixed);
 >Unmixed : typeof Unmixed
 
 function Filter<C extends Constructor<{}>>(ctor: C) {
->Filter : <C extends Constructor<{}>>(ctor: C) => { new (...args: any[]): FilterMixin; prototype: Filter<any>.FilterMixin; } & C
+>Filter : <C extends Constructor<{}>>(ctor: C) => ((abstract new (...args: any[]) => FilterMixin) & { prototype: Filter<any>.FilterMixin; }) & C
 >ctor : C
 
     abstract class FilterMixin extends ctor {
@@ -50,13 +50,13 @@ function Filter<C extends Constructor<{}>>(ctor: C) {
 >12 : 12
     }
     return FilterMixin;
->FilterMixin : { new (...args: any[]): FilterMixin; prototype: Filter<any>.FilterMixin; } & C
+>FilterMixin : ((abstract new (...args: any[]) => FilterMixin) & { prototype: Filter<any>.FilterMixin; }) & C
 }
 
 export class FilteredThing extends Filter(Unmixed) {
 >FilteredThing : FilteredThing
 >Filter(Unmixed) : Filter<typeof Unmixed>.FilterMixin & Unmixed
->Filter : <C extends Constructor<{}>>(ctor: C) => { new (...args: any[]): FilterMixin; prototype: Filter<any>.FilterMixin; } & C
+>Filter : <C extends Constructor<{}>>(ctor: C) => ((abstract new (...args: any[]) => FilterMixin) & { prototype: Filter<any>.FilterMixin; }) & C
 >Unmixed : typeof Unmixed
 
     match(path: string) {
diff --git a/tests/baselines/reference/mixinAbstractClasses.types b/tests/baselines/reference/mixinAbstractClasses.types
@@ -19,7 +19,7 @@ function Mixin<TBaseClass extends abstract new (...args: any) => any>(baseClass:
         }
     }
     return MixinClass;
->MixinClass : { new (...args: any): MixinClass; prototype: Mixin<any>.MixinClass; } & TBaseClass
+>MixinClass : ((abstract new (...args: any) => MixinClass) & { prototype: Mixin<any>.MixinClass; }) & TBaseClass
 }
 
 class ConcreteBase {
diff --git a/tests/baselines/reference/mixinAbstractClassesReturnTypeInference.js b/tests/baselines/reference/mixinAbstractClassesReturnTypeInference.js
@@ -0,0 +1,63 @@
+//// [mixinAbstractClassesReturnTypeInference.ts]
+interface Mixin1 {
+    mixinMethod(): void;
+}
+
+abstract class AbstractBase {
+    abstract abstractBaseMethod(): void;
+}
+
+function Mixin2<TBase extends abstract new (...args: any[]) => any>(baseClass: TBase) {
+    // must be `abstract` because we cannot know *all* of the possible abstract members that need to be
+    // implemented for this to be concrete.
+    abstract class MixinClass extends baseClass implements Mixin1 {
+        mixinMethod(): void {}
+        static staticMixinMethod(): void {}
+    }
+    return MixinClass;
+}
+
+class DerivedFromAbstract2 extends Mixin2(AbstractBase) {
+    abstractBaseMethod() {}
+}
+
+
+//// [mixinAbstractClassesReturnTypeInference.js]
+class AbstractBase {
+}
+function Mixin2(baseClass) {
+    // must be `abstract` because we cannot know *all* of the possible abstract members that need to be
+    // implemented for this to be concrete.
+    class MixinClass extends baseClass {
+        mixinMethod() { }
+        static staticMixinMethod() { }
+    }
+    return MixinClass;
+}
+class DerivedFromAbstract2 extends Mixin2(AbstractBase) {
+    abstractBaseMethod() { }
+}
+
+
+//// [mixinAbstractClassesReturnTypeInference.d.ts]
+interface Mixin1 {
+    mixinMethod(): void;
+}
+declare abstract class AbstractBase {
+    abstract abstractBaseMethod(): void;
+}
+declare function Mixin2<TBase extends abstract new (...args: any[]) => any>(baseClass: TBase): ((abstract new (...args: any[]) => {
+    [x: string]: any;
+    mixinMethod(): void;
+}) & {
+    staticMixinMethod(): void;
+}) & TBase;
+declare const DerivedFromAbstract2_base: ((abstract new (...args: any[]) => {
+    [x: string]: any;
+    mixinMethod(): void;
+}) & {
+    staticMixinMethod(): void;
+}) & typeof AbstractBase;
+declare class DerivedFromAbstract2 extends DerivedFromAbstract2_base {
+    abstractBaseMethod(): void;
+}
diff --git a/tests/baselines/reference/mixinAbstractClassesReturnTypeInference.symbols b/tests/baselines/reference/mixinAbstractClassesReturnTypeInference.symbols
@@ -0,0 +1,48 @@
+=== tests/cases/conformance/classes/mixinAbstractClassesReturnTypeInference.ts ===
+interface Mixin1 {
+>Mixin1 : Symbol(Mixin1, Decl(mixinAbstractClassesReturnTypeInference.ts, 0, 0))
+
+    mixinMethod(): void;
+>mixinMethod : Symbol(Mixin1.mixinMethod, Decl(mixinAbstractClassesReturnTypeInference.ts, 0, 18))
+}
+
+abstract class AbstractBase {
+>AbstractBase : Symbol(AbstractBase, Decl(mixinAbstractClassesReturnTypeInference.ts, 2, 1))
+
+    abstract abstractBaseMethod(): void;
+>abstractBaseMethod : Symbol(AbstractBase.abstractBaseMethod, Decl(mixinAbstractClassesReturnTypeInference.ts, 4, 29))
+}
+
+function Mixin2<TBase extends abstract new (...args: any[]) => any>(baseClass: TBase) {
+>Mixin2 : Symbol(Mixin2, Decl(mixinAbstractClassesReturnTypeInference.ts, 6, 1))
+>TBase : Symbol(TBase, Decl(mixinAbstractClassesReturnTypeInference.ts, 8, 16))
+>args : Symbol(args, Decl(mixinAbstractClassesReturnTypeInference.ts, 8, 44))
+>baseClass : Symbol(baseClass, Decl(mixinAbstractClassesReturnTypeInference.ts, 8, 68))
+>TBase : Symbol(TBase, Decl(mixinAbstractClassesReturnTypeInference.ts, 8, 16))
+
+    // must be `abstract` because we cannot know *all* of the possible abstract members that need to be
+    // implemented for this to be concrete.
+    abstract class MixinClass extends baseClass implements Mixin1 {
+>MixinClass : Symbol(MixinClass, Decl(mixinAbstractClassesReturnTypeInference.ts, 8, 87))
+>baseClass : Symbol(baseClass, Decl(mixinAbstractClassesReturnTypeInference.ts, 8, 68))
+>Mixin1 : Symbol(Mixin1, Decl(mixinAbstractClassesReturnTypeInference.ts, 0, 0))
+
+        mixinMethod(): void {}
+>mixinMethod : Symbol(MixinClass.mixinMethod, Decl(mixinAbstractClassesReturnTypeInference.ts, 11, 67))
+
+        static staticMixinMethod(): void {}
+>staticMixinMethod : Symbol(MixinClass.staticMixinMethod, Decl(mixinAbstractClassesReturnTypeInference.ts, 12, 30))
+    }
+    return MixinClass;
+>MixinClass : Symbol(MixinClass, Decl(mixinAbstractClassesReturnTypeInference.ts, 8, 87))
+}
+
+class DerivedFromAbstract2 extends Mixin2(AbstractBase) {
+>DerivedFromAbstract2 : Symbol(DerivedFromAbstract2, Decl(mixinAbstractClassesReturnTypeInference.ts, 16, 1))
+>Mixin2 : Symbol(Mixin2, Decl(mixinAbstractClassesReturnTypeInference.ts, 6, 1))
+>AbstractBase : Symbol(AbstractBase, Decl(mixinAbstractClassesReturnTypeInference.ts, 2, 1))
+
+    abstractBaseMethod() {}
+>abstractBaseMethod : Symbol(DerivedFromAbstract2.abstractBaseMethod, Decl(mixinAbstractClassesReturnTypeInference.ts, 18, 57))
+}
+
diff --git a/tests/baselines/reference/mixinAbstractClassesReturnTypeInference.types b/tests/baselines/reference/mixinAbstractClassesReturnTypeInference.types
@@ -0,0 +1,44 @@
+=== tests/cases/conformance/classes/mixinAbstractClassesReturnTypeInference.ts ===
+interface Mixin1 {
+    mixinMethod(): void;
+>mixinMethod : () => void
+}
+
+abstract class AbstractBase {
+>AbstractBase : AbstractBase
+
+    abstract abstractBaseMethod(): void;
+>abstractBaseMethod : () => void
+}
+
+function Mixin2<TBase extends abstract new (...args: any[]) => any>(baseClass: TBase) {
+>Mixin2 : <TBase extends abstract new (...args: any[]) => any>(baseClass: TBase) => ((abstract new (...args: any[]) => MixinClass) & { prototype: Mixin2<any>.MixinClass; staticMixinMethod(): void; }) & TBase
+>args : any[]
+>baseClass : TBase
+
+    // must be `abstract` because we cannot know *all* of the possible abstract members that need to be
+    // implemented for this to be concrete.
+    abstract class MixinClass extends baseClass implements Mixin1 {
+>MixinClass : MixinClass
+>baseClass : TBase
+
+        mixinMethod(): void {}
+>mixinMethod : () => void
+
+        static staticMixinMethod(): void {}
+>staticMixinMethod : () => void
+    }
+    return MixinClass;
+>MixinClass : ((abstract new (...args: any[]) => MixinClass) & { prototype: Mixin2<any>.MixinClass; staticMixinMethod(): void; }) & TBase
+}
+
+class DerivedFromAbstract2 extends Mixin2(AbstractBase) {
+>DerivedFromAbstract2 : DerivedFromAbstract2
+>Mixin2(AbstractBase) : Mixin2<typeof AbstractBase>.MixinClass & AbstractBase
+>Mixin2 : <TBase extends abstract new (...args: any[]) => any>(baseClass: TBase) => ((abstract new (...args: any[]) => MixinClass) & { prototype: Mixin2<any>.MixinClass; staticMixinMethod(): void; }) & TBase
+>AbstractBase : typeof AbstractBase
+
+    abstractBaseMethod() {}
+>abstractBaseMethod : () => void
+}
+
diff --git a/tests/cases/conformance/classes/mixinAbstractClassesReturnTypeInference.ts b/tests/cases/conformance/classes/mixinAbstractClassesReturnTypeInference.ts
@@ -0,0 +1,24 @@
+// @target: esnext
+// @declaration: true
+
+interface Mixin1 {
+    mixinMethod(): void;
+}
+
+abstract class AbstractBase {
+    abstract abstractBaseMethod(): void;
+}
+
+function Mixin2<TBase extends abstract new (...args: any[]) => any>(baseClass: TBase) {
+    // must be `abstract` because we cannot know *all* of the possible abstract members that need to be
+    // implemented for this to be concrete.
+    abstract class MixinClass extends baseClass implements Mixin1 {
+        mixinMethod(): void {}
+        static staticMixinMethod(): void {}
+    }
+    return MixinClass;
+}
+
+class DerivedFromAbstract2 extends Mixin2(AbstractBase) {
+    abstractBaseMethod() {}
+}

Original file line number	Diff line number	Diff line change
`@@ -5172,6 +5172,7 @@ namespace ts {`
`5172`	`5172`	`/* @internal */ constructSignatures?: readonly Signature[]; // Construct signatures of type`
`5173`	`5173`	`/* @internal */ stringIndexInfo?: IndexInfo; // String indexing info`
`5174`	`5174`	`/* @internal */ numberIndexInfo?: IndexInfo; // Numeric indexing info`
	`5175`	`+ /* @internal */ objectTypeWithoutAbstractConstructSignatures?: ObjectType;`
`5175`	`5176`	`}`
`5176`	`5177`
`5177`	`5178`	`/** Class and interface types (ObjectFlags.Class and ObjectFlags.Interface). */`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ function Mixin<TBaseClass extends abstract new (...args: any) => any>(baseClass:`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`return MixinClass;`
`22`		`->MixinClass : { new (...args: any): MixinClass; prototype: Mixin<any>.MixinClass; } & TBaseClass`
	`22`	`+>MixinClass : ((abstract new (...args: any) => MixinClass) & { prototype: Mixin<any>.MixinClass; }) & TBaseClass`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`class ConcreteBase {`