Oct 23, 2025 · Oct 28, 2025 · Oct 28, 2025 · Oct 28, 2025 · Oct 28, 2025 · Oct 28, 2025
diff --git a/src/Illuminate/Http/Resources/Json/Concerns/ResolvesJsonApiSpecifications.php b/src/Illuminate/Http/Resources/Json/Concerns/ResolvesJsonApiSpecifications.php
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonApiResource;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use JsonSerializable;
    /**
     * @var \WeakMap|null
     */
    protected $cachedLoadedRelationships;
    protected $cachedLoadedRelationshipsMap;

    /**
     * @var array
     */
    protected array $cachedLoadedRelationshipsIdentifier = [];

    /**
     * Resolves `attributes` for the resource.
            'type' => $this->resolveResourceType($request),
            ...(new Collection([
                'attributes' => $this->resolveResourceAttributes($request),
                'relationships' => $this->resolveResourceRelationships($request),
                'relationships' => $this->resolveResourceRelationshipsIdentifiers($request),
                'links' => $this->resolveResourceLinks($request),
                'meta' => $this->resolveMetaInformations($request),
            ]))->filter()->map(fn ($value) => (object) $value),
        ];
    }

    protected function resolveResourceRelationships(Request $request):array
    protected function resolveResourceRelationships(Request $request):void
    {
        if (!$this->resource instanceofModel) {
            return [];
        if ($this->cachedLoadedRelationships instanceofWeakMap) {
            return;
        }

        if (is_null($this->cachedLoadedRelationships)) {
            $this->cachedLoadedRelationships = new WeakMap;
        }
        $this->cachedLoadedRelationshipsMap = new WeakMap;

        return [
            'data' => (new Collection($this->resource->getRelations()))
                ->mapWithKeys(function ($relations, $key) {
                    if ($relations instanceof Collection) {
                        if ($relations->isEmpty()) {
                            return [$key => $relations];
                        }
        $this->cachedLoadedRelationshipsIdentifier = (new Collection($this->resource->getRelations()))
            ->mapWithKeys(function ($relations, $key) {
                if ($relations instanceof Collection) {
                    if ($relations->isEmpty()) {
                        return [$key => $relations];
                    }

                    $key = static::getResourceTypeFromEloquent($relations->first());

                        $key = static::getResourceTypeFromEloquent($relations->first());
                    return [$key => $relations->map(function ($relation) use ($key) {
                        return transform([$key, static::getResourceIdFromEloquent($relation)], function ($uniqueKey) use ($relation) {
                            $this->cachedLoadedRelationshipsMap[$relation] = $uniqueKey;

                        $relations->each(function ($relation) use ($key) {
                            $this->cachedLoadedRelationships[$relation] = [$key, $relation->getKey()];
                            return ['id' => $uniqueKey[1], 'type' => $uniqueKey[0]];
                        });
                    })];
                }

                        return [$key => $relations->map(function ($relation) use ($key) {
                            return tap([$key, static::getResourceIdFromEloquent($relation)], function ($uniqueKey) use ($relation) {
                                $this->cachedLoadedRelationships[$relation] = $uniqueKey;
                            });
                        })];
                return transform(
                    [static::getResourceTypeFromEloquent($relation), static::getResourceIdFromEloquent($relation)],
                    function ($uniqueKey) {
                        $this->cachedLoadedRelationshipsMap[$relation] = $uniqueKey;

                        return ['id' => $uniqueKey[1], 'type' => $uniqueKey[0]];
                    }
                );
            })->all();
    }

                    return tap(
                        [static::getResourceTypeFromEloquent($relation), static::getResourceIdFromEloquent($relation)],
                        function ($uniqueKey) use ($relations) {
                            $this->cachedLoadedRelationships[$relations] = $uniqueKey;
                        }
                    );
                }),
    protected function resolveResourceRelationshipsIdentifiers(Request $request): array
    {
        if (! $this->resource instanceof Model) {
            return [];
        }

        $this->resolveResourceRelationships($request);

        return [
            'data' => $this->cachedLoadedRelationshipsIdentifier,
        ];
    }

 protected function resolveResourceIncluded(Request $request): array
 public function resolveResourceIncluded(Request $request): array
    {
        $relations =[];
        $relations =new Collection();

        foreach ($this->cachedLoadedRelationships as $relation => $uniqueKey) {
            $relations[] = [
        foreach ($this->cachedLoadedRelationshipsMap as $relation => $uniqueKey) {
            $resource = rescue(fn () => $relation->toResource(), new JsonApiResource($relation), false);
            $relations->push([
                'id' => $uniqueKey[1],
                'type' => $uniqueKey[0],
                'attributes' =>rescue(fn () => $relation->toResource()->toArray($request), $relation->toArray(), false),
            ];
                'attributes' =>$resource->toArray($request),
            ]);
        }

        return $relations;
        return $relations->uniqueStrict(fn ($relation): array => [$relation['id'], $relation['type']])->all();
    }

    /**
diff --git a/src/Illuminate/Http/Resources/Json/JsonApiResource.php b/src/Illuminate/Http/Resources/Json/JsonApiResource.php
    public function resolve($request = null)
    {
        return [
            'data' => $this->resolveResourceToJsonApiSchema($request),
            'data' => $this->resolveResourceData($request),
        ];
    }

diff --git a/src/Illuminate/Http/Resources/Json/JsonApiResourceCollection.php b/src/Illuminate/Http/Resources/Json/JsonApiResourceCollection.php

 class JsonApiResourceCollection extends AnonymousResourceCollection
 {

    /**
     * @param  Request  $request
     * @return array{included?: array<int, JsonApiResource>, jsonapi: ServerImplementation}
     */
    public function with($request)
    {
        return array_filter([
            'included' => $this->collection
                ->map(fn ($resource) => $resource->resolveResourceIncluded($request))
                ->flatten(depth: 1)
                ->uniqueStrict(fn ($relation): array => [$relation['id'], $relation['type']])
                ->all(),
            ...($implementation = JsonApiResource::$jsonApiInformation)
                ? ['jsonapi' => $implementation]
                : [],
        ]);
    }

    /**
     * Transform the resource into a JSON array.
     *
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,7 @@
		use Illuminate\Database\Eloquent\Model;
		use Illuminate\Database\Eloquent\Relations\Relation;
		use Illuminate\Http\Request;
		use Illuminate\Http\Resources\Json\JsonApiResource;
		use Illuminate\Support\Collection;
		use Illuminate\Support\Str;
		use JsonSerializable;
Expand All		@@ -17,7 +18,12 @@ trait ResolvesJsonApiSpecifications
		/**
		* @var \WeakMap\|null
		*/
		protected $cachedLoadedRelationships;
		protected $cachedLoadedRelationshipsMap;

		/**
		* @var array
		*/
		protected array $cachedLoadedRelationshipsIdentifier = [];

		/**
		* Resolves `attributes` for the resource.
Expand DownExpand Up		@@ -51,67 +57,77 @@ public function resolveResourceData(Request $request): array
		'type' => $this->resolveResourceType($request),
		...(new Collection([
		'attributes' => $this->resolveResourceAttributes($request),
		'relationships' => $this->resolveResourceRelationships($request),
		'relationships' => $this->resolveResourceRelationshipsIdentifiers($request),
		'links' => $this->resolveResourceLinks($request),
		'meta' => $this->resolveMetaInformations($request),
		]))->filter()->map(fn ($value) => (object) $value),
		];
		}

		protected function resolveResourceRelationships(Request $request):array
		protected function resolveResourceRelationships(Request $request):void
		{
		if (!$this->resource instanceofModel) {
		return [];
		if ($this->cachedLoadedRelationships instanceofWeakMap) {
		return;
		}

		if (is_null($this->cachedLoadedRelationships)) {
		$this->cachedLoadedRelationships = new WeakMap;
		}
		$this->cachedLoadedRelationshipsMap = new WeakMap;

		return [
		'data' => (new Collection($this->resource->getRelations()))
		->mapWithKeys(function ($relations, $key) {
		if ($relations instanceof Collection) {
		if ($relations->isEmpty()) {
		return [$key => $relations];
		}
		$this->cachedLoadedRelationshipsIdentifier = (new Collection($this->resource->getRelations()))
		->mapWithKeys(function ($relations, $key) {
		if ($relations instanceof Collection) {
		if ($relations->isEmpty()) {
		return [$key => $relations];
		}

		$key = static::getResourceTypeFromEloquent($relations->first());

		$key = static::getResourceTypeFromEloquent($relations->first());
		return [$key => $relations->map(function ($relation) use ($key) {
		return transform([$key, static::getResourceIdFromEloquent($relation)], function ($uniqueKey) use ($relation) {
		$this->cachedLoadedRelationshipsMap[$relation] = $uniqueKey;

		$relations->each(function ($relation) use ($key) {
		$this->cachedLoadedRelationships[$relation] = [$key, $relation->getKey()];
		return ['id' => $uniqueKey[1], 'type' => $uniqueKey[0]];
		});
		})];
		}

		return [$key => $relations->map(function ($relation) use ($key) {
		return tap([$key, static::getResourceIdFromEloquent($relation)], function ($uniqueKey) use ($relation) {
		$this->cachedLoadedRelationships[$relation] = $uniqueKey;
		});
		})];
		return transform(
		[static::getResourceTypeFromEloquent($relation), static::getResourceIdFromEloquent($relation)],
		function ($uniqueKey) {
		$this->cachedLoadedRelationshipsMap[$relation] = $uniqueKey;

		return ['id' => $uniqueKey[1], 'type' => $uniqueKey[0]];
		}
		);
		})->all();
		}

		return tap(
		[static::getResourceTypeFromEloquent($relation), static::getResourceIdFromEloquent($relation)],
		function ($uniqueKey) use ($relations) {
		$this->cachedLoadedRelationships[$relations] = $uniqueKey;
		}
		);
		}),
		protected function resolveResourceRelationshipsIdentifiers(Request $request): array
		{
		if (! $this->resource instanceof Model) {
		return [];
		}

		$this->resolveResourceRelationships($request);

		return [
		'data' => $this->cachedLoadedRelationshipsIdentifier,
		];
		}

		protected function resolveResourceIncluded(Request $request): array
		public function resolveResourceIncluded(Request $request): array
		{
		$relations =[];
		$relations =new Collection();

		foreach ($this->cachedLoadedRelationships as $relation => $uniqueKey) {
		$relations[] = [
		foreach ($this->cachedLoadedRelationshipsMap as $relation => $uniqueKey) {
		$resource = rescue(fn () => $relation->toResource(), new JsonApiResource($relation), false);
		$relations->push([
		'id' => $uniqueKey[1],
		'type' => $uniqueKey[0],
		'attributes' =>rescue(fn () => $relation->toResource()->toArray($request), $relation->toArray(), false),
		];
		'attributes' =>$resource->toArray($request),
		]);
		}

		return $relations;
		return $relations->uniqueStrict(fn ($relation): array => [$relation['id'], $relation['type']])->all();
		}

		/**
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,7 +81,7 @@ public static function configure(?string $version = null, array $ext = [], array
		public function resolve($request = null)
		{
		return [
		'data' => $this->resolveResourceToJsonApiSchema($request),
		'data' => $this->resolveResourceData($request),
		];
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,6 +7,25 @@

		class JsonApiResourceCollection extends AnonymousResourceCollection
		{

		/**
		* @param Request $request
		* @return array{included?: array<int, JsonApiResource>, jsonapi: ServerImplementation}
		*/
		public function with($request)
		{
		return array_filter([
		'included' => $this->collection
		->map(fn ($resource) => $resource->resolveResourceIncluded($request))
		->flatten(depth: 1)
		->uniqueStrict(fn ($relation): array => [$relation['id'], $relation['type']])
		->all(),
		...($implementation = JsonApiResource::$jsonApiInformation)
		? ['jsonapi' => $implementation]
		: [],
		]);
		}

		/**
		* Transform the resource into a JSON array.
		*
Expand Down