Skip to content

Simplify / fix HTMLCollection overrides #2079

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Simplify / fix HTMLCollection overrides #2079

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6fc4a3
feat: Simplify collections
Bashamega Jul 23, 2025
8acd7f4
-
Bashamega Jul 27, 2025
6560d36
Merge branch 'main' of https://github.com/microsoft/TypeScript-DOM-li…
Aug 7, 2025
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
16 changes: 8 additions & 8 deletions baselines/audioworklet.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ interface MessagePortEventMap extends MessageEventTargetEventMap {
*
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/MessagePort)
*/
interface MessagePort extends EventTarget, MessageEventTarget<MessagePort> {
interface MessagePort extends EventTarget, MessageEventTarget {
/**
* The **`close()`** method of the MessagePort interface disconnects the port, so it is no longer active.
*
Expand Down Expand Up @@ -1880,39 +1880,39 @@ interface QueuingStrategySize<T = any> {
}

interface TransformerFlushCallback<O> {
(controller: TransformStreamDefaultController<O>): void | PromiseLike<void>;
(controller: TransformStreamDefaultController<O>): Promise<void>;
}

interface TransformerStartCallback<O> {
(controller: TransformStreamDefaultController<O>): any;
}

interface TransformerTransformCallback<I, O> {
(chunk: I, controller: TransformStreamDefaultController<O>): void | PromiseLike<void>;
(chunk: I, controller: TransformStreamDefaultController<O>): Promise<void>;
}

interface UnderlyingSinkAbortCallback {
(reason?: any): void | PromiseLike<void>;
(reason?: any): Promise<void>;
}

interface UnderlyingSinkCloseCallback {
(): void | PromiseLike<void>;
(): Promise<void>;
}

interface UnderlyingSinkStartCallback {
(controller: WritableStreamDefaultController): any;
}

interface UnderlyingSinkWriteCallback<W> {
(chunk: W, controller: WritableStreamDefaultController): void | PromiseLike<void>;
(chunk: W, controller: WritableStreamDefaultController): Promise<void>;
}

interface UnderlyingSourceCancelCallback {
(reason?: any): void | PromiseLike<void>;
(reason?: any): Promise<void>;
}

interface UnderlyingSourcePullCallback<R> {
(controller: ReadableStreamController<R>): void | PromiseLike<void>;
(controller: ReadableStreamController<R>): Promise<void>;
}

interface UnderlyingSourceStartCallback<R> {
Expand Down
109 changes: 50 additions & 59 deletions baselines/dom.generated.d.ts
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions baselines/dom.iterable.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,10 @@ interface HTMLAllCollection {
[Symbol.iterator](): ArrayIterator<Element>;
}

interface HTMLCollectionBase {
interface HTMLCollection<E extends Element = Element, N = never> {
[Symbol.iterator](): ArrayIterator<Element>;
}

interface HTMLCollectionOf<T extends Element> {
[Symbol.iterator](): ArrayIterator<T>;
}

interface HTMLFormElement {
[Symbol.iterator](): ArrayIterator<Element>;
}
Expand Down
18 changes: 10 additions & 8 deletions baselines/serviceworker.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5107,7 +5107,7 @@ interface MessagePortEventMap extends MessageEventTargetEventMap {
*
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/MessagePort)
*/
interface MessagePort extends EventTarget, MessageEventTarget<MessagePort> {
interface MessagePort extends EventTarget, MessageEventTarget {
/**
* The **`close()`** method of the MessagePort interface disconnects the port, so it is no longer active.
*
Expand Down Expand Up @@ -11271,39 +11271,39 @@ interface ReportingObserverCallback {
}

interface TransformerFlushCallback<O> {
(controller: TransformStreamDefaultController<O>): void | PromiseLike<void>;
(controller: TransformStreamDefaultController<O>): Promise<void>;
}

interface TransformerStartCallback<O> {
(controller: TransformStreamDefaultController<O>): any;
}

interface TransformerTransformCallback<I, O> {
(chunk: I, controller: TransformStreamDefaultController<O>): void | PromiseLike<void>;
(chunk: I, controller: TransformStreamDefaultController<O>): Promise<void>;
}

interface UnderlyingSinkAbortCallback {
(reason?: any): void | PromiseLike<void>;
(reason?: any): Promise<void>;
}

interface UnderlyingSinkCloseCallback {
(): void | PromiseLike<void>;
(): Promise<void>;
}

interface UnderlyingSinkStartCallback {
(controller: WritableStreamDefaultController): any;
}

interface UnderlyingSinkWriteCallback<W> {
(chunk: W, controller: WritableStreamDefaultController): void | PromiseLike<void>;
(chunk: W, controller: WritableStreamDefaultController): Promise<void>;
}

interface UnderlyingSourceCancelCallback {
(reason?: any): void | PromiseLike<void>;
(reason?: any): Promise<void>;
}

interface UnderlyingSourcePullCallback<R> {
(controller: ReadableStreamController<R>): void | PromiseLike<void>;
(controller: ReadableStreamController<R>): Promise<void>;
}

interface UnderlyingSourceStartCallback<R> {
Expand Down Expand Up @@ -11489,6 +11489,8 @@ type GLsizei = number;
type GLsizeiptr = number;
type GLuint = number;
type GLuint64 = number;
/** @deprecated */
type HTMLCollectionOf<T extends Element> = HTMLCollection<T>;
type HashAlgorithmIdentifier = AlgorithmIdentifier;
type HeadersInit = [string, string][] | Record<string, string> | Headers;
type IDBValidKey = number | string | Date | BufferSource | IDBValidKey[];
Expand Down
20 changes: 11 additions & 9 deletions baselines/sharedworker.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4790,7 +4790,7 @@ interface MessagePortEventMap extends MessageEventTargetEventMap {
*
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/MessagePort)
*/
interface MessagePort extends EventTarget, MessageEventTarget<MessagePort> {
interface MessagePort extends EventTarget, MessageEventTarget {
/**
* The **`close()`** method of the MessagePort interface disconnects the port, so it is no longer active.
*
Expand Down Expand Up @@ -10140,7 +10140,7 @@ interface WorkerEventMap extends AbstractWorkerEventMap, MessageEventTargetEvent
*
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Worker)
*/
interface Worker extends EventTarget, AbstractWorker, MessageEventTarget<Worker> {
interface Worker extends EventTarget, AbstractWorker, MessageEventTarget {
/**
* The **`postMessage()`** method of the Worker interface sends a message to the worker.
*
Expand Down Expand Up @@ -10997,39 +10997,39 @@ interface ReportingObserverCallback {
}

interface TransformerFlushCallback<O> {
(controller: TransformStreamDefaultController<O>): void | PromiseLike<void>;
(controller: TransformStreamDefaultController<O>): Promise<void>;
}

interface TransformerStartCallback<O> {
(controller: TransformStreamDefaultController<O>): any;
}

interface TransformerTransformCallback<I, O> {
(chunk: I, controller: TransformStreamDefaultController<O>): void | PromiseLike<void>;
(chunk: I, controller: TransformStreamDefaultController<O>): Promise<void>;
}

interface UnderlyingSinkAbortCallback {
(reason?: any): void | PromiseLike<void>;
(reason?: any): Promise<void>;
}

interface UnderlyingSinkCloseCallback {
(): void | PromiseLike<void>;
(): Promise<void>;
}

interface UnderlyingSinkStartCallback {
(controller: WritableStreamDefaultController): any;
}

interface UnderlyingSinkWriteCallback<W> {
(chunk: W, controller: WritableStreamDefaultController): void | PromiseLike<void>;
(chunk: W, controller: WritableStreamDefaultController): Promise<void>;
}

interface UnderlyingSourceCancelCallback {
(reason?: any): void | PromiseLike<void>;
(reason?: any): Promise<void>;
}

interface UnderlyingSourcePullCallback<R> {
(controller: ReadableStreamController<R>): void | PromiseLike<void>;
(controller: ReadableStreamController<R>): Promise<void>;
}

interface UnderlyingSourceStartCallback<R> {
Expand Down Expand Up @@ -11178,6 +11178,8 @@ type GLsizei = number;
type GLsizeiptr = number;
type GLuint = number;
type GLuint64 = number;
/** @deprecated */
type HTMLCollectionOf<T extends Element> = HTMLCollection<T>;
type HashAlgorithmIdentifier = AlgorithmIdentifier;
type HeadersInit = [string, string][] | Record<string, string> | Headers;
type IDBValidKey = number | string | Date | BufferSource | IDBValidKey[];
Expand Down
16 changes: 8 additions & 8 deletions baselines/ts5.5/audioworklet.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ interface MessagePortEventMap extends MessageEventTargetEventMap {
*
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/MessagePort)
*/
interface MessagePort extends EventTarget, MessageEventTarget<MessagePort> {
Copy link
Contributor

Choose a reason for hiding this comment

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

Any idea why this change happened?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Idk ... Maybe I broke the emitter with my changes. I will try to revert most of my change to the emitter

interface MessagePort extends EventTarget, MessageEventTarget {
/**
* The **`close()`** method of the MessagePort interface disconnects the port, so it is no longer active.
*
Expand Down Expand Up @@ -1880,39 +1880,39 @@ interface QueuingStrategySize<T = any> {
}

interface TransformerFlushCallback<O> {
(controller: TransformStreamDefaultController<O>): void | PromiseLike<void>;
(controller: TransformStreamDefaultController<O>): Promise<void>;
}

interface TransformerStartCallback<O> {
(controller: TransformStreamDefaultController<O>): any;
}

interface TransformerTransformCallback<I, O> {
(chunk: I, controller: TransformStreamDefaultController<O>): void | PromiseLike<void>;
(chunk: I, controller: TransformStreamDefaultController<O>): Promise<void>;
}

interface UnderlyingSinkAbortCallback {
(reason?: any): void | PromiseLike<void>;
(reason?: any): Promise<void>;
}

interface UnderlyingSinkCloseCallback {
(): void | PromiseLike<void>;
(): Promise<void>;
}

interface UnderlyingSinkStartCallback {
(controller: WritableStreamDefaultController): any;
}

interface UnderlyingSinkWriteCallback<W> {
(chunk: W, controller: WritableStreamDefaultController): void | PromiseLike<void>;
(chunk: W, controller: WritableStreamDefaultController): Promise<void>;
}

interface UnderlyingSourceCancelCallback {
(reason?: any): void | PromiseLike<void>;
(reason?: any): Promise<void>;
}

interface UnderlyingSourcePullCallback<R> {
(controller: ReadableStreamController<R>): void | PromiseLike<void>;
(controller: ReadableStreamController<R>): Promise<void>;
}

interface UnderlyingSourceStartCallback<R> {
Expand Down
Loading
Loading