fix: json-api-resource & descriptor support any array or object.

Author: Ark4ne

src/Descriptors/Describer.php

@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\MissingValue;
+use Illuminate\Support\Arr;
 
 /**
  * @template T
@@ -100,12 +101,14 @@ protected function check(Request $request, mixed $model, string $attribute): boo
 
     private function retrieveValue(mixed $model, string $attribute): mixed
     {
+        $value = static fn($attr) => Arr::accessible($model) ? $model[$attr] : $model->$attr;
+
         $retriever = $this->retriever();
         if ($retriever === null) {
-            return $model->$attribute;
+            return $value($attribute);
         }
         if (is_string($retriever)) {
-            return $model->$retriever;
+            return $value($retriever);
         }
         return $retriever();
     }

src/Descriptors/Descriptors.php

@@ -2,9 +2,6 @@
 
 namespace Ark4ne\JsonApi\Descriptors;
 
-/**
- * @deprecated
- */
 trait Descriptors
 {
     use Relations;

src/Descriptors/Relations.php

@@ -16,7 +16,7 @@
 use Closure;
 
 /**
- * @template T as \Illuminate\Database\Eloquent\Model
+ * @template T
  */
 trait Relations
 {

src/Descriptors/Relations/Relation.php

@@ -10,9 +10,10 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\MissingValue;
+use Illuminate\Support\Arr;
 
 /**
- * @template T as \Illuminate\Database\Eloquent\Model
+ * @template T
  * @extends Describer<T>
  */
 abstract class Relation extends Describer
@@ -113,7 +114,11 @@ public function resolveFor(Request $request, mixed $model, string $field): Relat
         if ($retriever instanceof Closure) {
             $value = static fn() => $retriever($model, $field);
         } else {
-            $value = static fn() => $model->getRelationValue($retriever ?? $field);
+            $value = static fn() => match (true) {
+                $model instanceof Model => $model->getRelationValue($retriever ?? $field),
+                Arr::accessible($model) => $model[$retriever ?? $field],
+                default => $model->{$retriever ?? $field}
+            };
         }
 
         $relation = $this->value(fn() => $this->check($request, $model, $field) ? $value() : new MissingValue());

src/Descriptors/Relations/RelationMany.php

@@ -6,7 +6,7 @@
 use Closure;
 
 /**
- * @template T as \Illuminate\Database\Eloquent\Model
+ * @template T
  * @extends Relation<T>
  */
 class RelationMany extends Relation

src/Descriptors/Relations/RelationOne.php

@@ -6,7 +6,7 @@
 use Closure;
 
 /**
- * @template T as \Illuminate\Database\Eloquent\Model
+ * @template T
  * @extends Relation<T>
  */
 class RelationOne extends Relation

src/Resources/Concerns/Attributes.php

@@ -30,7 +30,17 @@ trait Attributes
      */
     protected function toAttributes(Request $request): iterable
     {
-        return $this->resource->toArray();
+        if (is_object($this->resource) && method_exists($this->resource, 'toArray')) {
+            return $this->resource->toArray();
+        }
+        if (is_array($this->resource)) {
+            return $this->resource;
+        }
+        if (is_iterable($this->resource)) {
+            return iterator_to_array($this->resource);
+        }
+
+        return [];
     }
 
     /**

src/Resources/JsonApiCollection.php

@@ -45,17 +45,19 @@ public function __construct($resource, ?string $collects = null)
      */
     public function toArray(mixed $request, bool $included = true): array
     {
-        if (collect($this->collection)->every(fn($value) => $value instanceof JsonApiResource)) {
-            $collection = collect($this->collection);
+        $collection = collect($this->collection);
 
+        if ($collection->every(static fn($value) => $value instanceof JsonApiResource)) {
             // @phpstan-ignore-next-line
             $loads = array_merge(...$collection->map->requestedRelationshipsLoad($request));
 
-            // @phpstan-ignore-next-line
-            $resources = $collection->map->resource;
+            if (!empty($loads)) {
+                // @phpstan-ignore-next-line
+                $resources = $collection->map->resource;
 
-            if (!empty($loads) && $resources->every(fn($resource) => $resource instanceof Model)) {
-                (new Collection($resources))->loadMissing($loads);
+                if ($resources->every(static fn($resource) => $resource instanceof Model)) {
+                    (new Collection($resources))->loadMissing($loads);
+                }
             }
         }
 

tests/Unit/Descriptors/RelationTest.php

@@ -15,56 +15,69 @@
 
 class RelationTest extends TestCase
 {
-    public function testIncluded()
+    public function resourceProvider(): array
+    {
+        return [
+            [[]],
+            [new class {}],
+            [new class extends Model {}],
+        ];
+    }
+
+    /**
+     * @dataProvider resourceProvider
+     */
+    public function testIncluded($model)
     {
         $stub = new RelationOne(UserResource::class, fn() => null);
 
-        $relation = $stub->resolveFor(new Request, new class extends Model {
-        }, 'null');
+        $relation = $stub->resolveFor(new Request, $model, 'null');
 
         $this->assertInstanceOf(Relationship::class, $relation);
         $this->assertFalse(Reflect::get($relation, 'whenIncluded'));
 
         $stub->whenIncluded();
-        $relation = $stub->resolveFor(new Request, new class extends Model {
-        }, 'null');
+        $relation = $stub->resolveFor(new Request, $model, 'null');
 
         $this->assertInstanceOf(Relationship::class, $relation);
         $this->assertTrue(Reflect::get($relation, 'whenIncluded'));
     }
 
-    public function testMeta()
+
+    /**
+     * @dataProvider resourceProvider
+     */
+    public function testMeta($model)
     {
         $stub = new RelationOne(UserResource::class, fn() => null);
 
-        $relation = $stub->resolveFor(new Request, new class extends Model {
-        }, 'null');
+        $relation = $stub->resolveFor(new Request, $model, 'null');
 
         $this->assertInstanceOf(Relationship::class, $relation);
         $this->assertEmpty(Reflect::get($relation, 'meta'));
 
         $stub->meta(fn() => ['test']);
-        $relation = $stub->resolveFor(new Request, new class extends Model {
-        }, 'null');
+        $relation = $stub->resolveFor(new Request, $model, 'null');
 
         $this->assertInstanceOf(Relationship::class, $relation);
         $this->assertInstanceOf(\Closure::class, Reflect::get($relation, 'meta'));
         $this->assertEquals(['test'], Reflect::get($relation, 'meta')());
     }
 
-    public function testLinks()
+    /**
+     * @dataProvider resourceProvider
+     */
+    public function testLinks($model)
     {
         $stub = new RelationOne(UserResource::class, fn() => null);
 
-        $relation = $stub->resolveFor(new Request, new class extends Model {
-        }, 'null');
+        $relation = $stub->resolveFor(new Request, $model, 'null');
 
         $this->assertInstanceOf(Relationship::class, $relation);
         $this->assertEmpty(Reflect::get($relation, 'links'));
 
         $stub->links(fn() => ['test']);
-        $relation = $stub->resolveFor(new Request, new class extends Model {
-        }, 'null');
+        $relation = $stub->resolveFor(new Request, $model, 'null');
 
         $this->assertInstanceOf(Relationship::class, $relation);
         $this->assertInstanceOf(\Closure::class, Reflect::get($relation, 'links'));
@@ -120,12 +133,13 @@ public function testWhenPivotLoaded($expectedAttr, $relation, $invokedAttr)
         $this->assertTrue($check);
     }
 
-    public function testRelationMissing()
+    /**
+     * @dataProvider resourceProvider
+     */
+    public function testRelationMissing($model)
     {
         $missing = RelationMissing::fromRelationship(new Relationship(UserResource::class, fn() => null));
 
-        $model = new class extends Model {
-        };
         $check = Reflect::invoke($missing, 'check', new Request, $model, 'any');
         $value = Reflect::invoke($missing, 'valueFor', new Request, $model, 'any');