Skip to content

Commit 394c066

Browse files
authored
MessageEventTarget's events have type MessageEvent (microsoft#1881)
The override did not get added when the new mixin was introduced to Worker and MessagePort.
1 parent a5c716b commit 394c066

11 files changed

+58
-44
lines changed

baselines/audioworklet.generated.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,15 +678,15 @@ declare var MessageEvent: {
678678
};
679679

680680
interface MessageEventTargetEventMap {
681-
"message": Event;
682-
"messageerror": Event;
681+
"message": MessageEvent;
682+
"messageerror": MessageEvent;
683683
}
684684

685685
interface MessageEventTarget {
686686
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
687-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
687+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
688688
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
689-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
689+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
690690
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
691691
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
692692
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

baselines/dom.generated.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16385,15 +16385,15 @@ declare var MessageEvent: {
1638516385
};
1638616386

1638716387
interface MessageEventTargetEventMap {
16388-
"message": Event;
16389-
"messageerror": Event;
16388+
"message": MessageEvent;
16389+
"messageerror": MessageEvent;
1639016390
}
1639116391

1639216392
interface MessageEventTarget {
1639316393
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
16394-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
16394+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
1639516395
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
16396-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
16396+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
1639716397
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
1639816398
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
1639916399
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

baselines/serviceworker.generated.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3755,15 +3755,15 @@ declare var MessageEvent: {
37553755
};
37563756

37573757
interface MessageEventTargetEventMap {
3758-
"message": Event;
3759-
"messageerror": Event;
3758+
"message": MessageEvent;
3759+
"messageerror": MessageEvent;
37603760
}
37613761

37623762
interface MessageEventTarget {
37633763
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
3764-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
3764+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
37653765
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
3766-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
3766+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
37673767
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
37683768
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
37693769
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

baselines/sharedworker.generated.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3644,15 +3644,15 @@ declare var MessageEvent: {
36443644
};
36453645

36463646
interface MessageEventTargetEventMap {
3647-
"message": Event;
3648-
"messageerror": Event;
3647+
"message": MessageEvent;
3648+
"messageerror": MessageEvent;
36493649
}
36503650

36513651
interface MessageEventTarget {
36523652
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
3653-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
3653+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
36543654
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
3655-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
3655+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
36563656
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
36573657
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
36583658
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,15 +678,15 @@ declare var MessageEvent: {
678678
};
679679

680680
interface MessageEventTargetEventMap {
681-
"message": Event;
682-
"messageerror": Event;
681+
"message": MessageEvent;
682+
"messageerror": MessageEvent;
683683
}
684684

685685
interface MessageEventTarget {
686686
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
687-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
687+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
688688
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
689-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
689+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
690690
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
691691
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
692692
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16365,15 +16365,15 @@ declare var MessageEvent: {
1636516365
};
1636616366

1636716367
interface MessageEventTargetEventMap {
16368-
"message": Event;
16369-
"messageerror": Event;
16368+
"message": MessageEvent;
16369+
"messageerror": MessageEvent;
1637016370
}
1637116371

1637216372
interface MessageEventTarget {
1637316373
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
16374-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
16374+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
1637516375
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
16376-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
16376+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
1637716377
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
1637816378
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
1637916379
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3755,15 +3755,15 @@ declare var MessageEvent: {
37553755
};
37563756

37573757
interface MessageEventTargetEventMap {
3758-
"message": Event;
3759-
"messageerror": Event;
3758+
"message": MessageEvent;
3759+
"messageerror": MessageEvent;
37603760
}
37613761

37623762
interface MessageEventTarget {
37633763
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
3764-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
3764+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
37653765
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
3766-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
3766+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
37673767
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
37683768
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
37693769
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3644,15 +3644,15 @@ declare var MessageEvent: {
36443644
};
36453645

36463646
interface MessageEventTargetEventMap {
3647-
"message": Event;
3648-
"messageerror": Event;
3647+
"message": MessageEvent;
3648+
"messageerror": MessageEvent;
36493649
}
36503650

36513651
interface MessageEventTarget {
36523652
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
3653-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
3653+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
36543654
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
3655-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
3655+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
36563656
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
36573657
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
36583658
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4329,15 +4329,15 @@ declare var MessageEvent: {
43294329
};
43304330

43314331
interface MessageEventTargetEventMap {
4332-
"message": Event;
4333-
"messageerror": Event;
4332+
"message": MessageEvent;
4333+
"messageerror": MessageEvent;
43344334
}
43354335

43364336
interface MessageEventTarget {
43374337
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
4338-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
4338+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
43394339
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
4340-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
4340+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
43414341
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
43424342
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
43434343
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -9732,9 +9732,9 @@ declare function cancelAnimationFrame(handle: number): void;
97329732
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/requestAnimationFrame) */
97339733
declare function requestAnimationFrame(callback: FrameRequestCallback): number;
97349734
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
9735-
declare var onmessage: ((this: DedicatedWorkerGlobalScope, ev: Event) => any) | null;
9735+
declare var onmessage: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
97369736
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
9737-
declare var onmessageerror: ((this: DedicatedWorkerGlobalScope, ev: Event) => any) | null;
9737+
declare var onmessageerror: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
97389738
declare function addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
97399739
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
97409740
declare function removeEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

baselines/webworker.generated.d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4329,15 +4329,15 @@ declare var MessageEvent: {
43294329
};
43304330

43314331
interface MessageEventTargetEventMap {
4332-
"message": Event;
4333-
"messageerror": Event;
4332+
"message": MessageEvent;
4333+
"messageerror": MessageEvent;
43344334
}
43354335

43364336
interface MessageEventTarget {
43374337
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
4338-
onmessage: ((this: MessageEventTarget, ev: Event) => any) | null;
4338+
onmessage: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
43394339
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
4340-
onmessageerror: ((this: MessageEventTarget, ev: Event) => any) | null;
4340+
onmessageerror: ((this: MessageEventTarget, ev: MessageEvent) => any) | null;
43414341
addEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
43424342
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
43434343
removeEventListener<K extends keyof MessageEventTargetEventMap>(type: K, listener: (this: MessageEventTarget, ev: MessageEventTargetEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -9732,9 +9732,9 @@ declare function cancelAnimationFrame(handle: number): void;
97329732
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/requestAnimationFrame) */
97339733
declare function requestAnimationFrame(callback: FrameRequestCallback): number;
97349734
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event) */
9735-
declare var onmessage: ((this: DedicatedWorkerGlobalScope, ev: Event) => any) | null;
9735+
declare var onmessage: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
97369736
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event) */
9737-
declare var onmessageerror: ((this: DedicatedWorkerGlobalScope, ev: Event) => any) | null;
9737+
declare var onmessageerror: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
97389738
declare function addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
97399739
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
97409740
declare function removeEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | EventListenerOptions): void;

inputfiles/overridingTypes.jsonc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
{
22
"mixins": {
33
"mixin": {
4+
"MessageEventTarget": {
5+
"events": {
6+
"event": [
7+
{
8+
"name": "message",
9+
"type": "MessageEvent"
10+
},
11+
{
12+
"name": "messageerror",
13+
"type": "MessageEvent"
14+
}
15+
]
16+
}
17+
},
418
"ChildNode": {
519
"extends": "Node"
620
},

0 commit comments

Comments
 (0)