@wordpress/api-fetch 7.41.0 → 7.41.1-next.v.202603102151.0

package/build/middlewares/http-v1.cjs

@@ -31,9 +31,9 @@ var httpV1Middleware = (options, next) => {
     options = {
       ...options,
       headers: {
+        "Content-Type": "application/json",
         ...options.headers,
-        "X-HTTP-Method-Override": method,
-        "Content-Type": "application/json"
+        "X-HTTP-Method-Override": method
       },
       method: "POST"
     };

package/build/middlewares/http-v1.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/middlewares/http-v1.ts"],
-  "sourcesContent": ["/**\n * Internal dependencies\n */\nimport type { APIFetchMiddleware } from '../types';\n\n/**\n * Set of HTTP methods which are eligible to be overridden.\n */\nconst OVERRIDE_METHODS = new Set( [ 'PATCH', 'PUT', 'DELETE' ] );\n\n/**\n * Default request method.\n *\n * \"A request has an associated method (a method). Unless stated otherwise it\n * is `GET`.\"\n *\n * @see  https://fetch.spec.whatwg.org/#requests\n */\nconst DEFAULT_METHOD = 'GET';\n\n/**\n * API Fetch middleware which overrides the request method for HTTP v1\n * compatibility leveraging the REST API X-HTTP-Method-Override header.\n *\n * @param options\n * @param next\n */\nconst httpV1Middleware: APIFetchMiddleware = ( options, next ) => {\n\tconst { method = DEFAULT_METHOD } = options;\n\tif ( OVERRIDE_METHODS.has( method.toUpperCase() ) ) {\n\t\toptions = {\n\t\t\t...options,\n\t\t\theaders: {\n\t\t\t\t...options.headers,\n\t\t\t\t'X-HTTP-Method-Override': method,\n\t\t\t\t'Content-Type': 'application/json',\n\t\t\t},\n\t\t\tmethod: 'POST',\n\t\t};\n\t}\n\n\treturn next( options );\n};\n\nexport default httpV1Middleware;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,IAAM,mBAAmB,oBAAI,IAAK,CAAE,SAAS,OAAO,QAAS,CAAE;AAU/D,IAAM,iBAAiB;AASvB,IAAM,mBAAuC,CAAE,SAAS,SAAU;AACjE,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,MAAK,iBAAiB,IAAK,OAAO,YAAY,CAAE,GAAI;AACnD,cAAU;AAAA,MACT,GAAG;AAAA,MACH,SAAS;AAAA,QACR,GAAG,QAAQ;AAAA,QACX,0BAA0B;AAAA,QAC1B,gBAAgB;AAAA,MACjB;AAAA,MACA,QAAQ;AAAA,IACT;AAAA,EACD;AAEA,SAAO,KAAM,OAAQ;AACtB;AAEA,IAAO,kBAAQ;",
+  "sourcesContent": ["/**\n * Internal dependencies\n */\nimport type { APIFetchMiddleware } from '../types';\n\n/**\n * Set of HTTP methods which are eligible to be overridden.\n */\nconst OVERRIDE_METHODS = new Set( [ 'PATCH', 'PUT', 'DELETE' ] );\n\n/**\n * Default request method.\n *\n * \"A request has an associated method (a method). Unless stated otherwise it\n * is `GET`.\"\n *\n * @see  https://fetch.spec.whatwg.org/#requests\n */\nconst DEFAULT_METHOD = 'GET';\n\n/**\n * API Fetch middleware which overrides the request method for HTTP v1\n * compatibility leveraging the REST API X-HTTP-Method-Override header.\n *\n * @param options\n * @param next\n */\nconst httpV1Middleware: APIFetchMiddleware = ( options, next ) => {\n\tconst { method = DEFAULT_METHOD } = options;\n\tif ( OVERRIDE_METHODS.has( method.toUpperCase() ) ) {\n\t\toptions = {\n\t\t\t...options,\n\t\t\theaders: {\n\t\t\t\t'Content-Type': 'application/json',\n\t\t\t\t...options.headers,\n\t\t\t\t'X-HTTP-Method-Override': method,\n\t\t\t},\n\t\t\tmethod: 'POST',\n\t\t};\n\t}\n\n\treturn next( options );\n};\n\nexport default httpV1Middleware;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,IAAM,mBAAmB,oBAAI,IAAK,CAAE,SAAS,OAAO,QAAS,CAAE;AAU/D,IAAM,iBAAiB;AASvB,IAAM,mBAAuC,CAAE,SAAS,SAAU;AACjE,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,MAAK,iBAAiB,IAAK,OAAO,YAAY,CAAE,GAAI;AACnD,cAAU;AAAA,MACT,GAAG;AAAA,MACH,SAAS;AAAA,QACR,gBAAgB;AAAA,QAChB,GAAG,QAAQ;AAAA,QACX,0BAA0B;AAAA,MAC3B;AAAA,MACA,QAAQ;AAAA,IACT;AAAA,EACD;AAEA,SAAO,KAAM,OAAQ;AACtB;AAEA,IAAO,kBAAQ;",
   "names": []
 }

package/build-module/middlewares/http-v1.mjs

@@ -7,9 +7,9 @@ var httpV1Middleware = (options, next) => {
     options = {
       ...options,
       headers: {
+        "Content-Type": "application/json",
         ...options.headers,
-        "X-HTTP-Method-Override": method,
-        "Content-Type": "application/json"
+        "X-HTTP-Method-Override": method
       },
       method: "POST"
     };

package/build-module/middlewares/http-v1.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/middlewares/http-v1.ts"],
-  "sourcesContent": ["/**\n * Internal dependencies\n */\nimport type { APIFetchMiddleware } from '../types';\n\n/**\n * Set of HTTP methods which are eligible to be overridden.\n */\nconst OVERRIDE_METHODS = new Set( [ 'PATCH', 'PUT', 'DELETE' ] );\n\n/**\n * Default request method.\n *\n * \"A request has an associated method (a method). Unless stated otherwise it\n * is `GET`.\"\n *\n * @see  https://fetch.spec.whatwg.org/#requests\n */\nconst DEFAULT_METHOD = 'GET';\n\n/**\n * API Fetch middleware which overrides the request method for HTTP v1\n * compatibility leveraging the REST API X-HTTP-Method-Override header.\n *\n * @param options\n * @param next\n */\nconst httpV1Middleware: APIFetchMiddleware = ( options, next ) => {\n\tconst { method = DEFAULT_METHOD } = options;\n\tif ( OVERRIDE_METHODS.has( method.toUpperCase() ) ) {\n\t\toptions = {\n\t\t\t...options,\n\t\t\theaders: {\n\t\t\t\t...options.headers,\n\t\t\t\t'X-HTTP-Method-Override': method,\n\t\t\t\t'Content-Type': 'application/json',\n\t\t\t},\n\t\t\tmethod: 'POST',\n\t\t};\n\t}\n\n\treturn next( options );\n};\n\nexport default httpV1Middleware;\n"],
-  "mappings": ";AAQA,IAAM,mBAAmB,oBAAI,IAAK,CAAE,SAAS,OAAO,QAAS,CAAE;AAU/D,IAAM,iBAAiB;AASvB,IAAM,mBAAuC,CAAE,SAAS,SAAU;AACjE,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,MAAK,iBAAiB,IAAK,OAAO,YAAY,CAAE,GAAI;AACnD,cAAU;AAAA,MACT,GAAG;AAAA,MACH,SAAS;AAAA,QACR,GAAG,QAAQ;AAAA,QACX,0BAA0B;AAAA,QAC1B,gBAAgB;AAAA,MACjB;AAAA,MACA,QAAQ;AAAA,IACT;AAAA,EACD;AAEA,SAAO,KAAM,OAAQ;AACtB;AAEA,IAAO,kBAAQ;",
+  "sourcesContent": ["/**\n * Internal dependencies\n */\nimport type { APIFetchMiddleware } from '../types';\n\n/**\n * Set of HTTP methods which are eligible to be overridden.\n */\nconst OVERRIDE_METHODS = new Set( [ 'PATCH', 'PUT', 'DELETE' ] );\n\n/**\n * Default request method.\n *\n * \"A request has an associated method (a method). Unless stated otherwise it\n * is `GET`.\"\n *\n * @see  https://fetch.spec.whatwg.org/#requests\n */\nconst DEFAULT_METHOD = 'GET';\n\n/**\n * API Fetch middleware which overrides the request method for HTTP v1\n * compatibility leveraging the REST API X-HTTP-Method-Override header.\n *\n * @param options\n * @param next\n */\nconst httpV1Middleware: APIFetchMiddleware = ( options, next ) => {\n\tconst { method = DEFAULT_METHOD } = options;\n\tif ( OVERRIDE_METHODS.has( method.toUpperCase() ) ) {\n\t\toptions = {\n\t\t\t...options,\n\t\t\theaders: {\n\t\t\t\t'Content-Type': 'application/json',\n\t\t\t\t...options.headers,\n\t\t\t\t'X-HTTP-Method-Override': method,\n\t\t\t},\n\t\t\tmethod: 'POST',\n\t\t};\n\t}\n\n\treturn next( options );\n};\n\nexport default httpV1Middleware;\n"],
+  "mappings": ";AAQA,IAAM,mBAAmB,oBAAI,IAAK,CAAE,SAAS,OAAO,QAAS,CAAE;AAU/D,IAAM,iBAAiB;AASvB,IAAM,mBAAuC,CAAE,SAAS,SAAU;AACjE,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,MAAK,iBAAiB,IAAK,OAAO,YAAY,CAAE,GAAI;AACnD,cAAU;AAAA,MACT,GAAG;AAAA,MACH,SAAS;AAAA,QACR,gBAAgB;AAAA,QAChB,GAAG,QAAQ;AAAA,QACX,0BAA0B;AAAA,MAC3B;AAAA,MACA,QAAQ;AAAA,IACT;AAAA,EACD;AAEA,SAAO,KAAM,OAAQ;AACtB;AAEA,IAAO,kBAAQ;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/api-fetch",
-	"version": "7.41.0",
+	"version": "7.41.1-next.v.202603102151.0+59e17f9ec",
 	"description": "Utility to make WordPress REST API requests.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -45,11 +45,11 @@
 	"wpScriptDefaultExport": true,
 	"types": "build-types",
 	"dependencies": {
-		"@wordpress/i18n": "^6.14.0",
-		"@wordpress/url": "^4.41.0"
+		"@wordpress/i18n": "^6.14.1-next.v.202603102151.0+59e17f9ec",
+		"@wordpress/url": "^4.41.1-next.v.202603102151.0+59e17f9ec"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "8bfc179b9aed74c0a6dd6e8edf7a49e40e4f87cc"
+	"gitHead": "86db21e727d89e8f0dbba9300d2f97fd22b08693"
 }

package/src/middlewares/http-v1.ts

@@ -31,9 +31,9 @@ const httpV1Middleware: APIFetchMiddleware = ( options, next ) => {
 		options = {
 			...options,
 			headers: {
+				'Content-Type': 'application/json',
 				...options.headers,
 				'X-HTTP-Method-Override': method,
-				'Content-Type': 'application/json',
 			},
 			method: 'POST',
 		};

package/src/middlewares/test/http-v1.ts

@@ -39,4 +39,213 @@ describe( 'HTTP v1 Middleware', () => {
 
 		httpV1Middleware( requestOptions, callback );
 	} );
+
+	it( 'should default Content-Type to application/json when no headers are set', () => {
+		expect.hasAssertions();
+
+		const callback: FetchHandler = async ( options ) => {
+			expect( options.headers![ 'Content-Type' ] ).toBe(
+				'application/json'
+			);
+		};
+
+		httpV1Middleware( { method: 'PUT', data: {} }, callback );
+	} );
+
+	it( 'should default Content-Type to application/json when headers exist without Content-Type', () => {
+		expect.hasAssertions();
+
+		const callback: FetchHandler = async ( options ) => {
+			expect( options.headers![ 'Content-Type' ] ).toBe(
+				'application/json'
+			);
+			expect( options.headers![ 'X-Custom' ] ).toBe( 'value' );
+		};
+
+		httpV1Middleware(
+			{
+				method: 'PUT',
+				headers: { 'X-Custom': 'value' },
+				data: {},
+			},
+			callback
+		);
+	} );
+
+	it( 'should respect a caller-provided Content-Type header', () => {
+		expect.hasAssertions();
+
+		const callback: FetchHandler = async ( options ) => {
+			expect( options.headers![ 'Content-Type' ] ).toBe( 'text/plain' );
+			expect( options.method ).toBe( 'POST' );
+			expect( options.headers![ 'X-HTTP-Method-Override' ] ).toBe(
+				'PUT'
+			);
+		};
+
+		httpV1Middleware(
+			{
+				method: 'PUT',
+				headers: { 'Content-Type': 'text/plain' },
+				body: '# Markdown content',
+			},
+			callback
+		);
+	} );
+
+	it( 'should respect Content-Type for PATCH requests', () => {
+		expect.hasAssertions();
+
+		const callback: FetchHandler = async ( options ) => {
+			expect( options.headers![ 'Content-Type' ] ).toBe(
+				'application/xml'
+			);
+			expect( options.headers![ 'X-HTTP-Method-Override' ] ).toBe(
+				'PATCH'
+			);
+		};
+
+		httpV1Middleware(
+			{
+				method: 'PATCH',
+				headers: { 'Content-Type': 'application/xml' },
+				body: '<doc/>',
+			},
+			callback
+		);
+	} );
+
+	it( 'should respect Content-Type for DELETE requests', () => {
+		expect.hasAssertions();
+
+		const callback: FetchHandler = async ( options ) => {
+			expect( options.headers![ 'Content-Type' ] ).toBe( 'text/plain' );
+			expect( options.headers![ 'X-HTTP-Method-Override' ] ).toBe(
+				'DELETE'
+			);
+		};
+
+		httpV1Middleware(
+			{
+				method: 'DELETE',
+				headers: { 'Content-Type': 'text/plain' },
+			},
+			callback
+		);
+	} );
+
+	it( 'should always set X-HTTP-Method-Override regardless of caller headers', () => {
+		expect.hasAssertions();
+
+		const callback: FetchHandler = async ( options ) => {
+			// X-HTTP-Method-Override must not be overridable by the caller.
+			expect( options.headers![ 'X-HTTP-Method-Override' ] ).toBe(
+				'PUT'
+			);
+		};
+
+		httpV1Middleware(
+			{
+				method: 'PUT',
+				headers: { 'X-HTTP-Method-Override': 'DELETE' },
+				data: {},
+			},
+			callback
+		);
+	} );
+
+	it( 'should preserve other caller headers alongside Content-Type override', () => {
+		expect.hasAssertions();
+
+		const callback: FetchHandler = async ( options ) => {
+			expect( options.headers![ 'Content-Type' ] ).toBe(
+				'text/markdown'
+			);
+			expect( options.headers!.Authorization ).toBe( 'Bearer token123' );
+			expect( options.headers![ 'X-Custom-Header' ] ).toBe(
+				'custom-value'
+			);
+			expect( options.headers![ 'X-HTTP-Method-Override' ] ).toBe(
+				'PUT'
+			);
+		};
+
+		httpV1Middleware(
+			{
+				method: 'PUT',
+				headers: {
+					'Content-Type': 'text/markdown',
+					Authorization: 'Bearer token123',
+					'X-Custom-Header': 'custom-value',
+				},
+				body: '# Hello',
+			},
+			callback
+		);
+	} );
+
+	it( 'should not modify GET requests even with custom Content-Type', () => {
+		expect.hasAssertions();
+
+		const requestOptions = {
+			method: 'GET' as const,
+			path: '/wp/v2/posts',
+			headers: { 'Content-Type': 'text/plain' },
+		};
+
+		const callback: FetchHandler = async ( options ) => {
+			expect( options ).toBe( requestOptions );
+		};
+
+		httpV1Middleware( requestOptions, callback );
+	} );
+
+	it( 'should not modify POST requests', () => {
+		expect.hasAssertions();
+
+		const requestOptions = {
+			method: 'POST' as const,
+			path: '/wp/v2/posts',
+			headers: { 'Content-Type': 'text/plain' },
+			body: 'raw content',
+		};
+
+		const callback: FetchHandler = async ( options ) => {
+			expect( options ).toBe( requestOptions );
+		};
+
+		httpV1Middleware( requestOptions, callback );
+	} );
+
+	it( 'should handle case-insensitive method matching', () => {
+		expect.hasAssertions();
+
+		const callback: FetchHandler = async ( options ) => {
+			expect( options.method ).toBe( 'POST' );
+			expect( options.headers![ 'X-HTTP-Method-Override' ] ).toBe(
+				'put'
+			);
+		};
+
+		httpV1Middleware( { method: 'put', data: {} }, callback );
+	} );
+
+	it( 'should preserve the body when overriding Content-Type', () => {
+		expect.hasAssertions();
+
+		const markdownContent = '# Title\n\nSome **bold** text.\n';
+		const callback: FetchHandler = async ( options ) => {
+			expect( options.body ).toBe( markdownContent );
+			expect( options.headers![ 'Content-Type' ] ).toBe( 'text/plain' );
+		};
+
+		httpV1Middleware(
+			{
+				method: 'PUT',
+				headers: { 'Content-Type': 'text/plain' },
+				body: markdownContent,
+			},
+			callback
+		);
+	} );
 } );