cache basset blocks on production

Author: pxpm

src/Console/Commands/BassetCache.php

@@ -67,12 +67,22 @@ public function handle(): void
             ->flatMap(function (string $file) {
                 // Map all bassets
                 $content = File::get($file);
+                $bassets = collect();
+
                 preg_match_all('/(basset|@bassetArchive|@bassetDirectory)\((.+)\)/', $content, $matches);
+                foreach ($matches[1] as $i => $type) {
+                    $args = $this->parseBassetArguments($matches[2][$i]);
+                    $bassets->push([$type, $args]);
+                }
 
-                $matches[2] = collect($matches[2])
-                    ->map(fn ($match) => $this->parseBassetArguments($match));
+                preg_match_all('/@bassetBlock\((.+?)\)(.*?)@endBassetBlock/si', $content, $matches);
+                foreach ($matches[1] as $i => $argsString) {
+                    $args = $this->parseBassetArguments($argsString);
+                    array_splice($args, 1, 0, [$matches[2][$i]]);
+                    $bassets->push(['bassetBlock', $args]);
+                }
 
-                return collect($matches[1])->map(fn (string $type, int $i) => [$type, $matches[2][$i]]);
+                return $bassets;
             });
 
         $totalBassets = count($bassets);
@@ -98,6 +108,10 @@ public function handle(): void
                 $args[1] = false;
             }
 
+            if ($type === 'bassetBlock') {
+                $args[2] = false;
+            }
+
             try {
                 if (in_array($type, ['basset', 'bassetArchive', 'bassetDirectory', 'bassetBlock'])) {
                     $result = Basset::{$type}(...$args)->value;