Add the ability to add messages to validations

Author: AngryMoustache

src/Form.php

@@ -63,19 +63,21 @@ public function getFieldStackFromField(Field $field)
     public function validation($stack = null, $skipChecks = false): array
     {
         $rules = collect([]);
+        $messages = collect([]);
         $fields = $stack ?? collect($this->fieldStack());
 
-        $fields->each(function (Field $value) use (&$rules, $skipChecks) {
+        $fields->each(function (Field $value) use (&$rules, &$messages, $skipChecks) {
             if ($skipChecks || $value->conditionalCheck()) {
-                if ($value->containsFile) {
-                    $rules->put('files.' . $value->getName(), $value->rules ?? '');
-                } else {
-                    $rules->put('fields.' . $value->getName(), $value->rules ?? '');
-                }
+                $target = ($value->containsFile ? 'files' : 'fields');
+                $rules->put($target . '.' . $value->getName(), $value->rules ?? '');
+                $messages->put($target . '.' . $value->getName(), $value->validationMessages ?? '');
             }
         });
 
-        return $rules->toArray();
+        return [
+            'rules' => $rules->toArray(),
+            'messages' => $messages->filter()->toArray(),
+        ];
     }
 
     public function stepValidation($step): array

src/FormController.php

@@ -28,6 +28,7 @@ class FormController extends Component
     public array $syncs = [];
     public array $flashes = [];
 
+    protected array $messages = [];
     protected null | Form $form = null;
     protected array $fieldStack = [];
 
@@ -99,7 +100,10 @@ public function setFields($doCheck = true)
     // Get and set the validation rules
     public function setValidation()
     {
-        $this->validation = $this->getForm()->validation();
+        $validation = $this->getForm()->validation();
+
+        $this->validation = $validation['rules'] ?? [];
+        $this->messages = $validation['messages'] ?? [];
     }
 
     public function getForm()

src/Traits/HandleSteps.php

@@ -27,6 +27,10 @@ public function goToStep($index)
     public function validateStep($step = null)
     {
         $validation = $this->getForm()->stepValidation($step ?? $this->step);
-        $this->validate($this->parseNamespaceRules($validation));
+
+        $this->validate(
+            $this->parseNamespaceRules($validation['rules']),
+            $validation['messages'],
+        );
     }
 }