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.

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
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
88 changes: 41 additions & 47 deletions baselines/dom.generated.d.ts

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions baselines/dom.iterable.generated.d.ts
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 HTMLCollectionBase<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
2 changes: 2 additions & 0 deletions baselines/serviceworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11642,6 +11642,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
2 changes: 2 additions & 0 deletions baselines/sharedworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11331,6 +11331,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
88 changes: 41 additions & 47 deletions baselines/ts5.5/dom.generated.d.ts

Large diffs are not rendered by default.

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

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

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

interface HTMLFormElement {
[Symbol.iterator](): IterableIterator<Element>;
}
Expand Down
2 changes: 2 additions & 0 deletions baselines/ts5.5/serviceworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11642,6 +11642,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
2 changes: 2 additions & 0 deletions baselines/ts5.5/sharedworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11331,6 +11331,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
2 changes: 2 additions & 0 deletions baselines/ts5.5/webworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13299,6 +13299,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
88 changes: 41 additions & 47 deletions baselines/ts5.6/dom.generated.d.ts

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions baselines/ts5.6/dom.iterable.generated.d.ts
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 HTMLCollectionBase<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
2 changes: 2 additions & 0 deletions baselines/ts5.6/serviceworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11642,6 +11642,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
2 changes: 2 additions & 0 deletions baselines/ts5.6/sharedworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11331,6 +11331,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
2 changes: 2 additions & 0 deletions baselines/ts5.6/webworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13299,6 +13299,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
2 changes: 2 additions & 0 deletions baselines/webworker.generated.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13299,6 +13299,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
52 changes: 12 additions & 40 deletions inputfiles/addedTypes.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -250,45 +250,6 @@
]
}
},
"HTMLCollectionOf": {
"name": "HTMLCollectionOf",
"typeParameters": [
{
"name": "T",
"extends": "Element"
}
],
"exposed": "Window",
"extends": "HTMLCollection",
"methods": {
"method": {
"item": {
"getter": true,
"signature": [
{
"nullable": true,
"overrideType": "T",
"param": [
{
"name": "index",
"type": "unsigned long"
}
]
}
],
"specs": "html5",
"name": "item"
},
"namedItem": {
"name": "namedItem",
"overrideSignatures": [
"namedItem(name: string): T | null"
]
}
}
},
"noInterfaceObject": true
},
"Element": {
"name": "Element",
"methods": {
Expand All @@ -297,7 +258,7 @@
"name": "getElementsByClassName",
"signature": {
"0": {
"overrideType": "HTMLCollectionOf<Element>"
"overrideType": "HTMLCollection"
}
}
},
Expand Down Expand Up @@ -1173,6 +1134,17 @@
}
]
},
{
"name": "HTMLCollectionOf",
"deprecated": true,
"typeParameters": [
{
"name": "T",
"extends": "Element"
}
],
"overrideType": "HTMLCollection<T>"
},
{
"name": "ReadableStreamReadResult",
"typeParameters": [
Expand Down
1 change: 1 addition & 0 deletions inputfiles/knownTypes.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
"HkdfParams",
"HmacImportParams",
"HmacKeyGenParams",
"HTMLCollectionOf",
"ImageBitmapRenderingContextSettings",
"NamedCurve",
"Pbkdf2Params",
Expand Down
Loading
Loading