v2.0.07

- Fix `EloquentPhp::class` for `\` duplicates
- Fix `EloquentCast::class` with `UnitEnum` and public constants into enum classes

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "kiwilan/typescriptable-laravel",
   "description": "PHP package for Laravel to type Eloquent models, routes, Spatie Settings with autogenerated TypeScript. If you want to use some helpers with Inertia, you can install associated NPM package.",
-  "version": "2.0.06",
+  "version": "2.0.07",
   "keywords": [
     "kiwilan",
     "laravel",

src/Typed/Eloquent/Output/EloquentPhp.php

@@ -131,6 +131,8 @@ private function setField(EloquentProperty $property, bool $isLast): string
             $field .= PHP_EOL;
         }
 
+        $field = str_replace('\\\\', '\\', $field);
+
         return $field;
     }
 

src/Typed/Eloquent/Utils/EloquentCast.php

@@ -2,8 +2,10 @@
 
 namespace Kiwilan\Typescriptable\Typed\Eloquent\Utils;
 
+use BackedEnum;
 use Kiwilan\Typescriptable\Typed\Eloquent\EloquentItem;
 use ReflectionClass;
+use UnitEnum;
 
 class EloquentCast
 {
@@ -140,9 +142,15 @@ public static function enumsToTs(array $enum): string
     private function setEnums(ReflectionClass $reflector): array
     {
         $enums = [];
-
-        foreach ($reflector->getConstants() as $name => $enum) {
-            $enums[$name] = is_string($enum) ? "'{$enum}'" : $enum->value;
+        $constants = $reflector->getConstants();
+        $constants = array_filter($constants, fn ($value) => is_object($value));
+
+        foreach ($constants as $name => $enum) {
+            if ($enum instanceof BackedEnum) {
+                $enums[$name] = $enum->value;
+            } elseif ($enum instanceof UnitEnum) {
+                $enums[$name] = $enum->name;
+            }
         }
 
         return $enums;

tests/Data/Enums/StoryFormatEnum.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Kiwilan\Typescriptable\Tests\Data\Enums;
+
+/**
+ * List of available formats.
+ */
+enum StoryFormatEnum
+{
+    public const ALLOWED_EXTENSIONS = ['mp3', 'm4b', 'pdf', 'cb7', 'cba', 'cbr', 'cbt', 'cbz', 'epub'];
+
+    case unknown;
+
+    case audio;
+
+    case pdf;
+
+    case cba;
+
+    case epub;
+}

tests/Data/Models/Story.php

@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Kiwilan\Typescriptable\Tests\Data\Enums\PublishStatusEnum;
+use Kiwilan\Typescriptable\Tests\Data\Enums\StoryFormatEnum;
 
 class Story extends Model
 {
@@ -22,6 +23,7 @@ class Story extends Model
         'picture',
         'published_at',
         'status',
+        'format',
     ];
 
     protected $appends = [
@@ -35,6 +37,7 @@ class Story extends Model
     protected $casts = [
         'published_at' => 'datetime',
         'status' => PublishStatusEnum::class,
+        'format' => StoryFormatEnum::class,
     ];
 
     /**

tests/Data/database/migrations/create_models_tables.php

@@ -33,6 +33,7 @@ public function up(): void
             $table->text('picture')->nullable();
             $table->string('status')->default(PublishStatusEnum::draft->value);
             $table->dateTime('published_at')->nullable();
+            $table->string('format')->nullable();
 
             $table->string('meta_title')->nullable();
             $table->string('meta_description')->nullable();