exp

config/services.php

@@ -221,6 +221,7 @@
         ->set('rekalogika.mapper.transformer_registry', TransformerRegistry::class)
         ->args([
             '$transformersLocator' => tagged_locator('rekalogika.mapper.transformer'),
+            '$typeResolver' => service('rekalogika.mapper.type_resolver'),
             '$mappingFactory' => service('rekalogika.mapper.mapping_factory'),
         ]);
 

src/MapperFactory/MapperFactory.php

@@ -490,6 +490,7 @@ protected function getTransformerRegistry(): TransformerRegistryInterface
         if (null === $this->transformerRegistry) {
             $this->transformerRegistry = new TransformerRegistry(
                 $this->getTransformersLocator(),
+                $this->getTypeResolver(),
                 $this->getMappingFactory(),
             );
         }

src/TransformerRegistry/TransformerRegistry.php

@@ -17,12 +17,14 @@
 use Rekalogika\Mapper\Exception\LogicException;
 use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
+use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;
 use Rekalogika\Mapper\Util\TypeCheck;
 
 class TransformerRegistry implements TransformerRegistryInterface
 {
     public function __construct(
         private ContainerInterface $transformersLocator,
+        private TypeResolverInterface $typeResolver,
         private MappingFactoryInterface $mappingFactory,
     ) {
     }
@@ -55,6 +57,28 @@ public function findBySourceAndTargetTypes(
         array $sourceTypes,
         array $targetTypes,
     ): SearchResult {
+        $newSourceTypes = [];
+        $newTargetTypes = [];
+
+        foreach ($sourceTypes as $sourceType) {
+            $newSourceTypes = [
+                ...$newSourceTypes,
+                $sourceType,
+                ...$this->typeResolver->getAttributeTypes($sourceType),
+            ];
+        }
+
+        foreach ($targetTypes as $targetType) {
+            $newTargetTypes = [
+                ...$newTargetTypes,
+                $targetType,
+                ...$this->typeResolver->getAttributeTypes($targetType),
+            ];
+        }
+
+        $sourceTypes = $newSourceTypes;
+        $targetTypes = $newTargetTypes;
+
         $mapping = $this->mappingFactory->getMapping();
 
         /** @var array<int,SearchResultEntry> */

src/TypeResolver/CachingTypeResolver.php

@@ -119,4 +119,9 @@ public function getAcceptedTransformerOutputTypeStrings(Type|MixedType $type): a
     {
         return $this->decorated->getAcceptedTransformerOutputTypeStrings($type);
     }
+
+    public function getAttributeTypes(Type|MixedType $type): array
+    {
+        return $this->decorated->getAttributeTypes($type);
+    }
 }

src/TypeResolver/TypeResolver.php

@@ -56,4 +56,13 @@ public function getAcceptedTransformerOutputTypeStrings(Type|MixedType $type): a
     {
         return $this->getAcceptedTransformerInputTypeStrings($type);
     }
+
+    public function getAttributeTypes(Type|MixedType $type): array
+    {
+        if ($type instanceof MixedType) {
+            return [];
+        }
+
+        return TypeUtil::getAttributesFromType($type);
+    }
 }

src/TypeResolver/TypeResolverInterface.php

@@ -69,4 +69,10 @@ public function getAcceptedTransformerInputTypeStrings(Type|MixedType $type): ar
      * @return array<int,string>
      */
     public function getAcceptedTransformerOutputTypeStrings(Type|MixedType $type): array;
+
+    /**
+     * @param Type|MixedType $type
+     * @return array<int,Type>
+     */
+    public function getAttributeTypes(Type|MixedType $type): array;
 }

src/Util/TypeUtil.php

@@ -359,7 +359,7 @@ private static function getAllClassesFromObject(
      * @param Type|MixedType $type
      * @return array<int,Type>
      */
-    private static function getAttributesFromType(
+    public static function getAttributesFromType(
         Type|MixedType $type
     ): array {
         if ($type instanceof MixedType) {