Skip to content

[node] Remove post-22.0 features from v22.0.x package #70155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
typescript-bot merged 3 commits into from
Jul 31, 2024
Merged

[node] Remove post-22.0 features from v22.0.x package #70155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7b91b0
v22.1 reversions
Renegade334 Jul 28, 2024
3ed287e
v22.2 reversions
Renegade334 Jul 28, 2024
915753d
v22.3 reversions
Renegade334 Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 10 additions & 22 deletions types/node/dns.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,11 @@ declare module "dns" {
* @default false
*/
all?: boolean | undefined;
/**
* When `verbatim`, the resolved addresses are return unsorted. When `ipv4first`, the resolved addresses are sorted
* by placing IPv4 addresses before IPv6 addresses. When `ipv6first`, the resolved addresses are sorted by placing IPv6
* addresses before IPv4 addresses. Default value is configurable using
* {@link setDefaultResultOrder} or [`--dns-result-order`](https://nodejs.org/docs/latest-v22.x/api/cli.html#--dns-result-orderorder).
* @default `verbatim` (addresses are not reordered)
*/
order?: "ipv4first" | "ipv6first" | "verbatim" | undefined;
/**
* When `true`, the callback receives IPv4 and IPv6 addresses in the order the DNS resolver returned them. When `false`, IPv4
* addresses are placed before IPv6 addresses. This option will be deprecated in favor of `order`. When both are specified,
* `order` has higher precedence. New code should only use `order`. Default value is configurable using {@link setDefaultResultOrder}
* addresses are placed before IPv6 addresses. Default value is configurable using {@link setDefaultResultOrder}
* or [`--dns-result-order`](https://nodejs.org/docs/latest-v22.x/api/cli.html#--dns-result-orderorder).
* @default true (addresses are not reordered)
* @default true
*/
verbatim?: boolean | undefined;
}
Expand Down Expand Up @@ -672,15 +663,14 @@ declare module "dns" {
callback: (err: NodeJS.ErrnoException | null, hostnames: string[]) => void,
): void;
/**
* Get the default value for `order` in {@link lookup} and [`dnsPromises.lookup()`](https://nodejs.org/docs/latest-v22.x/api/dns.html#dnspromiseslookuphostname-options).
* Get the default value for `verbatim` in {@link lookup} and [`dnsPromises.lookup()`](https://nodejs.org/docs/latest-v22.x/api/dns.html#dnspromiseslookuphostname-options).
* The value could be:
*
* * `ipv4first`: for `order` defaulting to `ipv4first`.
* * `ipv6first`: for `order` defaulting to `ipv6first`.
* * `verbatim`: for `order` defaulting to `verbatim`.
* * `ipv4first`: for `verbatim` defaulting to `false`.
* * `verbatim`: for `verbatim` defaulting to `true`.
* @since v18.17.0
*/
export function getDefaultResultOrder(): "ipv4first" | "ipv6first" | "verbatim";
export function getDefaultResultOrder(): "ipv4first" | "verbatim";
/**
* Sets the IP address and port of servers to be used when performing DNS
* resolution. The `servers` argument is an array of [RFC 5952](https://tools.ietf.org/html/rfc5952#section-6) formatted
Expand Down Expand Up @@ -727,21 +717,19 @@ declare module "dns" {
*/
export function getServers(): string[];
/**
* Set the default value of `order` in {@link lookup} and [`dnsPromises.lookup()`](https://nodejs.org/docs/latest-v22.x/api/dns.html#dnspromiseslookuphostname-options).
* Set the default value of `verbatim` in {@link lookup} and [`dnsPromises.lookup()`](https://nodejs.org/docs/latest-v22.x/api/dns.html#dnspromiseslookuphostname-options).
* The value could be:
*
* * `ipv4first`: sets default `order` to `ipv4first`.
* * `ipv6first`: sets default `order` to `ipv6first`.
* * `verbatim`: sets default `order` to `verbatim`.
* * `ipv4first`: sets default `verbatim` to `false`.
* * `verbatim`: sets default `verbatim` to `true`.
*
* The default is `verbatim` and {@link setDefaultResultOrder} have higher
* priority than [`--dns-result-order`](https://nodejs.org/docs/latest-v22.x/api/cli.html#--dns-result-orderorder). When using
* [worker threads](https://nodejs.org/docs/latest-v22.x/api/worker_threads.html), {@link setDefaultResultOrder} from the main
* thread won't affect the default dns orders in workers.
* @since v16.4.0, v14.18.0
* @param order must be `'ipv4first'`, `'ipv6first'` or `'verbatim'`.
*/
export function setDefaultResultOrder(order: "ipv4first" | "ipv6first" | "verbatim"): void;
export function setDefaultResultOrder(order: "ipv4first" | "verbatim"): void;
// Error codes
export const NODATA: "ENODATA";
export const FORMERR: "EFORMERR";
Expand Down
20 changes: 10 additions & 10 deletions types/node/dns/promises.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,20 +346,20 @@ declare module "dns/promises" {
*/
function setServers(servers: readonly string[]): void;
/**
* Set the default value of `order` in `dns.lookup()` and `{@link lookup}`. The value could be:
* Set the default value of `verbatim` in {@link lookup} and [`dnsPromises.lookup()`](https://nodejs.org/docs/latest-v22.x/api/dns.html#dnspromiseslookuphostname-options).
* The value could be:
*
* * `ipv4first`: sets default `order` to `ipv4first`.
* * `ipv6first`: sets default `order` to `ipv6first`.
* * `verbatim`: sets default `order` to `verbatim`.
* * `ipv4first`: sets default `verbatim` to `false`.
* * `verbatim`: sets default `verbatim` to `true`.
*
* The default is `verbatim` and [dnsPromises.setDefaultResultOrder()](https://nodejs.org/docs/latest-v20.x/api/dns.html#dnspromisessetdefaultresultorderorder)
* have higher priority than [`--dns-result-order`](https://nodejs.org/docs/latest-v20.x/api/cli.html#--dns-result-orderorder).
* When using [worker threads](https://nodejs.org/docs/latest-v20.x/api/worker_threads.html), [`dnsPromises.setDefaultResultOrder()`](https://nodejs.org/docs/latest-v20.x/api/dns.html#dnspromisessetdefaultresultorderorder)
* from the main thread won't affect the default dns orders in workers.
* The default is `verbatim` and {@link setDefaultResultOrder} have higher
* priority than [`--dns-result-order`](https://nodejs.org/docs/latest-v22.x/api/cli.html#--dns-result-orderorder). When using
* [worker threads](https://nodejs.org/docs/latest-v22.x/api/worker_threads.html), {@link setDefaultResultOrder} from the main
* thread won't affect the default dns orders in workers.
* @since v16.4.0, v14.18.0
* @param order must be `'ipv4first'`, `'ipv6first'` or `'verbatim'`.
* @param order must be `'ipv4first'` or `'verbatim'`.
*/
function setDefaultResultOrder(order: "ipv4first" | "ipv6first" | "verbatim"): void;
function setDefaultResultOrder(order: "ipv4first" | "verbatim"): void;
// Error codes
const NODATA: "ENODATA";
const FORMERR: "EFORMERR";
Expand Down
36 changes: 4 additions & 32 deletions types/node/fs.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4324,17 +4324,6 @@ declare module "fs" {
* Function to filter out files/directories. Return true to exclude the item, false to include it.
*/
exclude?: ((fileName: string) => boolean) | undefined;
/**
* `true` if the glob should return paths as `Dirent`s, `false` otherwise.
* @default false
*/
withFileTypes?: boolean | undefined;
}
export interface GlobOptionsWithFileTypes extends GlobOptions {
withFileTypes: true;
}
export interface GlobOptionsWithoutFileTypes extends GlobOptions {
withFileTypes?: false | undefined;
}
/**
* Retrieves the files matching the specified pattern.
Expand All @@ -4343,32 +4332,15 @@ declare module "fs" {
pattern: string | string[],
callback: (err: NodeJS.ErrnoException | null, matches: string[]) => void,
): void;
/**
* Retrieves the files matching the specified pattern.
*/
export function glob<Options extends GlobOptions>(
export function glob(
pattern: string | string[],
options: Options,
callback: (
err: NodeJS.ErrnoException | null,
matches: Options extends GlobOptionsWithFileTypes ? Dirent[]
: Options extends GlobOptionsWithoutFileTypes ? string[]
: Dirent[] | string[],
) => void,
options: GlobOptions,
callback: (err: NodeJS.ErrnoException | null, matches: string[]) => void,
): void;
/**
* Retrieves the files matching the specified pattern.
*/
export function globSync(pattern: string | string[]): string[];
/**
* Retrieves the files matching the specified pattern.
*/
export function globSync<Options extends GlobOptions>(
pattern: string | string[],
options: Options,
): Options extends GlobOptionsWithFileTypes ? Dirent[]
: Options extends GlobOptionsWithoutFileTypes ? string[]
: Dirent[] | string[];
export function globSync(pattern: string | string[], options?: GlobOptions): string[];
}
declare module "node:fs" {
export * from "fs";
Expand Down
13 changes: 1 addition & 12 deletions types/node/fs/promises.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ declare module "fs/promises" {
Dir,
Dirent,
GlobOptions,
GlobOptionsWithFileTypes,
GlobOptionsWithoutFileTypes,
MakeDirectoryOptions,
Mode,
ObjectEncodingOptions,
Expand Down Expand Up @@ -1245,16 +1243,7 @@ declare module "fs/promises" {
/**
* Retrieves the files matching the specified pattern.
*/
function glob(pattern: string | string[]): AsyncIterableIterator<string>;
/**
* Retrieves the files matching the specified pattern.
*/
function glob<Options extends GlobOptions>(
pattern: string | string[],
opt: Options,
): Options extends GlobOptionsWithFileTypes ? AsyncIterableIterator<Dirent>
: Options extends GlobOptionsWithoutFileTypes ? AsyncIterableIterator<string>
: AsyncIterableIterator<Dirent> | AsyncIterableIterator<string>;
function glob(pattern: string | string[], options?: GlobOptions): AsyncIterableIterator<string>;
}
declare module "node:fs/promises" {
export * from "fs/promises";
Expand Down
11 changes: 0 additions & 11 deletions types/node/test.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,17 +941,6 @@ declare module "node:test" {
* @since v19.1.0, v18.13.0
*/
restoreAll(): void;
/**
* This function is used to mock the exports of ECMAScript modules,
* CommonJS modules, and Node.js builtin modules. Any references to
* the original module prior to mocking are not impacted
* @since v22.3.0
*/
module(speficier: string, options?: {
cache?: boolean;
defaultExport?: any;
namedExports?: object;
}): { restore: () => void };
timers: MockTimers;
}
const mock: MockTracker;
Expand Down
18 changes: 0 additions & 18 deletions types/node/test/fs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,12 +903,6 @@ const anyStatFs: fs.StatsFs | fs.BigIntStatsFs = fs.statfsSync(".", { bigint: Ma
for await (const entry of globAsync("**/*.js")) {
entry; // $ExpectType string
}
for await (const entry of globAsync("**/*.js", { withFileTypes: true })) {
entry; // $ExpectType Dirent
}
for await (const entry of globAsync("**/*.js", { withFileTypes: Math.random() > 0.5 })) {
entry; // $ExpectType Dirent | string
}

glob("**/*.js", (err, matches) => {
matches; // $ExpectType string[]
Expand All @@ -925,23 +919,11 @@ const anyStatFs: fs.StatsFs | fs.BigIntStatsFs = fs.statfsSync(".", { bigint: Ma
matches; // $ExpectType string[]
},
);
glob("**/*.js", { withFileTypes: true }, (err, matches) => {
matches; // $ExpectType Dirent[]
});
glob("**/*.js", { withFileTypes: Math.random() > 0.5 }, (err, matches) => {
matches; // $ExpectType Dirent[] | string[]
});

for (const entry of globSync("**/*.js")) {
entry; // $ExpectType string
}
for (const entry of globSync("**/*.js", { cwd: "/" })) {
entry; // $ExpectType string
}
for (const entry of globSync("**/*.js", { withFileTypes: true })) {
entry; // $ExpectType Dirent
}
for (const entry of globSync("**/*.js", { withFileTypes: Math.random() > 0.5 })) {
entry; // $ExpectType Dirent | string
}
});
16 changes: 0 additions & 16 deletions types/node/test/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,22 +496,6 @@ test("mocks a counting function", (t) => {
const fn = t.mock.fn(addOne, addTwo, { times: 2 });
// $ExpectType number
fn();

const mock = t.mock.module("node:readline", {
namedExports: {
fn() {
return 42;
},
},
defaultExport: {
foo() {
return "bar";
},
},
cache: true,
});
// $ExpectType void
mock.restore();
});

test("spies on an object method", (t) => {
Expand Down
6 changes: 0 additions & 6 deletions types/node/test/url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,17 +187,11 @@ import * as url from "node:url";

{
let path: string = url.fileURLToPath("file://test");
path = url.fileURLToPath("file://test", { windows: false });
path = url.fileURLToPath("file://test", { windows: true });
path = url.fileURLToPath(new url.URL("file://test"));
path = url.fileURLToPath(new url.URL("file://test"), { windows: false });
path = url.fileURLToPath(new url.URL("file://test"), { windows: true });
}

{
let path: url.URL = url.pathToFileURL("file://test");
path = url.pathToFileURL("file://test", { windows: false });
path = url.pathToFileURL("file://test", { windows: true });
}

{
Expand Down
12 changes: 2 additions & 10 deletions types/node/url.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,6 @@ declare module "url" {
interface UrlWithStringQuery extends Url {
query: string | null;
}
interface FileUrlToPathOptions {
/**
* `true` if the `path` should be return as a windows filepath, `false` for posix, and `undefined` for the system default.
* @default undefined
*/
windows?: boolean | undefined;
}
interface PathToFileUrlOptions extends FileUrlToPathOptions {}
/**
* The `url.parse()` method takes a URL string, parses it, and returns a URL
* object.
Expand Down Expand Up @@ -306,7 +298,7 @@ declare module "url" {
* @param url The file URL string or URL object to convert to a path.
* @return The fully-resolved platform-specific Node.js file path.
*/
function fileURLToPath(url: string | URL, options?: FileUrlToPathOptions): string;
function fileURLToPath(url: string | URL): string;
/**
* This function ensures that `path` is resolved absolutely, and that the URL
* control characters are correctly encoded when converting into a File URL.
Expand All @@ -324,7 +316,7 @@ declare module "url" {
* @param path The path to convert to a File URL.
* @return The file URL object.
*/
function pathToFileURL(path: string, options?: PathToFileUrlOptions): URL;
function pathToFileURL(path: string): URL;
/**
* This utility function converts a URL object into an ordinary options object as
* expected by the `http.request()` and `https.request()` APIs.
Expand Down