feat: autoload improve inclusion

Author: Ark4ne

src/Resources/Concerns/Relationships.php

@@ -4,6 +4,7 @@
 
 use Ark4ne\JsonApi\Descriptors\Resolver;
 use Ark4ne\JsonApi\Resources\Relationship;
+use Ark4ne\JsonApi\Resources\Skeleton;
 use Ark4ne\JsonApi\Support\Arr;
 use Ark4ne\JsonApi\Support\Includes;
 use Ark4ne\JsonApi\Support\Values;
@@ -43,31 +44,49 @@ protected function toRelationships(Request $request): iterable
      */
     public function requestedRelationshipsLoad(Request $request): array
     {
-        $schema = self::schema($request);
+        return Arr::flatDot($this->requestedRelationshipsLoadFromSchema($request, self::schema($request)));
+    }
+
+    private function requestedRelationshipsLoadFromSchema(Request $request, Skeleton $schema): array
+    {
+        $loads = [];
 
-        $walk = static function ($schema) use (&$walk, $request) {
-            $loads = [];
+        foreach ($schema->loads as $name => $load) {
+            if ($load && Includes::include($request, $name)) {
+                $include = Includes::through($name, fn() => $this->requestedRelationshipsLoadFromSchema($request, $schema->relationships[$name]));
 
-            foreach ($schema->loads as $name => $load) {
-                if ($load && Includes::include($request, $name)) {
-                    $include = Includes::through($name, static fn() => $walk($schema->relationships[$name]));
+                $apply = static function ($load, string $pre = null) use (&$loads, &$apply) {
                     foreach ((array)$load as $key => $value) {
                         if (is_string($value)) {
-                            $loads[$value] = $include;
+                            $loads["$pre.$value"] = [];
                         } elseif (is_string($key)) {
-                            $loads[$key] = $value;
-                            foreach (Arr::flatDot($include, $key) as $inc => $item) {
-                                $loads[$inc] = $item;
+                            if (is_array($value)) {
+                                $apply($value, "$pre.$key");
+                            } else {
+                                $loads["$pre.$key"] = $value;
                             }
                         }
                     }
+                };
+
+                foreach ((array)$load as $key => $value) {
+                    if (is_string($value)) {
+                        $loads[$value] = $include;
+                    } elseif (is_string($key)) {
+                        if (is_array($value)) {
+                            $apply($value, $key);
+                        } else {
+                            $loads[$key] = $value;
+                        }
+                        foreach (Arr::flatDot($include, $key) as $inc => $item) {
+                            $loads[$inc] = $item;
+                        }
+                    }
                 }
             }
+        }
 
-            return $loads;
-        };
-
-        return Arr::flatDot($walk($schema));
+        return $loads;
     }
 
     /**

src/Traits/HasRelationLoad.php

@@ -7,11 +7,11 @@
 
 trait HasRelationLoad
 {
-    /** @var bool|string|array<string, callable(Builder|Relation):mixed>|array<array-key, string> */
+    /** @var bool|string|array<string, callable(Builder|Relation):mixed>|array<array-key, string|string[]|mixed> */
     protected bool|string|array $load = false;
 
     /**
-     * @param bool|string|array<string, callable(Builder|Relation):mixed>|array<array-key, string> $load
+     * @param bool|string|array<string, callable(Builder|Relation):mixed>|array<array-key, string|string[]|mixed> $load
      * @return $this
      */
     public function withLoad(bool|string|array $load): static
@@ -21,7 +21,7 @@ public function withLoad(bool|string|array $load): static
     }
 
     /**
-     * @return bool|string|array<string, callable(Builder|Relation):mixed>|array<array-key, string>
+     * @return bool|string|array<string, callable(Builder|Relation):mixed>|array<array-key, string|string[]|mixed>
      */
     public function load(): bool|string|array
     {

tests/Unit/Resources/Concerns/RelationshipsTest.php

@@ -5,6 +5,8 @@
 use Ark4ne\JsonApi\Resources\Concerns\Relationships;
 use Ark4ne\JsonApi\Resources\Relationship;
 use Ark4ne\JsonApi\Resources\Resourceable;
+use Ark4ne\JsonApi\Resources\Skeleton;
+use Ark4ne\JsonApi\Support\Arr;
 use Ark4ne\JsonApi\Support\Includes;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -259,6 +261,38 @@ public function toRelationships(Request $request): iterable
         ], $actual);
     }
 
+    public function testRequestedRelationshipsLoadFromSchema()
+    {
+        $r1 = new Skeleton('r1', 'r1');
+        $r1->loads = [
+            '_2' => 'r2',
+            '_3' => 'r3'
+        ];
+
+        $r2 = new Skeleton('r2', 'r2');
+        $r2->loads = ['_3' => ['r3' => ['r1']]];
+
+        $r3 = new Skeleton('r3', 'r3');
+        $r3->loads = ['_1' => 'r1'];
+
+        $r1->relationships['_2'] = $r2;
+        $r2->relationships['_3'] = $r3;
+        $r3->relationships['_1'] = $r1;
+
+        $model = Stub::model(['id' => 1]);
+        $resource = new class($model) extends JsonResource {
+            use Relationships;
+        };
+
+        $request = new Request([
+            'include' => '_2._3'
+        ]);
+
+        $actual = Reflect::invoke($resource, 'requestedRelationshipsLoadFromSchema', $request, $r1);
+
+        $this->assertEquals(['r2.r3.r1' => []], Arr::flatDot($actual));
+    }
+
     private function getStub()
     {
         $resource = new class {