wip

d8vjork · d8vjork · commit 99a04220132c · 2025-05-22T13:57:10.000+02:00
diff --git a/src/Enums/BuiltInType.php b/src/Enums/BuiltInType.php
@@ -8,7 +8,7 @@ enum BuiltInType: string
     case Array = 'array';
     case Iterable = 'iterable';
 
-    case Integer = 'int';
+    case Integer = 'integer';
     case Float = 'float';
 
     case String = 'string';
diff --git a/src/Mapper.php b/src/Mapper.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use OpenSoutheners\LaravelDto\DataTransferObjects\MappingValue;
 use OpenSoutheners\LaravelDto\Enums\BuiltInType;
 use ReflectionClass;
@@ -50,6 +51,7 @@ protected function takeDataFrom(mixed $input): mixed
                 is_object($input->route()) ? $input->route()->parameters() : [],
                 $input instanceof FormRequest ? $input->validated() : $input->all()
             ),
+            $input instanceof Collection => $input->all(),
             is_object($input) => $this->extractProperties($input),
             default => $input,
         };
diff --git a/src/Mappers/BackedEnumDataMapper.php b/src/Mappers/BackedEnumDataMapper.php
diff --git a/src/Mappers/CarbonDataMapper.php b/src/Mappers/CarbonDataMapper.php
diff --git a/src/Mappers/CollectionDataMapper.php b/src/Mappers/CollectionDataMapper.php
@@ -32,34 +32,26 @@ public function assert(MappingValue $mappingValue): bool
      */
     public function resolve(MappingValue $mappingValue): mixed
     {
-        if ($mappingValue->objectClass === Collection::class) {
-            return $mappingValue->data instanceof EloquentCollection
-                ? $mappingValue->data->toBase()
-                : $mappingValue->data;
+        if ($mappingValue->objectClass === EloquentCollection::class) {
+            return $mappingValue->data->toBase();
         }
-
-        $propertyType = reset($mappingValue->types);
-
+        
         if (
             count(array_filter($mappingValue->types, fn (Type $type) => $type->getBuiltinType() === Type::BUILTIN_TYPE_STRING)) > 0
             && ! str_contains($mappingValue->types, ',')
         ) {
             return $mappingValue->data;
         }
 
-        if (is_json_structure($mappingValue->data)) {
-            $collection = Collection::make(json_decode($mappingValue->data, true));
-        } else {
-            $collection = Collection::make(
-                is_array($mappingValue->data)
-                    ? $mappingValue->data
-                    : explode(',', $mappingValue->data)
-            );
-        }
+        $collection = match (true) {
+            is_json_structure($mappingValue->data) => Collection::make(json_decode($mappingValue->data, true)),
+            is_string($mappingValue->data) => Collection::make(explode(',', $mappingValue->data)),
+            default => Collection::make($mappingValue->data),
+        };
 
-        $collectionTypes = $propertyType->getCollectionValueTypes();
+        $collectionTypes = $mappingValue->preferredType->getCollectionValueTypes();
 
-        $preferredCollectionType = reset($collectionTypes);
+        $preferredCollectionType = head($collectionTypes);
         $preferredCollectionTypeClass = $preferredCollectionType ? $preferredCollectionType->getClassName() : null;
 
         $collection = $collection->map(fn ($value) => is_string($value) ? trim($value) : $value)
@@ -75,7 +67,7 @@ public function resolve(MappingValue $mappingValue): mixed
             }
         }
 
-        if ($propertyType->getBuiltinType() === Type::BUILTIN_TYPE_ARRAY) {
+        if ($mappingValue->preferredType->getBuiltinType() === Type::BUILTIN_TYPE_ARRAY) {
             $collection = $collection->all();
         }
 
diff --git a/src/Mappers/GenericObjectDataMapper.php b/src/Mappers/GenericObjectDataMapper.php
diff --git a/src/Mappers/ModelDataMapper.php b/src/Mappers/ModelDataMapper.php
diff --git a/src/Mappers/ObjectDataMapper.php b/src/Mappers/ObjectDataMapper.php
@@ -82,7 +82,7 @@ public function resolve(MappingValue $mappingValue): mixed
                 continue;
             }
 
