From 720ea39c79ab35045bf1d769d99fa17ccab77485 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Fri, 27 Sep 2019 15:40:39 +0900
Subject: [PATCH] General type updates

---
 baselines/dom.generated.d.ts                  |  62 ++++-----
 baselines/webworker.generated.d.ts            |  20 ++-
 inputfiles/addedTypes.json                    |   4 +
 inputfiles/comments.json                      |  15 ---
 inputfiles/idl/Compatibility.widl             |   4 +-
 inputfiles/idl/DOM.commentmap.json            |   3 +-
 inputfiles/idl/DOM.widl                       | 120 ++++++++++++++----
 inputfiles/idl/File.widl                      |  34 ++---
 inputfiles/idl/HTML - DOM.widl                |  22 +++-
 .../HTML - Form control infrastructure.widl   |  10 ++
 inputfiles/idl/HTML - Form elements.widl      |  53 ++++----
 inputfiles/idl/HTML - The input element.widl  |   6 +-
 .../idl/HTML - Web application APIs.widl      |  17 ++-
 inputfiles/idl/High Resolution Time.widl      |   2 +-
 inputfiles/idl/Push.widl                      |  34 ++---
 inputfiles/idl/Service Workers.widl           |  29 +++--
 inputfiles/idl/Web Audio.widl                 |  42 +++---
 inputfiles/idlSources.json                    |   4 -
 inputfiles/removedTypes.json                  |  31 ++++-
 src/emitter.ts                                |   1 -
 src/widlprocess.ts                            |  23 +++-
 21 files changed, 332 insertions(+), 204 deletions(-)

diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
index cc5537b24..0afc86b8f 100644
--- a/baselines/dom.generated.d.ts
+++ b/baselines/dom.generated.d.ts
@@ -1674,6 +1674,13 @@ interface ShadowRootInit {
     mode: ShadowRootMode;
 }
 
+interface StaticRangeInit {
+    endContainer: Node;
+    endOffset: number;
+    startContainer: Node;
+    startOffset: number;
+}
+
 interface StereoPannerOptions extends AudioNodeOptions {
     pan?: number;
 }
@@ -2140,8 +2147,8 @@ interface AudioBuffer {
     readonly length: number;
     readonly numberOfChannels: number;
     readonly sampleRate: number;
-    copyFromChannel(destination: Float32Array, channelNumber: number, startInChannel?: number): void;
-    copyToChannel(source: Float32Array, channelNumber: number, startInChannel?: number): void;
+    copyFromChannel(destination: Float32Array, channelNumber: number, bufferOffset?: number): void;
+    copyToChannel(source: Float32Array, channelNumber: number, bufferOffset?: number): void;
     getChannelData(channel: number): Float32Array;
 }
 
