feat: implement With helpers

Author: Ark4ne

src/JsonApiCollection.php

@@ -3,9 +3,9 @@
 namespace Ark4ne\JsonApi\Resource;
 
 use Ark4ne\JsonApi\Resource\Concerns\AsRelationship;
+use Ark4ne\JsonApi\Resource\Support\With;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use Illuminate\Support\Arr;
 
 class JsonApiCollection extends ResourceCollection implements Resourceable
 {
@@ -32,40 +32,27 @@ public function toArray($request, bool $minimal = false): array
     {
         $data = [];
 
-        $this->with = collect($this->with)->toArray();
+        $base = collect($this->with)->toArray();
         foreach ($this->collection as $resource) {
             $data[] = $resource->toArray($request, $minimal);
 
             if ($resource instanceof JsonResource) {
                 $with = collect($resource->with($request))->toArray();
+
                 if ($minimal) {
                     unset($with['included']);
                 }
-                foreach ($with as $key => $value) {
-                    $this->with[$key] = array_merge_recursive(
-                        $this->with[$key] ?? [],
-                        $value
-                    );
-                }
+
+                $base = With::merge($base, $with);
             }
         }
+        $this->with = $base;
 
         return $data;
     }
 
     public function with($request)
     {
-        return collect($this->with)
-            ->map(static function ($value) {
-                if (is_iterable($value)) {
-                    $value = collect($value)->all();
-                    $isAssoc = Arr::isAssoc($value);
-                    $value = array_unique($value, SORT_REGULAR);
-                    return $isAssoc ? $value : array_values($value);
-                }
-                return $value;
-            })
-            ->filter()
-            ->toArray();
+        return With::wash($this->with);
     }
 }

src/Support/With.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Ark4ne\JsonApi\Resource\Support;
+
+use Illuminate\Support\Arr;
+
+class With
+{
+    public static function merge(iterable $base, iterable $with): array
+    {
+        $base = collect($base)->toArray();
+
+        foreach (collect($with)->toArray() as $key => $value) {
+            $base[$key] = array_merge_recursive(
+                $base[$key] ?? [],
+                $value
+            );
+        }
+
+        return self::uniqueRecursive($base);
+    }
+
+    public static function wash(iterable $with): array
+    {
+        return collect(self::uniqueRecursive($with))
+            ->filter()
+            ->toArray();
+    }
+
+    private static function uniqueRecursive($value)
+    {
+        return array_map(static function ($value) {
+            if (is_iterable($value)) {
+                $value = collect($value)->all();
+                $isAssoc = Arr::isAssoc($value);
+                $value = array_unique($value, SORT_REGULAR);
+                return self::uniqueRecursive($isAssoc ? $value : array_values($value));
+            }
+
+            return $value;
+        }, collect($value)->all());
+    }
+}

tests/Unit/Support/WithTest.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace Test\Unit\Support;
+
+use Ark4ne\JsonApi\Resource\Support\With;
+use Test\TestCase;
+
+class WithTest extends TestCase
+{
+    public function mergeProvider()
+    {
+        return [
+            // [expected, base, with]
+            [[], [], []],
+            [['foo' => []], ['foo' => []], []],
+            [['foo' => []], [], ['foo' => []]],
+            [['foo' => []], ['foo' => []], ['foo' => []]],
+            [['foo' => ['bar']], ['foo' => ['bar']], ['foo' => ['bar']]],
+            [['foo' => ['bar', 'baz']], ['foo' => ['bar']], ['foo' => ['bar', 'baz']]],
+            [
+                ['foo' => ['bar' => ['baz' => [1, 2]]]],
+                ['foo' => ['bar' => ['baz' => [1]]]],
+                ['foo' => ['bar' => ['baz' => [2]]]]
+            ],
+            [
+                [
+                    'included' => [
+                        ['id' => 1, 'attributes' => ['a' => 1]],
+                        ['id' => 2, 'attributes' => ['a' => 2]]
+                    ]
+                ],
+                [
+                    'included' => [
+                        ['id' => 1, 'attributes' => ['a' => 1]],
+                    ]
+                ],
+                [
+                    'included' => [
+                        ['id' => 2, 'attributes' => ['a' => 2]]
+                    ]
+                ]
+            ],
+            [
+                [
+                    'included' => [
+                        ['id' => 1, 'attributes' => ['a' => 1]],
+                    ]
+                ],
+                [
+                    'included' => [
+                        ['id' => 1, 'attributes' => ['a' => 1]],
+                    ]
+                ],
+                [
+                    'included' => [
+                        ['id' => 1, 'attributes' => ['a' => 1]]
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider mergeProvider
+     */
+    public function testMerge($expected, $base, $with)
+    {
+        $this->assertEquals($expected, With::merge($base, $with));
+    }
+
+    public function washProvider()
+    {
+        return [
+            // [expected, with]
+            [[], []],
+            [[], ['foo' => []]],
+            [['foo' => [1]], ['foo' => [1, 1, 1]]],
+            [
+                [
+                    'included' => [['id' => 1, 'attributes' => []]]
+                ],
+                [
+                    'included' => [['id' => 1, 'attributes' => []]],
+                    'meta' => []
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider washProvider
+     */
+    public function testWash($expected, $base)
+    {
+        $this->assertEquals($expected, With::wash($base));
+    }
+}