fix(jsonld): various json streamer fixes

Author: soyuka

src/JsonLd/JsonStreamer/ValueTransformer/TypeValueTransformer.php

@@ -15,26 +15,54 @@
 
 use ApiPlatform\Hydra\Collection;
 use ApiPlatform\Metadata\Exception\RuntimeException;
+use ApiPlatform\Metadata\HttpOperation;
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Metadata\ResourceClassResolverInterface;
 use Symfony\Component\JsonStreamer\ValueTransformer\ValueTransformerInterface;
 use Symfony\Component\TypeInfo\Type;
 
 final class TypeValueTransformer implements ValueTransformerInterface
 {
+    public function __construct(
+        private readonly ResourceClassResolverInterface $resourceClassResolver,
+        private readonly ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory,
+    ) {
+    }
+
     public function transform(mixed $value, array $options = []): mixed
     {
-        if ($options['_current_object'] instanceof Collection) {
+        if ($options['_current_object'] instanceof Collection || !\is_object($options['_current_object'])) {
             return 'Collection';
         }
 
-        if (!isset($options['operation'])) {
-            throw new RuntimeException('Operation is not defined');
+        if (($currentClass = $options['_current_object']::class) === $options['data']::class) {
+            if (!isset($options['operation'])) {
+                throw new RuntimeException('Operation is not defined');
+            }
+
+            return $this->getOperationType($options['operation']);
+        }
+
+        if (!$this->resourceClassResolver->isResourceClass($currentClass)) {
+            return null;
         }
 
-        return $options['operation']->getShortName();
+        $op = $this->resourceMetadataCollectionFactory->create($currentClass)->getOperation(httpOperation: true);
+
+        return $this->getOperationType($op);
     }
 
     public static function getStreamValueType(): Type
     {
         return Type::string();
     }
+
+    private function getOperationType(HttpOperation $operation): array|string
+    {
+        if (($t = $operation->getTypes()) && 1 === \count($t)) {
+            return $operation->getTypes()[0];
+        }
+
+        return $t ?: $operation->getShortname();
+    }
 }

src/JsonLd/JsonStreamer/WritePropertyMetadataLoader.php

@@ -15,6 +15,8 @@
 
 use ApiPlatform\Hydra\Collection;
 use ApiPlatform\Hydra\IriTemplate;
+use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
+use ApiPlatform\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
 use ApiPlatform\Metadata\Util\TypeHelper;
 use Symfony\Component\JsonStreamer\Mapping\PropertyMetadata;
@@ -26,6 +28,8 @@ final class WritePropertyMetadataLoader implements PropertyMetadataLoaderInterfa
     public function __construct(
         private readonly PropertyMetadataLoaderInterface $loader,
         private readonly ResourceClassResolverInterface $resourceClassResolver,
+        private readonly PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory,
+        private readonly PropertyMetadataFactoryInterface $propertyMetadataFactory,
     ) {
     }
 
@@ -47,23 +51,45 @@ public function load(string $className, array $options = [], array $context = []
             return $properties;
         }
 
-        $properties['@id'] = new PropertyMetadata(
-            'id', // virtual property
-            Type::mixed(), // virtual property
-            ['api_platform.jsonld.json_streamer.write.value_transformer.iri'],
-        );
+        $originalClassName = TypeHelper::getClassName($context['original_type']);
+        $hasIri = true;
+        $virtualProperty = 'id';
+
+        if ($className !== $originalClassName) {
+            foreach ($this->propertyNameCollectionFactory->create($originalClassName) as $property) {
+                $propertyMetadata = $this->propertyMetadataFactory->create($originalClassName, $property);
+                if ($propertyMetadata->isIdentifier()) {
+                    $virtualProperty = $property;
+                }
+
+                if ($propertyMetadata->getNativeType()->isIdentifiedBy($className)) {
+                    $hasIri = $propertyMetadata->getGenId();
+                    $virtualProperty = iterator_to_array($this->propertyNameCollectionFactory->create($className))[0];
+                }
+            }
+        }
+
+        if ($hasIri) {
+            $properties['@id'] = new PropertyMetadata(
+                $virtualProperty, // virtual property
+                Type::mixed(), // virtual property
+                ['api_platform.jsonld.json_streamer.write.value_transformer.iri'],
+            );
+        }
 
         $properties['@type'] = new PropertyMetadata(
-            'id', // virtual property
+            $virtualProperty, // virtual property
             Type::mixed(), // virtual property
             ['api_platform.jsonld.json_streamer.write.value_transformer.type'],
         );
 
-        $originalClassName = TypeHelper::getClassName($context['original_type']);
+        if ($className !== $originalClassName) {
+            return $properties;
+        }
 
         if (Collection::class === $originalClassName || ($this->resourceClassResolver->isResourceClass($originalClassName) && !isset($context['generated_classes'][Collection::class]))) {
             $properties['@context'] = new PropertyMetadata(
-                'id', // virual property
+                $virtualProperty, // virual property
                 Type::string(), // virtual property
                 ['api_platform.jsonld.json_streamer.write.value_transformer.context'],
             );

src/Symfony/Bundle/Resources/config/json_streamer/common.xml

@@ -19,6 +19,8 @@
         <service id="api_platform.jsonld.json_streamer.write.property_metadata_loader" class="ApiPlatform\JsonLd\JsonStreamer\WritePropertyMetadataLoader">
             <argument type="service" id="json_streamer.write.property_metadata_loader" />
             <argument type="service" id="api_platform.resource_class_resolver" />
+            <argument type="service" id="api_platform.metadata.property.name_collection_factory" />
+            <argument type="service" id="api_platform.metadata.property.metadata_factory" />
         </service>
 
         <service id="api_platform.jsonld.json_streamer.write.value_transformer.iri" class="ApiPlatform\JsonLd\JsonStreamer\ValueTransformer\IriValueTransformer">
@@ -27,6 +29,8 @@
         </service>
 
         <service id="api_platform.jsonld.json_streamer.write.value_transformer.type" class="ApiPlatform\JsonLd\JsonStreamer\ValueTransformer\TypeValueTransformer">
+            <argument type="service" id="api_platform.resource_class_resolver" />
+            <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <tag name="json_streamer.value_transformer"/>
         </service>