refactor(node): tweak up URL global type after tsc manual tests

DefinitelyTyped · Jan 19, 2022 · 0ac59f6 · 0ac59f6
1 parent 11fc7f5
commit 0ac59f6
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 33 deletions.
diff --git a/types/node/url.d.ts b/types/node/url.d.ts
@@ -858,22 +858,28 @@ declare module 'url' {
 
     import { URL as _URL, URLSearchParams as _URLSearchParams } from 'url';
     global {
+        interface URLSearchParams extends _URLSearchParams {}
+        interface URL extends _URL {}
         interface Global {
-            /**
-             * `URL` class is global.
-             * https://nodejs.org/api/url.html#the-whatwg-url-api
-             * @since v10.0.0
-             */
             URL: typeof _URL;
-            /**
-             * `URLSearchParams` class is global.
-             * https://nodejs.org/api/url.html#class-urlsearchparams
-             * @since v10.0.0
-             */
             URLSearchParams: typeof _URLSearchParams;
         }
-        interface URLSearchParams extends _URLSearchParams {}
-        interface URL extends _URL {}
+        /**
+         * `URL` class is global.
+         * 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;
+        /**
+         * `URLSearchParams` class is global.
+         * 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;
+        };
     }
 }
 declare module 'node:url' {

diff --git a/types/node/v12/url.d.ts b/types/node/v12/url.d.ts
@@ -117,13 +117,27 @@ declare module 'url' {
 
     import { URL as _URL, URLSearchParams as _URLSearchParams } from 'url';
     global {
-        namespace NodeJS {
-            interface Global {
-                URL: typeof _URL;
-                URLSearchParams: typeof _URLSearchParams;
-            }
-            interface URLSearchParams extends _URLSearchParams {}
-            interface URL extends _URL {}
+        interface URLSearchParams extends _URLSearchParams {}
+        interface URL extends _URL {}
+        interface Global {
+            URL: typeof _URL;
+            URLSearchParams: typeof _URLSearchParams;
         }
+        /**
+         * `URL` class is global.
+         * 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;
+        /**
+         * `URLSearchParams` class is global.
+         * 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;
+        };
     }
 }
diff --git a/types/node/v14/url.d.ts b/types/node/v14/url.d.ts
@@ -116,12 +116,28 @@ declare module 'url' {
 
     import { URL as _URL, URLSearchParams as _URLSearchParams } from 'url';
     global {
+        interface URLSearchParams extends _URLSearchParams {}
+        interface URL extends _URL {}
         interface Global {
             URL: typeof _URL;
             URLSearchParams: typeof _URLSearchParams;
         }
-        interface URLSearchParams extends _URLSearchParams {}
-        interface URL extends _URL {}
+        /**
+         * `URL` class is global.
+         * 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;
+        /**
+         * `URLSearchParams` class is global.
+         * 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;
+        };
     }
 }
 declare module 'node:url' {

diff --git a/types/node/v16/url.d.ts b/types/node/v16/url.d.ts
@@ -818,22 +818,28 @@ declare module 'url' {
 
     import { URL as _URL, URLSearchParams as _URLSearchParams } from 'url';
     global {
+        interface URLSearchParams extends _URLSearchParams {}
+        interface URL extends _URL {}
         interface Global {
-            /**
-             * `URL` class is global.
-             * https://nodejs.org/api/url.html#the-whatwg-url-api
-             * @since v10.0.0
-             */
             URL: typeof _URL;
-            /**
-             * `URLSearchParams` class is global.
-             * https://nodejs.org/api/url.html#class-urlsearchparams
-             * @since v10.0.0
-             */
             URLSearchParams: typeof _URLSearchParams;
         }
-        interface URLSearchParams extends _URLSearchParams {}
-        interface URL extends _URL {}
+        /**
+         * `URL` class is global.
+         * 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;
+        /**
+         * `URLSearchParams` class is global.
+         * 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;
+        };
     }
 }
 declare module 'node:url' {