Untangle core/post-meta source

Author: ockham

packages/editor/src/bindings/post-meta.js

@@ -35,58 +35,61 @@ import { unlock } from '../lock-unlock';
  * ```
  */
 function getPostMetaFields( select, context ) {
-	const { getEditedEntityRecord } = select( coreDataStore );
 	const { getRegisteredPostMeta } = unlock( select( coreDataStore ) );
 
-	let entityMetaValues;
-	// Try to get the current entity meta values.
-	if ( context?.postType && context?.postId ) {
-		entityMetaValues = getEditedEntityRecord(
-			'postType',
-			context?.postType,
-			context?.postId
-		).meta;
-	}
-
 	const registeredFields = getRegisteredPostMeta( context?.postType );
-	const metaFields = {};
-	Object.entries( registeredFields || {} ).forEach( ( [ key, props ] ) => {
+	const metaFields = [];
+	Object.entries( registeredFields ).forEach( ( [ key, props ] ) => {
 		// Don't include footnotes or private fields.
-		if ( key !== 'footnotes' && key.charAt( 0 ) !== '_' ) {
-			metaFields[ key ] = {
-				label: props.title || key,
-				value:
-					// When using the entity value, an empty string IS a valid value.
-					entityMetaValues?.[ key ] ??
-					// When using the default, an empty string IS NOT a valid value.
-					( props.default || undefined ),
-				type: props.type,
-			};
+		if ( key === 'footnotes' || key.charAt( 0 ) === '_' ) {
+			return;
 		}
-	} );
 
-	if ( ! Object.keys( metaFields || {} ).length ) {
-		return null;
-	}
+		metaFields.push( {
+			label: props.title || key,
+			args: { key },
+			type: props.type,
+		} );
+	} );
 
 	return metaFields;
 }
 
+function getValue( { select, context, args } ) {
+	const { getEditedEntityRecord } = select( coreDataStore );
+	const entityMetaValues = getEditedEntityRecord(
+		'postType',
+		context?.postType,
+		context?.postId
+	).meta;
+
+	const metaFields = getPostMetaFields( select, context );
+	const metaField = metaFields.find( ( field ) => field.args.key === args.key );
+
+	return (
+		entityMetaValues?.[ args.key ] ??
+		metaField?.label ??
+		args.key
+	);
+}
+
 /**
  * @type {WPBlockBindingsSource}
  */
 export default {
 	name: 'core/post-meta',
 	getValues( { select, context, bindings } ) {
-		const metaFields = getPostMetaFields( select, context );
+		if ( ! context?.postType || ! context?.postId ) {
+			return {};
+		}
 
 		const newValues = {};
-		for ( const [ attributeName, source ] of Object.entries( bindings ) ) {
-			// Use the value, the field label, or the field key.
-			const fieldKey = source.args.key;
-			const { value: fieldValue, label: fieldLabel } =
-				metaFields?.[ fieldKey ] || {};
-			newValues[ attributeName ] = fieldValue ?? fieldLabel ?? fieldKey;
+		for ( const [ attributeName, binding ] of Object.entries( bindings ) ) {
+			newValues[ attributeName ] = getValue( {
+				select,
+				context,
+				args: binding.args,
+			} );
 		}
 		return newValues;
 	},
@@ -116,10 +119,8 @@ export default {
 			return false;
 		}
 
-		const fieldValue = getPostMetaFields( select, context )?.[ args.key ]
-			?.value;
 		// Empty string or `false` could be a valid value, so we need to check if the field value is undefined.
-		if ( fieldValue === undefined ) {
+		if ( getValue( { select, context, args } ) === undefined ) {
 			return false;
 		}
 		// Check that custom fields metabox is not enabled.
@@ -142,14 +143,6 @@ export default {
 		return true;
 	},
 	getFieldsList( { select, context } ) {
-		const metaFields = getPostMetaFields( select, context );
-		if ( ! metaFields ) {
-			return [];
-		}
-		return Object.entries( metaFields ).map( ( [ key, field ] ) => ( {
-			label: field.label,
-			type: field.type,
-			args: { key },
-		} ) );
+		return getPostMetaFields( select, context );
 	},
 };