Skip to content

Commit acd8fc2

Browse files
nscarcellanscarcella
committed
Hopefully fixes microsoft#299 
1 parent bc29ad7 commit acd8fc2

7 files changed

+207
-65
lines changed

‎baselines/audioworklet.generated.d.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ declare var ErrorEvent: {
433433
*
434434
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event)
435435
*/
436-
interface Event {
436+
interface Event<T extends EventTarget = EventTarget> {
437437
/**
438438
* Returns true or false depending on how event was initialized. True if event goes through its target's ancestors in reverse tree order, and false otherwise.
439439
*
@@ -463,7 +463,7 @@ interface Event {
463463
*
464464
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/currentTarget)
465465
*/
466-
readonly currentTarget: EventTarget | null;
466+
readonly currentTarget: T | null;
467467
/**
468468
* Returns true if preventDefault() was invoked successfully to indicate cancelation, and false otherwise.
469469
*
@@ -499,7 +499,7 @@ interface Event {
499499
*
500500
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/target)
501501
*/
502-
readonly target: EventTarget | null;
502+
readonly target: T | null;
503503
/**
504504
* Returns the event's timestamp as the number of milliseconds measured relative to the time origin.
505505
*
@@ -557,12 +557,12 @@ declare var Event: {
557557
readonly BUBBLING_PHASE: 3;
558558
};
559559

560-
interface EventListener {
561-
(evt: Event): void;
560+
interface EventListener<T extends EventTarget = EventTarget> {
561+
(evt: Event<T>): void;
562562
}
563563

564-
interface EventListenerObject {
565-
handleEvent(object: Event): void;
564+
interface EventListenerObject<T extends EventTarget = EventTarget> {
565+
handleEvent(object: Event<T>): void;
566566
}
567567

568568
/**
@@ -588,7 +588,7 @@ interface EventTarget {
588588
*
589589
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
590590
*/
591-
addEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: AddEventListenerOptions | boolean): void;
591+
addEventListener(type: string, callback: EventListenerOrEventListenerObject<this> | null, options?: AddEventListenerOptions | boolean): void;
592592
/**
593593
* 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.
594594
*
@@ -600,7 +600,7 @@ interface EventTarget {
600600
*
601601
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
602602
*/
603-
removeEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: EventListenerOptions | boolean): void;
603+
removeEventListener(type: string, callback: EventListenerOrEventListenerObject<this> | null, options?: EventListenerOptions | boolean): void;
604604
}
605605

