refactor: ensure optional types are processed correctly

Author: mxaGianluca

src/Converters/AbstractConverter.php

@@ -43,7 +43,7 @@ protected function runModifiers(TypescriptType $type, $instance): TypescriptType
             $instance = app($modifier)->modify($instance);
             $modifiedType = app(static::class)->handle($instance);
 
-            $type = $type->merge($modifiedType);
+            $type = $type->merge($modifiedType, $type->listProperties());
         }
 
         return $type;

src/Values/TypescriptType.php

@@ -45,15 +45,15 @@ public function getClass(): string
         return $this->class;
     }
 
-    public function merge(TypescriptType $type): self
+    public function merge(TypescriptType $type, Collection $originalProperties): self
     {
         $newProperties = $type->listProperties()
             ->filter(fn ($prop) => ! $this->listProperties()->contains($prop));
 
         $this->addProperties($newProperties);
 
         $optionalProperties = $this->listProperties()
-            ->filter(fn ($prop) => ! $type->listProperties()->contains($prop));
+            ->filter(fn ($prop) => ! $originalProperties->contains($prop));
 
         $optionalProperties->each(fn ($prop) => $prop->setOptional(true));
 

tests/Actions/ConvertEntitiesTest.php

@@ -45,5 +45,5 @@
 
     $hiddenProperty = $type->listProperties()->last();
 
-    expect($hiddenProperty->getName())->toBe('hidden');
+    expect($hiddenProperty->getName())->toBe('hidden?');
 });

tests/Converters/ResourceConverterTest.php

@@ -3,6 +3,8 @@
 use Vagebond\Runtype\Converters\ResourceConverter;
 use Vagebond\Runtype\Processors\ResourceProcessor;
 use Vagebond\Runtype\Tests\Fakes\Models\User;
+use Vagebond\Runtype\Tests\Fakes\Modifiers\FeatureModifier;
+use Vagebond\Runtype\Tests\Fakes\Resources\FeatureResource;
 use Vagebond\Runtype\Tests\Fakes\Resources\ProductResource;
 use Vagebond\Runtype\Tests\Fakes\Resources\ProductResourceCollection;
 use Vagebond\Runtype\Tests\Fakes\Resources\UserResource;
@@ -55,4 +57,19 @@
     expect($userBoundProperty->getType())->toBe('{edit:boolean}');
 });
 
-// TODO: Add tests for modifiers.
+it('can detect optional properties', function () {
+    $config = getConfig();
+    $config->modifiers([
+        FeatureResource::class => FeatureModifier::class,
+    ]);
+
+    $instance = (new ResourceProcessor($config))->process(FeatureResource::class);
+    $processed = (new ResourceConverter($config))->convert($instance);
+
+    expect($processed->getName())->toBe('FeatureResourceType');
+
+    $modifiedProperty = $processed->listProperties()->last();
+
+    expect($modifiedProperty->getName())->toBe('hidden?');
+    expect($modifiedProperty->getType())->toBe('boolean');
+});

tests/Values/TypescriptTypeTest.php

@@ -50,8 +50,10 @@
         ),
     ]);
 
-    $type = $type->merge($mergeType);
+    $type = $type->merge($mergeType, $type->listProperties());
 
-    expect($type->listProperties()->firstWhere(fn ($property) => $property->getName() === 'address'))->not->toBeNull();
-    expect($type->listProperties()->firstWhere(fn ($property) => $property->getName() === 'age?')->isOptional())->toBeTrue();
+    expect($type->listProperties()->firstWhere(fn ($property) => $property->getName() === 'address?'))->not->toBeNull();
+    expect($type->listProperties()->firstWhere(fn ($property) => $property->getName() === 'address?')->isOptional())->toBeTrue();
+    expect($type->listProperties()->firstWhere(fn ($property) => $property->getName() === 'age')->isOptional())->toBeFalse();
+    expect($type->listProperties()->firstWhere(fn ($property) => $property->getName() === 'name')->isOptional())->toBeFalse();
 });