Skip to content

Commit ecd772d

Browse files
authored
Merge pull request #15186 from Microsoft/fix15184
Fix #15184: Use `void` and not `undefined` for `this` parameter types in the library
2 parents aa6c0c6 + ccda015 commit ecd772d

File tree

47 files changed

+874
-465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+874
-465
lines changed

src/lib/es2015.core.d.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ interface Array<T> {
1010
* @param thisArg If provided, it will be used as the this value for each invocation of
1111
* predicate. If it is not provided, undefined is used instead.
1212
*/
13-
find(predicate: (this: undefined, value: T, index: number, obj: Array<T>) => boolean): T | undefined;
14-
find(predicate: (this: undefined, value: T, index: number, obj: Array<T>) => boolean, thisArg: undefined): T | undefined;
13+
find(predicate: (this: void, value: T, index: number, obj: Array<T>) => boolean): T | undefined;
14+
find(predicate: (this: void, value: T, index: number, obj: Array<T>) => boolean, thisArg: undefined): T | undefined;
1515
find<Z>(predicate: (this: Z, value: T, index: number, obj: Array<T>) => boolean, thisArg: Z): T | undefined;
1616

1717
/**
@@ -23,8 +23,8 @@ interface Array<T> {
2323
* @param thisArg If provided, it will be used as the this value for each invocation of
2424
* predicate. If it is not provided, undefined is used instead.
2525
*/
26-
findIndex(predicate: (this: undefined, value: T, index: number, obj: Array<T>) => boolean): number;
27-
findIndex(predicate: (this: undefined, value: T, index: number, obj: Array<T>) => boolean, thisArg: undefined): number;
26+
findIndex(predicate: (this: void, value: T, index: number, obj: Array<T>) => boolean): number;
27+
findIndex(predicate: (this: void, value: T, index: number, obj: Array<T>) => boolean, thisArg: undefined): number;
2828
findIndex<Z>(predicate: (this: Z, value: T, index: number, obj: Array<T>) => boolean, thisArg: Z): number;
2929

3030
/**
@@ -56,8 +56,8 @@ interface ArrayConstructor {
5656
* @param mapfn A mapping function to call on every element of the array.
5757
* @param thisArg Value of 'this' used to invoke the mapfn.
5858
*/
59-
from<T, U>(arrayLike: ArrayLike<T>, mapfn: (this: undefined, v: T, k: number) => U): Array<U>;
60-
from<T, U>(arrayLike: ArrayLike<T>, mapfn: (this: undefined, v: T, k: number) => U, thisArg: undefined): Array<U>;
59+
from<T, U>(arrayLike: ArrayLike<T>, mapfn: (this: void, v: T, k: number) => U): Array<U>;
60+
from<T, U>(arrayLike: ArrayLike<T>, mapfn: (this: void, v: T, k: number) => U, thisArg: undefined): Array<U>;
6161
from<Z, T, U>(arrayLike: ArrayLike<T>, mapfn: (this: Z, v: T, k: number) => U, thisArg: Z): Array<U>;
6262

6363

@@ -363,8 +363,8 @@ interface ReadonlyArray<T> {
363363
* @param thisArg If provided, it will be used as the this value for each invocation of
364364
* predicate. If it is not provided, undefined is used instead.
365365
*/
366-
find(predicate: (this: undefined, value: T, index: number, obj: ReadonlyArray<T>) => boolean): T | undefined;
367-
find(predicate: (this: undefined, value: T, index: number, obj: ReadonlyArray<T>) => boolean, thisArg: undefined): T | undefined;
366+
find(predicate: (this: void, value: T, index: number, obj: ReadonlyArray<T>) => boolean): T | undefined;
367+
find(predicate: (this: void, value: T, index: number, obj: ReadonlyArray<T>) => boolean, thisArg: undefined): T | undefined;
368368
find<Z>(predicate: (this: Z, value: T, index: number, obj: ReadonlyArray<T>) => boolean, thisArg: Z): T | undefined;
369369

370370
/**
@@ -376,8 +376,8 @@ interface ReadonlyArray<T> {
376376
* @param thisArg If provided, it will be used as the this value for each invocation of
377377
* predicate. If it is not provided, undefined is used instead.
378378
*/
379-
findIndex(predicate: (this: undefined, value: T, index: number, obj: Array<T>) => boolean): number;
380-
findIndex(predicate: (this: undefined, value: T, index: number, obj: Array<T>) => boolean, thisArg: undefined): number;
379+
findIndex(predicate: (this: void, value: T, index: number, obj: Array<T>) => boolean): number;
380+
findIndex(predicate: (this: void, value: T, index: number, obj: Array<T>) => boolean, thisArg: undefined): number;
381381
findIndex<Z>(predicate: (this: Z, value: T, index: number, obj: Array<T>) => boolean, thisArg: Z): number;
382382
}
383383

src/lib/es2015.iterable.d.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ interface ArrayConstructor {
5454
* @param mapfn A mapping function to call on every element of the array.
5555
* @param thisArg Value of 'this' used to invoke the mapfn.
5656
*/
57-
from<T, U>(iterable: Iterable<T>, mapfn: (this: undefined, v: T, k: number) => U): Array<U>;
58-
from<T, U>(iterable: Iterable<T>, mapfn: (this: undefined, v: T, k: number) => U, thisArg: undefined): Array<U>;
57+
from<T, U>(iterable: Iterable<T>, mapfn: (this: void, v: T, k: number) => U): Array<U>;
58+
from<T, U>(iterable: Iterable<T>, mapfn: (this: void, v: T, k: number) => U, thisArg: undefined): Array<U>;
5959
from<Z, T, U>(iterable: Iterable<T>, mapfn: (this: Z, v: T, k: number) => U, thisArg: Z): Array<U>;
6060

6161
/**
@@ -182,8 +182,8 @@ interface Int8ArrayConstructor {
182182
* @param mapfn A mapping function to call on every element of the array.
183183
* @param thisArg Value of 'this' used to invoke the mapfn.
184184
*/
185-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number): Int8Array;
186-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number, thisArg: undefined): Int8Array;
185+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number): Int8Array;
186+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number, thisArg: undefined): Int8Array;
187187
from<Z>(arrayLike: Iterable<number>, mapfn: (this: Z, v: number, k: number) => number, thisArg: Z): Int8Array;
188188

