feat: improve schema & correct attributes generation

Author: Ark4ne

src/Resources/Concerns/Schema.php

@@ -5,24 +5,25 @@
 use Ark4ne\JsonApi\Resources\JsonApiCollection;
 use Ark4ne\JsonApi\Support\FakeModel;
 use Illuminate\Http\Request;
+use ReflectionClass;
 
 trait Schema
 {
     private static array $schemas = [];
 
     public static function schema(Request $request = null): object
     {
-        $request ??= new Request;
+        if (isset(self::$schemas[static::class])) {
+            return self::$schemas[static::class];
+        }
 
-        $resource = new static(new FakeModel);
+        $resource = self::new();
 
         if ($resource instanceof JsonApiCollection) {
             return $resource->collects::schema($request);
         }
 
-        if (isset(self::$schemas[static::class])) {
-            return self::$schemas[static::class];
-        }
+        $request ??= new Request;
 
         $schema = (object)[
             'type' => null,
@@ -33,12 +34,21 @@ public static function schema(Request $request = null): object
         self::$schemas[static::class] = $schema;
 
         $schema->type = $resource->toType($request);
-        $schema->fields = array_keys($resource->toAttributes($request));
+        $schema->fields = collect($resource->toAttributes($request))->keys()->all();
 
         foreach ($resource->toRelationships($request) as $name => $relation) {
             $schema->relationships[$name] = $relation->getResource()::schema();
         }
 
         return self::$schemas[static::class];
     }
+
+    private static function new(): self
+    {
+        /** @var self $instance */
+        $instance = (new ReflectionClass(static::class))->newInstanceWithoutConstructor();
+        $instance->resource = new FakeModel;
+
+        return $instance;
+    }
 }

tests/app/Http/Resources/CommentResource.php

@@ -18,17 +18,17 @@ protected function toType(Request $request): string
 
     protected function toAttributes(Request $request): iterable
     {
-        return [
+        return collect([
             'content' => fn() => $this->resource->content,
-        ];
+        ]);
     }
 
     protected function toResourceMeta(Request $request): ?iterable
     {
-        return [
+        return collect([
             'created_at' => $this->resource->created_at->format(DateTimeInterface::ATOM),
             'updated_at' => $this->resource->updated_at->format(DateTimeInterface::ATOM),
-        ];
+        ]);
     }
 
     protected function toRelationships(Request $request): iterable