Make types separate from attributes

Author: tobyzerner

src/Laravel/EloquentResource.php

@@ -18,10 +18,11 @@
 use Tobyz\JsonApiServer\Resource\Paginatable;
 use Tobyz\JsonApiServer\Resource\Resource;
 use Tobyz\JsonApiServer\Resource\Updatable;
-use Tobyz\JsonApiServer\Schema\Field\DateTime;
+use Tobyz\JsonApiServer\Schema\Field\Attribute;
 use Tobyz\JsonApiServer\Schema\Field\Field;
 use Tobyz\JsonApiServer\Schema\Field\Relationship;
 use Tobyz\JsonApiServer\Schema\Field\ToMany;
+use Tobyz\JsonApiServer\Schema\Type\DateTime;
 
 abstract class EloquentResource extends Resource implements
     Findable,
@@ -151,7 +152,11 @@ public function setValue(object $model, Field $field, mixed $value, Context $con
         // dates in the database. Since the API can receive dates in any
         // timezone, we will need to convert it to the app's configured
         // timezone ourselves before storage.
-        if ($field instanceof DateTime && $value instanceof \DateTimeInterface) {
+        if (
+            $field instanceof Attribute &&
+            $field->type instanceof DateTime &&
+            $value instanceof \DateTimeInterface
+        ) {
             $value = \DateTime::createFromInterface($value)->setTimezone(
                 new \DateTimeZone(config('app.timezone')),
             );

src/Schema/Field/Attribute.php

@@ -2,6 +2,52 @@
 
 namespace Tobyz\JsonApiServer\Schema\Field;
 
+use Tobyz\JsonApiServer\Context;
+use Tobyz\JsonApiServer\Schema\Type\TypeInterface;
+
 class Attribute extends Field
 {
+    public ?TypeInterface $type = null;
+
+    public function type(?TypeInterface $type): static
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function serializeValue(mixed $value, Context $context): mixed
+    {
+        if ($this->nullable && $value === null) {
+            return null;
+        }
+
+        if ($this->type) {
+            $value = $this->type->serialize($value);
+        }
+
+        return parent::serializeValue($value, $context);
+    }
+
+    public function deserializeValue(mixed $value, Context $context): mixed
+    {
+        if ($this->nullable && $value === null) {
+            return null;
+        }
+
+        if ($this->type) {
+            $value = $this->type->deserialize($value);
+        }
+
+        return parent::deserializeValue($value, $context);
+    }
+
+    public function validateValue(mixed $value, callable $fail, Context $context): void
+    {
+        if ($value !== null && $this->type) {
+            $this->type->validate($value, $fail);
+        }
+
+        parent::validateValue($value, $fail, $context);
+    }
 }

src/Schema/Field/Boolean.php

@@ -3,9 +3,17 @@
 namespace Tobyz\JsonApiServer\Schema\Field;
 
 use Tobyz\JsonApiServer\Context;
+use Tobyz\JsonApiServer\Schema\Type\Boolean;
 
-class BooleanDateTime extends Boolean
+class BooleanDateTime extends Attribute
 {
+    public function __construct(string $name)
+    {
+        parent::__construct($name);
+
+        $this->type(Boolean::make());
+    }
+
     public function setValue(mixed $model, mixed $value, Context $context): void
     {
         parent::setValue($model, $value ? new \DateTime() : null, $context);