Automatically resolve resource type from class

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

src/Illuminate/Http/Resources/JsonApi/AnonymousResourceCollection.php

@@ -26,6 +26,7 @@ public function with($request)
                 ->flatten(depth: 1)
                 ->uniqueStrict('_uniqueKey')
                 ->map(fn ($included) => Arr::except($included, ['_uniqueKey']))
+                ->values()
                 ->all(),
             ...($implementation = JsonApiResource::$jsonApiInformation)
                 ? ['jsonapi' => $implementation]

src/Illuminate/Http/Resources/JsonApi/Concerns/ResolvesJsonApiElements.php

@@ -77,11 +77,11 @@ public function resolveResourceIdentifier(JsonApiRequest $request): string
             return $resourceId;
         }
 
-        if (! $this->resource instanceof Model) {
+        if (! ($this->resource instanceof Model || method_exists($this->resource, 'getKey'))) {
             throw ResourceIdentificationException::attemptingToDetermineIdFor($this);
         }
 
-        return static::resourceIdFromModel($this->resource);
+        return (string) $this->resource->getKey();
     }
 
     /**
@@ -96,11 +96,21 @@ public function resolveResourceType(JsonApiRequest $request): string
             return $resourceType;
         }
 
+        if (static::class !== JsonApiResource::class) {
+            return Str::of(static::class)->classBasename()->basename('Resource')->snake()->pluralStudly();
+        }
+
         if (! $this->resource instanceof Model) {
             throw ResourceIdentificationException::attemptingToDetermineTypeFor($this);
         }
 
-        return static::resourceTypeFromModel($this->resource);
+        $modelClassName = $this->resource::class;
+
+        $morphMap = Relation::getMorphAlias($modelClassName);
+
+        return Str::of(
+            $morphMap !== $modelClassName ? $morphMap : class_basename($modelClassName)
+        )->snake()->pluralStudly();
     }
 
     /**
@@ -358,28 +368,6 @@ protected function resolveResourceMetaInformation(JsonApiRequest $request): arra
         return $this->toMeta($request);
     }
 
-    /**
-     * Get the resource ID from the given Eloquent model.
-     */
-    public static function resourceIdFromModel(Model $model): string
-    {
-        return $model->getKey();
-    }
-
-    /**
-     * Get the resource type from the given Eloquent model.
-     */
-    public static function resourceTypeFromModel(Model $model): string
-    {
-        $modelClassName = $model::class;
-
-        $morphMap = Relation::getMorphAlias($modelClassName);
-
-        return static::normalizeResourceType(
-            $morphMap !== $modelClassName ? $morphMap : class_basename($modelClassName)
-        );
-    }
-
     /**
      * Indicate that relationship loading should respect the request's "includes" query string.
      *
@@ -413,12 +401,4 @@ public function includePreviouslyLoadedRelationships()
 
         return $this;
     }
-
-    /**
-     * Normalize the resource type.
-     */
-    public static function normalizeResourceType(string $value): string
-    {
-        return Str::of($value)->snake()->pluralStudly();
-    }
 }

src/Illuminate/Http/Resources/JsonApi/JsonApiResource.php

@@ -136,6 +136,7 @@ public function with($request)
             'included' => $this->resolveIncludedResourceObjects($request)
                 ->uniqueStrict('_uniqueKey')
                 ->map(fn ($included) => Arr::except($included, ['_uniqueKey']))
+                ->values()
                 ->all(),
             ...($implementation = static::$jsonApiInformation)
                 ? ['jsonapi' => $implementation]

…s/JsonApi/Fixtures/AuthorApiResource.php …rces/JsonApi/Fixtures/AuthorResource.phptests/Integration/Http/Resources/JsonApi/Fixtures/AuthorApiResource.php renamed to tests/Integration/Http/Resources/JsonApi/Fixtures/AuthorResource.php tests/Integration/Http/Resources/JsonApi/Fixtures/AuthorApiResource.php renamed to tests/Integration/Http/Resources/JsonApi/Fixtures/AuthorResource.php

@@ -5,7 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\JsonApi\JsonApiResource;
 
-class AuthorApiResource extends JsonApiResource
+class AuthorResource extends JsonApiResource
 {
     protected array $relationships = [
         'comments',
@@ -20,10 +20,4 @@ public function toAttributes(Request $request)
             'email' => $this->email,
         ];
     }
-
-    #[\Override]
-    public function toType(Request $request)
-    {
-        return 'authors';
-    }
 }

tests/Integration/Http/Resources/JsonApi/Fixtures/Comment.php

@@ -8,7 +8,7 @@
 use Illuminate\Database\Eloquent\Model;
 
 #[UseFactory(CommentFactory::class)]
-#[UseResource(CommentApiResource::class)]
+#[UseResource(CommentResource::class)]
 class Comment extends Model
 {
     use HasFactory;

…/JsonApi/Fixtures/CommentApiResource.php …ces/JsonApi/Fixtures/CommentResource.phptests/Integration/Http/Resources/JsonApi/Fixtures/CommentApiResource.php renamed to tests/Integration/Http/Resources/JsonApi/Fixtures/CommentResource.php tests/Integration/Http/Resources/JsonApi/Fixtures/CommentApiResource.php renamed to tests/Integration/Http/Resources/JsonApi/Fixtures/CommentResource.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Http\Resources\JsonApi\JsonApiResource;
 
-class CommentApiResource extends JsonApiResource
+class CommentResource extends JsonApiResource
 {
     /**
      * The resource's attributes.

tests/Integration/Http/Resources/JsonApi/Fixtures/Post.php

@@ -8,7 +8,7 @@
 use Illuminate\Database\Eloquent\Model;
 
 #[UseFactory(PostFactory::class)]
-#[UseResource(PostApiResource::class)]
+#[UseResource(PostResource::class)]
 class Post extends Model
 {
     use HasFactory;

…ces/JsonApi/Fixtures/PostApiResource.php …ources/JsonApi/Fixtures/PostResource.phptests/Integration/Http/Resources/JsonApi/Fixtures/PostApiResource.php renamed to tests/Integration/Http/Resources/JsonApi/Fixtures/PostResource.php tests/Integration/Http/Resources/JsonApi/Fixtures/PostApiResource.php renamed to tests/Integration/Http/Resources/JsonApi/Fixtures/PostResource.php

@@ -4,15 +4,15 @@
 
 use Illuminate\Http\Resources\JsonApi\JsonApiResource;
 
-class PostApiResource extends JsonApiResource
+class PostResource extends JsonApiResource
 {
     protected array $attributes = [
         'title',
         'content',
     ];
 
     protected array $relationships = [
-        'author' => AuthorApiResource::class,
+        'author' => AuthorResource::class,
         'comments',
     ];
 }

tests/Integration/Http/Resources/JsonApi/Fixtures/User.php

@@ -8,7 +8,7 @@
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Orchestra\Testbench\Factories\UserFactory;
 
-#[UseResource(UserApiResource::class)]
+#[UseResource(UserResource::class)]
 #[UseFactory(UserFactory::class)]
 class User extends Authenticatable
 {