Skip to content

Commit 17c9bd3

Browse files
saschanazsaschanaz
committed
Merge remote-tracking branch 'upstream/master' into html-semantics
2 parents 8eb66fd + a2fe172 commit 17c9bd3

17 files changed

+411
-56
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The common steps to send a pull request are:
4545
1. Add missing elements to `inputfiles/addedTypes.json`, overriding elements to `inputfiles/overridingTypes.json`, or elements to remove to `inputfiles/removedTypes.json`.
4646
2. Run the build script locally to obtain new `dom.generated.d.ts` and `webworker.generated.d.ts`.
4747
3. Update the files in the `baselines` folder using the newly generated files
48-
under `generated` folder (`cp ./generated/* ./baselines/`).
48+
under `generated` folder (`npm run baseline-accept`).
4949

5050
### When should a DOM API be included here?
5151

‎baselines/dom.generated.d.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ interface MessageEventInit extends EventInit {
10061006
lastEventId?: string;
10071007
origin?: string;
10081008
ports?: MessagePort[];
1009-
source?: Window | null;
1009+
source?: MessageEventSource | null;
10101010
}
10111011

10121012
interface MouseEventInit extends EventModifierInit {
@@ -3393,10 +3393,8 @@ interface Console {
33933393
info(message?: any, ...optionalParams: any[]): void;
33943394
log(message?: any, ...optionalParams: any[]): void;
33953395
markTimeline(label?: string): void;
3396-
msIsIndependentlyComposed(element: Element): boolean;
33973396
profile(reportName?: string): void;
3398-
profileEnd(): void;
3399-
select(element: Element): void;
3397+
profileEnd(reportName?: string): void;
34003398
table(...tabularData: any[]): void;
34013399
time(label?: string): void;
34023400
timeEnd(label?: string): void;
@@ -4603,6 +4601,8 @@ interface Document extends Node, GlobalEventHandlers, ParentNode, DocumentEvent
46034601
* @param tagName The name of an element.
46044602
*/
46054603
createElement<K extends keyof HTMLElementTagNameMap>(tagName: K, options?: ElementCreationOptions): HTMLElementTagNameMap[K];
4604+
/** @deprecated */
4605+
createElement<K extends keyof HTMLElementDeprecatedTagNameMap>(tagName: K, options?: ElementCreationOptions): HTMLElementDeprecatedTagNameMap[K];
46064606
createElement(tagName: string, options?: ElementCreationOptions): HTMLElement;
46074607
createElementNS(namespaceURI: "http://www.w3.org/1999/xhtml", qualifiedName: string): HTMLElement;
46084608
createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement;
@@ -5173,7 +5173,6 @@ interface Event {
51735173
readonly eventPhase: number;
51745174
readonly isTrusted: boolean;
51755175
returnValue: boolean;
5176-
readonly srcElement: Element | null;
51775176
readonly target: EventTarget | null;
51785177
readonly timeStamp: number;
51795178
readonly type: string;
@@ -5772,6 +5771,7 @@ interface HTMLBodyElement extends HTMLElement, WindowEventHandlers {
57725771
link: string;
57735772
/** @deprecated */
57745773
noWrap: boolean;
5774+
/** @deprecated */
57755775
onorientationchange: ((this: HTMLBodyElement, ev: Event) => any) | null;
57765776
onresize: ((this: HTMLBodyElement, ev: UIEvent) => any) | null;
57775777
/** @deprecated */
@@ -6022,10 +6022,6 @@ interface HTMLDivElement extends HTMLElement {
60226022
*/
60236023
/** @deprecated */
60246024
align: string;
6025-
/**
6026-
* Sets or retrieves whether the browser automatically performs wordwrap.
6027-
*/
6028-
noWrap: boolean;
60296025
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDivElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
60306026
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
60316027
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDivElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7383,7 +7379,6 @@ declare var HTMLMediaElement: {
73837379
interface HTMLMenuElement extends HTMLElement {
73847380
/** @deprecated */
73857381
compact: boolean;
7386-
type: string;
73877382
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMenuElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
73887383
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
73897384
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMenuElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7466,6 +7461,7 @@ declare var HTMLModElement: {
74667461
interface HTMLOListElement extends HTMLElement {
74677462
/** @deprecated */
74687463
compact: boolean;
7464+
reversed: boolean;
74697465
/**
74707466
* The starting number.
74717467
*/
@@ -7730,7 +7726,6 @@ interface HTMLParagraphElement extends HTMLElement {
77307726
*/
77317727
/** @deprecated */
77327728
align: string;
7733-
clear: string;
77347729
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParagraphElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
77357730
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
77367731
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParagraphElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -9983,7 +9978,6 @@ interface MessageEvent extends Event {
99839978
readonly origin: string;
99849979
readonly ports: ReadonlyArray<MessagePort>;
99859980
readonly source: MessageEventSource;
9986-
initMessageEvent(type: string, bubbles: boolean, cancelable: boolean, data: any, origin: string, lastEventId: string, source: Window): void;
99879981
}
99889982

99899983
declare var MessageEvent: {
@@ -12025,6 +12019,7 @@ interface SVGElementEventMap extends ElementEventMap {
1202512019
}
1202612020

1202712021
interface SVGElement extends Element, ElementCSSInlineStyle {
12022+
/** @deprecated */
1202812023
readonly className: any;
1202912024
onclick: ((this: SVGElement, ev: MouseEvent) => any) | null;
1203012025
ondblclick: ((this: SVGElement, ev: MouseEvent) => any) | null;
@@ -16077,6 +16072,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
1607716072
onmspointerup: ((this: Window, ev: Event) => any) | null;
1607816073
onoffline: ((this: Window, ev: Event) => any) | null;
1607916074
ononline: ((this: Window, ev: Event) => any) | null;
16075+
/** @deprecated */
1608016076
onorientationchange: ((this: Window, ev: Event) => any) | null;
1608116077
onpagehide: ((this: Window, ev: PageTransitionEvent) => any) | null;
1608216078
onpageshow: ((this: Window, ev: PageTransitionEvent) => any) | null;
@@ -16111,6 +16107,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
1611116107
onvrdisplaypresentchange: ((this: Window, ev: Event) => any) | null;
1611216108
onwaiting: ((this: Window, ev: Event) => any) | null;
1611316109
opener: any;
16110+
/** @deprecated */
1611416111
readonly orientation: string | number;
1611516112
readonly outerHeight: number;
1611616113
readonly outerWidth: number;
@@ -16765,7 +16762,6 @@ interface HTMLElementTagNameMap {
1676516762
"legend": HTMLLegendElement;
1676616763
"li": HTMLLIElement;
1676716764
"link": HTMLLinkElement;
16768-
"listing": HTMLPreElement;
1676916765
"map": HTMLMapElement;
1677016766
"mark": HTMLElement;
1677116767
"marquee": HTMLMarqueeElement;
@@ -16823,6 +16819,10 @@ interface HTMLElementTagNameMap {
1682316819
"var": HTMLElement;
1682416820
"video": HTMLVideoElement;
1682516821
"wbr": HTMLElement;
16822+
}
16823+
16824+
interface HTMLElementDeprecatedTagNameMap {
16825+
"listing": HTMLPreElement;
1682616826
"xmp": HTMLPreElement;
1682716827
}
1682816828

@@ -16988,6 +16988,7 @@ declare var onmspointerover: ((this: Window, ev: Event) => any) | null;
1698816988
declare var onmspointerup: ((this: Window, ev: Event) => any) | null;
1698916989
declare var onoffline: ((this: Window, ev: Event) => any) | null;
1699016990
declare var ononline: ((this: Window, ev: Event) => any) | null;
16991+
/** @deprecated */
1699116992
declare var onorientationchange: ((this: Window, ev: Event) => any) | null;
1699216993
declare var onpagehide: ((this: Window, ev: PageTransitionEvent) => any) | null;
1699316994
declare var onpageshow: ((this: Window, ev: PageTransitionEvent) => any) | null;
@@ -17022,6 +17023,7 @@ declare var onvrdisplaypointerunrestricted: ((this: Window, ev: Event) => any) |
1702217023
declare var onvrdisplaypresentchange: ((this: Window, ev: Event) => any) | null;
1702317024
declare var onwaiting: ((this: Window, ev: Event) => any) | null;
1702417025
declare var opener: any;
17026+
/** @deprecated */
1702517027
declare var orientation: string | number;
1702617028
declare var outerHeight: number;
1702717029
declare var outerWidth: number;

‎baselines/webworker.generated.d.ts

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ interface MessageEventInit extends EventInit {
153153
lastEventId?: string;
154154
origin?: string;
155155
ports?: MessagePort[];
156-
source?: object | null;
156+
source?: MessageEventSource | null;
157157
}
158158

159159
interface NavigationPreloadState {
@@ -243,7 +243,7 @@ interface RequestInit {
243243
redirect?: RequestRedirect;
244244
referrer?: string;
245245
referrerPolicy?: ReferrerPolicy;
246-
signal?: object | null;
246+
signal?: AbortSignal | null;
247247
window?: any;
248248
}
249249

@@ -276,6 +276,24 @@ interface EventListener {
276276
(evt: Event): void;
277277
}
278278

279+
interface AbortSignalEventMap {
280+
"abort": ProgressEvent;
281+
}
282+
283+
interface AbortSignal extends EventTarget {
284+
readonly aborted: boolean;
285+
onabort: ((this: AbortSignal, ev: ProgressEvent) => any) | null;
286+
addEventListener<K extends keyof AbortSignalEventMap>(type: K, listener: (this: AbortSignal, ev: AbortSignalEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
287+
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
288+
removeEventListener<K extends keyof AbortSignalEventMap>(type: K, listener: (this: AbortSignal, ev: AbortSignalEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
289+
removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
290+
}
291+
292+
declare var AbortSignal: {
293+
prototype: AbortSignal;
294+
new(): AbortSignal;
295+
};
296+
279297
interface AbstractWorkerEventMap {
280298
"error": ErrorEvent;
281299
}
@@ -443,10 +461,8 @@ interface Console {
443461
info(message?: any, ...optionalParams: any[]): void;
444462
log(message?: any, ...optionalParams: any[]): void;
445463
markTimeline(label?: string): void;
446-
msIsIndependentlyComposed(element: object): boolean;
447464
profile(reportName?: string): void;
448-
profileEnd(): void;
449-
select(element: object): void;
465+
profileEnd(reportName?: string): void;
450466
table(...tabularData: any[]): void;
451467
time(label?: string): void;
452468
timeEnd(label?: string): void;
@@ -789,7 +805,6 @@ interface Event {
789805
readonly eventPhase: number;
790806
readonly isTrusted: boolean;
791807
returnValue: boolean;
792-
readonly srcElement: object | null;
793808
readonly target: EventTarget | null;
794809
readonly timeStamp: number;
795810
readonly type: string;
@@ -972,7 +987,7 @@ interface FormData {
972987

973988
declare var FormData: {
974989
prototype: FormData;
975-
new(form?: object): FormData;
990+
new(): FormData;
976991
};
977992

978993
interface GlobalFetch {
@@ -1526,7 +1541,6 @@ interface MessageEvent extends Event {
15261541
readonly origin: string;
15271542
readonly ports: ReadonlyArray<MessagePort>;
15281543
readonly source: MessageEventSource;
1529-
initMessageEvent(type: string, bubbles: boolean, cancelable: boolean, data: any, origin: string, lastEventId: string, source: object): void;
15301544
}
15311545

15321546
declare var MessageEvent: {
@@ -1948,7 +1962,7 @@ interface Request extends Body {
19481962
* Returns the signal associated with request, which is an AbortSignal object indicating whether or not request has been aborted, and its abort
19491963
* event handler.
19501964
*/
1951-
readonly signal: object;
1965+
readonly signal: AbortSignal;
19521966
/**
19531967
* Returns the URL of request as a string.
19541968
*/
@@ -2458,7 +2472,7 @@ interface XMLHttpRequest extends XMLHttpRequestEventTarget {
24582472
* Initiates the request. The optional argument provides the request body. The argument is ignored if request method is GET or HEAD.
24592473
* Throws an "InvalidStateError" DOMException if either state is not opened or the send() flag is set.
24602474
*/
2461-
send(body?: object | BodyInit | null): void;
2475+
send(body?: BodyInit | null): void;
24622476
/**
24632477
* Combines a header in author request headers.
24642478
* Throws an "InvalidStateError" DOMException if either state is not opened or the send() flag is set.
@@ -2582,7 +2596,7 @@ type BufferSource = ArrayBufferView | ArrayBuffer;
25822596
type DOMTimeStamp = number;
25832597
type FormDataEntryValue = File | string;
25842598
type IDBValidKey = number | string | Date | BufferSource | IDBArrayKey;
2585-
type MessageEventSource = object | MessagePort | ServiceWorker;
2599+
type MessageEventSource = MessagePort | ServiceWorker;
25862600
type BinaryType = "blob" | "arraybuffer";
25872601
type ClientTypes = "window" | "worker" | "sharedworker" | "all";
25882602
type IDBCursorDirection = "next" | "nextunique" | "prev" | "prevunique";

‎inputfiles/addedTypes.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,13 +2118,34 @@
21182118
}
21192119
]
21202120
},
2121+
"HTMLDivElement": {
2122+
"element": [
2123+
{
2124+
"name": "div"
2125+
}
2126+
]
2127+
},
2128+
"HTMLDListElement": {
2129+
"element": [
2130+
{
2131+
"name": "dl"
2132+
}
2133+
]
2134+
},
21212135
"HTMLHeadElement": {
21222136
"element": [
21232137
{
21242138
"name": "head"
21252139
}
21262140
]
21272141
},
2142+
"HTMLHRElement": {
2143+
"element": [
2144+
{
2145+
"name": "hr"
2146+
}
2147+
]
2148+
},
21282149
"HTMLHtmlElement": {
21292150
"element": [
21302151
{
@@ -2139,13 +2160,66 @@
21392160
}
21402161
]
21412162
},
2163+
"HTMLLIElement": {
2164+
"element": [
2165+
{
2166+
"name": "li"
2167+
}
2168+
]
2169+
},
2170+
"HTMLMenuElement": {
2171+
"element": [
2172+
{
2173+
"name": "menu"
2174+
}
2175+
]
2176+
},
21422177
"HTMLMetaElement": {
21432178
"element": [
21442179
{
21452180
"name": "meta"
21462181
}
21472182
]
21482183
},
2184+
"HTMLOListElement": {
2185+
"element": [
2186+
{
2187+
"name": "ol"
2188+
}
2189+
]
2190+
},
2191+
"HTMLParagraphElement": {
2192+
"element": [
2193+
{
2194+
"name": "p"
2195+
}
2196+
]
2197+
},
2198+
"HTMLPreElement": {
2199+
"element": [
2200+
{
2201+
"name": "pre"
2202+
},
2203+
{
2204+
"name": "listing",
2205+
"deprecated": true
2206+
},
2207+
{
2208+
"name": "xmp",
2209+
"deprecated": true
2210+
}
2211+
]
2212+
},
2213+
"HTMLQuoteElement": {
2214+
"element": [
2215+
{
2216+
"name": "blockquote"
2217+
},
2218+
{
2219+
"name": "q"
2220+
}
2221+
]
2222+
},
21492223
"HTMLStyleElement": {
21502224
"element": [
21512225
{
@@ -2190,6 +2264,13 @@
21902264
}
21912265
]
21922266
},
2267+
"HTMLUListElement": {
2268+
"element": [
2269+
{
2270+
"name": "ul"
2271+
}
2272+
]
2273+
},
21932274
"NodeSelector": {
21942275
"name": "NodeSelector",
21952276
"extends": "Object",
@@ -2266,6 +2347,10 @@
22662347
"name": "channel",
22672348
"override-type": "string",
22682349
"required": 0
2350+
},
2351+
"source": {
2352+
"name": "source",
2353+
"type": "MessageEventSource"
22692354
}
22702355
}
22712356
}

0 commit comments

Comments
 (0)