🐛 id-indexing (not content cache) did not consider drafts when performing full index

drafts where added to index less obviously later when any hook was triggered or and search to that id caused a crawl.
now it should not crawl for individual ids that often but initial indexing is a bit slower.

Author: bnomei

README.md

@@ -320,6 +320,7 @@ echo $page->tinyurl(); // https://devkit.bnomei.com/x/8j5g64hh
 | expire | `0` | expire in minutes for all caches created |
 | read | `true` | read from cache |
 | write | `true` | write to cache |
+| drafts | `true` | index drafts |
 | fileModifiedCheck | `false` | expects file to not be altered outside of kirby |
 | index.generator | callback | the uuid genertor |
 | tinyurl.url | callback | returning `site()->url()`. Use htaccess on that domain to redirect `RewriteRule (.*) http://www.bnomei.com/x/$1 [R=301]` |

classes/BoostIndex.php

@@ -75,7 +75,6 @@ public function index(bool $force = false, ?Page $target = null): int
 
         $this->index = [];
         $count = 0;
-        // NOT: index() does not include drafts
         foreach (kirby()->collection('boostidpages') as $page) {
             if ($this->add($page)) {
                 $count++;
@@ -124,7 +123,6 @@ public function findByBoostId(string $boostid, bool $throwException = true): ?Pa
             if ($crawl) {
                 return $crawl;
             } elseif ($throwException) {
-                $this->write();
                 throw new \Exception("No page found for BoostID: " . $boostid);
             }
         }

collections/boostidpages.php

@@ -4,7 +4,8 @@
     // NOTE: this does not have a cached since cached content is assumed
     // NOTE: this collection does not include drafts
     // PERFORMANCE ISSUE: https://github.com/getkirby/kirby/issues/3746
-    return $site->index()->filter(function ($page) {
+    $drafts = option('bnomei.boost.drafts');
+    return $site->index($drafts)->filter(function ($page) {
         return $page->hasBoost() === true;
     });
 };

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "bnomei/kirby3-boost",
   "type": "kirby-plugin",
-  "version": "1.6.6",
+  "version": "1.7.0",
   "description": "Boost the speed of Kirby by having content files of pages cached, with automatic unique ID, fast lookup and Tiny-URL.",
   "license": "MIT",
   "authors": [

index.php

@@ -30,7 +30,8 @@ function boost(string $id): ?\Kirby\Cms\Page
     /*
     function siteIndexFilterByBoostID(string $id): ?\Kirby\Cms\Page
     {
-        return site()->index()->filter(function ($page) use ($id) {
+        $drafts = option('bnomei.boost.drafts');
+        return site()->index($drafts)->filter(function ($page) use ($id) {
             return $page->boostIDField()->value() === $id;
         })->first();
     }
@@ -45,6 +46,7 @@ function siteIndexFilterByBoostID(string $id): ?\Kirby\Cms\Page
         'fileModifiedCheck' => false, // expects file to not be altered outside of kirby
         'read' => true, // read from cache
         'write' => true, // write to cache
+        'drafts' => true, // index drafts as well
         'index' => [
             'generator' => function (?string $seed = null) {
                 // override with custom callback if needed
@@ -183,10 +185,12 @@ function siteIndexFilterByBoostID(string $id): ?\Kirby\Cms\Page
     ],
     'siteMethods' => [
         'boost' => function () {
-            return site()->index()->boost();
+            $drafts = option('bnomei.boost.drafts');
+            return site()->index($drafts)->boost();
         },
         'boostmark' => function () {
-            return site()->index()->boostmark();
+            $drafts = option('bnomei.boost.drafts');
+            return site()->index($drafts)->boostmark();
         },
     ],
     'fieldMethods' => [

vendor/composer/installed.php

@@ -1,7 +1,7 @@
 <?php return array(
     'root' => array(
-        'pretty_version' => '1.6.6',
-        'version' => '1.6.6.0',
+        'pretty_version' => '1.7.0',
+        'version' => '1.7.0.0',
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -20,8 +20,8 @@
             'dev_requirement' => false,
         ),
         'bnomei/kirby3-boost' => array(
-            'pretty_version' => '1.6.6',
-            'version' => '1.6.6.0',
+            'pretty_version' => '1.7.0',
+            'version' => '1.7.0.0',
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),