⚡ even better caching

classes/Blueprints/Blueprint.php

@@ -38,21 +38,40 @@ public function __toString(): string
         return Yaml::encode($this->toArray());
     }
 
+    public function blueprintCacheKeyFromModel(): string
+    {
+        $ref = new ReflectionClass($this->modelClass);
+
+        if ($ref->isSubclassOf(\Kirby\Cms\Page::class)) {
+            return 'pages/'.strtolower(substr($this->modelClass, 0, -4));
+        } elseif ($ref->isSubclassOf(\Kirby\Cms\File::class)) {
+            return 'files/'.strtolower(substr($this->modelClass, 0, -4));
+        } elseif ($ref->isSubclassOf(\Kirby\Cms\User::class)) {
+            return 'users/'.strtolower(substr($this->modelClass, 0, -4));
+        }
+
+        return $this->modelClass;
+    }
+
     public function toArray(): array
     {
-        $blueprint = $this->cache ? BlueprintCache::get($this->modelClass, null, $this->cache) : null;
+        $key = $this->blueprintCacheKeyFromModel();
+        $blueprint = $this->cache ? BlueprintCache::get($key, null, $this->cache) : null;
         if ($blueprint) {
-            return $blueprint;
+            return [$key => $blueprint];
         }
 
         $blueprint = self::getBlueprintUsingReflection($this->modelClass);
+        // get first value of array, the key of array matched the $key
+        $blueprint = reset($blueprint);
 
         // some might not be cacheable like when they are class based and have dynamic fields
-        if ($this->cache) {
-            BlueprintCache::set($this->modelClass, $blueprint);
+        // only set here now if they will not be written on __destruct by trait
+        if ($this->cache && ! method_exists($this->modelClass, 'blueprintCacheKey')) {
+            BlueprintCache::set($key, $blueprint);
         }
 
-        return $blueprint;
+        return [$key => $blueprint];
     }
 
     public static function getBlueprintFieldsFromReflection(string $class): array

classes/Blueprints/BlueprintCache.php

@@ -31,11 +31,8 @@ public static function cacheDir(): ?string
 
     protected static function cacheFile(string $key): ?string
     {
-        $hash = hash('xxh3', $key);
-        $hash = substr($hash, 0, 2).'/'.substr($hash, 2);
-
         return static::cacheDir() ?
-            static::cacheDir().'/'.$hash.'.cache'
+            static::cacheDir().'/'.$key.'.cache'
             : null;
     }
 
@@ -64,7 +61,14 @@ public static function exists(string $key, $expire = null): bool
 
     public static function get(string $key, $default = null, $expire = null): ?array
     {
+        /*
+        if ($loaded = \Kirby\Toolkit\A::get(\Kirby\Cms\Blueprint::$loaded, $key)) {
+            return $loaded;
+        }
+        */
+
         $file = static::cacheFile($key);
+
         if ($file && static::exists($key, $expire)) {
             return Json::read($file);
         }
@@ -84,28 +88,22 @@ public static function getKey(): string
         return 'bnomei.blueprints.cache.dir';
     }
 
+    /*
     public static function preloadCachedBlueprints(): void
     {
-        $kirby = kirby();
-        $preload = $kirby->option('bnomei.blueprints.preload');
-        if ($preload === false) {
-            return;
-        }
-
-        $preloaded = [];
-        foreach ($preload as $type) {
-            $blueprints = $kirby->blueprints($type);
-            foreach ($blueprints as $name) {
-                $key = $type.'/'.$name;
-                $blueprint = static::get($key);
-                if ($blueprint === null) {
+        foreach (Dir::dirs(static::cacheDir(), [], true) as $dir) {
+            foreach (Dir::files($dir, [], true) as $file) {
+                if (! \Kirby\Toolkit\Str::endsWith($file, '.cache')) {
                     continue;
                 }
-                $preloaded[$key] = $blueprint;
+                $key = str_replace([static::cacheDir().'/', '.cache'], ['', ''], $file);
+                $blueprint = Json::read($file);
+                \Kirby\Cms\Blueprint::$loaded[$key] = $blueprint;
             }
         }
-        $kirby->extend([
-            'blueprints' => $preloaded,
-        ]);
+        // ray('preloaded', \Kirby\Cms\Blueprint::$loaded);
+
+        return count(\Kirby\Cms\Blueprint::$loaded);
     }
+    */
 }

