rework persiting logic

src/Fields/BelongsToMany.php

@@ -21,11 +21,9 @@ public function getRelation(Model $model): EloquentRelation
     /**
      * {@inheritdoc}
      */
-    public function persist(Request $request, Model $model): void
+    public function persist(Request $request, Model $model, mixed $value): void
     {
-        $model->saved(function (Model $model) use ($request): void {
-            $value = $this->getValueForHydrate($request, $model);
-
+        $model->saved(function (Model $model) use ($request, $value): void {
             $this->resolveHydrate($request, $model, $value);
 
             $this->getRelation($model)->sync($value);

src/Fields/Computed.php

@@ -38,7 +38,7 @@ public function searchable(bool|Closure $value = true): static
     /**
      * {@inheritdoc}
      */
-    public function persist(Request $request, Model $model): void
+    public function persist(Request $request, Model $model, mixed $value): void
     {
         //
     }

src/Fields/Field.php

@@ -275,12 +275,10 @@ public function resolveFormat(Request $request, Model $model): mixed
     /**
      * Persist the request value on the model.
      */
-    public function persist(Request $request, Model $model): void
+    public function persist(Request $request, Model $model, mixed $value): void
     {
-        $model->saving(function (Model $model) use ($request): void {
-            $this->resolveHydrate(
-                $request, $model, $this->getValueForHydrate($request, $model)
-            );
+        $model->saving(function (Model $model) use ($request, $value): void {
+            $this->resolveHydrate($request, $model, $value);
         });
     }
 

src/Fields/Fieldset.php

@@ -48,14 +48,12 @@ public function registerRoutes(Router $router): void
     /**
      * {@inheritdoc}
      */
-    public function persist(Request $request, Model $model): void
+    public function persist(Request $request, Model $model, mixed $value): void
     {
-        $this->resolveHydrate($request, $model, $this->getValueForHydrate($request, $model));
-
         $this->resolveFields($request)
             ->authorized($request, $model)
-            ->each(static function (Field $field) use ($request, $model): void {
-                $field->persist($request, $model);
+            ->each(static function (Field $field) use ($request, $model, $value): void {
+                $field->persist($request, $model, $value[$field->getKey()] ?? null);
             });
     }
 

src/Fields/HasOneOrMany.php

@@ -20,13 +20,11 @@ public function getRelation(Model $model): EloquentRelation
     /**
      * {@inheritdoc}
      */
-    public function persist(Request $request, Model $model): void
+    public function persist(Request $request, Model $model, mixed $value): void
     {
-        $model->saved(function (Model $model) use ($request): void {
+        $model->saved(function (Model $model) use ($request, $value): void {
             $relation = $this->getRelation($model);
 
-            $value = $this->getValueForHydrate($request, $model);
-
             $this->resolveHydrate($request, $model, $value);
 
             $models = $model->getRelation($this->getRelationName());

src/Fields/Media.php

@@ -101,11 +101,9 @@ public function store(Request $request, string $path): Medium
     /**
      * {@inheritdoc}
      */
-    public function persist(Request $request, Model $model): void
+    public function persist(Request $request, Model $model, mixed $value): void
     {
-        $model->saved(function (Model $model) use ($request): void {
-            $value = $this->getValueForHydrate($request, $model);
-
+        $model->saved(function (Model $model) use ($request, $value): void {
             $this->resolveHydrate($request, $model, $value);
 
             $this->getRelation($model)->sync($value);

src/Http/Controllers/RelationController.php

@@ -61,7 +61,7 @@ public function store(Request $request, Model $model): RedirectResponse
 
         $request->validate($fields->mapToValidate($request, $item->model));
 
-        $fields->each->persist($request, $item->model);
+        $fields->persist($request, $item->model);
 
         $item->model->save();
 
@@ -116,7 +116,7 @@ public function update(Request $request, Model $model, Model $related): Redirect
 
         $request->validate($fields->mapToValidate($request, $item->model));
 
-        $fields->each->persist($request, $item->model);
+        $fields->persist($request, $item->model);
 
         $item->model->save();
 

src/Http/Controllers/ResourceController.php

@@ -77,7 +77,7 @@ public function store(Request $request): RedirectResponse
 
         $request->validate($fields->mapToValidate($request, $model));
 
-        $fields->each->persist($request, $model);
+        $fields->persist($request, $model);
 
         $model->save();
 
@@ -138,7 +138,7 @@ public function update(Request $request, Model $model): RedirectResponse
 
         $request->validate($fields->mapToValidate($request, $model));
 
-        $fields->each->persist($request, $model);
+        $fields->persist($request, $model);
 
         $model->save();
 

src/Support/Collections/Fields.php

@@ -56,6 +56,18 @@ public function sortable(Request $request): static
         return $this->filter->isSortable($request);
     }
 
+    /**
+     * Persist the request value on the model.
+     */
+    public function persist(Request $request, Model $model): void
+    {
+        $this->each(static function (Field $field) use ($request, $model): void {
+            $field->persist(
+                $request, $model, $field->getValueForHydrate($request, $model)
+            );
+        });
+    }
+
     /**
      * Map the fields to display.
      */

tests/Fields/FieldTest.php

@@ -218,7 +218,11 @@ public function a_field_persists_model_attribute()
 
         $this->assertNull($model->title);
 
-        $this->field->persist($this->app['request'], $model);
+        $this->field->persist(
+            $this->app['request'],
+            $model,
+            $this->field->getValueForHydrate($this->app['request'], $model)
+        );
 
         $model->save();