Skip to content

Fix duplicates after merge in addedTypes.json #836

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

Merged
merged 2 commits into from
Mar 17, 2020
Merged

Fix duplicates after merge in addedTypes.json #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43e980c
Fix duplicated interfaces
IllusionMH Mar 17, 2020
76e78d9
Update baselines after fix
IllusionMH Mar 17, 2020
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
14 changes: 12 additions & 2 deletions baselines/dom.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7552,7 +7552,7 @@ declare var HTMLMarqueeElement: {
};

interface HTMLMediaElementEventMap extends HTMLElementEventMap {
"encrypted": Event;
"encrypted": MediaEncryptedEvent;
"waitingforkey": Event;
}

Expand Down Expand Up @@ -7609,7 +7609,7 @@ interface HTMLMediaElement extends HTMLElement {
* Gets the current network activity for the element.
*/
readonly networkState: number;
onencrypted: ((this: HTMLMediaElement, ev: Event) => any) | null;
onencrypted: ((this: HTMLMediaElement, ev: MediaEncryptedEvent) => any) | null;
onwaitingforkey: ((this: HTMLMediaElement, ev: Event) => any) | null;
/**
* Gets a flag that specifies whether playback is paused.
Expand Down Expand Up @@ -19360,12 +19360,14 @@ interface HTMLElementTagNameMap {
"area": HTMLAreaElement;
"article": HTMLElement;
"aside": HTMLElement;
"audio": HTMLAudioElement;
"b": HTMLElement;
"base": HTMLBaseElement;
"basefont": HTMLBaseFontElement;
"bdi": HTMLElement;
"bdo": HTMLElement;
"blockquote": HTMLQuoteElement;
"body": HTMLBodyElement;
"br": HTMLBRElement;
"button": HTMLButtonElement;
"canvas": HTMLCanvasElement;
Expand Down Expand Up @@ -19395,6 +19397,12 @@ interface HTMLElementTagNameMap {
"form": HTMLFormElement;
"frame": HTMLFrameElement;
"frameset": HTMLFrameSetElement;
"h1": HTMLHeadingElement;
"h2": HTMLHeadingElement;
"h3": HTMLHeadingElement;
"h4": HTMLHeadingElement;
"h5": HTMLHeadingElement;
"h6": HTMLHeadingElement;
"head": HTMLHeadElement;
"header": HTMLElement;
"hgroup": HTMLElement;
Expand Down Expand Up @@ -19458,9 +19466,11 @@ interface HTMLElementTagNameMap {
"time": HTMLTimeElement;
"title": HTMLTitleElement;
"tr": HTMLTableRowElement;
"track": HTMLTrackElement;
"u": HTMLElement;
"ul": HTMLUListElement;
"var": HTMLElement;
"video": HTMLVideoElement;
"wbr": HTMLElement;
}

Expand Down
136 changes: 54 additions & 82 deletions inputfiles/addedTypes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,16 @@
"type": "MediaEncryptedEvent"
}
]
},
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLMediaElement"
]
}
}
}
},
"CSSStyleDeclaration": {
Expand Down Expand Up @@ -1277,7 +1287,17 @@
{
"name": "audio"
}
]
],
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLAudioElement"
]
}
}
}
},
"HTMLBaseElement": {
"element": [
Expand All @@ -1301,7 +1321,17 @@
{
"name": "body"
}
]
],
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLBodyElement"
]
}
}
}
},
"HTMLBRElement": {
"element": [
Expand Down Expand Up @@ -1607,7 +1637,17 @@
{
"name": "h6"
}
]
],
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLHeadingElement"
]
}
}
}
},
"HTMLHRElement": {
"element": [
Expand Down Expand Up @@ -2232,7 +2272,17 @@
{
"name": "track"
}
]
],
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLTrackElement"
]
}
}
}
},
"HTMLUListElement": {
"element": [
Expand Down Expand Up @@ -3401,19 +3451,6 @@
}
}
},
"HTMLAudioElement": {
"name": "HTMLAudioElement",
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLAudioElement"
]
}
}
}
},
"HTMLBaseFontElement": {
"name": "HTMLBaseFontElement",
"methods": {
Expand All @@ -3427,19 +3464,6 @@
}
}
},
"HTMLBodyElement": {
"name": "HTMLBodyElement",
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLBodyElement"
]
}
}
}
},
"HTMLButtonElement": {
"name": "HTMLButtonElement",
"methods": {
Expand Down Expand Up @@ -3544,19 +3568,6 @@
}
}
},
"HTMLHeadingElement": {
"name": "HTMLHeadingElement",
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLHeadingElement"
]
}
}
}
},
"HTMLLegendElement": {
"name": "HTMLLegendElement",
"methods": {
Expand All @@ -3583,19 +3594,6 @@
}
}
},
"HTMLMediaElement": {
"name": "HTMLMediaElement",
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLMediaElement"
]
}
}
}
},
"HTMLMeterElement": {
"name": "HTMLMeterElement",
"methods": {
Expand Down Expand Up @@ -3674,19 +3672,6 @@
}
}
},
"HTMLTrackElement": {
"name": "HTMLTrackElement",
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLTrackElement"
]
}
}
}
},
"HTMLUnknownElement": {
"name": "HTMLUnknownElement",
"methods": {
Expand All @@ -3700,19 +3685,6 @@
}
}
},
"HTMLVideoElement": {
Copy link
Member

Choose a reason for hiding this comment

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

I don't see an existing entry where this HTMLVideoElement method is added. Was that an incorrect artifact of the merge too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was confused at first, but looks like you've added it by hand after problematic merge.
#811 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here it is in file https://github.com/microsoft/TSJS-lib-generator/blob/af44ea1019180f60aced843d65a1fd048adb5735/inputfiles/addedTypes.json#L2265

"name": "HTMLVideoElement",
"methods": {
"method": {
"cloneNode": {
"name": "cloneNode",
"override-signatures": [
"cloneNode(deep?: boolean): HTMLVideoElement"
]
}
}
}
},
"ProcessingInstruction": {
"name": "ProcessingInstruction",
"methods": {
Expand Down