Lodash: Refactor away from _.forEach() (#43807)

WordPress · Sep 2, 2022 · f26adef · f26adef
1 parent ebf3791
commit f26adef
Show file tree

Hide file tree

Showing 13 changed files with 127 additions and 152 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -103,6 +103,7 @@ module.exports = {
 							'flatMap',
 							'flatten',
 							'flattenDeep',
+							'forEach',
 							'fromPairs',
 							'has',
 							'identity',

diff --git a/packages/babel-plugin-makepot/index.js b/packages/babel-plugin-makepot/index.js
@@ -33,7 +33,7 @@
  */
 
 const { po } = require( 'gettext-parser' );
-const { pick, reduce, forEach, isEqual, merge, isEmpty } = require( 'lodash' );
+const { pick, reduce, isEqual, merge, isEmpty } = require( 'lodash' );
 const { relative, sep } = require( 'path' );
 const { writeFileSync } = require( 'fs' );
 
@@ -122,7 +122,7 @@ function getExtractedComment( path, _originalNodeLine ) {
 	}
 
 	let comment;
-	forEach( node.leadingComments, ( commentNode ) => {
+	Object.values( node.leadingComments ?? {} ).forEach( ( commentNode ) => {
 		let line = 0;
 		if ( commentNode && commentNode.loc && commentNode.loc.end ) {
 			line = commentNode.loc.end.line;
@@ -333,41 +333,35 @@ module.exports = () => {
 									Object.values( strings[ file ][ context ] )
 								);
 
-								forEach(
-									sortedTranslations,
-									( translation ) => {
-										const { msgctxt = '', msgid } =
-											translation;
-										if (
-											! memo.hasOwnProperty( msgctxt )
-										) {
-											memo[ msgctxt ] = {};
-										}
-
-										// Merge references if translation already exists.
-										if (
-											isSameTranslation(
-												translation,
-												memo[ msgctxt ][ msgid ]
-											)
-										) {
-											translation.comments.reference = [
-												...new Set(
-													[
-														memo[ msgctxt ][ msgid ]
-															.comments.reference,
-														translation.comments
-															.reference,
-													]
-														.join( '\n' )
-														.split( '\n' )
-												),
-											].join( '\n' );
-										}
-
-										memo[ msgctxt ][ msgid ] = translation;
+								sortedTranslations.forEach( ( translation ) => {
+									const { msgctxt = '', msgid } = translation;
+									if ( ! memo.hasOwnProperty( msgctxt ) ) {
+										memo[ msgctxt ] = {};
 									}
-								);
+
+									// Merge references if translation already exists.
+									if (
+										isSameTranslation(
+											translation,
+											memo[ msgctxt ][ msgid ]
+										)
+									) {
+										translation.comments.reference = [
+											...new Set(
+												[
+													memo[ msgctxt ][ msgid ]
+														.comments.reference,
+													translation.comments
+														.reference,
+												]
+													.join( '\n' )
+													.split( '\n' )
+											),
+										].join( '\n' );
+									}
+
+									memo[ msgctxt ][ msgid ] = translation;
+								} );
 							}
 
 							return memo;

diff --git a/packages/block-editor/src/hooks/utils.js b/packages/block-editor/src/hooks/utils.js
@@ -1,16 +1,7 @@
 /**
  * External dependencies
  */
-import {
-	pickBy,
-	isEmpty,
-	mapValues,
-	forEach,
-	get,
-	setWith,
-	clone,
-	every,
-} from 'lodash';
+import { pickBy, isEmpty, mapValues, get, setWith, clone, every } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -77,7 +68,7 @@ export function transformStyles(
 		}
 	}
 	let returnBlock = result;
-	forEach( activeSupports, ( isActive, support ) => {
+	Object.entries( activeSupports ).forEach( ( [ support, isActive ] ) => {
 		if ( isActive ) {
 			migrationPaths[ support ].forEach( ( path ) => {
 				const styleValue = get( referenceBlockAttributes, path );

diff --git a/packages/block-library/src/gallery/v1/edit.js b/packages/block-library/src/gallery/v1/edit.js
@@ -1,17 +1,7 @@
 /**
  * External dependencies
  */
-import {
-	every,
-	filter,
-	find,
-	forEach,
-	get,
-	isEmpty,
-	map,
-	reduce,
-	some,
-} from 'lodash';
+import { every, filter, find, get, isEmpty, map, reduce, some } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -346,7 +336,7 @@ function GalleryEdit( props ) {
 			every( images, ( { url } ) => isBlobURL( url ) )
 		) {
 			const filesList = map( images, ( { url } ) => getBlobByURL( url ) );
-			forEach( images, ( { url } ) => revokeBlobURL( url ) );
+			images.forEach( ( { url } ) => revokeBlobURL( url ) );
 			mediaUpload( {
 				filesList,
 				onFileChange: onSelectImages,

diff --git a/packages/block-library/src/post-author/edit.js b/packages/block-library/src/post-author/edit.js
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import { forEach } from 'lodash';
 import classnames from 'classnames';
 
 /**
@@ -51,7 +50,7 @@ function PostAuthorEdit( {
 
 	const avatarSizes = [];
 	if ( authorDetails ) {
-		forEach( authorDetails.avatar_urls, ( url, size ) => {
+		Object.keys( authorDetails.avatar_urls ).forEach( ( size ) => {
 			avatarSizes.push( {
 				value: size,
 				label: `${ size } x ${ size }`,

diff --git a/packages/components/src/modal/aria-helper.js b/packages/components/src/modal/aria-helper.js
@@ -1,10 +1,5 @@
 // @ts-nocheck
 
-/**
- * External dependencies
- */
-import { forEach } from 'lodash';
-
 const LIVE_REGION_ARIA_ROLES = new Set( [
 	'alert',
 	'status',
@@ -32,8 +27,8 @@ export function hideApp( unhiddenElement ) {
 	if ( isHidden ) {
 		return;
 	}
-	const elements = document.body.children;
-	forEach( elements, ( element ) => {
+	const elements = Array.from( document.body.children );
+	elements.forEach( ( element ) => {
 		if ( element === unhiddenElement ) {
 			return;
 		}
@@ -70,7 +65,7 @@ export function showApp() {
 	if ( ! isHidden ) {
 		return;
 	}
-	forEach( hiddenElements, ( element ) => {
+	hiddenElements.forEach( ( element ) => {
 		element.removeAttribute( 'aria-hidden' );
 	} );
 	hiddenElements = [];

diff --git a/packages/compose/src/higher-order/with-global-events/index.js b/packages/compose/src/higher-order/with-global-events/index.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { forEach } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -57,13 +52,13 @@ export default function withGlobalEvents( eventTypesToHandlers ) {
 			}
 
 			componentDidMount() {
-				forEach( eventTypesToHandlers, ( _, eventType ) => {
+				Object.keys( eventTypesToHandlers ).forEach( ( eventType ) => {
 					listener.add( eventType, this );
 				} );
 			}
 
 			componentWillUnmount() {
-				forEach( eventTypesToHandlers, ( _, eventType ) => {
+				Object.keys( eventTypesToHandlers ).forEach( ( eventType ) => {
 					listener.remove( eventType, this );
 				} );
 			}

diff --git a/packages/compose/src/higher-order/with-global-events/listener.js b/packages/compose/src/higher-order/with-global-events/listener.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { forEach, without } from 'lodash';
+import { without } from 'lodash';
 
 /**
  * Class responsible for orchestrating event handling on the global window,
@@ -40,9 +40,11 @@ class Listener {
 	}
 
 	handleEvent( /** @type {any} */ event ) {
-		forEach( this.listeners[ event.type ], ( instance ) => {
-			instance.handleEvent( event );
-		} );
+		this.listeners[ event.type ]?.forEach(
+			( /** @type {any} */ instance ) => {
+				instance.handleEvent( event );
+			}
+		);
 	}
 }
 

diff --git a/packages/data/src/registry.js b/packages/data/src/registry.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { mapValues, forEach } from 'lodash';
+import { mapValues } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -293,10 +293,10 @@ export function createRegistry( storeConfigs = {}, parent = null ) {
 
 	function batch( callback ) {
 		emitter.pause();
-		forEach( stores, ( store ) => store.emitter.pause() );
+		Object.values( stores ).forEach( ( store ) => store.emitter.pause() );
 		callback();
 		emitter.resume();
-		forEach( stores, ( store ) => store.emitter.resume() );
+		Object.values( stores ).forEach( ( store ) => store.emitter.resume() );
 	}
 
 	let registry = {

diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { forEach, map, without } from 'lodash';
+import { map, without } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -162,7 +162,7 @@ function Editor( {
 	const styles = useMemo( () => {
 		const themeStyles = [];
 		const presetStyles = [];
-		forEach( settings.styles, ( style ) => {
+		settings.styles?.forEach( ( style ) => {
 			if ( ! style.__unstableType || style.__unstableType === 'theme' ) {
 				themeStyles.push( style );
 			} else {