- simplify duplicate logic in Clone Field

Author: jasonbahl

src/FieldType/CloneField.php

@@ -48,18 +48,8 @@ static function ( $cloned ) use ( $field_config ) {
 						if ( ! $prefix_name ) {
 							register_graphql_interfaces_to_types( $cloned_group_interfaces, [ $parent_type ] );
 						} else {
-							$sub_field_group['graphql_type_name']  = $type_name;
-							$sub_field_group['graphql_field_name'] = $type_name;
-							$sub_field_group['parent']             = $sub_field_group['key'];
-							$sub_field_group['sub_fields']         = $cloned_fields;
-							$field_config->get_registry()->register_acf_field_groups_to_graphql(
-								[
-									$sub_field_group,
-								]
-							);
-
+							$type_name = self::register_prefixed_clone_field_type( $type_name, $sub_field_group, $cloned_fields, $field_config );
 							register_graphql_interfaces_to_types( $cloned_group_interfaces, [ $type_name ] );
-
 							return $type_name;
 						}
 					}
@@ -83,17 +73,7 @@ static function ( $cloned ) use ( $field_config ) {
 							// Register a new Object Type with the cloned fields, and return
 							// the new type.
 						} else {
-							$sub_field_group['graphql_type_name']  = $type_name;
-							$sub_field_group['graphql_field_name'] = $type_name;
-							$sub_field_group['parent']             = $sub_field_group['key'];
-							$sub_field_group['sub_fields']         = $cloned_fields;
-
-							$field_config->get_registry()->register_acf_field_groups_to_graphql(
-								[
-									$sub_field_group,
-								]
-							);
-							return $type_name;
+							return self::register_prefixed_clone_field_type( $type_name, $sub_field_group, $cloned_fields, $field_config );
 						}
 					}
 					// Bail by returning a NULL type
@@ -115,4 +95,27 @@ static function ( $cloned ) use ( $field_config ) {
 			]
 		);
 	}
+
+	/**
+	 * @param string      $type_name The name of the GraphQL Type representing the prefixed clone field
+	 * @param array       $sub_field_group  The Field Group representing the cloned field
+	 * @param array       $cloned_fields The cloned fields to be registered to the Cloned Field Type
+	 * @param \WPGraphQL\Acf\FieldConfig $field_config The ACF Field Config
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	public static function register_prefixed_clone_field_type( string $type_name, array $sub_field_group, array $cloned_fields, FieldConfig $field_config ): string {
+		$sub_field_group['graphql_type_name']  = $type_name;
+		$sub_field_group['graphql_field_name'] = $type_name;
+		$sub_field_group['parent']             = $sub_field_group['key'];
+		$sub_field_group['sub_fields']         = $cloned_fields;
+
+		$field_config->get_registry()->register_acf_field_groups_to_graphql(
+			[
+				$sub_field_group,
+			]
+		);
+		return $type_name;
+	}
 }

src/FieldType/FlexibleContent.php

@@ -52,7 +52,6 @@ public static function register_field_type(): void {
 
 					// If there are no layouts, return a NULL type
 					if ( ! empty( $acf_field['layouts'] ) ) {
-
 						foreach ( $acf_field['layouts'] as $layout ) {
 							$layout_type_name              = Utils::format_type_name( $layout_interface_prefix . ' ' . $field_config->get_registry()->get_field_group_graphql_type_name( $layout ) ) . 'Layout';
 							$layout['interfaces']          = [ $layout_interface_name ];
@@ -63,7 +62,7 @@ public static function register_field_type(): void {
 
 							$sub_fields = array_filter(
 								array_map(
-									static function( $field ) use ( $layout ) {
+									static function ( $field ) use ( $layout ) {
 										$field['graphql_types']       = [];
 										$field['parent_layout_group'] = $layout;
 										$field['isFlexLayoutField']   = true;
@@ -78,7 +77,6 @@ static function( $field ) use ( $layout ) {
 
 							$layouts[] = $layout;
 						}
-
 					}
 
 					if ( ! empty( $layouts ) ) {