updates hybridly, fixes stuff

.nvmrc

@@ -0,0 +1 @@
+20.12.2

app/Data/DashboardData.php

@@ -5,31 +5,30 @@
 namespace App\Data;
 
 use App\Models\User;
-use Spatie\LaravelData\Attributes\DataCollectionOf;
+use Illuminate\Support\Collection;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Data;
-use Spatie\LaravelData\DataCollection;
 use Spatie\LaravelData\Mappers\CamelCaseMapper;
 
 #[MapOutputName(CamelCaseMapper::class)]
 class DashboardData extends Data
 {
     public function __construct(
-        #[DataCollectionOf(TagData::class)]
-        public DataCollection $tags,
-        #[DataCollectionOf(StarData::class)]
-        public DataCollection $stars,
-        #[DataCollectionOf(SmartFilterData::class)]
-        public DataCollection $smart_filters,
+        /** @var Collection<int, TagData> */
+        public Collection $tags,
+        /** @var Collection<int, StarData> */
+        public Collection $stars,
+        /** @var Collection<int, SmartFilterData> */
+        public Collection $smart_filters,
     ) {
     }
 
     public static function fromModel(User $user): self
     {
         return new self(
-            TagData::collection($user->tags()->withStarCount()->get()),
-            StarData::collection($user->stars()->with('tags')->get()),
-            SmartFilterData::collection($user->smartFilters),
+            TagData::collect($user->tags()->withStarCount()->get()),
+            StarData::collect($user->stars()->with('tags')->get()),
+            SmartFilterData::collect($user->smartFilters),
         );
     }
 }

app/Data/StarData.php

@@ -4,10 +4,9 @@
 
 namespace App\Data;
 
-use Spatie\LaravelData\Attributes\DataCollectionOf;
+use Illuminate\Support\Collection;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Data;
-use Spatie\LaravelData\DataCollection;
 use Spatie\LaravelData\Mappers\CamelCaseMapper;
 
 class StarData extends Data
@@ -19,8 +18,8 @@ public function __construct(
         public int $repo_id,
         public ?string $notes,
         public ?array $meta,
-        #[DataCollectionOf(TagData::class)]
-        public readonly DataCollection $tags,
+        /** @var Collection<int, TagData> */
+        public readonly Collection $tags,
     ) {
     }
 }

app/Data/UserData.php

@@ -7,10 +7,9 @@
 use App\Data\Enums\Ability;
 use App\Data\Enums\Limit;
 use App\Models\User;
-use Spatie\LaravelData\Attributes\DataCollectionOf;
+use Illuminate\Support\Collection;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Data;
-use Spatie\LaravelData\DataCollection;
 use Spatie\LaravelData\Mappers\CamelCaseMapper;
 use Spatie\TypeScriptTransformer\Attributes\RecordTypeScriptType;
 
@@ -28,8 +27,8 @@ public function __construct(
         public readonly ?string $avatar,
         public readonly ?bool $is_sponsor,
         public readonly UserSettingsData $settings,
-        #[DataCollectionOf(UserFlagData::class)]
-        public readonly DataCollection $flags,
+        /** @var Collection<int, UserFlagData> */
+        public readonly Collection $flags,
         #[RecordTypeScriptType(Limit::class, 'int')]
         public readonly array $limits,
         #[RecordTypeScriptType(Ability::class, 'bool')]
@@ -50,7 +49,7 @@ public static function fromModel(User $user): self
             $user->avatar,
             $user->is_sponsor,
             UserSettingsData::from($user->settings),
-            UserFlagData::collection($user->flags),
+            UserFlagData::collect($user->flags),
             $user->limits(),
             [
                 'create_tag' => $user->can('create', Tag::class),

composer.json

@@ -14,12 +14,12 @@
     "graham-campbell/github": "^12.2",
     "guzzlehttp/guzzle": "^7.2",
     "http-interop/http-factory-guzzle": "^1.0",
-    "hybridly/laravel": "^0.3.1",
+    "hybridly/laravel": "^0.7.3",
     "laravel/framework": "^10.10",
     "laravel/sanctum": "^3.2",
     "laravel/socialite": "^5.6",
     "laravel/tinker": "^2.8",
-    "spatie/laravel-data": "^3.6"
+    "spatie/laravel-data": "^4.0"
   },
   "require-dev": {
     "barryvdh/laravel-debugbar": "^3.8",