Ensure toJson and toResponse call jsonSerialize

src/Concerns/ResponsableData.php

@@ -58,7 +58,7 @@ public function toResponse($request)
         }
 
         return new JsonResponse(
-            data: $this->transform($contextFactory),
+            data: $this->jsonSerializeWithTransformationContext($contextFactory),
             status: $this->calculateResponseStatus($request),
         );
     }

src/Concerns/TransformableData.php

@@ -14,6 +14,8 @@
 
 trait TransformableData
 {
+    protected null|TransformationContextFactory|TransformationContext $_jsonSerializeContextOnce = null;
+
     public function transform(
         null|TransformationContextFactory|TransformationContext $transformationContext = null,
     ): array {
@@ -51,12 +53,25 @@ public function toArray(): array
 
     public function toJson($options = 0): string
     {
-        return json_encode($this->transform(), $options);
+        return json_encode($this->jsonSerialize(), $options);
     }
 
     public function jsonSerialize(): array
     {
-        return $this->transform();
+        $transformationContext = $this->_jsonSerializeContextOnce;
+
+        if ($this->_jsonSerializeContextOnce) {
+            $this->_jsonSerializeContextOnce = null;
+        }
+
+        return $this->transform($transformationContext);
+    }
+
+    public function jsonSerializeWithTransformationContext(null|TransformationContextFactory|TransformationContext $transformationContext): array
+    {
+        $this->_jsonSerializeContextOnce = $transformationContext;
+
+        return $this->jsonSerialize();
     }
 
     public static function castUsing(array $arguments)

src/Contracts/TransformableData.php

@@ -23,5 +23,7 @@ public function toJson($options = 0): string;
 
     public function jsonSerialize(): array;
 
+    public function jsonSerializeWithTransformationContext(null|TransformationContextFactory|TransformationContext $transformationContext): array;
+
     public static function castUsing(array $arguments);
 }

tests/ResponseTest.php

@@ -0,0 +1,18 @@
+<?php
+
+use Spatie\LaravelData\Data;
+
+it('calls jsonSerialize when toResponse is invoked', function () {
+
+    $data = new class extends Data
+    {
+        public function jsonSerialize(): array
+        {
+            return [
+                'string' => 'Hello from serialize',
+            ];
+        }
+    };
+
+    expect($data->toResponse(request())->getContent())->toBe('{"string":"Hello from serialize"}');
+});

tests/TransformationTest.php

@@ -133,6 +133,21 @@ public function __construct(
         ->toEqual(json_encode(SimpleData::from('Hello')));
 });
 
+it('calls jsonSerialize when toJson is invoked', function () {
+
+    $data = new class extends Data
+    {
+        public function jsonSerialize(): array
+        {
+            return [
+                'string' => 'Hello from serialize',
+            ];
+        }
+    };
+
+    expect($data->toJson())->toBe('{"string":"Hello from serialize"}');
+});
+
 it('can use a custom transformer for a data object and/or data collectable', function () {
     $nestedData = new class (42, 'Hello World') extends Data {
         public function __construct(