@@ -2509,7 +2516,10 @@ declare var BiquadFilterNode: {
 interface Blob {
     readonly size: number;
     readonly type: string;
+    arrayBuffer(): Promise<ArrayBuffer>;
     slice(start?: number, end?: number, contentType?: string): Blob;
+    stream(): ReadableStream;
+    text(): Promise<string>;
 }
 
 declare var Blob: {
@@ -3150,7 +3160,8 @@ interface CSSStyleDeclaration {
     webkitBoxFlex: string;
     /** @deprecated */
     webkitBoxOrdinalGroup: string;
-    webkitBoxOrient: string | null;
+    /** @deprecated */
+    webkitBoxOrient: string;
     /** @deprecated */
     webkitBoxPack: string;
     /** @deprecated */
@@ -3817,7 +3828,7 @@ declare var CryptoKeyPair: {
 };
 
 interface CustomElementRegistry {
-    define(name: string, constructor: Function, options?: ElementDefinitionOptions): void;
+    define(name: string, constructor: CustomElementConstructor, options?: ElementDefinitionOptions): void;
     get(name: string): any;
     upgrade(root: Node): void;
     whenDefined(name: string): Promise<void>;
@@ -4504,10 +4515,6 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
      * Sets or gets the URL for the current document.
      */
     readonly URL: string;
-    /**
-     * Gets the object that has the focus when the parent document has focus.
-     */
-    readonly activeElement: Element | null;
     /**
      * Sets or gets the color of all active links in the document.
      */
@@ -5508,7 +5515,7 @@ interface EventTarget {
      * 
      * When set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.
      * 
-     * When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in §2.8 Observing event listeners.
+     * When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in § 2.8 Observing event listeners.
      * 
      * When set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.
      * 
@@ -5813,7 +5820,6 @@ interface GlobalEventHandlersEventMap {
     "load": Event;
     "loadeddata": Event;
     "loadedmetadata": Event;
-    "loadend": ProgressEvent;
     "loadstart": Event;
     "lostpointercapture": PointerEvent;
     "mousedown": MouseEvent;
@@ -5998,7 +6004,6 @@ interface GlobalEventHandlers {
      * @param ev The event.
      */
     onloadedmetadata: ((this: GlobalEventHandlers, ev: Event) => any) | null;
-    onloadend: ((this: GlobalEventHandlers, ev: ProgressEvent) => any) | null;
     /**
      * Occurs when Internet Explorer begins looking for media data.
      * @param ev The event.
@@ -6420,10 +6425,6 @@ declare var HTMLBodyElement: {
 
 /** Provides properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <button> elements. */
 interface HTMLButtonElement extends HTMLElement {
-    /**
-     * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
-     */
-    autofocus: boolean;
     disabled: boolean;
     /**
      * Retrieves a reference to the form that the object is embedded in.
@@ -7270,10 +7271,6 @@ interface HTMLInputElement extends HTMLElement {
      * Specifies whether autocomplete is applied to an editable text field.
      */
     autocomplete: string;
-    /**
-     * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
-     */
-    autofocus: boolean;
     /**
      * Sets or retrieves the state of the check box or radio button.
      */
@@ -8159,6 +8156,7 @@ declare var HTMLOptionsCollection: {
 };
 
 interface HTMLOrSVGElement {
+    autofocus: boolean;
     readonly dataset: DOMStringMap;
     nonce?: string;
     tabIndex: number;
@@ -8367,10 +8365,6 @@ declare var HTMLScriptElement: {
 /** A <select> HTML Element. These elements also share all of the properties and methods of other HTML elements via the HTMLElement interface. */
 interface HTMLSelectElement extends HTMLElement {
     autocomplete: string;
-    /**
-     * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
-     */
-    autofocus: boolean;
     disabled: boolean;
     /**
      * Retrieves a reference to the form that the object is embedded in.
@@ -8907,10 +8901,6 @@ declare var HTMLTemplateElement: {
 /** Provides special properties and methods for manipulating the layout and presentation of <textarea> elements. */
 interface HTMLTextAreaElement extends HTMLElement {
     autocomplete: string;
-    /**
-     * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
-     */
-    autofocus: boolean;
     /**
      * Sets or retrieves the width of the object.
      */
@@ -15455,7 +15445,7 @@ interface StaticRange extends AbstractRange {
 
 declare var StaticRange: {
     prototype: StaticRange;
-    new(): StaticRange;
+    new(init: StaticRangeInit): StaticRange;
 };
 
 /** The pan property takes a unitless value between -1 (full left pan) and 1 (full right pan). This interface was introduced as a much simpler way to apply a simple panning effect than having to use a full PannerNode. */
@@ -18536,7 +18526,7 @@ interface WindowEventMap extends GlobalEventHandlersEventMap, WindowEventHandler
 }
 
 /** A window containing a DOM document; the document property points to the DOM document loaded in that window. */
-interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandlers, IDBEnvironment, WindowBase64, WindowConsole, WindowEventHandlers, WindowLocalStorage, WindowOrWorkerGlobalScope, WindowSessionStorage, WindowTimers {
+interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandlers, IDBEnvironment, WindowBase64, WindowConsole, WindowEventHandlers, WindowLocalStorage, WindowOrWorkerGlobalScope, WindowSessionStorage {
     readonly applicationCache: ApplicationCache;
     readonly caches: CacheStorage;
     readonly clientInformation: Navigator;
@@ -18738,7 +18728,7 @@ interface WindowOrWorkerGlobalScope {
     createImageBitmap(image: ImageBitmapSource): Promise<ImageBitmap>;
     createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number): Promise<ImageBitmap>;
     fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
-    queueMicrotask(callback: Function): void;
+    queueMicrotask(callback: VoidFunction): void;
     setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
     setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
 }
@@ -18747,9 +18737,6 @@ interface WindowSessionStorage {
     readonly sessionStorage: Storage;
 }
 
-interface WindowTimers {
-}
-
 interface WorkerEventMap extends AbstractWorkerEventMap {
     "message": MessageEvent;
 }
@@ -19211,6 +19198,10 @@ interface BlobCallback {
     (blob: Blob | null): void;
 }
 
+interface CustomElementConstructor {
+    (): any;
+}
+
 interface DecodeErrorCallback {
     (error: DOMException): void;
 }
@@ -19797,7 +19788,6 @@ declare var onloadeddata: ((this: Window, ev: Event) => any) | null;
  * @param ev The event.
  */
 declare var onloadedmetadata: ((this: Window, ev: Event) => any) | null;
-declare var onloadend: ((this: Window, ev: ProgressEvent) => any) | null;
 /**
  * Occurs when Internet Explorer begins looking for media data.
  * @param ev The event.
@@ -19946,7 +19936,7 @@ declare function clearTimeout(handle?: number): void;
 declare function createImageBitmap(image: ImageBitmapSource): Promise<ImageBitmap>;
 declare function createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number): Promise<ImageBitmap>;
 declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
-declare function queueMicrotask(callback: Function): void;
+declare function queueMicrotask(callback: VoidFunction): void;
 declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
 declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
 declare var sessionStorage: Storage;
@@ -20151,7 +20141,7 @@ type ScrollLogicalPosition = "start" | "center" | "end" | "nearest";
 type ScrollRestoration = "auto" | "manual";
 type ScrollSetting = "" | "up";
 type SelectionMode = "select" | "start" | "end" | "preserve";
-type ServiceWorkerState = "installing" | "installed" | "activating" | "activated" | "redundant";
+type ServiceWorkerState = "parsed" | "installing" | "installed" | "activating" | "activated" | "redundant";
 type ServiceWorkerUpdateViaCache = "imports" | "all" | "none";
 type ShadowRootMode = "open" | "closed";
 type SpeechRecognitionErrorCode = "no-speech" | "aborted" | "audio-capture" | "network" | "not-allowed" | "service-not-allowed" | "bad-grammar" | "language-not-supported";
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
index 111b94ad0..ac3782145 100644
--- a/baselines/webworker.generated.d.ts
+++ b/baselines/webworker.generated.d.ts
@@ -350,7 +350,7 @@ interface PushPermissionDescriptor extends PermissionDescriptor {
     userVisibleOnly?: boolean;
 }
 
-interface PushSubscriptionChangeInit extends ExtendableEventInit {
+interface PushSubscriptionChangeEventInit extends ExtendableEventInit {
     newSubscription?: PushSubscription;
     oldSubscription?: PushSubscription;
 }
@@ -632,7 +632,10 @@ interface AnimationFrameProvider {
 interface Blob {
     readonly size: number;
     readonly type: string;
+    arrayBuffer(): Promise<ArrayBuffer>;
     slice(start?: number, end?: number, contentType?: string): Blob;
+    stream(): ReadableStream;
+    text(): Promise<string>;
 }
 
 declare var Blob: {
@@ -1465,7 +1468,7 @@ interface EventTarget {
      * 
      * When set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.
      * 
-     * When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in §2.8 Observing event listeners.
+     * When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in § 2.8 Observing event listeners.
      * 
      * When set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.
      * 
@@ -2705,7 +2708,7 @@ interface PushSubscriptionChangeEvent extends ExtendableEvent {
 
 declare var PushSubscriptionChangeEvent: {
     prototype: PushSubscriptionChangeEvent;
-    new(type: string, eventInitDict?: PushSubscriptionChangeInit): PushSubscriptionChangeEvent;
+    new(type: string, eventInitDict?: PushSubscriptionChangeEventInit): PushSubscriptionChangeEvent;
 };
 
 interface PushSubscriptionOptions {
@@ -2948,6 +2951,7 @@ interface ServiceWorkerGlobalScope extends WorkerGlobalScope {
     onpushsubscriptionchange: ((this: ServiceWorkerGlobalScope, ev: PushSubscriptionChangeEvent) => any) | null;
     onsync: ((this: ServiceWorkerGlobalScope, ev: SyncEvent) => any) | null;
     readonly registration: ServiceWorkerRegistration;
+    readonly serviceWorker: ServiceWorker;
     skipWaiting(): Promise<void>;
     addEventListener<K extends keyof ServiceWorkerGlobalScopeEventMap>(type: K, listener: (this: ServiceWorkerGlobalScope, ev: ServiceWorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -5336,7 +5340,7 @@ interface WindowOrWorkerGlobalScope {
     createImageBitmap(image: ImageBitmapSource): Promise<ImageBitmap>;
     createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number): Promise<ImageBitmap>;
     fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
-    queueMicrotask(callback: Function): void;
+    queueMicrotask(callback: VoidFunction): void;
     setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
     setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
 }
@@ -5741,6 +5745,10 @@ interface TransformStreamDefaultControllerTransformCallback<I, O> {
     (chunk: I, controller: TransformStreamDefaultController<O>): void | PromiseLike<void>;
 }
 
+interface VoidFunction {
+    (): void;
+}
+
 interface WritableStreamDefaultControllerCloseCallback {
     (): void | PromiseLike<void>;
 }
@@ -5795,7 +5803,7 @@ declare function clearTimeout(handle?: number): void;
 declare function createImageBitmap(image: ImageBitmapSource): Promise<ImageBitmap>;
 declare function createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number): Promise<ImageBitmap>;
 declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
-declare function queueMicrotask(callback: Function): void;
+declare function queueMicrotask(callback: VoidFunction): void;
 declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
 declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
 declare function cancelAnimationFrame(handle: number): void;
@@ -5874,7 +5882,7 @@ type RequestDestination = "" | "audio" | "audioworklet" | "document" | "embed" |
 type RequestMode = "navigate" | "same-origin" | "no-cors" | "cors";
 type RequestRedirect = "follow" | "error" | "manual";
 type ResponseType = "basic" | "cors" | "default" | "error" | "opaque" | "opaqueredirect";
-type ServiceWorkerState = "installing" | "installed" | "activating" | "activated" | "redundant";
+type ServiceWorkerState = "parsed" | "installing" | "installed" | "activating" | "activated" | "redundant";
 type ServiceWorkerUpdateViaCache = "imports" | "all" | "none";
 type VisibilityState = "hidden" | "visible";
 type WebGLPowerPreference = "default" | "low-power" | "high-performance";
diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json
index a6ce1c001..f60268980 100644
--- a/inputfiles/addedTypes.json
+++ b/inputfiles/addedTypes.json
@@ -489,6 +489,10 @@
                         "userSelect": {
                             "name": "userSelect",
                             "type": "CSSOMString"
+                        },
+                        "webkitAppearance": {
+                            "nullable": 0,
+                            "deprecated": 1
                         }
                     }
                 }
diff --git a/inputfiles/comments.json b/inputfiles/comments.json
index d4c94897c..66bb54294 100644
--- a/inputfiles/comments.json
+++ b/inputfiles/comments.json
@@ -370,9 +370,6 @@
                         "validationMessage": {
                             "comment": "/**\n * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as \"this is a required field\". The result is that the user sees validation messages without actually submitting.\n */"
                         },
-                        "autofocus": {
-                            "comment": "/**\n * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.\n */"
-                        },
                         "validity": {
                             "comment": "/**\n * Returns a  ValidityState object that represents the validity states of an element.\n */"
                         },
@@ -630,9 +627,6 @@
                         "formAction": {
                             "comment": "/**\n * Overrides the action attribute (where the data on a form is sent) on the parent form element.\n */"
                         },
-                        "autofocus": {
-                            "comment": "/**\n * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.\n */"
-                        },
                         "validity": {
                             "comment": "/**\n * Returns a  ValidityState object that represents the validity states of an element.\n */"
                         },
@@ -709,9 +703,6 @@
                         "inputEncoding": {
                             "comment": "/**\n * Returns the character encoding used to create the webpage that is loaded into the document object.\n */"
                         },
-                        "activeElement": {
-                            "comment": "/**\n * Gets the object that has the focus when the parent document has focus.\n */"
-                        },
                         "links": {
                             "comment": "/**\n * Retrieves a collection of all a objects that specify the href property and all area objects in the document.\n */"
                         },
@@ -1141,9 +1132,6 @@
                         "step": {
                             "comment": "/**\n * Defines an increment or jump between values that you want to allow the user to enter. When used with the max and min attributes, lets you control the range and increment (for example, allow only even numbers) that the user can enter into an input field.\n */"
                         },
-                        "autofocus": {
-                            "comment": "/**\n * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.\n */"
-                        },
                         "required": {
                             "comment": "/**\n * When present, marks an element that can't be submitted without a value.\n */"
                         },
@@ -1401,9 +1389,6 @@
                         "validationMessage": {
                             "comment": "/**\n * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as \"this is a required field\". The result is that the user sees validation messages without actually submitting.\n */"
                         },
-                        "autofocus": {
-                            "comment": "/**\n * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.\n */"
-                        },
                         "validity": {
                             "comment": "/**\n * Returns a  ValidityState object that represents the validity states of an element.\n */"
                         },
diff --git a/inputfiles/idl/Compatibility.widl b/inputfiles/idl/Compatibility.widl
index a505a86ec..b16ea6355 100644
--- a/inputfiles/idl/Compatibility.widl
+++ b/inputfiles/idl/Compatibility.widl
@@ -65,10 +65,10 @@ partial interface CSSStyleDeclaration {
   [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitTransitionTimingFunction;
   [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitTransition;
   [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitTextSizeAdjust;
-  [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitAppearance;
+  [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitBoxAlign;
   [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitBoxFlex;
   [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitBoxOrdinalGroup;
-  [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitBoxAlign;
+  [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitBoxOrient;
   [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitBoxPack;
   [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitBackgroundClip;
   [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString webkitTextFillColor;
diff --git a/inputfiles/idl/DOM.commentmap.json b/inputfiles/idl/DOM.commentmap.json
index c0916871f..1428907b2 100644
--- a/inputfiles/idl/DOM.commentmap.json
+++ b/inputfiles/idl/DOM.commentmap.json
@@ -17,7 +17,7 @@
     "customevent-customevent": "Works analogously to the constructor for Event except that the eventInitDict argument now allows for setting the detail attribute too.",
     "customevent-detail": "Returns any custom data event was created with. Typically used for synthetic events.",
     "eventtarget-eventtarget": "Creates a new EventTarget object, which can be used by developers to dispatch and listen for events.",
-    "eventtarget-addeventlistener": "Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.\n\nThe options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.\n\nWhen set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.\n\nWhen set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in §2.8 Observing event listeners.\n\nWhen set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.\n\nThe event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.",
+    "eventtarget-addeventlistener": "Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.\n\nThe options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.\n\nWhen set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.\n\nWhen set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in § 2.8 Observing event listeners.\n\nWhen set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.\n\nThe event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.",
     "eventtarget-removeeventlistener": "Removes the event listener in target's event listener list with the same type, callback, and options.",
     "eventtarget-dispatchevent": "Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.",
     "abortcontroller-abortcontroller": "Returns a new controller whose signal is set to a newly created AbortSignal object.",
@@ -131,6 +131,7 @@
     "abstractrange-endcontainer": "Returns range's end node.",
     "abstractrange-endoffset": "Returns range's end offset.",
     "abstractrange-collapsed": "Returns true if range is collapsed, and false otherwise.",
+    "staticrange-staticrange": "Returns a new range object that does not update when the node tree mutates.",
     "range-range": "Returns a new live range.",
     "range-commonancestorcontainer": "Returns the node, furthest away from the document, that is an ancestor of both range's start node and end node.",
     "range-comparepoint": "Returns −1 if the point is before the range, 0 if the point is in the range, and 1 if the point is after the range.",
diff --git a/inputfiles/idl/DOM.widl b/inputfiles/idl/DOM.widl
index 3a17f915c..b64fc5f18 100644
--- a/inputfiles/idl/DOM.widl
+++ b/inputfiles/idl/DOM.widl
@@ -1,6 +1,7 @@
-[Constructor(DOMString type, optional EventInit eventInitDict),
- Exposed=(Window,Worker,AudioWorklet)]
+[Exposed=(Window,Worker,AudioWorklet)]
 interface Event {
+  constructor(DOMString type, optional EventInit eventInitDict = {});
+
   readonly attribute DOMString type;
   readonly attribute EventTarget? target;
   readonly attribute EventTarget? srcElement; // historical
@@ -40,9 +41,10 @@ partial interface Window {
   [Replaceable] readonly attribute any event; // historical
 };
 
-[Constructor(DOMString type, optional CustomEventInit eventInitDict),
- Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface CustomEvent : Event {
+  constructor(DOMString type, optional CustomEventInit eventInitDict = {});
+
   readonly attribute any detail;
 
   void initCustomEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional any detail = null);
@@ -52,11 +54,12 @@ dictionary CustomEventInit : EventInit {
   any detail = null;
 };
 
-[Constructor,
- Exposed=(Window,Worker,AudioWorklet)]
+[Exposed=(Window,Worker,AudioWorklet)]
 interface EventTarget {
-  void addEventListener(DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options);
-  void removeEventListener(DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options);
+  constructor();
+
+  void addEventListener(DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options = {});
+  void removeEventListener(DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options = {});
   boolean dispatchEvent(Event event);
 };
 
@@ -73,9 +76,10 @@ dictionary AddEventListenerOptions : EventListenerOptions {
   boolean once = false;
 };
 
-[Constructor,
- Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface AbortController {
+  constructor();
+
   [SameObject] readonly attribute AbortSignal signal;
 
   void abort();
@@ -152,10 +156,11 @@ interface HTMLCollection {
   getter Element? namedItem(DOMString name);
 };
 
-[Constructor(MutationCallback callback),
- Exposed=Window]
+[Exposed=Window]
 interface MutationObserver {
-  void observe(Node target, optional MutationObserverInit options);
+  constructor(MutationCallback callback);
+
+  void observe(Node target, optional MutationObserverInit options = {});
   void disconnect();
   sequence<MutationRecord> takeRecords();
 };
@@ -206,7 +211,7 @@ interface Node : EventTarget {
 
   readonly attribute boolean isConnected;
   readonly attribute Document? ownerDocument;
-  Node getRootNode(optional GetRootNodeOptions options);
+  Node getRootNode(optional GetRootNodeOptions options = {});
   readonly attribute Node? parentNode;
   readonly attribute Element? parentElement;
   boolean hasChildNodes();
@@ -247,9 +252,10 @@ dictionary GetRootNodeOptions {
   boolean composed = false;
 };
 
-[Constructor,
- Exposed=Window]
+[Exposed=Window]
 interface Document : Node {
+  constructor();
+
   [SameObject] readonly attribute DOMImplementation implementation;
   readonly attribute USVString URL;
   readonly attribute USVString documentURI;
@@ -266,8 +272,8 @@ interface Document : Node {
   HTMLCollection getElementsByTagNameNS(DOMString? namespace, DOMString localName);
   HTMLCollection getElementsByClassName(DOMString classNames);
 
-  [CEReactions, NewObject] Element createElement(DOMString localName, optional (DOMString or ElementCreationOptions) options);
-  [CEReactions, NewObject] Element createElementNS(DOMString? namespace, DOMString qualifiedName, optional (DOMString or ElementCreationOptions) options);
+  [CEReactions, NewObject] Element createElement(DOMString localName, optional (DOMString or ElementCreationOptions) options = {});
+  [CEReactions, NewObject] Element createElementNS(DOMString? namespace, DOMString qualifiedName, optional (DOMString or ElementCreationOptions) options = {});
   [NewObject] DocumentFragment createDocumentFragment();
   [NewObject] Text createTextNode(DOMString data);
   [NewObject] CDATASection createCDATASection(DOMString data);
@@ -312,15 +318,16 @@ interface DocumentType : Node {
   readonly attribute DOMString systemId;
 };
 
-[Constructor,
- Exposed=Window]
+[Exposed=Window]
 interface DocumentFragment : Node {
+  constructor();
 };
 
 [Exposed=Window]
 interface ShadowRoot : DocumentFragment {
   readonly attribute ShadowRootMode mode;
   readonly attribute Element host;
+  attribute EventHandler onslotchange;
 };
 
 enum ShadowRootMode { "open", "closed" };
@@ -373,6 +380,7 @@ interface Element : Node {
 
 dictionary ShadowRootInit {
   required ShadowRootMode mode;
+  boolean delegatesFocus = false;
 };
 
 [Exposed=Window,
@@ -412,9 +420,10 @@ interface CharacterData : Node {
   void replaceData(unsigned long offset, unsigned long count, DOMString data);
 };
 
-[Constructor(optional DOMString data = ""),
- Exposed=Window]
+[Exposed=Window]
 interface Text : CharacterData {
+  constructor(optional DOMString data = "");
+
   [NewObject] Text splitText(unsigned long offset);
   readonly attribute DOMString wholeText;
 };
@@ -428,9 +437,9 @@ interface ProcessingInstruction : CharacterData {
   readonly attribute DOMString target;
 };
 
-[Constructor(optional DOMString data = ""),
- Exposed=Window]
+[Exposed=Window]
 interface Comment : CharacterData {
+  constructor(optional DOMString data = "");
 };
 
 [Exposed=Window]
@@ -442,13 +451,22 @@ interface AbstractRange {
   readonly attribute boolean collapsed;
 };
 
+dictionary StaticRangeInit {
+  required Node startContainer;
+  required unsigned long startOffset;
+  required Node endContainer;
+  required unsigned long endOffset;
+};
+
 [Exposed=Window]
 interface StaticRange : AbstractRange {
+  constructor(StaticRangeInit init);
 };
 
-[Constructor,
- Exposed=Window]
+[Exposed=Window]
 interface Range : AbstractRange {
+  constructor();
+
   readonly attribute Node commonAncestorContainer;
 
   void setStart(Node node, unsigned long offset);
@@ -552,3 +570,53 @@ interface DOMTokenList {
   [CEReactions] stringifier attribute DOMString value;
   iterable<DOMString>;
 };
+
+[Exposed=Window]
+interface XPathResult {
+  const unsigned short ANY_TYPE = 0;
+  const unsigned short NUMBER_TYPE = 1;
+  const unsigned short STRING_TYPE = 2;
+  const unsigned short BOOLEAN_TYPE = 3;
+  const unsigned short UNORDERED_NODE_ITERATOR_TYPE = 4;
+  const unsigned short ORDERED_NODE_ITERATOR_TYPE = 5;
+  const unsigned short UNORDERED_NODE_SNAPSHOT_TYPE = 6;
+  const unsigned short ORDERED_NODE_SNAPSHOT_TYPE = 7;
+  const unsigned short ANY_UNORDERED_NODE_TYPE = 8;
+  const unsigned short FIRST_ORDERED_NODE_TYPE = 9;
+
+  readonly attribute unsigned short resultType;
+  readonly attribute unrestricted double numberValue;
+  readonly attribute DOMString stringValue;
+  readonly attribute boolean booleanValue;
+  readonly attribute Node? singleNodeValue;
+  readonly attribute boolean invalidIteratorState;
+  readonly attribute unsigned long snapshotLength;
+
+  Node? iterateNext();
+  Node? snapshotItem(unsigned long index);
+};
+
+[Exposed=Window]
+interface XPathExpression {
+  // XPathResult.ANY_TYPE = 0
+  XPathResult evaluate(Node contextNode, optional unsigned short type = 0, optional XPathResult? result = null);
+};
+
+callback interface XPathNSResolver {
+  DOMString? lookupNamespaceURI(DOMString? prefix);
+};
+
+interface mixin XPathEvaluatorBase {
+  [NewObject] XPathExpression createExpression(DOMString expression, optional XPathNSResolver? resolver = null);
+  XPathNSResolver createNSResolver(Node nodeResolver);
+  // XPathResult.ANY_TYPE = 0
+  XPathResult evaluate(DOMString expression, Node contextNode, optional XPathNSResolver? resolver = null, optional unsigned short type = 0, optional XPathResult? result = null);
+};
+Document includes XPathEvaluatorBase;
+
+[Exposed=Window]
+interface XPathEvaluator {
+  constructor();
+};
+
+XPathEvaluator includes XPathEvaluatorBase;
diff --git a/inputfiles/idl/File.widl b/inputfiles/idl/File.widl
index d93f2a3d0..c92c76eae 100644
--- a/inputfiles/idl/File.widl
+++ b/inputfiles/idl/File.widl
@@ -1,15 +1,20 @@
-[Constructor(optional sequence<BlobPart> blobParts,
-             optional BlobPropertyBag options),
- Exposed=(Window,Worker), Serializable]
+[Exposed=(Window,Worker), Serializable]
 interface Blob {
+  constructor(optional sequence<BlobPart> blobParts,
+              optional BlobPropertyBag options = {});
 
   readonly attribute unsigned long long size;
   readonly attribute DOMString type;
 
   // slice Blob into byte-ranged chunks
-  Blob slice([Clamp] optional long long start,
-            [Clamp] optional long long end,
+  Blob slice(optional [Clamp] long long start,
+            optional [Clamp] long long end,
             optional DOMString contentType);
+
+  // read from the Blob.
+  [NewObject] ReadableStream stream();
+  [NewObject] Promise<USVString> text();
+  [NewObject] Promise<ArrayBuffer> arrayBuffer();
 };
 
 enum EndingType { "transparent", "native" };
@@ -21,11 +26,11 @@ dictionary BlobPropertyBag {
 
 typedef (BufferSource or Blob or USVString) BlobPart;
 
-[Constructor(sequence<BlobPart> fileBits,
-             USVString fileName,
-             optional FilePropertyBag options),
- Exposed=(Window,Worker), Serializable]
+[Exposed=(Window,Worker), Serializable]
 interface File : Blob {
+  constructor(sequence<BlobPart> fileBits,
+              USVString fileName,
+              optional FilePropertyBag options = {});
   readonly attribute DOMString name;
   readonly attribute long long lastModified;
 };
@@ -40,9 +45,9 @@ interface FileList {
   readonly attribute unsigned long length;
 };
 
-[Constructor, Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface FileReader: EventTarget {
-
+  constructor();
   // async read methods
   void readAsArrayBuffer(Blob blob);
   void readAsBinaryString(Blob blob);
@@ -56,7 +61,6 @@ interface FileReader: EventTarget {
   const unsigned short LOADING = 1;
   const unsigned short DONE = 2;
 
-
   readonly attribute unsigned short readyState;
 
   // File or Blob data
@@ -71,11 +75,11 @@ interface FileReader: EventTarget {
   attribute EventHandler onabort;
   attribute EventHandler onerror;
   attribute EventHandler onloadend;
-
 };
 
-[Constructor, Exposed=(DedicatedWorker,SharedWorker)]
+[Exposed=(DedicatedWorker,SharedWorker)]
 interface FileReaderSync {
+  constructor();
   // Synchronously return strings
 
   ArrayBuffer readAsArrayBuffer(Blob blob);
@@ -86,6 +90,6 @@ interface FileReaderSync {
 
 [Exposed=(Window,DedicatedWorker,SharedWorker)]
 partial interface URL {
-  static DOMString createObjectURL(Blob blob);
+  static DOMString createObjectURL((Blob or MediaSource) obj);
   static void revokeObjectURL(DOMString url);
 };
diff --git a/inputfiles/idl/HTML - DOM.widl b/inputfiles/idl/HTML - DOM.widl
index b9f6f2863..4f6421b82 100644
--- a/inputfiles/idl/HTML - DOM.widl	
+++ b/inputfiles/idl/HTML - DOM.widl	
@@ -35,7 +35,6 @@ partial interface Document {
 
   // user interaction
   readonly attribute WindowProxy? defaultView;
-  readonly attribute Element? activeElement;
   boolean hasFocus();
   [CEReactions] attribute DOMString designMode;
   [CEReactions] boolean execCommand(DOMString commandId, optional boolean showUI = false, optional DOMString value = "");
@@ -47,13 +46,20 @@ partial interface Document {
 
   // special event handler IDL attributes that only apply to Document objects
   [LenientThis] attribute EventHandler onreadystatechange;
+
+  // also has obsolete members
 };
 Document includes GlobalEventHandlers;
 Document includes DocumentAndElementEventHandlers;
 
-[Exposed=Window,
- HTMLConstructor]
+partial interface mixin DocumentOrShadowRoot {
+  readonly attribute Element? activeElement;
+};
+
+[Exposed=Window]
 interface HTMLElement : Element {
+  [HTMLConstructor] constructor();
+
   // metadata attributes
   [CEReactions] attribute DOMString title;
   [CEReactions] attribute DOMString lang;
@@ -70,6 +76,8 @@ interface HTMLElement : Element {
   [CEReactions] attribute DOMString autocapitalize;
 
   [CEReactions] attribute [TreatNullAs=EmptyString] DOMString innerText;
+
+  ElementInternals attachInternals();
 };
 
 HTMLElement includes GlobalEventHandlers;
@@ -77,16 +85,18 @@ HTMLElement includes DocumentAndElementEventHandlers;
 HTMLElement includes ElementContentEditable;
 HTMLElement includes HTMLOrSVGElement;
 
-// Note: intentionally not [HTMLConstructor]
 [Exposed=Window]
-interface HTMLUnknownElement : HTMLElement { };
+interface HTMLUnknownElement : HTMLElement {
+  // Note: intentionally no [HTMLConstructor]
+};
 
 interface mixin HTMLOrSVGElement {
   [SameObject] readonly attribute DOMStringMap dataset;
   attribute DOMString nonce; // intentionally no [CEReactions]
 
+  [CEReactions] attribute boolean autofocus;
   [CEReactions] attribute long tabIndex;
-  void focus(optional FocusOptions options);
+  void focus(optional FocusOptions options = {});
   void blur();
 };
 
diff --git a/inputfiles/idl/HTML - Form control infrastructure.widl b/inputfiles/idl/HTML - Form control infrastructure.widl
index ed00ce225..288934b88 100644
--- a/inputfiles/idl/HTML - Form control infrastructure.widl	
+++ b/inputfiles/idl/HTML - Form control infrastructure.widl	
@@ -19,3 +19,13 @@ interface ValidityState {
   readonly attribute boolean customError;
   readonly attribute boolean valid;
 };
+
+[Exposed=Window,
+ Constructor(DOMString type, optional FormDataEventInit eventInitDict = {})]
+interface FormDataEvent : Event {
+  readonly attribute FormData formData;
+};
+
+dictionary FormDataEventInit : EventInit {
+  required FormData formData;
+};
diff --git a/inputfiles/idl/HTML - Form elements.widl b/inputfiles/idl/HTML - Form elements.widl
index 0c0c5a34f..d218460d8 100644
--- a/inputfiles/idl/HTML - Form elements.widl	
+++ b/inputfiles/idl/HTML - Form elements.widl	
@@ -1,7 +1,7 @@
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLButtonElement : HTMLElement {
-  [CEReactions] attribute boolean autofocus;
+  [HTMLConstructor] constructor();
+
   [CEReactions] attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
   [CEReactions] attribute USVString formAction;
@@ -23,11 +23,11 @@ interface HTMLButtonElement : HTMLElement {
   readonly attribute NodeList labels;
 };
 
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLSelectElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   [CEReactions] attribute DOMString autocomplete;
-  [CEReactions] attribute boolean autofocus;
   [CEReactions] attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
   [CEReactions] attribute boolean multiple;
@@ -60,15 +60,17 @@ interface HTMLSelectElement : HTMLElement {
   readonly attribute NodeList labels;
 };
 
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLDataListElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   [SameObject] readonly attribute HTMLCollection options;
 };
 
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLOptGroupElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   [CEReactions] attribute boolean disabled;
   [CEReactions] attribute DOMString label;
 };
@@ -88,11 +90,11 @@ interface HTMLOptionElement : HTMLElement {
   readonly attribute long index;
 };
 
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLTextAreaElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   [CEReactions] attribute DOMString autocomplete;
-  [CEReactions] attribute boolean autofocus;
   [CEReactions] attribute unsigned long cols;
   [CEReactions] attribute DOMString dirName;
   [CEReactions] attribute boolean disabled;
@@ -129,9 +131,10 @@ interface HTMLTextAreaElement : HTMLElement {
   void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
 };
 
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLOutputElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   [SameObject, PutForwards=value] readonly attribute DOMTokenList htmlFor;
   readonly attribute HTMLFormElement? form;
   [CEReactions] attribute DOMString name;
@@ -150,18 +153,20 @@ interface HTMLOutputElement : HTMLElement {
   readonly attribute NodeList labels;
 };
 
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLProgressElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   [CEReactions] attribute double value;
   [CEReactions] attribute double max;
   readonly attribute double position;
   readonly attribute NodeList labels;
 };
 
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLMeterElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   [CEReactions] attribute double value;
   [CEReactions] attribute double min;
   [CEReactions] attribute double max;
@@ -171,9 +176,10 @@ interface HTMLMeterElement : HTMLElement {
   readonly attribute NodeList labels;
 };
 
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLFieldSetElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   [CEReactions] attribute boolean disabled;
   readonly attribute HTMLFormElement? form;
   [CEReactions] attribute DOMString name;
@@ -190,8 +196,9 @@ interface HTMLFieldSetElement : HTMLElement {
   void setCustomValidity(DOMString error);
 };
 
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLLegendElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   readonly attribute HTMLFormElement? form;
 };
diff --git a/inputfiles/idl/HTML - The input element.widl b/inputfiles/idl/HTML - The input element.widl
index f60d4da4c..9cbe80427 100644
--- a/inputfiles/idl/HTML - The input element.widl	
+++ b/inputfiles/idl/HTML - The input element.widl	
@@ -1,10 +1,10 @@
-[Exposed=Window,
- HTMLConstructor]
+[Exposed=Window]
 interface HTMLInputElement : HTMLElement {
+  [HTMLConstructor] constructor();
+
   [CEReactions] attribute DOMString accept;
   [CEReactions] attribute DOMString alt;
   [CEReactions] attribute DOMString autocomplete;
-  [CEReactions] attribute boolean autofocus;
   [CEReactions] attribute boolean defaultChecked;
   attribute boolean checked;
   [CEReactions] attribute DOMString dirName;
diff --git a/inputfiles/idl/HTML - Web application APIs.widl b/inputfiles/idl/HTML - Web application APIs.widl
index 3737fceaa..1911b5c30 100644
--- a/inputfiles/idl/HTML - Web application APIs.widl	
+++ b/inputfiles/idl/HTML - Web application APIs.widl	
@@ -1,5 +1,7 @@
-[Constructor(DOMString type, optional ErrorEventInit eventInitDict), Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface ErrorEvent : Event {
+  constructor(DOMString type, optional ErrorEventInit eventInitDict = {});
+
   readonly attribute DOMString message;
   readonly attribute USVString filename;
   readonly attribute unsigned long lineno;
@@ -15,8 +17,10 @@ dictionary ErrorEventInit : EventInit {
   any error = null;
 };
 
-[Constructor(DOMString type, PromiseRejectionEventInit eventInitDict), Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface PromiseRejectionEvent : Event {
+  constructor(DOMString type, PromiseRejectionEventInit eventInitDict);
+
   readonly attribute Promise<any> promise;
   readonly attribute any reason;
 };
@@ -64,6 +68,7 @@ interface mixin GlobalEventHandlers {
   attribute EventHandler onended;
   attribute OnErrorEventHandler onerror;
   attribute EventHandler onfocus;
+  attribute EventHandler onformdata;
   attribute EventHandler oninput;
   attribute EventHandler oninvalid;
   attribute EventHandler onkeydown;
@@ -72,7 +77,6 @@ interface mixin GlobalEventHandlers {
   attribute EventHandler onload;
   attribute EventHandler onloadeddata;
   attribute EventHandler onloadedmetadata;
-  attribute EventHandler onloadend;
   attribute EventHandler onloadstart;
   attribute EventHandler onmousedown;
   [LenientThis] attribute EventHandler onmouseenter;
@@ -94,6 +98,7 @@ interface mixin GlobalEventHandlers {
   attribute EventHandler onseeked;
   attribute EventHandler onseeking;
   attribute EventHandler onselect;
+  attribute EventHandler onslotchange;
   attribute EventHandler onstalled;
   attribute EventHandler onsubmit;
   attribute EventHandler onsuspend;
@@ -144,11 +149,11 @@ interface mixin WindowOrWorkerGlobalScope {
   void clearInterval(optional long handle = 0);
 
   // microtask queuing
-  void queueMicrotask(Function callback);
+  void queueMicrotask(VoidFunction callback);
 
   // ImageBitmap
-  Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, optional ImageBitmapOptions options);
-  Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, long sx, long sy, long sw, long sh, optional ImageBitmapOptions options);
+  Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, optional ImageBitmapOptions options = {});
+  Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, long sx, long sy, long sw, long sh, optional ImageBitmapOptions options = {});
 };
 Window includes WindowOrWorkerGlobalScope;
 WorkerGlobalScope includes WindowOrWorkerGlobalScope;
diff --git a/inputfiles/idl/High Resolution Time.widl b/inputfiles/idl/High Resolution Time.widl
index ccbbc3323..2bc1bd559 100644
--- a/inputfiles/idl/High Resolution Time.widl	
+++ b/inputfiles/idl/High Resolution Time.widl	
@@ -2,7 +2,7 @@ typedef double DOMHighResTimeStamp;
 
 [Exposed=(Window,Worker)]
 interface Performance : EventTarget {
-    DOMHighResTimeStamp now();
+    DOMHighResTimeStamp now ();
     readonly attribute DOMHighResTimeStamp timeOrigin;
     [Default] object              toJSON();
 };
diff --git a/inputfiles/idl/Push.widl b/inputfiles/idl/Push.widl
index 16f52d2f3..b2fe87e89 100644
--- a/inputfiles/idl/Push.widl
+++ b/inputfiles/idl/Push.widl
@@ -7,14 +7,9 @@ partial interface ServiceWorkerRegistration {
 interface PushManager {
   [SameObject] static readonly attribute FrozenArray<DOMString> supportedContentEncodings;
 
-  Promise<PushSubscription> subscribe(optional PushSubscriptionOptionsInit options);
+  Promise<PushSubscription> subscribe(optional PushSubscriptionOptionsInit options = {});
   Promise<PushSubscription?> getSubscription();
-  Promise<PushPermissionState> permissionState(optional PushSubscriptionOptionsInit options);
-};
-
-dictionary PushSubscriptionOptionsInit {
-  boolean userVisibleOnly = false;
-  (BufferSource or DOMString)? applicationServerKey = null;
+  Promise<PushPermissionState> permissionState(optional PushSubscriptionOptionsInit options = {});
 };
 
 [Exposed=(Window,Worker), SecureContext]
@@ -23,6 +18,11 @@ interface PushSubscriptionOptions {
   [SameObject] readonly attribute ArrayBuffer? applicationServerKey;
 };
 
+dictionary PushSubscriptionOptionsInit {
+  boolean userVisibleOnly = false;
+  (BufferSource or DOMString)? applicationServerKey = null;
+};
+
 [Exposed=(Window,Worker), SecureContext]
 interface PushSubscription {
   readonly attribute USVString endpoint;
@@ -59,28 +59,28 @@ partial interface ServiceWorkerGlobalScope {
   attribute EventHandler onpushsubscriptionchange;
 };
 
+[Constructor(DOMString type, optional PushEventInit eventInitDict = {}), Exposed=ServiceWorker, SecureContext]
+interface PushEvent : ExtendableEvent {
+  readonly attribute PushMessageData? data;
+};
+
 typedef (BufferSource or USVString) PushMessageDataInit;
 
 dictionary PushEventInit : ExtendableEventInit {
   PushMessageDataInit data;
 };
 
-[Constructor(DOMString type, optional PushEventInit eventInitDict), Exposed=ServiceWorker, SecureContext]
-interface PushEvent : ExtendableEvent {
-  readonly attribute PushMessageData? data;
+[Constructor(DOMString type, optional PushSubscriptionChangeEventInit eventInitDict = {}), Exposed=ServiceWorker, SecureContext]
+interface PushSubscriptionChangeEvent : ExtendableEvent {
+  readonly attribute PushSubscription? newSubscription;
+  readonly attribute PushSubscription? oldSubscription;
 };
 
-dictionary PushSubscriptionChangeInit : ExtendableEventInit {
+dictionary PushSubscriptionChangeEventInit : ExtendableEventInit {
   PushSubscription newSubscription = null;
   PushSubscription oldSubscription = null;
 };
 
-[Constructor(DOMString type, optional PushSubscriptionChangeInit eventInitDict), Exposed=ServiceWorker, SecureContext]
-interface PushSubscriptionChangeEvent : ExtendableEvent {
-  readonly attribute PushSubscription? newSubscription;
-  readonly attribute PushSubscription? oldSubscription;
-};
-
 enum PushPermissionState {
   "denied",
   "granted",
diff --git a/inputfiles/idl/Service Workers.widl b/inputfiles/idl/Service Workers.widl
index dc6dec5dc..b11a49765 100644
--- a/inputfiles/idl/Service Workers.widl	
+++ b/inputfiles/idl/Service Workers.widl	
@@ -3,7 +3,7 @@ interface ServiceWorker : EventTarget {
   readonly attribute USVString scriptURL;
   readonly attribute ServiceWorkerState state;
   void postMessage(any message, sequence<object> transfer);
-  void postMessage(any message, optional PostMessageOptions options);
+  void postMessage(any message, optional PostMessageOptions options = {});
 
   // event
   attribute EventHandler onstatechange;
@@ -11,6 +11,7 @@ interface ServiceWorker : EventTarget {
 ServiceWorker includes AbstractWorker;
 
 enum ServiceWorkerState {
+  "parsed",
   "installing",
   "installed",
   "activating",
@@ -54,7 +55,7 @@ interface ServiceWorkerContainer : EventTarget {
   readonly attribute ServiceWorker? controller;
   readonly attribute Promise<ServiceWorkerRegistration> ready;
 
-  [NewObject] Promise<ServiceWorkerRegistration> register(USVString scriptURL, optional RegistrationOptions options);
+  [NewObject] Promise<ServiceWorkerRegistration> register(USVString scriptURL, optional RegistrationOptions options = {});
 
   [NewObject] Promise<any> getRegistration(optional USVString clientURL = "");
   [NewObject] Promise<FrozenArray<ServiceWorkerRegistration>> getRegistrations();
@@ -91,6 +92,7 @@ dictionary NavigationPreloadState {
 interface ServiceWorkerGlobalScope : WorkerGlobalScope {
   [SameObject] readonly attribute Clients clients;
   [SameObject] readonly attribute ServiceWorkerRegistration registration;
+  [SameObject] readonly attribute ServiceWorker serviceWorker;
 
   [NewObject] Promise<void> skipWaiting();
 
@@ -109,7 +111,7 @@ interface Client {
   readonly attribute DOMString id;
   readonly attribute ClientType type;
   void postMessage(any message, sequence<object> transfer);
-  void postMessage(any message, optional PostMessageOptions options);
+  void postMessage(any message, optional PostMessageOptions options = {});
 };
 
 [Exposed=ServiceWorker]
@@ -132,7 +134,7 @@ enum FrameType {
 interface Clients {
   // The objects returned will be new instances every time
   [NewObject] Promise<any> get(DOMString id);
-  [NewObject] Promise<FrozenArray<Client>> matchAll(optional ClientQueryOptions options);
+  [NewObject] Promise<FrozenArray<Client>> matchAll(optional ClientQueryOptions options = {});
   [NewObject] Promise<WindowClient?> openWindow(USVString url);
   [NewObject] Promise<void> claim();
 };
@@ -149,8 +151,9 @@ enum ClientType {
   "all"
 };
 
-[Constructor(DOMString type, optional ExtendableEventInit eventInitDict), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface ExtendableEvent : Event {
+  constructor(DOMString type, optional ExtendableEventInit eventInitDict = {});
   void waitUntil(Promise<any> f);
 };
 
@@ -158,8 +161,9 @@ dictionary ExtendableEventInit : EventInit {
   // Defined for the forward compatibility across the derived events
 };
 
-[Constructor(DOMString type, FetchEventInit eventInitDict), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface FetchEvent : ExtendableEvent {
+  constructor(DOMString type, FetchEventInit eventInitDict);
   [SameObject] readonly attribute Request request;
   readonly attribute Promise<any> preloadResponse;
   readonly attribute DOMString clientId;
@@ -177,8 +181,9 @@ dictionary FetchEventInit : ExtendableEventInit {
   DOMString replacesClientId = "";
 };
 
-[Constructor(DOMString type, optional ExtendableMessageEventInit eventInitDict), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface ExtendableMessageEvent : ExtendableEvent {
+  constructor(DOMString type, optional ExtendableMessageEventInit eventInitDict = {});
   readonly attribute any data;
   readonly attribute USVString origin;
   readonly attribute DOMString lastEventId;
@@ -200,13 +205,13 @@ partial interface mixin WindowOrWorkerGlobalScope {
 
 [SecureContext, Exposed=(Window,Worker)]
 interface Cache {
-  [NewObject] Promise<any> match(RequestInfo request, optional CacheQueryOptions options);
-  [NewObject] Promise<FrozenArray<Response>> matchAll(optional RequestInfo request, optional CacheQueryOptions options);
+  [NewObject] Promise<any> match(RequestInfo request, optional CacheQueryOptions options = {});
+  [NewObject] Promise<FrozenArray<Response>> matchAll(optional RequestInfo request, optional CacheQueryOptions options = {});
   [NewObject] Promise<void> add(RequestInfo request);
   [NewObject] Promise<void> addAll(sequence<RequestInfo> requests);
   [NewObject] Promise<void> put(RequestInfo request, Response response);
-  [NewObject] Promise<boolean> delete(RequestInfo request, optional CacheQueryOptions options);
-  [NewObject] Promise<FrozenArray<Request>> keys(optional RequestInfo request, optional CacheQueryOptions options);
+  [NewObject] Promise<boolean> delete(RequestInfo request, optional CacheQueryOptions options = {});
+  [NewObject] Promise<FrozenArray<Request>> keys(optional RequestInfo request, optional CacheQueryOptions options = {});
 };
 
 dictionary CacheQueryOptions {
@@ -217,7 +222,7 @@ dictionary CacheQueryOptions {
 
 [SecureContext, Exposed=(Window,Worker)]
 interface CacheStorage {
-  [NewObject] Promise<any> match(RequestInfo request, optional MultiCacheQueryOptions options);
+  [NewObject] Promise<any> match(RequestInfo request, optional MultiCacheQueryOptions options = {});
   [NewObject] Promise<boolean> has(DOMString cacheName);
   [NewObject] Promise<Cache> open(DOMString cacheName);
   [NewObject] Promise<boolean> delete(DOMString cacheName);
diff --git a/inputfiles/idl/Web Audio.widl b/inputfiles/idl/Web Audio.widl
index 1287f4568..e135b97c1 100644
--- a/inputfiles/idl/Web Audio.widl	
+++ b/inputfiles/idl/Web Audio.widl	
@@ -111,8 +111,8 @@ interface AudioBuffer {
   readonly attribute double duration;
   readonly attribute unsigned long numberOfChannels;
   Float32Array getChannelData (unsigned long channel);
-  void copyFromChannel (Float32Array destination, unsigned long channelNumber, optional unsigned long startInChannel = 0);
-  void copyToChannel (Float32Array source, unsigned long channelNumber, optional unsigned long startInChannel = 0);
+  void copyFromChannel (Float32Array destination, unsigned long channelNumber, optional unsigned long bufferOffset = 0);
+  void copyToChannel (Float32Array source, unsigned long channelNumber, optional unsigned long bufferOffset = 0);
 };
 
 dictionary AudioBufferOptions {
@@ -188,7 +188,7 @@ interface AudioScheduledSourceNode : AudioNode {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional AnalyserOptions options)]
+ Constructor (BaseAudioContext context, optional AnalyserOptions options = {})]
 interface AnalyserNode : AudioNode {
   void getFloatFrequencyData (Float32Array array);
   void getByteFrequencyData (Uint8Array array);
@@ -209,7 +209,7 @@ dictionary AnalyserOptions : AudioNodeOptions {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional AudioBufferSourceOptions options)]
+ Constructor (BaseAudioContext context, optional AudioBufferSourceOptions options = {})]
 interface AudioBufferSourceNode : AudioScheduledSourceNode {
   attribute AudioBuffer? buffer;
   readonly attribute AudioParam playbackRate;
@@ -277,7 +277,7 @@ enum BiquadFilterType {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional BiquadFilterOptions options)]
+ Constructor (BaseAudioContext context, optional BiquadFilterOptions options = {})]
 interface BiquadFilterNode : AudioNode {
   attribute BiquadFilterType type;
   readonly attribute AudioParam frequency;
@@ -296,7 +296,7 @@ dictionary BiquadFilterOptions : AudioNodeOptions {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional ChannelMergerOptions options)]
+ Constructor (BaseAudioContext context, optional ChannelMergerOptions options = {})]
 interface ChannelMergerNode : AudioNode {
 };
 
@@ -305,7 +305,7 @@ dictionary ChannelMergerOptions : AudioNodeOptions {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional ChannelSplitterOptions options)]
+ Constructor (BaseAudioContext context, optional ChannelSplitterOptions options = {})]
 interface ChannelSplitterNode : AudioNode {
 };
 
@@ -314,7 +314,7 @@ dictionary ChannelSplitterOptions : AudioNodeOptions {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional ConstantSourceOptions options)]
+ Constructor (BaseAudioContext context, optional ConstantSourceOptions options = {})]
 interface ConstantSourceNode : AudioScheduledSourceNode {
   readonly attribute AudioParam offset;
 };
@@ -324,7 +324,7 @@ dictionary ConstantSourceOptions {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional ConvolverOptions options)]
+ Constructor (BaseAudioContext context, optional ConvolverOptions options = {})]
 interface ConvolverNode : AudioNode {
   attribute AudioBuffer? buffer;
   attribute boolean normalize;
@@ -336,7 +336,7 @@ dictionary ConvolverOptions : AudioNodeOptions {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional DelayOptions options)]
+ Constructor (BaseAudioContext context, optional DelayOptions options = {})]
 interface DelayNode : AudioNode {
   readonly attribute AudioParam delayTime;
 };
@@ -347,7 +347,7 @@ dictionary DelayOptions : AudioNodeOptions {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional DynamicsCompressorOptions options)]
+ Constructor (BaseAudioContext context, optional DynamicsCompressorOptions options = {})]
 interface DynamicsCompressorNode : AudioNode {
   readonly attribute AudioParam threshold;
   readonly attribute AudioParam knee;
@@ -366,7 +366,7 @@ dictionary DynamicsCompressorOptions : AudioNodeOptions {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional GainOptions options)]
+ Constructor (BaseAudioContext context, optional GainOptions options = {})]
 interface GainNode : AudioNode {
   readonly attribute AudioParam gain;
 };
@@ -397,7 +397,7 @@ dictionary MediaElementAudioSourceOptions {
 };
 
 [Exposed=Window,
- Constructor (AudioContext context, optional AudioNodeOptions options)]
+ Constructor (AudioContext context, optional AudioNodeOptions options = {})]
 interface MediaStreamAudioDestinationNode : AudioNode {
   readonly attribute MediaStream stream;
 };
@@ -430,7 +430,7 @@ enum OscillatorType {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional OscillatorOptions options)]
+ Constructor (BaseAudioContext context, optional OscillatorOptions options = {})]
 interface OscillatorNode : AudioScheduledSourceNode {
   attribute OscillatorType type;
   readonly attribute AudioParam frequency;
@@ -457,7 +457,7 @@ enum DistanceModelType {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional PannerOptions options)]
+ Constructor (BaseAudioContext context, optional PannerOptions options = {})]
 interface PannerNode : AudioNode {
   attribute PanningModelType panningModel;
   readonly attribute AudioParam positionX;
@@ -495,7 +495,7 @@ dictionary PannerOptions : AudioNodeOptions {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional PeriodicWaveOptions options)]
+ Constructor (BaseAudioContext context, optional PeriodicWaveOptions options = {})]
 interface PeriodicWave {
 };
 
@@ -515,7 +515,7 @@ interface ScriptProcessorNode : AudioNode {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional StereoPannerOptions options)]
+ Constructor (BaseAudioContext context, optional StereoPannerOptions options = {})]
 interface StereoPannerNode : AudioNode {
   readonly attribute AudioParam pan;
 };
@@ -531,7 +531,7 @@ enum OverSampleType {
 };
 
 [Exposed=Window,
- Constructor (BaseAudioContext context, optional WaveShaperOptions options)]
+ Constructor (BaseAudioContext context, optional WaveShaperOptions options = {})]
 interface WaveShaperNode : AudioNode {
   attribute Float32Array? curve;
   attribute OverSampleType oversample;
@@ -564,7 +564,7 @@ interface AudioParamMap {
 [Exposed=Window,
  SecureContext,
  Constructor (BaseAudioContext context, DOMString name,
-              optional AudioWorkletNodeOptions options)]
+              optional AudioWorkletNodeOptions options = {})]
 interface AudioWorkletNode : AudioNode {
   readonly attribute AudioParamMap parameters;
   readonly attribute MessagePort port;
@@ -576,11 +576,11 @@ dictionary AudioWorkletNodeOptions : AudioNodeOptions {
   unsigned long numberOfOutputs = 1;
   sequence<unsigned long> outputChannelCount;
   record<DOMString, double> parameterData;
-  object? processorOptions = null;
+  object processorOptions;
 };
 
 [Exposed=AudioWorklet,
-Constructor (optional AudioWorkletNodeOptions options)]
+Constructor (optional AudioWorkletNodeOptions options = {})]
 interface AudioWorkletProcessor {
   readonly attribute MessagePort port;
 };
diff --git a/inputfiles/idlSources.json b/inputfiles/idlSources.json
index 3eee3c5fe..95b13f806 100644
--- a/inputfiles/idlSources.json
+++ b/inputfiles/idlSources.json
@@ -164,10 +164,6 @@
         "url": "https://w3c.github.io/DOM-Parsing/",
         "title": "DOM Parsing and Serialization"
     },
-    {
-        "url": "https://wiki.whatwg.org/wiki/DOM_XPath",
-        "title": "DOM XPath"
-    },
     {
         "url": "https://encoding.spec.whatwg.org/",
         "title": "Encoding"
diff --git a/inputfiles/removedTypes.json b/inputfiles/removedTypes.json
index 03dfd953b..5f407487f 100644
--- a/inputfiles/removedTypes.json
+++ b/inputfiles/removedTypes.json
@@ -1,18 +1,21 @@
 {
     "callback-functions": {
         "callback-function": {
-            "CustomElementConstructor": null,
             "ErrorEventHandler": null,
             "Function": null
         }
     },
     "mixins": {
         "mixin": {
-            "XMLHttpRequestEventTarget": null,
-            "WindowTimers": {
-                "methods": null,
-                "implements": null
+            "GlobalEventHandlers": {
+                "properties": {
+                    "property": {
+                        "onformdata": null,
+                        "onslotchange": null
+                    }
+                }
             },
+            "XMLHttpRequestEventTarget": null,
             "WorkerUtils": {
                 "methods": {
                     "method": {
@@ -152,6 +155,7 @@
                 }
             },
             "FederatedCredential": null,
+            "FormDataEvent": null,
             "HTMLAreasCollection": null,
             "HTMLBodyElement": {
                 "properties": {
@@ -165,6 +169,13 @@
                     }
                 }
             },
+            "HTMLElement": {
+                "methods": {
+                    "method": {
+                        "attachInternals": null
+                    }
+                }
+            },
             "MessageEvent": {
                 "methods": {
                     "method": {
@@ -177,6 +188,13 @@
             "MSDSHEvent": null,
             "MSStreamReader": null,
             "PasswordCredential": null,
+            "ShadowRoot": {
+                "properties": {
+                    "property": {
+                        "onslotchange": null
+                    }
+                }
+            },
             "StorageEvent": {
                 "methods": {
                     "method": {
@@ -262,7 +280,8 @@
                     }
                 },
                 "implements": [
-                    "GlobalFetch"
+                    "GlobalFetch",
+                    "WindowTimers"
                 ]
             },
             "WorkerGlobalScope": {
diff --git a/src/emitter.ts b/src/emitter.ts
index 5f23a60d0..b48785220 100644
--- a/src/emitter.ts
+++ b/src/emitter.ts
@@ -343,7 +343,6 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
             return baseTypeConversionMap.get(objDomType)!;
         }
         switch (objDomType) {
-            case "CustomElementConstructor": return "Function";
             case "DOMHighResTimeStamp": return "number";
             case "DOMTimeStamp": return "number";
             case "EventListener": return "EventListenerOrEventListenerObject";
diff --git a/src/widlprocess.ts b/src/widlprocess.ts
index 7372dcf9f..004bdeffa 100644
--- a/src/widlprocess.ts
+++ b/src/widlprocess.ts
@@ -114,7 +114,7 @@ function convertInterfaceCommon(i: webidl2.InterfaceType | webidl2.InterfaceMixi
         methods: { method: {} },
         "anonymous-methods": { method: [] },
         properties: { property: {}, namesakes: {} },
-        constructor: getConstructor(i.extAttrs, i.name),
+        constructor: getConstructor(i.members, i.name) || getOldStyleConstructor(i.extAttrs, i.name),
         "named-constructor": getNamedConstructor(i.extAttrs, i.name),
         exposed: getExtAttrConcatenated(i.extAttrs, "Exposed"),
         global: getExtAttrConcatenated(i.extAttrs, "Global"),
@@ -173,7 +173,24 @@ function convertInterfaceCommon(i: webidl2.InterfaceType | webidl2.InterfaceMixi
     return result;
 }
 
-function getConstructor(extAttrs: webidl2.ExtendedAttribute[], parent: string) {
+function getConstructor(members: webidl2.IDLInterfaceMemberType[], parent: string) {
+    const constructor: Browser.Constructor = {
+        signature: []
+    };
+    for (const member of members) {
+        if (member.type === "constructor") {
+            constructor.signature.push({
+                type: parent,
+                param: member.arguments.map(convertArgument)
+            });
+        }
+    }
+    if (constructor.signature.length) {
+        return constructor;
+    }
+}
+
+function getOldStyleConstructor(extAttrs: webidl2.ExtendedAttribute[], parent: string) {
     const constructor: Browser.Constructor = {
         signature: []
     };
@@ -181,7 +198,7 @@ function getConstructor(extAttrs: webidl2.ExtendedAttribute[], parent: string) {
         if (extAttr.name === "Constructor") {
             constructor.signature.push({
                 type: parent,
-                param: extAttr.arguments ? extAttr.arguments.map(convertArgument) : []
+                param: extAttr.arguments.map(convertArgument)
             });
         }
     }