Skip to content

Commit 3d73b7c

Browse files
committed
2 parents b326abd + 246360b commit 3d73b7c

File tree

7 files changed

+47
-40
lines changed

7 files changed

+47
-40
lines changed

baselines/dom.generated.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ interface InputEventInit extends UIEventInit {
905905
interface IntersectionObserverInit {
906906
root?: Element | Document | null;
907907
rootMargin?: string;
908+
scrollMargin?: string;
908909
threshold?: number | number[];
909910
}
910911

baselines/ts5.5/dom.generated.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ interface InputEventInit extends UIEventInit {
905905
interface IntersectionObserverInit {
906906
root?: Element | Document | null;
907907
rootMargin?: string;
908+
scrollMargin?: string;
908909
threshold?: number | number[];
909910
}
910911

baselines/ts5.6/dom.generated.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ interface InputEventInit extends UIEventInit {
905905
interface IntersectionObserverInit {
906906
root?: Element | Document | null;
907907
rootMargin?: string;
908+
scrollMargin?: string;
908909
threshold?: number | number[];
909910
}
910911

inputfiles/overridingTypes.jsonc

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
{
22
"mixins": {
33
"mixin": {
4-
"MessageEventTarget": {
5-
"typeParameters": [
6-
{
7-
"name": "T"
8-
}
9-
],
10-
"overrideThis": "T"
11-
},
124
"NavigatorGPU": {
135
"properties": {
146
"property": {
@@ -1294,26 +1286,15 @@
12941286
"[name: number]: HTMLOptionElement | HTMLOptGroupElement"
12951287
]
12961288
},
1297-
"HTMLDirectoryElement": {
1298-
"element": [
1299-
{
1300-
"name": "dir"
1301-
}
1302-
]
1303-
},
1304-
"HTMLFontElement": {
1305-
"element": [
1306-
{
1307-
"name": "font"
1308-
}
1309-
]
1310-
},
1311-
"HTMLFrameElement": {
1312-
"element": [
1313-
{
1314-
"name": "frame"
1289+
"HTMLDataListElement": {
1290+
"properties": {
1291+
"property": {
1292+
"options": {
1293+
"name": "options",
1294+
"overrideType": "HTMLCollectionOf<HTMLOptionElement>"
1295+
}
13151296
}
1316-
]
1297+
}
13171298
},
13181299
"FontFace": {
13191300
"properties": {
@@ -1324,12 +1305,29 @@
13241305
}
13251306
}
13261307
},
1327-
"HTMLFrameSetElement": {
1328-
"element": [
1329-
{
1330-
"name": "frameset"
1308+
"HTMLTableElement": {
1309+
"properties": {
1310+
"property": {
1311+
"rows": {
1312+
"name": "rows",
1313+
"overrideType": "HTMLCollectionOf<HTMLTableRowElement>"
1314+
},
1315+
"tBodies": {
1316+
"name": "tBodies",
1317+
"overrideType": "HTMLCollectionOf<HTMLTableSectionElement>"
1318+
}
13311319
}
1332-
]
1320+
}
1321+
},
1322+
"HTMLTableSectionElement": {
1323+
"properties": {
1324+
"property": {
1325+
"rows": {
1326+
"name": "rows",
1327+
"overrideType": "HTMLCollectionOf<HTMLTableRowElement>"
1328+
}
1329+
}
1330+
}
13331331
},
13341332
"Element": {
13351333
"methods": {
@@ -2219,13 +2217,6 @@
22192217
}
22202218
}
22212219
},
2222-
"HTMLMarqueeElement": {
2223-
"element": [
2224-
{
2225-
"name": "marquee"
2226-
}
2227-
]
2228-
},
22292220
"Worker": {
22302221
"methods": {
22312222
"method": {

inputfiles/patches/message.kdl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
interface-mixin MessageEventTarget overrideThis=T typeParameters=T

inputfiles/removedTypes.jsonc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@
425425
"members": {
426426
"member": {
427427
"delay": null, // Blink only as of 2024-07
428-
"scrollMargin": null, // Blink only as of 2024-07
429428
"trackVisibility": null // Blink only as of 2024-07
430429
}
431430
}

src/build/patches.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,17 @@ function handleTyped(type: Node): Typed {
5555
};
5656
}
5757

58+
function handleTypeParameters(value: Value) {
59+
if (!value) return {};
60+
return {
61+
typeParameters: [
62+
{
63+
name: string(value),
64+
},
65+
],
66+
};
67+
}
68+
5869
/**
5970
* Converts patch files in KDL to match the [types](types.d.ts).
6071
*/
@@ -171,6 +182,8 @@ function handleMixinandInterfaces(
171182
properties: { property },
172183
methods: { method },
173184
...optionalMember("extends", "string", node.properties?.extends),
185+
...optionalMember("overrideThis", "string", node.properties?.overrideThis),
186+
...handleTypeParameters(node.properties?.typeParameters),
174187
...interfaceObject,
175188
} as DeepPartial<Interface>;
176189
}

0 commit comments

Comments
 (0)