Skip to content

Commit 5e5b770

Browse files
author
Andy
authored
Hack to allow concat to work even when an Array isn't assignable to ReadonlyArray (#20455)
1 parent 19ea189 commit 5e5b770

21 files changed

+146
-49
lines changed

Diff for: ‎src/lib/es5.d.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -992,12 +992,13 @@ interface ReadonlyArray<T> {
992992
* Combines two or more arrays.
993993
* @param items Additional items to add to the end of array1.
994994
*/
995-
concat(...items: ReadonlyArray<T>[]): T[];
995+
// TODO: https://github.com/Microsoft/TypeScript/issues/20454
996+
concat(...items: (T[] | ReadonlyArray<T>)[]): T[];
996997
/**
997998
* Combines two or more arrays.
998999
* @param items Additional items to add to the end of array1.
9991000
*/
1000-
concat(...items: (T | ReadonlyArray<T>)[]): T[];
1001+
concat(...items: (T | T[] | ReadonlyArray<T>)[]): T[];
10011002
/**
10021003
* Adds all the elements of an array separated by the specified separator string.
10031004
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
@@ -1113,12 +1114,12 @@ interface Array<T> {
11131114
* Combines two or more arrays.
11141115
* @param items Additional items to add to the end of array1.
11151116
*/
1116-
concat(...items: ReadonlyArray<T>[]): T[];
1117+
concat(...items: (T[] | ReadonlyArray<T>)[]): T[];
11171118
/**
11181119
* Combines two or more arrays.
11191120
* @param items Additional items to add to the end of array1.
11201121
*/
1121-
concat(...items: (T | ReadonlyArray<T>)[]): T[];
1122+
concat(...items: (T | T[] | ReadonlyArray<T>)[]): T[];
11221123
/**
11231124
* Adds all the elements of an array separated by the specified separator string.
11241125
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.

Diff for: ‎tests/baselines/reference/arrayConcat2.types

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ var a: string[] = [];
55

66
a.concat("hello", 'world');
77
>a.concat("hello", 'world') : string[]
8-
>a.concat : { (...items: ReadonlyArray<string>[]): string[]; (...items: (string | ReadonlyArray<string>)[]): string[]; }
8+
>a.concat : { (...items: (string[] | ReadonlyArray<string>)[]): string[]; (...items: (string | string[] | ReadonlyArray<string>)[]): string[]; }
99
>a : string[]
10-
>concat : { (...items: ReadonlyArray<string>[]): string[]; (...items: (string | ReadonlyArray<string>)[]): string[]; }
10+
>concat : { (...items: (string[] | ReadonlyArray<string>)[]): string[]; (...items: (string | string[] | ReadonlyArray<string>)[]): string[]; }
1111
>"hello" : "hello"
1212
>'world' : "world"
1313

1414
a.concat('Hello');
1515
>a.concat('Hello') : string[]
16-
>a.concat : { (...items: ReadonlyArray<string>[]): string[]; (...items: (string | ReadonlyArray<string>)[]): string[]; }
16+
>a.concat : { (...items: (string[] | ReadonlyArray<string>)[]): string[]; (...items: (string | string[] | ReadonlyArray<string>)[]): string[]; }
1717
>a : string[]
18-
>concat : { (...items: ReadonlyArray<string>[]): string[]; (...items: (string | ReadonlyArray<string>)[]): string[]; }
18+
>concat : { (...items: (string[] | ReadonlyArray<string>)[]): string[]; (...items: (string | string[] | ReadonlyArray<string>)[]): string[]; }
1919
>'Hello' : "Hello"
2020

2121
var b = new Array<string>();
@@ -25,8 +25,8 @@ var b = new Array<string>();
2525

2626
b.concat('hello');
2727
>b.concat('hello') : string[]
28-
>b.concat : { (...items: ReadonlyArray<string>[]): string[]; (...items: (string | ReadonlyArray<string>)[]): string[]; }
28+
>b.concat : { (...items: (string[] | ReadonlyArray<string>)[]): string[]; (...items: (string | string[] | ReadonlyArray<string>)[]): string[]; }
2929
>b : string[]
30-
>concat : { (...items: ReadonlyArray<string>[]): string[]; (...items: (string | ReadonlyArray<string>)[]): string[]; }
30+
>concat : { (...items: (string[] | ReadonlyArray<string>)[]): string[]; (...items: (string | string[] | ReadonlyArray<string>)[]): string[]; }
3131
>'hello' : "hello"
3232

Diff for: ‎tests/baselines/reference/arrayConcat3.js

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//// [arrayConcat3.ts]
2+
// TODO: remove lib hack when https://github.com/Microsoft/TypeScript/issues/20454 is fixed
3+
type Fn<T extends object> = <U extends T>(subj: U) => U
4+
function doStuff<T extends object, T1 extends T>(a: Array<Fn<T>>, b: Array<Fn<T1>>) {
5+
b.concat(a);
6+
}
7+
8+
9+
//// [arrayConcat3.js]
10+
function doStuff(a, b) {
11+
b.concat(a);
12+
}

Diff for: ‎tests/baselines/reference/arrayConcat3.symbols

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
=== tests/cases/compiler/arrayConcat3.ts ===
2+
// TODO: remove lib hack when https://github.com/Microsoft/TypeScript/issues/20454 is fixed
3+
type Fn<T extends object> = <U extends T>(subj: U) => U
4+
>Fn : Symbol(Fn, Decl(arrayConcat3.ts, 0, 0))
5+
>T : Symbol(T, Decl(arrayConcat3.ts, 1, 8))
6+
>U : Symbol(U, Decl(arrayConcat3.ts, 1, 29))
7+
>T : Symbol(T, Decl(arrayConcat3.ts, 1, 8))
8+
>subj : Symbol(subj, Decl(arrayConcat3.ts, 1, 42))
9+
>U : Symbol(U, Decl(arrayConcat3.ts, 1, 29))
10+
>U : Symbol(U, Decl(arrayConcat3.ts, 1, 29))
11+
12+
function doStuff<T extends object, T1 extends T>(a: Array<Fn<T>>, b: Array<Fn<T1>>) {
13+
>doStuff : Symbol(doStuff, Decl(arrayConcat3.ts, 1, 55))
14+
>T : Symbol(T, Decl(arrayConcat3.ts, 2, 17))
15+
>T1 : Symbol(T1, Decl(arrayConcat3.ts, 2, 34))
16+
>T : Symbol(T, Decl(arrayConcat3.ts, 2, 17))
17+
>a : Symbol(a, Decl(arrayConcat3.ts, 2, 49))
18+
>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
19+
>Fn : Symbol(Fn, Decl(arrayConcat3.ts, 0, 0))
20+
>T : Symbol(T, Decl(arrayConcat3.ts, 2, 17))
21+
>b : Symbol(b, Decl(arrayConcat3.ts, 2, 65))
22+
>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
23+
>Fn : Symbol(Fn, Decl(arrayConcat3.ts, 0, 0))
24+
>T1 : Symbol(T1, Decl(arrayConcat3.ts, 2, 34))
25+
26+
b.concat(a);
27+
>b.concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
28+
>b : Symbol(b, Decl(arrayConcat3.ts, 2, 65))
29+
>concat : Symbol(Array.concat, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
30+
>a : Symbol(a, Decl(arrayConcat3.ts, 2, 49))
31+
}
32+

Diff for: ‎tests/baselines/reference/arrayConcat3.types

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
=== tests/cases/compiler/arrayConcat3.ts ===
2+
// TODO: remove lib hack when https://github.com/Microsoft/TypeScript/issues/20454 is fixed
3+
type Fn<T extends object> = <U extends T>(subj: U) => U
4+
>Fn : Fn<T>
5+
>T : T
6+
>U : U
7+
>T : T
8+
>subj : U
9+
>U : U
10+
>U : U
11+
12+
function doStuff<T extends object, T1 extends T>(a: Array<Fn<T>>, b: Array<Fn<T1>>) {
13+
>doStuff : <T extends object, T1 extends T>(a: Fn<T>[], b: Fn<T1>[]) => void
14+
>T : T
15+
>T1 : T1
16+
>T : T
17+
>a : Fn<T>[]
18+
>Array : T[]
19+
>Fn : Fn<T>
20+
>T : T
21+
>b : Fn<T1>[]
22+
>Array : T[]
23+
>Fn : Fn<T>
24+
>T1 : T1
25+
26+
b.concat(a);
27+
>b.concat(a) : Fn<T1>[]
28+
>b.concat : { (...items: (Fn<T1>[] | ReadonlyArray<Fn<T1>>)[]): Fn<T1>[]; (...items: (Fn<T1> | Fn<T1>[] | ReadonlyArray<Fn<T1>>)[]): Fn<T1>[]; }
29+
>b : Fn<T1>[]
30+
>concat : { (...items: (Fn<T1>[] | ReadonlyArray<Fn<T1>>)[]): Fn<T1>[]; (...items: (Fn<T1> | Fn<T1>[] | ReadonlyArray<Fn<T1>>)[]): Fn<T1>[]; }
31+
>a : Fn<T>[]
32+
}
33+

Diff for: ‎tests/baselines/reference/arrayConcatMap.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ var x = [].concat([{ a: 1 }], [{ a: 2 }])
44
>[].concat([{ a: 1 }], [{ a: 2 }]) .map(b => b.a) : any[]
55
>[].concat([{ a: 1 }], [{ a: 2 }]) .map : <U>(callbackfn: (value: any, index: number, array: any[]) => U, thisArg?: any) => U[]
66
>[].concat([{ a: 1 }], [{ a: 2 }]) : any[]
7-
>[].concat : { (...items: ReadonlyArray<any>[]): any[]; (...items: any[]): any[]; }
7+
>[].concat : { (...items: (any[] | ReadonlyArray<any>)[]): any[]; (...items: any[]): any[]; }
88
>[] : undefined[]
9-
>concat : { (...items: ReadonlyArray<any>[]): any[]; (...items: any[]): any[]; }
9+
>concat : { (...items: (any[] | ReadonlyArray<any>)[]): any[]; (...items: any[]): any[]; }
1010
>[{ a: 1 }] : { a: number; }[]
1111
>{ a: 1 } : { a: number; }
1212
>a : number

Diff for: ‎tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(13,1): error TS2322: Type 'A[]' is not assignable to type 'ReadonlyArray<B>'.
22
Types of property 'concat' are incompatible.
3-
Type '{ (...items: ReadonlyArray<A>[]): A[]; (...items: (A | ReadonlyArray<A>)[]): A[]; }' is not assignable to type '{ (...items: ReadonlyArray<B>[]): B[]; (...items: (B | ReadonlyArray<B>)[]): B[]; }'.
3+
Type '{ (...items: (A[] | ReadonlyArray<A>)[]): A[]; (...items: (A | A[] | ReadonlyArray<A>)[]): A[]; }' is not assignable to type '{ (...items: (B[] | ReadonlyArray<B>)[]): B[]; (...items: (B | B[] | ReadonlyArray<B>)[]): B[]; }'.
44
Type 'A[]' is not assignable to type 'B[]'.
55
Type 'A' is not assignable to type 'B'.
66
Property 'b' is missing in type 'A'.
77
tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error TS2322: Type 'C<A>' is not assignable to type 'ReadonlyArray<B>'.
88
Types of property 'concat' are incompatible.
9-
Type '{ (...items: ReadonlyArray<A>[]): A[]; (...items: (A | ReadonlyArray<A>)[]): A[]; }' is not assignable to type '{ (...items: ReadonlyArray<B>[]): B[]; (...items: (B | ReadonlyArray<B>)[]): B[]; }'.
9+
Type '{ (...items: (A[] | ReadonlyArray<A>)[]): A[]; (...items: (A | A[] | ReadonlyArray<A>)[]): A[]; }' is not assignable to type '{ (...items: (B[] | ReadonlyArray<B>)[]): B[]; (...items: (B | B[] | ReadonlyArray<B>)[]): B[]; }'.
1010
Type 'A[]' is not assignable to type 'B[]'.
1111

1212

@@ -27,7 +27,7 @@ tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error T
2727
~~~
2828
!!! error TS2322: Type 'A[]' is not assignable to type 'ReadonlyArray<B>'.
2929
!!! error TS2322: Types of property 'concat' are incompatible.
30-
!!! error TS2322: Type '{ (...items: ReadonlyArray<A>[]): A[]; (...items: (A | ReadonlyArray<A>)[]): A[]; }' is not assignable to type '{ (...items: ReadonlyArray<B>[]): B[]; (...items: (B | ReadonlyArray<B>)[]): B[]; }'.
30+
!!! error TS2322: Type '{ (...items: (A[] | ReadonlyArray<A>)[]): A[]; (...items: (A | A[] | ReadonlyArray<A>)[]): A[]; }' is not assignable to type '{ (...items: (B[] | ReadonlyArray<B>)[]): B[]; (...items: (B | B[] | ReadonlyArray<B>)[]): B[]; }'.
3131
!!! error TS2322: Type 'A[]' is not assignable to type 'B[]'.
3232
!!! error TS2322: Type 'A' is not assignable to type 'B'.
3333
!!! error TS2322: Property 'b' is missing in type 'A'.
@@ -39,6 +39,6 @@ tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error T
3939
~~~
4040
!!! error TS2322: Type 'C<A>' is not assignable to type 'ReadonlyArray<B>'.
4141
!!! error TS2322: Types of property 'concat' are incompatible.
42-
!!! error TS2322: Type '{ (...items: ReadonlyArray<A>[]): A[]; (...items: (A | ReadonlyArray<A>)[]): A[]; }' is not assignable to type '{ (...items: ReadonlyArray<B>[]): B[]; (...items: (B | ReadonlyArray<B>)[]): B[]; }'.
42+
!!! error TS2322: Type '{ (...items: (A[] | ReadonlyArray<A>)[]): A[]; (...items: (A | A[] | ReadonlyArray<A>)[]): A[]; }' is not assignable to type '{ (...items: (B[] | ReadonlyArray<B>)[]): B[]; (...items: (B | B[] | ReadonlyArray<B>)[]): B[]; }'.
4343
!!! error TS2322: Type 'A[]' is not assignable to type 'B[]'.
4444

Diff for: ‎tests/baselines/reference/concatError.types

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ fa = fa.concat([0]);
1515
>fa = fa.concat([0]) : number[]
1616
>fa : number[]
1717
>fa.concat([0]) : number[]
18-
>fa.concat : { (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }
18+
>fa.concat : { (...items: (number[] | ReadonlyArray<number>)[]): number[]; (...items: (number | number[] | ReadonlyArray<number>)[]): number[]; }
1919
>fa : number[]
20-
>concat : { (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }
20+
>concat : { (...items: (number[] | ReadonlyArray<number>)[]): number[]; (...items: (number | number[] | ReadonlyArray<number>)[]): number[]; }
2121
>[0] : number[]
2222
>0 : 0
2323

2424
fa = fa.concat(0);
2525
>fa = fa.concat(0) : number[]
2626
>fa : number[]
2727
>fa.concat(0) : number[]
28-
>fa.concat : { (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }
28+
>fa.concat : { (...items: (number[] | ReadonlyArray<number>)[]): number[]; (...items: (number | number[] | ReadonlyArray<number>)[]): number[]; }
2929
>fa : number[]
30-
>concat : { (...items: ReadonlyArray<number>[]): number[]; (...items: (number | ReadonlyArray<number>)[]): number[]; }
30+
>concat : { (...items: (number[] | ReadonlyArray<number>)[]): number[]; (...items: (number | number[] | ReadonlyArray<number>)[]): number[]; }
3131
>0 : 0
3232

3333

Diff for: ‎tests/baselines/reference/concatTuples.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ ijs = ijs.concat([[3, 4], [5, 6]]);
1010
>ijs = ijs.concat([[3, 4], [5, 6]]) : [number, number][]
1111
>ijs : [number, number][]
1212
>ijs.concat([[3, 4], [5, 6]]) : [number, number][]
13-
>ijs.concat : { (...items: ReadonlyArray<[number, number]>[]): [number, number][]; (...items: ([number, number] | ReadonlyArray<[number, number]>)[]): [number, number][]; }
13+
>ijs.concat : { (...items: ([number, number][] | ReadonlyArray<[number, number]>)[]): [number, number][]; (...items: ([number, number] | [number, number][] | ReadonlyArray<[number, number]>)[]): [number, number][]; }
1414
>ijs : [number, number][]
15-
>concat : { (...items: ReadonlyArray<[number, number]>[]): [number, number][]; (...items: ([number, number] | ReadonlyArray<[number, number]>)[]): [number, number][]; }
15+
>concat : { (...items: ([number, number][] | ReadonlyArray<[number, number]>)[]): [number, number][]; (...items: ([number, number] | [number, number][] | ReadonlyArray<[number, number]>)[]): [number, number][]; }
1616
>[[3, 4], [5, 6]] : [number, number][]
1717
>[3, 4] : [number, number]
1818
>3 : 3

Diff for: ‎tests/baselines/reference/emitSkipsThisWithRestParameter.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ function rebase(fn: (base: any, ...args: any[]) => any): (...args: any[]) => any
1818
>apply : (this: Function, thisArg: any, argArray?: any) => any
1919
>this : any
2020
>[ this ].concat(args) : any[]
21-
>[ this ].concat : { (...items: ReadonlyArray<any>[]): any[]; (...items: any[]): any[]; }
21+
>[ this ].concat : { (...items: (any[] | ReadonlyArray<any>)[]): any[]; (...items: any[]): any[]; }
2222
>[ this ] : any[]
2323
>this : any
24-
>concat : { (...items: ReadonlyArray<any>[]): any[]; (...items: any[]): any[]; }
24+
>concat : { (...items: (any[] | ReadonlyArray<any>)[]): any[]; (...items: any[]): any[]; }
2525
>args : any[]
2626

2727
};

Diff for: ‎tests/baselines/reference/intersectionTypeInference3.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ declare const b: Set<A>;
3232
const c1 = Array.from(a).concat(Array.from(b));
3333
>c1 : Nominal<"A", string>[]
3434
>Array.from(a).concat(Array.from(b)) : Nominal<"A", string>[]
35-
>Array.from(a).concat : { (...items: ReadonlyArray<Nominal<"A", string>>[]): Nominal<"A", string>[]; (...items: (Nominal<"A", string> | ReadonlyArray<Nominal<"A", string>>)[]): Nominal<"A", string>[]; }
35+
>Array.from(a).concat : { (...items: (Nominal<"A", string>[] | ReadonlyArray<Nominal<"A", string>>)[]): Nominal<"A", string>[]; (...items: (Nominal<"A", string> | Nominal<"A", string>[] | ReadonlyArray<Nominal<"A", string>>)[]): Nominal<"A", string>[]; }
3636
>Array.from(a) : Nominal<"A", string>[]
3737
>Array.from : { <T>(iterable: Iterable<T>): T[]; <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
3838
>Array : ArrayConstructor
3939
>from : { <T>(iterable: Iterable<T>): T[]; <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
4040
>a : Set<Nominal<"A", string>>
41-
>concat : { (...items: ReadonlyArray<Nominal<"A", string>>[]): Nominal<"A", string>[]; (...items: (Nominal<"A", string> | ReadonlyArray<Nominal<"A", string>>)[]): Nominal<"A", string>[]; }
41+
>concat : { (...items: (Nominal<"A", string>[] | ReadonlyArray<Nominal<"A", string>>)[]): Nominal<"A", string>[]; (...items: (Nominal<"A", string> | Nominal<"A", string>[] | ReadonlyArray<Nominal<"A", string>>)[]): Nominal<"A", string>[]; }
4242
>Array.from(b) : Nominal<"A", string>[]
4343
>Array.from : { <T>(iterable: Iterable<T>): T[]; <T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; <T>(arrayLike: ArrayLike<T>): T[]; <T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): U[]; }
4444
>Array : ArrayConstructor

0 commit comments

Comments
 (0)