refactor: clean up serializer and caster matching

Author: innocenzi

packages/database/src/Casters/DataTransferObjectCaster.php

@@ -2,15 +2,16 @@
 
 namespace Tempest\Database\Casters;
 
-use Closure;
 use Tempest\Core\Priority;
 use Tempest\Database\DatabaseContext;
 use Tempest\Mapper\Attributes\Context;
 use Tempest\Mapper\Caster;
 use Tempest\Mapper\Context as MapperContext;
+use Tempest\Mapper\DynamicCaster;
 use Tempest\Mapper\Exceptions\ValueCouldNotBeCast;
 use Tempest\Mapper\MapperConfig;
 use Tempest\Mapper\SerializeAs;
+use Tempest\Reflection\PropertyReflector;
 use Tempest\Reflection\TypeReflector;
 use Tempest\Support\Arr;
 use Tempest\Support\Json;
@@ -19,16 +20,20 @@
 
 #[Priority(Priority::HIGHEST)]
 #[Context(DatabaseContext::class)]
-final readonly class DataTransferObjectCaster implements Caster
+final readonly class DataTransferObjectCaster implements Caster, DynamicCaster
 {
     public function __construct(
         private MapperConfig $mapperConfig,
         private MapperContext $context,
     ) {}
 
-    public static function for(): Closure
+    public static function accepts(PropertyReflector|TypeReflector $type): bool
     {
-        return fn (TypeReflector $type) => $type->isClass() && $type->asClass()->getAttribute(SerializeAs::class);
+        $type = $type instanceof PropertyReflector
+            ? $type->getType()
+            : $type;
+
+        return $type->isClass() && $type->asClass()->getAttribute(SerializeAs::class) !== null;
     }
 
     public function cast(mixed $input): mixed

packages/database/src/Casters/EncryptedCaster.php

@@ -15,11 +15,6 @@ public function __construct(
         private Encrypter $encrypter,
     ) {}
 
-    public static function for(): false
-    {
-        return false;
-    }
-
     public function cast(mixed $input): ?string
     {
         if ($input === null) {

packages/database/src/Casters/PrimaryKeyCaster.php

@@ -7,13 +7,20 @@
 use Tempest\Core\Priority;
 use Tempest\Database\PrimaryKey;
 use Tempest\Mapper\Caster;
+use Tempest\Mapper\DynamicCaster;
+use Tempest\Reflection\PropertyReflector;
+use Tempest\Reflection\TypeReflector;
 
 #[Priority(Priority::HIGHEST)]
-final readonly class PrimaryKeyCaster implements Caster
+final readonly class PrimaryKeyCaster implements Caster, DynamicCaster
 {
-    public static function for(): string
+    public static function accepts(PropertyReflector|TypeReflector $input): bool
     {
-        return PrimaryKey::class;
+        $type = $input instanceof PropertyReflector
+            ? $input->getType()
+            : $input;
+
+        return $type->matches(PrimaryKey::class);
     }
 
     public function cast(mixed $input): PrimaryKey

packages/database/src/Serializers/BooleanSerializer.php

@@ -7,19 +7,26 @@
 use Tempest\Database\Config\DatabaseDialect;
 use Tempest\Database\DatabaseContext;
 use Tempest\Mapper\Attributes\Context;
+use Tempest\Mapper\DynamicSerializer;
 use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized;
 use Tempest\Mapper\Serializer;
+use Tempest\Reflection\PropertyReflector;
+use Tempest\Reflection\TypeReflector;
 
 #[Context(DatabaseContext::class)]
-final class BooleanSerializer implements Serializer
+final class BooleanSerializer implements Serializer, DynamicSerializer
 {
     public function __construct(
         private DatabaseContext $context,
     ) {}
 
-    public static function for(): array
+    public static function accepts(PropertyReflector|TypeReflector $type): bool
     {
-        return ['bool', 'boolean'];
+        $type = $type instanceof PropertyReflector
+            ? $type->getType()
+            : $type;
+
+        return $type->getName() === 'bool' || $type->getName() === 'boolean';
     }
 
     public function serialize(mixed $input): string

packages/database/src/Serializers/DataTransferObjectSerializer.php

@@ -3,11 +3,11 @@
 namespace Tempest\Database\Serializers;
 
 use BackedEnum;
-use Closure;
 use JsonSerializable;
 use Tempest\Core\Priority;
 use Tempest\Database\DatabaseContext;
 use Tempest\Mapper\Attributes\Context;
+use Tempest\Mapper\DynamicSerializer;
 use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized;
 use Tempest\Mapper\MapperConfig;
 use Tempest\Mapper\SerializeAs;
@@ -21,15 +21,19 @@
 
 #[Priority(Priority::HIGHEST)]
 #[Context(DatabaseContext::class)]
-final readonly class DataTransferObjectSerializer implements Serializer
+final readonly class DataTransferObjectSerializer implements Serializer, DynamicSerializer
 {
     public function __construct(
         private MapperConfig $mapperConfig,
     ) {}
 
-    public static function for(): Closure
+    public static function accepts(PropertyReflector|TypeReflector $type): bool
     {
-        return fn (TypeReflector $type) => $type->isClass() && $type->asClass()->getAttribute(SerializeAs::class);
+        $type = $type instanceof PropertyReflector
+            ? $type->getType()
+            : $type;
+
+        return $type->isClass() && $type->asClass()->getAttribute(SerializeAs::class) !== null;
     }
 
     public function serialize(mixed $input): array|string

packages/database/src/Serializers/DateTimeSerializer.php

@@ -10,15 +10,22 @@
 use Tempest\DateTime\DateTimeInterface;
 use Tempest\DateTime\FormatPattern;
 use Tempest\Mapper\Attributes\Context;
+use Tempest\Mapper\DynamicSerializer;
 use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized;
 use Tempest\Mapper\Serializer;
+use Tempest\Reflection\PropertyReflector;
+use Tempest\Reflection\TypeReflector;
 
 #[Context(DatabaseContext::class)]
-final readonly class DateTimeSerializer implements Serializer
+final readonly class DateTimeSerializer implements Serializer, DynamicSerializer
 {
-    public static function for(): array
+    public static function accepts(PropertyReflector|TypeReflector $type): bool
     {
-        return [DateTime::class, DateTimeInterface::class, NativeDateTimeInterface::class];
+        $type = $type instanceof PropertyReflector
+            ? $type->getType()
+            : $type;
+
+        return $type->matches(DateTime::class) || $type->matches(DateTimeInterface::class) || $type->matches(NativeDateTimeInterface::class);
     }
 
     public function serialize(mixed $input): string

packages/database/src/Serializers/EncryptedSerializer.php

@@ -14,11 +14,6 @@ public function __construct(
         private Encrypter $encrypter,
     ) {}
 
-    public static function for(): false
-    {
-        return false;
-    }
-
     public function serialize(mixed $input): array|string
     {
         if (! is_string($input)) {

packages/database/src/Serializers/HashedSerializer.php

@@ -11,11 +11,6 @@ public function __construct(
         private PasswordHasher $passwordHasher,
     ) {}
 
-    public static function for(): false
-    {
-        return false;
-    }
-
     public function serialize(mixed $input): string
     {
         if (! is_string($input)) {

packages/database/src/Serializers/PrimaryKeySerializer.php

@@ -3,14 +3,21 @@
 namespace Tempest\Database\Serializers;
 
 use Tempest\Database\PrimaryKey;
+use Tempest\Mapper\DynamicSerializer;
 use Tempest\Mapper\Exceptions\ValueCouldNotBeSerialized;
 use Tempest\Mapper\Serializer;
+use Tempest\Reflection\PropertyReflector;
+use Tempest\Reflection\TypeReflector;
 
-final class PrimaryKeySerializer implements Serializer
+final class PrimaryKeySerializer implements Serializer, DynamicSerializer
 {
-    public static function for(): string
+    public static function accepts(PropertyReflector|TypeReflector $input): bool
     {
-        return PrimaryKey::class;
+        $type = $input instanceof PropertyReflector
+            ? $input->getType()
+            : $input;
+
+        return $type->matches(PrimaryKey::class);
     }
 
     public function serialize(mixed $input): string|int

packages/mapper/src/Caster.php

@@ -4,23 +4,8 @@
 
 namespace Tempest\Mapper;
 
-use Closure;
-use Tempest\Reflection\TypeReflector;
-
 interface Caster
 {
-    /**
-     * Declares what this caster can handle.
-     *
-     * Can return:
-     * - A string type name: 'bool', 'int', 'string', etc.
-     * - A class name: DateTime::class
-     * - A Closure for complex matching: fn (TypeReflector $type) => $type->matches(SomeClass::class)
-     *
-     * @return false|string|array|(Closure(TypeReflector):bool)
-     */
-    public static function for(): false|array|string|Closure;
-
     /**
      * Creates an object or a scalar value from the given input.
      */