✨ unroll blueprint files to arrays, adding needed name key automati…

…cally Signed-off-by: bnomei <b@bnomei.com>
bnomei · Mar 21, 2024 · 7aae435 · 7aae435
1 parent 6bad8e6
commit 7aae435
Show file tree

Hide file tree

Showing 13 changed files with 931 additions and 437 deletions.
diff --git a/classes/Autoloader.php b/classes/Autoloader.php
@@ -59,7 +59,7 @@ public function __construct(array $options = [])
                 'folder' => 'blueprints',
                 'name' => self::ANY_PHP_OR_YML,
                 'key' => 'relativepath',
-                'require' => false,
+                'require' => true, // false
                 'transform' => fn ($key) => strtolower($key),
             ],
             'classes' => [
@@ -213,6 +213,7 @@ private function registry(string $type): array
                     }
                 }
             }
+
             if (empty($key)) {
                 continue;
             } else {
@@ -246,12 +247,16 @@ private function registry(string $type): array
                         is_array($route) ? $route : []
                     );
                 }
-            } elseif ($options['require'] && $extension && strtolower($extension) === 'php') {
-                $path = $file->getPathname();
-                $this->registry[$type][$key] = require_once $path;
             } elseif ($options['folder'] === 'blueprints' && $extension && strtolower($extension) === 'php') {
                 $path = $file->getPathname();
-                $this->registry[$type][$key] = require_once $path;
+                $this->registry[$type][$key] = include $path; // require will link, include will read
+                if (is_array($this->registry[$type][$key])) {
+                    $kk = explode('/', $key);
+                    $this->registry[$type][$key]['name'] = array_pop($kk);
+                }
+            } elseif ($options['require'] && $extension && strtolower($extension) === 'php') {
+                $path = $file->getPathname();
+                $this->registry[$type][$key] = include $path; // require will link, include will read
             } elseif ($options['require'] && $extension && strtolower($extension) === 'json') {
                 $path = $file->getPathname();
                 $this->registry[$type][$key] = json_decode(file_get_contents($path), true);
@@ -264,6 +269,10 @@ private function registry(string $type): array
                 } else {
                     $this->registry[$type][$key] = Spyc::YAMLLoadString($yaml);
                 }
+                if (is_array($this->registry[$type][$key]) && $options['folder'] === 'blueprints') {
+                    $kk = explode('/', $key);
+                    $this->registry[$type][$key]['name'] = array_pop($kk);
+                }
             } else {
                 $this->registry[$type][$key] = $file->getRealPath();
             }

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "bnomei/autoloader-for-kirby",
     "type": "project",
-    "version": "4.1.0",
+    "version": "4.2.0",
     "license": "MIT",
     "description": "Helper to automatically load various Kirby extensions in a plugin",
     "authors": [
@@ -60,11 +60,12 @@
     },
     "require-dev": {
         "getkirby/cms": "^4.0.0-beta.2",
+        "larastan/larastan": "^2.9",
         "laravel/pint": "^1.13",
-        "nunomaduro/larastan": "^2.6",
         "pestphp/pest": "^2.24",
         "pestphp/pest-plugin-drift": "^2.5",
-        "pestphp/pest-plugin-type-coverage": "^2.4"
+        "pestphp/pest-plugin-type-coverage": "^2.4",
+        "spatie/ray": "^1.41"
     },
     "scripts": {
         "analyze": "./vendor/bin/phpstan",