Skip to content
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

Jump to bottom

Filter out non-array types when contextually typing array literal elements #52589

Merged
merged 11 commits into from
Mar 10, 2023
Merged

Filter out non-array types when contextually typing array literal elements #52589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8ebc95f
Filter out non-array types when contextually typing union members
Andarist Feb 3, 2023
47bd0dd
Merge branch 'main' into fix/prefer-array-members-for-contextual-type…
Andarist Feb 11, 2023
c659bc8
Add extra test case for contextual type caching
Andarist Feb 11, 2023
d56e1a9
Cache `anyIterable` in `getContextualTypeForElementExpression`
Andarist Feb 11, 2023
0d5b9d5
Cover both lib es5 and es2015 cases
Andarist Feb 11, 2023
f0093bd
Introduce `isAssignableToAvailableAnyIterable` helper
Andarist Feb 11, 2023
64ec074
Cache `anyIterable` creation
Andarist Feb 11, 2023
a531e1e
Merge remote-tracking branch 'origin/main' into fix/prefer-array-memb…
Andarist Feb 18, 2023
8561b1b
Merge remote-tracking branch 'origin/main' into fix/prefer-array-memb…
Andarist Mar 8, 2023
52c423a
use var instead of let
Andarist Mar 8, 2023
85c03c5
Drop anyIterable caching
Andarist Mar 8, 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
3 changes: 2 additions & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28838,8 +28838,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
// it is the type of the numeric index signature in T. Otherwise, in ES6 and higher, the contextual type is the iterated
// type of T.
function getContextualTypeForElementExpression(arrayContextualType: Type | undefined, index: number): Type | undefined {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The !!getIndexTypeOfType(t, numberType) bit here is required to cover this concatTuples test case. .concat is typed using ConcatArray which isn't exactly an array.

const hasIterable = getGlobalIterableType(/* reportErrors */ false) !== emptyGenericType;
jakebailey marked this conversation as resolved.
Show resolved Hide resolved
return arrayContextualType && (
getTypeOfPropertyOfContextualType(arrayContextualType, "" + index as __String)
getTypeOfPropertyOfContextualType(filterType(arrayContextualType, t => isArrayOrTupleLikeType(t) || !!getIndexTypeOfType(t, numberType) || hasIterable && isTypeAssignableTo(t, createIterableType(anyType))), "" + index as __String)
|| mapType(
arrayContextualType,
t => getIteratedTypeOrElementType(IterationUse.Element, t, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false),
Expand Down
27 changes: 27 additions & 0 deletions tests/baselines/reference/contextualSignatureInArrayElementPrefersArrayUnionMember.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
=== tests/cases/compiler/contextualSignatureInArrayElementPrefersArrayUnionMember.ts ===
// repro from #52588

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

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

): void;

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

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

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

},
]);

28 changes: 28 additions & 0 deletions tests/baselines/reference/contextualSignatureInArrayElementPrefersArrayUnionMember.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
=== tests/cases/compiler/contextualSignatureInArrayElementPrefersArrayUnionMember.ts ===
// repro from #52588

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

arg: Record<string, (arg: string) => void> | Array<(arg: number) => void>
>arg : Record<string, (arg: string) => void> | ((arg: number) => void)[]
>arg : string
>arg : number

): void;

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) => { arg; // number } : (arg: number) => void
>arg : number

arg; // number
>arg : number

},
]);

14 changes: 14 additions & 0 deletions tests/cases/compiler/contextualSignatureInArrayElementPrefersArrayUnionMember.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// @strict: true
// @noEmit: true

// repro from #52588

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

test([
(arg) => {
arg; // number
},
]);