Lodash: Refactor away from _.keyBy() (#42044)

* Lodash: Refactor away from _.keyBy() * Add an explanatory comment
WordPress · Jul 4, 2022 · 7af66e9 · 7af66e9
1 parent 301dec6
commit 7af66e9
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 19 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -99,6 +99,7 @@ module.exports = {
 							'isNumber',
 							'isObjectLike',
 							'isUndefined',
+							'keyBy',
 							'keys',
 							'lowerCase',
 							'memoize',

diff --git a/packages/blocks/src/store/reducer.js b/packages/blocks/src/store/reducer.js
@@ -6,7 +6,6 @@ import {
 	find,
 	get,
 	isEmpty,
-	keyBy,
 	map,
 	mapValues,
 	omit,
@@ -41,6 +40,17 @@ export const DEFAULT_CATEGORIES = [
 	{ slug: 'reusable', title: __( 'Reusable blocks' ) },
 ];
 
+// Key block types by their name.
+function keyBlockTypesByName( types ) {
+	return types.reduce(
+		( newBlockTypes, block ) => ( {
+			...newBlockTypes,
+			[ block.name ]: block,
+		} ),
+		{}
+	);
+}
+
 /**
  * Reducer managing the unprocessed block types in a form passed when registering the by block.
  * It's for internal use only. It allows recomputing the processed block types on-demand after block type filters
@@ -79,7 +89,7 @@ export function blockTypes( state = {}, action ) {
 		case 'ADD_BLOCK_TYPES':
 			return {
 				...state,
-				...keyBy( action.blockTypes, 'name' ),
+				...keyBlockTypesByName( action.blockTypes ),
 			};
 		case 'REMOVE_BLOCK_TYPES':
 			return omit( state, action.names );
@@ -102,7 +112,7 @@ export function blockStyles( state = {}, action ) {
 			return {
 				...state,
 				...mapValues(
-					keyBy( action.blockTypes, 'name' ),
+					keyBlockTypesByName( action.blockTypes ),
 					( blockType ) => {
 						return uniqBy(
 							[
@@ -159,7 +169,7 @@ export function blockVariations( state = {}, action ) {
 			return {
 				...state,
 				...mapValues(
-					keyBy( action.blockTypes, 'name' ),
+					keyBlockTypesByName( action.blockTypes ),
 					( blockType ) => {
 						return uniqBy(
 							[

diff --git a/packages/core-data/src/reducer.js b/packages/core-data/src/reducer.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { keyBy, map, groupBy, flowRight, isEqual, get } from 'lodash';
+import { map, groupBy, flowRight, isEqual, get } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -55,7 +55,14 @@ export function users( state = { byId: {}, queries: {} }, action ) {
 			return {
 				byId: {
 					...state.byId,
-					...keyBy( action.users, 'id' ),
+					// Key users by their ID.
+					...action.users.reduce(
+						( newUsers, user ) => ( {
+							...newUsers,
+							[ user.id ]: user,
+						} ),
+						{}
+					),
 				},
 				queries: {
 					...state.queries,

diff --git a/packages/edit-site/src/store/selectors.js b/packages/edit-site/src/store/selectors.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { map, keyBy } from 'lodash';
+import { map } from 'lodash';
 import createSelector from 'rememo';
 
 /**
@@ -341,10 +341,16 @@ export const getCurrentTemplateTemplateParts = createRegistrySelector(
 			'wp_template_part',
 			{ per_page: -1 }
 		);
-		const templatePartsById = keyBy(
-			templateParts,
-			( templatePart ) => templatePart.id
-		);
+		const templatePartsById = templateParts
+			? // Key template parts by their ID.
+			  templateParts.reduce(
+					( newTemplateParts, part ) => ( {
+						...newTemplateParts,
+						[ part.id ]: part,
+					} ),
+					{}
+			  )
+			: {};
 
 		return ( template.blocks ?? [] )
 			.filter( ( block ) => isTemplatePart( block ) )

diff --git a/packages/edit-widgets/src/store/selectors.js b/packages/edit-widgets/src/store/selectors.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { keyBy } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -36,7 +31,16 @@ export const getWidgets = createRegistrySelector( ( select ) => () => {
 		buildWidgetsQuery()
 	);
 
-	return keyBy( widgets, 'id' );
+	return (
+		// Key widgets by their ID.
+		widgets?.reduce(
+			( allWidgets, widget ) => ( {
+				...allWidgets,
+				[ widget.id ]: widget,
+			} ),
+			{}
+		) || {}
+	);
 } );
 
 /**

diff --git a/packages/rich-text/src/store/reducer.js b/packages/rich-text/src/store/reducer.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { keyBy, omit } from 'lodash';
+import { omit } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -21,7 +21,14 @@ export function formatTypes( state = {}, action ) {
 		case 'ADD_FORMAT_TYPES':
 			return {
 				...state,
-				...keyBy( action.formatTypes, 'name' ),
+				// Key format types by their name.
+				...action.formatTypes.reduce(
+					( newFormatTypes, type ) => ( {
+						...newFormatTypes,
+						[ type.name ]: type,
+					} ),
+					{}
+				),
 			};
 		case 'REMOVE_FORMAT_TYPES':
 			return omit( state, action.names );