@wordpress/api-fetch 7.29.1-next.f34ab90e9.0 → 7.30.1-next.6870dfe5b.0

package/build-types/middlewares/media-upload.d.ts

@@ -1,8 +1,9 @@
-export default mediaUploadMiddleware;
+import type { APIFetchMiddleware } from '../types';
 /**
  * Middleware handling media upload failures and retries.
- *
- * @type {import('../types').APIFetchMiddleware}
+ * @param options
+ * @param next
  */
-declare const mediaUploadMiddleware: import("../types").APIFetchMiddleware;
+declare const mediaUploadMiddleware: APIFetchMiddleware;
+export default mediaUploadMiddleware;
 //# sourceMappingURL=media-upload.d.ts.map

package/build-types/middlewares/media-upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media-upload.d.ts","sourceRoot":"","sources":["../../src/middlewares/media-upload.js"],"names":[],"mappings":";AA0BA;;;;GAIG;AACH,qCAFU,OAAO,UAAU,EAAE,kBAAkB,CAmE7C"}
+{"version":3,"file":"media-upload.d.ts","sourceRoot":"","sources":["../../src/middlewares/media-upload.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAmB,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAepE;;;;GAIG;AACH,QAAA,MAAM,qBAAqB,EAAE,kBAiE5B,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

package/build-types/middlewares/namespace-endpoint.d.ts

@@ -1,6 +1,7 @@
-export default namespaceAndEndpointMiddleware;
 /**
- * @type {import('../types').APIFetchMiddleware}
+ * Internal dependencies
  */
-declare const namespaceAndEndpointMiddleware: import("../types").APIFetchMiddleware;
+import type { APIFetchMiddleware } from '../types';
+declare const namespaceAndEndpointMiddleware: APIFetchMiddleware;
+export default namespaceAndEndpointMiddleware;
 //# sourceMappingURL=namespace-endpoint.d.ts.map

package/build-types/middlewares/namespace-endpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"namespace-endpoint.d.ts","sourceRoot":"","sources":["../../src/middlewares/namespace-endpoint.js"],"names":[],"mappings":";AAAA;;GAEG;AACH,8CAFU,OAAO,UAAU,EAAE,kBAAkB,CA0B7C"}
+{"version":3,"file":"namespace-endpoint.d.ts","sourceRoot":"","sources":["../../src/middlewares/namespace-endpoint.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD,QAAA,MAAM,8BAA8B,EAAE,kBA2BrC,CAAC;AAEF,eAAe,8BAA8B,CAAC"}

package/build-types/middlewares/nonce.d.ts

@@ -1,9 +1,14 @@
-export default createNonceMiddleware;
 /**
- * @param {string} nonce
- * @return {import('../types').APIFetchMiddleware & { nonce: string }} A middleware to enhance a request with a nonce.
+ * Internal dependencies
+ */
+import type { APIFetchMiddleware } from '../types';
+/**
+ * @param nonce
+ *
+ * @return  A middleware to enhance a request with a nonce.
  */
-declare function createNonceMiddleware(nonce: string): import("../types").APIFetchMiddleware & {
+declare function createNonceMiddleware(nonce: string): APIFetchMiddleware & {
     nonce: string;
 };
+export default createNonceMiddleware;
 //# sourceMappingURL=nonce.d.ts.map

package/build-types/middlewares/nonce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nonce.d.ts","sourceRoot":"","sources":["../../src/middlewares/nonce.js"],"names":[],"mappings":";AAAA;;;GAGG;AACH,8CAHW,MAAM,GACL,OAAO,UAAU,EAAE,kBAAkB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAgCpE"}
+{"version":3,"file":"nonce.d.ts","sourceRoot":"","sources":["../../src/middlewares/nonce.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD;;;;GAIG;AACH,iBAAS,qBAAqB,CAC7B,KAAK,EAAE,MAAM,GACX,kBAAkB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CA8BxC;AAED,eAAe,qBAAqB,CAAC"}

package/build-types/middlewares/preloading.d.ts

@@ -1,7 +1,11 @@
-export default createPreloadingMiddleware;
 /**
- * @param {Record<string, any>} preloadedData
- * @return {import('../types').APIFetchMiddleware} Preloading middleware.
+ * Internal dependencies
+ */
+import type { APIFetchMiddleware } from '../types';
+/**
+ * @param preloadedData
+ * @return Preloading middleware.
  */
-declare function createPreloadingMiddleware(preloadedData: Record<string, any>): import("../types").APIFetchMiddleware;
+declare function createPreloadingMiddleware(preloadedData: Record<string, any>): APIFetchMiddleware;
+export default createPreloadingMiddleware;
 //# sourceMappingURL=preloading.d.ts.map

package/build-types/middlewares/preloading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preloading.d.ts","sourceRoot":"","sources":["../../src/middlewares/preloading.js"],"names":[],"mappings":";AAKA;;;GAGG;AACH,2DAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAClB,OAAO,UAAU,EAAE,kBAAkB,CAqDhD"}
+{"version":3,"file":"preloading.d.ts","sourceRoot":"","sources":["../../src/middlewares/preloading.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD;;;GAGG;AACH,iBAAS,0BAA0B,CAClC,aAAa,EAAE,MAAM,CAAE,MAAM,EAAE,GAAG,CAAE,GAClC,kBAAkB,CAkDpB;AAkDD,eAAe,0BAA0B,CAAC"}

package/build-types/middlewares/root-url.d.ts

@@ -1,7 +1,11 @@
-export default createRootURLMiddleware;
 /**
- * @param {string} rootURL
- * @return {import('../types').APIFetchMiddleware} Root URL middleware.
+ * Internal dependencies
+ */
+import type { APIFetchMiddleware } from '../types';
+/**
+ * @param rootURL
+ * @return  Root URL middleware.
  */
-declare function createRootURLMiddleware(rootURL: string): import("../types").APIFetchMiddleware;
+declare const createRootURLMiddleware: (rootURL: string) => APIFetchMiddleware;
+export default createRootURLMiddleware;
 //# sourceMappingURL=root-url.d.ts.map

package/build-types/middlewares/root-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"root-url.d.ts","sourceRoot":"","sources":["../../src/middlewares/root-url.js"],"names":[],"mappings":";AAKA;;;GAGG;AACH,kDAHW,MAAM,GACL,OAAO,UAAU,EAAE,kBAAkB,CAkChD"}
+{"version":3,"file":"root-url.d.ts","sourceRoot":"","sources":["../../src/middlewares/root-url.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAGnD;;;GAGG;AACH,QAAA,MAAM,uBAAuB,YACjB,MAAM,KAAI,kBAiCpB,CAAC;AAEH,eAAe,uBAAuB,CAAC"}

package/build-types/middlewares/theme-preview.d.ts

@@ -1,4 +1,7 @@
-export default createThemePreviewMiddleware;
+/**
+ * Internal dependencies
+ */
+import type { APIFetchMiddleware } from '../types';
 /**
  * This appends a `wp_theme_preview` parameter to the REST API request URL if
  * the admin URL contains a `theme` GET parameter.
@@ -6,8 +9,9 @@ export default createThemePreviewMiddleware;
  * If the REST API request URL has contained the `wp_theme_preview` parameter as `''`,
  * then bypass this middleware.
  *
- * @param {Record<string, any>} themePath
- * @return {import('../types').APIFetchMiddleware} Preloading middleware.
+ * @param themePath
+ * @return  Preloading middleware.
  */
-declare function createThemePreviewMiddleware(themePath: Record<string, any>): import("../types").APIFetchMiddleware;
+declare const createThemePreviewMiddleware: (themePath: Record<string, any>) => APIFetchMiddleware;
+export default createThemePreviewMiddleware;
 //# sourceMappingURL=theme-preview.d.ts.map

package/build-types/middlewares/theme-preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme-preview.d.ts","sourceRoot":"","sources":["../../src/middlewares/theme-preview.js"],"names":[],"mappings":";AAKA;;;;;;;;;GASG;AACH,yDAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAClB,OAAO,UAAU,EAAE,kBAAkB,CA0BhD"}
+{"version":3,"file":"theme-preview.d.ts","sourceRoot":"","sources":["../../src/middlewares/theme-preview.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD;;;;;;;;;GASG;AACH,QAAA,MAAM,4BAA4B,cACpB,MAAM,CAAE,MAAM,EAAE,GAAG,CAAE,KAAI,kBAqCrC,CAAC;AAEH,eAAe,4BAA4B,CAAC"}

package/build-types/middlewares/user-locale.d.ts

@@ -1,6 +1,7 @@
-export default userLocaleMiddleware;
 /**
- * @type {import('../types').APIFetchMiddleware}
+ * Internal dependencies
  */
-declare const userLocaleMiddleware: import("../types").APIFetchMiddleware;
+import type { APIFetchMiddleware } from '../types';
+declare const userLocaleMiddleware: APIFetchMiddleware;
+export default userLocaleMiddleware;
 //# sourceMappingURL=user-locale.d.ts.map

package/build-types/middlewares/user-locale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-locale.d.ts","sourceRoot":"","sources":["../../src/middlewares/user-locale.js"],"names":[],"mappings":";AAKA;;GAEG;AACH,oCAFU,OAAO,UAAU,EAAE,kBAAkB,CAkB7C"}
+{"version":3,"file":"user-locale.d.ts","sourceRoot":"","sources":["../../src/middlewares/user-locale.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD,QAAA,MAAM,oBAAoB,EAAE,kBAgB3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/build-types/types.d.ts

@@ -1,14 +1,15 @@
-export interface APIFetchOptions extends RequestInit {
+export interface APIFetchOptions<Parse extends boolean = boolean> extends RequestInit {
     headers?: Record<string, string>;
     path?: string;
     url?: string;
     /**
      * @default true
      */
-    parse?: boolean;
+    parse?: Parse;
     data?: any;
     namespace?: string;
     endpoint?: string;
 }
-export type APIFetchMiddleware = (options: APIFetchOptions, next: (nextOptions: APIFetchOptions) => Promise<any>) => Promise<any>;
+export type FetchHandler<Parse extends boolean = boolean> = (nextOptions: APIFetchOptions<Parse>) => Promise<any>;
+export type APIFetchMiddleware<Parse extends boolean = boolean> = (options: APIFetchOptions<Parse>, next: FetchHandler<Parse>) => Promise<any>;
 //# sourceMappingURL=types.d.ts.map

package/build-types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAEnD,OAAO,CAAC,EAAE,MAAM,CAAE,MAAM,EAAE,MAAM,CAAE,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,kBAAkB,GAAG,CAChC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,CAAE,WAAW,EAAE,eAAe,KAAM,OAAO,CAAE,GAAG,CAAE,KACpD,OAAO,CAAE,GAAG,CAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe,CAAE,KAAK,SAAS,OAAO,GAAG,OAAO,CAChE,SAAQ,WAAW;IAEnB,OAAO,CAAC,EAAE,MAAM,CAAE,MAAM,EAAE,MAAM,CAAE,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,YAAY,CAAE,KAAK,SAAS,OAAO,GAAG,OAAO,IAAK,CAC7D,WAAW,EAAE,eAAe,CAAE,KAAK,CAAE,KACjC,OAAO,CAAE,GAAG,CAAE,CAAC;AAEpB,MAAM,MAAM,kBAAkB,CAAE,KAAK,SAAS,OAAO,GAAG,OAAO,IAAK,CACnE,OAAO,EAAE,eAAe,CAAE,KAAK,CAAE,EACjC,IAAI,EAAE,YAAY,CAAE,KAAK,CAAE,KACvB,OAAO,CAAE,GAAG,CAAE,CAAC"}

package/build-types/utils/response.d.ts

@@ -1,10 +1,18 @@
+/**
+ * Parses the apiFetch response properly and normalize response errors.
+ *
+ * @param response
+ * @param shouldParseResponse
+ *
+ * @return Parsed response.
+ */
+export declare function parseResponseAndNormalizeError(response: Response, shouldParseResponse?: boolean): Promise<any>;
 /**
  * Parses a response, throwing an error if parsing the response fails.
  *
- * @param {Response} response
- * @param {boolean}  shouldParseResponse
- * @return {Promise<any>} Parsed response.
+ * @param response
+ * @param shouldParseResponse
+ * @return Never returns, always throws.
  */
-export function parseAndThrowError(response: Response, shouldParseResponse?: boolean): Promise<any>;
-export function parseResponseAndNormalizeError(response: Response, shouldParseResponse?: boolean): Promise<any>;
+export declare function parseAndThrowError(response: Response, shouldParseResponse?: boolean): Promise<void>;
 //# sourceMappingURL=response.d.ts.map

package/build-types/utils/response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/utils/response.js"],"names":[],"mappings":"AAgEA;;;;;;GAMG;AACH,6CAJW,QAAQ,wBACR,OAAO,GACN,OAAO,CAAC,GAAG,CAAC,CAevB;AA7BM,yDALI,QAAQ,wBACR,OAAO,GAEN,OAAO,CAAC,GAAG,CAAC,CASvB"}
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/utils/response.ts"],"names":[],"mappings":"AAuBA;;;;;;;GAOG;AACH,wBAAsB,8BAA8B,CACnD,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,UAAO,gBAW1B;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACvC,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,UAAO,iBAQ1B"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/api-fetch",
-	"version": "7.29.1-next.f34ab90e9.0",
+	"version": "7.30.1-next.6870dfe5b.0",
 	"description": "Utility to make WordPress REST API requests.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -30,11 +30,11 @@
 	"types": "build-types",
 	"dependencies": {
 		"@babel/runtime": "7.25.7",
-		"@wordpress/i18n": "^6.2.1-next.f34ab90e9.0",
-		"@wordpress/url": "^4.29.1-next.f34ab90e9.0"
+		"@wordpress/i18n": "^6.3.1-next.6870dfe5b.0",
+		"@wordpress/url": "^4.30.1-next.6870dfe5b.0"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "91f58004986ec6faf118825f925ac7873d171986"
+	"gitHead": "c8637da9df499cd7b6b07c9fad918f6d45f4de3d"
 }

package/src/{index.js → index.ts}

@@ -19,14 +19,17 @@ import {
 	parseResponseAndNormalizeError,
 	parseAndThrowError,
 } from './utils/response';
+import type {
+	APIFetchMiddleware,
+	APIFetchOptions,
+	FetchHandler,
+} from './types';
 
 /**
  * Default set of header values which should be sent with every request unless
  * explicitly provided through apiFetch options.
- *
- * @type {Record<string, string>}
  */
-const DEFAULT_HEADERS = {
+const DEFAULT_HEADERS: APIFetchOptions[ 'headers' ] = {
 	// The backend uses the Accept header as a condition for considering an
 	// incoming request as a REST request.
 	//
@@ -37,20 +40,12 @@ const DEFAULT_HEADERS = {
 /**
  * Default set of fetch option values which should be sent with every request
  * unless explicitly provided through apiFetch options.
- *
- * @type {Object}
  */
-const DEFAULT_OPTIONS = {
+const DEFAULT_OPTIONS: APIFetchOptions = {
 	credentials: 'include',
 };
 
-/** @typedef {import('./types').APIFetchMiddleware} APIFetchMiddleware */
-/** @typedef {import('./types').APIFetchOptions} APIFetchOptions */
-
-/**
- * @type {import('./types').APIFetchMiddleware[]}
- */
-const middlewares = [
+const middlewares: Array< APIFetchMiddleware > = [
 	userLocaleMiddleware,
 	namespaceEndpointMiddleware,
 	httpV1Middleware,
@@ -60,33 +55,13 @@ const middlewares = [
 /**
  * Register a middleware
  *
- * @param {import('./types').APIFetchMiddleware} middleware
+ * @param middleware
  */
-function registerMiddleware( middleware ) {
+function registerMiddleware( middleware: APIFetchMiddleware ) {
 	middlewares.unshift( middleware );
 }
 
-/**
- * Checks the status of a response, throwing the Response as an error if
- * it is outside the 200 range.
- *
- * @param {Response} response
- * @return {Response} The response if the status is in the 200 range.
- */
-const checkStatus = ( response ) => {
-	if ( response.status >= 200 && response.status < 300 ) {
-		return response;
-	}
-
-	throw response;
-};
-
-/** @typedef {(options: import('./types').APIFetchOptions) => Promise<any>} FetchHandler*/
-
-/**
- * @type {FetchHandler}
- */
-const defaultFetchHandler = ( nextOptions ) => {
+const defaultFetchHandler: FetchHandler = ( nextOptions ) => {
 	const { url, path, data, parse = true, ...remainingOptions } = nextOptions;
 	let { body, headers } = nextOptions;
 
@@ -99,7 +74,7 @@ const defaultFetchHandler = ( nextOptions ) => {
 		headers[ 'Content-Type' ] = 'application/json';
 	}
 
-	const responsePromise = window.fetch(
+	const responsePromise = globalThis.fetch(
 		// Fall back to explicitly passing `window.location` which is the behavior if `undefined` is passed.
 		url || path || window.location.href,
 		{
@@ -111,55 +86,85 @@ const defaultFetchHandler = ( nextOptions ) => {
 	);
 
 	return responsePromise.then(
-		( value ) =>
-			Promise.resolve( value )
-				.then( checkStatus )
-				.catch( ( response ) => parseAndThrowError( response, parse ) )
-				.then( ( response ) =>
-					parseResponseAndNormalizeError( response, parse )
-				),
+		( response ) => {
+			// If the response is not 2xx, still parse the response body as JSON
+			// but throw the JSON as error.
+			if ( ! response.ok ) {
+				return parseAndThrowError( response, parse );
+			}
+
+			return parseResponseAndNormalizeError( response, parse );
+		},
 		( err ) => {
 			// Re-throw AbortError for the users to handle it themselves.
 			if ( err && err.name === 'AbortError' ) {
 				throw err;
 			}
 
-			// Otherwise, there is most likely no network connection.
-			// Unfortunately the message might depend on the browser.
+			// If the browser reports being offline, we'll just assume that
+			// this is why the request failed.
+			if ( ! globalThis.navigator.onLine ) {
+				throw {
+					code: 'offline_error',
+					message: __(
+						'Unable to connect. Please check your Internet connection.'
+					),
+				};
+			}
+
+			// Hard to diagnose further due to how Window.fetch reports errors.
 			throw {
 				code: 'fetch_error',
-				message: __( 'You are probably offline.' ),
+				message: __(
+					'Could not get a valid response from the server.'
+				),
 			};
 		}
 	);
 };
 
-/** @type {FetchHandler} */
 let fetchHandler = defaultFetchHandler;
 
 /**
  * Defines a custom fetch handler for making the requests that will override
  * the default one using window.fetch
  *
- * @param {FetchHandler} newFetchHandler The new fetch handler
+ * @param newFetchHandler The new fetch handler
  */
-function setFetchHandler( newFetchHandler ) {
+function setFetchHandler( newFetchHandler: FetchHandler ) {
 	fetchHandler = newFetchHandler;
 }
 
+interface apiFetch {
+	< T, Parse extends boolean = true >(
+		options: APIFetchOptions< Parse >
+	): Promise< Parse extends true ? T : Response >;
+	nonceEndpoint?: string;
+	nonceMiddleware?: ReturnType< typeof createNonceMiddleware >;
+	use: ( middleware: APIFetchMiddleware ) => void;
+	setFetchHandler: ( newFetchHandler: FetchHandler ) => void;
+	createNonceMiddleware: typeof createNonceMiddleware;
+	createPreloadingMiddleware: typeof createPreloadingMiddleware;
+	createRootURLMiddleware: typeof createRootURLMiddleware;
+	fetchAllMiddleware: typeof fetchAllMiddleware;
+	mediaUploadMiddleware: typeof mediaUploadMiddleware;
+	createThemePreviewMiddleware: typeof createThemePreviewMiddleware;
+}
+
 /**
- * @template T
- * @param {import('./types').APIFetchOptions} options
- * @return {Promise<T>} A promise representing the request processed via the registered middlewares.
+ * Fetch
+ *
+ * @param options The options for the fetch.
+ * @return A promise representing the request processed via the registered middlewares.
  */
-function apiFetch( options ) {
+const apiFetch: apiFetch = ( options ) => {
 	// creates a nested function chain that calls all middlewares and finally the `fetchHandler`,
 	// converting `middlewares = [ m1, m2, m3 ]` into:
 	// ```
 	// opts1 => m1( opts1, opts2 => m2( opts2, opts3 => m3( opts3, fetchHandler ) ) );
 	// ```
-	const enhancedHandler = middlewares.reduceRight(
-		( /** @type {FetchHandler} */ next, middleware ) => {
+	const enhancedHandler = middlewares.reduceRight< FetchHandler >(
+		( next, middleware ) => {
 			return ( workingOptions ) => middleware( workingOptions, next );
 		},
 		fetchHandler
@@ -171,20 +176,23 @@ function apiFetch( options ) {
 		}
 
 		// If the nonce is invalid, refresh it and try again.
-		return (
-			window
-				// @ts-ignore
-				.fetch( apiFetch.nonceEndpoint )
-				.then( checkStatus )
-				.then( ( data ) => data.text() )
-				.then( ( text ) => {
-					// @ts-ignore
-					apiFetch.nonceMiddleware.nonce = text;
-					return apiFetch( options );
-				} )
-		);
+		return globalThis
+			.fetch( apiFetch.nonceEndpoint! )
+			.then( ( response ) => {
+				// If the nonce refresh fails, it means we failed to recover from the original
+				// `rest_cookie_invalid_nonce` error and that it's time to finally re-throw it.
+				if ( ! response.ok ) {
+					return Promise.reject( error );
+				}
+
+				return response.text();
+			} )
+			.then( ( text ) => {
+				apiFetch.nonceMiddleware!.nonce = text;
+				return apiFetch( options );
+			} );
 	} );
-}
+};
 
 apiFetch.use = registerMiddleware;
 apiFetch.setFetchHandler = setFetchHandler;
@@ -197,3 +205,4 @@ apiFetch.mediaUploadMiddleware = mediaUploadMiddleware;
 apiFetch.createThemePreviewMiddleware = createThemePreviewMiddleware;
 
 export default apiFetch;
+export * from './types';

package/src/middlewares/{fetch-all-middleware.js → fetch-all-middleware.ts}

@@ -7,15 +7,19 @@ import { addQueryArgs } from '@wordpress/url';
  * Internal dependencies
  */
 import apiFetch from '..';
+import type { APIFetchMiddleware, APIFetchOptions } from '../types';
 
 /**
  * Apply query arguments to both URL and Path, whichever is present.
  *
- * @param {import('../types').APIFetchOptions} props
- * @param {Record<string, string | number>}    queryArgs
- * @return {import('../types').APIFetchOptions} The request with the modified query args
+ * @param {APIFetchOptions}                   props     The request options
+ * @param {Record< string, string | number >} queryArgs
+ * @return  The request with the modified query args
  */
-const modifyQuery = ( { path, url, ...options }, queryArgs ) => ( {
+const modifyQuery = (
+	{ path, url, ...options }: APIFetchOptions,
+	queryArgs: Record< string, string | number >
+): APIFetchOptions => ( {
 	...options,
 	url: url && addQueryArgs( url, queryArgs ),
 	path: path && addQueryArgs( path, queryArgs ),
@@ -24,17 +28,17 @@ const modifyQuery = ( { path, url, ...options }, queryArgs ) => ( {
 /**
  * Duplicates parsing functionality from apiFetch.
  *
- * @param {Response} response
- * @return {Promise<any>} Parsed response json.
+ * @param response
+ * @return Parsed response json.
  */
-const parseResponse = ( response ) =>
+const parseResponse = ( response: Response ) =>
 	response.json ? response.json() : Promise.reject( response );
 
 /**
- * @param {string | null} linkHeader
- * @return {{ next?: string }} The parsed link header.
+ * @param linkHeader
+ * @return The parsed link header.
  */
-const parseLinkHeader = ( linkHeader ) => {
+const parseLinkHeader = ( linkHeader: string | null ) => {
 	if ( ! linkHeader ) {
 		return {};
 	}
@@ -47,19 +51,19 @@ const parseLinkHeader = ( linkHeader ) => {
 };
 
 /**
- * @param {Response} response
- * @return {string | undefined} The next page URL.
+ * @param response
+ * @return  The next page URL.
  */
-const getNextPageUrl = ( response ) => {
+const getNextPageUrl = ( response: Response ) => {
 	const { next } = parseLinkHeader( response.headers.get( 'link' ) );
 	return next;
 };
 
 /**
- * @param {import('../types').APIFetchOptions} options
- * @return {boolean} True if the request contains an unbounded query.
+ * @param options
+ * @return True if the request contains an unbounded query.
  */
-const requestContainsUnboundedQuery = ( options ) => {
+const requestContainsUnboundedQuery = ( options: APIFetchOptions ) => {
 	const pathIsUnbounded =
 		!! options.path && options.path.indexOf( 'per_page=-1' ) !== -1;
 	const urlIsUnbounded =
@@ -71,10 +75,10 @@ const requestContainsUnboundedQuery = ( options ) => {
  * The REST API enforces an upper limit on the per_page option. To handle large
  * collections, apiFetch consumers can pass `per_page=-1`; this middleware will
  * then recursively assemble a full response array from all available pages.
- *
- * @type {import('../types').APIFetchMiddleware}
+ * @param options
+ * @param next
  */
-const fetchAllMiddleware = async ( options, next ) => {
+const fetchAllMiddleware: APIFetchMiddleware = async ( options, next ) => {
 	if ( options.parse === false ) {
 		// If a consumer has opted out of parsing, do not apply middleware.
 		return next( options );
@@ -108,7 +112,7 @@ const fetchAllMiddleware = async ( options, next ) => {
 	}
 
 	// Iteratively fetch all remaining pages until no "next" header is found.
-	let mergedResults = /** @type {any[]} */ ( [] ).concat( results );
+	let mergedResults = ( [] as Array< any > ).concat( results );
 	while ( nextPage ) {
 		const nextResponse = await apiFetch( {
 			...options,

package/src/middlewares/{http-v1.js → http-v1.ts}

@@ -1,7 +1,10 @@
+/**
+ * Internal dependencies
+ */
+import type { APIFetchMiddleware } from '../types';
+
 /**
  * Set of HTTP methods which are eligible to be overridden.
- *
- * @type {Set<string>}
  */
 const OVERRIDE_METHODS = new Set( [ 'PATCH', 'PUT', 'DELETE' ] );
 
@@ -12,8 +15,6 @@ const OVERRIDE_METHODS = new Set( [ 'PATCH', 'PUT', 'DELETE' ] );
  * is `GET`."
  *
  * @see  https://fetch.spec.whatwg.org/#requests
- *
- * @type {string}
  */
 const DEFAULT_METHOD = 'GET';
 
@@ -21,9 +22,10 @@ const DEFAULT_METHOD = 'GET';
  * API Fetch middleware which overrides the request method for HTTP v1
  * compatibility leveraging the REST API X-HTTP-Method-Override header.
  *
- * @type {import('../types').APIFetchMiddleware}
+ * @param options
+ * @param next
  */
-const httpV1Middleware = ( options, next ) => {
+const httpV1Middleware: APIFetchMiddleware = ( options, next ) => {
 	const { method = DEFAULT_METHOD } = options;
 	if ( OVERRIDE_METHODS.has( method.toUpperCase() ) ) {
 		options = {