189189
from(arrayLike: Iterable<number>): Int8Array;
@@ -218,8 +218,8 @@ interface Uint8ArrayConstructor {
218218
* @param mapfn A mapping function to call on every element of the array.
219219
* @param thisArg Value of 'this' used to invoke the mapfn.
220220
*/
221-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number): Uint8Array;
222-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number, thisArg: undefined): Uint8Array;
221+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number): Uint8Array;
222+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number, thisArg: undefined): Uint8Array;
223223
from<Z>(arrayLike: Iterable<number>, mapfn: (this: Z, v: number, k: number) => number, thisArg: Z): Uint8Array;
224224

225225
from(arrayLike: Iterable<number>): Uint8Array;
@@ -257,8 +257,8 @@ interface Uint8ClampedArrayConstructor {
257257
* @param mapfn A mapping function to call on every element of the array.
258258
* @param thisArg Value of 'this' used to invoke the mapfn.
259259
*/
260-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number): Uint8ClampedArray;
261-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number, thisArg: undefined): Uint8ClampedArray;
260+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number): Uint8ClampedArray;
261+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number, thisArg: undefined): Uint8ClampedArray;
262262
from<Z>(arrayLike: Iterable<number>, mapfn: (this: Z, v: number, k: number) => number, thisArg: Z): Uint8ClampedArray;
263263

