Finish Laravel integration

Author: tobyzerner

README.md

@@ -44,8 +44,15 @@ use Tobyz\JsonApiServer\JsonApi;
 
 class UsersResource extends EloquentResource
 {
-    public readonly string $type = 'users';
-    public readonly string $model = User::class;
+    public function type(): string
+    {
+        return 'users';
+    }
+
+    public function newModel(Context $context): object
+    {
+        return new User();
+    }
 
     public function endpoints(): array
     {
@@ -75,7 +82,7 @@ class UsersResource extends EloquentResource
 
     public function filters(): array
     {
-        return [Filter\WhereIdIn::make(), Filter\Where::make('name')];
+        return [Filter\Where::make('id'), Filter\Where::make('name')];
     }
 }
 

composer.json

@@ -23,7 +23,7 @@
         },
         "files": [
             "src/functions.php",
-            "src/functions_laravel.php"
+            "src/Laravel/functions.php"
         ]
     },
     "autoload-dev": {

docs/index.md

@@ -47,8 +47,15 @@ use Tobyz\JsonApiServer\JsonApi;
 
 class UsersResource extends EloquentResource
 {
-    public readonly string $type = 'users';
-    public readonly string $model = User::class;
+    public function type(): string
+    {
+        return 'users';
+    }
+
+    public function newModel(Context $context): object
+    {
+        return new User();
+    }
 
     public function endpoints(): array
     {
@@ -78,7 +85,7 @@ class UsersResource extends EloquentResource
 
     public function filters(): array
     {
-        return [Filter\WhereIdIn::make(), Filter\Where::make('name')];
+        return [Filter\Where::make('id'), Filter\Where::make('name')];
     }
 }
 

docs/laravel.md

@@ -49,8 +49,15 @@ use Tobyz\JsonApiServer\Laravel\EloquentResource;
 
 class PostsResource extends EloquentResource
 {
-    public readonly string $type = 'posts';
-    public readonly string $model = Post::class;
+    public function type(): string
+    {
+        return 'posts';
+    }
+
+    public function newModel(Context $context): object
+    {
+        return new Post();
+    }
 
     public function endpoints(): array
     {
@@ -117,11 +124,11 @@ requests, and force delete a resource using a `DELETE` request.
 
 To expose the soft-delete capability to the client, add the
 `Tobyz\JsonApiServer\Laravel\SoftDeletes` trait to your Eloquent resource, and a
-`Tobyz\JsonApiServer\Laravel\Fields\SoftDelete` field to your fields array:
+nullable `DateTime` field to your fields array:
 
 ```php
-use Tobyz\JsonApiServer\Laravel\Fields\SoftDelete; // [!code ++]
 use Tobyz\JsonApiServer\Laravel\SoftDeletes; // [!code ++]
+use Tobyz\JsonApiServer\Schema\Field\DateTime; // [!code ++]
 
 class PostsResource extends EloquentResource
 {
@@ -132,20 +139,22 @@ class PostsResource extends EloquentResource
     public function fields(): array
     {
         return [
-            SoftDelete::make('deletedAt'), // [!code ++]
+            DateTime::make('deletedAt')->nullable(), // [!code ++]
         ];
     }
 }
 ```
 
 If you prefer to use a boolean to indicate whether or not a resource is
-soft-deleted instead of a nullable date-time value, you can call the `asBoolean`
-method on the `SoftDelete` field:
+soft-deleted instead of a nullable date-time value, you can use a
+`BooleanDateTime` field instead:
 
 ```php
-SoftDelete::make('isDeleted')
+use Tobyz\JsonApiServer\Schema\Field\BooleanDateTime;
+
+BooleanDateTime::make('isDeleted')
     ->property('deleted_at')
-    ->asBoolean();
+    ->writable();
 ```
 
 ## Filters
@@ -156,8 +165,12 @@ resources.
 ### Where
 
 ```php
-Where::make('id');
 Where::make('name');
+Where::make('id')->commaSeparated();
+Where::make('isConfirmed')->asBoolean();
+Where::make('score')->asNumeric();
+WhereBelongsTo::make('user');
+Has::make('hasComments');
 WhereHas::make('comments');
 WhereDoesntHave::make('comments');
 WhereNull::make('draft')->property('published_at');

src/Laravel/EloquentBuffer.php

@@ -6,13 +6,11 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Tobyz\JsonApiServer\Context;
-use Tobyz\JsonApiServer\Schema\Relationship;
-
-use function Tobyz\JsonApiServer\run_callbacks;
+use Tobyz\JsonApiServer\Schema\Field\Relationship;
 
 abstract class EloquentBuffer
 {
-    private static $buffer = [];
+    private static array $buffer = [];
 
     public static function add(Model $model, string $relationName): void
     {
@@ -43,32 +41,22 @@ public static function load(
                 // may be multiple if this is a polymorphic relationship. We
                 // start by getting the resource types this relationship
                 // could possibly contain.
-                $resourceTypes = $context->getApi()->getResourceTypes();
+                $resources = $context->api->resources;
 
-                if ($type = $relationship->getType()) {
-                    if (is_string($type)) {
-                        $resourceTypes = [$resourceTypes[$type]];
-                    } else {
-                        $resourceTypes = array_intersect_key($resourceTypes, array_flip($type));
-                    }
+                if ($type = $relationship->types) {
+                    $resources = array_intersect_key($resources, array_flip($type));
                 }
 
                 // Now, construct a map of model class names -> scoping
                 // functions. This will be provided to the MorphTo::constrain
                 // method in order to apply type-specific scoping.
                 $constrain = [];
 
-                foreach ($resourceTypes as $resourceType) {
-                    if (
-                        ($model = $resourceType->getAdapter()->model()) &&
-                        !isset($constrain[get_class($model)])
-                    ) {
-                        $constrain[get_class($model)] = function ($query) use (
-                            $resourceType,
-                            $context,
-                        ) {
-                            $resourceType->applyScopes($query, $context);
-                        };
+                foreach ($resources as $resource) {
+                    $modelClass = get_class($resource->newModel($context));
+
+                    if ($resource instanceof EloquentResource && !isset($constrain[$modelClass])) {
+                        $constrain[$modelClass] = fn($query) => $resource->scope($query, $context);
                     }
                 }
 
@@ -77,10 +65,6 @@ public static function load(
                 } else {
                     reset($constrain)($query);
                 }
-
-                // Also apply any local scopes that have been defined on this
-                // relationship.
-                run_callbacks($relationship->getListeners('scope'), [$query, $context]);
             },
         ]);