Skip to content

Revert PR #52589 #53280

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.

Sign up for GitHub

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 3 commits into from
Mar 16, 2023
Merged

Revert PR #52589 #53280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9abd95
Run test with higher lib
jakebailey Mar 16, 2023
c7386ea
Revert "Filter out non-array types when contextually typing array lit…
jakebailey Mar 16, 2023
fe00b42
Rename and relink
jakebailey Mar 16, 2023
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
21 changes: 13 additions & 8 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19592,8 +19592,18 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return result;
}
const moreThanOneRealChildren = length(validChildren) > 1;
const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
const nonArrayLikeTargetParts = filterType(childrenTargetType, t => !isAssignableToAvailableAnyIterable(t));
let arrayLikeTargetParts: Type;
let nonArrayLikeTargetParts: Type;
const iterableType = getGlobalIterableType(/*reportErrors*/ false);
if (iterableType !== emptyGenericType) {
const anyIterable = createIterableType(anyType);
arrayLikeTargetParts = filterType(childrenTargetType, t => isTypeAssignableTo(t, anyIterable));
nonArrayLikeTargetParts = filterType(childrenTargetType, t => !isTypeAssignableTo(t, anyIterable));
}
else {
arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
nonArrayLikeTargetParts = filterType(childrenTargetType, t => !isArrayOrTupleLikeType(t));
}
if (moreThanOneRealChildren) {
if (arrayLikeTargetParts !== neverType) {
const realSource = createTupleType(checkJsxChildren(containingElement, CheckMode.Normal));
Expand Down Expand Up @@ -23116,11 +23126,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return isArrayLikeType(type) || isTupleLikeType(type);
}

function isAssignableToAvailableAnyIterable(type: Type): boolean {
const anyIterable = getGlobalIterableType(/*reportErrors*/ false) !== emptyGenericType && createIterableType(anyType);
return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
}

function getTupleElementType(type: Type, index: number) {
const propType = getTypeOfPropertyOfType(type, "" + index as __String);
if (propType) {
Expand Down Expand Up @@ -29080,7 +29085,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
// type of T.
function getContextualTypeForElementExpression(arrayContextualType: Type | undefined, index: number): Type | undefined {
return arrayContextualType && (
index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, t => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index as __String) ||
index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index as __String) ||
mapType(arrayContextualType, t =>
isTupleType(t) ?
getElementTypeOfSliceOfTupleType(t, 0, /*endSkipCount*/ 0, /*writing*/ false, /*noReductions*/ true) :
Expand Down
18 changes: 18 additions & 0 deletions tests/baselines/reference/contextualSignatureInArrayElementLibEs2015.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
tests/cases/compiler/contextualSignatureInArrayElementLibEs2015.ts(8,4): error TS7006: Parameter 'arg' implicitly has an 'any' type.


==== tests/cases/compiler/contextualSignatureInArrayElementLibEs2015.ts (1 errors) ====
// See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984

declare function test(
arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>
): void;

test([
(arg) => {
~~~
!!! error TS7006: Parameter 'arg' implicitly has an 'any' type.
arg; // number
},
]);

27 changes: 27 additions & 0 deletions tests/baselines/reference/contextualSignatureInArrayElementLibEs2015.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
=== tests/cases/compiler/contextualSignatureInArrayElementLibEs2015.ts ===
// See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984

declare function test(
>test : Symbol(test, Decl(contextualSignatureInArrayElementLibEs2015.ts, 0, 0))

arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs2015.ts, 2, 22))
>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs2015.ts, 3, 23))
>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs2015.ts, 3, 54))

): void;

test([
>test : Symbol(test, Decl(contextualSignatureInArrayElementLibEs2015.ts, 0, 0))

(arg) => {
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs2015.ts, 7, 3))

arg; // number
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs2015.ts, 7, 3))

},
]);

12 changes: 6 additions & 6 deletions ...lementPrefersArrayUnionMemberLibEs5.types → ...ualSignatureInArrayElementLibEs2015.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
=== tests/cases/compiler/contextualSignatureInArrayElementPrefersArrayUnionMemberLibEs5.ts ===
// repro from #52588
=== tests/cases/compiler/contextualSignatureInArrayElementLibEs2015.ts ===
// See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984