606606
declare var EventTarget: {
@@ -1402,7 +1402,7 @@ declare function registerProcessor(name: string, processorCtor: AudioWorkletProc
14021402
type AllowSharedBufferSource = ArrayBuffer | ArrayBufferView;
14031403
type BufferSource = ArrayBufferView | ArrayBuffer;
14041404
type DOMHighResTimeStamp = number;
1405-
type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
1405+
type EventListenerOrEventListenerObject<T extends EventTarget = EventTarget> = EventListener<T> | EventListenerObject<T>;
14061406
type MessageEventSource = MessagePort;
14071407
type ReadableStreamController<T> = ReadableStreamDefaultController<T> | ReadableByteStreamController;
14081408
type ReadableStreamReadResult<T> = ReadableStreamReadValueResult<T> | ReadableStreamReadDoneResult<T>;

‎baselines/dom.generated.d.ts

+20-20
Original file line numberDiff line numberDiff line change
@@ -5721,7 +5721,7 @@ declare var Comment: {
57215721
*
57225722
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CompositionEvent)
57235723
*/
5724-
interface CompositionEvent extends UIEvent {
5724+
interface CompositionEvent<T extends EventTarget = EventTarget> extends UIEvent<T> {
57255725
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/CompositionEvent/data) */
57265726
readonly data: string;
57275727
/**
@@ -7462,7 +7462,7 @@ declare var DocumentType: {
74627462
*
74637463
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/DragEvent)
74647464
*/
7465-
interface DragEvent extends MouseEvent {
7465+
interface DragEvent<T extends EventTarget = EventTarget> extends MouseEvent<T> {
74667466
/**
74677467
* Returns the DataTransfer object for the event.
74687468
*
@@ -7982,7 +7982,7 @@ declare var ErrorEvent: {
79827982
*
79837983
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event)
79847984
*/
7985-
interface Event {
7985+
interface Event<T extends EventTarget = EventTarget> {
79867986
/**
79877987
* Returns true or false depending on how event was initialized. True if event goes through its target's ancestors in reverse tree order, and false otherwise.
79887988
*
@@ -8012,7 +8012,7 @@ interface Event {
80128012
*
80138013
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/currentTarget)
80148014
*/
8015-
readonly currentTarget: EventTarget | null;
8015+
readonly currentTarget: T | null;
80168016
/**
80178017
* Returns true if preventDefault() was invoked successfully to indicate cancelation, and false otherwise.
80188018
*
@@ -8048,7 +8048,7 @@ interface Event {
80488048
*
80498049
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/target)
80508050
*/
8051-
readonly target: EventTarget | null;
8051+
readonly target: T | null;
80528052
/**
80538053
* Returns the event's timestamp as the number of milliseconds measured relative to the time origin.
80548054
*
@@ -8116,12 +8116,12 @@ declare var EventCounts: {
81168116
new(): EventCounts;
81178117
};
81188118

8119-
interface EventListener {
8120-
(evt: Event): void;
8119+
interface EventListener<T extends EventTarget = EventTarget> {
8120+
(evt: Event<T>): void;
81218121
}
81228122

8123-
interface EventListenerObject {
8124-
handleEvent(object: Event): void;
8123+
interface EventListenerObject<T extends EventTarget = EventTarget> {
8124+
handleEvent(object: Event<T>): void;
81258125
}
81268126

81278127
interface EventSourceEventMap {
@@ -8204,7 +8204,7 @@ interface EventTarget {
82048204
*
82058205
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
82068206
*/
8207-
addEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: AddEventListenerOptions | boolean): void;
8207+
addEventListener(type: string, callback: EventListenerOrEventListenerObject<this> | null, options?: AddEventListenerOptions | boolean): void;
82088208
/**
82098209
* 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.
82108210
*
@@ -8216,7 +8216,7 @@ interface EventTarget {
82168216
*
82178217
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
82188218
*/
8219-
removeEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: EventListenerOptions | boolean): void;
8219+
removeEventListener(type: string, callback: EventListenerOrEventListenerObject<this> | null, options?: EventListenerOptions | boolean): void;
82208220
}
82218221

82228222
declare var EventTarget: {
@@ -8501,7 +8501,7 @@ declare var FileSystemWritableFileStream: {
85018501
*
85028502
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FocusEvent)
85038503
*/
8504-
interface FocusEvent extends UIEvent {
8504+
interface FocusEvent<T extends EventTarget = EventTarget> extends UIEvent<T> {
85058505
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/FocusEvent/relatedTarget) */
85068506
readonly relatedTarget: EventTarget | null;
85078507
}
@@ -14303,7 +14303,7 @@ declare var InputDeviceInfo: {
1430314303
};
1430414304

1430514305
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/InputEvent) */
14306-
interface InputEvent extends UIEvent {
14306+
interface InputEvent<T extends EventTarget = EventTarget> extends UIEvent<T> {
1430714307
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/InputEvent/data) */
1430814308
readonly data: string | null;
1430914309
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/InputEvent/dataTransfer) */
@@ -14385,7 +14385,7 @@ interface KHR_parallel_shader_compile {
1438514385
*
1438614386
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/KeyboardEvent)
1438714387
*/
14388-
interface KeyboardEvent extends UIEvent {
14388+
interface KeyboardEvent<T extends EventTarget = EventTarget> extends UIEvent<T> {
1438914389
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/KeyboardEvent/altKey) */
1439014390
readonly altKey: boolean;
1439114391
/**
@@ -15592,7 +15592,7 @@ declare var MimeTypeArray: {
1559215592
*
1559315593
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/MouseEvent)
1559415594
*/
15595-
interface MouseEvent extends UIEvent {
15595+
interface MouseEvent<T extends EventTarget = EventTarget> extends UIEvent<T> {
1559615596
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/MouseEvent/altKey) */
1559715597
readonly altKey: boolean;
1559815598
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/MouseEvent/button) */
@@ -17593,7 +17593,7 @@ declare var PluginArray: {
1759317593
*
1759417594
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/PointerEvent)
1759517595
*/
17596-
interface PointerEvent extends MouseEvent {
17596+
interface PointerEvent<T extends EventTarget = EventTarget> extends MouseEvent<T> {
1759717597
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/PointerEvent/height) */
1759817598
readonly height: number;
1759917599
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/PointerEvent/isPrimary) */
@@ -22414,7 +22414,7 @@ declare var Touch: {
2241422414
*
2241522415
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TouchEvent)
2241622416
*/
22417-
interface TouchEvent extends UIEvent {
22417+
interface TouchEvent<T extends EventTarget = EventTarget> extends UIEvent<T> {
2241822418
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/TouchEvent/altKey) */
2241922419
readonly altKey: boolean;
2242022420
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/TouchEvent/changedTouches) */
@@ -22562,7 +22562,7 @@ declare var TreeWalker: {
2256222562
*
2256322563
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/UIEvent)
2256422564
*/
22565-
interface UIEvent extends Event {
22565+
interface UIEvent<T extends EventTarget = EventTarget> extends Event<T> {
2256622566
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/UIEvent/detail) */
2256722567
readonly detail: number;
2256822568
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/UIEvent/view) */
@@ -25596,7 +25596,7 @@ declare var WebTransportError: {
2559625596
*
2559725597
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WheelEvent)
2559825598
*/
25599-
interface WheelEvent extends MouseEvent {
25599+
interface WheelEvent<T extends EventTarget = EventTarget> extends MouseEvent<T> {
2560025600
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WheelEvent/deltaMode) */
2560125601
readonly deltaMode: number;
2560225602
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WheelEvent/deltaX) */
@@ -28041,7 +28041,7 @@ type ConstrainDouble = number | ConstrainDoubleRange;
2804128041
type ConstrainULong = number | ConstrainULongRange;
2804228042
type DOMHighResTimeStamp = number;
2804328043
type EpochTimeStamp = number;
28044-
type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
28044+
type EventListenerOrEventListenerObject<T extends EventTarget = EventTarget> = EventListener<T> | EventListenerObject<T>;
2804528045
type FileSystemWriteChunkType = BufferSource | Blob | string | WriteParams;
2804628046
type Float32List = Float32Array | GLfloat[];
2804728047
type FormDataEntryValue = File | string;

‎baselines/serviceworker.generated.d.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -2202,7 +2202,7 @@ declare var ErrorEvent: {
22022202
*
22032203
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event)
22042204
*/
2205-
interface Event {
2205+
interface Event<T extends EventTarget = EventTarget> {
22062206
/**
22072207
* Returns true or false depending on how event was initialized. True if event goes through its target's ancestors in reverse tree order, and false otherwise.
22082208
*
@@ -2232,7 +2232,7 @@ interface Event {
22322232
*
22332233
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/currentTarget)
22342234
*/
2235-
readonly currentTarget: EventTarget | null;
2235+
readonly currentTarget: T | null;
22362236
/**
22372237
* Returns true if preventDefault() was invoked successfully to indicate cancelation, and false otherwise.
22382238
*
@@ -2268,7 +2268,7 @@ interface Event {
22682268
*
22692269
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/target)
22702270
*/
2271-
readonly target: EventTarget | null;
2271+
readonly target: T | null;
22722272
/**
22732273
* Returns the event's timestamp as the number of milliseconds measured relative to the time origin.
22742274
*
@@ -2326,12 +2326,12 @@ declare var Event: {
23262326
readonly BUBBLING_PHASE: 3;
23272327
};
23282328

2329-
interface EventListener {
2330-
(evt: Event): void;
2329+
interface EventListener<T extends EventTarget = EventTarget> {
2330+
(evt: Event<T>): void;
23312331
}
23322332

2333-
interface EventListenerObject {
2334-
handleEvent(object: Event): void;
2333+
interface EventListenerObject<T extends EventTarget = EventTarget> {
2334+
handleEvent(object: Event<T>): void;
23352335
}
23362336

23372337
interface EventSourceEventMap {
@@ -2414,7 +2414,7 @@ interface EventTarget {
24142414
*
24152415
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
24162416
*/
2417-
addEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: AddEventListenerOptions | boolean): void;
2417+
addEventListener(type: string, callback: EventListenerOrEventListenerObject<this> | null, options?: AddEventListenerOptions | boolean): void;
24182418
/**
24192419
* 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.
24202420
*
@@ -2426,7 +2426,7 @@ interface EventTarget {
24262426
*
24272427
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
24282428
*/
2429-
removeEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: EventListenerOptions | boolean): void;
2429+
removeEventListener(type: string, callback: EventListenerOrEventListenerObject<this> | null, options?: EventListenerOptions | boolean): void;
24302430
}
24312431

24322432
declare var EventTarget: {
@@ -8547,7 +8547,7 @@ type CSSUnparsedSegment = string | CSSVariableReferenceValue;
85478547
type CanvasImageSource = ImageBitmap | OffscreenCanvas;
85488548
type DOMHighResTimeStamp = number;
85498549
type EpochTimeStamp = number;
8550-
type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
8550+
type EventListenerOrEventListenerObject<T extends EventTarget = EventTarget> = EventListener<T> | EventListenerObject<T>;
85518551
type FileSystemWriteChunkType = BufferSource | Blob | string | WriteParams;
85528552
type Float32List = Float32Array | GLfloat[];
85538553
type FormDataEntryValue = File | string;

‎baselines/sharedworker.generated.d.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -2129,7 +2129,7 @@ declare var ErrorEvent: {
21292129
*
21302130
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event)
21312131
*/
2132-
interface Event {
2132+
interface Event<T extends EventTarget = EventTarget> {
21332133
/**
21342134
* Returns true or false depending on how event was initialized. True if event goes through its target's ancestors in reverse tree order, and false otherwise.
21352135
*
@@ -2159,7 +2159,7 @@ interface Event {
21592159
*
21602160
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/currentTarget)
21612161
*/
2162-
readonly currentTarget: EventTarget | null;
2162+
readonly currentTarget: T | null;
21632163
/**
21642164
* Returns true if preventDefault() was invoked successfully to indicate cancelation, and false otherwise.
21652165
*
@@ -2195,7 +2195,7 @@ interface Event {
21952195
*
21962196
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/target)
21972197
*/
2198-
readonly target: EventTarget | null;
2198+
readonly target: T | null;
21992199
/**
22002200
* Returns the event's timestamp as the number of milliseconds measured relative to the time origin.
22012201
*
@@ -2253,12 +2253,12 @@ declare var Event: {
22532253
readonly BUBBLING_PHASE: 3;
22542254
};
22552255

2256-
interface EventListener {
2257-
(evt: Event): void;
2256+
interface EventListener<T extends EventTarget = EventTarget> {
2257+
(evt: Event<T>): void;
22582258
}
22592259

2260-
interface EventListenerObject {
2261-
handleEvent(object: Event): void;
2260+
interface EventListenerObject<T extends EventTarget = EventTarget> {
2261+
handleEvent(object: Event<T>): void;
22622262
}
22632263

22642264
interface EventSourceEventMap {
@@ -2341,7 +2341,7 @@ interface EventTarget {
23412341
*
23422342
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
23432343
*/
2344-
addEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: AddEventListenerOptions | boolean): void;
2344+
addEventListener(type: string, callback: EventListenerOrEventListenerObject<this> | null, options?: AddEventListenerOptions | boolean): void;
23452345
/**
23462346
* 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.
23472347
*
@@ -2353,7 +2353,7 @@ interface EventTarget {
23532353
*
23542354
* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
23552355
*/
2356-
removeEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: EventListenerOptions | boolean): void;
2356+
removeEventListener(type: string, callback: EventListenerOrEventListenerObject<this> | null, options?: EventListenerOptions | boolean): void;
23572357
}
23582358

23592359
declare var EventTarget: {
@@ -8556,7 +8556,7 @@ type CSSUnparsedSegment = string | CSSVariableReferenceValue;
85568556
type CanvasImageSource = ImageBitmap | OffscreenCanvas;
85578557
type DOMHighResTimeStamp = number;
85588558
type EpochTimeStamp = number;
8559-
type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
8559+
type EventListenerOrEventListenerObject<T extends EventTarget = EventTarget> = EventListener<T> | EventListenerObject<T>;
85608560
type FileSystemWriteChunkType = BufferSource | Blob | string | WriteParams;
85618561
type Float32List = Float32Array | GLfloat[];
85628562
type FormDataEntryValue = File | string;

0 commit comments

Comments
 (0)