classes/Blueprints/HasBlueprintCache.php

@@ -17,9 +17,9 @@ public function blueprintCacheKey(): string
             PageBlueprint::class => 'pages',
             FileBlueprint::class => 'files',
             UserBlueprint::class => 'users',
-        };
+        }.'/';
 
-        return $type.'/'.$blueprint->name();
+        return $type.str_replace($type, '', $blueprint->name());
     }
 
     public function __destruct()
@@ -34,12 +34,16 @@ public function __destruct()
         if (BlueprintCache::exists($key) === false) {
             $blueprint = $this->blueprint();
             $data = $blueprint->toArray();
+            $copy = $data;
             if (isset(static::$blueprintCacheResolve)) {
-                foreach ($blueprint->toArray()['tabs'] as $tabKey => $tab) {
+                foreach ($copy['tabs'] as $tabKey => $tab) {
                     foreach ($tab['columns'] as $columnKey => $column) {
                         foreach ($column['sections'] as $sectionKey => $section) {
                             $section = $blueprint->section($sectionKey);
-                            $data['tabs'][$tabKey]['columns'][$columnKey]['sections'][$sectionKey]['fields'] = $section->toArray()['fields'];
+                            $path = $data['tabs'][$tabKey]['columns'][$columnKey]['sections'][$sectionKey];
+                            if (array_key_exists('fields', $path)) {
+                                $path['fields'] = $section->toArray()['fields'];
+                            }
                         }
                     }
                 }

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby-blueprints",
     "type": "kirby-plugin",
-    "version": "4.4.0",
+    "version": "4.4.1",
     "license": "MIT",
     "homepage": "https://github.com/bnomei/kirby3-blueprints",
     "description": "PHP Class-based Blueprints for Kirby CMS for better type safety and code completion",
@@ -51,7 +51,7 @@
         "getkirby/composer-installer": "^1.2"
     },
     "require-dev": {
-        "bnomei/autoloader-for-kirby": "^4.2.1",
+        "bnomei/autoloader-for-kirby": "^4.2",
         "getkirby/cms": "^4.0.0-beta.2",
         "larastan/larastan": "^2.9",
         "laravel/pint": "^1.11",

index.php

@@ -15,7 +15,6 @@
             // and use it on next request
             \Bnomei\Blueprints\BlueprintCache::rememberCacheDir();
             \Bnomei\Blueprints\Blueprint::loadPluginsAfter();
-            \Bnomei\Blueprints\BlueprintCache::preloadCachedBlueprints();
         },
     ],
 ]);

tests/index.php

@@ -6,7 +6,9 @@
 require __DIR__.'/../vendor/autoload.php';
 
 $micotime = microtime(true);
-$render = (new Kirby())->render();
+//\Bnomei\Blueprints\BlueprintCache::preloadFromLoadMap();
+$kirby = new Kirby();
+$render = $kirby->render();
 $micotime = microtime(true) - $micotime;
 header('X-Render-Time: '.number_format($micotime, 3, '.', '').'s');
 echo $render;

tests/site/models/caching.php

@@ -0,0 +1,7 @@
+<?php
+
+class CachingPage extends \Kirby\Cms\Page
+{
+    use \Bnomei\Blueprints\HasBlueprintCache;
+    use \Bnomei\Blueprints\HasBlueprintCacheResolve;
+}

tests/site/models/example.php

@@ -3,5 +3,5 @@
 class ExamplePage extends \Kirby\Cms\Page
 {
     use \Bnomei\Blueprints\HasBlueprintCache;
-    use \Bnomei\Blueprints\HasBlueprintCacheResolve;
+    //use \Bnomei\Blueprints\HasBlueprintCacheResolve;
 }