-            $preferredType = reset($propertyTypes);
+            $preferredType = $propertyTypes[0] ?? null;
             $propertyTypesClasses = array_filter(array_map(fn (Type $type) => $type->getClassName(), $propertyTypes));
             $preferredTypeClass = $preferredType->getClassName();
 
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -7,21 +7,20 @@
 use OpenSoutheners\LaravelDto\Attributes\Validate;
 use OpenSoutheners\LaravelDto\Commands\DtoMakeCommand;
 use OpenSoutheners\LaravelDto\Commands\DtoTypescriptGenerateCommand;
-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;
-use OpenSoutheners\LaravelDto\PropertyMappers\PropertyMapper;
+use OpenSoutheners\LaravelDto\Contracts\RouteTransferableObject;
+use OpenSoutheners\LaravelDto\Mappers;
 use ReflectionClass;
 
 class ServiceProvider extends BaseServiceProvider
 {
     protected static $mappers = [
-        PropertyMappers\CollectionPropertyMapper::class,
-        PropertyMappers\ModelPropertyMapper::class,
-
-        PropertyMappers\CarbonPropertyMapper::class,
-        PropertyMappers\BackedEnumPropertyMapper::class,
-        PropertyMappers\GenericObjectPropertyMapper::class,
-        PropertyMappers\ObjectPropertyMapper::class,
+        Mappers\CollectionDataMapper::class,
+        Mappers\ModelDataMapper::class,
 
+        Mappers\CarbonDataMapper::class,
+        Mappers\BackedEnumDataMapper::class,
+        Mappers\GenericObjectDataMapper::class,
+        Mappers\ObjectDataMapper::class,
     ];
 
     /**
@@ -40,7 +39,7 @@ public function boot()
         }
 
         $this->app->beforeResolving(
-            DataTransferObject::class,
+            RouteTransferableObject::class,
             function ($dataClass, $parameters, $app) {
                 /** @var \Illuminate\Foundation\Application $app */
                 $app->scoped($dataClass, function () use ($dataClass, $app) {
@@ -70,7 +69,7 @@ public function register()
     /**
      * Register new dynamic mappers.
      */
-    public function registerMapper(string|array $mapper, bool $replacing = false): void
+    public static function registerMapper(string|array $mapper, bool $replacing = false): void
     {
         $mappers = (array) $mapper;
 
@@ -89,7 +88,7 @@ public static function getMappers(): array
         foreach (static::$mappers as $mapper) {
             $mapperInstance = new $mapper;
 
-            if ($mapperInstance instanceof PropertyMapper) {
+            if ($mapperInstance instanceof Mappers\DataMapper) {
                 $mappers[] = $mapperInstance;
             }
         }
diff --git a/tests/Unit/DataTransferObjectTest.php b/tests/Unit/DataTransferObjectTest.php
@@ -8,7 +8,8 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Mockery;
-use OpenSoutheners\LaravelDto\ObjectMapper;
+use OpenSoutheners\LaravelDto\Mappers;
+use OpenSoutheners\LaravelDto\ServiceProvider;
 use PHPUnit\Framework\TestCase;
 use Workbench\App\DataTransferObjects\CreateComment;
 use Workbench\App\DataTransferObjects\CreateManyPostData;
@@ -23,13 +24,14 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        ObjectMapper::registerMapper([
-            new PropertyMappers\ModelPropertyMapper,
-            new PropertyMappers\CollectionPropertyMapper,
-            new PropertyMappers\ObjectPropertyMapper,
-            new PropertyMappers\GenericObjectPropertyMapper,
-            new PropertyMappers\CarbonPropertyMapper,
-            new PropertyMappers\BackedEnumPropertyMapper,
+        ServiceProvider::registerMapper([
+            Mappers\CollectionDataMapper::class,
+            Mappers\ModelDataMapper::class,
+    
+            Mappers\CarbonDataMapper::class,
+            Mappers\BackedEnumDataMapper::class,
+            Mappers\GenericObjectDataMapper::class,
+            Mappers\ObjectDataMapper::class,
         ]);
 
         $mockedConfig = Mockery::mock(Repository::class);
@@ -245,8 +247,8 @@ public function test_data_transfer_object_date_properties_does_not_get_mapped_fr
         ])->to(CreatePostData::class);
 
         $this->assertTrue($data->dates instanceof Collection);
-        $this->assertFalse($data->dates->first() instanceof Carbon);
-        $this->assertIsString($data->dates->first());
+        $this->assertTrue($data->dates->first() instanceof Carbon);
+        $this->assertTrue($data->dates->last() instanceof Carbon);
     }
 
     public function test_data_transfer_object_sent_into_another_as_collected_will_be_mapped_from_array()
diff --git a/workbench/app/DataTransferObjects/CreateComment.php b/workbench/app/DataTransferObjects/CreateComment.php
@@ -2,9 +2,7 @@
 
 namespace Workbench\App\DataTransferObjects;
 
-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;
-
-class CreateComment implements DataTransferObject
+class CreateComment
 {
     public function __construct(
         public string $content,
diff --git a/workbench/app/DataTransferObjects/CreateManyPostData.php b/workbench/app/DataTransferObjects/CreateManyPostData.php
@@ -3,9 +3,8 @@
 namespace Workbench\App\DataTransferObjects;
 
 use Illuminate\Support\Collection;
-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;
 
-class CreateManyPostData implements DataTransferObject
+class CreateManyPostData
 {
     /**
      * @param  \Illuminate\Support\Collection<\Workbench\App\DataTransferObjects\CreatePostData>  $posts
diff --git a/workbench/app/DataTransferObjects/CreatePostData.php b/workbench/app/DataTransferObjects/CreatePostData.php
@@ -5,13 +5,13 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use OpenSoutheners\LaravelDto\Attributes\Authenticated;
-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;
+use OpenSoutheners\LaravelDto\Contracts\RouteTransferableObject;
 use stdClass;
 use Workbench\App\Enums\PostStatus;
 use Workbench\App\Models\Post;
 use Workbench\App\Models\User;
 
-class CreatePostData implements DataTransferObject
+class CreatePostData implements RouteTransferableObject
 {
     public mixed $authorEmail = 'me@d8vjork.com';
 
diff --git a/workbench/app/DataTransferObjects/UpdatePostData.php b/workbench/app/DataTransferObjects/UpdatePostData.php
@@ -2,10 +2,9 @@
 
 namespace Workbench\App\DataTransferObjects;
 
-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;
 use Workbench\App\Models\Post;
 
-class UpdatePostData implements DataTransferObject
+class UpdatePostData
 {
     /**
      * @param  string[]  $tags
diff --git a/workbench/app/DataTransferObjects/UpdatePostWithDefaultData.php b/workbench/app/DataTransferObjects/UpdatePostWithDefaultData.php
@@ -4,12 +4,12 @@
 
 use OpenSoutheners\LaravelDto\Attributes\Authenticated;
 use OpenSoutheners\LaravelDto\Attributes\ResolveModel;
-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;
+use OpenSoutheners\LaravelDto\Contracts\RouteTransferableObject;
 use Workbench\App\Models\Post;
 use Workbench\App\Models\Tag;
 use Workbench\App\Models\User;
 
-class UpdatePostWithDefaultData implements DataTransferObject
+class UpdatePostWithDefaultData implements RouteTransferableObject
 {
     /**
      * @param  string[]  $tags
diff --git a/workbench/app/DataTransferObjects/UpdatePostWithRouteBindingData.php b/workbench/app/DataTransferObjects/UpdatePostWithRouteBindingData.php
@@ -8,7 +8,7 @@
 use OpenSoutheners\LaravelDto\Attributes\Authenticated;
 use OpenSoutheners\LaravelDto\Attributes\ModelWith;
 use OpenSoutheners\LaravelDto\Attributes\Validate;
-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;
+use OpenSoutheners\LaravelDto\Contracts\RouteTransferableObject;
 use stdClass;
 use Workbench\App\Enums\PostStatus;
 use Workbench\App\Http\Requests\PostUpdateFormRequest;
@@ -17,7 +17,7 @@
 
 #[AsType('UpdatePostFormData')]
 #[Validate(PostUpdateFormRequest::class)]
-class UpdatePostWithRouteBindingData implements DataTransferObject
+class UpdatePostWithRouteBindingData implements RouteTransferableObject
 {
     /**
      * @param  \Illuminate\Support\Collection<\Workbench\App\Models\Tag>|null  $tags
diff --git a/workbench/app/DataTransferObjects/UpdatePostWithTags.php b/workbench/app/DataTransferObjects/UpdatePostWithTags.php
@@ -3,10 +3,9 @@
 namespace Workbench\App\DataTransferObjects;
 
 use Illuminate\Support\Collection;
-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;
 use Workbench\App\Models\Post;
 
-class UpdatePostWithTags implements DataTransferObject
+class UpdatePostWithTags
 {
     public function __construct(
         public Post $post,
diff --git a/workbench/app/DataTransferObjects/UpdateTagData.php b/workbench/app/DataTransferObjects/UpdateTagData.php
@@ -6,15 +6,15 @@
 use OpenSoutheners\LaravelDto\Attributes\Authenticated;
 use OpenSoutheners\LaravelDto\Attributes\ResolveModel;
 use OpenSoutheners\LaravelDto\Attributes\Validate;
-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;
+use OpenSoutheners\LaravelDto\Contracts\RouteTransferableObject;
 use Workbench\App\Http\Requests\TagUpdateFormRequest;
 use Workbench\App\Models\Film;
 use Workbench\App\Models\Post;
 use Workbench\App\Models\Tag;
 use Workbench\App\Models\User;
 
 #[Validate(TagUpdateFormRequest::class)]
-class UpdateTagData implements DataTransferObject
+class UpdateTagData implements RouteTransferableObject
 {
     /**
      * @param  \Illuminate\Support\Collection<\Workbench\App\Models\Post|\Workbench\App\Models\Film>  $taggable

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function resolve(MappingValue $mappingValue): mixed`
`82`	`82`	`continue;`
`83`	`83`	`}`
`84`	`84`
`85`		`- $preferredType = reset($propertyTypes);`
	`85`	`+ $preferredType = $propertyTypes[0] ?? null;`
`86`	`86`	`$propertyTypesClasses = array_filter(array_map(fn (Type $type) => $type->getClassName(), $propertyTypes));`
`87`	`87`	`$preferredTypeClass = $preferredType->getClassName();`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Workbench\App\DataTransferObjects;`
`4`	`4`
`5`		`-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;`
`6`		`-`
`7`		`-class CreateComment implements DataTransferObject`
	`5`	`+class CreateComment`
`8`	`6`	`{`
`9`	`7`	`public function __construct(`
`10`	`8`	`public string $content,`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,8 @@`
`3`	`3`	`namespace Workbench\App\DataTransferObjects;`
`4`	`4`
`5`	`5`	`use Illuminate\Support\Collection;`
`6`		`-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;`
`7`	`6`
`8`		`-class CreateManyPostData implements DataTransferObject`
	`7`	`+class CreateManyPostData`
`9`	`8`	`{`
`10`	`9`	`/**`
`11`	`10`	`* @param \Illuminate\Support\Collection<\Workbench\App\DataTransferObjects\CreatePostData> $posts`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Workbench\App\DataTransferObjects;`
`4`	`4`
`5`		`-use OpenSoutheners\LaravelDto\Contracts\DataTransferObject;`
`6`	`5`	`use Workbench\App\Models\Post;`
`7`	`6`
`8`		`-class UpdatePostData implements DataTransferObject`
	`7`	`+class UpdatePostData`
`9`	`8`	`{`
`10`	`9`	`/**`
`11`	`10`	`* @param string[] $tags`