Skip to content

Commit ffd2d13

Browse files
committed
Added overload to ReadonlyArray.prototype.every to make it a type guard if the callback is one.
Fixes microsoft#14963
1 parent 49a73a9 commit ffd2d13

File tree

3 files changed

+54
-0
lines changed

3 files changed

+54
-0
lines changed

src/lib/es5.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,7 @@ interface ReadonlyArray<T> {
10141014
* @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array.
10151015
* @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
10161016
*/
1017+
every<U extends T>(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => value is U, thisArg?: any): this is ReadonlyArray<U>;
10171018
every(callbackfn: (value: T, index: number, array: ReadonlyArray<T>) => boolean, thisArg?: any): boolean;
10181019
/**
10191020
* Determines whether the specified callback function returns true for any element of an array.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
//// [arrayEvery.ts]
2+
declare const baseReadonlyArray: ReadonlyArray<number | string>;
3+
const isNumber = (x: any): x is number => "number" === typeof x;
4+
5+
if (baseReadonlyArray.every<number>((x): x is number => "number" === typeof x)) {
6+
const numberReadonlyArray: ReadonlyArray<number> = baseReadonlyArray; // should be ReadonlyArray<number>
7+
}
8+
if (baseReadonlyArray.every<number>(isNumber)) {
9+
const numberReadonlyArray: ReadonlyArray<number> = baseReadonlyArray; // should be ReadonlyArray<number>
10+
}
11+
12+
if (baseReadonlyArray.every((x: any): x is number => "number" === typeof x)) {
13+
const numberReadonlyArray: ReadonlyArray<number> = baseReadonlyArray; // should be ReadonlyArray<number>
14+
}
15+
if (baseReadonlyArray.every(isNumber)) {
16+
const numberReadonlyArray: ReadonlyArray<number> = baseReadonlyArray; // should be ReadonlyArray<number>
17+
}
18+
19+
baseReadonlyArray.every(x => "number" === typeof x && x > 2);
20+
21+
//// [arrayEvery.js]
22+
var isNumber = function (x) { return "number" === typeof x; };
23+
if (baseReadonlyArray.every(function (x) { return "number" === typeof x; })) {
24+
var numberReadonlyArray = baseReadonlyArray; // should be ReadonlyArray<number>
25+
}
26+
if (baseReadonlyArray.every(isNumber)) {
27+
var numberReadonlyArray = baseReadonlyArray; // should be ReadonlyArray<number>
28+
}
29+
if (baseReadonlyArray.every(function (x) { return "number" === typeof x; })) {
30+
var numberReadonlyArray = baseReadonlyArray; // should be ReadonlyArray<number>
31+
}
32+
if (baseReadonlyArray.every(isNumber)) {
33+
var numberReadonlyArray = baseReadonlyArray; // should be ReadonlyArray<number>
34+
}
35+
baseReadonlyArray.every(function (x) { return "number" === typeof x && x > 2; });

tests/cases/compiler/arrayEvery.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
declare const baseReadonlyArray: ReadonlyArray<number | string>;
2+
const isNumber = (x: any): x is number => "number" === typeof x;
3+
4+
if (baseReadonlyArray.every<number>((x): x is number => "number" === typeof x)) {
5+
const numberReadonlyArray: ReadonlyArray<number> = baseReadonlyArray; // should be ReadonlyArray<number>
6+
}
7+
if (baseReadonlyArray.every<number>(isNumber)) {
8+
const numberReadonlyArray: ReadonlyArray<number> = baseReadonlyArray; // should be ReadonlyArray<number>
9+
}
10+
11+
if (baseReadonlyArray.every((x: any): x is number => "number" === typeof x)) {
12+
const numberReadonlyArray: ReadonlyArray<number> = baseReadonlyArray; // should be ReadonlyArray<number>
13+
}
14+
if (baseReadonlyArray.every(isNumber)) {
15+
const numberReadonlyArray: ReadonlyArray<number> = baseReadonlyArray; // should be ReadonlyArray<number>
16+
}
17+
18+
baseReadonlyArray.every(x => "number" === typeof x && x > 2);

0 commit comments

Comments
 (0)