Refactoring. Fix nullableTimestamps type

src/Console/Commands/MakeEventSourcingDomainCommand.php

@@ -138,7 +138,7 @@ protected function loadProperties(): void
                 $migration = (new Migration($this->settings->migration));
                 foreach ($migration->properties() as $property) {
                     $this->settings->modelProperties->add($property);
-                    if ($property->type->toString() === 'Carbon') {
+                    if ($property->type->type === 'Carbon') {
                         $this->settings->useCarbon = true;
                     }
                 }

src/Domain/Blueprint/Concerns/HasBlueprintColumnType.php

@@ -23,7 +23,7 @@ protected function columnTypeToBuiltInType(string $type): string
     protected function carbonToBuiltInType(string $type): string
     {
         return match ($type) {
-            'Carbon' => 'date:Y-m-d H:i:s',
+            'Carbon', '?Carbon' => 'date:Y-m-d H:i:s',
             'Carbon:Y-m-d' => 'date:Y-m-d',
             'Carbon:H:i:s' => 'date:H:i:s',
             default => $type

src/Domain/Blueprint/Contracts/BlueprintUnsupportedInterface.php

@@ -37,4 +37,6 @@ interface BlueprintUnsupportedInterface
         'uuidMorphs',
         'ulid',
     ];
+
+    public const IGNORED = [...self::SKIPPED_METHODS, ...self::UNSUPPORTED_COLUMN_TYPES];
 }

src/Domain/PhpParser/Concerns/HasMethodNode.php

@@ -9,7 +9,7 @@ trait HasMethodNode
 {
     protected function enterMethodNode(Node $node, string $method, EnterNode $enterNode): ?Node
     {
-        // Check if Schema::up() method exists
+        // Check if method exists
         if ($node instanceof Node\Stmt\Class_) {
             $currentMethod = $node->getMethod($method);
             if (! $currentMethod) {

src/Domain/PhpParser/Models/MigrationCreateProperty.php

@@ -21,7 +21,7 @@ public function __construct(
             new MigrationCreatePropertyType($type);
 
         if (! $this->name) {
-            $this->name = $this->type->toString();
+            $this->name = $this->type->type;
             $this->type->setAsBuiltInType();
         }
     }

src/Domain/PhpParser/Models/MigrationCreatePropertyType.php

@@ -3,41 +3,31 @@
 namespace Albertoarena\LaravelEventSourcingGenerator\Domain\PhpParser\Models;
 
 use Albertoarena\LaravelEventSourcingGenerator\Domain\Blueprint\Concerns\HasBlueprintColumnType;
+use Albertoarena\LaravelEventSourcingGenerator\Domain\Blueprint\Contracts\BlueprintUnsupportedInterface;
 use Aldemeery\Onion\Onion;
 use Illuminate\Support\Str;
 
 class MigrationCreatePropertyType
 {
     use HasBlueprintColumnType;
 
-    public readonly bool $nullable;
+    public bool $nullable;
 
     public function __construct(
         public string $type,
         bool $nullable = false,
     ) {
+        $this->nullable = false;
         if ($nullable) {
             $this->nullable = $nullable;
         } else {
             // Check if built-in type is nullable (e.g. nullableTimestamps)
             if (Str::startsWith($this->columnTypeToBuiltInType($type), '?')) {
                 $this->nullable = true;
             }
-            // Check if type starts with ? (nullable)
-            else {
-                $this->nullable = Str::startsWith($type, '?');
-                if ($this->nullable) {
-                    $this->type = Str::substr($this->type, 1);
-                }
-            }
         }
     }
 
-    public function toString(): string
-    {
-        return $this->type;
-    }
-
     public function setAsBuiltInType(): void
     {
         $this->type = $this->columnTypeToBuiltInType($this->type);
@@ -67,4 +57,9 @@ public function toProjection(): string
             fn ($type) => Str::replaceFirst('?', '', $type),
         ]))->peel($this->type);
     }
+
+    public function isIgnored(): bool
+    {
+        return in_array($this->type, array_merge(BlueprintUnsupportedInterface::IGNORED));
+    }
 }

src/Domain/PhpParser/Traversers/BlueprintClassNodeVisitor.php

@@ -2,7 +2,6 @@
 
 namespace Albertoarena\LaravelEventSourcingGenerator\Domain\PhpParser\Traversers;
 
-use Albertoarena\LaravelEventSourcingGenerator\Domain\Blueprint\Contracts\BlueprintUnsupportedInterface;
 use Albertoarena\LaravelEventSourcingGenerator\Domain\PhpParser\Concerns\HasSchemaUpNode;
 use Albertoarena\LaravelEventSourcingGenerator\Domain\PhpParser\Models\EnterNode;
 use Albertoarena\LaravelEventSourcingGenerator\Domain\PhpParser\Models\MigrationCreateProperty;
@@ -14,16 +13,9 @@ class BlueprintClassNodeVisitor extends NodeVisitorAbstract
 {
     use HasSchemaUpNode;
 
-    protected array $ignored;
-
     public function __construct(
         protected array &$properties
-    ) {
-        $this->ignored = array_merge(
-            BlueprintUnsupportedInterface::SKIPPED_METHODS,
-            BlueprintUnsupportedInterface::UNSUPPORTED_COLUMN_TYPES
-        );
-    }
+    ) {}
 
     /**
      * @throws UpdateMigrationIsNotSupportedException
@@ -47,7 +39,7 @@ function (Node $node) {
                         // Collect properties from Schema::up method
                         if ($node->expr instanceof Node\Expr\MethodCall) {
                             $property = MigrationCreateProperty::createFromExprMethodCall($node->expr);
-                            if (! in_array($property->type->toString(), $this->ignored)) {
+                            if (! $property->type->isIgnored()) {
                                 $this->properties[$property->name] = $property;
                             }
                         }

tests/Unit/Domain/PhpParser/Models/MigrationCreatePropertyTypeTest.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace Tests\Unit\Domain\PhpParser\Models;
+
+use Albertoarena\LaravelEventSourcingGenerator\Domain\PhpParser\Models\MigrationCreatePropertyType;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\TestCase;
+
+class MigrationCreatePropertyTypeTest extends TestCase
+{
+    #[Test]
+    public function can_create_property_type_from_string()
+    {
+        $obj = new MigrationCreatePropertyType('string');
+        $this->assertEquals('string', $obj->type);
+        $this->assertFalse($obj->nullable);
+        $this->assertEquals('string', $obj->toBuiltInType());
+        $this->assertEquals('string', $obj->toNormalisedBuiltInType());
+        $this->assertEquals('string', $obj->toProjection());
+    }
+
+    #[Test]
+    public function can_create_property_type_from_nullable_type()
+    {
+        $obj = new MigrationCreatePropertyType('?string');
+        $this->assertEquals('?string', $obj->type);
+        $this->assertTrue($obj->nullable);
+        $this->assertEquals('string', $obj->toBuiltInType());
+        $this->assertEquals('string', $obj->toNormalisedBuiltInType());
+        $this->assertEquals('string', $obj->toProjection());
+    }
+
+    #[Test]
+    public function can_create_property_type_from_string_with_nullable()
+    {
+        $obj = new MigrationCreatePropertyType('string', true);
+        $this->assertEquals('string', $obj->type);
+        $this->assertTrue($obj->nullable);
+        $this->assertEquals('string', $obj->toBuiltInType());
+        $this->assertEquals('string', $obj->toNormalisedBuiltInType());
+        $this->assertEquals('string', $obj->toProjection());
+    }
+
+    #[Test]
+    public function can_create_property_type_from_nullable_string_with_nullable()
+    {
+        $obj = new MigrationCreatePropertyType('?string', true);
+        $this->assertEquals('?string', $obj->type);
+        $this->assertTrue($obj->nullable);
+        $this->assertEquals('string', $obj->toBuiltInType());
+        $this->assertEquals('string', $obj->toNormalisedBuiltInType());
+        $this->assertEquals('string', $obj->toProjection());
+    }
+
+    #[Test]
+    public function can_create_property_type_from_nullable_custom_type()
+    {
+        $obj = new MigrationCreatePropertyType('?custom');
+        $this->assertEquals('?custom', $obj->type);
+        $this->assertTrue($obj->nullable);
+        $this->assertEquals('custom', $obj->toBuiltInType());
+        $this->assertEquals('custom', $obj->toNormalisedBuiltInType());
+        $this->assertEquals('custom', $obj->toProjection());
+    }
+
+    #[Test]
+    public function can_create_property_type_from_date()
+    {
+        $obj = new MigrationCreatePropertyType('date');
+        $this->assertEquals('date', $obj->type);
+        $this->assertFalse($obj->nullable);
+        $this->assertEquals('Carbon:Y-m-d', $obj->toBuiltInType());
+        $this->assertEquals('Carbon', $obj->toNormalisedBuiltInType());
+        $this->assertEquals('date:Y-m-d', $obj->toProjection());
+    }
+
+    #[Test]
+    public function can_create_property_type_from_time()
+    {
+        $obj = new MigrationCreatePropertyType('time');
+        $this->assertEquals('time', $obj->type);
+        $this->assertFalse($obj->nullable);
+        $this->assertEquals('Carbon:H:i:s', $obj->toBuiltInType());
+        $this->assertEquals('Carbon', $obj->toNormalisedBuiltInType());
+        $this->assertEquals('date:H:i:s', $obj->toProjection());
+    }
+
+    #[Test]
+    public function can_create_property_type_from_nullableTimestamps()
+    {
+        $obj = new MigrationCreatePropertyType('nullableTimestamps');
+        $this->assertEquals('nullableTimestamps', $obj->type);
+        $this->assertTrue($obj->nullable);
+        $this->assertEquals('Carbon', $obj->toBuiltInType());
+        $this->assertEquals('Carbon', $obj->toNormalisedBuiltInType());
+        $this->assertEquals('date:Y-m-d H:i:s', $obj->toProjection());
+    }
+}