refactor(mapper): clean up dto caster and serializer

Author: innocenzi

packages/mapper/src/Casters/DtoCaster.php

@@ -19,11 +19,11 @@ public function __construct(
     public function cast(mixed $input): mixed
     {
         if (is_string($input) && Json\is_valid($input)) {
-            return $this->deserializeRecursively(Json\decode($input));
+            return $this->deserialize(Json\decode($input));
         }
 
         if (is_array($input)) {
-            return $this->deserializeRecursively($input);
+            return $this->deserialize($input);
         }
 
         if (is_string($input)) {
@@ -33,22 +33,19 @@ public function cast(mixed $input): mixed
         return $input;
     }
 
-    private function deserializeRecursively(mixed $input): mixed
+    private function deserialize(mixed $input): mixed
     {
         if (is_array($input) && isset($input['type'], $input['data'])) {
             $class = Arr\find_key(
                 array: $this->mapperConfig->serializationMap,
                 value: $input['type'],
             ) ?: $input['type'];
 
-            return map($this->deserializeRecursively($input['data']))->to($class);
+            return map($this->deserialize($input['data']))->to($class);
         }
 
         if (is_array($input)) {
-            return array_map(
-                fn (mixed $value) => $this->deserializeRecursively($value),
-                $input,
-            );
+            return array_map(fn (mixed $value) => $this->deserialize($value), $input);
         }
 
         return $input;

packages/mapper/src/Serializers/DtoSerializer.php

@@ -2,12 +2,16 @@
 
 namespace Tempest\Mapper\Serializers;
 
+use BackedEnum;
+use JsonSerializable;
 use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized;
 use Tempest\Mapper\MapperConfig;
 use Tempest\Mapper\Serializer;
+use Tempest\Reflection\ClassReflector;
+use Tempest\Reflection\PropertyReflector;
+use Tempest\Support\Arr;
 use Tempest\Support\Json;
-
-use function Tempest\map;
+use UnitEnum;
 
 final readonly class DtoSerializer implements Serializer
 {
@@ -17,33 +21,33 @@ public function __construct(
 
     public function serialize(mixed $input): array|string
     {
+        // Support top-level arrays
         if (is_array($input)) {
-            // Handle top-level arrays
-            return Json\encode($this->wrapWithTypeInfo($input));
+            return Json\encode($this->serializeWithType($input));
         }
 
         if (! is_object($input)) {
             throw new ValueCouldNotBeSerialized('object or array');
         }
 
-        return Json\encode($this->wrapWithTypeInfo($input));
+        return Json\encode($this->serializeWithType($input));
     }
 
-    private function wrapWithTypeInfo(mixed $input): mixed
+    private function serializeWithType(mixed $input): mixed
     {
-        if ($input instanceof \BackedEnum) {
+        if ($input instanceof BackedEnum) {
             return $input->value;
         }
 
-        if ($input instanceof \UnitEnum) {
+        if ($input instanceof UnitEnum) {
             return $input->name;
         }
 
         if (is_object($input)) {
             $data = $this->extractObjectData($input);
 
             foreach ($data as $key => $value) {
-                $data[$key] = $this->wrapWithTypeInfo($value);
+                $data[$key] = $this->serializeWithType($value);
             }
 
             $type = $this->mapperConfig->serializationMap[get_class($input)] ?? get_class($input);
@@ -55,25 +59,21 @@ private function wrapWithTypeInfo(mixed $input): mixed
         }
 
         if (is_array($input)) {
-            return array_map([$this, 'wrapWithTypeInfo'], $input);
+            return Arr\map_iterable($input, $this->serializeWithType(...));
         }
 
         return $input;
     }
 
     private function extractObjectData(object $input): array
     {
-        if ($input instanceof \JsonSerializable) {
+        if ($input instanceof JsonSerializable) {
             return $input->jsonSerialize();
         }
 
-        $data = [];
-        $class = new \ReflectionClass($input);
-
-        foreach ($class->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
-            $data[$property->getName()] = $property->getValue($input);
-        }
-
-        return $data;
+        return Arr\map_with_keys(
+            array: new ClassReflector($input)->getPublicProperties(),
+            map: fn (PropertyReflector $property) => yield $property->getName() => $property->getValue($input),
+        );
     }
 }