Merge pull request #41 from bnzo/wireable

Convert Wireable DTO with deeply nested objects to arrays

Author: WendellAdriel

src/Concerns/Wireable.php

@@ -11,6 +11,8 @@ trait Wireable
     public static function fromLivewire($value)
     {
         if (is_array($value)) {
+            json_decode(json_encode($value), true);
+
             return new static($value);
         }
 
@@ -27,6 +29,10 @@ public static function fromLivewire($value)
 
     public function toLivewire(): array
     {
-        return $this->toArray();
+        $fullArray = json_decode(json_encode($this->toArray()), true);
+
+        $filteredArray = array_filter($fullArray, fn ($value) => ! is_null($value));
+
+        return $filteredArray;
     }
 }

tests/Datasets/WireableDTO.php

@@ -4,6 +4,9 @@
 
 namespace WendellAdriel\ValidatedDTO\Tests\Datasets;
 
+use Illuminate\Support\Collection;
+use WendellAdriel\ValidatedDTO\Casting\CollectionCast;
+use WendellAdriel\ValidatedDTO\Casting\DTOCast;
 use WendellAdriel\ValidatedDTO\Casting\IntegerCast;
 use WendellAdriel\ValidatedDTO\Casting\StringCast;
 use WendellAdriel\ValidatedDTO\Concerns\Wireable;
@@ -17,6 +20,10 @@ class WireableDTO extends SimpleDTO
 
     public ?int $age;
 
+    public ?SimpleNameDTO $simple_name_dto;
+
+    public ?Collection $simple_names_collection;
+
     protected function defaults(): array
     {
         return [];
@@ -27,6 +34,8 @@ protected function casts(): array
         return [
             'name' => new StringCast(),
             'age' => new IntegerCast(),
+            'simple_name_dto' => new DTOCast(SimpleNameDTO::class),
+            'simple_names_collection' => new CollectionCast(new DTOCast(SimpleNameDTO::class)),
         ];
     }
 }

tests/Unit/WireableTest.php

@@ -2,8 +2,10 @@
 
 declare(strict_types=1);
 
+use Illuminate\Support\Collection;
 use function Pest\Faker\faker;
 use WendellAdriel\ValidatedDTO\SimpleDTO;
+use WendellAdriel\ValidatedDTO\Tests\Datasets\SimpleNameDTO;
 use WendellAdriel\ValidatedDTO\Tests\Datasets\WireableDTO;
 
 beforeEach(function () {
@@ -21,6 +23,55 @@
         ->toBe($wireableDTO->toArray());
 });
 
+it('validates that a Wireable DTO with a nested DTO will return the correct data for the toLivewire method', function () {
+    $data = [
+        'name' => $this->name,
+        'age' => $this->age,
+        'simple_name_dto' => [
+            'first_name' => $this->name,
+            'last_name' => $this->name,
+        ],
+    ];
+
+    $wireableDTO = new WireableDTO($data);
+
+    expect($wireableDTO)
+        ->toBeInstanceOf(SimpleDTO::class)
+        ->and($wireableDTO->simple_name_dto)
+        ->toBeInstanceOf(SimpleNameDTO::class)
+        ->and($wireableDTO->toLivewire())
+        ->toBe($data);
+});
+
+it('validates that a Wireable DTO with a DTO Collection will return the correct data for the toLivewire method', function () {
+    $simple_name = [
+        'first_name' => $this->name,
+        'last_name' => $this->name,
+    ];
+
+    $simple_name_2 = [
+        'first_name' => $this->name,
+        'last_name' => $this->name,
+    ];
+
+    $data = [
+        'name' => $this->name,
+        'age' => $this->age,
+        'simple_names_collection' => [$simple_name, $simple_name_2],
+    ];
+
+    $wireableDTO = new WireableDTO($data);
+
+    expect($wireableDTO)
+        ->toBeInstanceOf(SimpleDTO::class)
+        ->and($wireableDTO->simple_names_collection)
+        ->toBeInstanceOf(Collection::class)
+        ->and($wireableDTO->simple_names_collection->first())
+        ->toBeInstanceOf(SimpleNameDTO::class)
+        ->and($wireableDTO->toLivewire())
+        ->toBe($data);
+});
+
 it('validates that a Wireable DTO can be instantiated with the fromLivewire method with array', function () {
     $wireableDTO = WireableDTO::fromLivewire(['name' => $this->name, 'age' => $this->age]);