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.

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

Allow specifying TReturn and TNext for AsyncIterableIterator and AsyncIterable #36723

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions src/lib/es2018.asynciterable.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ interface AsyncIterator<T, TReturn = any, TNext = undefined> {
throw?(e?: any): Promise<IteratorResult<T, TReturn>>;
}

interface AsyncIterable<T> {
[Symbol.asyncIterator](): AsyncIterator<T>;
interface AsyncIterable<T, TReturn = any, TNext = undefined> {
[Symbol.asyncIterator](): AsyncIterator<T, TReturn, TNext>;
}

interface AsyncIterableIterator<T> extends AsyncIterator<T> {
[Symbol.asyncIterator](): AsyncIterableIterator<T>;
}
interface AsyncIterableIterator<T, TReturn = any, TNext = undefined> extends AsyncIterator<T, TReturn, TNext> {
[Symbol.asyncIterator](): AsyncIterableIterator<T, TReturn, TNext>;
}
6 changes: 3 additions & 3 deletions tests/baselines/reference/forAwaitForUnion.types
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
=== tests/cases/compiler/forAwaitForUnion.ts ===
async function f<T>(source: Iterable<T> | AsyncIterable<T>) {
>f : <T>(source: Iterable<T> | AsyncIterable<T>) => Promise<void>
>source : Iterable<T> | AsyncIterable<T>
>f : <T>(source: Iterable<T> | AsyncIterable<T, any, undefined>) => Promise<void>
>source : Iterable<T> | AsyncIterable<T, any, undefined>

for await (const x of source) {
>x : T
>source : Iterable<T> | AsyncIterable<T>
>source : Iterable<T> | AsyncIterable<T, any, undefined>
}
}

40 changes: 20 additions & 20 deletions tests/baselines/reference/types.asyncGenerators.es2018.1.types
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ async function * inferReturnType8() {
>1 : 1
}
const assignability1: () => AsyncIterableIterator<number> = async function * () {
>assignability1 : () => AsyncIterableIterator<number>
>assignability1 : () => AsyncIterableIterator<number, any, undefined>
>async function * () { yield 1;} : () => AsyncGenerator<number, void, undefined>

yield 1;
Expand All @@ -83,7 +83,7 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()

};
const assignability2: () => AsyncIterableIterator<number> = async function * () {
>assignability2 : () => AsyncIterableIterator<number>
>assignability2 : () => AsyncIterableIterator<number, any, undefined>
>async function * () { yield Promise.resolve(1);} : () => AsyncGenerator<number, void, undefined>

yield Promise.resolve(1);
Expand All @@ -96,7 +96,7 @@ const assignability2: () => AsyncIterableIterator<number> = async function * ()

};
const assignability3: () => AsyncIterableIterator<number> = async function * () {
>assignability3 : () => AsyncIterableIterator<number>
>assignability3 : () => AsyncIterableIterator<number, any, undefined>
>async function * () { yield* [1, 2];} : () => AsyncGenerator<number, void, undefined>

yield* [1, 2];
Expand All @@ -107,7 +107,7 @@ const assignability3: () => AsyncIterableIterator<number> = async function * ()

};
const assignability4: () => AsyncIterableIterator<number> = async function * () {
>assignability4 : () => AsyncIterableIterator<number>
>assignability4 : () => AsyncIterableIterator<number, any, undefined>
>async function * () { yield* [Promise.resolve(1)];} : () => AsyncGenerator<number, void, undefined>

yield* [Promise.resolve(1)];
Expand All @@ -121,7 +121,7 @@ const assignability4: () => AsyncIterableIterator<number> = async function * ()

};
const assignability5: () => AsyncIterableIterator<number> = async function * () {
>assignability5 : () => AsyncIterableIterator<number>
>assignability5 : () => AsyncIterableIterator<number, any, undefined>
>async function * () { yield* (async function * () { yield 1; })();} : () => AsyncGenerator<number, void, unknown>

yield* (async function * () { yield 1; })();
Expand All @@ -134,7 +134,7 @@ const assignability5: () => AsyncIterableIterator<number> = async function * ()

};
const assignability6: () => AsyncIterable<number> = async function * () {
>assignability6 : () => AsyncIterable<number>
>assignability6 : () => AsyncIterable<number, any, undefined>
>async function * () { yield 1;} : () => AsyncGenerator<number, void, undefined>

yield 1;
Expand All @@ -143,7 +143,7 @@ const assignability6: () => AsyncIterable<number> = async function * () {

};
const assignability7: () => AsyncIterable<number> = async function * () {
>assignability7 : () => AsyncIterable<number>
>assignability7 : () => AsyncIterable<number, any, undefined>
>async function * () { yield Promise.resolve(1);} : () => AsyncGenerator<number, void, undefined>

yield Promise.resolve(1);
Expand All @@ -156,7 +156,7 @@ const assignability7: () => AsyncIterable<number> = async function * () {

};
const assignability8: () => AsyncIterable<number> = async function * () {
>assignability8 : () => AsyncIterable<number>
>assignability8 : () => AsyncIterable<number, any, undefined>
>async function * () { yield* [1, 2];} : () => AsyncGenerator<number, void, undefined>

yield* [1, 2];
Expand All @@ -167,7 +167,7 @@ const assignability8: () => AsyncIterable<number> = async function * () {

};
const assignability9: () => AsyncIterable<number> = async function * () {
>assignability9 : () => AsyncIterable<number>
>assignability9 : () => AsyncIterable<number, any, undefined>
>async function * () { yield* [Promise.resolve(1)];} : () => AsyncGenerator<number, void, undefined>

yield* [Promise.resolve(1)];
Expand All @@ -181,7 +181,7 @@ const assignability9: () => AsyncIterable<number> = async function * () {

};
const assignability10: () => AsyncIterable<number> = async function * () {
>assignability10 : () => AsyncIterable<number>
>assignability10 : () => AsyncIterable<number, any, undefined>
>async function * () { yield* (async function * () { yield 1; })();} : () => AsyncGenerator<number, void, unknown>

yield* (async function * () { yield 1; })();
Expand Down Expand Up @@ -254,14 +254,14 @@ const assignability15: () => AsyncIterator<number> = async function * () {

};
async function * explicitReturnType1(): AsyncIterableIterator<number> {
>explicitReturnType1 : () => AsyncIterableIterator<number>
>explicitReturnType1 : () => AsyncIterableIterator<number, any, undefined>

yield 1;
>yield 1 : undefined
>1 : 1
}
async function * explicitReturnType2(): AsyncIterableIterator<number> {
>explicitReturnType2 : () => AsyncIterableIterator<number>
>explicitReturnType2 : () => AsyncIterableIterator<number, any, undefined>

yield Promise.resolve(1);
>yield Promise.resolve(1) : undefined
Expand All @@ -272,7 +272,7 @@ async function * explicitReturnType2(): AsyncIterableIterator<number> {
>1 : 1
}
async function * explicitReturnType3(): AsyncIterableIterator<number> {
>explicitReturnType3 : () => AsyncIterableIterator<number>
>explicitReturnType3 : () => AsyncIterableIterator<number, any, undefined>

yield* [1, 2];
>yield* [1, 2] : any
Expand All @@ -281,7 +281,7 @@ async function * explicitReturnType3(): AsyncIterableIterator<number> {
>2 : 2
}
async function * explicitReturnType4(): AsyncIterableIterator<number> {
>explicitReturnType4 : () => AsyncIterableIterator<number>
>explicitReturnType4 : () => AsyncIterableIterator<number, any, undefined>

yield* [Promise.resolve(1)];
>yield* [Promise.resolve(1)] : any
Expand All @@ -293,7 +293,7 @@ async function * explicitReturnType4(): AsyncIterableIterator<number> {
>1 : 1
}
async function * explicitReturnType5(): AsyncIterableIterator<number> {
>explicitReturnType5 : () => AsyncIterableIterator<number>
>explicitReturnType5 : () => AsyncIterableIterator<number, any, undefined>

yield* (async function * () { yield 1; })();
>yield* (async function * () { yield 1; })() : void
Expand All @@ -304,14 +304,14 @@ async function * explicitReturnType5(): AsyncIterableIterator<number> {
>1 : 1
}
async function * explicitReturnType6(): AsyncIterable<number> {
>explicitReturnType6 : () => AsyncIterable<number>
>explicitReturnType6 : () => AsyncIterable<number, any, undefined>

yield 1;
>yield 1 : undefined
>1 : 1
}
async function * explicitReturnType7(): AsyncIterable<number> {
>explicitReturnType7 : () => AsyncIterable<number>
>explicitReturnType7 : () => AsyncIterable<number, any, undefined>

yield Promise.resolve(1);
>yield Promise.resolve(1) : undefined
Expand All @@ -322,7 +322,7 @@ async function * explicitReturnType7(): AsyncIterable<number> {
>1 : 1
}
async function * explicitReturnType8(): AsyncIterable<number> {
>explicitReturnType8 : () => AsyncIterable<number>
>explicitReturnType8 : () => AsyncIterable<number, any, undefined>

yield* [1, 2];
>yield* [1, 2] : any
Expand All @@ -331,7 +331,7 @@ async function * explicitReturnType8(): AsyncIterable<number> {
>2 : 2
}
async function * explicitReturnType9(): AsyncIterable<number> {
>explicitReturnType9 : () => AsyncIterable<number>
>explicitReturnType9 : () => AsyncIterable<number, any, undefined>

yield* [Promise.resolve(1)];
>yield* [Promise.resolve(1)] : any
Expand All @@ -343,7 +343,7 @@ async function * explicitReturnType9(): AsyncIterable<number> {
>1 : 1
}
async function * explicitReturnType10(): AsyncIterable<number> {
>explicitReturnType10 : () => AsyncIterable<number>
>explicitReturnType10 : () => AsyncIterable<number, any, undefined>

yield* (async function * () { yield 1; })();
>yield* (async function * () { yield 1; })() : void
Expand Down
Loading