improve types and identification caching

src/Concerns/Attributes.php

@@ -34,7 +34,13 @@ private function requestedAttributes(Request $request): Collection
     {
         return Collection::make($this->toAttributes($request))
             ->only($this->fields($request))
-            ->map(fn ($value) => value($value));
+            ->map(
+                /**
+                 * @param mixed $value
+                 * @return mixed
+                 */
+                fn ($value) => value($value)
+            );
     }
 
     /**

src/Concerns/Identification.php

@@ -55,8 +55,8 @@ public function toResourceIdentifier(Request $request): array
     {
         return [
             'data' => [
-                'id' => $this->toId($request),
-                'type' => $this->toType($request),
+                'id' => $this->resolveId($request),
+                'type' => $this->resolveType($request),
             ],
         ];
     }
@@ -66,7 +66,23 @@ public function toResourceIdentifier(Request $request): array
      */
     public function toUniqueResourceIdentifier(Request $request): string
     {
-        return "type:{$this->toType($request)} id:{$this->toId($request)}";
+        return "type:{$this->resolveType($request)} id:{$this->resolveId($request)}";
+    }
+
+    /**
+     * @internal
+     */
+    private function resolveId(Request $request): string
+    {
+        return $this->rememberId(fn (): string => $this->toId($request));
+    }
+
+    /**
+     * @internal
+     */
+    private function resolveType(Request $request): string
+    {
+        return $this->rememberType(fn (): string => $this->toType($request));
     }
 
     /**

src/Concerns/Relationships.php

@@ -84,6 +84,7 @@ private function requestedRelationshipsAsIdentifiers(Request $request): Collecti
             ->map(
                 /**
                  * @param JsonApiResource|JsonApiResourceCollection|UnknownRelationship $resource
+                 * @return mixed
                  */
                 fn ($resource) => $resource->toResourceIdentifier($request)
             );

src/Exceptions/ResourceIdentificationException.php

@@ -19,21 +19,21 @@ class ResourceIdentificationException extends RuntimeException
      */
     public static function attemptingToDetermineIdFor($model): self
     {
-        return new self('Unable to resolve resource object id for '.self::resolveType($model).'.');
+        return new self('Unable to resolve resource object id for '.self::determineType($model).'.');
     }
 
     /**
      * @param mixed $model
      */
     public static function attemptingToDetermineTypeFor($model): self
     {
-        return new self('Unable to resolve resource object type for '.self::resolveType($model).'.');
+        return new self('Unable to resolve resource object type for '.self::determineType($model).'.');
     }
 
     /**
      * @param mixed $model
      */
-    private static function resolveType($model): string
+    private static function determineType($model): string
     {
         return is_object($model)
             ? get_class($model)

src/JsonApiResource.php

@@ -65,24 +65,24 @@ protected function toMeta(Request $request): array
 
     protected function toId(Request $request): string
     {
-        return $this->rememberId(fn () => (self::$idResolver ??= static function ($resource): string {
+        return (self::$idResolver ??= static function ($resource): string {
             if (! $resource instanceof Model) {
                 throw ResourceIdentificationException::attemptingToDetermineIdFor($resource);
             }
 
             return (string) $resource->getKey();
-        })($this->resource));
+        })($this->resource);
     }
 
     protected function toType(Request $request): string
     {
-        return $this->rememberType(fn () => (self::$typeResolver ??= static function ($resource): string {
+        return (self::$typeResolver ??= static function ($resource): string {
             if (! $resource instanceof Model) {
                 throw ResourceIdentificationException::attemptingToDetermineTypeFor($resource);
             }
 
             return Str::camel($resource->getTable());
-        })($this->resource));
+        })($this->resource);
     }
 
     /**
@@ -91,8 +91,8 @@ protected function toType(Request $request): string
     public function toArray($request): array
     {
         return [
-            'id' => $this->toId($request),
-            'type' => $this->toType($request),
+            'id' => $this->resolveId($request),
+            'type' => $this->resolveType($request),
             'attributes' => (object) $this->requestedAttributes($request)->all(),
             'relationships' => (object) $this->requestedRelationshipsAsIdentifiers($request)->all(),
             'meta' => (object) $this->toMeta($request),