@wordpress/core-data 4.1.1 → 4.2.0-next.e230fbab09.0

package/src/locks/test/engine.js

@@ -5,7 +5,7 @@ import createLocks from '../engine';
 
 jest.useRealTimers();
 
-// we correctly await all promises with expect calls, but the rule doesn't detect that
+// We correctly await all promises with expect calls, but the rule doesn't detect that.
 /* eslint-disable jest/valid-expect-in-promise */
 
 describe( 'Locks engine', () => {
@@ -15,11 +15,11 @@ describe( 'Locks engine', () => {
 		let l1Granted = false;
 		let l2Granted = false;
 
-		// request two locks
+		// Request two locks.
 		const l1 = locks.acquire( 'store', [ 'root' ], true );
 		const l2 = locks.acquire( 'store', [ 'root' ], true );
 
-		// on each grant, verify that the other lock is not granted at the same time
+		// On each grant, verify that the other lock is not granted at the same time.
 		const check1 = l1.then( () => {
 			l1Granted = true;
 			expect( l2Granted ).toBe( false );
@@ -30,7 +30,7 @@ describe( 'Locks engine', () => {
 			expect( l1Granted ).toBe( false );
 		} );
 
-		// unlock both
+		// Unlock both.
 		const lock1 = await l1;
 		locks.release( lock1 );
 		l1Granted = false;
@@ -39,7 +39,7 @@ describe( 'Locks engine', () => {
 		locks.release( lock2 );
 		l2Granted = false;
 
-		// ensure that both locks were granted and checked
+		// Ensure that both locks were granted and checked.
 		return await Promise.all( [ check1, check2 ] );
 	} );
 
@@ -49,11 +49,11 @@ describe( 'Locks engine', () => {
 		let l1Granted = false;
 		let l2Granted = false;
 
-		// request two locks
+		// Request two locks.
 		const l1 = locks.acquire( 'store', [ 'root' ], false );
 		const l2 = locks.acquire( 'store', [ 'root' ], true );
 
-		// on each grant, verify that the other lock is not granted at the same time
+		// On each grant, verify that the other lock is not granted at the same time.
 		const check1 = l1.then( () => {
 			l1Granted = true;
 			expect( l2Granted ).toBe( false );
@@ -64,7 +64,7 @@ describe( 'Locks engine', () => {
 			expect( l1Granted ).toBe( false );
 		} );
 
-		// unlock both
+		// Unlock both.
 		const lock1 = await l1;
 		locks.release( lock1 );
 		l1Granted = false;
@@ -73,7 +73,7 @@ describe( 'Locks engine', () => {
 		locks.release( lock2 );
 		l2Granted = false;
 
-		// ensure that both locks were granted and checked
+		// Ensure that both locks were granted and checked.
 		return await Promise.all( [ check1, check2 ] );
 	} );
 
@@ -83,11 +83,11 @@ describe( 'Locks engine', () => {
 		let l1Granted = false;
 		let l2Granted = false;
 
-		// request two locks
+		// Request two locks.
 		const l1 = locks.acquire( 'store', [ 'root' ], true );
 		const l2 = locks.acquire( 'store', [ 'root', 'child' ], true );
 
-		// on each grant, verify that the other lock is not granted at the same time
+		// On each grant, verify that the other lock is not granted at the same time.
 		const check1 = l1.then( () => {
 			l1Granted = true;
 			expect( l2Granted ).toBe( false );
@@ -98,7 +98,7 @@ describe( 'Locks engine', () => {
 			expect( l1Granted ).toBe( false );
 		} );
 
-		// unlock both
+		// Unlock both.
 		const lock1 = await l1;
 		locks.release( lock1 );
 		l1Granted = false;
@@ -107,7 +107,7 @@ describe( 'Locks engine', () => {
 		locks.release( lock2 );
 		l2Granted = false;
 
-		// ensure that both locks were granted and checked
+		// Ensure that both locks were granted and checked.
 		return await Promise.all( [ check1, check2 ] );
 	} );
 

package/src/locks/test/reducer.js

@@ -62,7 +62,7 @@ describe( 'locks', () => {
 							red,
 							blue,
 							green: {
-								// ...and add the lock
+								// ...and add the lock.
 								locks: [ lock ],
 								children: {},
 							},
@@ -92,7 +92,7 @@ describe( 'locks', () => {
 							red,
 							blue,
 							green: {
-								// ...and add the lock
+								// ...and add the lock.
 								locks: [ lock ],
 								children: {},
 							},
@@ -118,7 +118,7 @@ describe( 'locks', () => {
 							red,
 							blue,
 							green: {
-								// Should remove the lock
+								// Should remove the lock.
 								locks: [],
 								children: {},
 							},

package/src/locks/test/utils.js

@@ -193,13 +193,13 @@ describe( 'deepCopyLocksTreePath', () => {
 		expect( deepCopy.children ).not.toBe( tree.children );
 		expect( deepCopy.children.target ).not.toBe( tree.children.target );
 
-		// Locks lists should be preserved
+		// Locks lists should be preserved.
 		expect( deepCopy.locks ).toBe( tree.locks );
 		expect( deepCopy.children.target.locks ).toBe(
 			tree.children.target.locks
 		);
 
-		// Specific locks should be preserved
+		// Specific locks should be preserved.
 		expect( deepCopy.locks[ 0 ] ).toBe( tree.locks[ 0 ] );
 
 		// No need to clone lower levels of the tree, let's check if they're still the same:

package/src/reducer.js

@@ -355,7 +355,7 @@ export function entitiesConfig( state = defaultEntities, action ) {
 export const entities = ( state = {}, action ) => {
 	const newConfig = entitiesConfig( state.config, action );
 
-	// Generates a dynamic reducer for the entities
+	// Generates a dynamic reducer for the entities.
 	let entitiesDataReducer = state.reducer;
 	if ( ! entitiesDataReducer || newConfig !== state.config ) {
 		const entitiesByKind = groupBy( newConfig, 'kind' );

package/src/resolvers.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { find, includes, get, hasIn, compact, uniq } from 'lodash';
+import { find, includes, get, compact, uniq } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -283,11 +283,7 @@ export const canUser = ( action, resource, id ) => async ( { dispatch } ) => {
 	try {
 		response = await apiFetch( {
 			path,
-			// Ideally this would always be an OPTIONS request, but unfortunately there's
-			// a bug in the REST API which causes the Allow header to not be sent on
-			// OPTIONS requests to /posts/:id routes.
-			// https://core.trac.wordpress.org/ticket/45753
-			method: id ? 'GET' : 'OPTIONS',
+			method: 'OPTIONS',
 			parse: false,
 		} );
 	} catch ( error ) {
@@ -296,17 +292,10 @@ export const canUser = ( action, resource, id ) => async ( { dispatch } ) => {
 		return;
 	}
 
-	let allowHeader;
-	if ( hasIn( response, [ 'headers', 'get' ] ) ) {
-		// If the request is fetched using the fetch api, the header can be
-		// retrieved using the 'get' method.
-		allowHeader = response.headers.get( 'allow' );
-	} else {
-		// If the request was preloaded server-side and is returned by the
-		// preloading middleware, the header will be a simple property.
-		allowHeader = get( response, [ 'headers', 'Allow' ], '' );
-	}
-
+	// Optional chaining operator is used here because the API requests don't
+	// return the expected result in the native version. Instead, API requests
+	// only return the result, without including response properties like the headers.
+	const allowHeader = response.headers?.get( 'allow' );
 	const key = compact( [ action, resource, id ] ).join( '/' );
 	const isAllowed = includes( allowHeader, method );
 	dispatch.receiveUserPermission( key, isAllowed );

package/src/test/resolvers.js

@@ -46,12 +46,12 @@ describe( 'getEntityRecord', () => {
 
 		await getEntityRecord( 'root', 'postType', 'post' )( { dispatch } );
 
-		// Fetch request should have been issued
+		// Fetch request should have been issued.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
 			path: '/wp/v2/types/post?context=edit',
 		} );
 
-		// The record should have been received
+		// The record should have been received.
 		expect( dispatch.receiveEntityRecords ).toHaveBeenCalledWith(
 			'root',
 			'postType',
@@ -59,7 +59,7 @@ describe( 'getEntityRecord', () => {
 			undefined
 		);
 
-		// Locks should have been acquired and released
+		// Locks should have been acquired and released.
 		expect( dispatch.__unstableAcquireStoreLock ).toHaveBeenCalledTimes(
 			1
 		);
@@ -94,19 +94,19 @@ describe( 'getEntityRecord', () => {
 			query
 		)( { dispatch, select } );
 
-		// Check resolution cache for an existing entity that fulfills the request with query
+		// Check resolution cache for an existing entity that fulfills the request with query.
 		expect( select.hasEntityRecords ).toHaveBeenCalledWith(
 			'root',
 			'postType',
 			queryObj
 		);
 
-		// Trigger apiFetch, test that the query is present in the url
+		// Trigger apiFetch, test that the query is present in the url.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
 			path: '/wp/v2/types/post?context=view&_envelope=1',
 		} );
 
-		// The record should have been received
+		// The record should have been received.
 		expect( dispatch.receiveEntityRecords ).toHaveBeenCalledWith(
 			'root',
 			'postType',
@@ -114,7 +114,7 @@ describe( 'getEntityRecord', () => {
 			queryObj
 		);
 
-		// Locks should have been acquired and released
+		// Locks should have been acquired and released.
 		expect( dispatch.__unstableAcquireStoreLock ).toHaveBeenCalledTimes(
 			1
 		);
@@ -163,12 +163,12 @@ describe( 'getEntityRecords', () => {
 
 		await getEntityRecords( 'root', 'postType' )( { dispatch } );
 
-		// Fetch request should have been issued
+		// Fetch request should have been issued.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
 			path: '/wp/v2/types?context=edit',
 		} );
 
-		// The record should have been received
+		// The record should have been received.
 		expect( dispatch.receiveEntityRecords ).toHaveBeenCalledWith(
 			'root',
 			'postType',
@@ -191,12 +191,12 @@ describe( 'getEntityRecords', () => {
 
 		await getEntityRecords( 'root', 'postType' )( { dispatch } );
 
-		// Fetch request should have been issued
+		// Fetch request should have been issued.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
 			path: '/wp/v2/types?context=edit',
 		} );
 
-		// The record should have been received
+		// The record should have been received.
 		expect(
 			dispatch.__unstableAcquireStoreLock
 		).toHaveBeenCalledWith(
@@ -223,12 +223,12 @@ describe( 'getEntityRecords', () => {
 
 		await getEntityRecords( 'root', 'postType' )( { dispatch } );
 
-		// Fetch request should have been issued
+		// Fetch request should have been issued.
 		expect( triggerFetch ).toHaveBeenCalledWith( {
 			path: '/wp/v2/types?context=edit',
 		} );
 
-		// The record should have been received
+		// The record should have been received.
 		expect( dispatch ).toHaveBeenCalledWith( {
 			type: 'START_RESOLUTIONS',
 			selectorName: 'getEntityRecord',
@@ -312,9 +312,7 @@ describe( 'canUser', () => {
 		} );
 
 		triggerFetch.mockImplementation( () => ( {
-			headers: {
-				Allow: 'GET',
-			},
+			headers: new Map( [ [ 'allow', 'GET' ] ] ),
 		} ) );
 
 		await canUser( 'create', 'media' )( { dispatch } );
@@ -337,9 +335,7 @@ describe( 'canUser', () => {
 		} );
 
 		triggerFetch.mockImplementation( () => ( {
-			headers: {
-				Allow: 'POST, GET, PUT, DELETE',
-			},
+			headers: new Map( [ [ 'allow', 'POST, GET, PUT, DELETE' ] ] ),
 		} ) );
 
 		await canUser( 'create', 'media' )( { dispatch } );
@@ -362,16 +358,14 @@ describe( 'canUser', () => {
 		} );
 
 		triggerFetch.mockImplementation( () => ( {
-			headers: {
-				Allow: 'POST, GET, PUT, DELETE',
-			},
+			headers: new Map( [ [ 'allow', 'POST, GET, PUT, DELETE' ] ] ),
 		} ) );
 
 		await canUser( 'create', 'blocks', 123 )( { dispatch } );
 
 		expect( triggerFetch ).toHaveBeenCalledWith( {
 			path: '/wp/v2/blocks/123',
-			method: 'GET',
+			method: 'OPTIONS',
 			parse: false,
 		} );
 

package/src/test/selectors.js

@@ -24,8 +24,7 @@ import {
 	getCurrentUser,
 	getReferenceByDistinctEdits,
 } from '../selectors';
-
-// getEntityRecord and __experimentalGetEntityRecordNoResolver selectors share the same tests
+// getEntityRecord and __experimentalGetEntityRecordNoResolver selectors share the same tests.
 describe.each( [
 	[ getEntityRecord ],
 	[ __experimentalGetEntityRecordNoResolver ],
@@ -398,7 +397,7 @@ describe( 'getEntityRecords', () => {
 			'wp_block'
 		);
 
-		// Simulate update states
+		// Simulate update states.
 		state = { ...state };
 
 		const postTypeSecondRecords = getEntityRecords(