@types/node 24.3.0 → 24.3.2

node/README.md

@@ -8,7 +8,7 @@ This package contains type definitions for node (https://nodejs.org/).
 Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node.
 
 ### Additional Details
- * Last updated: Fri, 15 Aug 2025 08:39:32 GMT
+ * Last updated: Fri, 12 Sep 2025 19:32:39 GMT
  * Dependencies: [undici-types](https://npmjs.com/package/undici-types)
 
 # Credits

node/globals.d.ts

@@ -1,367 +1,168 @@
-export {}; // Make this a module
+declare var global: typeof globalThis;
 
-// #region Fetch and friends
-// Conditional type aliases, used at the end of this file.
-// Will either be empty if lib.dom (or lib.webworker) is included, or the undici version otherwise.
-type _Request = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").Request;
-type _Response = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").Response;
-type _FormData = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").FormData;
-type _Headers = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").Headers;
-type _MessageEvent = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").MessageEvent;
-type _RequestInit = typeof globalThis extends { onmessage: any } ? {}
-    : import("undici-types").RequestInit;
-type _ResponseInit = typeof globalThis extends { onmessage: any } ? {}
-    : import("undici-types").ResponseInit;
-type _WebSocket = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").WebSocket;
-type _EventSource = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").EventSource;
-type _CloseEvent = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").CloseEvent;
-// #endregion Fetch and friends
-
-// Conditional type definitions for webstorage interface, which conflicts with lib.dom otherwise.
-type _Storage = typeof globalThis extends { onabort: any } ? {} : {
-    readonly length: number;
-    clear(): void;
-    getItem(key: string): string | null;
-    key(index: number): string | null;
-    removeItem(key: string): void;
-    setItem(key: string, value: string): void;
-    [key: string]: any;
-};
-
-// #region DOMException
-type _DOMException = typeof globalThis extends { onmessage: any } ? {} : NodeDOMException;
-interface NodeDOMException extends Error {
-    readonly code: number;
-    readonly message: string;
-    readonly name: string;
-    readonly INDEX_SIZE_ERR: 1;
-    readonly DOMSTRING_SIZE_ERR: 2;
-    readonly HIERARCHY_REQUEST_ERR: 3;
-    readonly WRONG_DOCUMENT_ERR: 4;
-    readonly INVALID_CHARACTER_ERR: 5;
-    readonly NO_DATA_ALLOWED_ERR: 6;
-    readonly NO_MODIFICATION_ALLOWED_ERR: 7;
-    readonly NOT_FOUND_ERR: 8;
-    readonly NOT_SUPPORTED_ERR: 9;
-    readonly INUSE_ATTRIBUTE_ERR: 10;
-    readonly INVALID_STATE_ERR: 11;
-    readonly SYNTAX_ERR: 12;
-    readonly INVALID_MODIFICATION_ERR: 13;
-    readonly NAMESPACE_ERR: 14;
-    readonly INVALID_ACCESS_ERR: 15;
-    readonly VALIDATION_ERR: 16;
-    readonly TYPE_MISMATCH_ERR: 17;
-    readonly SECURITY_ERR: 18;
-    readonly NETWORK_ERR: 19;
-    readonly ABORT_ERR: 20;
-    readonly URL_MISMATCH_ERR: 21;
-    readonly QUOTA_EXCEEDED_ERR: 22;
-    readonly TIMEOUT_ERR: 23;
-    readonly INVALID_NODE_TYPE_ERR: 24;
-    readonly DATA_CLONE_ERR: 25;
-}
-interface NodeDOMExceptionConstructor {
-    prototype: DOMException;
-    new(message?: string, nameOrOptions?: string | { name?: string; cause?: unknown }): DOMException;
-    readonly INDEX_SIZE_ERR: 1;
-    readonly DOMSTRING_SIZE_ERR: 2;
-    readonly HIERARCHY_REQUEST_ERR: 3;
-    readonly WRONG_DOCUMENT_ERR: 4;
-    readonly INVALID_CHARACTER_ERR: 5;
-    readonly NO_DATA_ALLOWED_ERR: 6;
-    readonly NO_MODIFICATION_ALLOWED_ERR: 7;
-    readonly NOT_FOUND_ERR: 8;
-    readonly NOT_SUPPORTED_ERR: 9;
-    readonly INUSE_ATTRIBUTE_ERR: 10;
-    readonly INVALID_STATE_ERR: 11;
-    readonly SYNTAX_ERR: 12;
-    readonly INVALID_MODIFICATION_ERR: 13;
-    readonly NAMESPACE_ERR: 14;
-    readonly INVALID_ACCESS_ERR: 15;
-    readonly VALIDATION_ERR: 16;
-    readonly TYPE_MISMATCH_ERR: 17;
-    readonly SECURITY_ERR: 18;
-    readonly NETWORK_ERR: 19;
-    readonly ABORT_ERR: 20;
-    readonly URL_MISMATCH_ERR: 21;
-    readonly QUOTA_EXCEEDED_ERR: 22;
-    readonly TIMEOUT_ERR: 23;
-    readonly INVALID_NODE_TYPE_ERR: 24;
-    readonly DATA_CLONE_ERR: 25;
-}
-// #endregion DOMException
-
-declare global {
-    var global: typeof globalThis;
-
-    var process: NodeJS.Process;
-    var console: Console;
-
-    interface ErrorConstructor {
-        /**
-         * Creates a `.stack` property on `targetObject`, which when accessed returns
-         * a string representing the location in the code at which
-         * `Error.captureStackTrace()` was called.
-         *
-         * ```js
-         * const myObject = {};
-         * Error.captureStackTrace(myObject);
-         * myObject.stack;  // Similar to `new Error().stack`
-         * ```
-         *
-         * The first line of the trace will be prefixed with
-         * `${myObject.name}: ${myObject.message}`.
-         *
-         * The optional `constructorOpt` argument accepts a function. If given, all frames
-         * above `constructorOpt`, including `constructorOpt`, will be omitted from the
-         * generated stack trace.
-         *
-         * The `constructorOpt` argument is useful for hiding implementation
-         * details of error generation from the user. For instance:
-         *
-         * ```js
-         * function a() {
-         *   b();
-         * }
-         *
-         * function b() {
-         *   c();
-         * }
-         *
-         * function c() {
-         *   // Create an error without stack trace to avoid calculating the stack trace twice.
-         *   const { stackTraceLimit } = Error;
-         *   Error.stackTraceLimit = 0;
-         *   const error = new Error();
-         *   Error.stackTraceLimit = stackTraceLimit;
-         *
-         *   // Capture the stack trace above function b
-         *   Error.captureStackTrace(error, b); // Neither function c, nor b is included in the stack trace
-         *   throw error;
-         * }
-         *
-         * a();
-         * ```
-         */
-        captureStackTrace(targetObject: object, constructorOpt?: Function): void;
-        /**
-         * @see https://v8.dev/docs/stack-trace-api#customizing-stack-traces
-         */
-        prepareStackTrace(err: Error, stackTraces: NodeJS.CallSite[]): any;
-        /**
-         * The `Error.stackTraceLimit` property specifies the number of stack frames
-         * collected by a stack trace (whether generated by `new Error().stack` or
-         * `Error.captureStackTrace(obj)`).
-         *
-         * The default value is `10` but may be set to any valid JavaScript number. Changes
-         * will affect any stack trace captured _after_ the value has been changed.
-         *
-         * If set to a non-number value, or set to a negative number, stack traces will
-         * not capture any frames.
-         */
-        stackTraceLimit: number;
-    }
+declare var process: NodeJS.Process;
+declare var console: Console;
 
+interface ErrorConstructor {
     /**
-     * Enable this API with the `--expose-gc` CLI flag.
+     * Creates a `.stack` property on `targetObject`, which when accessed returns
+     * a string representing the location in the code at which
+     * `Error.captureStackTrace()` was called.
+     *
+     * ```js
+     * const myObject = {};
+     * Error.captureStackTrace(myObject);
+     * myObject.stack;  // Similar to `new Error().stack`
+     * ```
+     *
+     * The first line of the trace will be prefixed with
+     * `${myObject.name}: ${myObject.message}`.
+     *
+     * The optional `constructorOpt` argument accepts a function. If given, all frames
+     * above `constructorOpt`, including `constructorOpt`, will be omitted from the
+     * generated stack trace.
+     *
+     * The `constructorOpt` argument is useful for hiding implementation
+     * details of error generation from the user. For instance:
+     *
+     * ```js
+     * function a() {
+     *   b();
+     * }
+     *
+     * function b() {
+     *   c();
+     * }
+     *
+     * function c() {
+     *   // Create an error without stack trace to avoid calculating the stack trace twice.
+     *   const { stackTraceLimit } = Error;
+     *   Error.stackTraceLimit = 0;
+     *   const error = new Error();
+     *   Error.stackTraceLimit = stackTraceLimit;
+     *
+     *   // Capture the stack trace above function b
+     *   Error.captureStackTrace(error, b); // Neither function c, nor b is included in the stack trace
+     *   throw error;
+     * }
+     *
+     * a();
+     * ```
      */
-    var gc: NodeJS.GCFunction | undefined;
-
-    namespace NodeJS {
-        interface CallSite {
-            getColumnNumber(): number | null;
-            getEnclosingColumnNumber(): number | null;
-            getEnclosingLineNumber(): number | null;
-            getEvalOrigin(): string | undefined;
-            getFileName(): string | null;
-            getFunction(): Function | undefined;
-            getFunctionName(): string | null;
-            getLineNumber(): number | null;
-            getMethodName(): string | null;
-            getPosition(): number;
-            getPromiseIndex(): number | null;
-            getScriptHash(): string;
-            getScriptNameOrSourceURL(): string | null;
-            getThis(): unknown;
-            getTypeName(): string | null;
-            isAsync(): boolean;
-            isConstructor(): boolean;
-            isEval(): boolean;
-            isNative(): boolean;
-            isPromiseAll(): boolean;
-            isToplevel(): boolean;
-        }
-
-        interface ErrnoException extends Error {
-            errno?: number | undefined;
-            code?: string | undefined;
-            path?: string | undefined;
-            syscall?: string | undefined;
-        }
-
-        interface ReadableStream extends EventEmitter {
-            readable: boolean;
-            read(size?: number): string | Buffer;
-            setEncoding(encoding: BufferEncoding): this;
-            pause(): this;
-            resume(): this;
-            isPaused(): boolean;
-            pipe<T extends WritableStream>(destination: T, options?: { end?: boolean | undefined }): T;
-            unpipe(destination?: WritableStream): this;
-            unshift(chunk: string | Uint8Array, encoding?: BufferEncoding): void;
-            wrap(oldStream: ReadableStream): this;
-            [Symbol.asyncIterator](): AsyncIterableIterator<string | Buffer>;
-        }
-
-        interface WritableStream extends EventEmitter {
-            writable: boolean;
-            write(buffer: Uint8Array | string, cb?: (err?: Error | null) => void): boolean;
-            write(str: string, encoding?: BufferEncoding, cb?: (err?: Error | null) => void): boolean;
-            end(cb?: () => void): this;
-            end(data: string | Uint8Array, cb?: () => void): this;
-            end(str: string, encoding?: BufferEncoding, cb?: () => void): this;
-        }
-
-        interface ReadWriteStream extends ReadableStream, WritableStream {}
-
-        interface RefCounted {
-            ref(): this;
-            unref(): this;
-        }
-
-        interface Dict<T> {
-            [key: string]: T | undefined;
-        }
-
-        interface ReadOnlyDict<T> {
-            readonly [key: string]: T | undefined;
-        }
-
-        interface GCFunction {
-            (minor?: boolean): void;
-            (options: NodeJS.GCOptions & { execution: "async" }): Promise<void>;
-            (options: NodeJS.GCOptions): void;
-        }
-
-        interface GCOptions {
-            execution?: "sync" | "async" | undefined;
-            flavor?: "regular" | "last-resort" | undefined;
-            type?: "major-snapshot" | "major" | "minor" | undefined;
-            filename?: string | undefined;
-        }
-
-        /** An iterable iterator returned by the Node.js API. */
-        interface Iterator<T, TReturn = undefined, TNext = any> extends IteratorObject<T, TReturn, TNext> {
-            [Symbol.iterator](): NodeJS.Iterator<T, TReturn, TNext>;
-        }
+    captureStackTrace(targetObject: object, constructorOpt?: Function): void;
+    /**
+     * @see https://v8.dev/docs/stack-trace-api#customizing-stack-traces
+     */
+    prepareStackTrace(err: Error, stackTraces: NodeJS.CallSite[]): any;
+    /**
+     * The `Error.stackTraceLimit` property specifies the number of stack frames
+     * collected by a stack trace (whether generated by `new Error().stack` or
+     * `Error.captureStackTrace(obj)`).
+     *
+     * The default value is `10` but may be set to any valid JavaScript number. Changes
+     * will affect any stack trace captured _after_ the value has been changed.
+     *
+     * If set to a non-number value, or set to a negative number, stack traces will
+     * not capture any frames.
+     */
+    stackTraceLimit: number;
+}
 
-        /** An async iterable iterator returned by the Node.js API. */
-        interface AsyncIterator<T, TReturn = undefined, TNext = any> extends AsyncIteratorObject<T, TReturn, TNext> {
-            [Symbol.asyncIterator](): NodeJS.AsyncIterator<T, TReturn, TNext>;
-        }
+/**
+ * Enable this API with the `--expose-gc` CLI flag.
+ */
+declare var gc: NodeJS.GCFunction | undefined;
+
+declare namespace NodeJS {
+    interface CallSite {
+        getColumnNumber(): number | null;
+        getEnclosingColumnNumber(): number | null;
+        getEnclosingLineNumber(): number | null;
+        getEvalOrigin(): string | undefined;
+        getFileName(): string | null;
+        getFunction(): Function | undefined;
+        getFunctionName(): string | null;
+        getLineNumber(): number | null;
+        getMethodName(): string | null;
+        getPosition(): number;
+        getPromiseIndex(): number | null;
+        getScriptHash(): string;
+        getScriptNameOrSourceURL(): string | null;
+        getThis(): unknown;
+        getTypeName(): string | null;
+        isAsync(): boolean;
+        isConstructor(): boolean;
+        isEval(): boolean;
+        isNative(): boolean;
+        isPromiseAll(): boolean;
+        isToplevel(): boolean;
     }
 
-    // Global DOM types
-
-    interface DOMException extends _DOMException {}
-    var DOMException: typeof globalThis extends { onmessage: any; DOMException: infer T } ? T
-        : NodeDOMExceptionConstructor;
-
-    // #region AbortController
-    interface AbortController {
-        readonly signal: AbortSignal;
-        abort(reason?: any): void;
+    interface ErrnoException extends Error {
+        errno?: number | undefined;
+        code?: string | undefined;
+        path?: string | undefined;
+        syscall?: string | undefined;
     }
-    var AbortController: typeof globalThis extends { onmessage: any; AbortController: infer T } ? T
-        : {
-            prototype: AbortController;
-            new(): AbortController;
-        };
 
-    interface AbortSignal extends EventTarget {
-        readonly aborted: boolean;
-        onabort: ((this: AbortSignal, ev: Event) => any) | null;
-        readonly reason: any;
-        throwIfAborted(): void;
+    interface ReadableStream extends EventEmitter {
+        readable: boolean;
+        read(size?: number): string | Buffer;
+        setEncoding(encoding: BufferEncoding): this;
+        pause(): this;
+        resume(): this;
+        isPaused(): boolean;
+        pipe<T extends WritableStream>(destination: T, options?: { end?: boolean | undefined }): T;
+        unpipe(destination?: WritableStream): this;
+        unshift(chunk: string | Uint8Array, encoding?: BufferEncoding): void;
+        wrap(oldStream: ReadableStream): this;
+        [Symbol.asyncIterator](): AsyncIterableIterator<string | Buffer>;
     }
-    var AbortSignal: typeof globalThis extends { onmessage: any; AbortSignal: infer T } ? T
-        : {
-            prototype: AbortSignal;
-            new(): AbortSignal;
-            abort(reason?: any): AbortSignal;
-            any(signals: AbortSignal[]): AbortSignal;
-            timeout(milliseconds: number): AbortSignal;
-        };
-    // #endregion AbortController
-
-    // #region Storage
-    interface Storage extends _Storage {}
-    // Conditional on `onabort` rather than `onmessage`, in order to exclude lib.webworker
-    var Storage: typeof globalThis extends { onabort: any; Storage: infer T } ? T
-        : {
-            prototype: Storage;
-            new(): Storage;
-        };
-
-    var localStorage: Storage;
-    var sessionStorage: Storage;
-    // #endregion Storage
-
-    // #region fetch
-    interface RequestInit extends _RequestInit {}
 
-    function fetch(
-        input: string | URL | globalThis.Request,
-        init?: RequestInit,
-    ): Promise<Response>;
-
-    interface Request extends _Request {}
-    var Request: typeof globalThis extends {
-        onmessage: any;
-        Request: infer T;
-    } ? T
-        : typeof import("undici-types").Request;
+    interface WritableStream extends EventEmitter {
+        writable: boolean;
+        write(buffer: Uint8Array | string, cb?: (err?: Error | null) => void): boolean;
+        write(str: string, encoding?: BufferEncoding, cb?: (err?: Error | null) => void): boolean;
+        end(cb?: () => void): this;
+        end(data: string | Uint8Array, cb?: () => void): this;
+        end(str: string, encoding?: BufferEncoding, cb?: () => void): this;
+    }
 
-    interface ResponseInit extends _ResponseInit {}
+    interface ReadWriteStream extends ReadableStream, WritableStream {}
 
-    interface Response extends _Response {}
-    var Response: typeof globalThis extends {
-        onmessage: any;
-        Response: infer T;
-    } ? T
-        : typeof import("undici-types").Response;
+    interface RefCounted {
+        ref(): this;
+        unref(): this;
+    }
 
-    interface FormData extends _FormData {}
-    var FormData: typeof globalThis extends {
-        onmessage: any;
-        FormData: infer T;
-    } ? T
-        : typeof import("undici-types").FormData;
+    interface Dict<T> {
+        [key: string]: T | undefined;
+    }
 
-    interface Headers extends _Headers {}
-    var Headers: typeof globalThis extends {
-        onmessage: any;
-        Headers: infer T;
-    } ? T
-        : typeof import("undici-types").Headers;
+    interface ReadOnlyDict<T> {
+        readonly [key: string]: T | undefined;
+    }
 
-    interface MessageEvent extends _MessageEvent {}
-    var MessageEvent: typeof globalThis extends {
-        onmessage: any;
-        MessageEvent: infer T;
-    } ? T
-        : typeof import("undici-types").MessageEvent;
+    interface GCFunction {
+        (minor?: boolean): void;
+        (options: NodeJS.GCOptions & { execution: "async" }): Promise<void>;
+        (options: NodeJS.GCOptions): void;
+    }
 
-    interface WebSocket extends _WebSocket {}
-    var WebSocket: typeof globalThis extends { onmessage: any; WebSocket: infer T } ? T
-        : typeof import("undici-types").WebSocket;
+    interface GCOptions {
+        execution?: "sync" | "async" | undefined;
+        flavor?: "regular" | "last-resort" | undefined;
+        type?: "major-snapshot" | "major" | "minor" | undefined;
+        filename?: string | undefined;
+    }
 
-    interface EventSource extends _EventSource {}
-    var EventSource: typeof globalThis extends { onmessage: any; EventSource: infer T } ? T
-        : typeof import("undici-types").EventSource;
+    /** An iterable iterator returned by the Node.js API. */
+    interface Iterator<T, TReturn = undefined, TNext = any> extends IteratorObject<T, TReturn, TNext> {
+        [Symbol.iterator](): NodeJS.Iterator<T, TReturn, TNext>;
+    }
 
-    interface CloseEvent extends _CloseEvent {}
-    var CloseEvent: typeof globalThis extends { onmessage: any; CloseEvent: infer T } ? T
-        : typeof import("undici-types").CloseEvent;
-    // #endregion fetch
+    /** An async iterable iterator returned by the Node.js API. */
+    interface AsyncIterator<T, TReturn = undefined, TNext = any> extends AsyncIteratorObject<T, TReturn, TNext> {
+        [Symbol.asyncIterator](): NodeJS.AsyncIterator<T, TReturn, TNext>;
+    }
 }

node/http.d.ts

@@ -2031,15 +2031,15 @@ declare module "http" {
      * A browser-compatible implementation of [WebSocket](https://nodejs.org/docs/latest/api/http.html#websocket).
      * @since v22.5.0
      */
-    const WebSocket: import("undici-types").WebSocket;
+    const WebSocket: typeof import("undici-types").WebSocket;
     /**
      * @since v22.5.0
      */
-    const CloseEvent: import("undici-types").CloseEvent;
+    const CloseEvent: typeof import("undici-types").CloseEvent;
     /**
      * @since v22.5.0
      */
-    const MessageEvent: import("undici-types").MessageEvent;
+    const MessageEvent: typeof import("undici-types").MessageEvent;
 }
 declare module "node:http" {
     export * from "http";

node/index.d.ts

@@ -38,6 +38,12 @@
 
 // Definitions for Node.js modules that are not specific to any version of TypeScript:
 /// <reference path="globals.d.ts" />
+/// <reference path="web-globals/abortcontroller.d.ts" />
+/// <reference path="web-globals/domexception.d.ts" />
+/// <reference path="web-globals/events.d.ts" />
+/// <reference path="web-globals/fetch.d.ts" />
+/// <reference path="web-globals/navigator.d.ts" />
+/// <reference path="web-globals/storage.d.ts" />
 /// <reference path="assert.d.ts" />
 /// <reference path="assert/strict.d.ts" />
 /// <reference path="async_hooks.d.ts" />
@@ -53,7 +59,6 @@
 /// <reference path="dns/promises.d.ts" />
 /// <reference path="dns/promises.d.ts" />
 /// <reference path="domain.d.ts" />
-/// <reference path="dom-events.d.ts" />
 /// <reference path="events.d.ts" />
 /// <reference path="fs.d.ts" />
 /// <reference path="fs/promises.d.ts" />

node/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@types/node",
-    "version": "24.3.0",
+    "version": "24.3.2",
     "description": "TypeScript definitions for node",
     "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node",
     "license": "MIT",
@@ -150,6 +150,6 @@
         "undici-types": "~7.10.0"
     },
     "peerDependencies": {},
-    "typesPublisherContentHash": "1db0510763ba3afd8e54c0591e60a100a7b90926f5d7da28ae32d8f845d725da",
+    "typesPublisherContentHash": "51e862b120094aacc736611dfd6c115dca5d946c4391105b5149da165827bf5b",
     "typeScriptVersion": "5.2"
 }

node/ts5.6/index.d.ts

@@ -40,6 +40,12 @@
 
 // Definitions for Node.js modules that are not specific to any version of TypeScript:
 /// <reference path="../globals.d.ts" />
+/// <reference path="../web-globals/abortcontroller.d.ts" />
+/// <reference path="../web-globals/domexception.d.ts" />
+/// <reference path="../web-globals/events.d.ts" />
+/// <reference path="../web-globals/fetch.d.ts" />
+/// <reference path="../web-globals/navigator.d.ts" />
+/// <reference path="../web-globals/storage.d.ts" />
 /// <reference path="../assert.d.ts" />
 /// <reference path="../assert/strict.d.ts" />
 /// <reference path="../async_hooks.d.ts" />
@@ -55,7 +61,6 @@
 /// <reference path="../dns/promises.d.ts" />
 /// <reference path="../dns/promises.d.ts" />
 /// <reference path="../domain.d.ts" />
-/// <reference path="../dom-events.d.ts" />
 /// <reference path="../events.d.ts" />
 /// <reference path="../fs.d.ts" />
 /// <reference path="../fs/promises.d.ts" />

node/ts5.7/index.d.ts

@@ -40,6 +40,12 @@
 
 // Definitions for Node.js modules that are not specific to any version of TypeScript:
 /// <reference path="../globals.d.ts" />
+/// <reference path="../web-globals/abortcontroller.d.ts" />
+/// <reference path="../web-globals/domexception.d.ts" />
+/// <reference path="../web-globals/events.d.ts" />
+/// <reference path="../web-globals/fetch.d.ts" />
+/// <reference path="../web-globals/navigator.d.ts" />
+/// <reference path="../web-globals/storage.d.ts" />
 /// <reference path="../assert.d.ts" />
 /// <reference path="../assert/strict.d.ts" />
 /// <reference path="../async_hooks.d.ts" />
@@ -55,7 +61,6 @@
 /// <reference path="../dns/promises.d.ts" />
 /// <reference path="../dns/promises.d.ts" />
 /// <reference path="../domain.d.ts" />
-/// <reference path="../dom-events.d.ts" />
 /// <reference path="../events.d.ts" />
 /// <reference path="../fs.d.ts" />
 /// <reference path="../fs/promises.d.ts" />

node/web-globals/abortcontroller.d.ts

@@ -0,0 +1,34 @@
+export {};
+
+type _AbortController = typeof globalThis extends { onmessage: any } ? {} : AbortController;
+interface AbortController {
+    readonly signal: AbortSignal;
+    abort(reason?: any): void;
+}
+
+type _AbortSignal = typeof globalThis extends { onmessage: any } ? {} : AbortSignal;
+interface AbortSignal extends EventTarget {
+    readonly aborted: boolean;
+    onabort: ((this: AbortSignal, ev: Event) => any) | null;
+    readonly reason: any;
+    throwIfAborted(): void;
+}
+
+declare global {
+    interface AbortController extends _AbortController {}
+    var AbortController: typeof globalThis extends { onmessage: any; AbortController: infer T } ? T
+        : {
+            prototype: AbortController;
+            new(): AbortController;
+        };
+
+    interface AbortSignal extends _AbortSignal {}
+    var AbortSignal: typeof globalThis extends { onmessage: any; AbortSignal: infer T } ? T
+        : {
+            prototype: AbortSignal;
+            new(): AbortSignal;
+            abort(reason?: any): AbortSignal;
+            any(signals: AbortSignal[]): AbortSignal;
+            timeout(milliseconds: number): AbortSignal;
+        };
+}

node/web-globals/domexception.d.ts

@@ -0,0 +1,68 @@
+export {};
+
+type _DOMException = typeof globalThis extends { onmessage: any } ? {} : DOMException;
+interface DOMException extends Error {
+    readonly code: number;
+    readonly message: string;
+    readonly name: string;
+    readonly INDEX_SIZE_ERR: 1;
+    readonly DOMSTRING_SIZE_ERR: 2;
+    readonly HIERARCHY_REQUEST_ERR: 3;
+    readonly WRONG_DOCUMENT_ERR: 4;
+    readonly INVALID_CHARACTER_ERR: 5;
+    readonly NO_DATA_ALLOWED_ERR: 6;
+    readonly NO_MODIFICATION_ALLOWED_ERR: 7;
+    readonly NOT_FOUND_ERR: 8;
+    readonly NOT_SUPPORTED_ERR: 9;
+    readonly INUSE_ATTRIBUTE_ERR: 10;
+    readonly INVALID_STATE_ERR: 11;
+    readonly SYNTAX_ERR: 12;
+    readonly INVALID_MODIFICATION_ERR: 13;
+    readonly NAMESPACE_ERR: 14;
+    readonly INVALID_ACCESS_ERR: 15;
+    readonly VALIDATION_ERR: 16;
+    readonly TYPE_MISMATCH_ERR: 17;
+    readonly SECURITY_ERR: 18;
+    readonly NETWORK_ERR: 19;
+    readonly ABORT_ERR: 20;
+    readonly URL_MISMATCH_ERR: 21;
+    readonly QUOTA_EXCEEDED_ERR: 22;
+    readonly TIMEOUT_ERR: 23;
+    readonly INVALID_NODE_TYPE_ERR: 24;
+    readonly DATA_CLONE_ERR: 25;
+}
+
+declare global {
+    interface DOMException extends _DOMException {}
+    var DOMException: typeof globalThis extends { onmessage: any; DOMException: infer T } ? T
+        : {
+            prototype: DOMException;
+            new(message?: string, name?: string): DOMException;
+            new(message?: string, options?: { name?: string; cause?: unknown }): DOMException;
+            readonly INDEX_SIZE_ERR: 1;
+            readonly DOMSTRING_SIZE_ERR: 2;
+            readonly HIERARCHY_REQUEST_ERR: 3;
+            readonly WRONG_DOCUMENT_ERR: 4;
+            readonly INVALID_CHARACTER_ERR: 5;
+            readonly NO_DATA_ALLOWED_ERR: 6;
+            readonly NO_MODIFICATION_ALLOWED_ERR: 7;
+            readonly NOT_FOUND_ERR: 8;
+            readonly NOT_SUPPORTED_ERR: 9;
+            readonly INUSE_ATTRIBUTE_ERR: 10;
+            readonly INVALID_STATE_ERR: 11;
+            readonly SYNTAX_ERR: 12;
+            readonly INVALID_MODIFICATION_ERR: 13;
+            readonly NAMESPACE_ERR: 14;
+            readonly INVALID_ACCESS_ERR: 15;
+            readonly VALIDATION_ERR: 16;
+            readonly TYPE_MISMATCH_ERR: 17;
+            readonly SECURITY_ERR: 18;
+            readonly NETWORK_ERR: 19;
+            readonly ABORT_ERR: 20;
+            readonly URL_MISMATCH_ERR: 21;
+            readonly QUOTA_EXCEEDED_ERR: 22;
+            readonly TIMEOUT_ERR: 23;
+            readonly INVALID_NODE_TYPE_ERR: 24;
+            readonly DATA_CLONE_ERR: 25;
+        };
+}

node/{dom-events.d.ts → web-globals/events.d.ts}

@@ -1,37 +1,61 @@
-// Make this a module
 export {};
 
-// Conditional type aliases, which are later merged into the global scope.
-// Will either be empty if the relevant web library is already present, or the @types/node definition otherwise.
+interface AddEventListenerOptions extends EventListenerOptions {
+    once?: boolean;
+    passive?: boolean;
+    signal?: AbortSignal;
+}
 
-type __Event = typeof globalThis extends { onmessage: any } ? {} : Event;
+type _CustomEvent<T = any> = typeof globalThis extends { onmessage: any } ? {} : CustomEvent<T>;
+interface CustomEvent<T = any> extends Event {
+    readonly detail: T;
+}
+
+interface CustomEventInit<T = any> extends EventInit {
+    detail?: T;
+}
+
+type _Event = typeof globalThis extends { onmessage: any } ? {} : Event;
 interface Event {
     readonly bubbles: boolean;
     cancelBubble: boolean;
     readonly cancelable: boolean;
     readonly composed: boolean;
-    composedPath(): [EventTarget?];
     readonly currentTarget: EventTarget | null;
     readonly defaultPrevented: boolean;
     readonly eventPhase: 0 | 2;
-    initEvent(type: string, bubbles?: boolean, cancelable?: boolean): void;
     readonly isTrusted: boolean;
-    preventDefault(): void;
-    readonly returnValue: boolean;
+    returnValue: boolean;
     readonly srcElement: EventTarget | null;
-    stopImmediatePropagation(): void;
-    stopPropagation(): void;
     readonly target: EventTarget | null;
     readonly timeStamp: number;
     readonly type: string;
+    composedPath(): [EventTarget?];
+    initEvent(type: string, bubbles?: boolean, cancelable?: boolean): void;
+    preventDefault(): void;
+    stopImmediatePropagation(): void;
+    stopPropagation(): void;
 }
 
-type __CustomEvent<T = any> = typeof globalThis extends { onmessage: any } ? {} : CustomEvent<T>;
-interface CustomEvent<T = any> extends Event {
-    readonly detail: T;
+interface EventInit {
+    bubbles?: boolean;
+    cancelable?: boolean;
+    composed?: boolean;
+}
+
+interface EventListener {
+    (evt: Event): void;
+}
+
+interface EventListenerObject {
+    handleEvent(object: Event): void;
+}
+
+interface EventListenerOptions {
+    capture?: boolean;
 }
 
-type __EventTarget = typeof globalThis extends { onmessage: any } ? {} : EventTarget;
+type _EventTarget = typeof globalThis extends { onmessage: any } ? {} : EventTarget;
 interface EventTarget {
     addEventListener(
         type: string,
@@ -46,51 +70,22 @@ interface EventTarget {
     ): void;
 }
 
-interface EventInit {
-    bubbles?: boolean;
-    cancelable?: boolean;
-    composed?: boolean;
-}
-
-interface CustomEventInit<T = any> extends EventInit {
-    detail?: T;
-}
-
-interface EventListenerOptions {
-    capture?: boolean;
-}
-
-interface AddEventListenerOptions extends EventListenerOptions {
-    once?: boolean;
-    passive?: boolean;
-    signal?: AbortSignal;
-}
-
-interface EventListener {
-    (evt: Event): void;
-}
-
-interface EventListenerObject {
-    handleEvent(object: Event): void;
-}
-
-// Merge conditional interfaces into global scope, and conditionally declare global constructors.
 declare global {
-    interface Event extends __Event {}
-    var Event: typeof globalThis extends { onmessage: any; Event: infer T } ? T
-        : {
-            prototype: Event;
-            new(type: string, eventInitDict?: EventInit): Event;
-        };
-
-    interface CustomEvent<T = any> extends __CustomEvent<T> {}
+    interface CustomEvent<T = any> extends _CustomEvent<T> {}
     var CustomEvent: typeof globalThis extends { onmessage: any; CustomEvent: infer T } ? T
         : {
             prototype: CustomEvent;
             new<T>(type: string, eventInitDict?: CustomEventInit<T>): CustomEvent<T>;
         };
 
-    interface EventTarget extends __EventTarget {}
+    interface Event extends _Event {}
+    var Event: typeof globalThis extends { onmessage: any; Event: infer T } ? T
+        : {
+            prototype: Event;
+            new(type: string, eventInitDict?: EventInit): Event;
+        };
+
+    interface EventTarget extends _EventTarget {}
     var EventTarget: typeof globalThis extends { onmessage: any; EventTarget: infer T } ? T
         : {
             prototype: EventTarget;

node/web-globals/fetch.d.ts

@@ -0,0 +1,50 @@
+export {};
+
+import * as undici from "undici-types";
+
+type _CloseEvent = typeof globalThis extends { onmessage: any } ? {} : undici.CloseEvent;
+type _EventSource = typeof globalThis extends { onmessage: any } ? {} : undici.EventSource;
+type _FormData = typeof globalThis extends { onmessage: any } ? {} : undici.FormData;
+type _Headers = typeof globalThis extends { onmessage: any } ? {} : undici.Headers;
+type _MessageEvent = typeof globalThis extends { onmessage: any } ? {} : undici.MessageEvent;
+type _Request = typeof globalThis extends { onmessage: any } ? {} : undici.Request;
+type _RequestInit = typeof globalThis extends { onmessage: any } ? {} : undici.RequestInit;
+type _Response = typeof globalThis extends { onmessage: any } ? {} : undici.Response;
+type _ResponseInit = typeof globalThis extends { onmessage: any } ? {} : undici.ResponseInit;
+type _WebSocket = typeof globalThis extends { onmessage: any } ? {} : undici.WebSocket;
+
+declare global {
+    function fetch(
+        input: string | URL | Request,
+        init?: RequestInit,
+    ): Promise<Response>;
+
+    interface CloseEvent extends _CloseEvent {}
+    var CloseEvent: typeof globalThis extends { onmessage: any; CloseEvent: infer T } ? T : typeof undici.CloseEvent;
+
+    interface EventSource extends _EventSource {}
+    var EventSource: typeof globalThis extends { onmessage: any; EventSource: infer T } ? T : typeof undici.EventSource;
+
+    interface FormData extends _FormData {}
+    var FormData: typeof globalThis extends { onmessage: any; FormData: infer T } ? T : typeof undici.FormData;
+
+    interface Headers extends _Headers {}
+    var Headers: typeof globalThis extends { onmessage: any; Headers: infer T } ? T : typeof undici.Headers;
+
+    interface MessageEvent extends _MessageEvent {}
+    var MessageEvent: typeof globalThis extends { onmessage: any; MessageEvent: infer T } ? T
+        : typeof undici.MessageEvent;
+
+    interface Request extends _Request {}
+    var Request: typeof globalThis extends { onmessage: any; Request: infer T } ? T : typeof undici.Request;
+
+    interface RequestInit extends _RequestInit {}
+
+    interface Response extends _Response {}
+    var Response: typeof globalThis extends { onmessage: any; Response: infer T } ? T : typeof undici.Response;
+
+    interface ResponseInit extends _ResponseInit {}
+
+    interface WebSocket extends _WebSocket {}
+    var WebSocket: typeof globalThis extends { onmessage: any; WebSocket: infer T } ? T : typeof undici.WebSocket;
+}

node/web-globals/navigator.d.ts

@@ -0,0 +1,22 @@
+export {};
+
+// lib.webworker has `WorkerNavigator` rather than `Navigator`, so conditionals use `onabort` instead of `onmessage`
+type _Navigator = typeof globalThis extends { onabort: any } ? {} : Navigator;
+interface Navigator {
+    readonly hardwareConcurrency: number;
+    readonly language: string;
+    readonly languages: readonly string[];
+    readonly platform: string;
+    readonly userAgent: string;
+}
+
+declare global {
+    interface Navigator extends _Navigator {}
+    var Navigator: typeof globalThis extends { onabort: any; Navigator: infer T } ? T : {
+        prototype: Navigator;
+        new(): Navigator;
+    };
+
+    // Needs conditional inference for lib.dom and lib.webworker compatibility
+    var navigator: typeof globalThis extends { onmessage: any; navigator: infer T } ? T : Navigator;
+}

node/web-globals/storage.d.ts

@@ -0,0 +1,24 @@
+export {};
+
+// These interfaces are absent from lib.webworker, so the conditionals use `onabort` rather than `onmessage`
+type _Storage = typeof globalThis extends { onabort: any } ? {} : Storage;
+interface Storage {
+    readonly length: number;
+    clear(): void;
+    getItem(key: string): string | null;
+    key(index: number): string | null;
+    removeItem(key: string): void;
+    setItem(key: string, value: string): void;
+    [key: string]: any;
+}
+
+declare global {
+    interface Storage extends _Storage {}
+    var Storage: typeof globalThis extends { onabort: any; Storage: infer T } ? T : {
+        prototype: Storage;
+        new(): Storage;
+    };
+
+    var localStorage: Storage;
+    var sessionStorage: Storage;
+}