refactor: update map field to use new rules utility class

Author: lindyhopchris

src/Fields/Map.php

@@ -24,6 +24,7 @@
 use LaravelJsonApi\Eloquent\Fields\Concerns\Hideable;
 use LaravelJsonApi\Eloquent\Fields\Concerns\IsReadOnly;
 use LaravelJsonApi\Eloquent\Fields\Concerns\OnRelated;
+use LaravelJsonApi\Validation\Fields\FieldRuleMap;
 use LaravelJsonApi\Validation\Fields\IsValidated;
 use LogicException;
 
@@ -222,43 +223,17 @@ public function serialize(object $model)
      */
     public function rulesForCreation(?Request $request): ?array
     {
-        $fields = [];
-        $rules = [];
-
-        /** @var AttributeContract $attr */
-        foreach ($this->map as $attr) {
-            if ($attr instanceof IsValidated) {
-                $fields[] = $name = $attr->name();
-                $rules[$name] = $attr->rulesForCreation($request);
-            }
-        }
-
-        return !empty($fields) ? [
-            '.' => 'array:' . implode(',', $fields),
-            ...$rules,
-        ] : null;
+        return FieldRuleMap::make($this->map)
+            ->creation($request);
     }
 
     /**
      * @inheritDoc
      */
     public function rulesForUpdate(?Request $request, object $model): ?array
     {
-        $fields = [];
-        $rules = [];
-
-        /** @var AttributeContract $attr */
-        foreach ($this->map as $attr) {
-            if ($attr instanceof IsValidated) {
-                $fields[] = $name = $attr->name();
-                $rules[$name] = $attr->rulesForUpdate($request, $model);
-            }
-        }
-
-        return !empty($fields) ? [
-            '.' => 'array:' . implode(',', $fields),
-            ...$rules,
-        ] : null;
+        return FieldRuleMap::make($this->map)
+            ->update($request, $model);
     }
 
     /**

tests/lib/Integration/Fields/MapTest.php

@@ -316,12 +316,12 @@ public function testItIsValidatedOnCreate(): void
 
         $this->assertInstanceOf(IsValidated::class, $map);
         $this->assertEquals([
-            '.' => 'array:bar,foo',
+            '.' => ['array:bar,foo'],
             'foo' => ['string', 'foo1'],
             'bar' => [new JsonNumber(), 'bar1'],
         ], $map->rulesForCreation($request));
         $this->assertEquals([
-            '.' => 'array:bar,foo',
+            '.' => ['array:bar,foo'],
             'foo' => ['string', 'foo2'],
             'bar' => [new JsonNumber(), 'bar2'],
         ], $map->rulesForUpdate($request, $model));