chore(mapper): fix MapTo naming collision (#933)

Author: brendt

src/Tempest/Mapper/src/Attributes/MapTo.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tempest\Mapper\Attributes;
+namespace Tempest\Mapper;
 
 use Attribute;
 

…empest/Mapper/src/Attributes/MapFrom.php src/Tempest/Mapper/src/MapFrom.phpsrc/Tempest/Mapper/src/Attributes/MapFrom.php renamed to src/Tempest/Mapper/src/MapFrom.php src/Tempest/Mapper/src/Attributes/MapFrom.php renamed to src/Tempest/Mapper/src/MapFrom.php

@@ -4,8 +4,13 @@
 
 namespace Tempest\Mapper;
 
-enum MapTo
+use Attribute;
+
+#[Attribute(Attribute::TARGET_PROPERTY)]
+final readonly class MapTo
 {
-    case JSON;
-    case ARRAY;
+    public function __construct(
+        public string $name,
+    ) {
+    }
 }

src/Tempest/Mapper/src/MapTo.php

@@ -5,13 +5,12 @@
 namespace Tempest\Mapper\Mappers;
 
 use Tempest\Mapper\Mapper;
-use Tempest\Mapper\MapTo;
 
 final readonly class ArrayToJsonMapper implements Mapper
 {
     public function canMap(mixed $from, mixed $to): bool
     {
-        return $to === MapTo::JSON && is_array($from);
+        return false;
     }
 
     public function map(mixed $from, mixed $to): string

src/Tempest/Mapper/src/Mappers/ArrayToJsonMapper.php

@@ -4,10 +4,10 @@
 
 namespace Tempest\Mapper\Mappers;
 
-use Tempest\Mapper\Attributes\MapFrom;
 use Tempest\Mapper\Casters\ArrayCaster;
 use Tempest\Mapper\Casters\CasterFactory;
 use Tempest\Mapper\Exceptions\MissingValuesException;
+use Tempest\Mapper\MapFrom;
 use Tempest\Mapper\Mapper;
 use Tempest\Mapper\Strict;
 use Tempest\Mapper\UnknownValue;

src/Tempest/Mapper/src/Mappers/ArrayToObjectMapper.php

@@ -11,7 +11,7 @@
 {
     public function canMap(mixed $from, mixed $to): bool
     {
-        return $to === MapTo::ARRAY && is_string($from) && json_validate($from);
+        return is_string($from) && json_validate($from);
     }
 
     public function map(mixed $from, mixed $to): array

src/Tempest/Mapper/src/Mappers/JsonToArrayMapper.php

@@ -33,8 +33,6 @@ public function canMap(mixed $from, mixed $to): bool
 
     public function map(mixed $from, mixed $to): object
     {
-        return map(
-            map($from)->to(MapTo::ARRAY),
-        )->to($to);
+        return map(map($from)->toArray())->to($to);
     }
 }

src/Tempest/Mapper/src/Mappers/JsonToObjectMapper.php

@@ -6,9 +6,9 @@
 
 use JsonSerializable;
 use ReflectionException;
-use Tempest\Mapper\Attributes\MapTo as MapToAttribute;
 use Tempest\Mapper\Mapper;
 use Tempest\Mapper\MapTo;
+use Tempest\Mapper\MapTo as MapToAttribute;
 use Tempest\Reflection\ClassReflector;
 use Tempest\Reflection\PropertyReflector;
 use function Tempest\Support\arr;
@@ -17,7 +17,7 @@
 {
     public function canMap(mixed $from, mixed $to): bool
     {
-        return $to === MapTo::ARRAY && is_object($from);
+        return false;
     }
 
     public function map(mixed $from, mixed $to): array

src/Tempest/Mapper/src/Mappers/ObjectToArrayMapper.php

@@ -12,14 +12,11 @@
 {
     public function canMap(mixed $from, mixed $to): bool
     {
-        return $to === MapTo::JSON && is_object($from);
+        return false;
     }
 
     public function map(mixed $from, mixed $to): string
     {
-        return
-            map(
-                map($from)->to(MapTo::ARRAY),
-            )->to(MapTo::JSON);
+        return map(map($from)->toArray())->toJson();
     }
 }

src/Tempest/Mapper/src/Mappers/ObjectToJsonMapper.php

@@ -8,6 +8,10 @@
 use ReflectionException;
 use Tempest\Container\Container;
 use Tempest\Mapper\Exceptions\CannotMapDataException;
+use Tempest\Mapper\Mappers\ArrayToJsonMapper;
+use Tempest\Mapper\Mappers\JsonToArrayMapper;
+use Tempest\Mapper\Mappers\ObjectToArrayMapper;
+use Tempest\Mapper\Mappers\ObjectToJsonMapper;
 use Tempest\Reflection\FunctionReflector;
 
 /** @template ClassType */
@@ -22,8 +26,7 @@ final class ObjectFactory
     public function __construct(
         private readonly MapperConfig $config,
         private readonly Container $container,
-    ) {
-    }
+    ) {}
 
     /**
      * @template T of object
@@ -68,7 +71,7 @@ public function from(mixed $data): mixed
 
     /**
      * @template T of object
-     * @param T|class-string<T> $to
+     * @param T|class-string<T>|string $to
      * @return T|T[]|mixed
      */
     public function to(mixed $to): mixed
@@ -80,9 +83,33 @@ public function to(mixed $to): mixed
         );
     }
 
+    public function toArray(): array
+    {
+        if (is_object($this->from)) {
+            return $this->with(ObjectToArrayMapper::class);
+        } elseif (is_array($this->from)) {
+            return $this->from;
+        } elseif (is_string($this->from) && json_validate($this->from)) {
+            return $this->with(JsonToArrayMapper::class);
+        } else {
+            throw new CannotMapDataException($this->from, 'array');
+        }
+    }
+
+    public function toJson(): string
+    {
+        if (is_object($this->from)) {
+            return $this->with(ObjectToJsonMapper::class);
+        } elseif (is_array($this->from)) {
+            return $this->with(ArrayToJsonMapper::class);
+        } else {
+            throw new CannotMapDataException($this->from, 'json');
+        }
+    }
+
     /**
      * @template T of object
-     * @param T|class-string<T> $to
+     * @param T|class-string<T>|string $to
      * @return T|mixed
      */
     public function map(mixed $from, mixed $to): mixed
@@ -131,7 +158,8 @@ private function mapObject(
         mixed $from,
         mixed $to,
         bool $isCollection,
-    ): mixed {
+    ): mixed
+    {
         if ($isCollection && is_array($from)) {
             return array_map(
                 fn (mixed $item) => $this->mapObject(