- update FieldConfig to check for values prefixed with _ for resolution

- fix call to possibly unset `$parent_field_group['ID']`
- phpstan fixes
- update acf_get_raw_fields to acf_get_fields
- add adjustments to how group types are registered if they've been cloned

Author: jasonbahl

src/Admin/Settings.php

@@ -159,7 +159,7 @@ public function graphql_types_ajax_callback(): void {
 			wp_send_json( __( 'No form data.', 'wpgraphql-acf' ) );
 		}
 
-		if ( empty( $form_data ) || ! isset( $form_data['acf_field_group']['location'] ) ) {
+		if ( empty( $form_data['acf_field_group']['location'] ) ) {
 			wp_send_json( __( 'No field group locations found.', 'wpgraphql-acf' ) );
 		}
 

src/FieldConfig.php

@@ -409,6 +409,11 @@ public function resolve_field( $root, array $args, AppContext $context, ResolveI
 			return $this->prepare_acf_field_value( $root[ $field_config['__key'] ], $node, $node_id, $field_config );
 		}
 
+		// Else check if the values are being passed down via the name
+		if ( isset( $field_config['name'] ) && ! empty( $root[ '_' . $field_config['name'] ] ) ) {
+			return $this->prepare_acf_field_value( $root[ '_' .  $field_config['name'] ], $node, $node_id, $field_config );
+		}
+
 		// Else check if the values are being passed down via the name
 		if ( isset( $field_config['name'] ) && ! empty( $root[ $field_config['name'] ] ) ) {
 			return $this->prepare_acf_field_value( $root[ $field_config['name'] ], $node, $node_id, $field_config );
@@ -603,7 +608,7 @@ public function register_graphql_connections( array $config ): void {
 		// Register the connection to the Field Group Type
 		if ( defined( 'WPGRAPHQL_VERSION' ) && version_compare( WPGRAPHQL_VERSION, '1.23.0', '<=' ) ) {
 			register_graphql_connection( $connection_config );
-		}
+	    }
 
 		// Register the connection to the Field Group Fields Interface
 		register_graphql_connection( array_merge( $connection_config, [ 'fromType' => $type_name . '_Fields' ] ) );

src/FieldType/FlexibleContent.php

@@ -69,14 +69,14 @@ static function ( $field ) use ( $layout ) {
 
 										return isset( $field['parent_layout'] ) && $layout['key'] === $field['parent_layout'] ? $field : null;
 									},
-									acf_get_raw_fields( $layout['key'] )
+									acf_get_fields( $layout['key'] )
 								)
 							);
 
 							$layout_sub_fields = ! empty( $layout['sub_fields'] ) && is_array( $layout['sub_fields'] ) ? $layout['sub_fields'] : [];
 
 							$layout['sub_fields'] = array_merge( $sub_fields, $layout_sub_fields );
-							
+
 							$layouts[] = $layout;
 						}
 					}

src/FieldType/Group.php

@@ -38,14 +38,22 @@ public static function register_field_type(): void {
 							foreach ( $cloned_from['clone'] as $clone_field ) {
 								$cloned_group = acf_get_field_group( $clone_field );
 
+								// if there is no cloned group, continue to the next clone field
 								if ( ! $cloned_group ) {
 									continue;
 								}
 
+								// if the cloned group is not an ACF field group, continue to the next clone field
+								if ( ! acf_is_field_group( $cloned_group ) ) {
+									continue;
+								}
+
+								// if the cloned group should not show in GraphQL, continue to the next clone field
 								if ( ! $field_config->get_registry()->should_field_group_show_in_graphql( $cloned_group ) ) {
 									continue;
 								}
 
+								// determine the GraphQL Type of the cloned field group
 								$cloned_type = $field_config->get_registry()->get_field_group_graphql_type_name( $cloned_group );
 								break;
 							}
@@ -55,7 +63,20 @@ public static function register_field_type(): void {
 					// If the group is a clone field, return the cloned type instead of registering
 					// another Type in the registry
 					if ( $cloned_type ) {
-						return Utils::format_type_name( $cloned_type . ' ' . $field_name );
+						$cloned_type_name = Utils::format_type_name( $cloned_type . ' ' . $field_name );
+						if ( $field_config->get_registry()->has_registered_field_group( $cloned_type_name ) ) {
+							return $cloned_type_name;
+						}
+
+						$sub_field_group['graphql_type_name']  = $cloned_type_name;
+						$sub_field_group['graphql_field_name'] = $cloned_type_name;
+						$field_config->get_registry()->register_acf_field_groups_to_graphql(
+							[
+								$sub_field_group,
+							]
+						);
+
+						return $cloned_type_name;
 					}
 
 					$field_config->get_registry()->register_acf_field_groups_to_graphql(

src/Registry.php

@@ -475,7 +475,8 @@ protected function get_acf_fields( $parent_field_group ): array {
 
 			// Then check database.
 		} else {
-			$raw_fields = isset( $parent_field_group['ID'] ) ? acf_get_fields( $parent_field_group['ID'] ) : [];
+			$parent_field_group_id = $parent_field_group['ID'] ?? null;
+			$raw_fields = acf_get_raw_fields( $parent_field_group_id );
 			foreach ( $raw_fields as $raw_field ) {
 				$fields[] = $raw_field;
 			}