Skip to content

Commit ecc0f5e

Browse files
turbocrimesaschanaz
turbocrime
and
saschanaz
authored
fix: LockManager.request promises the return of its callback parameter (microsoft#1947)
Co-authored-by: saschanaz <saschanaz@users.noreply.github.com>
1 parent 7191a93 commit ecc0f5e

9 files changed

+85
-32
lines changed

‎baselines/dom.generated.d.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15697,8 +15697,8 @@ interface LockManager {
1569715697
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
1569815698
query(): Promise<LockManagerSnapshot>;
1569915699
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
15700-
request(name: string, callback: LockGrantedCallback): Promise<any>;
15701-
request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
15700+
request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
15701+
request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
1570215702
}
1570315703

1570415704
declare var LockManager: {
@@ -28445,8 +28445,8 @@ interface IntersectionObserverCallback {
2844528445
(entries: IntersectionObserverEntry[], observer: IntersectionObserver): void;
2844628446
}
2844728447

28448-
interface LockGrantedCallback {
28449-
(lock: Lock | null): any;
28448+
interface LockGrantedCallback<T> {
28449+
(lock: Lock | null): T;
2845028450
}
2845128451

2845228452
interface MediaSessionActionHandler {

‎baselines/serviceworker.generated.d.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3746,8 +3746,8 @@ interface LockManager {
37463746
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
37473747
query(): Promise<LockManagerSnapshot>;
37483748
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
3749-
request(name: string, callback: LockGrantedCallback): Promise<any>;
3750-
request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
3749+
request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
3750+
request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
37513751
}
37523752

37533753
declare var LockManager: {
@@ -8522,8 +8522,8 @@ interface Console {
85228522

85238523
declare var console: Console;
85248524

8525-
interface LockGrantedCallback {
8526-
(lock: Lock | null): any;
8525+
interface LockGrantedCallback<T> {
8526+
(lock: Lock | null): T;
85278527
}
85288528

85298529
interface OnErrorEventHandlerNonNull {

‎baselines/sharedworker.generated.d.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3565,8 +3565,8 @@ interface LockManager {
35653565
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
35663566
query(): Promise<LockManagerSnapshot>;
35673567
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
3568-
request(name: string, callback: LockGrantedCallback): Promise<any>;
3569-
request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
3568+
request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
3569+
request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
35703570
}
35713571

35723572
declare var LockManager: {
@@ -8460,8 +8460,8 @@ interface Console {
84608460

84618461
declare var console: Console;
84628462

8463-
interface LockGrantedCallback {
8464-
(lock: Lock | null): any;
8463+
interface LockGrantedCallback<T> {
8464+
(lock: Lock | null): T;
84658465
}
84668466

84678467
interface OnErrorEventHandlerNonNull {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15677,8 +15677,8 @@ interface LockManager {
1567715677
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
1567815678
query(): Promise<LockManagerSnapshot>;
1567915679
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
15680-
request(name: string, callback: LockGrantedCallback): Promise<any>;
15681-
request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
15680+
request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
15681+
request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
1568215682
}
1568315683

1568415684
declare var LockManager: {
@@ -28423,8 +28423,8 @@ interface IntersectionObserverCallback {
2842328423
(entries: IntersectionObserverEntry[], observer: IntersectionObserver): void;
2842428424
}
2842528425

28426-
interface LockGrantedCallback {
28427-
(lock: Lock | null): any;
28426+
interface LockGrantedCallback<T> {
28427+
(lock: Lock | null): T;
2842828428
}
2842928429

2843028430
interface MediaSessionActionHandler {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3746,8 +3746,8 @@ interface LockManager {
37463746
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
37473747
query(): Promise<LockManagerSnapshot>;
37483748
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
3749-
request(name: string, callback: LockGrantedCallback): Promise<any>;
3750-
request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
3749+
request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
3750+
request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
37513751
}
37523752

37533753
declare var LockManager: {
@@ -8522,8 +8522,8 @@ interface Console {
85228522

85238523
declare var console: Console;
85248524

8525-
interface LockGrantedCallback {
8526-
(lock: Lock | null): any;
8525+
interface LockGrantedCallback<T> {
8526+
(lock: Lock | null): T;
85278527
}
85288528

85298529
interface OnErrorEventHandlerNonNull {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3565,8 +3565,8 @@ interface LockManager {
35653565
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
35663566
query(): Promise<LockManagerSnapshot>;
35673567
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
3568-
request(name: string, callback: LockGrantedCallback): Promise<any>;
3569-
request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
3568+
request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
3569+
request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
35703570
}
35713571

35723572
declare var LockManager: {
@@ -8460,8 +8460,8 @@ interface Console {
84608460

84618461
declare var console: Console;
84628462

8463-
interface LockGrantedCallback {
8464-
(lock: Lock | null): any;
8463+
interface LockGrantedCallback<T> {
8464+
(lock: Lock | null): T;
84658465
}
84668466

84678467
interface OnErrorEventHandlerNonNull {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4300,8 +4300,8 @@ interface LockManager {
43004300
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
43014301
query(): Promise<LockManagerSnapshot>;
43024302
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
4303-
request(name: string, callback: LockGrantedCallback): Promise<any>;
4304-
request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
4303+
request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
4304+
request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
43054305
}
43064306

43074307
declare var LockManager: {
@@ -9627,8 +9627,8 @@ interface FrameRequestCallback {
96279627
(time: DOMHighResTimeStamp): void;
96289628
}
96299629

9630-
interface LockGrantedCallback {
9631-
(lock: Lock | null): any;
9630+
interface LockGrantedCallback<T> {
9631+
(lock: Lock | null): T;
96329632
}
96339633

96349634
interface OnErrorEventHandlerNonNull {

‎baselines/webworker.generated.d.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4300,8 +4300,8 @@ interface LockManager {
43004300
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
43014301
query(): Promise<LockManagerSnapshot>;
43024302
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
4303-
request(name: string, callback: LockGrantedCallback): Promise<any>;
4304-
request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
4303+
request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
4304+
request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
43054305
}
43064306

43074307
declare var LockManager: {
@@ -9627,8 +9627,8 @@ interface FrameRequestCallback {
96279627
(time: DOMHighResTimeStamp): void;
96289628
}
96299629

9630-
interface LockGrantedCallback {
9631-
(lock: Lock | null): any;
9630+
interface LockGrantedCallback<T> {
9631+
(lock: Lock | null): T;
96329632
}
96339633

96349634
interface OnErrorEventHandlerNonNull {

‎inputfiles/overridingTypes.jsonc‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,18 @@
467467
"overrideSignatures": [
468468
"new (options: any): AudioWorkletProcessorImpl"
469469
]
470+
},
471+
"LockGrantedCallback": {
472+
"typeParameters": [
473+
{
474+
"name": "T"
475+
}
476+
],
477+
"signature": {
478+
"0": {
479+
"overrideType": "T"
480+
}
481+
}
470482
}
471483
}
472484
},
@@ -3643,6 +3655,47 @@
36433655
}
36443656
}
36453657
}
3658+
},
3659+
"LockManager": {
3660+
"methods": {
3661+
"method": {
3662+
"request": {
3663+
"typeParameters": {
3664+
"name": "T"
3665+
},
3666+
"signature": {
3667+
"0": {
3668+
"typeParameters": [
3669+
{
3670+
"name": "T"
3671+
}
3672+
],
3673+
"param": [
3674+
{
3675+
"name": "callback",
3676+
"overrideType": "LockGrantedCallback<T>"
3677+
}
3678+
],
3679+
"overrideType": "Promise<T>"
3680+
},
3681+
"1": {
3682+
"typeParameters": [
3683+
{
3684+
"name": "T"
3685+
}
3686+
],
3687+
"param": [
3688+
{
3689+
"name": "callback",
3690+
"overrideType": "LockGrantedCallback<T>"
3691+
}
3692+
],
3693+
"overrideType": "Promise<T>"
3694+
}
3695+
}
3696+
}
3697+
}
3698+
}
36463699
}
36473700
}
36483701
},

0 commit comments

Comments
 (0)