264264
from(arrayLike: Iterable<number>): Uint8ClampedArray;
@@ -295,8 +295,8 @@ interface Int16ArrayConstructor {
295295
* @param mapfn A mapping function to call on every element of the array.
296296
* @param thisArg Value of 'this' used to invoke the mapfn.
297297
*/
298-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number): Int16Array;
299-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number, thisArg: undefined): Int16Array;
298+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number): Int16Array;
299+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number, thisArg: undefined): Int16Array;
300300
from<Z>(arrayLike: Iterable<number>, mapfn: (this: Z, v: number, k: number) => number, thisArg: Z): Int16Array;
301301

302302
from(arrayLike: Iterable<number>): Int16Array;
@@ -331,8 +331,8 @@ interface Uint16ArrayConstructor {
331331
* @param mapfn A mapping function to call on every element of the array.
332332
* @param thisArg Value of 'this' used to invoke the mapfn.
333333
*/
334-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number): Uint16Array;
335-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number, thisArg: undefined): Uint16Array;
334+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number): Uint16Array;
335+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number, thisArg: undefined): Uint16Array;
336336
from<Z>(arrayLike: Iterable<number>, mapfn: (this: Z, v: number, k: number) => number, thisArg: Z): Uint16Array;
337337

338338
from(arrayLike: Iterable<number>): Uint16Array;
@@ -367,8 +367,8 @@ interface Int32ArrayConstructor {
367367
* @param mapfn A mapping function to call on every element of the array.
368368
* @param thisArg Value of 'this' used to invoke the mapfn.
369369
*/
370-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number): Int32Array;
371-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number, thisArg: undefined): Int32Array;
370+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number): Int32Array;
371+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number, thisArg: undefined): Int32Array;
372372
from<Z>(arrayLike: Iterable<number>, mapfn: (this: Z, v: number, k: number) => number, thisArg: Z): Int32Array;
373373

374374
from(arrayLike: Iterable<number>): Int32Array;
@@ -403,8 +403,8 @@ interface Uint32ArrayConstructor {
403403
* @param mapfn A mapping function to call on every element of the array.
404404
* @param thisArg Value of 'this' used to invoke the mapfn.
405405
*/
406-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number): Uint32Array;
407-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number, thisArg: undefined): Uint32Array;
406+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number): Uint32Array;
407+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number, thisArg: undefined): Uint32Array;
408408
from<Z>(arrayLike: Iterable<number>, mapfn: (this: Z, v: number, k: number) => number, thisArg: Z): Uint32Array;
409409

410410
from(arrayLike: Iterable<number>): Uint32Array;
@@ -439,8 +439,8 @@ interface Float32ArrayConstructor {
439439
* @param mapfn A mapping function to call on every element of the array.
440440
* @param thisArg Value of 'this' used to invoke the mapfn.
441441
*/
442-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number): Float32Array;
443-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number, thisArg: undefined): Float32Array;
442+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number): Float32Array;
443+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number, thisArg: undefined): Float32Array;
444444
from<Z>(arrayLike: Iterable<number>, mapfn: (this: Z, v: number, k: number) => number, thisArg: Z): Float32Array;
445445

446446
from(arrayLike: Iterable<number>): Float32Array;
@@ -475,8 +475,8 @@ interface Float64ArrayConstructor {
475475
* @param mapfn A mapping function to call on every element of the array.
476476
* @param thisArg Value of 'this' used to invoke the mapfn.
477477
*/
478-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number): Float64Array;
479-
from(arrayLike: Iterable<number>, mapfn: (this: undefined, v: number, k: number) => number, thisArg: undefined): Float64Array;
478+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number): Float64Array;
479+
from(arrayLike: Iterable<number>, mapfn: (this: void, v: number, k: number) => number, thisArg: undefined): Float64Array;
480480
from<Z>(arrayLike: Iterable<number>, mapfn: (this: Z, v: number, k: number) => number, thisArg: Z): Float64Array;
481481

482482
from(arrayLike: Iterable<number>): Float64Array;

0 commit comments

Comments
 (0)