fix: error props resolution

Author: NeoIsRecursive

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 .cache
-.tempest
+.tempest
+log

README.md

@@ -14,7 +14,7 @@ It should be very familiar if you have used inertia before, with some small diff
 
 - No configuration is done in the middleware, use the the config file, a provider class or your own middleware to set your "globally-shared-props".
 - No automatic redirect back handling in non get requests, since all tempest routes must return a response you have to return your own `Back` response.
-- No `Inertia::defer/lazy/always` method, in favor of just using the prop classes (`new DeferProp/LazyProp/AlwaysProp`) (unless people like that syntax more?)
+- Includes all validation errors for each field by default, instead of just the first one.
 
 We provide an installer that you can use to set up some of the boilerplate code, but you can also do it manually.
 

src/Support/ResolveErrorProps.php

@@ -6,20 +6,26 @@
 
 use Tempest\Http\Session\Session;
 use Tempest\Validation\Rule;
+use Tempest\Validation\Validator;
 
 use function Tempest\Support\arr;
 
 final readonly class ResolveErrorProps
 {
     public function __construct(
         private Session $session,
+        private Validator $validator,
     ) {}
 
     public function resolve(): array
     {
-        return array_map(
-            fn(array $rules) => array_map(fn(Rule $rule) => arr($rule->message())->first(), $rules),
-            $this->session->get(Session::VALIDATION_ERRORS) ?? [],
-        );
+        /** @var Rule[][] */
+        $failingRules = $this->session->get(Session::VALIDATION_ERRORS) ?? [];
+
+        return arr($failingRules)->map(
+            fn(array $rules): array => arr($rules)->map(
+                fn(Rule $rule): string => $this->validator->getErrorMessage($rule),
+            )->toArray(),
+        )->toArray();
     }
 }

tests/Fixtures/Requests/CreatePerson.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace NeoIsRecursive\Inertia\Tests\Fixtures\Requests;
+
+use Tempest\Http\IsRequest;
+use Tempest\Http\Request;
+use Tempest\Validation\Rules\IsBetween;
+use Tempest\Validation\Rules\IsEmail;
+use Tempest\Validation\Rules\IsNotEmptyString;
+use Tempest\Validation\Rules\IsNumeric;
+
+final class CreatePerson implements Request
+{
+    use IsRequest;
+
+    #[IsNotEmptyString]
+    public string $firstName;
+    #[IsNotEmptyString]
+    public string $lastName;
+    #[IsNumeric, IsBetween(min: 0, max: 130)]
+    public int $age;
+    #[IsEmail]
+    public ?string $email;
+}

tests/Fixtures/TestController.php

@@ -9,6 +9,7 @@
 use NeoIsRecursive\Inertia\Inertia;
 use NeoIsRecursive\Inertia\Props\AlwaysProp;
 use NeoIsRecursive\Inertia\Props\LazyProp;
+use NeoIsRecursive\Inertia\Tests\Fixtures\Requests\CreatePerson;
 use Tempest\Http\Responses\Ok;
 use Tempest\Http\Responses\Redirect;
 use Tempest\Router\Get;
@@ -118,4 +119,11 @@ public function testCanMergeProps(Inertia $inertia): InertiaResponse
             ],
         );
     }
+
+    #[Post(uri: '/test-validation-errors')]
+    public function testValidationErrors(CreatePerson $request, Inertia $inertia): Redirect
+    {
+        // If we reach here, the request is valid.
+        return new Redirect(to: uri([static::class, 'index']));
+    }
 }

tests/Integration/ErrorPropsTest.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace NeoIsRecursive\Inertia\Tests\Integration;
+
+use NeoIsRecursive\Inertia\PageData;
+use NeoIsRecursive\Inertia\Tests\Fixtures\TestController;
+use NeoIsRecursive\Inertia\Tests\TestCase;
+use Tempest\Http\Session\Session;
+
+use function Tempest\Router\uri;
+
+final class ErrorPropsTest extends TestCase
+{
+    public function test_error_props(): void
+    {
+        $this->http->post(
+            uri([TestController::class, 'testValidationErrors']),
+            body: [
+                'firstName' => '',
+                'lastName' => '',
+                'email' => 'not-an-email',
+                'age' => -2,
+            ],
+            headers: [
+                'X-Inertia' => 'true',
+                'X-Version' => '1.0',
+            ],
+        );
+
+        $response = $this->http->get(uri([TestController::class, 'index']), headers: [
+            'X-Inertia' => 'true',
+            'X-Version' => '1.0',
+        ]);
+
+        /** @var PageData */
+        $body = $response->body;
+
+        $response->assertHasSession(Session::VALIDATION_ERRORS);
+
+        $this->assertArrayHasKey('errors', $body->props);
+        $this->assertArrayHasKey('firstName', $body->props['errors']);
+        $this->assertCount(1, $body->props['errors']['firstName']);
+        $this->assertCount(2, $body->props['errors']['age']);
+    }
+}