Little refactor and big performance improvement on collections

Author: d8vjork

src/Http/Resources/CollectsWithIncludes.php

@@ -4,6 +4,9 @@
 
 use Illuminate\Support\{Arr, Collection};
 
+/**
+ * @property array $with
+ */
 trait CollectsWithIncludes
 {
     /**
@@ -13,12 +16,10 @@ trait CollectsWithIncludes
      */
     protected function withIncludes()
     {
-        $this->with['included'] = [];
-
         /** @var \SkoreLabs\JsonApi\Http\Resources\JsonApiResource $jsonResource */
         foreach ($this->collection->toArray() as $jsonResource) {
             if ($jsonResource->with) {
-                $this->with['included'][] = Arr::get($jsonResource->with, 'included');
+                $this->addIncluded(Arr::get($jsonResource->with, 'included'));
             }
         }
 
@@ -32,7 +33,9 @@ protected function withIncludes()
      */
     protected function uniqueIncludes()
     {
-        $includedCollection = Collection::make($this->with['included'])->flatten();
+        $includedCollection = Collection::make(
+            Arr::get($this->with, 'included', [])
+        )->flatten();
 
         return $includedCollection->unique(static function (JsonApiResource $resource) {
             return implode('', $resource->getResourceIdentifier());

src/Http/Resources/JsonApiResource.php

@@ -24,7 +24,7 @@ class JsonApiResource extends JsonResource
      * @param bool $authorize
      * @return void
      */
-    public function __construct($resource, $authorize = false)
+    public function __construct($resource, $authorize = null)
     {
         if (gettype($authorize) === 'boolean') {
             $this->authorize = $authorize;
@@ -80,7 +80,7 @@ public function getResourceIdentifier()
     {
         return [
             $this->resource->getKeyName() => (string) $this->resource->getKey(),
-            'type' => Str::lower(class_basename($this->resource)),
+            'type' => Str::snake(class_basename($this->resource)),
         ];
     }
 

src/Http/Resources/RelationshipsWithIncludes.php

@@ -3,11 +3,12 @@
 namespace SkoreLabs\JsonApi\Http\Resources;
 
 use Illuminate\Database\Eloquent\{Model, Collection, Relations\Pivot};
-use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Arr;
 
 /**
  * @property mixed $resource
+ * @property array $with
+ * @property bool $authorize
  */
 trait RelationshipsWithIncludes
 {
@@ -25,11 +26,7 @@ trait RelationshipsWithIncludes
      */
     protected function withRelationships()
     {
-        if ($this->resource instanceof LengthAwarePaginator) {
-            $this->resource->getCollection()->map(function (Model $model) {
-                $this->attachRelations($model, true);
-            });
-        } else if ($this->resource instanceof Model) {
+        if ($this->resource instanceof Model) {
             $this->attachRelations($this->resource);
         }
     }
@@ -72,12 +69,23 @@ protected function processModelRelation(Model $model)
     {
         $modelResource = new JsonApiResource($model, $this->authorize);
 
-        $this->with['included'][] = $modelResource;
-
-        if (Arr::has($modelResource->with, 'included')) {
-            $this->with['included'][] = $modelResource->with['included'];
-        }
+        $this->addIncluded([$modelResource],
+            Arr::get($modelResource->with, 'included', [])
+        );
 
         return $modelResource->getResourceIdentifier();
     }
+
+    /**
+     * Set included data to resource's with.
+     *
+     * @param array $arrays,...
+     * @return void
+     */
+    protected function addIncluded(...$arrays)
+    {
+        Arr::set($this->with, 'included',
+            array_merge(Arr::get($this->with, 'included', []), ...$arrays)
+        );
+    }
 }