refacto: describer name retriever

Author: Ark4ne

src/Descriptors/Describer.php

@@ -124,4 +124,19 @@ abstract protected function resolveFor(Request $request, Model $model, string $f
      * @return string|Closure|null
      */
     abstract public function retriever(): null|string|Closure;
+
+    /**
+     * @param mixed      $value
+     * @param int|string $key
+     *
+     * @return int|string
+     */
+    public static function retrieveName(mixed $value, int|string $key): int|string
+    {
+        if (is_int($key) && $value instanceof self && is_string($retriever = $value->retriever())) {
+            return $retriever;
+        }
+
+        return $key;
+    }
 }

src/Descriptors/Resolver.php

@@ -21,9 +21,7 @@ protected function resolveValues(Request $request, ?iterable $values): ?array
 
         return (new Collection($values))
             ->reduce(function (Collection $fields, $value, int|string $key) use ($request) {
-                if (is_int($key) && ($value instanceof Describer) && is_string($value->retriever())) {
-                    $key = $value->retriever();
-                }
+                $key = Describer::retrieveName($value, $key);
 
                 $fields[$key] = value(
                     $value instanceof Describer

src/Resources/Concerns/Schema.php

@@ -2,9 +2,9 @@
 
 namespace Ark4ne\JsonApi\Resources\Concerns;
 
+use Ark4ne\JsonApi\Descriptors\Describer;
 use Ark4ne\JsonApi\Descriptors\Relations\Relation;
 use Ark4ne\JsonApi\Descriptors\Resolver;
-use Ark4ne\JsonApi\Descriptors\Values\Value;
 use Ark4ne\JsonApi\Resources\Skeleton;
 use Ark4ne\JsonApi\Support\FakeModel;
 use Illuminate\Http\Request;
@@ -35,18 +35,15 @@ public static function schema(Request $request = null): Skeleton
             $resource->toType($request)
         );
 
-        $schema->fields = (new Collection($resource->toAttributes($request)))->map(fn(
-            $value,
-            $key
-        ) => is_int($key) && ($value instanceof Value) && is_string($value->retriever())
-            ? $value->retriever()
-            : $key
-        )->values()->all();
+        $schema->fields = (new Collection($resource->mergeValues($resource->toAttributes($request))))
+            ->map(fn($value, $key) => Describer::retrieveName($value, $key))
+            ->values()
+            ->all();
 
         foreach ($resource->toRelationships($request) as $name => $relation) {
             if ($relation instanceof Relation) {
                 $relationship = $relation->related();
-                $name = is_int($name) && is_string($relation->retriever()) ? $relation->retriever() : $name;
+                $name = Describer::retrieveName($relation, $name);
             } else {
                 $relationship = $relation->getResource();
             }