From 666cc8420067ac85044646b8b657454ebd782b7c Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Mon, 22 Jul 2024 00:05:47 -0400 Subject: [PATCH 1/2] Use 'BuiltinAsyncIterator' spelling --- src/lib/dom.asynciterable.generated.d.ts | 12 ++++++------ src/lib/es2018.asyncgenerator.d.ts | 2 +- src/lib/es2018.asynciterable.d.ts | 4 ++-- src/lib/webworker.asynciterable.generated.d.ts | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lib/dom.asynciterable.generated.d.ts b/src/lib/dom.asynciterable.generated.d.ts index 28d15775c66ce..f9b5ee37473ac 100644 --- a/src/lib/dom.asynciterable.generated.d.ts +++ b/src/lib/dom.asynciterable.generated.d.ts @@ -3,13 +3,13 @@ ///////////////////////////// interface FileSystemDirectoryHandle { - [Symbol.asyncIterator](): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>; - entries(): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>; - keys(): AsyncBuiltinIterator; - values(): AsyncBuiltinIterator; + [Symbol.asyncIterator](): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>; + entries(): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>; + keys(): BuiltinAsyncIterator; + values(): BuiltinAsyncIterator; } interface ReadableStream { - [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator; - values(options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator; + [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator; + values(options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator; } diff --git a/src/lib/es2018.asyncgenerator.d.ts b/src/lib/es2018.asyncgenerator.d.ts index e53975ab4021f..e5397a9e7afe2 100644 --- a/src/lib/es2018.asyncgenerator.d.ts +++ b/src/lib/es2018.asyncgenerator.d.ts @@ -1,6 +1,6 @@ /// -interface AsyncGenerator extends AsyncBuiltinIterator { +interface AsyncGenerator extends BuiltinAsyncIterator { // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places. next(...[value]: [] | [TNext]): Promise>; return(value: TReturn | PromiseLike): Promise>; diff --git a/src/lib/es2018.asynciterable.d.ts b/src/lib/es2018.asynciterable.d.ts index 17a9b067fa76f..d5a587aef2767 100644 --- a/src/lib/es2018.asynciterable.d.ts +++ b/src/lib/es2018.asynciterable.d.ts @@ -24,6 +24,6 @@ interface AsyncIterableIterator extends AsyncIter [Symbol.asyncIterator](): AsyncIterableIterator; } -interface AsyncBuiltinIterator extends AsyncIterator { - [Symbol.asyncIterator](): AsyncBuiltinIterator; +interface BuiltinAsyncIterator extends AsyncIterator { + [Symbol.asyncIterator](): BuiltinAsyncIterator; } diff --git a/src/lib/webworker.asynciterable.generated.d.ts b/src/lib/webworker.asynciterable.generated.d.ts index 0ade610693c07..cd2b63eb5d790 100644 --- a/src/lib/webworker.asynciterable.generated.d.ts +++ b/src/lib/webworker.asynciterable.generated.d.ts @@ -3,13 +3,13 @@ ///////////////////////////// interface FileSystemDirectoryHandle { - [Symbol.asyncIterator](): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>; - entries(): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>; - keys(): AsyncBuiltinIterator; - values(): AsyncBuiltinIterator; + [Symbol.asyncIterator](): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>; + entries(): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>; + keys(): BuiltinAsyncIterator; + values(): BuiltinAsyncIterator; } interface ReadableStream { - [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator; - values(options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator; + [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator; + values(options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator; } From f3ae72ece4ee307d4847fd70151e6cd3bb56c724 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Mon, 22 Jul 2024 00:19:13 -0400 Subject: [PATCH 2/2] Use 'BuiltinAsyncIterator' spelling in checker --- src/compiler/checker.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 8bdbbff72ac31..0f382fbb5e6b7 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2162,7 +2162,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { getGlobalIteratorType: getGlobalAsyncIteratorType, getGlobalIterableType: getGlobalAsyncIterableType, getGlobalIterableIteratorType: getGlobalAsyncIterableIteratorType, - getGlobalBuiltinIteratorType: getGlobalAsyncBuiltinIteratorType, + getGlobalBuiltinIteratorType: getGlobalBuiltinAsyncIteratorType, getGlobalGeneratorType: getGlobalAsyncGeneratorType, resolveIterationType: (type, errorNode) => getAwaitedType(type, errorNode, Diagnostics.Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member), mustHaveANextMethodDiagnostic: Diagnostics.An_async_iterator_must_have_a_next_method, @@ -2246,7 +2246,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { var deferredGlobalAsyncIterableType: GenericType | undefined; var deferredGlobalAsyncIteratorType: GenericType | undefined; var deferredGlobalAsyncIterableIteratorType: GenericType | undefined; - var deferredGlobalAsyncBuiltinIteratorType: GenericType | undefined; + var deferredGlobalBuiltinAsyncIteratorType: GenericType | undefined; var deferredGlobalAsyncGeneratorType: GenericType | undefined; var deferredGlobalTemplateStringsArrayType: ObjectType | undefined; var deferredGlobalImportMetaType: ObjectType; @@ -16941,8 +16941,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return (deferredGlobalAsyncIterableIteratorType ||= getGlobalType("AsyncIterableIterator" as __String, /*arity*/ 3, reportErrors)) || emptyGenericType; } - function getGlobalAsyncBuiltinIteratorType(reportErrors: boolean) { - return (deferredGlobalAsyncBuiltinIteratorType ||= getGlobalType("AsyncBuiltinIterator" as __String, /*arity*/ 3, reportErrors)) || emptyGenericType; + function getGlobalBuiltinAsyncIteratorType(reportErrors: boolean) { + return (deferredGlobalBuiltinAsyncIteratorType ||= getGlobalType("BuiltinAsyncIterator" as __String, /*arity*/ 3, reportErrors)) || emptyGenericType; } function getGlobalAsyncGeneratorType(reportErrors: boolean) { @@ -44797,7 +44797,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // As an optimization, if the type is an instantiation of the following global type, then // just grab its related type arguments: // - `Iterable` or `AsyncIterable` - // - `BuiltinIterator` or `AsyncBuiltinIterator` + // - `BuiltinIterator` or `BuiltinAsyncIterator` // - `IterableIterator` or `AsyncIterableIterator` // - `Generator` or `AsyncGenerator` if ( @@ -44925,7 +44925,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // As an optimization, if the type is an instantiation of one of the following global types, // then just grab its related type arguments: // - `IterableIterator` or `AsyncIterableIterator` - // - `BuiltinIterator` or `AsyncBuiltinIterator` + // - `BuiltinIterator` or `BuiltinAsyncIterator` // - `Iterator` or `AsyncIterator` // - `Generator` or `AsyncGenerator` if (