Skip to content

Commit dd663a8

Browse files
IllusionMHIllusionMH
authored
Fix duplicates after merge in addedTypes.json (#836)
* Fix duplicated interfaces * Update baselines after fix
1 parent af44ea1 commit dd663a8

File tree

2 files changed

+66
-84
lines changed

2 files changed

+66
-84
lines changed

‎baselines/dom.generated.d.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7552,7 +7552,7 @@ declare var HTMLMarqueeElement: {
75527552
};
75537553

75547554
interface HTMLMediaElementEventMap extends HTMLElementEventMap {
7555-
"encrypted": Event;
7555+
"encrypted": MediaEncryptedEvent;
75567556
"waitingforkey": Event;
75577557
}
75587558

@@ -7609,7 +7609,7 @@ interface HTMLMediaElement extends HTMLElement {
76097609
* Gets the current network activity for the element.
76107610
*/
76117611
readonly networkState: number;
7612-
onencrypted: ((this: HTMLMediaElement, ev: Event) => any) | null;
7612+
onencrypted: ((this: HTMLMediaElement, ev: MediaEncryptedEvent) => any) | null;
76137613
onwaitingforkey: ((this: HTMLMediaElement, ev: Event) => any) | null;
76147614
/**
76157615
* Gets a flag that specifies whether playback is paused.
@@ -19360,12 +19360,14 @@ interface HTMLElementTagNameMap {
1936019360
"area": HTMLAreaElement;
1936119361
"article": HTMLElement;
1936219362
"aside": HTMLElement;
19363+
"audio": HTMLAudioElement;
1936319364
"b": HTMLElement;
1936419365
"base": HTMLBaseElement;
1936519366
"basefont": HTMLBaseFontElement;
1936619367
"bdi": HTMLElement;
1936719368
"bdo": HTMLElement;
1936819369
"blockquote": HTMLQuoteElement;
19370+
"body": HTMLBodyElement;
1936919371
"br": HTMLBRElement;
1937019372
"button": HTMLButtonElement;
1937119373
"canvas": HTMLCanvasElement;
@@ -19395,6 +19397,12 @@ interface HTMLElementTagNameMap {
1939519397
"form": HTMLFormElement;
1939619398
"frame": HTMLFrameElement;
1939719399
"frameset": HTMLFrameSetElement;
19400+
"h1": HTMLHeadingElement;
19401+
"h2": HTMLHeadingElement;
19402+
"h3": HTMLHeadingElement;
19403+
"h4": HTMLHeadingElement;
19404+
"h5": HTMLHeadingElement;
19405+
"h6": HTMLHeadingElement;
1939819406
"head": HTMLHeadElement;
1939919407
"header": HTMLElement;
1940019408
"hgroup": HTMLElement;
@@ -19458,9 +19466,11 @@ interface HTMLElementTagNameMap {
1945819466
"time": HTMLTimeElement;
1945919467
"title": HTMLTitleElement;
1946019468
"tr": HTMLTableRowElement;
19469+
"track": HTMLTrackElement;
1946119470
"u": HTMLElement;
1946219471
"ul": HTMLUListElement;
1946319472
"var": HTMLElement;
19473+
"video": HTMLVideoElement;
1946419474
"wbr": HTMLElement;
1946519475
}
1946619476

‎inputfiles/addedTypes.json

Lines changed: 54 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,16 @@
416416
"type": "MediaEncryptedEvent"
417417
}
418418
]
419+
},
420+
"methods": {
421+
"method": {
422+
"cloneNode": {
423+
"name": "cloneNode",
424+
"override-signatures": [
425+
"cloneNode(deep?: boolean): HTMLMediaElement"
426+
]
427+
}
428+
}
419429
}
420430
},
421431
"CSSStyleDeclaration": {
@@ -1277,7 +1287,17 @@
12771287
{
12781288
"name": "audio"
12791289
}
1280-
]
1290+
],
1291+
"methods": {
1292+
"method": {
1293+
"cloneNode": {
1294+
"name": "cloneNode",
1295+
"override-signatures": [
1296+
"cloneNode(deep?: boolean): HTMLAudioElement"
1297+
]
1298+
}
1299+
}
1300+
}
12811301
},
12821302
"HTMLBaseElement": {
12831303
"element": [
@@ -1301,7 +1321,17 @@
13011321
{
13021322
"name": "body"
13031323
}
1304-
]
1324+
],
1325+
"methods": {
1326+
"method": {
1327+
"cloneNode": {
1328+
"name": "cloneNode",
1329+
"override-signatures": [
1330+
"cloneNode(deep?: boolean): HTMLBodyElement"
1331+
]
1332+
}
1333+
}
1334+
}
13051335
},
13061336
"HTMLBRElement": {
13071337
"element": [
@@ -1607,7 +1637,17 @@
16071637
{
16081638
"name": "h6"
16091639
}
1610-
]
1640+
],
1641+
"methods": {
1642+
"method": {
1643+
"cloneNode": {
1644+
"name": "cloneNode",
1645+
"override-signatures": [
1646+
"cloneNode(deep?: boolean): HTMLHeadingElement"
1647+
]
1648+
}
1649+
}
1650+
}
16111651
},
16121652
"HTMLHRElement": {
16131653
"element": [
@@ -2232,7 +2272,17 @@
22322272
{
22332273
"name": "track"
22342274
}
2235-
]
2275+
],
2276+
"methods": {
2277+
"method": {
2278+
"cloneNode": {
2279+
"name": "cloneNode",
2280+
"override-signatures": [
2281+
"cloneNode(deep?: boolean): HTMLTrackElement"
2282+
]
2283+
}
2284+
}
2285+
}
22362286
},
22372287
"HTMLUListElement": {
22382288
"element": [
@@ -3401,19 +3451,6 @@
34013451
}
34023452
}
34033453
},
3404-
"HTMLAudioElement": {
3405-
"name": "HTMLAudioElement",
3406-
"methods": {
3407-
"method": {
3408-
"cloneNode": {
3409-
"name": "cloneNode",
3410-
"override-signatures": [
3411-
"cloneNode(deep?: boolean): HTMLAudioElement"
3412-
]
3413-
}
3414-
}
3415-
}
3416-
},
34173454
"HTMLBaseFontElement": {
34183455
"name": "HTMLBaseFontElement",
34193456
"methods": {
@@ -3427,19 +3464,6 @@
34273464
}
34283465
}
34293466
},
3430-
"HTMLBodyElement": {
3431-
"name": "HTMLBodyElement",
3432-
"methods": {
3433-
"method": {
3434-
"cloneNode": {
3435-
"name": "cloneNode",
3436-
"override-signatures": [
3437-
"cloneNode(deep?: boolean): HTMLBodyElement"
3438-
]
3439-
}
3440-
}
3441-
}
3442-
},
34433467
"HTMLButtonElement": {
34443468
"name": "HTMLButtonElement",
34453469
"methods": {
@@ -3544,19 +3568,6 @@
35443568
}
35453569
}
35463570
},
3547-
"HTMLHeadingElement": {
3548-
"name": "HTMLHeadingElement",
3549-
"methods": {
3550-
"method": {
3551-
"cloneNode": {
3552-
"name": "cloneNode",
3553-
"override-signatures": [
3554-
"cloneNode(deep?: boolean): HTMLHeadingElement"
3555-
]
3556-
}
3557-
}
3558-
}
3559-
},
35603571
"HTMLLegendElement": {
35613572
"name": "HTMLLegendElement",
35623573
"methods": {
@@ -3583,19 +3594,6 @@
35833594
}
35843595
}
35853596
},
3586-
"HTMLMediaElement": {
3587-
"name": "HTMLMediaElement",
3588-
"methods": {
3589-
"method": {
3590-
"cloneNode": {
3591-
"name": "cloneNode",
3592-
"override-signatures": [
3593-
"cloneNode(deep?: boolean): HTMLMediaElement"
3594-
]
3595-
}
3596-
}
3597-
}
3598-
},
35993597
"HTMLMeterElement": {
36003598
"name": "HTMLMeterElement",
36013599
"methods": {
@@ -3674,19 +3672,6 @@
36743672
}
36753673
}
36763674
},
3677-
"HTMLTrackElement": {
3678-
"name": "HTMLTrackElement",
3679-
"methods": {
3680-
"method": {
3681-
"cloneNode": {
3682-
"name": "cloneNode",
3683-
"override-signatures": [
3684-
"cloneNode(deep?: boolean): HTMLTrackElement"
3685-
]
3686-
}
3687-
}
3688-
}
3689-
},
36903675
"HTMLUnknownElement": {
36913676
"name": "HTMLUnknownElement",
36923677
"methods": {
@@ -3700,19 +3685,6 @@
37003685
}
37013686
}
37023687
},
3703-
"HTMLVideoElement": {
3704-
"name": "HTMLVideoElement",
3705-
"methods": {
3706-
"method": {
3707-
"cloneNode": {
3708-
"name": "cloneNode",
3709-
"override-signatures": [
3710-
"cloneNode(deep?: boolean): HTMLVideoElement"
3711-
]
3712-
}
3713-
}
3714-
}
3715-
},
37163688
"ProcessingInstruction": {
37173689
"name": "ProcessingInstruction",
37183690
"methods": {

0 commit comments

Comments
 (0)