@types/node 14.6.0 → 14.6.4

node/README.md

@@ -8,9 +8,9 @@ This package contains type definitions for Node.js (http://nodejs.org/).
 Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node.
 
 ### Additional Details
- * Last updated: Mon, 17 Aug 2020 14:33:28 GMT
+ * Last updated: Thu, 03 Sep 2020 22:13:20 GMT
  * Dependencies: none
- * Global values: `Buffer`, `Symbol`, `__dirname`, `__filename`, `clearImmediate`, `clearInterval`, `clearTimeout`, `console`, `exports`, `global`, `module`, `process`, `queueMicrotask`, `require`, `setImmediate`, `setInterval`, `setTimeout`
+ * Global values: `Buffer`, `__dirname`, `__filename`, `clearImmediate`, `clearInterval`, `clearTimeout`, `console`, `exports`, `global`, `module`, `process`, `queueMicrotask`, `require`, `setImmediate`, `setInterval`, `setTimeout`, `Symbol`
 
 # Credits
 These definitions were written by [Microsoft TypeScript](https://github.com/Microsoft), [DefinitelyTyped](https://github.com/DefinitelyTyped), [Alberto Schiabel](https://github.com/jkomyno), [Alexander T.](https://github.com/a-tarasyuk), [Alvis HT Tang](https://github.com/alvis), [Andrew Makarov](https://github.com/r3nya), [Benjamin Toueg](https://github.com/btoueg), [Bruno Scheufler](https://github.com/brunoscheufler), [Chigozirim C.](https://github.com/smac89), [David Junger](https://github.com/touffy), [Deividas Bakanas](https://github.com/DeividasBakanas), [Eugene Y. Q. Shen](https://github.com/eyqs), [Flarna](https://github.com/Flarna), [Hannes Magnusson](https://github.com/Hannes-Magnusson-CK), [Hoàng Văn Khải](https://github.com/KSXGitHub), [Huw](https://github.com/hoo29), [Kelvin Jin](https://github.com/kjin), [Klaus Meinhardt](https://github.com/ajafff), [Lishude](https://github.com/islishude), [Mariusz Wiktorczyk](https://github.com/mwiktorczyk), [Mohsen Azimi](https://github.com/mohsen1), [Nicolas Even](https://github.com/n-e), [Nikita Galkin](https://github.com/galkin), [Parambir Singh](https://github.com/parambirs), [Sebastian Silbermann](https://github.com/eps1lon), [Simon Schick](https://github.com/SimonSchick), [Thomas den Hollander](https://github.com/ThomasdenH), [Wilco Bakker](https://github.com/WilcoBakker), [wwwy3y3](https://github.com/wwwy3y3), [Samuel Ainsworth](https://github.com/samuela), [Kyle Uehlein](https://github.com/kuehlein), [Jordi Oliveras Rovira](https://github.com/j-oliveras), [Thanik Bhongbhibhat](https://github.com/bhongy), [Marcin Kopacz](https://github.com/chyzwar), [Trivikram Kamat](https://github.com/trivikr), [Minh Son Nguyen](https://github.com/nguymin4), [Junxiao Shi](https://github.com/yoursunny), [Ilia Baryshnikov](https://github.com/qwelias), [ExE Boss](https://github.com/ExE-Boss), [Surasak Chaisurin](https://github.com/Ryan-Willpower), [Piotr Błażejewicz](https://github.com/peterblazejewicz), [Anna Henningsen](https://github.com/addaleax), and [Jason Kwok](https://github.com/JasonHK).

node/assert.d.ts

@@ -1,5 +1,5 @@
 declare module "assert" {
-    function assert(value: any, message?: string | Error): void;
+    function assert(value: any, message?: string | Error): asserts value;
     namespace assert {
         class AssertionError implements Error {
             name: string;
@@ -19,20 +19,20 @@ declare module "assert" {
         type AssertPredicate = RegExp | (new() => object) | ((thrown: any) => boolean) | object | Error;
 
         function fail(message?: string | Error): never;
-        /** @deprecated since v10.0.0 - use `fail([message])` or other assert functions instead. */
+        /** @deprecated since v10.0.0 - use fail([message]) or other assert functions instead. */
         function fail(actual: any, expected: any, message?: string | Error, operator?: string, stackStartFn?: Function): never;
-        function ok(value: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use `strictEqual()` instead. */
+        function ok(value: any, message?: string | Error): asserts value;
+        /** @deprecated since v9.9.0 - use strictEqual() instead. */
         function equal(actual: any, expected: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use `notStrictEqual()` instead. */
+        /** @deprecated since v9.9.0 - use notStrictEqual() instead. */
         function notEqual(actual: any, expected: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use `deepStrictEqual()` instead. */
+        /** @deprecated since v9.9.0 - use deepStrictEqual() instead. */
         function deepEqual(actual: any, expected: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use `notDeepStrictEqual()` instead. */
+        /** @deprecated since v9.9.0 - use notDeepStrictEqual() instead. */
         function notDeepEqual(actual: any, expected: any, message?: string | Error): void;
-        function strictEqual(actual: any, expected: any, message?: string | Error): void;
+        function strictEqual<T>(actual: any, expected: T, message?: string | Error): asserts actual is T;
         function notStrictEqual(actual: any, expected: any, message?: string | Error): void;
-        function deepStrictEqual(actual: any, expected: any, message?: string | Error): void;
+        function deepStrictEqual<T>(actual: any, expected: T, message?: string | Error): asserts actual is T;
         function notDeepStrictEqual(actual: any, expected: any, message?: string | Error): void;
 
         function throws(block: () => any, message?: string | Error): void;
@@ -40,7 +40,7 @@ declare module "assert" {
         function doesNotThrow(block: () => any, message?: string | Error): void;
         function doesNotThrow(block: () => any, error: RegExp | Function, message?: string | Error): void;
 
-        function ifError(value: any): void;
+        function ifError(value: any): asserts value is null | undefined;
 
         function rejects(block: (() => Promise<any>) | Promise<any>, message?: string | Error): Promise<void>;
         function rejects(block: (() => Promise<any>) | Promise<any>, error: AssertPredicate, message?: string | Error): Promise<void>;

node/base.d.ts

@@ -1,41 +1,20 @@
-// base definitions for all NodeJS modules that are not specific to any version of TypeScript
-/// <reference path="globals.d.ts" />
-/// <reference path="async_hooks.d.ts" />
-/// <reference path="buffer.d.ts" />
-/// <reference path="child_process.d.ts" />
-/// <reference path="cluster.d.ts" />
-/// <reference path="console.d.ts" />
-/// <reference path="constants.d.ts" />
-/// <reference path="crypto.d.ts" />
-/// <reference path="dgram.d.ts" />
-/// <reference path="dns.d.ts" />
-/// <reference path="domain.d.ts" />
-/// <reference path="events.d.ts" />
-/// <reference path="fs.d.ts" />
-/// <reference path="fs/promises.d.ts" />
-/// <reference path="http.d.ts" />
-/// <reference path="http2.d.ts" />
-/// <reference path="https.d.ts" />
-/// <reference path="inspector.d.ts" />
-/// <reference path="module.d.ts" />
-/// <reference path="net.d.ts" />
-/// <reference path="os.d.ts" />
-/// <reference path="path.d.ts" />
-/// <reference path="perf_hooks.d.ts" />
-/// <reference path="process.d.ts" />
-/// <reference path="punycode.d.ts" />
-/// <reference path="querystring.d.ts" />
-/// <reference path="readline.d.ts" />
-/// <reference path="repl.d.ts" />
-/// <reference path="stream.d.ts" />
-/// <reference path="string_decoder.d.ts" />
-/// <reference path="timers.d.ts" />
-/// <reference path="tls.d.ts" />
-/// <reference path="trace_events.d.ts" />
-/// <reference path="tty.d.ts" />
-/// <reference path="url.d.ts" />
-/// <reference path="util.d.ts" />
-/// <reference path="v8.d.ts" />
-/// <reference path="vm.d.ts" />
-/// <reference path="worker_threads.d.ts" />
-/// <reference path="zlib.d.ts" />
+// NOTE: These definitions support NodeJS and TypeScript 3.7.
+
+// NOTE: TypeScript version-specific augmentations can be found in the following paths:
+//          - ~/base.d.ts         - Shared definitions common to all TypeScript versions
+//          - ~/index.d.ts        - Definitions specific to TypeScript 2.1
+//          - ~/ts3.7/base.d.ts   - Definitions specific to TypeScript 3.7
+//          - ~/ts3.7/index.d.ts  - Definitions specific to TypeScript 3.7 with assert pulled in
+
+// Reference required types from the default lib:
+/// <reference lib="es2018" />
+/// <reference lib="esnext.asynciterable" />
+/// <reference lib="esnext.intl" />
+/// <reference lib="esnext.bigint" />
+
+// Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="ts3.6/base.d.ts" />
+
+// TypeScript 3.7-specific augmentations:
+/// <reference path="assert.d.ts" />

node/index.d.ts

@@ -45,7 +45,10 @@
 //                 Jason Kwok <https://github.com/JasonHK>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// NOTE: These definitions support NodeJS and TypeScript 3.5.
+// NOTE: These definitions support NodeJS and TypeScript 3.7.
+// Typically type modifications should be made in base.d.ts instead of here
+
+/// <reference path="base.d.ts" />
 
 // NOTE: TypeScript version-specific augmentations can be found in the following paths:
 //          - ~/base.d.ts         - Shared definitions common to all TypeScript versions
@@ -55,37 +58,3 @@
 // NOTE: Augmentations for TypeScript 3.5 and later should use individual files for overrides
 //       within the respective ~/ts3.5 (or later) folder. However, this is disallowed for versions
 //       prior to TypeScript 3.5, so the older definitions will be found here.
-
-// Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
-/// <reference path="base.d.ts" />
-
-// We can't include globals.global.d.ts in globals.d.ts, as it'll cause duplication errors in TypeScript 3.5+
-/// <reference path="globals.global.d.ts" />
-
-// We can't include assert.d.ts in base.d.ts, as it'll cause duplication errors in TypeScript 3.7+
-/// <reference path="assert.d.ts" />
-
-// Forward-declarations for needed types from es2015 and later (in case users are using `--lib es5`)
-// Empty interfaces are used here which merge fine with the real declarations in the lib XXX files
-// just to ensure the names are known and node typings can be used without importing these libs.
-// if someone really needs these types the libs need to be added via --lib or in tsconfig.json
-interface AsyncIterable<T> { }
-interface IterableIterator<T> { }
-interface AsyncIterableIterator<T> {}
-interface SymbolConstructor {
-    readonly asyncIterator: symbol;
-}
-declare var Symbol: SymbolConstructor;
-// even this is just a forward declaration some properties are added otherwise
-// it would be allowed to pass anything to e.g. Buffer.from()
-interface SharedArrayBuffer {
-    readonly byteLength: number;
-    slice(begin?: number, end?: number): SharedArrayBuffer;
-}
-
-declare module "util" {
-    namespace types {
-        function isBigInt64Array(value: any): boolean;
-        function isBigUint64Array(value: any): boolean;
-    }
-}

node/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@types/node",
-    "version": "14.6.0",
+    "version": "14.6.4",
     "description": "TypeScript definitions for Node.js",
     "license": "MIT",
     "contributors": [
@@ -223,19 +223,19 @@
     "main": "",
     "types": "index.d.ts",
     "typesVersions": {
-        ">=3.7.0-0": {
+        "<=3.1": {
             "*": [
-                "ts3.7/*"
+                "ts3.1/*"
             ]
         },
-        ">=3.5.0-0": {
+        "<=3.4": {
             "*": [
-                "ts3.5/*"
+                "ts3.4/*"
             ]
         },
-        ">=3.2.0-0": {
+        "<=3.6": {
             "*": [
-                "ts3.2/*"
+                "ts3.6/*"
             ]
         }
     },
@@ -246,6 +246,6 @@
     },
     "scripts": {},
     "dependencies": {},
-    "typesPublisherContentHash": "9d0f004e6461e52f8fa5badd6efa10f2dc7d2156363fcb7ca879e15a611c96f0",
-    "typeScriptVersion": "3.0"
+    "typesPublisherContentHash": "5fc739401176088207c6f60e9d6b833ad5ae4b6a6edc1548b9665013878f8ac0",
+    "typeScriptVersion": "3.1"
 }

node/{ts3.7 → ts3.1}/assert.d.ts

@@ -1,5 +1,5 @@
 declare module "assert" {
-    function assert(value: any, message?: string | Error): asserts value;
+    function assert(value: any, message?: string | Error): void;
     namespace assert {
         class AssertionError implements Error {
             name: string;
@@ -19,20 +19,20 @@ declare module "assert" {
         type AssertPredicate = RegExp | (new() => object) | ((thrown: any) => boolean) | object | Error;
 
         function fail(message?: string | Error): never;
-        /** @deprecated since v10.0.0 - use fail([message]) or other assert functions instead. */
+        /** @deprecated since v10.0.0 - use `fail([message])` or other assert functions instead. */
         function fail(actual: any, expected: any, message?: string | Error, operator?: string, stackStartFn?: Function): never;
-        function ok(value: any, message?: string | Error): asserts value;
-        /** @deprecated since v9.9.0 - use strictEqual() instead. */
+        function ok(value: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use `strictEqual()` instead. */
         function equal(actual: any, expected: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use notStrictEqual() instead. */
+        /** @deprecated since v9.9.0 - use `notStrictEqual()` instead. */
         function notEqual(actual: any, expected: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use deepStrictEqual() instead. */
+        /** @deprecated since v9.9.0 - use `deepStrictEqual()` instead. */
         function deepEqual(actual: any, expected: any, message?: string | Error): void;
-        /** @deprecated since v9.9.0 - use notDeepStrictEqual() instead. */
+        /** @deprecated since v9.9.0 - use `notDeepStrictEqual()` instead. */
         function notDeepEqual(actual: any, expected: any, message?: string | Error): void;
-        function strictEqual<T>(actual: any, expected: T, message?: string | Error): asserts actual is T;
+        function strictEqual(actual: any, expected: any, message?: string | Error): void;
         function notStrictEqual(actual: any, expected: any, message?: string | Error): void;
-        function deepStrictEqual<T>(actual: any, expected: T, message?: string | Error): asserts actual is T;
+        function deepStrictEqual(actual: any, expected: any, message?: string | Error): void;
         function notDeepStrictEqual(actual: any, expected: any, message?: string | Error): void;
 
         function throws(block: () => any, message?: string | Error): void;
@@ -40,7 +40,7 @@ declare module "assert" {
         function doesNotThrow(block: () => any, message?: string | Error): void;
         function doesNotThrow(block: () => any, error: RegExp | Function, message?: string | Error): void;
 
-        function ifError(value: any): asserts value is null | undefined;
+        function ifError(value: any): void;
 
         function rejects(block: (() => Promise<any>) | Promise<any>, message?: string | Error): Promise<void>;
         function rejects(block: (() => Promise<any>) | Promise<any>, error: AssertPredicate, message?: string | Error): Promise<void>;

node/{async_hooks.d.ts → ts3.1/async_hooks.d.ts}

@@ -152,8 +152,7 @@ declare module "async_hooks" {
         /**
          * This method disables the instance of `AsyncLocalStorage`. All subsequent calls
          * to `asyncLocalStorage.getStore()` will return `undefined` until
-         * `asyncLocalStorage.run()` or `asyncLocalStorage.runSyncAndReturn()`
-         * is called again.
+         * `asyncLocalStorage.run()` is called again.
          *
          * When calling `asyncLocalStorage.disable()`, all current contexts linked to the
          * instance will be exited.
@@ -169,45 +168,40 @@ declare module "async_hooks" {
         disable(): void;
 
         /**
-         * This method returns the current store.
-         * If this method is called outside of an asynchronous context initialized by
-         * calling `asyncLocalStorage.run` or `asyncLocalStorage.runAndReturn`, it will
+         * This method returns the current store. If this method is called outside of an
+         * asynchronous context initialized by calling `asyncLocalStorage.run`, it will
          * return `undefined`.
          */
         getStore(): T | undefined;
 
         /**
-         * Calling `asyncLocalStorage.run(callback)` will create a new asynchronous
-         * context.
-         * Within the callback function and the asynchronous operations from the callback,
-         * `asyncLocalStorage.getStore()` will return an instance of `Map` known as
-         * "the store". This store will be persistent through the following
-         * asynchronous calls.
+         * This methods runs a function synchronously within a context and return its
+         * return value. The store is not accessible outside of the callback function or
+         * the asynchronous operations created within the callback.
          *
-         * The callback will be ran asynchronously. Optionally, arguments can be passed
-         * to the function. They will be passed to the callback function.
+         * Optionally, arguments can be passed to the function. They will be passed to the
+         * callback function.
          *
-         * If an error is thrown by the callback function, it will not be caught by
-         * a `try/catch` block as the callback is ran in a new asynchronous resource.
-         * Also, the stacktrace will be impacted by the asynchronous call.
+         * I the callback function throws an error, it will be thrown by `run` too. The
+         * stacktrace will not be impacted by this call and the context will be exited.
          */
         // TODO: Apply generic vararg once available
-        run(store: T, callback: (...args: any[]) => void, ...args: any[]): void;
+        run<R>(store: T, callback: (...args: any[]) => R, ...args: any[]): R;
 
         /**
-         * Calling `asyncLocalStorage.exit(callback)` will create a new asynchronous
-         * context.
-         * Within the callback function and the asynchronous operations from the callback,
-         * `asyncLocalStorage.getStore()` will return `undefined`.
+         * This methods runs a function synchronously outside of a context and return its
+         * return value. The store is not accessible within the callback function or the
+         * asynchronous operations created within the callback.
          *
-         * The callback will be ran asynchronously. Optionally, arguments can be passed
-         * to the function. They will be passed to the callback function.
+         * Optionally, arguments can be passed to the function. They will be passed to the
+         * callback function.
          *
-         * If an error is thrown by the callback function, it will not be caught by
-         * a `try/catch` block as the callback is ran in a new asynchronous resource.
-         * Also, the stacktrace will be impacted by the asynchronous call.
+         * If the callback function throws an error, it will be thrown by `exit` too. The
+         * stacktrace will not be impacted by this call and the context will be
+         * re-entered.
          */
-        exit(callback: (...args: any[]) => void, ...args: any[]): void;
+        // TODO: Apply generic vararg once available
+        exit<R>(callback: (...args: any[]) => R, ...args: any[]): R;
 
         /**
          * Calling `asyncLocalStorage.enterWith(store)` will transition into the context

node/ts3.1/base.d.ts

@@ -0,0 +1,42 @@
+// base definitions for all NodeJS modules that are not specific to any version of TypeScript
+
+/// <reference path="globals.d.ts" />
+/// <reference path="async_hooks.d.ts" />
+/// <reference path="buffer.d.ts" />
+/// <reference path="child_process.d.ts" />
+/// <reference path="cluster.d.ts" />
+/// <reference path="console.d.ts" />
+/// <reference path="constants.d.ts" />
+/// <reference path="crypto.d.ts" />
+/// <reference path="dgram.d.ts" />
+/// <reference path="dns.d.ts" />
+/// <reference path="domain.d.ts" />
+/// <reference path="events.d.ts" />
+/// <reference path="fs.d.ts" />
+/// <reference path="fs/promises.d.ts" />
+/// <reference path="http.d.ts" />
+/// <reference path="http2.d.ts" />
+/// <reference path="https.d.ts" />
+/// <reference path="inspector.d.ts" />
+/// <reference path="module.d.ts" />
+/// <reference path="net.d.ts" />
+/// <reference path="os.d.ts" />
+/// <reference path="path.d.ts" />
+/// <reference path="perf_hooks.d.ts" />
+/// <reference path="process.d.ts" />
+/// <reference path="punycode.d.ts" />
+/// <reference path="querystring.d.ts" />
+/// <reference path="readline.d.ts" />
+/// <reference path="repl.d.ts" />
+/// <reference path="stream.d.ts" />
+/// <reference path="string_decoder.d.ts" />
+/// <reference path="timers.d.ts" />
+/// <reference path="tls.d.ts" />
+/// <reference path="trace_events.d.ts" />
+/// <reference path="tty.d.ts" />
+/// <reference path="url.d.ts" />
+/// <reference path="util.d.ts" />
+/// <reference path="v8.d.ts" />
+/// <reference path="vm.d.ts" />
+/// <reference path="worker_threads.d.ts" />
+/// <reference path="zlib.d.ts" />

node/{crypto.d.ts → ts3.1/crypto.d.ts}

@@ -431,7 +431,7 @@ declare module "crypto" {
     /** @deprecated since v10.0.0 */
     const DEFAULT_ENCODING: BufferEncoding;
 
-    type KeyType = 'rsa' | 'dsa' | 'ec' | 'ed25519';
+    type KeyType = 'rsa' | 'dsa' | 'ec' | 'ed25519' | 'x25519';
     type KeyFormat = 'pem' | 'der';
 
     interface BasePrivateKeyEncodingOptions<T extends KeyFormat> {
@@ -451,6 +451,12 @@ declare module "crypto" {
          */
     }
 
+    interface X25519KeyPairKeyObjectOptions {
+       /**
+        * No options.
+        */
+    }
+
     interface ECKeyPairKeyObjectOptions {
         /**
          * Name of the curve to use.
@@ -537,11 +543,21 @@ declare module "crypto" {
 
     interface ED25519KeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
         publicKeyEncoding: {
-            type: 'pkcs1' | 'spki';
+            type: 'spki';
             format: PubF;
         };
         privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
-            type: 'sec1' | 'pkcs8';
+            type: 'pkcs8';
+        };
+    }
+
+    interface X25519KeyPairOptions<PubF extends KeyFormat, PrivF extends KeyFormat> {
+        publicKeyEncoding: {
+            type: 'spki';
+            format: PubF;
+        };
+        privateKeyEncoding: BasePrivateKeyEncodingOptions<PrivF> & {
+            type: 'pkcs8';
         };
     }
 
@@ -574,6 +590,12 @@ declare module "crypto" {
     function generateKeyPairSync(type: 'ed25519', options: ED25519KeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
     function generateKeyPairSync(type: 'ed25519', options: ED25519KeyPairKeyObjectOptions): KeyPairKeyObjectResult;
 
+    function generateKeyPairSync(type: 'x25519', options: X25519KeyPairOptions<'pem', 'pem'>): KeyPairSyncResult<string, string>;
+    function generateKeyPairSync(type: 'x25519', options: X25519KeyPairOptions<'pem', 'der'>): KeyPairSyncResult<string, Buffer>;
+    function generateKeyPairSync(type: 'x25519', options: X25519KeyPairOptions<'der', 'pem'>): KeyPairSyncResult<Buffer, string>;
+    function generateKeyPairSync(type: 'x25519', options: X25519KeyPairOptions<'der', 'der'>): KeyPairSyncResult<Buffer, Buffer>;
+    function generateKeyPairSync(type: 'x25519', options: X25519KeyPairKeyObjectOptions): KeyPairKeyObjectResult;
+
     function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
     function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
     function generateKeyPair(type: 'rsa', options: RSAKeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
@@ -598,6 +620,12 @@ declare module "crypto" {
     function generateKeyPair(type: 'ed25519', options: ED25519KeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
     function generateKeyPair(type: 'ed25519', options: ED25519KeyPairKeyObjectOptions, callback: (err: Error | null, publicKey: KeyObject, privateKey: KeyObject) => void): void;
 
+    function generateKeyPair(type: 'x25519', options: X25519KeyPairOptions<'pem', 'pem'>, callback: (err: Error | null, publicKey: string, privateKey: string) => void): void;
+    function generateKeyPair(type: 'x25519', options: X25519KeyPairOptions<'pem', 'der'>, callback: (err: Error | null, publicKey: string, privateKey: Buffer) => void): void;
+    function generateKeyPair(type: 'x25519', options: X25519KeyPairOptions<'der', 'pem'>, callback: (err: Error | null, publicKey: Buffer, privateKey: string) => void): void;
+    function generateKeyPair(type: 'x25519', options: X25519KeyPairOptions<'der', 'der'>, callback: (err: Error | null, publicKey: Buffer, privateKey: Buffer) => void): void;
+    function generateKeyPair(type: 'x25519', options: X25519KeyPairKeyObjectOptions, callback: (err: Error | null, publicKey: KeyObject, privateKey: KeyObject) => void): void;
+
     namespace generateKeyPair {
         function __promisify__(type: "rsa", options: RSAKeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
         function __promisify__(type: "rsa", options: RSAKeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
@@ -622,6 +650,12 @@ declare module "crypto" {
         function __promisify__(type: "ed25519", options: ED25519KeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
         function __promisify__(type: "ed25519", options: ED25519KeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
         function __promisify__(type: "ed25519", options: ED25519KeyPairKeyObjectOptions): Promise<KeyPairKeyObjectResult>;
+
+        function __promisify__(type: "x25519", options: X25519KeyPairOptions<'pem', 'pem'>): Promise<{ publicKey: string, privateKey: string }>;
+        function __promisify__(type: "x25519", options: X25519KeyPairOptions<'pem', 'der'>): Promise<{ publicKey: string, privateKey: Buffer }>;
+        function __promisify__(type: "x25519", options: X25519KeyPairOptions<'der', 'pem'>): Promise<{ publicKey: Buffer, privateKey: string }>;
+        function __promisify__(type: "x25519", options: X25519KeyPairOptions<'der', 'der'>): Promise<{ publicKey: Buffer, privateKey: Buffer }>;
+        function __promisify__(type: "x25519", options: X25519KeyPairKeyObjectOptions): Promise<KeyPairKeyObjectResult>;
     }
 
     /**
@@ -646,4 +680,14 @@ declare module "crypto" {
      * passed to [`crypto.createPublicKey()`][].
      */
     function verify(algorithm: string | null | undefined, data: NodeJS.ArrayBufferView, key: KeyLike | VerifyKeyWithOptions, signature: NodeJS.ArrayBufferView): boolean;
+
+    /**
+     * Computes the Diffie-Hellman secret based on a privateKey and a publicKey.
+     * Both keys must have the same asymmetricKeyType, which must be one of
+     * 'dh' (for Diffie-Hellman), 'ec' (for ECDH), 'x448', or 'x25519' (for ECDH-ES).
+     */
+    function diffieHellman(options: {
+        privateKey: KeyObject;
+        publicKey: KeyObject
+    }): Buffer;
 }

node/ts3.1/index.d.ts

@@ -0,0 +1,44 @@
+// NOTE: These definitions support NodeJS and TypeScript 3.1.
+
+// NOTE: TypeScript version-specific augmentations can be found in the following paths:
+//          - ~/base.d.ts         - Shared definitions common to all TypeScript versions
+//          - ~/index.d.ts        - Definitions specific to TypeScript 2.8
+//          - ~/ts3.5/index.d.ts  - Definitions specific to TypeScript 3.5
+
+// NOTE: Augmentations for TypeScript 3.5 and later should use individual files for overrides
+//       within the respective ~/ts3.5 (or later) folder. However, this is disallowed for versions
+//       prior to TypeScript 3.5, so the older definitions will be found here.
+
+// Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
+/// <reference path="base.d.ts" />
+
+// We can't include globals.global.d.ts in globals.d.ts, as it'll cause duplication errors in TypeScript 3.5+
+/// <reference path="globals.global.d.ts" />
+
+// We can't include assert.d.ts in base.d.ts, as it'll cause duplication errors in TypeScript 3.7+
+/// <reference path="assert.d.ts" />
+
+// Forward-declarations for needed types from es2015 and later (in case users are using `--lib es5`)
+// Empty interfaces are used here which merge fine with the real declarations in the lib XXX files
+// just to ensure the names are known and node typings can be used without importing these libs.
+// if someone really needs these types the libs need to be added via --lib or in tsconfig.json
+interface AsyncIterable<T> { }
+interface IterableIterator<T> { }
+interface AsyncIterableIterator<T> {}
+interface SymbolConstructor {
+    readonly asyncIterator: symbol;
+}
+declare var Symbol: SymbolConstructor;
+// even this is just a forward declaration some properties are added otherwise
+// it would be allowed to pass anything to e.g. Buffer.from()
+interface SharedArrayBuffer {
+    readonly byteLength: number;
+    slice(begin?: number, end?: number): SharedArrayBuffer;
+}
+
+declare module "util" {
+    namespace types {
+        function isBigInt64Array(value: any): boolean;
+        function isBigUint64Array(value: any): boolean;
+    }
+}

node/{process.d.ts → ts3.1/process.d.ts}

@@ -32,7 +32,7 @@ declare module "process" {
                 lts?: string;
             }
 
-            interface ProcessVersions {
+            interface ProcessVersions extends Dict<string> {
                 http_parser: string;
                 node: string;
                 v8: string;

node/{ts3.2 → ts3.4}/base.d.ts

@@ -1,4 +1,4 @@
-// NOTE: These definitions support NodeJS and TypeScript 3.2.
+// NOTE: These definitions support NodeJS and TypeScript 3.2 - 3.4.
 
 // NOTE: TypeScript version-specific augmentations can be found in the following paths:
 //          - ~/base.d.ts         - Shared definitions common to all TypeScript versions
@@ -14,7 +14,7 @@
 
 // Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../base.d.ts" />
+/// <reference path="../ts3.1/base.d.ts" />
 
 // TypeScript 3.2-specific augmentations:
 /// <reference path="fs.d.ts" />

node/{ts3.2 → ts3.4}/fs.d.ts

@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../fs.d.ts" />
+/// <reference path="../ts3.1/fs.d.ts" />
 
 declare module 'fs' {
     interface BigIntStats extends StatsBase<bigint> {

node/{ts3.2 → ts3.4}/globals.d.ts

@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../globals.d.ts" />
+/// <reference path="../ts3.1/globals.d.ts" />
 
 interface Buffer extends Uint8Array {
     readBigUInt64BE(offset?: number): bigint;

node/ts3.4/index.d.ts

@@ -0,0 +1,12 @@
+// NOTE: These definitions support NodeJS and TypeScript 3.2 - 3.4.
+// This is required to enable globalThis support for global in ts3.5 without causing errors
+// This is required to enable typing assert in ts3.7 without causing errors
+// Typically type modifiations should be made in base.d.ts instead of here
+
+/// <reference path="base.d.ts" />
+
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="../ts3.1/assert.d.ts" />
+
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="../ts3.1/globals.global.d.ts" />

node/{ts3.2 → ts3.4}/process.d.ts

@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../process.d.ts" />
+/// <reference path="../ts3.1/process.d.ts" />
 
 declare module 'process' {
     global {

node/{ts3.2 → ts3.4}/util.d.ts

@@ -1,5 +1,5 @@
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../util.d.ts" />
+/// <reference path="../ts3.1/util.d.ts" />
 
 declare module "util" {
     namespace types {

node/{ts3.5 → ts3.6}/base.d.ts

@@ -14,7 +14,7 @@
 
 // Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
 // tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.2/base.d.ts" />
+/// <reference path="../ts3.4/base.d.ts" />
 
 // TypeScript 3.5-specific augmentations:
 /// <reference path="globals.global.d.ts" />

node/ts3.6/index.d.ts

@@ -0,0 +1,8 @@
+// NOTE: These definitions support NodeJS and TypeScript 3.5 - 3.6.
+// This is required to enable typing assert in ts3.7 without causing errors
+// Typically type modifications should be made in base.d.ts instead of here
+
+/// <reference path="base.d.ts" />
+
+// tslint:disable-next-line:no-bad-reference
+/// <reference path="../ts3.1/assert.d.ts" />

node/ts3.2/index.d.ts

@@ -1,12 +0,0 @@
-// NOTE: These definitions support NodeJS and TypeScript 3.2.
-// This is requried to enable globalThis support for global in ts3.5 without causing errors
-// This is requried to enable typing assert in ts3.7 without causing errors
-// Typically type modifiations should be made in base.d.ts instead of here
-
-/// <reference path="base.d.ts" />
-
-// tslint:disable-next-line:no-bad-reference
-/// <reference path="../assert.d.ts" />
-
-// tslint:disable-next-line:no-bad-reference
-/// <reference path="../globals.global.d.ts" />

node/ts3.5/index.d.ts

@@ -1,8 +0,0 @@
-// NOTE: These definitions support NodeJS and TypeScript 3.5.
-// This is requried to enable typing assert in ts3.7 without causing errors
-// Typically type modifiations should be made in base.d.ts instead of here
-
-/// <reference path="base.d.ts" />
-
-// tslint:disable-next-line:no-bad-reference
-/// <reference path="../assert.d.ts" />

node/ts3.7/base.d.ts

@@ -1,20 +0,0 @@
-// NOTE: These definitions support NodeJS and TypeScript 3.7.
-
-// NOTE: TypeScript version-specific augmentations can be found in the following paths:
-//          - ~/base.d.ts         - Shared definitions common to all TypeScript versions
-//          - ~/index.d.ts        - Definitions specific to TypeScript 2.1
-//          - ~/ts3.7/base.d.ts   - Definitions specific to TypeScript 3.7
-//          - ~/ts3.7/index.d.ts  - Definitions specific to TypeScript 3.7 with assert pulled in
-
-// Reference required types from the default lib:
-/// <reference lib="es2018" />
-/// <reference lib="esnext.asynciterable" />
-/// <reference lib="esnext.intl" />
-/// <reference lib="esnext.bigint" />
-
-// Base definitions for all NodeJS modules that are not specific to any version of TypeScript:
-// tslint:disable-next-line:no-bad-reference
-/// <reference path="../ts3.5/base.d.ts" />
-
-// TypeScript 3.7-specific augmentations:
-/// <reference path="assert.d.ts" />

node/ts3.7/index.d.ts

@@ -1,5 +0,0 @@
-// NOTE: These definitions support NodeJS and TypeScript 3.7.
-// This isn't strictly needed since 3.7 has the assert module, but this way we're consistent.
-// Typically type modificatons should be made in base.d.ts instead of here
-
-/// <reference path="base.d.ts" />