declare function test(
>test : (arg: Record<string, (arg: string) => void> | ((arg: number) => void)[]) => void
Expand All @@ -14,14 +14,14 @@ declare function test(
test([
>test([ (arg) => { arg; // number },]) : void
>test : (arg: Record<string, (arg: string) => void> | ((arg: number) => void)[]) => void
>[ (arg) => { arg; // number },] : ((arg: number) => void)[]
>[ (arg) => { arg; // number },] : ((arg: any) => void)[]

(arg) => {
>(arg) => { arg; // number } : (arg: number) => void
>arg : number
>(arg) => { arg; // number } : (arg: any) => void
>arg : any

arg; // number
>arg : number
>arg : any

},
]);
Expand Down
18 changes: 18 additions & 0 deletions tests/baselines/reference/contextualSignatureInArrayElementLibEs5.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
tests/cases/compiler/contextualSignatureInArrayElementLibEs5.ts(8,4): error TS7006: Parameter 'arg' implicitly has an 'any' type.


==== tests/cases/compiler/contextualSignatureInArrayElementLibEs5.ts (1 errors) ====
// See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984

declare function test(
arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>
): void;

test([
(arg) => {
~~~
!!! error TS7006: Parameter 'arg' implicitly has an 'any' type.
arg; // number
},
]);

27 changes: 27 additions & 0 deletions tests/baselines/reference/contextualSignatureInArrayElementLibEs5.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
=== tests/cases/compiler/contextualSignatureInArrayElementLibEs5.ts ===
// See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984

declare function test(
>test : Symbol(test, Decl(contextualSignatureInArrayElementLibEs5.ts, 0, 0))

arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs5.ts, 2, 22))
>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --))
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs5.ts, 3, 23))
>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs5.ts, 3, 54))

): void;

test([
>test : Symbol(test, Decl(contextualSignatureInArrayElementLibEs5.ts, 0, 0))

(arg) => {
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs5.ts, 7, 3))

arg; // number
>arg : Symbol(arg, Decl(contextualSignatureInArrayElementLibEs5.ts, 7, 3))

},
]);

12 changes: 6 additions & 6 deletions ...entPrefersArrayUnionMemberLibEs2015.types → ...extualSignatureInArrayElementLibEs5.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
=== tests/cases/compiler/contextualSignatureInArrayElementPrefersArrayUnionMemberLibEs2015.ts ===
// repro from #52588
=== tests/cases/compiler/contextualSignatureInArrayElementLibEs5.ts ===
// See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984

declare function test(
>test : (arg: Record<string, (arg: string) => void> | ((arg: number) => void)[]) => void
Expand All @@ -14,14 +14,14 @@ declare function test(
test([
>test([ (arg) => { arg; // number },]) : void
>test : (arg: Record<string, (arg: string) => void> | ((arg: number) => void)[]) => void
>[ (arg) => { arg; // number },] : ((arg: number) => void)[]
>[ (arg) => { arg; // number },] : ((arg: any) => void)[]

(arg) => {
>(arg) => { arg; // number } : (arg: number) => void
>arg : number
>(arg) => { arg; // number } : (arg: any) => void
>arg : any

arg; // number
>arg : number
>arg : any

},
]);
Expand Down
27 changes: 0 additions & 27 deletions ...lines/reference/contextualSignatureInArrayElementPrefersArrayUnionMemberLibEs2015.symbols
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions ...aselines/reference/contextualSignatureInArrayElementPrefersArrayUnionMemberLibEs5.symbols
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion tests/baselines/reference/inferringAnyFunctionType1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ function f<T extends { "0": (p1: number) => number }>(p: T): T {
return p;
}

var v = f([x => x]);
var v = f([x => x]);


//// [inferringAnyFunctionType1.js]
function f(p) {
Expand Down
2 changes: 1 addition & 1 deletion ...lementPrefersArrayUnionMemberLibEs2015.ts → ...extualSignatureInArrayElementLibEs2015.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// @noEmit: true
// @lib: es2015

// repro from #52588
// See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984

declare function test(
arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>
Expand Down
2 changes: 1 addition & 1 deletion ...ayElementPrefersArrayUnionMemberLibEs5.ts → ...ontextualSignatureInArrayElementLibEs5.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// @noEmit: true
// @lib: es5

// repro from #52588
// See: https://github.com/microsoft/TypeScript/pull/53280#discussion_r1138684984

declare function test(
arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>
Expand Down
4 changes: 3 additions & 1 deletion tests/cases/compiler/inferringAnyFunctionType1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// @lib: es2015

function f<T extends { "0": (p1: number) => number }>(p: T): T {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While I have no idea why anybody would like to write this code... ok 😅 this is definitely valid 😉

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pattern definitely occurs in real world code, though most of it probably pre-dates our support for tuples.

return p;
}

var v = f([x => x]);
var v = f([x => x]);