Skip to content

Fixed some variance measurements in type aliases of generic functions #54866

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed some variance measurements in type aliases of generic functions #54866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1915,6 +1915,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
var wildcardType = createIntrinsicType(TypeFlags.Any, "any");
var errorType = createIntrinsicType(TypeFlags.Any, "error");
var unresolvedType = createIntrinsicType(TypeFlags.Any, "unresolved");
var erasedType = createIntrinsicType(TypeFlags.Any, "erased");
var nonInferrableAnyType = createIntrinsicType(TypeFlags.Any, "any", ObjectFlags.ContainsWideningType);
var intrinsicMarkerType = createIntrinsicType(TypeFlags.Any, "intrinsic");
var unknownType = createIntrinsicType(TypeFlags.Unknown, "unknown");
Expand Down Expand Up @@ -16288,6 +16289,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

function addTypeToUnion(typeSet: Type[], includes: TypeFlags, type: Type) {
if (type === erasedType) {
return includes;
}
const flags = type.flags;
// We ignore 'never' types in unions
if (!(flags & TypeFlags.Never)) {
Expand Down Expand Up @@ -16621,6 +16625,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

function addTypeToIntersection(typeSet: Map<string, Type>, includes: TypeFlags, type: Type) {
if (type === erasedType) {
return includes;
}
const flags = type.flags;
if (flags & TypeFlags.Intersection) {
return addTypesToIntersection(typeSet, includes, (type as IntersectionType).types);
Expand Down Expand Up @@ -18681,7 +18688,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

function createTypeEraser(sources: readonly TypeParameter[]): TypeMapper {
return createTypeMapper(sources, /*targets*/ undefined);
return createTypeMapper(sources, sources.map(() => erasedType));
}

/**
Expand Down
9 changes: 8 additions & 1 deletion tests/baselines/reference/complexRecursiveCollections.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
immutable.ts(189,20): error TS2430: Interface 'Stack<T>' incorrectly extends interface 'Indexed<T>'.
The types returned by 'concat(...).filter(...)' are incompatible between these types.
Type 'Set<any>' is not assignable to type 'Indexed<any>'.
immutable.ts(341,22): error TS2430: Interface 'Keyed<K, V>' incorrectly extends interface 'Collection<K, V>'.
The types returned by 'toSeq()' are incompatible between these types.
Type 'Keyed<K, V>' is not assignable to type 'this'.
Expand Down Expand Up @@ -33,7 +36,7 @@ immutable.ts(391,22): error TS2430: Interface 'Set<T>' incorrectly extends inter
flatMap<M>(mapper: (value: T, key: void, iter: this) => Ara<M>, context?: any): N2<M>;
toSeq(): N2<T>;
}
==== immutable.ts (3 errors) ====
==== immutable.ts (4 errors) ====
// Test that complex recursive collections can pass the `extends` assignability check without
// running out of memory. This bug was exposed in Typescript 2.4 when more generic signatures
// started being checked.
Expand Down Expand Up @@ -223,6 +226,10 @@ immutable.ts(391,22): error TS2430: Interface 'Set<T>' incorrectly extends inter
export function Stack<T>(): Stack<T>;
export function Stack<T>(collection: Iterable<T>): Stack<T>;
export interface Stack<T> extends Collection.Indexed<T> {
~~~~~
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a hard time assessing if this is a good change or not, could use some help with that 😅

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably a good change. This used to stack out, using more variance calculations removed the stack out, but I think have been hiding the error with incorrect results.

!!! error TS2430: Interface 'Stack<T>' incorrectly extends interface 'Indexed<T>'.
!!! error TS2430: The types returned by 'concat(...).filter(...)' are incompatible between these types.
!!! error TS2430: Type 'Set<any>' is not assignable to type 'Indexed<any>'.
// Reading values
peek(): T | undefined;
// Persistent changes
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/complexRecursiveCollections.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ declare module Immutable {
>Seq : typeof Seq

function isSeq(maybeSeq: any): maybeSeq is Seq.Indexed<any> | Seq.Keyed<any, any>;
>isSeq : (maybeSeq: any) => maybeSeq is Indexed<any> | Keyed<any, any>
>isSeq : (maybeSeq: any) => maybeSeq is Keyed<any, any> | Indexed<any>
>maybeSeq : any
>Seq : any
>Seq : any
Expand Down
37 changes: 35 additions & 2 deletions tests/baselines/reference/varianceAnnotations.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,21 @@ varianceAnnotations.ts(160,68): error TS2345: Argument of type 'ActionObject<{ t
Types of property '_storedEvent' are incompatible.
Type '{ type: "PLAY"; value: number; } | { type: "RESET"; }' is not assignable to type '{ type: "PLAY"; value: number; }'.
Type '{ type: "RESET"; }' is not assignable to type '{ type: "PLAY"; value: number; }'.
varianceAnnotations.ts(177,15): error TS2636: Type 'F1_53210<sub-A>' is not assignable to type 'F1_53210<super-A>' as implied by variance annotation.
Types of parameters 'v' and 'v' are incompatible.
Type 'super-A' is not assignable to type 'sub-A'.
varianceAnnotations.ts(178,15): error TS2636: Type 'F2_53210<sub-A>' is not assignable to type 'F2_53210<super-A>' as implied by variance annotation.
Types of parameters 'v2' and 'v2' are incompatible.
Type 'super-A' is not assignable to type 'sub-A'.
varianceAnnotations.ts(179,15): error TS2636: Type 'F3_53210<sub-A>' is not assignable to type 'F3_53210<super-A>' as implied by variance annotation.
Types of parameters 'v2' and 'v2' are incompatible.
Type 'super-A' is not assignable to type 'sub-A'.
varianceAnnotations.ts(180,15): error TS2636: Type 'F4_53210<sub-A>' is not assignable to type 'F4_53210<super-A>' as implied by variance annotation.
Types of parameters 'v' and 'v' are incompatible.
Type 'super-A' is not assignable to type 'sub-A'.


==== varianceAnnotations.ts (31 errors) ====
==== varianceAnnotations.ts (35 errors) ====
type Covariant<out T> = {
x: T;
}
Expand Down Expand Up @@ -338,4 +350,25 @@ varianceAnnotations.ts(160,68): error TS2345: Argument of type 'ActionObject<{ t
return this;
}
}


// https://github.com/microsoft/TypeScript/issues/53210#issuecomment-1468551245
type F1_53210<out A> = <X>(v: X & A) => unknown;
~~~~~
!!! error TS2636: Type 'F1_53210<sub-A>' is not assignable to type 'F1_53210<super-A>' as implied by variance annotation.
!!! error TS2636: Types of parameters 'v' and 'v' are incompatible.
!!! error TS2636: Type 'super-A' is not assignable to type 'sub-A'.
type F2_53210<out A> = <X>(v1: X, v2: A) => unknown;
~~~~~
!!! error TS2636: Type 'F2_53210<sub-A>' is not assignable to type 'F2_53210<super-A>' as implied by variance annotation.
!!! error TS2636: Types of parameters 'v2' and 'v2' are incompatible.
!!! error TS2636: Type 'super-A' is not assignable to type 'sub-A'.
type F3_53210<out A> = <X>(v2: A) => X;
~~~~~
!!! error TS2636: Type 'F3_53210<sub-A>' is not assignable to type 'F3_53210<super-A>' as implied by variance annotation.
!!! error TS2636: Types of parameters 'v2' and 'v2' are incompatible.
!!! error TS2636: Type 'super-A' is not assignable to type 'sub-A'.
type F4_53210<out A> = <X>(v: X | A) => unknown;
~~~~~
!!! error TS2636: Type 'F4_53210<sub-A>' is not assignable to type 'F4_53210<super-A>' as implied by variance annotation.
!!! error TS2636: Types of parameters 'v' and 'v' are incompatible.
!!! error TS2636: Type 'super-A' is not assignable to type 'sub-A'.
11 changes: 10 additions & 1 deletion tests/baselines/reference/varianceAnnotations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,12 @@ let OuterC = class C<out T> {
return this;
}
}


// https://github.com/microsoft/TypeScript/issues/53210#issuecomment-1468551245
type F1_53210<out A> = <X>(v: X & A) => unknown;
type F2_53210<out A> = <X>(v1: X, v2: A) => unknown;
type F3_53210<out A> = <X>(v2: A) => X;
type F4_53210<out A> = <X>(v: X | A) => unknown;

//// [varianceAnnotations.js]
"use strict";
Expand Down Expand Up @@ -336,3 +341,7 @@ declare let OuterC: {
foo(): any;
};
};
type F1_53210<out A> = <X>(v: X & A) => unknown;
type F2_53210<out A> = <X>(v1: X, v2: A) => unknown;
type F3_53210<out A> = <X>(v2: A) => X;
type F4_53210<out A> = <X>(v: X | A) => unknown;
34 changes: 34 additions & 0 deletions tests/baselines/reference/varianceAnnotations.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,3 +482,37 @@ let OuterC = class C<out T> {
}
}

// https://github.com/microsoft/TypeScript/issues/53210#issuecomment-1468551245
type F1_53210<out A> = <X>(v: X & A) => unknown;
>F1_53210 : Symbol(F1_53210, Decl(varianceAnnotations.ts, 173, 1))
>A : Symbol(A, Decl(varianceAnnotations.ts, 176, 14))
>X : Symbol(X, Decl(varianceAnnotations.ts, 176, 24))
>v : Symbol(v, Decl(varianceAnnotations.ts, 176, 27))
>X : Symbol(X, Decl(varianceAnnotations.ts, 176, 24))
>A : Symbol(A, Decl(varianceAnnotations.ts, 176, 14))

type F2_53210<out A> = <X>(v1: X, v2: A) => unknown;
>F2_53210 : Symbol(F2_53210, Decl(varianceAnnotations.ts, 176, 48))
>A : Symbol(A, Decl(varianceAnnotations.ts, 177, 14))
>X : Symbol(X, Decl(varianceAnnotations.ts, 177, 24))
>v1 : Symbol(v1, Decl(varianceAnnotations.ts, 177, 27))
>X : Symbol(X, Decl(varianceAnnotations.ts, 177, 24))
>v2 : Symbol(v2, Decl(varianceAnnotations.ts, 177, 33))
>A : Symbol(A, Decl(varianceAnnotations.ts, 177, 14))

type F3_53210<out A> = <X>(v2: A) => X;
>F3_53210 : Symbol(F3_53210, Decl(varianceAnnotations.ts, 177, 52))
>A : Symbol(A, Decl(varianceAnnotations.ts, 178, 14))
>X : Symbol(X, Decl(varianceAnnotations.ts, 178, 24))
>v2 : Symbol(v2, Decl(varianceAnnotations.ts, 178, 27))
>A : Symbol(A, Decl(varianceAnnotations.ts, 178, 14))
>X : Symbol(X, Decl(varianceAnnotations.ts, 178, 24))

type F4_53210<out A> = <X>(v: X | A) => unknown;
>F4_53210 : Symbol(F4_53210, Decl(varianceAnnotations.ts, 178, 39))
>A : Symbol(A, Decl(varianceAnnotations.ts, 179, 14))
>X : Symbol(X, Decl(varianceAnnotations.ts, 179, 24))
>v : Symbol(v, Decl(varianceAnnotations.ts, 179, 27))
>X : Symbol(X, Decl(varianceAnnotations.ts, 179, 24))
>A : Symbol(A, Decl(varianceAnnotations.ts, 179, 14))

18 changes: 18 additions & 0 deletions tests/baselines/reference/varianceAnnotations.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,3 +371,21 @@ let OuterC = class C<out T> {
}
}

// https://github.com/microsoft/TypeScript/issues/53210#issuecomment-1468551245
type F1_53210<out A> = <X>(v: X & A) => unknown;
>F1_53210 : F1_53210<A>
>v : X & A

type F2_53210<out A> = <X>(v1: X, v2: A) => unknown;
>F2_53210 : F2_53210<A>
>v1 : X
>v2 : A

type F3_53210<out A> = <X>(v2: A) => X;
>F3_53210 : F3_53210<A>
>v2 : A

type F4_53210<out A> = <X>(v: X | A) => unknown;
>F4_53210 : F4_53210<A>
>v : A | X

6 changes: 6 additions & 0 deletions tests/cases/conformance/types/typeParameters/typeParameterLists/varianceAnnotations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,9 @@ let OuterC = class C<out T> {
return this;
}
}

// https://github.com/microsoft/TypeScript/issues/53210#issuecomment-1468551245
type F1_53210<out A> = <X>(v: X & A) => unknown;
type F2_53210<out A> = <X>(v1: X, v2: A) => unknown;
type F3_53210<out A> = <X>(v2: A) => X;
type F4_53210<out A> = <X>(v: X | A) => unknown;