microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-07 14:34:35 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix iterable contextual type (#40592)

Browse Source
This commit is contained in:
Andrew Branch 2020-09-17 10:42:47 -07:00 committed by GitHub
parent d779a19053
commit 735a67a05e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 105 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/checker.ts
View File

@ -23651,7 +23651,10 @@ namespace ts {
function getContextualTypeForElementExpression(arrayContextualType: Type | undefined, index: number): Type | undefined {
return arrayContextualType && (
getTypeOfPropertyOfContextualType(arrayContextualType, "" + index as __String)
|| getIteratedTypeOrElementType(IterationUse.Element, arrayContextualType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false));
|| mapType(
arrayContextualType,
t => getIteratedTypeOrElementType(IterationUse.Element, t, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false),
/*noReductions*/ true));
}
// In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.

17
tests/baselines/reference/contextualTypeIterableUnions.js Normal file
View File

@ -0,0 +1,17 @@
//// [contextualTypeIterableUnions.ts]
declare class DMap<K, V> {
constructor(iterable: Iterable<[K, V]> | undefined);
}
new DMap([["1", 2]]);
const i1: Iterable<{ a: true }> | undefined = [{ a: true }];
const i2: Iterable<{ a: true }> | Iterable<{ b: false }> = [{ b: false }];
const i3: Iterable<number> | 1[] = [2];
//// [contextualTypeIterableUnions.js]
"use strict";
new DMap([["1", 2]]);
const i1 = [{ a: true }];
const i2 = [{ b: false }];
const i3 = [2];

33
tests/baselines/reference/contextualTypeIterableUnions.symbols Normal file
View File

@ -0,0 +1,33 @@
=== tests/cases/compiler/contextualTypeIterableUnions.ts ===
declare class DMap<K, V> {
>DMap : Symbol(DMap, Decl(contextualTypeIterableUnions.ts, 0, 0))
>K : Symbol(K, Decl(contextualTypeIterableUnions.ts, 0, 19))
>V : Symbol(V, Decl(contextualTypeIterableUnions.ts, 0, 21))
constructor(iterable: Iterable<[K, V]> | undefined);
>iterable : Symbol(iterable, Decl(contextualTypeIterableUnions.ts, 1, 14))
>Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
>K : Symbol(K, Decl(contextualTypeIterableUnions.ts, 0, 19))
>V : Symbol(V, Decl(contextualTypeIterableUnions.ts, 0, 21))
}
new DMap([["1", 2]]);
>DMap : Symbol(DMap, Decl(contextualTypeIterableUnions.ts, 0, 0))
const i1: Iterable<{ a: true }> | undefined = [{ a: true }];
>i1 : Symbol(i1, Decl(contextualTypeIterableUnions.ts, 5, 5))
>Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
>a : Symbol(a, Decl(contextualTypeIterableUnions.ts, 5, 20))
>a : Symbol(a, Decl(contextualTypeIterableUnions.ts, 5, 48))
const i2: Iterable<{ a: true }> | Iterable<{ b: false }> = [{ b: false }];
>i2 : Symbol(i2, Decl(contextualTypeIterableUnions.ts, 6, 5))
>Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
>a : Symbol(a, Decl(contextualTypeIterableUnions.ts, 6, 20))
>Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
>b : Symbol(b, Decl(contextualTypeIterableUnions.ts, 6, 44))
>b : Symbol(b, Decl(contextualTypeIterableUnions.ts, 6, 61))
const i3: Iterable<number> | 1[] = [2];
>i3 : Symbol(i3, Decl(contextualTypeIterableUnions.ts, 7, 5))
>Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))

40
tests/baselines/reference/contextualTypeIterableUnions.types Normal file
View File

@ -0,0 +1,40 @@
=== tests/cases/compiler/contextualTypeIterableUnions.ts ===
declare class DMap<K, V> {
>DMap : DMap<K, V>
constructor(iterable: Iterable<[K, V]> | undefined);
>iterable : Iterable<[K, V]> | undefined
}
new DMap([["1", 2]]);
>new DMap([["1", 2]]) : DMap<string, number>
>DMap : typeof DMap
>[["1", 2]] : [string, number][]
>["1", 2] : [string, number]
>"1" : "1"
>2 : 2
const i1: Iterable<{ a: true }> | undefined = [{ a: true }];
>i1 : Iterable<{ a: true; }> | undefined
>a : true
>true : true
>[{ a: true }] : { a: true; }[]
>{ a: true } : { a: true; }
>a : true
>true : true
const i2: Iterable<{ a: true }> | Iterable<{ b: false }> = [{ b: false }];
>i2 : Iterable<{ a: true; }> | Iterable<{ b: false; }>
>a : true
>true : true
>b : false
>false : false
>[{ b: false }] : { b: false; }[]
>{ b: false } : { b: false; }
>b : false
>false : false
const i3: Iterable<number> | 1[] = [2];
>i3 : Iterable<number> | 1[]
>[2] : 2[]
>2 : 2

11
tests/cases/compiler/contextualTypeIterableUnions.ts Normal file
View File

@ -0,0 +1,11 @@
// @strict: true
// @target: esnext
declare class DMap<K, V> {
constructor(iterable: Iterable<[K, V]> | undefined);
}
new DMap([["1", 2]]);
const i1: Iterable<{ a: true }> | undefined = [{ a: true }];
const i2: Iterable<{ a: true }> | Iterable<{ b: false }> = [{ b: false }];
const i3: Iterable<number> | 1[] = [2];