🤖 Merge PR #58619 fix(node): make global URL decl compatible with lib…

… "webworker" by @antongolub * fix(node): make global ULR decl compatible with lib "webworker" relates #58277 #34960 * fix(node): improve global URL var type resolution * refactor(node): handle URLSeachParams var type collision in the same way as for URL * refactor(node): simplify type condition for global URL and URLSearchParams
DefinitelyTyped · Feb 14, 2022 · 118a383 · 118a383
1 parent 71ccdc3
commit 118a383
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 24 deletions.
diff --git a/types/node/url.d.ts b/types/node/url.d.ts
@@ -869,17 +869,21 @@ declare module 'url' {
          * https://nodejs.org/api/url.html#the-whatwg-url-api
          * @since v10.0.0
          */
-        var URL: typeof globalThis extends { webkitURL: infer URL } ? URL : typeof _URL;
+        var URL:
+            // For compatibility with "dom" and "webworker" URL declarations
+            typeof globalThis extends { onmessage: any, URL: infer URL }
+                ? URL
+                : typeof _URL;
         /**
          * `URLSearchParams` class is a global reference for `require('url').URLSearchParams`
          * https://nodejs.org/api/url.html#class-urlsearchparams
          * @since v10.0.0
          */
-        var URLSearchParams: {
-            prototype: URLSearchParams;
-            new(init?: string[][] | Record<string, string> | string | URLSearchParams): URLSearchParams;
-            toString(): string;
-        };
+        var URLSearchParams:
+            // For compatibility with "dom" and "webworker" URLSearchParams declarations
+            typeof globalThis extends { onmessage: any, URLSearchParams: infer URLSearchParams }
+                ? URLSearchParams
+                : typeof _URLSearchParams;
     }
 }
 declare module 'node:url' {

diff --git a/types/node/v12/url.d.ts b/types/node/v12/url.d.ts
@@ -128,16 +128,20 @@ declare module 'url' {
          * https://nodejs.org/api/url.html#the-whatwg-url-api
          * @since v10.0.0
          */
-        var URL: typeof globalThis extends { webkitURL: infer URL } ? URL : typeof _URL;
+        var URL:
+            // For compatibility with "dom" and "webworker" URL declarations
+            typeof globalThis extends { onmessage: any, URL: infer URL }
+                ? URL
+                : typeof _URL;
         /**
          * `URLSearchParams` class is a global reference for `require('url').URLSearchParams`.
          * https://nodejs.org/api/url.html#class-urlsearchparams
          * @since v10.0.0
          */
-        var URLSearchParams: {
-            prototype: URLSearchParams;
-            new(init?: string[][] | Record<string, string> | string | URLSearchParams): URLSearchParams;
-            toString(): string;
-        };
+        var URLSearchParams:
+            // For compatibility with "dom" and "webworker" URLSearchParams declarations
+            typeof globalThis extends { onmessage: any, URLSearchParams: infer URLSearchParams }
+                ? URLSearchParams
+                : typeof _URLSearchParams;
     }
 }
diff --git a/types/node/v14/url.d.ts b/types/node/v14/url.d.ts
@@ -127,17 +127,21 @@ declare module 'url' {
          * https://nodejs.org/api/url.html#the-whatwg-url-api
          * @since v10.0.0
          */
-        var URL: typeof globalThis extends { webkitURL: infer URL } ? URL : typeof _URL;
+        var URL:
+            // For compatibility with "dom" and "webworker" URL declarations
+            typeof globalThis extends { onmessage: any, URL: infer URL }
+                ? URL
+                : typeof _URL;
         /**
          * `URLSearchParams` class is a global reference for `require('url').URLSearchParams`.
          * https://nodejs.org/api/url.html#class-urlsearchparams
          * @since v10.0.0
          */
-        var URLSearchParams: {
-            prototype: URLSearchParams;
-            new(init?: string[][] | Record<string, string> | string | URLSearchParams): URLSearchParams;
-            toString(): string;
-        };
+        var URLSearchParams:
+            // For compatibility with "dom" and "webworker" URLSearchParams declarations
+            typeof globalThis extends { onmessage: any, URLSearchParams: infer URLSearchParams }
+                ? URLSearchParams
+                : typeof _URLSearchParams;
     }
 }
 declare module 'node:url' {

diff --git a/types/node/v16/url.d.ts b/types/node/v16/url.d.ts
@@ -829,17 +829,21 @@ declare module 'url' {
          * https://nodejs.org/api/url.html#the-whatwg-url-api
          * @since v10.0.0
          */
-        var URL: typeof globalThis extends { webkitURL: infer URL } ? URL : typeof _URL;
+        var URL:
+            // For compatibility with "dom" and "webworker" URL declarations
+            typeof globalThis extends { onmessage: any, URL: infer URL }
+                ? URL
+                : typeof _URL;
         /**
          * `URLSearchParams` class is a global reference for `require('url').URLSearchParams`.
          * https://nodejs.org/api/url.html#class-urlsearchparams
          * @since v10.0.0
          */
-        var URLSearchParams: {
-            prototype: URLSearchParams;
-            new(init?: string[][] | Record<string, string> | string | URLSearchParams): URLSearchParams;
-            toString(): string;
-        };
+        var URLSearchParams:
+            // For compatibility with "dom" and "webworker" URLSearchParams declarations
+            typeof globalThis extends { onmessage: any, URLSearchParams: infer URLSearchParams }
+                ? URLSearchParams
+                : typeof _URLSearchParams;
     }
 }
 declare module 'node:url' {