typescript 5.6.0-dev.20240805 → 5.6.0-dev.20240807

package/lib/lib.es2015.iterable.d.ts

@@ -49,34 +49,48 @@ interface Iterable<T, TReturn = any, TNext = any> {
     [Symbol.iterator](): Iterator<T, TReturn, TNext>;
 }
 
+/**
+ * Describes a user-defined {@link Iterator} that is also iterable.
+ */
 interface IterableIterator<T, TReturn = any, TNext = any> extends Iterator<T, TReturn, TNext> {
     [Symbol.iterator](): IterableIterator<T, TReturn, TNext>;
 }
 
-interface BuiltinIterator<T, TReturn = any, TNext = any> extends Iterator<T, TReturn, TNext> {
-    [Symbol.iterator](): BuiltinIterator<T, TReturn, TNext>;
+/**
+ * Describes an {@link Iterator} produced by the runtime that inherits from the intrinsic `Iterator.prototype`.
+ */
+interface IteratorObject<T, TReturn = unknown, TNext = unknown> extends Iterator<T, TReturn, TNext> {
+    [Symbol.iterator](): IteratorObject<T, TReturn, TNext>;
 }
 
+/**
+ * Defines the `TReturn` type used for built-in iterators produced by `Array`, `Map`, `Set`, and others.
+ * This is `undefined` when `strictBuiltInIteratorReturn` is `true`; otherwise, this is `any`.
+ */
 type BuiltinIteratorReturn = intrinsic;
 
+interface ArrayIterator<T> extends IteratorObject<T, BuiltinIteratorReturn, unknown> {
+    [Symbol.iterator](): ArrayIterator<T>;
+}
+
 interface Array<T> {
     /** Iterator */
-    [Symbol.iterator](): BuiltinIterator<T, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<T>;
 
     /**
      * Returns an iterable of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, T], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, T]>;
 
     /**
      * Returns an iterable of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
 
     /**
      * Returns an iterable of values in the array
      */
-    values(): BuiltinIterator<T, BuiltinIteratorReturn>;
+    values(): ArrayIterator<T>;
 }
 
 interface ArrayConstructor {
@@ -97,67 +111,71 @@ interface ArrayConstructor {
 
 interface ReadonlyArray<T> {
     /** Iterator of values in the array. */
-    [Symbol.iterator](): BuiltinIterator<T, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<T>;
 
     /**
      * Returns an iterable of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, T], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, T]>;
 
     /**
      * Returns an iterable of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
 
     /**
      * Returns an iterable of values in the array
      */
-    values(): BuiltinIterator<T, BuiltinIteratorReturn>;
+    values(): ArrayIterator<T>;
 }
 
 interface IArguments {
     /** Iterator */
-    [Symbol.iterator](): BuiltinIterator<any, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<any>;
+}
+
+interface MapIterator<T> extends IteratorObject<T, BuiltinIteratorReturn, unknown> {
+    [Symbol.iterator](): MapIterator<T>;
 }
 
 interface Map<K, V> {
     /** Returns an iterable of entries in the map. */
-    [Symbol.iterator](): BuiltinIterator<[K, V], BuiltinIteratorReturn>;
+    [Symbol.iterator](): MapIterator<[K, V]>;
 
     /**
      * Returns an iterable of key, value pairs for every entry in the map.
      */
-    entries(): BuiltinIterator<[K, V], BuiltinIteratorReturn>;
+    entries(): MapIterator<[K, V]>;
 
     /**
      * Returns an iterable of keys in the map
      */
-    keys(): BuiltinIterator<K, BuiltinIteratorReturn>;
+    keys(): MapIterator<K>;
 
     /**
      * Returns an iterable of values in the map
      */
-    values(): BuiltinIterator<V, BuiltinIteratorReturn>;
+    values(): MapIterator<V>;
 }
 
 interface ReadonlyMap<K, V> {
     /** Returns an iterable of entries in the map. */
-    [Symbol.iterator](): BuiltinIterator<[K, V], BuiltinIteratorReturn>;
+    [Symbol.iterator](): MapIterator<[K, V]>;
 
     /**
      * Returns an iterable of key, value pairs for every entry in the map.
      */
-    entries(): BuiltinIterator<[K, V], BuiltinIteratorReturn>;
+    entries(): MapIterator<[K, V]>;
 
     /**
      * Returns an iterable of keys in the map
      */
-    keys(): BuiltinIterator<K, BuiltinIteratorReturn>;
+    keys(): MapIterator<K>;
 
     /**
      * Returns an iterable of values in the map
      */
-    values(): BuiltinIterator<V, BuiltinIteratorReturn>;
+    values(): MapIterator<V>;
 }
 
 interface MapConstructor {
@@ -171,42 +189,46 @@ interface WeakMapConstructor {
     new <K extends WeakKey, V>(iterable: Iterable<readonly [K, V]>): WeakMap<K, V>;
 }
 
+interface SetIterator<T> extends IteratorObject<T, BuiltinIteratorReturn, unknown> {
+    [Symbol.iterator](): SetIterator<T>;
+}
+
 interface Set<T> {
     /** Iterates over values in the set. */
-    [Symbol.iterator](): BuiltinIterator<T, BuiltinIteratorReturn>;
+    [Symbol.iterator](): SetIterator<T>;
     /**
      * Returns an iterable of [v,v] pairs for every value `v` in the set.
      */
-    entries(): BuiltinIterator<[T, T], BuiltinIteratorReturn>;
+    entries(): SetIterator<[T, T]>;
     /**
      * Despite its name, returns an iterable of the values in the set.
      */
-    keys(): BuiltinIterator<T, BuiltinIteratorReturn>;
+    keys(): SetIterator<T>;
 
     /**
      * Returns an iterable of values in the set.
      */
-    values(): BuiltinIterator<T, BuiltinIteratorReturn>;
+    values(): SetIterator<T>;
 }
 
 interface ReadonlySet<T> {
     /** Iterates over values in the set. */
-    [Symbol.iterator](): BuiltinIterator<T, BuiltinIteratorReturn>;
+    [Symbol.iterator](): SetIterator<T>;
 
     /**
      * Returns an iterable of [v,v] pairs for every value `v` in the set.
      */
-    entries(): BuiltinIterator<[T, T], BuiltinIteratorReturn>;
+    entries(): SetIterator<[T, T]>;
 
     /**
      * Despite its name, returns an iterable of the values in the set.
      */
-    keys(): BuiltinIterator<T, BuiltinIteratorReturn>;
+    keys(): SetIterator<T>;
 
     /**
      * Returns an iterable of values in the set.
      */
-    values(): BuiltinIterator<T, BuiltinIteratorReturn>;
+    values(): SetIterator<T>;
 }
 
 interface SetConstructor {
@@ -239,25 +261,29 @@ interface PromiseConstructor {
     race<T>(values: Iterable<T | PromiseLike<T>>): Promise<Awaited<T>>;
 }
 
+interface StringIterator<T> extends IteratorObject<T, BuiltinIteratorReturn, unknown> {
+    [Symbol.iterator](): StringIterator<T>;
+}
+
 interface String {
     /** Iterator */
-    [Symbol.iterator](): BuiltinIterator<string, BuiltinIteratorReturn>;
+    [Symbol.iterator](): StringIterator<string>;
 }
 
 interface Int8Array {
-    [Symbol.iterator](): BuiltinIterator<number, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<number>;
     /**
      * Returns an array of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, number], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, number]>;
     /**
      * Returns an list of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
     /**
      * Returns an list of values in the array
      */
-    values(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    values(): ArrayIterator<number>;
 }
 
 interface Int8ArrayConstructor {
@@ -273,19 +299,19 @@ interface Int8ArrayConstructor {
 }
 
 interface Uint8Array {
-    [Symbol.iterator](): BuiltinIterator<number, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<number>;
     /**
      * Returns an array of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, number], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, number]>;
     /**
      * Returns an list of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
     /**
      * Returns an list of values in the array
      */
-    values(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    values(): ArrayIterator<number>;
 }
 
 interface Uint8ArrayConstructor {
@@ -301,21 +327,21 @@ interface Uint8ArrayConstructor {
 }
 
 interface Uint8ClampedArray {
-    [Symbol.iterator](): BuiltinIterator<number, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<number>;
     /**
      * Returns an array of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, number], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, number]>;
 
     /**
      * Returns an list of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
 
     /**
      * Returns an list of values in the array
      */
-    values(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    values(): ArrayIterator<number>;
 }
 
 interface Uint8ClampedArrayConstructor {
@@ -331,21 +357,21 @@ interface Uint8ClampedArrayConstructor {
 }
 
 interface Int16Array {
-    [Symbol.iterator](): BuiltinIterator<number, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<number>;
     /**
      * Returns an array of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, number], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, number]>;
 
     /**
      * Returns an list of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
 
     /**
      * Returns an list of values in the array
      */
-    values(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    values(): ArrayIterator<number>;
 }
 
 interface Int16ArrayConstructor {
@@ -361,19 +387,19 @@ interface Int16ArrayConstructor {
 }
 
 interface Uint16Array {
-    [Symbol.iterator](): BuiltinIterator<number, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<number>;
     /**
      * Returns an array of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, number], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, number]>;
     /**
      * Returns an list of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
     /**
      * Returns an list of values in the array
      */
-    values(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    values(): ArrayIterator<number>;
 }
 
 interface Uint16ArrayConstructor {
@@ -389,19 +415,19 @@ interface Uint16ArrayConstructor {
 }
 
 interface Int32Array {
-    [Symbol.iterator](): BuiltinIterator<number, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<number>;
     /**
      * Returns an array of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, number], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, number]>;
     /**
      * Returns an list of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
     /**
      * Returns an list of values in the array
      */
-    values(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    values(): ArrayIterator<number>;
 }
 
 interface Int32ArrayConstructor {
@@ -417,19 +443,19 @@ interface Int32ArrayConstructor {
 }
 
 interface Uint32Array {
-    [Symbol.iterator](): BuiltinIterator<number, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<number>;
     /**
      * Returns an array of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, number], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, number]>;
     /**
      * Returns an list of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
     /**
      * Returns an list of values in the array
      */
-    values(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    values(): ArrayIterator<number>;
 }
 
 interface Uint32ArrayConstructor {
@@ -445,19 +471,19 @@ interface Uint32ArrayConstructor {
 }
 
 interface Float32Array {
-    [Symbol.iterator](): BuiltinIterator<number, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<number>;
     /**
      * Returns an array of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, number], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, number]>;
     /**
      * Returns an list of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
     /**
      * Returns an list of values in the array
      */
-    values(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    values(): ArrayIterator<number>;
 }
 
 interface Float32ArrayConstructor {
@@ -473,19 +499,19 @@ interface Float32ArrayConstructor {
 }
 
 interface Float64Array {
-    [Symbol.iterator](): BuiltinIterator<number, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<number>;
     /**
      * Returns an array of key, value pairs for every entry in the array
      */
-    entries(): BuiltinIterator<[number, number], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, number]>;
     /**
      * Returns an list of keys in the array
      */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
     /**
      * Returns an list of values in the array
      */
-    values(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    values(): ArrayIterator<number>;
 }
 
 interface Float64ArrayConstructor {

package/lib/lib.es2018.asyncgenerator.d.ts

@@ -18,7 +18,7 @@ and limitations under the License.
 
 /// <reference lib="es2018.asynciterable" />
 
-interface AsyncGenerator<T = unknown, TReturn = any, TNext = any> extends BuiltinAsyncIterator<T, TReturn, TNext> {
+interface AsyncGenerator<T = unknown, TReturn = any, TNext = any> extends AsyncIteratorObject<T, TReturn, TNext> {
     // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places.
     next(...[value]: [] | [TNext]): Promise<IteratorResult<T, TReturn>>;
     return(value: TReturn | PromiseLike<TReturn>): Promise<IteratorResult<T, TReturn>>;

package/lib/lib.es2018.asynciterable.d.ts

@@ -38,10 +38,16 @@ interface AsyncIterable<T, TReturn = any, TNext = any> {
     [Symbol.asyncIterator](): AsyncIterator<T, TReturn, TNext>;
 }
 
+/**
+ * Describes a user-defined {@link AsyncIterator} that is also async iterable.
+ */
 interface AsyncIterableIterator<T, TReturn = any, TNext = any> extends AsyncIterator<T, TReturn, TNext> {
     [Symbol.asyncIterator](): AsyncIterableIterator<T, TReturn, TNext>;
 }
 
-interface BuiltinAsyncIterator<T, TReturn = any, TNext = any> extends AsyncIterator<T, TReturn, TNext> {
-    [Symbol.asyncIterator](): BuiltinAsyncIterator<T, TReturn, TNext>;
+/**
+ * Describes an {@link AsyncIterator} produced by the runtime that inherits from the intrinsic `AsyncIterator.prototype`.
+ */
+interface AsyncIteratorObject<T, TReturn = unknown, TNext = unknown> extends AsyncIterator<T, TReturn, TNext> {
+    [Symbol.asyncIterator](): AsyncIteratorObject<T, TReturn, TNext>;
 }

package/lib/lib.es2020.bigint.d.ts

@@ -171,7 +171,7 @@ interface BigInt64Array {
     copyWithin(target: number, start: number, end?: number): this;
 
     /** Yields index, value pairs for every entry in the array. */
-    entries(): BuiltinIterator<[number, bigint], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, bigint]>;
 
     /**
      * Determines whether all the members of an array satisfy the specified test.
@@ -256,7 +256,7 @@ interface BigInt64Array {
     join(separator?: string): string;
 
     /** Yields each index in the array. */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
 
     /**
      * Returns the index of the last occurrence of a value in an array.
@@ -378,9 +378,9 @@ interface BigInt64Array {
     valueOf(): BigInt64Array;
 
     /** Yields each value in the array. */
-    values(): BuiltinIterator<bigint, BuiltinIteratorReturn>;
+    values(): ArrayIterator<bigint>;
 
-    [Symbol.iterator](): BuiltinIterator<bigint, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<bigint>;
 
     readonly [Symbol.toStringTag]: "BigInt64Array";
 
@@ -443,7 +443,7 @@ interface BigUint64Array {
     copyWithin(target: number, start: number, end?: number): this;
 
     /** Yields index, value pairs for every entry in the array. */
-    entries(): BuiltinIterator<[number, bigint], BuiltinIteratorReturn>;
+    entries(): ArrayIterator<[number, bigint]>;
 
     /**
      * Determines whether all the members of an array satisfy the specified test.
@@ -528,7 +528,7 @@ interface BigUint64Array {
     join(separator?: string): string;
 
     /** Yields each index in the array. */
-    keys(): BuiltinIterator<number, BuiltinIteratorReturn>;
+    keys(): ArrayIterator<number>;
 
     /**
      * Returns the index of the last occurrence of a value in an array.
@@ -650,9 +650,9 @@ interface BigUint64Array {
     valueOf(): BigUint64Array;
 
     /** Yields each value in the array. */
-    values(): BuiltinIterator<bigint, BuiltinIteratorReturn>;
+    values(): ArrayIterator<bigint>;
 
-    [Symbol.iterator](): BuiltinIterator<bigint, BuiltinIteratorReturn>;
+    [Symbol.iterator](): ArrayIterator<bigint>;
 
     readonly [Symbol.toStringTag]: "BigUint64Array";
 

package/lib/lib.es2020.string.d.ts

@@ -16,7 +16,7 @@ and limitations under the License.
 
 /// <reference no-default-lib="true"/>
 
-/// <reference lib="es2015.iterable" />
+/// <reference lib="es2020.symbol.wellknown" />
 
 interface String {
     /**
@@ -24,7 +24,7 @@ interface String {
      * containing the results of that search.
      * @param regexp A variable name or string literal containing the regular expression pattern and flags.
      */
-    matchAll(regexp: RegExp): BuiltinIterator<RegExpExecArray, BuiltinIteratorReturn>;
+    matchAll(regexp: RegExp): RegExpStringIterator<RegExpExecArray>;
 
     /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */
     toLocaleLowerCase(locales?: Intl.LocalesArgument): string;

package/lib/lib.es2020.symbol.wellknown.d.ts

@@ -27,11 +27,15 @@ interface SymbolConstructor {
     readonly matchAll: unique symbol;
 }
 
+interface RegExpStringIterator<T> extends IteratorObject<T, BuiltinIteratorReturn, unknown> {
+    [Symbol.iterator](): RegExpStringIterator<T>;
+}
+
 interface RegExp {
     /**
      * Matches a string with this regular expression, and returns an iterable of matches
      * containing the results of that search.
      * @param string A string to search within.
      */
-    [Symbol.matchAll](str: string): BuiltinIterator<RegExpMatchArray, BuiltinIteratorReturn>;
+    [Symbol.matchAll](str: string): RegExpStringIterator<RegExpMatchArray>;
 }

package/lib/lib.es2022.intl.d.ts

@@ -46,6 +46,10 @@ declare namespace Intl {
         granularity: "grapheme" | "word" | "sentence";
     }
 
+    interface SegmentIterator<T> extends IteratorObject<T, BuiltinIteratorReturn, unknown> {
+        [Symbol.iterator](): SegmentIterator<T>;
+    }
+
     interface Segments {
         /**
          * Returns an object describing the segment in the original string that includes the code unit at a specified index.
@@ -55,7 +59,7 @@ declare namespace Intl {
         containing(codeUnitIndex?: number): SegmentData;
 
         /** Returns an iterator to iterate over the segments. */
-        [Symbol.iterator](): BuiltinIterator<SegmentData, BuiltinIteratorReturn>;
+        [Symbol.iterator](): SegmentIterator<SegmentData>;
     }
 
     interface SegmentData {

package/lib/lib.esnext.iterator.d.ts

@@ -25,59 +25,59 @@ and limitations under the License.
 export {};
 
 // Abstract type that allows us to mark `next` as `abstract`
-declare abstract class Iterator<T> { // eslint-disable-line @typescript-eslint/no-unsafe-declaration-merging
-    abstract next(value?: unknown): IteratorResult<T, undefined>;
+declare abstract class Iterator<T, TResult = undefined, TNext = unknown> { // eslint-disable-line @typescript-eslint/no-unsafe-declaration-merging
+    abstract next(value?: TNext): IteratorResult<T, TResult>;
 }
 
-// Merge all members of `BuiltinIterator<T>` into `Iterator<T>`
-interface Iterator<T> extends globalThis.BuiltinIterator<T, undefined, unknown> {}
+// Merge all members of `IteratorObject<T>` into `Iterator<T>`
+interface Iterator<T, TResult, TNext> extends globalThis.IteratorObject<T, TResult, TNext> {}
 
 // Capture the `Iterator` constructor in a type we can use in the `extends` clause of `IteratorConstructor`.
-type BuiltinIteratorConstructor = typeof Iterator;
+type IteratorObjectConstructor = typeof Iterator;
 
 declare global {
-    // Global `BuiltinIterator<T>` interface that can be augmented by polyfills
-    interface BuiltinIterator<T, TReturn, TNext> {
+    // Global `IteratorObject<T, TReturn, TNext>` interface that can be augmented by polyfills
+    interface IteratorObject<T, TReturn, TNext> {
         /**
          * Returns this iterator.
          */
-        [Symbol.iterator](): BuiltinIterator<T, TReturn, TNext>;
+        [Symbol.iterator](): IteratorObject<T, TReturn, TNext>;
 
         /**
          * Creates an iterator whose values are the result of applying the callback to the values from this iterator.
          * @param callbackfn A function that accepts up to two arguments to be used to transform values from the underlying iterator.
          */
-        map<U>(callbackfn: (value: T, index: number) => U): BuiltinIterator<U, undefined>;
+        map<U>(callbackfn: (value: T, index: number) => U): IteratorObject<U, undefined, unknown>;
 
         /**
          * Creates an iterator whose values are those from this iterator for which the provided predicate returns true.
          * @param predicate A function that accepts up to two arguments to be used to test values from the underlying iterator.
          */
-        filter<S extends T>(predicate: (value: T, index: number) => value is S): BuiltinIterator<S, undefined>;
+        filter<S extends T>(predicate: (value: T, index: number) => value is S): IteratorObject<S, undefined, unknown>;
 
         /**
          * Creates an iterator whose values are those from this iterator for which the provided predicate returns true.
          * @param predicate A function that accepts up to two arguments to be used to test values from the underlying iterator.
          */
-        filter(predicate: (value: T, index: number) => unknown): BuiltinIterator<T, undefined>;
+        filter(predicate: (value: T, index: number) => unknown): IteratorObject<T, undefined, unknown>;
 
         /**
          * Creates an iterator whose values are the values from this iterator, stopping once the provided limit is reached.
          * @param limit The maximum number of values to yield.
          */
-        take(limit: number): BuiltinIterator<T, undefined>;
+        take(limit: number): IteratorObject<T, undefined, unknown>;
 
         /**
          * Creates an iterator whose values are the values from this iterator after skipping the provided count.
          * @param count The number of values to drop.
          */
-        drop(count: number): BuiltinIterator<T, undefined>;
+        drop(count: number): IteratorObject<T, undefined, unknown>;
 
         /**
          * Creates an iterator whose values are the result of applying the callback to the values from this iterator and then flattening the resulting iterators or iterables.
          * @param callback A function that accepts up to two arguments to be used to transform values from the underlying iterator into new iterators or iterables to be flattened into the result.
          */
-        flatMap<U>(callback: (value: T, index: number) => Iterator<U, unknown, undefined> | Iterable<U, unknown, undefined>): BuiltinIterator<U, undefined>;
+        flatMap<U>(callback: (value: T, index: number) => Iterator<U, unknown, undefined> | Iterable<U, unknown, undefined>): IteratorObject<U, undefined, unknown>;
 
         /**
          * Calls the specified callback function for all the elements in this iterator. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
@@ -135,13 +135,13 @@ declare global {
     }
 
     // Global `IteratorConstructor` interface that can be augmented by polyfills
-    interface IteratorConstructor extends BuiltinIteratorConstructor {
+    interface IteratorConstructor extends IteratorObjectConstructor {
         /**
          * Creates a native iterator from an iterator or iterable object.
          * Returns its input if the input already inherits from the built-in Iterator class.
          * @param value An iterator or iterable object to convert a native iterator.
          */
-        from<T>(value: Iterator<T, unknown, undefined> | Iterable<T, unknown, undefined>): BuiltinIterator<T, undefined>;
+        from<T>(value: Iterator<T, unknown, undefined> | Iterable<T, unknown, undefined>): IteratorObject<T, undefined, unknown>;
     }
 
     var Iterator: IteratorConstructor;