Add batched variants for start/finish resolution actions

packages/core-data/src/resolvers.js

@@ -219,20 +219,20 @@ export function* getEntityRecords( kind, name, query = {} ) {
 		// See https://github.com/WordPress/gutenberg/pull/26575
 		if ( ! query?._fields ) {
 			const key = entity.key || DEFAULT_ENTITY_KEY;
-			for ( const record of records ) {
-				if ( record[ key ] ) {
-					yield {
-						type: 'START_RESOLUTION',
-						selectorName: 'getEntityRecord',
-						args: [ kind, name, record[ key ] ],
-					};
-					yield {
-						type: 'FINISH_RESOLUTION',
-						selectorName: 'getEntityRecord',
-						args: [ kind, name, record[ key ] ],
-					};
-				}
-			}
+			const resolutionsArgs = records
+				.filter( ( record ) => record[ key ] )
+				.map( ( record ) => [ kind, name, record[ key ] ] );
+
+			yield {
+				type: 'START_RESOLUTIONS',
+				selectorName: 'getEntityRecord',
+				args: resolutionsArgs,
+			};
+			yield {
+				type: 'FINISH_RESOLUTIONS',
+				selectorName: 'getEntityRecord',
+				args: resolutionsArgs,
+			};
 		}
 	} finally {
 		yield* __unstableReleaseStoreLock( lock );

packages/core-data/src/test/resolvers.js

@@ -136,14 +136,14 @@ describe( 'getEntityRecords', () => {
 
 		// It should mark the entity record that has an ID as resolved
 		expect( fulfillment.next().value ).toEqual( {
-			type: 'START_RESOLUTION',
+			type: 'START_RESOLUTIONS',
 			selectorName: 'getEntityRecord',
-			args: [ ENTITIES[ 1 ].kind, ENTITIES[ 1 ].name, 2 ],
+			args: [ [ ENTITIES[ 1 ].kind, ENTITIES[ 1 ].name, 2 ] ],
 		} );
 		expect( fulfillment.next().value ).toEqual( {
-			type: 'FINISH_RESOLUTION',
+			type: 'FINISH_RESOLUTIONS',
 			selectorName: 'getEntityRecord',
-			args: [ ENTITIES[ 1 ].kind, ENTITIES[ 1 ].name, 2 ],
+			args: [ [ ENTITIES[ 1 ].kind, ENTITIES[ 1 ].name, 2 ] ],
 		} );
 	} );
 } );

packages/data/src/redux-store/metadata/actions.js

@@ -32,6 +32,42 @@ export function finishResolution( selectorName, args ) {
 	};
 }
 
+/**
+ * Returns an action object used in signalling that a batch of selector resolutions has
+ * started.
+ *
+ * @param {string} selectorName Name of selector for which resolver triggered.
+ * @param {...*}   args         Array of arguments to associate for uniqueness, each item
+ * 								is associated to a resolution.
+ *
+ * @return {Object} Action object.
+ */
+export function startResolutions( selectorName, args ) {
+	return {
+		type: 'START_RESOLUTIONS',
+		selectorName,
+		args,
+	};
+}
+
+/**
+ * Returns an action object used in signalling that a batch of selector resolutions has
+ * completed.
+ *
+ * @param {string} selectorName Name of selector for which resolver triggered.
+ * @param {...*}   args         Array of arguments to associate for uniqueness, each item
+ * 								is associated to a resolution.
+ *
+ * @return {Object} Action object.
+ */
+export function finishResolutions( selectorName, args ) {
+	return {
+		type: 'FINISH_RESOLUTIONS',
+		selectorName,
+		args,
+	};
+}
+
 /**
  * Returns an action object used in signalling that we should invalidate the resolution cache.
  *

packages/data/src/redux-store/metadata/reducer.js

@@ -30,6 +30,15 @@ const subKeysIsResolved = onSubKey( 'selectorName' )(
 				nextState.set( action.args, isStarting );
 				return nextState;
 			}
+			case 'START_RESOLUTIONS':
+			case 'FINISH_RESOLUTIONS': {
+				const isStarting = action.type === 'START_RESOLUTIONS';
+				const nextState = new EquivalentKeyMap( state );
+				for ( const resolutionArgs of action.args ) {
+					nextState.set( resolutionArgs, isStarting );
+				}
+				return nextState;
+			}
 			case 'INVALIDATE_RESOLUTION': {
 				const nextState = new EquivalentKeyMap( state );
 				nextState.delete( action.args );
@@ -60,6 +69,8 @@ const isResolved = ( state = {}, action ) => {
 				: state;
 		case 'START_RESOLUTION':
 		case 'FINISH_RESOLUTION':
+		case 'START_RESOLUTIONS':
+		case 'FINISH_RESOLUTIONS':
 		case 'INVALIDATE_RESOLUTION':
 			return subKeysIsResolved( state, action );
 	}