From 376a03be7dbd9de1dc4c526d2ac6774979ca764f Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Tue, 15 Dec 2020 15:31:12 -0800 Subject: [PATCH] Ignore method bivariance in the subtype and strict subtype relationships Fix #41977 --- src/compiler/checker.ts | 11 ++- ...ayLiteralWithMultipleBestCommonTypes.types | 4 +- .../reference/arrayOfFunctionTypes3.types | 14 ++-- .../reference/bestChoiceType.symbols | 18 ++--- .../baselines/reference/bestChoiceType.types | 74 +++++++++---------- .../contextualTypingArrayOfLambdas.types | 4 +- ...tializedDestructuringAssignmentTypes.types | 2 +- .../subtypeReduceBivariance1.errors.txt | 23 ++++++ .../reference/subtypeReduceBivariance1.js | 19 +++++ .../subtypeReduceBivariance1.symbols | 34 +++++++++ .../reference/subtypeReduceBivariance1.types | 31 ++++++++ .../subtypeReduceBivariance2.errors.txt | 23 ++++++ .../reference/subtypeReduceBivariance2.js | 19 +++++ .../subtypeReduceBivariance2.symbols | 34 +++++++++ .../reference/subtypeReduceBivariance2.types | 31 ++++++++ .../subtypeReduceBivarianceChecks.js | 5 ++ .../subtypeReduceBivarianceChecks.symbols | 9 +++ .../subtypeReduceBivarianceChecks.types | 20 +++++ .../subtypingWithCallSignatures3.types | 16 ++-- .../subtypingWithConstructSignatures3.types | 16 ++-- .../reference/tsxUnionElementType3.errors.txt | 12 ++- .../reference/tsxUnionElementType3.types | 8 +- .../reference/tsxUnionElementType4.errors.txt | 7 +- .../reference/tsxUnionElementType4.types | 6 +- .../compiler/subtypeReduceBivariance1.ts | 13 ++++ .../compiler/subtypeReduceBivariance2.ts | 13 ++++ .../compiler/subtypeReduceBivarianceChecks.ts | 1 + 27 files changed, 372 insertions(+), 95 deletions(-) create mode 100644 tests/baselines/reference/subtypeReduceBivariance1.errors.txt create mode 100644 tests/baselines/reference/subtypeReduceBivariance1.js create mode 100644 tests/baselines/reference/subtypeReduceBivariance1.symbols create mode 100644 tests/baselines/reference/subtypeReduceBivariance1.types create mode 100644 tests/baselines/reference/subtypeReduceBivariance2.errors.txt create mode 100644 tests/baselines/reference/subtypeReduceBivariance2.js create mode 100644 tests/baselines/reference/subtypeReduceBivariance2.symbols create mode 100644 tests/baselines/reference/subtypeReduceBivariance2.types create mode 100644 tests/baselines/reference/subtypeReduceBivarianceChecks.js create mode 100644 tests/baselines/reference/subtypeReduceBivarianceChecks.symbols create mode 100644 tests/baselines/reference/subtypeReduceBivarianceChecks.types create mode 100644 tests/cases/compiler/subtypeReduceBivariance1.ts create mode 100644 tests/cases/compiler/subtypeReduceBivariance2.ts create mode 100644 tests/cases/compiler/subtypeReduceBivarianceChecks.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 772fdf9f0bb44..a9840f87e5a8a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -194,6 +194,7 @@ namespace ts { StrictCallback = 1 << 1, IgnoreReturnTypes = 1 << 2, StrictArity = 1 << 3, + IgnoreBivariance = 1 << 4, Callback = BivariantCallback | StrictCallback, } @@ -16280,8 +16281,12 @@ namespace ts { } const kind = target.declaration ? target.declaration.kind : SyntaxKind.Unknown; - const strictVariance = !(checkMode & SignatureCheckMode.Callback) && strictFunctionTypes && kind !== SyntaxKind.MethodDeclaration && - kind !== SyntaxKind.MethodSignature && kind !== SyntaxKind.Constructor; + const strictVariance = (checkMode & SignatureCheckMode.IgnoreBivariance) || + (!(checkMode & SignatureCheckMode.Callback) && + strictFunctionTypes && + kind !== SyntaxKind.MethodDeclaration && + kind !== SyntaxKind.MethodSignature && + kind !== SyntaxKind.Constructor); let result = Ternary.True; const sourceThisType = getThisTypeOfSignature(source); @@ -18538,7 +18543,7 @@ namespace ts { */ function signatureRelatedTo(source: Signature, target: Signature, erase: boolean, reportErrors: boolean, incompatibleReporter: (source: Type, target: Type) => void): Ternary { return compareSignaturesRelated(erase ? getErasedSignature(source) : source, erase ? getErasedSignature(target) : target, - relation === strictSubtypeRelation ? SignatureCheckMode.StrictArity : 0, reportErrors, reportError, incompatibleReporter, isRelatedTo, makeFunctionTypeMapper(reportUnreliableMarkers)); + relation === strictSubtypeRelation ? (SignatureCheckMode.StrictArity | SignatureCheckMode.IgnoreBivariance) : 0, reportErrors, reportError, incompatibleReporter, isRelatedTo, makeFunctionTypeMapper(reportUnreliableMarkers)); } function signaturesIdenticalTo(source: Type, target: Type, kind: SignatureKind): Ternary { diff --git a/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types b/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types index a7553fd5cd5f0..6572893f90013 100644 --- a/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types +++ b/tests/baselines/reference/arrayLiteralWithMultipleBestCommonTypes.types @@ -36,8 +36,8 @@ var cs = [a, b, c]; // { x: number; y?: number };[] >c : { x: number; a?: number; } var ds = [(x: Object) => 1, (x: string) => 2]; // { (x:Object) => number }[] ->ds : ((x: Object) => number)[] ->[(x: Object) => 1, (x: string) => 2] : ((x: Object) => number)[] +>ds : ((x: string) => number)[] +>[(x: Object) => 1, (x: string) => 2] : ((x: string) => number)[] >(x: Object) => 1 : (x: Object) => number >x : Object >1 : 1 diff --git a/tests/baselines/reference/arrayOfFunctionTypes3.types b/tests/baselines/reference/arrayOfFunctionTypes3.types index 4dd258645a6f2..b4ea3b59ba10a 100644 --- a/tests/baselines/reference/arrayOfFunctionTypes3.types +++ b/tests/baselines/reference/arrayOfFunctionTypes3.types @@ -50,28 +50,28 @@ var c: { (x: number): number; (x: any): any; }; >x : any var z = [a, b, c]; ->z : { (x: number): number; (x: any): any; }[] ->[a, b, c] : { (x: number): number; (x: any): any; }[] +>z : ({ (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; })[] +>[a, b, c] : ({ (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; })[] >a : { (x: number): number; (x: string): string; } >b : { (x: number): number; (x: string): string; } >c : { (x: number): number; (x: any): any; } var r4 = z[0]; ->r4 : { (x: number): number; (x: any): any; } ->z[0] : { (x: number): number; (x: any): any; } ->z : { (x: number): number; (x: any): any; }[] +>r4 : { (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; } +>z[0] : { (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; } +>z : ({ (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; })[] >0 : 0 var r5 = r4(''); // any not string >r5 : any >r4('') : any ->r4 : { (x: number): number; (x: any): any; } +>r4 : { (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; } >'' : "" var r5b = r4(1); >r5b : number >r4(1) : number ->r4 : { (x: number): number; (x: any): any; } +>r4 : { (x: number): number; (x: string): string; } | { (x: number): number; (x: any): any; } >1 : 1 var a2: { (x: T): number; (x: string): string;}; diff --git a/tests/baselines/reference/bestChoiceType.symbols b/tests/baselines/reference/bestChoiceType.symbols index c7732890347d0..0072356223368 100644 --- a/tests/baselines/reference/bestChoiceType.symbols +++ b/tests/baselines/reference/bestChoiceType.symbols @@ -2,14 +2,12 @@ // Repro from #10041 (''.match(/ /) || []).map(s => s.toLowerCase()); ->(''.match(/ /) || []).map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) +>(''.match(/ /) || []).map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >''.match : Symbol(String.match, Decl(lib.es5.d.ts, --, --)) >match : Symbol(String.match, Decl(lib.es5.d.ts, --, --)) ->map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) +>map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >s : Symbol(s, Decl(bestChoiceType.ts, 2, 26)) ->s.toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --)) >s : Symbol(s, Decl(bestChoiceType.ts, 2, 26)) ->toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --)) // Similar cases @@ -27,13 +25,11 @@ function f1() { let z = y.map(s => s.toLowerCase()); >z : Symbol(z, Decl(bestChoiceType.ts, 9, 7)) ->y.map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) +>y.map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >y : Symbol(y, Decl(bestChoiceType.ts, 8, 7)) ->map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) +>map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >s : Symbol(s, Decl(bestChoiceType.ts, 9, 18)) ->s.toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --)) >s : Symbol(s, Decl(bestChoiceType.ts, 9, 18)) ->toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --)) } function f2() { @@ -51,12 +47,10 @@ function f2() { let z = y.map(s => s.toLowerCase()); >z : Symbol(z, Decl(bestChoiceType.ts, 15, 7)) ->y.map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) +>y.map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >y : Symbol(y, Decl(bestChoiceType.ts, 14, 7)) ->map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --)) +>map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >s : Symbol(s, Decl(bestChoiceType.ts, 15, 18)) ->s.toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --)) >s : Symbol(s, Decl(bestChoiceType.ts, 15, 18)) ->toLowerCase : Symbol(String.toLowerCase, Decl(lib.es5.d.ts, --, --)) } diff --git a/tests/baselines/reference/bestChoiceType.types b/tests/baselines/reference/bestChoiceType.types index 49997d1e273cc..95fc6fb0ca5c3 100644 --- a/tests/baselines/reference/bestChoiceType.types +++ b/tests/baselines/reference/bestChoiceType.types @@ -2,23 +2,23 @@ // Repro from #10041 (''.match(/ /) || []).map(s => s.toLowerCase()); ->(''.match(/ /) || []).map(s => s.toLowerCase()) : string[] ->(''.match(/ /) || []).map : (callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[] ->(''.match(/ /) || []) : RegExpMatchArray ->''.match(/ /) || [] : RegExpMatchArray +>(''.match(/ /) || []).map(s => s.toLowerCase()) : any[] +>(''.match(/ /) || []).map : ((callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]) | ((callbackfn: (value: never, index: number, array: never[]) => U, thisArg?: any) => U[]) +>(''.match(/ /) || []) : RegExpMatchArray | never[] +>''.match(/ /) || [] : RegExpMatchArray | never[] >''.match(/ /) : RegExpMatchArray | null >''.match : (regexp: string | RegExp) => RegExpMatchArray | null >'' : "" >match : (regexp: string | RegExp) => RegExpMatchArray | null >/ / : RegExp >[] : never[] ->map : (callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[] ->s => s.toLowerCase() : (s: string) => string ->s : string ->s.toLowerCase() : string ->s.toLowerCase : () => string ->s : string ->toLowerCase : () => string +>map : ((callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]) | ((callbackfn: (value: never, index: number, array: never[]) => U, thisArg?: any) => U[]) +>s => s.toLowerCase() : (s: any) => any +>s : any +>s.toLowerCase() : any +>s.toLowerCase : any +>s : any +>toLowerCase : any // Similar cases @@ -34,23 +34,23 @@ function f1() { >/ / : RegExp let y = x || []; ->y : RegExpMatchArray ->x || [] : RegExpMatchArray +>y : RegExpMatchArray | never[] +>x || [] : RegExpMatchArray | never[] >x : RegExpMatchArray | null >[] : never[] let z = y.map(s => s.toLowerCase()); ->z : string[] ->y.map(s => s.toLowerCase()) : string[] ->y.map : (callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[] ->y : RegExpMatchArray ->map : (callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[] ->s => s.toLowerCase() : (s: string) => string ->s : string ->s.toLowerCase() : string ->s.toLowerCase : () => string ->s : string ->toLowerCase : () => string +>z : any[] +>y.map(s => s.toLowerCase()) : any[] +>y.map : ((callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]) | ((callbackfn: (value: never, index: number, array: never[]) => U, thisArg?: any) => U[]) +>y : RegExpMatchArray | never[] +>map : ((callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]) | ((callbackfn: (value: never, index: number, array: never[]) => U, thisArg?: any) => U[]) +>s => s.toLowerCase() : (s: any) => any +>s : any +>s.toLowerCase() : any +>s.toLowerCase : any +>s : any +>toLowerCase : any } function f2() { @@ -65,23 +65,23 @@ function f2() { >/ / : RegExp let y = x ? x : []; ->y : RegExpMatchArray ->x ? x : [] : RegExpMatchArray +>y : RegExpMatchArray | never[] +>x ? x : [] : RegExpMatchArray | never[] >x : RegExpMatchArray | null >x : RegExpMatchArray >[] : never[] let z = y.map(s => s.toLowerCase()); ->z : string[] ->y.map(s => s.toLowerCase()) : string[] ->y.map : (callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[] ->y : RegExpMatchArray ->map : (callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[] ->s => s.toLowerCase() : (s: string) => string ->s : string ->s.toLowerCase() : string ->s.toLowerCase : () => string ->s : string ->toLowerCase : () => string +>z : any[] +>y.map(s => s.toLowerCase()) : any[] +>y.map : ((callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]) | ((callbackfn: (value: never, index: number, array: never[]) => U, thisArg?: any) => U[]) +>y : RegExpMatchArray | never[] +>map : ((callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]) | ((callbackfn: (value: never, index: number, array: never[]) => U, thisArg?: any) => U[]) +>s => s.toLowerCase() : (s: any) => any +>s : any +>s.toLowerCase() : any +>s.toLowerCase : any +>s : any +>toLowerCase : any } diff --git a/tests/baselines/reference/contextualTypingArrayOfLambdas.types b/tests/baselines/reference/contextualTypingArrayOfLambdas.types index 36b8aaa715f6f..ffe589c092927 100644 --- a/tests/baselines/reference/contextualTypingArrayOfLambdas.types +++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.types @@ -23,8 +23,8 @@ class C extends A { } var xs = [(x: A) => { }, (x: B) => { }, (x: C) => { }]; ->xs : ((x: A) => void)[] ->[(x: A) => { }, (x: B) => { }, (x: C) => { }] : ((x: A) => void)[] +>xs : (((x: B) => void) | ((x: C) => void))[] +>[(x: A) => { }, (x: B) => { }, (x: C) => { }] : (((x: B) => void) | ((x: C) => void))[] >(x: A) => { } : (x: A) => void >x : A >(x: B) => { } : (x: B) => void diff --git a/tests/baselines/reference/initializedDestructuringAssignmentTypes.types b/tests/baselines/reference/initializedDestructuringAssignmentTypes.types index 333fc5d92ccd8..07fd73428cf33 100644 --- a/tests/baselines/reference/initializedDestructuringAssignmentTypes.types +++ b/tests/baselines/reference/initializedDestructuringAssignmentTypes.types @@ -3,7 +3,7 @@ const [, a = ''] = ''.match('') || []; > : undefined >a : string >'' : "" ->''.match('') || [] : RegExpMatchArray +>''.match('') || [] : RegExpMatchArray | undefined[] >''.match('') : RegExpMatchArray >''.match : (regexp: string | RegExp) => RegExpMatchArray >'' : "" diff --git a/tests/baselines/reference/subtypeReduceBivariance1.errors.txt b/tests/baselines/reference/subtypeReduceBivariance1.errors.txt new file mode 100644 index 0000000000000..8b3a215089f78 --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivariance1.errors.txt @@ -0,0 +1,23 @@ +tests/cases/compiler/subtypeReduceBivariance1.ts(11,51): error TS2322: Type '(a: number) => void' is not assignable to type '(a: string | number) => void'. + Types of parameters 'a' and 'a' are incompatible. + Type 'string | number' is not assignable to type 'number'. + Type 'string' is not assignable to type 'number'. + + +==== tests/cases/compiler/subtypeReduceBivariance1.ts (1 errors) ==== + interface S { + f(a: number | string): void; + } + declare const S: S; + function g(a: number): void { } + + // Force type resolution + g; + S.f; + + const arr: Array<(a: number | string) => void> = [g, S.f]; + ~ +!!! error TS2322: Type '(a: number) => void' is not assignable to type '(a: string | number) => void'. +!!! error TS2322: Types of parameters 'a' and 'a' are incompatible. +!!! error TS2322: Type 'string | number' is not assignable to type 'number'. +!!! error TS2322: Type 'string' is not assignable to type 'number'. \ No newline at end of file diff --git a/tests/baselines/reference/subtypeReduceBivariance1.js b/tests/baselines/reference/subtypeReduceBivariance1.js new file mode 100644 index 0000000000000..c746528669999 --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivariance1.js @@ -0,0 +1,19 @@ +//// [subtypeReduceBivariance1.ts] +interface S { + f(a: number | string): void; +} +declare const S: S; +function g(a: number): void { } + +// Force type resolution +g; +S.f; + +const arr: Array<(a: number | string) => void> = [g, S.f]; + +//// [subtypeReduceBivariance1.js] +function g(a) { } +// Force type resolution +g; +S.f; +var arr = [g, S.f]; diff --git a/tests/baselines/reference/subtypeReduceBivariance1.symbols b/tests/baselines/reference/subtypeReduceBivariance1.symbols new file mode 100644 index 0000000000000..84e16b94d7137 --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivariance1.symbols @@ -0,0 +1,34 @@ +=== tests/cases/compiler/subtypeReduceBivariance1.ts === +interface S { +>S : Symbol(S, Decl(subtypeReduceBivariance1.ts, 0, 0), Decl(subtypeReduceBivariance1.ts, 3, 13)) + + f(a: number | string): void; +>f : Symbol(S.f, Decl(subtypeReduceBivariance1.ts, 0, 13)) +>a : Symbol(a, Decl(subtypeReduceBivariance1.ts, 1, 6)) +} +declare const S: S; +>S : Symbol(S, Decl(subtypeReduceBivariance1.ts, 0, 0), Decl(subtypeReduceBivariance1.ts, 3, 13)) +>S : Symbol(S, Decl(subtypeReduceBivariance1.ts, 0, 0), Decl(subtypeReduceBivariance1.ts, 3, 13)) + +function g(a: number): void { } +>g : Symbol(g, Decl(subtypeReduceBivariance1.ts, 3, 19)) +>a : Symbol(a, Decl(subtypeReduceBivariance1.ts, 4, 11)) + +// Force type resolution +g; +>g : Symbol(g, Decl(subtypeReduceBivariance1.ts, 3, 19)) + +S.f; +>S.f : Symbol(S.f, Decl(subtypeReduceBivariance1.ts, 0, 13)) +>S : Symbol(S, Decl(subtypeReduceBivariance1.ts, 0, 0), Decl(subtypeReduceBivariance1.ts, 3, 13)) +>f : Symbol(S.f, Decl(subtypeReduceBivariance1.ts, 0, 13)) + +const arr: Array<(a: number | string) => void> = [g, S.f]; +>arr : Symbol(arr, Decl(subtypeReduceBivariance1.ts, 10, 5)) +>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>a : Symbol(a, Decl(subtypeReduceBivariance1.ts, 10, 18)) +>g : Symbol(g, Decl(subtypeReduceBivariance1.ts, 3, 19)) +>S.f : Symbol(S.f, Decl(subtypeReduceBivariance1.ts, 0, 13)) +>S : Symbol(S, Decl(subtypeReduceBivariance1.ts, 0, 0), Decl(subtypeReduceBivariance1.ts, 3, 13)) +>f : Symbol(S.f, Decl(subtypeReduceBivariance1.ts, 0, 13)) + diff --git a/tests/baselines/reference/subtypeReduceBivariance1.types b/tests/baselines/reference/subtypeReduceBivariance1.types new file mode 100644 index 0000000000000..27d44e1960f78 --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivariance1.types @@ -0,0 +1,31 @@ +=== tests/cases/compiler/subtypeReduceBivariance1.ts === +interface S { + f(a: number | string): void; +>f : (a: number | string) => void +>a : string | number +} +declare const S: S; +>S : S + +function g(a: number): void { } +>g : (a: number) => void +>a : number + +// Force type resolution +g; +>g : (a: number) => void + +S.f; +>S.f : (a: string | number) => void +>S : S +>f : (a: string | number) => void + +const arr: Array<(a: number | string) => void> = [g, S.f]; +>arr : ((a: number | string) => void)[] +>a : string | number +>[g, S.f] : ((a: number) => void)[] +>g : (a: number) => void +>S.f : (a: string | number) => void +>S : S +>f : (a: string | number) => void + diff --git a/tests/baselines/reference/subtypeReduceBivariance2.errors.txt b/tests/baselines/reference/subtypeReduceBivariance2.errors.txt new file mode 100644 index 0000000000000..d5e0d85ea85eb --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivariance2.errors.txt @@ -0,0 +1,23 @@ +tests/cases/compiler/subtypeReduceBivariance2.ts(11,51): error TS2322: Type '(a: number) => void' is not assignable to type '(a: string | number) => void'. + Types of parameters 'a' and 'a' are incompatible. + Type 'string | number' is not assignable to type 'number'. + Type 'string' is not assignable to type 'number'. + + +==== tests/cases/compiler/subtypeReduceBivariance2.ts (1 errors) ==== + interface S { + f(a: number | string): void; + } + declare const S: S; + function g(a: number): void { } + + // Force type resolution + S.f; + g; + + const arr: Array<(a: number | string) => void> = [g, S.f]; + ~ +!!! error TS2322: Type '(a: number) => void' is not assignable to type '(a: string | number) => void'. +!!! error TS2322: Types of parameters 'a' and 'a' are incompatible. +!!! error TS2322: Type 'string | number' is not assignable to type 'number'. +!!! error TS2322: Type 'string' is not assignable to type 'number'. \ No newline at end of file diff --git a/tests/baselines/reference/subtypeReduceBivariance2.js b/tests/baselines/reference/subtypeReduceBivariance2.js new file mode 100644 index 0000000000000..54e79418c92bf --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivariance2.js @@ -0,0 +1,19 @@ +//// [subtypeReduceBivariance2.ts] +interface S { + f(a: number | string): void; +} +declare const S: S; +function g(a: number): void { } + +// Force type resolution +S.f; +g; + +const arr: Array<(a: number | string) => void> = [g, S.f]; + +//// [subtypeReduceBivariance2.js] +function g(a) { } +// Force type resolution +S.f; +g; +var arr = [g, S.f]; diff --git a/tests/baselines/reference/subtypeReduceBivariance2.symbols b/tests/baselines/reference/subtypeReduceBivariance2.symbols new file mode 100644 index 0000000000000..5247d235dba3c --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivariance2.symbols @@ -0,0 +1,34 @@ +=== tests/cases/compiler/subtypeReduceBivariance2.ts === +interface S { +>S : Symbol(S, Decl(subtypeReduceBivariance2.ts, 0, 0), Decl(subtypeReduceBivariance2.ts, 3, 13)) + + f(a: number | string): void; +>f : Symbol(S.f, Decl(subtypeReduceBivariance2.ts, 0, 13)) +>a : Symbol(a, Decl(subtypeReduceBivariance2.ts, 1, 6)) +} +declare const S: S; +>S : Symbol(S, Decl(subtypeReduceBivariance2.ts, 0, 0), Decl(subtypeReduceBivariance2.ts, 3, 13)) +>S : Symbol(S, Decl(subtypeReduceBivariance2.ts, 0, 0), Decl(subtypeReduceBivariance2.ts, 3, 13)) + +function g(a: number): void { } +>g : Symbol(g, Decl(subtypeReduceBivariance2.ts, 3, 19)) +>a : Symbol(a, Decl(subtypeReduceBivariance2.ts, 4, 11)) + +// Force type resolution +S.f; +>S.f : Symbol(S.f, Decl(subtypeReduceBivariance2.ts, 0, 13)) +>S : Symbol(S, Decl(subtypeReduceBivariance2.ts, 0, 0), Decl(subtypeReduceBivariance2.ts, 3, 13)) +>f : Symbol(S.f, Decl(subtypeReduceBivariance2.ts, 0, 13)) + +g; +>g : Symbol(g, Decl(subtypeReduceBivariance2.ts, 3, 19)) + +const arr: Array<(a: number | string) => void> = [g, S.f]; +>arr : Symbol(arr, Decl(subtypeReduceBivariance2.ts, 10, 5)) +>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>a : Symbol(a, Decl(subtypeReduceBivariance2.ts, 10, 18)) +>g : Symbol(g, Decl(subtypeReduceBivariance2.ts, 3, 19)) +>S.f : Symbol(S.f, Decl(subtypeReduceBivariance2.ts, 0, 13)) +>S : Symbol(S, Decl(subtypeReduceBivariance2.ts, 0, 0), Decl(subtypeReduceBivariance2.ts, 3, 13)) +>f : Symbol(S.f, Decl(subtypeReduceBivariance2.ts, 0, 13)) + diff --git a/tests/baselines/reference/subtypeReduceBivariance2.types b/tests/baselines/reference/subtypeReduceBivariance2.types new file mode 100644 index 0000000000000..78e4ec5c1e4f1 --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivariance2.types @@ -0,0 +1,31 @@ +=== tests/cases/compiler/subtypeReduceBivariance2.ts === +interface S { + f(a: number | string): void; +>f : (a: number | string) => void +>a : string | number +} +declare const S: S; +>S : S + +function g(a: number): void { } +>g : (a: number) => void +>a : number + +// Force type resolution +S.f; +>S.f : (a: string | number) => void +>S : S +>f : (a: string | number) => void + +g; +>g : (a: number) => void + +const arr: Array<(a: number | string) => void> = [g, S.f]; +>arr : ((a: number | string) => void)[] +>a : string | number +>[g, S.f] : ((a: number) => void)[] +>g : (a: number) => void +>S.f : (a: string | number) => void +>S : S +>f : (a: string | number) => void + diff --git a/tests/baselines/reference/subtypeReduceBivarianceChecks.js b/tests/baselines/reference/subtypeReduceBivarianceChecks.js new file mode 100644 index 0000000000000..f1929cac5cfe1 --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivarianceChecks.js @@ -0,0 +1,5 @@ +//// [subtypeReduceBivarianceChecks.ts] +(''.match(/ /) || []).map(s => s.toLowerCase()); + +//// [subtypeReduceBivarianceChecks.js] +(''.match(/ /) || []).map(function (s) { return s.toLowerCase(); }); diff --git a/tests/baselines/reference/subtypeReduceBivarianceChecks.symbols b/tests/baselines/reference/subtypeReduceBivarianceChecks.symbols new file mode 100644 index 0000000000000..eb467c9f8da6f --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivarianceChecks.symbols @@ -0,0 +1,9 @@ +=== tests/cases/compiler/subtypeReduceBivarianceChecks.ts === +(''.match(/ /) || []).map(s => s.toLowerCase()); +>(''.match(/ /) || []).map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>''.match : Symbol(String.match, Decl(lib.es5.d.ts, --, --)) +>match : Symbol(String.match, Decl(lib.es5.d.ts, --, --)) +>map : Symbol(Array.map, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>s : Symbol(s, Decl(subtypeReduceBivarianceChecks.ts, 0, 26)) +>s : Symbol(s, Decl(subtypeReduceBivarianceChecks.ts, 0, 26)) + diff --git a/tests/baselines/reference/subtypeReduceBivarianceChecks.types b/tests/baselines/reference/subtypeReduceBivarianceChecks.types new file mode 100644 index 0000000000000..86a401d051aec --- /dev/null +++ b/tests/baselines/reference/subtypeReduceBivarianceChecks.types @@ -0,0 +1,20 @@ +=== tests/cases/compiler/subtypeReduceBivarianceChecks.ts === +(''.match(/ /) || []).map(s => s.toLowerCase()); +>(''.match(/ /) || []).map(s => s.toLowerCase()) : any[] +>(''.match(/ /) || []).map : ((callbackfn: (value: any, index: number, array: any[]) => U, thisArg?: any) => U[]) | ((callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]) +>(''.match(/ /) || []) : RegExpMatchArray | undefined[] +>''.match(/ /) || [] : RegExpMatchArray | undefined[] +>''.match(/ /) : RegExpMatchArray +>''.match : (regexp: string | RegExp) => RegExpMatchArray +>'' : "" +>match : (regexp: string | RegExp) => RegExpMatchArray +>/ / : RegExp +>[] : undefined[] +>map : ((callbackfn: (value: any, index: number, array: any[]) => U, thisArg?: any) => U[]) | ((callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]) +>s => s.toLowerCase() : (s: any) => any +>s : any +>s.toLowerCase() : any +>s.toLowerCase : any +>s : any +>toLowerCase : any + diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types index 7116d132b7d2b..52310f1cfa573 100644 --- a/tests/baselines/reference/subtypingWithCallSignatures3.types +++ b/tests/baselines/reference/subtypingWithCallSignatures3.types @@ -305,14 +305,14 @@ module Errors { >r4arg : (...x: T[]) => T var r4a = [r4arg2, r4arg]; ->r4a : ((...x: Base[]) => Base)[] ->[r4arg2, r4arg] : ((...x: Base[]) => Base)[] +>r4a : (((...x: T[]) => T) | ((...x: Base[]) => Base))[] +>[r4arg2, r4arg] : (((...x: T[]) => T) | ((...x: Base[]) => Base))[] >r4arg2 : (...x: Base[]) => Base >r4arg : (...x: T[]) => T var r4b = [r4arg, r4arg2]; ->r4b : ((...x: Base[]) => Base)[] ->[r4arg, r4arg2] : ((...x: Base[]) => Base)[] +>r4b : (((...x: T[]) => T) | ((...x: Base[]) => Base))[] +>[r4arg, r4arg2] : (((...x: T[]) => T) | ((...x: Base[]) => Base))[] >r4arg : (...x: T[]) => T >r4arg2 : (...x: Base[]) => Base @@ -342,14 +342,14 @@ module Errors { >r5arg : (x: T, y: T) => T var r5a = [r5arg2, r5arg]; ->r5a : ((x: { foo: string; }, y: { foo: string; bar: string; }) => Base)[] ->[r5arg2, r5arg] : ((x: { foo: string; }, y: { foo: string; bar: string; }) => Base)[] +>r5a : (((x: T, y: T) => T) | ((x: { foo: string; }, y: { foo: string; bar: string; }) => Base))[] +>[r5arg2, r5arg] : (((x: T, y: T) => T) | ((x: { foo: string; }, y: { foo: string; bar: string; }) => Base))[] >r5arg2 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base >r5arg : (x: T, y: T) => T var r5b = [r5arg, r5arg2]; ->r5b : ((x: { foo: string; }, y: { foo: string; bar: string; }) => Base)[] ->[r5arg, r5arg2] : ((x: { foo: string; }, y: { foo: string; bar: string; }) => Base)[] +>r5b : (((x: T, y: T) => T) | ((x: { foo: string; }, y: { foo: string; bar: string; }) => Base))[] +>[r5arg, r5arg2] : (((x: T, y: T) => T) | ((x: { foo: string; }, y: { foo: string; bar: string; }) => Base))[] >r5arg : (x: T, y: T) => T >r5arg2 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types index 5cf176caa0934..c78033a447c7a 100644 --- a/tests/baselines/reference/subtypingWithConstructSignatures3.types +++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types @@ -276,14 +276,14 @@ module Errors { >r4arg1 : new (...x: T[]) => T var r4a = [r4arg2, r4arg1]; ->r4a : (new (...x: Base[]) => Base)[] ->[r4arg2, r4arg1] : (new (...x: Base[]) => Base)[] +>r4a : ((new (...x: T[]) => T) | (new (...x: Base[]) => Base))[] +>[r4arg2, r4arg1] : ((new (...x: T[]) => T) | (new (...x: Base[]) => Base))[] >r4arg2 : new (...x: Base[]) => Base >r4arg1 : new (...x: T[]) => T var r4b = [r4arg1, r4arg2]; ->r4b : (new (...x: Base[]) => Base)[] ->[r4arg1, r4arg2] : (new (...x: Base[]) => Base)[] +>r4b : ((new (...x: T[]) => T) | (new (...x: Base[]) => Base))[] +>[r4arg1, r4arg2] : ((new (...x: T[]) => T) | (new (...x: Base[]) => Base))[] >r4arg1 : new (...x: T[]) => T >r4arg2 : new (...x: Base[]) => Base @@ -307,14 +307,14 @@ module Errors { >r5arg1 : new (x: T, y: T) => T var r5a = [r5arg2, r5arg1]; ->r5a : (new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base)[] ->[r5arg2, r5arg1] : (new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base)[] +>r5a : ((new (x: T, y: T) => T) | (new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base))[] +>[r5arg2, r5arg1] : ((new (x: T, y: T) => T) | (new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base))[] >r5arg2 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base >r5arg1 : new (x: T, y: T) => T var r5b = [r5arg1, r5arg2]; ->r5b : (new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base)[] ->[r5arg1, r5arg2] : (new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base)[] +>r5b : ((new (x: T, y: T) => T) | (new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base))[] +>[r5arg1, r5arg2] : ((new (x: T, y: T) => T) | (new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base))[] >r5arg1 : new (x: T, y: T) => T >r5arg2 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base diff --git a/tests/baselines/reference/tsxUnionElementType3.errors.txt b/tests/baselines/reference/tsxUnionElementType3.errors.txt index 73d8ccb0ce2b2..e61786f2c04b2 100644 --- a/tests/baselines/reference/tsxUnionElementType3.errors.txt +++ b/tests/baselines/reference/tsxUnionElementType3.errors.txt @@ -1,7 +1,9 @@ tests/cases/conformance/jsx/file.tsx(32,17): error TS2322: Type 'string' is not assignable to type 'never'. +tests/cases/conformance/jsx/file.tsx(35,10): error TS2741: Property 'x' is missing in type '{}' but required in type '{ x: number; }'. +tests/cases/conformance/jsx/file.tsx(36,10): error TS2741: Property 'x' is missing in type '{ "data-extra": string; }' but required in type '{ x: number; }'. -==== tests/cases/conformance/jsx/file.tsx (1 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (3 errors) ==== import React = require('react'); class RC1 extends React.Component<{x : number}, {}> { @@ -40,4 +42,10 @@ tests/cases/conformance/jsx/file.tsx(32,17): error TS2322: Type 'string' is not let a1 = ; let a2 = ; let b = - let c = \ No newline at end of file + ~~~~~~~~~~ +!!! error TS2741: Property 'x' is missing in type '{}' but required in type '{ x: number; }'. +!!! related TS2728 tests/cases/conformance/jsx/file.tsx:3:36: 'x' is declared here. + let c = + ~~~~~~~~~~ +!!! error TS2741: Property 'x' is missing in type '{ "data-extra": string; }' but required in type '{ x: number; }'. +!!! related TS2728 tests/cases/conformance/jsx/file.tsx:3:36: 'x' is declared here. \ No newline at end of file diff --git a/tests/baselines/reference/tsxUnionElementType3.types b/tests/baselines/reference/tsxUnionElementType3.types index 5a797ea483b59..65a7ca0d25eeb 100644 --- a/tests/baselines/reference/tsxUnionElementType3.types +++ b/tests/baselines/reference/tsxUnionElementType3.types @@ -69,8 +69,8 @@ var EmptyRCComp = RC3 || RC4; >RC4 : typeof RC4 var PartRCComp = RC1 || RC4; ->PartRCComp : typeof RC4 ->RC1 || RC4 : typeof RC4 +>PartRCComp : typeof RC1 | typeof RC4 +>RC1 || RC4 : typeof RC1 | typeof RC4 >RC1 : typeof RC1 >RC4 : typeof RC4 @@ -101,11 +101,11 @@ let a2 = ; let b = >b : JSX.Element > : JSX.Element ->PartRCComp : typeof RC4 +>PartRCComp : typeof RC1 | typeof RC4 let c = >c : JSX.Element > : JSX.Element ->PartRCComp : typeof RC4 +>PartRCComp : typeof RC1 | typeof RC4 >data-extra : string diff --git a/tests/baselines/reference/tsxUnionElementType4.errors.txt b/tests/baselines/reference/tsxUnionElementType4.errors.txt index 03cb6c62a526e..665af28a91068 100644 --- a/tests/baselines/reference/tsxUnionElementType4.errors.txt +++ b/tests/baselines/reference/tsxUnionElementType4.errors.txt @@ -1,11 +1,9 @@ tests/cases/conformance/jsx/file.tsx(32,17): error TS2322: Type 'boolean' is not assignable to type 'never'. -tests/cases/conformance/jsx/file.tsx(33,21): error TS2322: Type '{ x: number; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes & { children?: ReactNode; }'. - Property 'x' does not exist on type 'IntrinsicAttributes & IntrinsicClassAttributes & { children?: ReactNode; }'. tests/cases/conformance/jsx/file.tsx(34,22): error TS2322: Type '{ prop: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes & { children?: ReactNode; }'. Property 'prop' does not exist on type 'IntrinsicAttributes & IntrinsicClassAttributes & { children?: ReactNode; }'. -==== tests/cases/conformance/jsx/file.tsx (3 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (2 errors) ==== import React = require('react'); class RC1 extends React.Component<{x : number}, {}> { @@ -42,9 +40,6 @@ tests/cases/conformance/jsx/file.tsx(34,22): error TS2322: Type '{ prop: true; } !!! error TS2322: Type 'boolean' is not assignable to type 'never'. !!! related TS6500 tests/cases/conformance/jsx/file.tsx:3:36: The expected type comes from property 'x' which is declared here on type 'IntrinsicAttributes & IntrinsicClassAttributes & { x: number; } & { children?: ReactNode; } & { x: string; } & { children?: ReactNode; }' let b = - ~ -!!! error TS2322: Type '{ x: number; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes & { children?: ReactNode; }'. -!!! error TS2322: Property 'x' does not exist on type 'IntrinsicAttributes & IntrinsicClassAttributes & { children?: ReactNode; }'. let c = ; ~~~~ !!! error TS2322: Type '{ prop: true; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes & { children?: ReactNode; }'. diff --git a/tests/baselines/reference/tsxUnionElementType4.types b/tests/baselines/reference/tsxUnionElementType4.types index c0961eb6d1644..d346b144a49e3 100644 --- a/tests/baselines/reference/tsxUnionElementType4.types +++ b/tests/baselines/reference/tsxUnionElementType4.types @@ -75,8 +75,8 @@ var EmptyRCComp = RC3 || RC4; >RC4 : typeof RC4 var PartRCComp = RC1 || RC4; ->PartRCComp : typeof RC4 ->RC1 || RC4 : typeof RC4 +>PartRCComp : typeof RC1 | typeof RC4 +>RC1 || RC4 : typeof RC1 | typeof RC4 >RC1 : typeof RC1 >RC4 : typeof RC4 @@ -90,7 +90,7 @@ let a = ; let b = >b : JSX.Element > : JSX.Element ->PartRCComp : typeof RC4 +>PartRCComp : typeof RC1 | typeof RC4 >x : number >10 : 10 diff --git a/tests/cases/compiler/subtypeReduceBivariance1.ts b/tests/cases/compiler/subtypeReduceBivariance1.ts new file mode 100644 index 0000000000000..20d3901e56b57 --- /dev/null +++ b/tests/cases/compiler/subtypeReduceBivariance1.ts @@ -0,0 +1,13 @@ +//@strictFunctionTypes: true + +interface S { + f(a: number | string): void; +} +declare const S: S; +function g(a: number): void { } + +// Force type resolution +g; +S.f; + +const arr: Array<(a: number | string) => void> = [g, S.f]; \ No newline at end of file diff --git a/tests/cases/compiler/subtypeReduceBivariance2.ts b/tests/cases/compiler/subtypeReduceBivariance2.ts new file mode 100644 index 0000000000000..dfa4fa09c2161 --- /dev/null +++ b/tests/cases/compiler/subtypeReduceBivariance2.ts @@ -0,0 +1,13 @@ +//@strictFunctionTypes: true + +interface S { + f(a: number | string): void; +} +declare const S: S; +function g(a: number): void { } + +// Force type resolution +S.f; +g; + +const arr: Array<(a: number | string) => void> = [g, S.f]; \ No newline at end of file diff --git a/tests/cases/compiler/subtypeReduceBivarianceChecks.ts b/tests/cases/compiler/subtypeReduceBivarianceChecks.ts new file mode 100644 index 0000000000000..4f91e0f864b85 --- /dev/null +++ b/tests/cases/compiler/subtypeReduceBivarianceChecks.ts @@ -0,0 +1 @@ +(''.match(/ /) || []).map(s => s.toLowerCase()); \ No newline at end of file