Merge branch 'main' into generic-typedarrays

rbuckton · rbuckton · commit 3c5c873d4761 · 2025-03-27T16:12:58.000-04:00
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -15697,8 +15697,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -28445,8 +28445,8 @@ interface IntersectionObserverCallback {
     (entries: IntersectionObserverEntry[], observer: IntersectionObserver): void;
 }
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface MediaSessionActionHandler {
diff --git a/baselines/serviceworker.generated.d.ts b/baselines/serviceworker.generated.d.ts
@@ -3746,8 +3746,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -8522,8 +8522,8 @@ interface Console {
 
 declare var console: Console;
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface OnErrorEventHandlerNonNull {
diff --git a/baselines/sharedworker.generated.d.ts b/baselines/sharedworker.generated.d.ts
@@ -3565,8 +3565,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -8460,8 +8460,8 @@ interface Console {
 
 declare var console: Console;
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface OnErrorEventHandlerNonNull {
diff --git a/baselines/ts5.5/dom.generated.d.ts b/baselines/ts5.5/dom.generated.d.ts
@@ -15677,8 +15677,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -28423,8 +28423,8 @@ interface IntersectionObserverCallback {
     (entries: IntersectionObserverEntry[], observer: IntersectionObserver): void;
 }
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface MediaSessionActionHandler {
diff --git a/baselines/ts5.5/serviceworker.generated.d.ts b/baselines/ts5.5/serviceworker.generated.d.ts
@@ -3746,8 +3746,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -8522,8 +8522,8 @@ interface Console {
 
 declare var console: Console;
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface OnErrorEventHandlerNonNull {
diff --git a/baselines/ts5.5/sharedworker.generated.d.ts b/baselines/ts5.5/sharedworker.generated.d.ts
@@ -3565,8 +3565,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -8460,8 +8460,8 @@ interface Console {
 
 declare var console: Console;
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface OnErrorEventHandlerNonNull {
diff --git a/baselines/ts5.5/webworker.generated.d.ts b/baselines/ts5.5/webworker.generated.d.ts
@@ -4300,8 +4300,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -9627,8 +9627,8 @@ interface FrameRequestCallback {
     (time: DOMHighResTimeStamp): void;
 }
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface OnErrorEventHandlerNonNull {
diff --git a/baselines/ts5.6/dom.generated.d.ts b/baselines/ts5.6/dom.generated.d.ts
@@ -15697,8 +15697,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -28445,8 +28445,8 @@ interface IntersectionObserverCallback {
     (entries: IntersectionObserverEntry[], observer: IntersectionObserver): void;
 }
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface MediaSessionActionHandler {
diff --git a/baselines/ts5.6/serviceworker.generated.d.ts b/baselines/ts5.6/serviceworker.generated.d.ts
@@ -3746,8 +3746,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -8522,8 +8522,8 @@ interface Console {
 
 declare var console: Console;
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface OnErrorEventHandlerNonNull {
diff --git a/baselines/ts5.6/sharedworker.generated.d.ts b/baselines/ts5.6/sharedworker.generated.d.ts
@@ -3565,8 +3565,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -8460,8 +8460,8 @@ interface Console {
 
 declare var console: Console;
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface OnErrorEventHandlerNonNull {
diff --git a/baselines/ts5.6/webworker.generated.d.ts b/baselines/ts5.6/webworker.generated.d.ts
@@ -4300,8 +4300,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -9627,8 +9627,8 @@ interface FrameRequestCallback {
     (time: DOMHighResTimeStamp): void;
 }
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface OnErrorEventHandlerNonNull {
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
@@ -4300,8 +4300,8 @@ interface LockManager {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */
     query(): Promise<LockManagerSnapshot>;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/request) */
-    request(name: string, callback: LockGrantedCallback): Promise<any>;
-    request(name: string, options: LockOptions, callback: LockGrantedCallback): Promise<any>;
+    request<T>(name: string, callback: LockGrantedCallback<T>): Promise<T>;
+    request<T>(name: string, options: LockOptions, callback: LockGrantedCallback<T>): Promise<T>;
 }
 
 declare var LockManager: {
@@ -9627,8 +9627,8 @@ interface FrameRequestCallback {
     (time: DOMHighResTimeStamp): void;
 }
 
-interface LockGrantedCallback {
-    (lock: Lock | null): any;
+interface LockGrantedCallback<T> {
+    (lock: Lock | null): T;
 }
 
 interface OnErrorEventHandlerNonNull {
diff --git a/inputfiles/overridingTypes.jsonc b/inputfiles/overridingTypes.jsonc
@@ -469,6 +469,18 @@
                 "overrideSignatures": [
                     "new (options: any): AudioWorkletProcessorImpl"
                 ]
+            },
+            "LockGrantedCallback": {
+                "typeParameters": [
+                    {
+                        "name": "T"
+                    }
+                ],
+                "signature": {
+                    "0": {
+                        "overrideType": "T"
+                    }
+                }
             }
         }
     },
@@ -3655,6 +3667,47 @@
                         }
                     }
                 }
+            },
+            "LockManager": {
+                "methods": {
+                    "method": {
+                        "request": {
+                            "typeParameters": {
+                                "name": "T"
+                            },
+                            "signature": {
+                                "0": {
+                                    "typeParameters": [
+                                        {
+                                            "name": "T"
+                                        }
+                                    ],
+                                    "param": [
+                                        {
+                                            "name": "callback",
+                                            "overrideType": "LockGrantedCallback<T>"
+                                        }
+                                    ],
+                                    "overrideType": "Promise<T>"
+                                },
+                                "1": {
+                                    "typeParameters": [
+                                        {
+                                            "name": "T"
+                                        }
+                                    ],
+                                    "param": [
+                                        {
+                                            "name": "callback",
+                                            "overrideType": "LockGrantedCallback<T>"
+                                        }
+                                    ],
+                                    "overrideType": "Promise<T>"
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
     },

Original file line number	Diff line number	Diff line change
`@@ -15697,8 +15697,8 @@ interface LockManager {`
`15697`	`15697`	`/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */`
`15698`	`15698`	`query(): Promise<LockManagerSnapshot>;`
`15699`	`15699`	`/** [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>;`
`15702`	`15702`	`}`
`15703`	`15703`
`15704`	`15704`	`declare var LockManager: {`
`@@ -28445,8 +28445,8 @@ interface IntersectionObserverCallback {`
`28445`	`28445`	`(entries: IntersectionObserverEntry[], observer: IntersectionObserver): void;`
`28446`	`28446`	`}`
`28447`	`28447`
`28448`		`-interface LockGrantedCallback {`
`28449`		`- (lock: Lock \| null): any;`
	`28448`	`+interface LockGrantedCallback<T> {`
	`28449`	`+ (lock: Lock \| null): T;`
`28450`	`28450`	`}`
`28451`	`28451`
`28452`	`28452`	`interface MediaSessionActionHandler {`
Original file line number	Diff line number	Diff line change
`@@ -15677,8 +15677,8 @@ interface LockManager {`
`15677`	`15677`	`/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */`
`15678`	`15678`	`query(): Promise<LockManagerSnapshot>;`
`15679`	`15679`	`/** [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>;`
`15682`	`15682`	`}`
`15683`	`15683`
`15684`	`15684`	`declare var LockManager: {`
`@@ -28423,8 +28423,8 @@ interface IntersectionObserverCallback {`
`28423`	`28423`	`(entries: IntersectionObserverEntry[], observer: IntersectionObserver): void;`
`28424`	`28424`	`}`
`28425`	`28425`
`28426`		`-interface LockGrantedCallback {`
`28427`		`- (lock: Lock \| null): any;`
	`28426`	`+interface LockGrantedCallback<T> {`
	`28427`	`+ (lock: Lock \| null): T;`
`28428`	`28428`	`}`
`28429`	`28429`
`28430`	`28430`	`interface MediaSessionActionHandler {`
Original file line number	Diff line number	Diff line change
`@@ -4300,8 +4300,8 @@ interface LockManager {`
`4300`	`4300`	`/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/LockManager/query) */`
`4301`	`4301`	`query(): Promise<LockManagerSnapshot>;`
`4302`	`4302`	`/** [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>;`
`4305`	`4305`	`}`
`4306`	`4306`
`4307`	`4307`	`declare var LockManager: {`
`@@ -9627,8 +9627,8 @@ interface FrameRequestCallback {`
`9627`	`9627`	`(time: DOMHighResTimeStamp): void;`
`9628`	`9628`	`}`
`9629`	`9629`
`9630`		`-interface LockGrantedCallback {`
`9631`		`- (lock: Lock \| null): any;`
	`9630`	`+interface LockGrantedCallback<T> {`
	`9631`	`+ (lock: Lock \| null): T;`
`9632`	`9632`	`}`
`9633`	`9633`
`9634`	`9634`	`interface OnErrorEventHandlerNonNull {`