feat: improved handling of clone and group fields

src/FieldType/CloneField.php

@@ -15,13 +15,21 @@ public static function register_field_type(): void {
 			'clone',
 			[
 				'graphql_type' => static function ( FieldConfig $field_config, AcfGraphQLFieldType $acf_field_type ) {
+
 					$sub_field_group = $field_config->get_raw_acf_field();
 					$parent_type     = $field_config->get_parent_graphql_type_name( $sub_field_group );
 					$field_name      = $field_config->get_graphql_field_name();
 					$registry        = $field_config->get_registry();
 					$type_name       = Utils::format_type_name( $parent_type . ' ' . $field_name );
 					$prefix_name     = $sub_field_group['prefix_name'] ?? false;
 
+					// If the "Clone" field has not set a "prefix_name",
+					// return NULL to prevent registering a new type
+					// The cloned
+					if ( ! $prefix_name ) {
+						return 'NULL';
+					}
+
 					$cloned_fields = array_filter(
 						array_map(
 							static function ( $cloned ) {
@@ -44,38 +52,19 @@ static function ( $cloned ) use ( $field_config ) {
 						)
 					);
 
+
 					if ( ! empty( $cloned_group_interfaces ) ) {
-						if ( ! $prefix_name ) {
-							register_graphql_interfaces_to_types( $cloned_group_interfaces, [ $parent_type ] );
-						} else {
-							$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;
-						}
+						$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;
 					}
 
 
 					// If the "Clone" field has cloned individual fields
 					if ( ! empty( $cloned_fields ) ) {
-
-						// If the clone field is NOT set to use "prefix_name"
-						if ( ! $prefix_name ) {
-
-							// Map over the cloned fields and register them to the parent type
-							foreach ( $cloned_fields as $cloned_field ) {
-								$field_config = $registry->map_acf_field_to_graphql( $cloned_field, $sub_field_group );
-								if ( ! empty( $field_config['name'] ) ) {
-									register_graphql_field( $parent_type, $field_config['name'], $field_config );
-								}
-							}
-
-							// If the Clone field is set to use "prefix_name"
-							// Register a new Object Type with the cloned fields, and return
-							// the new type.
-						} else {
-							return self::register_prefixed_clone_field_type( $type_name, $sub_field_group, $cloned_fields, $field_config );
-						}
+						return self::register_prefixed_clone_field_type( $type_name, $sub_field_group, $cloned_fields, $field_config );
 					}
+
 					// Bail by returning a NULL type
 					return 'NULL';
 				},

src/FieldType/FlexibleContent.php

@@ -76,7 +76,7 @@ static function ( $field ) use ( $layout ) {
 							$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

@@ -26,6 +26,38 @@ public static function register_field_type(): void {
 					$sub_field_group['graphql_field_name'] = $type_name;
 					$sub_field_group['parent']             = $sub_field_group['key'];
 
+					// Determine if the group is a clone field
+					$cloned_type = null;
+
+					// if the field group is actually a cloned field group, we
+					// can return the GraphQL Type of the cloned field group
+					if ( isset( $sub_field_group['_clone'] ) ) {
+						$cloned_from = acf_get_field( $sub_field_group['_clone'] );
+
+						if ( ! empty( $cloned_from['clone'] ) && is_array( $cloned_from['clone'] ) ) {
+							foreach ( $cloned_from['clone'] as $clone_field ) {
+								$cloned_group = acf_get_field_group( $clone_field );
+
+								if ( ! $cloned_group ) {
+									continue;
+								}
+
+								if ( ! $field_config->get_registry()->should_field_group_show_in_graphql( $cloned_group ) ) {
+									continue;
+								}
+
+								$cloned_type = $field_config->get_registry()->get_field_group_graphql_type_name( $cloned_group );
+								break;
+							}
+						}
+					}
+
+					// 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 );
+					}
+
 					$field_config->get_registry()->register_acf_field_groups_to_graphql(
 						[
 							$sub_field_group,

src/FieldType/Repeater.php

@@ -24,15 +24,38 @@ public static function register_field_type(): void {
 					$sub_field_group['graphql_field_name'] = $type_name;
 					$sub_field_group['locations']          = null;
 
-					if ( ! empty( $sub_field_group['__key'] ) ) {
-						$cloned_from   = acf_get_field( $sub_field_group['__key'] );
-						$cloned_parent = ! empty( $cloned_from ) ? $field_config->get_parent_graphql_type_name( $cloned_from ) : null;
-						if ( ! empty( $cloned_parent ) ) {
-							$type_name = Utils::format_type_name( $cloned_parent . ' ' . $field_name );
-							return [ 'list_of' => $type_name ];
+					// Determine if the group is a clone field
+					$cloned_type = null;
+
+					// if the field group is actually a cloned field group, we
+					// can return the GraphQL Type of the cloned field group
+					if ( isset( $sub_field_group['_clone'] ) ) {
+						$cloned_from = acf_get_field( $sub_field_group['_clone'] );
+
+						if ( ! empty( $cloned_from['clone'] ) && is_array( $cloned_from['clone'] ) ) {
+							foreach ( $cloned_from['clone'] as $clone_field ) {
+								$cloned_group = acf_get_field_group( $clone_field );
+
+								if ( ! $cloned_group ) {
+									continue;
+								}
+
+								if ( ! $field_config->get_registry()->should_field_group_show_in_graphql( $cloned_group ) ) {
+									continue;
+								}
+
+								$cloned_type = $field_config->get_registry()->get_field_group_graphql_type_name( $cloned_group );
+								break;
+							}
 						}
 					}
 
+					// If the group is a clone field, return the cloned type instead of registering
+					// another Type in the registry
+					if ( $cloned_type ) {
+						return [ 'list_of' => Utils::format_type_name( $cloned_type . ' ' . $field_name ) ];
+					}
+
 
 					$field_config->get_registry()->register_acf_field_groups_to_graphql(
 						[

src/Registry.php

@@ -311,16 +311,44 @@ public function register_initial_graphql_types(): void {
 	 *
 	 * @param array<mixed> $acf_field_group The ACF Field Group config
 	 *
-	 * @return array<mixed>
+	 * @return array<string> The interface names that the Field Group should apply
 	 * @throws \GraphQL\Error\Error
 	 */
 	public function get_field_group_interfaces( array $acf_field_group ): array {
 		$fields_interface = $this->get_field_group_graphql_type_name( $acf_field_group ) . '_Fields';
 		$interfaces       = isset( $acf_field_group['interfaces'] ) && is_array( $acf_field_group['interfaces'] ) ? $acf_field_group['interfaces'] : [];
 		$interfaces[]     = 'AcfFieldGroup';
 		$interfaces[]     = $fields_interface;
-		$interfaces       = array_unique( array_values( $interfaces ) );
-		return array_unique( $interfaces );
+
+		$fields                 = $this->get_acf_fields( $acf_field_group );
+		$clone_field_interfaces = [];
+		if ( ! empty( $fields ) ) {
+			foreach ( $fields as $field ) {
+				// if the field is a clone field, track it
+				if ( ! empty( $field['clone'] ) && is_array( $field['clone'] ) ) {
+					foreach ( $field['clone'] as $clone_field ) {
+						$cloned_group = acf_get_field_group( $clone_field );
+
+						if ( ! $cloned_group ) {
+							continue;
+						}
+
+						if ( ! $this->should_field_group_show_in_graphql( $cloned_group ) ) {
+							continue;
+						}
+
+						$cloned_type_name         = $this->get_field_group_graphql_type_name( $cloned_group );
+						$clone_field_interfaces[] = $cloned_type_name . '_Fields';
+					}
+				}
+			}
+		}
+
+		if ( ! empty( $clone_field_interfaces ) ) {
+			$interfaces = array_merge( $interfaces, $clone_field_interfaces );
+		}
+
+		return array_unique( array_values( $interfaces ) );
 	}
 
 	/**