Skip to content

[master] Undo #39258 (isArray changes) - see overview at #41808 #41851

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.

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

Merged
merged 1 commit into from
Dec 7, 2020
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/lib/es5.d.ts
Original file line number Diff line number Diff line change
@@ -1376,7 +1376,7 @@ interface ArrayConstructor {
(arrayLength?: number): any[];
<T>(arrayLength: number): T[];
<T>(...items: T[]): T[];
isArray<T>(arg: T | {}): arg is T extends readonly any[] ? (unknown extends T ? never : readonly any[]) : any[];
isArray(arg: any): arg is any[];
readonly prototype: any[];
}

100 changes: 0 additions & 100 deletions tests/baselines/reference/consistentUnionSubtypeReduction.js

This file was deleted.

130 changes: 0 additions & 130 deletions tests/baselines/reference/consistentUnionSubtypeReduction.symbols

This file was deleted.

132 changes: 0 additions & 132 deletions tests/baselines/reference/consistentUnionSubtypeReduction.types

This file was deleted.

Original file line number Diff line number Diff line change
@@ -67,9 +67,9 @@ export const updateIfChanged = <T>(t: T) => {
>assign : { <T, U>(target: T, source: U): T & U; <T, U, V>(target: T, source1: U, source2: V): T & U & V; <T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W; (target: object, ...sources: any[]): any; }
>Array.isArray(u) ? [] : {} : undefined[] | {}
>Array.isArray(u) : boolean
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>u : U
>[] : undefined[]
>{} : {}
4 changes: 2 additions & 2 deletions tests/baselines/reference/fixSignatureCaching.types
Original file line number Diff line number Diff line change
@@ -1109,9 +1109,9 @@ define(function () {
>Array : ArrayConstructor

Array.isArray : function (value) { return Object.prototype.toString.call(value) === '[object Array]'; };
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>function (value) { return Object.prototype.toString.call(value) === '[object Array]'; } : (value: any) => boolean
>value : any
>Object.prototype.toString.call(value) === '[object Array]' : boolean
4 changes: 2 additions & 2 deletions tests/baselines/reference/isArray.types
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@ var maybeArray: number | number[];

if (Array.isArray(maybeArray)) {
>Array.isArray(maybeArray) : boolean
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>maybeArray : number | number[]

maybeArray.length; // OK
Original file line number Diff line number Diff line change
@@ -66,9 +66,9 @@ function f2() {
>a4 : string | false | (string | false)[]
>Array.isArray(elOrA) ? elOrA : [elOrA] : (string | false)[]
>Array.isArray(elOrA) : boolean
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>elOrA : string | false | (string | false)[]
>elOrA : (string | false)[]
>[elOrA] : (string | false)[]
@@ -83,9 +83,9 @@ function f2() {
>...Array.isArray(elOrA) ? elOrA : [elOrA] : string | false
>Array.isArray(elOrA) ? elOrA : [elOrA] : (string | false)[]
>Array.isArray(elOrA) : boolean
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>elOrA : string | false | (string | false)[]
>elOrA : (string | false)[]
>[elOrA] : (string | false)[]
4 changes: 2 additions & 2 deletions tests/baselines/reference/malformedTags.types
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
*/
var isArray = Array.isArray;
>isArray : Function
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]

4 changes: 2 additions & 2 deletions tests/baselines/reference/noIterationTypeErrorsInCFA.types
Original file line number Diff line number Diff line change
@@ -10,9 +10,9 @@ export function doRemove(dds: F | F[]) {
if (!Array.isArray(dds)) {
>!Array.isArray(dds) : boolean
>Array.isArray(dds) : boolean
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>dds : F | F[]

dds = [dds]
8 changes: 4 additions & 4 deletions tests/baselines/reference/parserharness.types
Original file line number Diff line number Diff line change
@@ -3068,13 +3068,13 @@ module Harness {
>(Array.isArray && Array.isArray(arg)) || arg instanceof Array : boolean
>(Array.isArray && Array.isArray(arg)) : boolean
>Array.isArray && Array.isArray(arg) : boolean
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>Array.isArray(arg) : boolean
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>arg : any
>arg instanceof Array : boolean
>arg : any
4 changes: 2 additions & 2 deletions tests/baselines/reference/partiallyDiscriminantedUnions.types
Original file line number Diff line number Diff line change
@@ -77,9 +77,9 @@ function isShape(s : Shapes): s is Shape {
return !Array.isArray(s);
>!Array.isArray(s) : boolean
>Array.isArray(s) : boolean
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>s : Shapes
}

Original file line number Diff line number Diff line change
@@ -22,9 +22,9 @@ foo1 = [...Array.isArray(foo2) ? foo2 : [foo2]];
>...Array.isArray(foo2) ? foo2 : [foo2] : FooBase
>Array.isArray(foo2) ? foo2 : [foo2] : FooArray
>Array.isArray(foo2) : boolean
>Array.isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>Array.isArray : (arg: any) => arg is any[]
>Array : ArrayConstructor
>isArray : <T>(arg: {} | T) => arg is T extends readonly any[] ? unknown extends T ? never : readonly any[] : any[]
>isArray : (arg: any) => arg is any[]
>foo2 : Foo
>foo2 : FooArray
>[foo2] : FooBase[]
56 changes: 0 additions & 56 deletions tests/cases/compiler/consistentUnionSubtypeReduction.ts

This file was deleted.