Fixes inertiajs#298 (inertiajs#342)

* Fixes inertiajs#298

Author: NickSdot

src/Response.php

@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceResponse;
 use Illuminate\Support\Arr;
@@ -93,34 +94,7 @@ public function toResponse($request)
                 return ! ($prop instanceof LazyProp);
             });
 
-        array_walk_recursive($props, static function (&$prop) use ($request) {
-            if ($prop instanceof LazyProp) {
-                $prop = App::call($prop);
-            }
-
-            if ($prop instanceof Closure) {
-                $prop = App::call($prop);
-            }
-
-            if ($prop instanceof PromiseInterface) {
-                $prop = $prop->wait();
-            }
-
-            if ($prop instanceof ResourceResponse || $prop instanceof JsonResource) {
-                $prop = $prop->toResponse($request)->getData(true);
-            }
-
-            if ($prop instanceof Arrayable) {
-                $prop = $prop->toArray();
-            }
-        });
-
-        foreach ($props as $key => $value) {
-            if (str_contains($key, '.')) {
-                data_set($props, $key, $value);
-                unset($props[$key]);
-            }
-        }
+        $props = $this->resolvePropertyInstances($props, $request);
 
         $page = [
             'component' => $this->component,
@@ -138,4 +112,44 @@ public function toResponse($request)
 
         return ResponseFactory::view($this->rootView, $this->viewData + ['page' => $page]);
     }
+
+    /**
+     * Resolve all necessary class instances in the given props.
+     *
+     * @param  array  $props
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function resolvePropertyInstances(array $props, Request $request): array
+    {
+        foreach ($props as $key => $value) {
+            if ($value instanceof Closure) {
+                $value = App::call($value);
+            }
+
+            if ($value instanceof LazyProp) {
+                $value = App::call($value);
+            }
+
+            if ($value instanceof PromiseInterface) {
+                $value = $value->wait();
+            }
+
+            if ($value instanceof ResourceResponse || $value instanceof JsonResource) {
+                $value = $value->toResponse($request)->getData(true);
+            }
+
+            if ($value instanceof Arrayable) {
+                $value = $value->toArray();
+            }
+
+            if (is_array($value)) {
+                $value = $this->resolvePropertyInstances($value, $request);
+            }
+
+            Arr::set($props, $key, $value);
+        }
+
+        return $props;
+    }
 }

tests/ResponseTest.php

@@ -136,6 +136,62 @@ public function test_lazy_resource_response(): void
         });
     }
 
+    public function test_nested_lazy_resource_response(): void
+    {
+        $request = Request::create('/users', 'GET', ['page' => 1]);
+        $request->headers->add(['X-Inertia' => 'true']);
+
+        $users = Collection::make([
+            new Fluent(['name' => 'Jonathan']),
+            new Fluent(['name' => 'Taylor']),
+            new Fluent(['name' => 'Jeffrey']),
+        ]);
+
+        $callable = static function () use ($users) {
+            $page = new LengthAwarePaginator($users->take(2), $users->count(), 2);
+
+            // nested array with ResourceCollection to resolve
+            return [
+                'users' => new class($page, JsonResource::class) extends ResourceCollection {},
+            ];
+        };
+
+        $response = new Response('User/Index', ['something' => $callable], 'app', '123');
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+
+        $expected = [
+            'users' => [
+                'data' => $users->take(2),
+                'links' => [
+                    'first' => '/?page=1',
+                    'last' => '/?page=2',
+                    'prev' => null,
+                    'next' => '/?page=2',
+                ],
+                'meta' => [
+                    'current_page' => 1,
+                    'from' => 1,
+                    'last_page' => 2,
+                    'path' => '/',
+                    'per_page' => 2,
+                    'to' => 2,
+                    'total' => 3,
+                ],
+            ],
+        ];
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertSame('User/Index', $page->component);
+        $this->assertSame('/users?page=1', $page->url);
+        $this->assertSame('123', $page->version);
+        tap($page->props->something->users, function ($users) use ($expected) {
+            $this->assertSame(json_encode($expected['users']['data']), json_encode($users->data));
+            $this->assertSame(json_encode($expected['users']['links']), json_encode($users->links));
+            $this->assertSame('/', $users->meta->path);
+        });
+    }
+
     public function test_arrayable_prop_response(): void
     {
         $request = Request::create('/user/123', 'GET');