Correct LockManager.prototype.request return type with async callback (microsoft#2112)

Renegade334 · saschanaz · web-flow · commit 72684f05ab94 · 2025-08-26T20:00:31.000Z
Co-authored-by: saschanaz &lt;saschanaz@users.noreply.github.com&gt;
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -19777,8 +19777,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/serviceworker.generated.d.ts b/baselines/serviceworker.generated.d.ts
@@ -5030,8 +5030,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/sharedworker.generated.d.ts b/baselines/sharedworker.generated.d.ts
@@ -4713,8 +4713,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/ts5.5/dom.generated.d.ts b/baselines/ts5.5/dom.generated.d.ts
@@ -19756,8 +19756,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/ts5.5/serviceworker.generated.d.ts b/baselines/ts5.5/serviceworker.generated.d.ts
@@ -5030,8 +5030,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/ts5.5/sharedworker.generated.d.ts b/baselines/ts5.5/sharedworker.generated.d.ts
@@ -4713,8 +4713,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/ts5.5/webworker.generated.d.ts b/baselines/ts5.5/webworker.generated.d.ts
@@ -5859,8 +5859,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/ts5.6/dom.generated.d.ts b/baselines/ts5.6/dom.generated.d.ts
@@ -19777,8 +19777,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/ts5.6/serviceworker.generated.d.ts b/baselines/ts5.6/serviceworker.generated.d.ts
@@ -5030,8 +5030,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/ts5.6/sharedworker.generated.d.ts b/baselines/ts5.6/sharedworker.generated.d.ts
@@ -4713,8 +4713,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/ts5.6/webworker.generated.d.ts b/baselines/ts5.6/webworker.generated.d.ts
@@ -5859,8 +5859,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
@@ -5859,8 +5859,8 @@ interface LockManager {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)
      */
-    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
-    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;
 }
 
 declare var LockManager: {
diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc
@@ -3520,7 +3520,7 @@
                                             "overrideType": "LockGrantedCallback<T>"
                                         }
                                     ],
-                                    "overrideType": "Promise<T>"
+                                    "overrideType": "Promise<Awaited<T>>"
                                 },
                                 "1": {
                                     "typeParameters": [
@@ -3534,7 +3534,7 @@
                                             "overrideType": "LockGrantedCallback<T>"
                                         }
                                     ],
-                                    "overrideType": "Promise<T>"
+                                    "overrideType": "Promise<Awaited<T>>"
                                 }
                             }
                         }
diff --git a/unittests/files/lockmanager.ts b/unittests/files/lockmanager.ts
@@ -0,0 +1,3 @@
+let p: Promise<number>;
+p = new LockManager().request('sync', () => 0);
+p = new LockManager().request('async', async () => 0);

Original file line number	Diff line number	Diff line change
`@@ -19777,8 +19777,8 @@ interface LockManager {`
`19777`	`19777`	`*`
`19778`	`19778`	`* [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)`
`19779`	`19779`	`*/`
`19780`		`- request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;`
`19781`		`- request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;`
	`19780`	`+ request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
	`19781`	`+ request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
`19782`	`19782`	`}`
`19783`	`19783`
`19784`	`19784`	`declare var LockManager: {`
Original file line number	Diff line number	Diff line change
`@@ -5030,8 +5030,8 @@ interface LockManager {`
`5030`	`5030`	`*`
`5031`	`5031`	`* [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)`
`5032`	`5032`	`*/`
`5033`		`- request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;`
`5034`		`- request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;`
	`5033`	`+ request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
	`5034`	`+ request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
`5035`	`5035`	`}`
`5036`	`5036`
`5037`	`5037`	`declare var LockManager: {`
Original file line number	Diff line number	Diff line change
`@@ -4713,8 +4713,8 @@ interface LockManager {`
`4713`	`4713`	`*`
`4714`	`4714`	`* [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)`
`4715`	`4715`	`*/`
`4716`		`- request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;`
`4717`		`- request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;`
	`4716`	`+ request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
	`4717`	`+ request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
`4718`	`4718`	`}`
`4719`	`4719`
`4720`	`4720`	`declare var LockManager: {`
Original file line number	Diff line number	Diff line change
`@@ -19756,8 +19756,8 @@ interface LockManager {`
`19756`	`19756`	`*`
`19757`	`19757`	`* [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)`
`19758`	`19758`	`*/`
`19759`		`- request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;`
`19760`		`- request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;`
	`19759`	`+ request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
	`19760`	`+ request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
`19761`	`19761`	`}`
`19762`	`19762`
`19763`	`19763`	`declare var LockManager: {`
Original file line number	Diff line number	Diff line change
`@@ -5859,8 +5859,8 @@ interface LockManager {`
`5859`	`5859`	`*`
`5860`	`5860`	`* [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request)`
`5861`	`5861`	`*/`
`5862`		`- request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;`
`5863`		`- request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;`
	`5862`	`+ request<T>(name: string, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
	`5863`	`+ request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<Awaited<T>>;`
`5864`	`5864`	`}`
`5865`	`5865`
`5866`	`5866`	`declare var LockManager: {`