Call user serializer before type serializer

Fixes #91

Author: tobyzerner

src/Schema/Field/Attribute.php

@@ -22,11 +22,13 @@ public function serializeValue(mixed $value, Context $context): mixed
             return null;
         }
 
+        $value = parent::serializeValue($value, $context);
+
         if ($this->type) {
             $value = $this->type->serialize($value);
         }
 
-        return parent::serializeValue($value, $context);
+        return $value;
     }
 
     public function deserializeValue(mixed $value, Context $context): mixed

tests/feature/FieldGetTest.php

@@ -5,6 +5,7 @@
 use Tobyz\JsonApiServer\Endpoint\Show;
 use Tobyz\JsonApiServer\JsonApi;
 use Tobyz\JsonApiServer\Schema\Field\Attribute;
+use Tobyz\JsonApiServer\Schema\Type\Str;
 use Tobyz\Tests\JsonApiServer\AbstractTestCase;
 use Tobyz\Tests\JsonApiServer\MockResource;
 
@@ -71,4 +72,32 @@ public function test_use_serializer_if_provided()
             $response->getBody(),
         );
     }
+
+    public function test_use_serializer_before_type()
+    {
+        $this->api->resource(
+            new MockResource(
+                'users',
+                models: [(object) ['id' => '1', 'value' => 1]],
+                endpoints: [Show::make()],
+                fields: [
+                    Attribute::make('value')
+                        ->type(Str::make())
+                        ->serialize(function ($value) {
+                            if (is_string($value)) {
+                                $this->fail('value should not yet be a string');
+                            }
+                            return $value + 1;
+                        }),
+                ],
+            ),
+        );
+
+        $response = $this->api->handle($this->buildRequest('GET', '/users/1'));
+
+        $this->assertJsonApiDocumentSubset(
+            ['data' => ['attributes' => ['value' => '2']]],
+            $response->getBody(),
+        );
+    }
 }

tests/feature/NumberTest.php

@@ -56,7 +56,7 @@ public function test_validates_integer()
 
         $this->expectException(UnprocessableEntityException::class);
 
-        $response = $this->api->handle(
+        $this->api->handle(
             $this->buildRequest('POST', '/users')->withParsedBody([
                 'data' => ['type' => 'users', 'attributes' => ['count' => 'hello']],
             ]),