diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index d7ef91a81..f8a084d49 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -4722,12 +4722,12 @@ interface FileReaderEventMap { interface FileReader extends EventTarget { readonly error: DOMException | null; - onabort: ((this: FileReader, ev: ProgressEvent) => any) | null; - onerror: ((this: FileReader, ev: ProgressEvent) => any) | null; - onload: ((this: FileReader, ev: ProgressEvent) => any) | null; - onloadend: ((this: FileReader, ev: ProgressEvent) => any) | null; - onloadstart: ((this: FileReader, ev: ProgressEvent) => any) | null; - onprogress: ((this: FileReader, ev: ProgressEvent) => any) | null; + onabort: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onerror: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onload: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onloadend: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onloadstart: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onprogress: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; readonly readyState: number; readonly result: any; abort(): void; @@ -4752,6 +4752,10 @@ declare var FileReader: { readonly LOADING: number; }; +interface FileReaderProgressEvent extends ProgressEvent { + readonly target: FileReader | null; +} + interface FocusEvent extends UIEvent { readonly relatedTarget: EventTarget; initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void; @@ -9681,6 +9685,12 @@ declare var PannerNode: { new(): PannerNode; }; +interface ParentNode { + readonly childElementCount: number; + readonly firstElementChild: Element | null; + readonly lastElementChild: Element | null; +} + interface ParentNode { readonly children: HTMLCollection; querySelector(selectors: K): HTMLElementTagNameMap[K] | null; @@ -9691,12 +9701,6 @@ interface ParentNode { querySelectorAll(selectors: string): NodeListOf; } -interface ParentNode { - readonly childElementCount: number; - readonly firstElementChild: Element | null; - readonly lastElementChild: Element | null; -} - interface Path2D extends CanvasPathMethods { } diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 691d55c56..abdfd73b4 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -588,12 +588,12 @@ interface FileReaderEventMap { interface FileReader extends EventTarget { readonly error: DOMException | null; - onabort: ((this: FileReader, ev: ProgressEvent) => any) | null; - onerror: ((this: FileReader, ev: ProgressEvent) => any) | null; - onload: ((this: FileReader, ev: ProgressEvent) => any) | null; - onloadend: ((this: FileReader, ev: ProgressEvent) => any) | null; - onloadstart: ((this: FileReader, ev: ProgressEvent) => any) | null; - onprogress: ((this: FileReader, ev: ProgressEvent) => any) | null; + onabort: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onerror: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onload: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onloadend: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onloadstart: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; + onprogress: ((this: FileReader, ev: FileReaderProgressEvent) => any) | null; readonly readyState: number; readonly result: any; abort(): void; @@ -618,6 +618,10 @@ declare var FileReader: { readonly LOADING: number; }; +interface FileReaderProgressEvent extends ProgressEvent { + readonly target: FileReader | null; +} + interface FileReaderSync { readAsArrayBuffer(blob: Blob): any; readAsBinaryString(blob: Blob): void; diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 0523d300b..e1fcd98e1 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -47,6 +47,20 @@ } } }, + "FileReaderProgressEvent": { + "name": "FileReaderProgressEvent", + "extends": "ProgressEvent", + "properties": { + "property": { + "name": { + "name": "target", + "read-only": 1, + "override-type": "FileReader | null" + } + } + }, + "no-interface-object": "1" + }, "BroadcastChannel": { "name": "BroadcastChannel", "extends": "EventTarget", diff --git a/inputfiles/knownWorkerTypes.json b/inputfiles/knownWorkerTypes.json index 94d54e323..2d4c5a4a0 100644 --- a/inputfiles/knownWorkerTypes.json +++ b/inputfiles/knownWorkerTypes.json @@ -37,6 +37,7 @@ "File", "FileList", "FileReader", + "FileReaderProgressEvent", "FormData", "Headers", "IDBCursor", diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json index 4058d9448..b6866c860 100644 --- a/inputfiles/overridingTypes.json +++ b/inputfiles/overridingTypes.json @@ -1761,6 +1761,30 @@ "name": "FileReader", "properties": { "property": { + "onloadstart": { + "name": "onloadstart", + "override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any" + }, + "onprogress": { + "name": "onprogress", + "override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any" + }, + "onload": { + "name": "onload", + "override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any" + }, + "onabort": { + "name": "onabort", + "override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any" + }, + "onerror": { + "name": "onerror", + "override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any" + }, + "onloadend": { + "name": "onloadend", + "override-type": "(this: FileReader, ev: FileReaderProgressEvent) => any" + }, "result": { "name": "result", "override-type": "any"