- refactor get_graphql_locations_for_field_group() to early return for field groups that have graphql_types defined, but still support field groups that don't have graphql_types defined.

Author: jasonbahl

src/Registry.php

@@ -568,9 +568,33 @@ public function get_graphql_locations_for_field_group( array $field_group, array
 			return [];
 		}
 
-		$graphql_types = $field_group['graphql_types'] ?? [];
+		// early return if the field group has graphql_types defined
+		if ( ! empty( $field_group['graphql_types'] ) && is_array( $field_group['graphql_types'] ) ) {
+			return array_unique( array_filter( $field_group['graphql_types'] ) );
+		}
+
+		if ( ! isset( $field_group['map_graphql_types_from_location_rules'] ) || false !== (bool) $field_group['map_graphql_types_from_location_rules'] ) {
+			return [];
+		}
+
+		if ( empty( $field_group['locations'] ) ) {
+			return [];
+		}
+
+		$field_group_name = \WPGraphQL\Acf\Utils::get_field_group_name( $field_group );
+
+		if ( empty( $field_group_name ) ) {
+			return [];
+		}
+
+		$field_group_name = Utils::format_field_name( $field_group_name, true );
+
+		$location_rules = $this->get_location_rules( $acf_field_groups );
+		if ( isset( $location_rules[ $field_group_name ] ) ) {
+			$graphql_types = $location_rules[ $field_group_name ];
+		}
 
-		return is_array( $graphql_types ) ? $graphql_types : [ $graphql_types ];
+		return ! empty( $graphql_types ) && is_array( $graphql_types ) ? array_unique( array_filter( $graphql_types ) ) : [];
 	}
 
 	/**