fix(graphql): refactor handling of nested collections

src/GraphQl/Resolver/Factory/ResolverFactory.php

@@ -16,6 +16,7 @@
 use ApiPlatform\Metadata\GraphQl\Mutation;
 use ApiPlatform\Metadata\GraphQl\Operation;
 use ApiPlatform\Metadata\GraphQl\Query;
+use ApiPlatform\State\Pagination\ArrayPaginator;
 use ApiPlatform\State\ProcessorInterface;
 use ApiPlatform\State\ProviderInterface;
 use GraphQL\Type\Definition\ResolveInfo;
@@ -33,6 +34,11 @@ public function __invoke(string $resourceClass = null, string $rootClass = null,
         return function (?array $source, array $args, $context, ResolveInfo $info) use ($resourceClass, $rootClass, $operation) {
             // Data already fetched and normalized (field or nested resource)
             if ($body = $source[$info->fieldName] ?? null) {
+                // special treatment for nested resources without a resolver/provider
+                if ($operation instanceof Query && $operation->getNested() && !$operation->getResolver() && !$operation->getProvider()) {
+                    return $this->process($source, $args, $info, $rootClass, $operation, new ArrayPaginator($body, 0, \count($body)));
+                }
+
                 return $body;
             }
 
@@ -45,23 +51,28 @@ public function __invoke(string $resourceClass = null, string $rootClass = null,
                 return null;
             }
 
-            // Handles relay nodes
-            $operation ??= new Query();
+            return $this->process($source, $args, $info, $rootClass, $operation, null);
+        };
+    }
+
+    private function process(?array $source, array $args, ResolveInfo $info, string $rootClass = null, Operation $operation = null, mixed $body)
+    {
+        // Handles relay nodes
+        $operation ??= new Query();
 
-            $graphQlContext = [];
-            $context = ['source' => $source, 'args' => $args, 'info' => $info, 'root_class' => $rootClass, 'graphql_context' => &$graphQlContext];
+        $graphQlContext = [];
+        $context = ['source' => $source, 'args' => $args, 'info' => $info, 'root_class' => $rootClass, 'graphql_context' => &$graphQlContext];
 
-            if (null === $operation->canValidate()) {
-                $operation = $operation->withValidate($operation instanceof Mutation);
-            }
+        if (null === $operation->canValidate()) {
+            $operation = $operation->withValidate($operation instanceof Mutation);
+        }
 
-            $body = $this->provider->provide($operation, [], $context);
+        $body ??= $this->provider->provide($operation, [], $context);
 
-            if (null === $operation->canWrite()) {
-                $operation = $operation->withWrite($operation instanceof Mutation && null !== $body);
-            }
+        if (null === $operation->canWrite()) {
+            $operation = $operation->withWrite($operation instanceof Mutation && null !== $body);
+        }
 
-            return $this->processor->process($body, $operation, [], $context);
-        };
+        return $this->processor->process($body, $operation, [], $context);
     }
 }

src/GraphQl/Serializer/ItemNormalizer.php

@@ -115,18 +115,7 @@ protected function normalizeCollectionOfRelations(ApiProperty $propertyMetadata,
             // check for nested collection
             $operation = $this->resourceMetadataCollectionFactory->create($resourceClass)->getOperation('collection_query');
             if ($operation instanceof Query && $operation->getNested() && !$operation->getResolver() && !$operation->getProvider()) {
-                if (false === $operation->getPaginationEnabled()) {
-                    return [...$attributeValue];
-                }
-
-                $data = ['edges' => []];
-                $index = 0;
-                foreach ($attributeValue as $object) {
-                    $data['edges'][$index] = ['node' => $object];
-                    ++$index;
-                }
-
-                return $data;
+                return [...$attributeValue];
             }
         }