JsonLd: resolve @id when there is an output class

Author: soyuka

features/main/input_output.feature

@@ -42,13 +42,16 @@ Feature: DTO input and output
         "@vocab": "http://example.com/docs.jsonld#",
         "hydra": "http://www.w3.org/ns/hydra/core#",
         "foo": {
+          "@id": "/dummy_dto_customs/1/foo",
           "@type": "@id"
         },
         "bar": {
+          "@id": "/dummy_dto_customs/1/bar",
           "@type": "@id"
         }
       },
       "@type": "CustomOutputDto",
+      "@id": "/dummy_dto_customs/1",
       "foo": "test",
       "bar": 1
     }
@@ -69,10 +72,12 @@ Feature: DTO input and output
       "@type": "hydra:Collection",
       "hydra:member": [
         {
+          "@id": "/dummy_dto_customs/1",
           "foo": "test",
           "bar": 1
         },
         {
+          "@id": "/dummy_dto_customs/2",
           "foo": "test",
           "bar": 2
         }

src/GraphQl/Resolver/ResourceFieldResolver.php

@@ -50,6 +50,7 @@ public function __invoke($source, $args, $context, ResolveInfo $info)
         }
 
         if ('_id' === $info->fieldName && isset($source['id'])) {
+            // if we set _id in the normalizer we take it
             $property = $source['_id'] ?? $source['id'];
         } elseif (\is_array($source) && isset($source[$info->fieldName])) {
             $property = $source[$info->fieldName];

src/GraphQl/Serializer/ItemNormalizer.php

@@ -64,6 +64,7 @@ public function normalize($object, $format = null, array $context = [])
             throw new UnexpectedValueException('Expected data to be an array');
         }
 
+        // we're handling the case where we have an Output class, we need the IRI from the origin resource
         if (($context['origin_resource'] ?? false) && isset($data['id'])) {
             $data['_id'] = $data['id'];
             $data['id'] = $this->iriConverter->getIriFromItem($context['origin_resource']);

src/JsonLd/Serializer/ItemNormalizer.php

@@ -71,11 +71,16 @@ public function normalize($object, $format = null, array $context = [])
 
             $context['api_normalize'] = true;
             $context['resource_class'] = $this->getObjectClass($transformed);
+            $context['origin_resource'] = $object;
 
             return $this->serializer->normalize($transformed, $format, $context);
         }
 
         if ($this->handleNonResource && $context['api_normalize'] ?? false) {
+            if (($context['origin_resource'] ?? false)) {
+                $context['output']['iri'] = $this->iriConverter->getIriFromItem($context['origin_resource']);
+            }
+
             $data = $this->createJsonLdContext($this->contextBuilder, $object, $context);
             $rawData = parent::normalize($object, $format, $context);
             if (!\is_array($rawData)) {

src/JsonLd/Serializer/JsonLdContextTrait.php

@@ -49,8 +49,9 @@ private function addJsonLdContext(ContextBuilderInterface $contextBuilder, strin
 
     private function createJsonLdContext(AnonymousContextBuilderInterface $contextBuilder, $object, array &$context, array $data = []): array
     {
+        // We're in a collection, just add the IRI if available
         if (isset($context['jsonld_has_context'])) {
-            return $data;
+            return isset($context['output']['iri']) ? ['@id' => $context['output']['iri']] : $data;
         }
 
         $context['jsonld_has_context'] = true;