🐛 $field->toFilesTurbo() did not resolve properly

Author: bnomei

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby-turbo",
     "type": "kirby-plugin",
-    "version": "5.1.0",
+    "version": "5.1.1",
     "description": "Speed up Kirby with caching",
     "license": "proprietary",
     "authors": [

composer.lock

@@ -17,12 +17,14 @@
 use Bnomei\TurboStopwatch;
 use Bnomei\TurboUuidCache;
 use Kirby\Cms\App;
+use Kirby\Cms\File;
 use Kirby\Cms\Files;
 use Kirby\Cms\Page;
 use Kirby\Cms\Pages;
 use Kirby\Content\Field;
 use Kirby\Filesystem\F;
 use Kirby\Http\Route;
+use Kirby\Toolkit\A;
 
 @include_once __DIR__.'/vendor/autoload.php';
 
@@ -286,26 +288,45 @@ function tubs(array|string $key, Closure $closure): mixed
             },
         ],
         'fieldMethods' => [
+            'toFileTurbo' => function (Field $field): ?File {
+                return $field->toFilesTurbo()->first();
+            },
             'toFilesTurbo' => function (Field $field): Files {
                 if (kirby()->option('cache.uuid.type') === 'turbo-uuid') {
-                    $ids = [];
-                    foreach ($field->yaml() as $uuid) { // @phpstan-ignore-line
-                        $uuid = 'file/'.substr($uuid, 7, 2).'/'.substr($uuid, 9);
-                        $ids[] = kirby()->cache('uuid')->get($uuid);
+                    $files = [];
+                    $pages = [];
+                    $cache = kirby()->cache('uuid');
+                    foreach ($field->yaml() as $fileKey) { // @phpstan-ignore-line
+                        $fileKey = 'file/'.substr($fileKey, 7, 2).'/'.substr($fileKey, 9);
+                        if ($data =$cache->get($fileKey)) {
+                            $parentUuid = is_array($data) ? A::get($data, 'parent') : null;
+                            if (! $parentUuid) {
+                                continue;
+                            }
+                            $parentKey = 'page/'.substr($parentUuid, 7, 2).'/'.substr($parentUuid, 9);
+                            if ($parentId =$cache->get($parentKey)) {
+                                $pages[$parentId] = A::get($pages, $parentId, kirby()->page($parentId));
+                                $files[] = $pages[$parentId]?->file(A::get($data, 'filename'));
+                            }
+                        }
                     }
 
-                    return new Files(array_filter($ids));
+                    return new Files(array_filter($files));
                 }
 
                 // default
                 return $field->toFiles(); // @phpstan-ignore-line
             },
+            'toPageTurbo' => function (Field $field): ?Page {
+                return $field->toPagesTurbo()->first();
+            },
             'toPagesTurbo' => function (Field $field): Pages {
                 if (kirby()->option('cache.uuid.type') === 'turbo-uuid') {
                     $ids = [];
+                    $cache = kirby()->cache('uuid');
                     foreach ($field->yaml() as $uuid) {  // @phpstan-ignore-line
-                        $uuid = 'page/'.substr($uuid, 7, 2).'/'.substr($uuid, 9);
-                        $ids[] = kirby()->cache('uuid')->get($uuid);
+                        $key = 'page/'.substr($uuid, 7, 2).'/'.substr($uuid, 9);
+                        $ids[] = $cache->get($key);
                     }
 
                     return new Pages(array_filter($ids));

index.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby-turbo',
-        'pretty_version' => '5.1.0',
-        'version' => '5.1.0.0',
+        'pretty_version' => '5.1.1',
+        'version' => '5.1.1.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby-turbo' => array(
-            'pretty_version' => '5.1.0',
-            'version' => '5.1.0.0',
+            'pretty_version' => '5.1.1',
+            'version' => '5.1.1.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',