got 14.2.1 → 14.4.0

package/dist/source/as-promise/index.js

@@ -3,7 +3,7 @@ import is from '@sindresorhus/is';
 import PCancelable from 'p-cancelable';
 import { HTTPError, RetryError, } from '../core/errors.js';
 import Request from '../core/index.js';
-import { parseBody, isResponseOk, ParseError } from '../core/response.js';
+import { parseBody, isResponseOk, ParseError, } from '../core/response.js';
 import proxyEvents from '../core/utils/proxy-events.js';
 import { CancelError } from './types.js';
 const proxiedRequestEvents = [
@@ -130,12 +130,12 @@ export default function asPromise(firstRequest) {
         };
         makeRequest(0);
     });
-    promise.on = (event, fn) => {
-        emitter.on(event, fn);
+    promise.on = (event, function_) => {
+        emitter.on(event, function_);
         return promise;
     };
-    promise.off = (event, fn) => {
-        emitter.off(event, fn);
+    promise.off = (event, function_) => {
+        emitter.off(event, function_);
         return promise;
     };
     const shortcut = (responseType) => {

package/dist/source/core/calculate-retry-delay.d.ts

@@ -1,4 +1,4 @@
 import type { RetryFunction } from './options.js';
-type Returns<T extends (...args: any) => unknown, V> = (...args: Parameters<T>) => V;
+type Returns<T extends (...arguments_: any) => unknown, V> = (...arguments_: Parameters<T>) => V;
 declare const calculateRetryDelay: Returns<RetryFunction, number>;
 export default calculateRetryDelay;

package/dist/source/core/index.js

@@ -824,9 +824,7 @@ export default class Request extends Duplex {
                 break;
             }
         }
-        if (!request) {
-            request = options.getRequestFunction();
-        }
+        request ||= options.getRequestFunction();
         const url = options.url;
         this._requestOptions = options.createNativeRequestOptions();
         if (options.cache) {
@@ -836,11 +834,11 @@ export default class Request extends Duplex {
             this._prepareCache(options.cache);
         }
         // Cache support
-        const fn = options.cache ? this._createCacheableRequest : request;
+        const function_ = options.cache ? this._createCacheableRequest : request;
         try {
             // We can't do `await fn(...)`,
             // because stream `error` event can be emitted before `Promise.resolve()`.
-            let requestOrResponse = fn(url, this._requestOptions);
+            let requestOrResponse = function_(url, this._requestOptions);
             if (is.promise(requestOrResponse)) {
                 requestOrResponse = await requestOrResponse;
             }

package/dist/source/core/options.d.ts

@@ -38,8 +38,8 @@ export type Agents = {
 };
 export type Headers = Record<string, string | string[] | undefined>;
 export type ToughCookieJar = {
-    getCookieString: ((currentUrl: string, options: Record<string, unknown>, cb: (error: Error | null, cookies: string) => void) => void) & ((url: string, callback: (error: Error | null, cookieHeader: string) => void) => void);
-    setCookie: ((cookieOrString: unknown, currentUrl: string, options: Record<string, unknown>, cb: (error: Error | null, cookie: unknown) => void) => void) & ((rawCookie: string, url: string, callback: (error: Error | null, result: unknown) => void) => void);
+    getCookieString: ((currentUrl: string, options: Record<string, unknown>, callback: (error: Error | null, cookies: string) => void) => void) & ((url: string, callback: (error: Error | null, cookieHeader: string) => void) => void);
+    setCookie: ((cookieOrString: unknown, currentUrl: string, options: Record<string, unknown>, callback: (error: Error | null, cookie: unknown) => void) => void) & ((rawCookie: string, url: string, callback: (error: Error | null, result: unknown) => void) => void);
 };
 export type PromiseCookieJar = {
     getCookieString: (url: string) => Promise<string>;

package/dist/source/core/options.js

@@ -174,7 +174,7 @@ const defaultInternals = {
         shouldContinue: () => true,
         countLimit: Number.POSITIVE_INFINITY,
         backoff: 0,
-        requestLimit: 10000,
+        requestLimit: 10_000,
         stackAllItems: false,
     },
     setHost: true,

package/dist/source/core/utils/proxy-events.js

@@ -1,8 +1,8 @@
 export default function proxyEvents(from, to, events) {
     const eventFunctions = {};
     for (const event of events) {
-        const eventFunction = (...args) => {
-            to.emit(event, ...args);
+        const eventFunction = (...arguments_) => {
+            to.emit(event, ...arguments_);
         };
         eventFunctions[event] = eventFunction;
         from.on(event, eventFunction);

package/dist/source/core/utils/unhandle.d.ts

@@ -2,9 +2,9 @@
 import type { EventEmitter } from 'node:events';
 type Origin = EventEmitter;
 type Event = string | symbol;
-type Fn = (...args: any[]) => void;
+type AnyFunction = (...arguments_: any[]) => void;
 type Unhandler = {
-    once: (origin: Origin, event: Event, fn: Fn) => void;
+    once: (origin: Origin, event: Event, function_: AnyFunction) => void;
     unhandleAll: () => void;
 };
 export default function unhandle(): Unhandler;

package/dist/source/core/utils/unhandle.js

@@ -5,9 +5,9 @@
 export default function unhandle() {
     const handlers = [];
     return {
-        once(origin, event, fn) {
-            origin.once(event, fn);
-            handlers.push({ origin, event, fn });
+        once(origin, event, function_) {
+            origin.once(event, function_);
+            handlers.push({ origin, event, fn: function_ });
         },
         unhandleAll() {
             for (const handler of handlers) {

package/dist/source/create.js

@@ -38,9 +38,7 @@ const create = (defaults) => {
             if (normalized.isStream) {
                 return request;
             }
-            if (!promise) {
-                promise = asPromise(request);
-            }
+            promise ||= asPromise(request);
             return promise;
         };
         let iteration = 0;
@@ -48,9 +46,7 @@ const create = (defaults) => {
             const handler = defaults.handlers[iteration++] ?? lastHandler;
             const result = handler(newOptions, iterateHandlers);
             if (is.promise(result) && !request.options.isStream) {
-                if (!promise) {
-                    promise = asPromise(request);
-                }
+                promise ||= asPromise(request);
                 if (result !== promise) {
                     const descriptors = Object.getOwnPropertyDescriptors(promise);
                     for (const key in descriptors) {

package/dist/source/types.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { Buffer } from 'node:buffer';
+import type { Spread } from 'type-fest';
 import type { CancelableRequest } from './as-promise/types.js';
 import type { Response } from './core/response.js';
 import type Options from './core/options.js';
@@ -60,32 +61,10 @@ export type ExtendOptions = {
     */
     mutableDefaults?: boolean;
 } & OptionsInit;
-export type OptionsOfTextResponseBody = Merge<OptionsInit, {
-    isStream?: false;
-    resolveBodyOnly?: false;
-    responseType?: 'text';
-}>;
-export type OptionsOfJSONResponseBody = Merge<OptionsInit, {
-    isStream?: false;
-    resolveBodyOnly?: false;
-    responseType?: 'json';
-}>;
-export type OptionsOfBufferResponseBody = Merge<OptionsInit, {
-    isStream?: false;
-    resolveBodyOnly?: false;
-    responseType: 'buffer';
-}>;
-export type OptionsOfUnknownResponseBody = Merge<OptionsInit, {
-    isStream?: false;
-    resolveBodyOnly?: false;
-}>;
 export type StrictOptions = Except<OptionsInit, 'isStream' | 'responseType' | 'resolveBodyOnly'>;
 export type StreamOptions = Merge<OptionsInit, {
     isStream?: true;
 }>;
-type ResponseBodyOnly = {
-    resolveBodyOnly: true;
-};
 export type OptionsWithPagination<T = unknown, R = unknown> = Merge<OptionsInit, {
     pagination?: PaginationOptions<T, R>;
 }>;
@@ -145,21 +124,84 @@ export type GotPaginate = {
     */
     all: (<T, R = unknown>(url: string | URL, options?: OptionsWithPagination<T, R>) => Promise<T[]>) & (<T, R = unknown>(options?: OptionsWithPagination<T, R>) => Promise<T[]>);
 };
-export type GotRequestFunction = {
-    (url: string | URL, options?: OptionsOfTextResponseBody): CancelableRequest<Response<string>>;
-    <T>(url: string | URL, options?: OptionsOfJSONResponseBody): CancelableRequest<Response<T>>;
-    (url: string | URL, options?: OptionsOfBufferResponseBody): CancelableRequest<Response<Buffer>>;
-    (url: string | URL, options?: OptionsOfUnknownResponseBody): CancelableRequest<Response>;
-    (options: OptionsOfTextResponseBody): CancelableRequest<Response<string>>;
-    <T>(options: OptionsOfJSONResponseBody): CancelableRequest<Response<T>>;
-    (options: OptionsOfBufferResponseBody): CancelableRequest<Response<Buffer>>;
-    (options: OptionsOfUnknownResponseBody): CancelableRequest<Response>;
-    (url: string | URL, options?: (Merge<OptionsOfTextResponseBody, ResponseBodyOnly>)): CancelableRequest<string>;
-    <T>(url: string | URL, options?: (Merge<OptionsOfJSONResponseBody, ResponseBodyOnly>)): CancelableRequest<T>;
-    (url: string | URL, options?: (Merge<OptionsOfBufferResponseBody, ResponseBodyOnly>)): CancelableRequest<Buffer>;
-    (options: (Merge<OptionsOfTextResponseBody, ResponseBodyOnly>)): CancelableRequest<string>;
-    <T>(options: (Merge<OptionsOfJSONResponseBody, ResponseBodyOnly>)): CancelableRequest<T>;
-    (options: (Merge<OptionsOfBufferResponseBody, ResponseBodyOnly>)): CancelableRequest<Buffer>;
+export type OptionsOfTextResponseBody = Merge<StrictOptions, {
+    isStream?: false;
+    responseType?: 'text';
+}>;
+export type OptionsOfTextResponseBodyOnly = Merge<StrictOptions, {
+    isStream?: false;
+    resolveBodyOnly: true;
+    responseType?: 'text';
+}>;
+export type OptionsOfTextResponseBodyWrapped = Merge<StrictOptions, {
+    isStream?: false;
+    resolveBodyOnly: false;
+    responseType?: 'text';
+}>;
+export type OptionsOfJSONResponseBody = Merge<StrictOptions, {
+    isStream?: false;
+    responseType?: 'json';
+}>;
+export type OptionsOfJSONResponseBodyOnly = Merge<StrictOptions, {
+    isStream?: false;
+    resolveBodyOnly: true;
+    responseType?: 'json';
+}>;
+export type OptionsOfJSONResponseBodyWrapped = Merge<StrictOptions, {
+    isStream?: false;
+    resolveBodyOnly: false;
+    responseType?: 'json';
+}>;
+export type OptionsOfBufferResponseBody = Merge<StrictOptions, {
+    isStream?: false;
+    responseType?: 'buffer';
+}>;
+export type OptionsOfBufferResponseBodyOnly = Merge<StrictOptions, {
+    isStream?: false;
+    resolveBodyOnly: true;
+    responseType?: 'buffer';
+}>;
+export type OptionsOfBufferResponseBodyWrapped = Merge<StrictOptions, {
+    isStream?: false;
+    resolveBodyOnly: false;
+    responseType?: 'buffer';
+}>;
+export type OptionsOfUnknownResponseBody = Merge<StrictOptions, {
+    isStream?: false;
+}>;
+export type OptionsOfUnknownResponseBodyOnly = Merge<StrictOptions, {
+    isStream?: false;
+    resolveBodyOnly: true;
+}>;
+export type OptionsOfUnknownResponseBodyWrapped = Merge<StrictOptions, {
+    isStream?: false;
+    resolveBodyOnly: false;
+}>;
+export type GotRequestFunction<U extends ExtendOptions = Record<string, unknown>> = {
+    (url: string | URL, options?: OptionsOfTextResponseBody): U['resolveBodyOnly'] extends true ? CancelableRequest<string> : CancelableRequest<Response<string>>;
+    <T>(url: string | URL, options?: OptionsOfJSONResponseBody): U['resolveBodyOnly'] extends true ? CancelableRequest<T> : CancelableRequest<Response<T>>;
+    (url: string | URL, options?: OptionsOfBufferResponseBody): U['resolveBodyOnly'] extends true ? CancelableRequest<Buffer> : CancelableRequest<Response<Buffer>>;
+    (url: string | URL, options?: OptionsOfUnknownResponseBody): U['resolveBodyOnly'] extends true ? CancelableRequest : CancelableRequest<Response>;
+    (url: string | URL, options?: OptionsOfTextResponseBodyWrapped): CancelableRequest<Response<string>>;
+    <T>(url: string | URL, options?: OptionsOfJSONResponseBodyWrapped): CancelableRequest<Response<T>>;
+    (url: string | URL, options?: OptionsOfBufferResponseBodyWrapped): CancelableRequest<Response<Buffer>>;
+    (url: string | URL, options?: OptionsOfUnknownResponseBodyWrapped): CancelableRequest<Response>;
+    (url: string | URL, options?: OptionsOfTextResponseBodyOnly): CancelableRequest<string>;
+    <T>(url: string | URL, options?: OptionsOfJSONResponseBodyOnly): CancelableRequest<T>;
+    (url: string | URL, options?: OptionsOfBufferResponseBodyOnly): CancelableRequest<Buffer>;
+    (url: string | URL, options?: OptionsOfUnknownResponseBodyOnly): CancelableRequest;
+    (options: OptionsOfTextResponseBody): U['resolveBodyOnly'] extends true ? CancelableRequest<string> : CancelableRequest<Response<string>>;
+    <T>(options: OptionsOfJSONResponseBody): U['resolveBodyOnly'] extends true ? CancelableRequest<T> : CancelableRequest<Response<T>>;
+    (options: OptionsOfBufferResponseBody): U['resolveBodyOnly'] extends true ? CancelableRequest<Buffer> : CancelableRequest<Response<Buffer>>;
+    (options: OptionsOfUnknownResponseBody): U['resolveBodyOnly'] extends true ? CancelableRequest : CancelableRequest<Response>;
+    (options: OptionsOfTextResponseBodyWrapped): CancelableRequest<Response<string>>;
+    <T>(options: OptionsOfJSONResponseBodyWrapped): CancelableRequest<Response<T>>;
+    (options: OptionsOfBufferResponseBodyWrapped): CancelableRequest<Response<Buffer>>;
+    (options: OptionsOfUnknownResponseBodyWrapped): CancelableRequest<Response>;
+    (options: OptionsOfTextResponseBodyOnly): CancelableRequest<string>;
+    <T>(options: OptionsOfJSONResponseBodyOnly): CancelableRequest<T>;
+    (options: OptionsOfBufferResponseBodyOnly): CancelableRequest<Buffer>;
+    (options: OptionsOfUnknownResponseBodyOnly): CancelableRequest;
     (url: string | URL, options?: Merge<OptionsInit, {
         isStream: true;
     }>): Request;
@@ -186,7 +228,7 @@ export type GotStream = GotStreamFunction & Record<HTTPAlias, GotStreamFunction>
 /**
 An instance of `got`.
 */
-export type Got = {
+export type Got<GotOptions extends ExtendOptions = ExtendOptions> = {
     /**
     Sets `options.isStream` to `true`.
 
@@ -256,6 +298,11 @@ export type Got = {
     // x-unicorn: rainbow
     ```
     */
-    extend: (...instancesOrOptions: Array<Got | ExtendOptions>) => Got;
-} & Record<HTTPAlias, GotRequestFunction> & GotRequestFunction;
+    extend<T extends Array<Got | ExtendOptions>>(...instancesOrOptions: T): Got<MergeExtendsConfig<T>>;
+} & Record<HTTPAlias, GotRequestFunction<GotOptions>> & GotRequestFunction<GotOptions>;
+export type ExtractExtendOptions<T> = T extends Got<infer GotOptions> ? GotOptions : T;
+/**
+Merges the options of multiple Got instances.
+*/
+export type MergeExtendsConfig<Value extends Array<Got | ExtendOptions>> = Value extends readonly [Value[0], ...infer NextValue] ? NextValue[0] extends undefined ? Value[0] extends infer OnlyValue ? OnlyValue extends ExtendOptions ? OnlyValue : OnlyValue extends Got<infer GotOptions> ? GotOptions : OnlyValue : never : ExtractExtendOptions<Value[0]> extends infer FirstArg extends ExtendOptions ? ExtractExtendOptions<NextValue[0] extends ExtendOptions | Got ? NextValue[0] : never> extends infer NextArg extends ExtendOptions ? Spread<FirstArg, NextArg> extends infer Merged extends ExtendOptions ? NextValue extends [NextValue[0], ...infer NextRest] ? NextRest extends Array<Got | ExtendOptions> ? MergeExtendsConfig<[Merged, ...NextRest]> : never : never : never : never : never : never;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "14.2.1",
+	"version": "14.4.0",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",
@@ -48,10 +48,10 @@
 		"ky"
 	],
 	"dependencies": {
-		"@sindresorhus/is": "^6.1.0",
+		"@sindresorhus/is": "^6.3.1",
 		"@szmarczak/http-timer": "^5.0.1",
 		"cacheable-lookup": "^7.0.0",
-		"cacheable-request": "^10.2.14",
+		"cacheable-request": "^12.0.1",
 		"decompress-response": "^6.0.0",
 		"form-data-encoder": "^4.0.2",
 		"get-stream": "^8.0.1",
@@ -66,14 +66,14 @@
 		"@sinonjs/fake-timers": "^11.2.2",
 		"@types/benchmark": "^2.1.5",
 		"@types/express": "^4.17.21",
-		"@types/node": "^20.10.0",
+		"@types/node": "^20.12.12",
 		"@types/pem": "^1.14.4",
-		"@types/readable-stream": "^4.0.9",
+		"@types/readable-stream": "^4.0.14",
 		"@types/request": "^2.48.12",
 		"@types/sinon": "^17.0.2",
 		"@types/sinonjs__fake-timers": "^8.1.5",
 		"ava": "^5.3.1",
-		"axios": "^1.6.2",
+		"axios": "^1.6.8",
 		"benchmark": "^2.1.4",
 		"bluebird": "^3.7.2",
 		"body-parser": "^1.20.2",
@@ -81,33 +81,35 @@
 		"create-test-server": "^3.0.1",
 		"del-cli": "^5.1.0",
 		"delay": "^6.0.0",
-		"express": "^4.18.2",
+		"expect-type": "^0.19.0",
+		"express": "^4.19.2",
 		"form-data": "^4.0.0",
 		"formdata-node": "^6.0.3",
-		"nock": "^13.4.0",
+		"nock": "^13.5.4",
 		"node-fetch": "^3.3.2",
-		"np": "^9.0.0",
+		"np": "^10.0.5",
 		"nyc": "^15.1.0",
-		"p-event": "^6.0.0",
+		"p-event": "^6.0.1",
 		"pem": "^1.14.8",
 		"pify": "^6.1.0",
 		"readable-stream": "^4.4.2",
 		"request": "^2.88.2",
-		"sinon": "^17.0.1",
+		"sinon": "^18.0.0",
 		"slow-stream": "0.0.4",
 		"tempy": "^3.1.0",
 		"then-busboy": "^5.2.1",
-		"tough-cookie": "^4.1.3",
-		"tsx": "^4.6.0",
+		"tough-cookie": "^4.1.4",
+		"tsx": "^4.10.4",
 		"type-fest": "^4.8.2",
-		"typescript": "^5.3.2",
+		"typescript": "^5.4.5",
 		"xo": "^0.56.0"
 	},
 	"ava": {
 		"files": [
-			"test/*"
+			"test/*",
+			"!test/*.types.ts"
 		],
-		"timeout": "1m",
+		"timeout": "10m",
 		"extensions": {
 			"ts": "module"
 		},

package/readme.md

@@ -12,11 +12,13 @@
 			</sup>
 		</p>
 		<br>
+		<br>
 		<a href="https://retool.com/?utm_campaign=sindresorhus">
-			<img src="https://sindresorhus.com/assets/thanks/retool-logo.svg" width="210">
+			<img src="https://sindresorhus.com/assets/thanks/retool-logo.svg" width="220">
 		</a>
 		<br>
 		<br>
+		<br>
 		<a href="https://strapi.io/?ref=sindresorhus">
 			<div>
 				<img src="https://sindresorhus.com/assets/thanks/strapi-logo-white-bg.png" width="200" alt="Strapi">
@@ -45,26 +47,18 @@
 		<br>
 		<br>
 		<br>
-		<a href="https://dutchis.net/?ref=sindresorhus#gh-light-mode-only">
-			<div>
-				<img src="https://sindresorhus.com/assets/thanks/dutchis-logo-light.png" width="200" alt="DutchIS">
-			</div>
-			<br>
-			<b>VPS hosting with taste 😛</b>
+		<br>
+		<a href="https://www.fame.fi#gh-light-mode-only">
+			<img src="https://sindresorhus.com/assets/thanks/fame-logo-light.svg" width="200" alt="Fame Helsinki">
 		</a>
-		<a href="https://dutchis.net/?ref=sindresorhus#gh-dark-mode-only">
-			<div>
-				<img src="https://sindresorhus.com/assets/thanks/dutchis-logo-dark.png" width="200" alt="DutchIS">
-			</div>
-			<br>
-			<b>VPS hosting with taste 😛</b>
+		<a href="https://www.fame.fi#gh-dark-mode-only">
+			<img src="https://sindresorhus.com/assets/thanks/fame-logo-dark.svg" width="200" alt="Fame Helsinki">
 		</a>
 		<br>
 		<br>
 		<br>
 		<br>
 		<br>
-		<br>
 	</p>
 	<br>
 	<br>