Fix handling of deleted compiled files (#114)

* Fix handling of deleted compiled files

* Update BlazeRuntime.php

Author: ganyicz

src/BladeRenderer.php

@@ -5,6 +5,7 @@
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Facades\File;
 use Illuminate\View\Compilers\BladeCompiler;
+use Illuminate\View\Component;
 use Livewire\Blaze\Runtime\BlazeRuntime;
 use ReflectionClass;
 
@@ -79,13 +80,15 @@ function ($input) {
         ]);
 
         $restoreRuntime = $this->freezeObjectProperties($this->runtime, [
-            'compiled' => [],
-            'paths' => [],
             'compiledPath' => $temporaryCachePath,
             'dataStack' => [],
             'slotsStack' => [],
         ]);
 
+        $restoreComponent = $this->freezeObjectProperties(Component::class, [
+            'bladeViewCache' => [],
+        ]);
+
         try {
             $this->manager->startFolding();
 
@@ -94,6 +97,7 @@ function ($input) {
             $restoreCompiler();
             $restoreFactory();
             $restoreRuntime();
+            $restoreComponent();
 
             $this->manager->stopFolding();
         }
@@ -114,7 +118,7 @@ public function deleteTemporaryCacheDirectory(): void
     /**
      * Snapshot object properties and return a restore closure to revert them.
      */
-    protected function freezeObjectProperties(object $object, array $properties)
+    protected function freezeObjectProperties(object|string $object, array $properties)
     {
         $reflection = new ReflectionClass($object);
 
@@ -125,7 +129,7 @@ protected function freezeObjectProperties(object $object, array $properties)
 
             $property = $reflection->getProperty($name);
 
-            $frozen[$name] = $property->getValue($object);
+            $frozen[$name] = $property->getValue(is_object($object) ? $object : null);
 
             if (! is_numeric($key)) {
                 $property->setValue($object, $value);

src/Compiler/Compiler.php

@@ -14,7 +14,7 @@
 use Livewire\Blaze\Support\Utils;
 
 /**
- * Compiles component nodes into PHP require_once + function call output.
+ * Compiles component nodes into PHP function call output.
  */
 class Compiler
 {
@@ -31,7 +31,7 @@ public function __construct(
     }
 
     /**
-     * Compile a component node into ensureCompiled + require_once + function call.
+     * Compile a component node into ensureRequired + function call.
      */
     public function compile(Node $node): Node
     {
@@ -91,7 +91,7 @@ protected function hasDynamicSlotNames(ComponentNode $node): bool
     }
 
     /**
-     * Compile a standard component tag into ensureCompiled + require_once + function call.
+     * Compile a standard component tag into ensureRequired + function call.
      */
     protected function compileComponentTag(ComponentNode $node, ComponentSource $source): string
     {
@@ -100,8 +100,7 @@ protected function compileComponentTag(ComponentNode $node, ComponentSource $sou
         $slotsVariableName = '$slots' . $hash;
         [$attributesArrayString, $boundKeysArrayString] = $this->getAttributesAndBoundKeysArrayStrings($node->attributeString);
 
-        $output = '<' . '?php $__blaze->ensureCompiled(\'' . $source->path . '\', $__blaze->compiledPath.\'/'. $hash . '.php\'); ?>' . "\n";
-        $output .= '<' . '?php require_once $__blaze->compiledPath.\'/'. $hash . '.php\'; ?>' . "\n";
+        $output = '<' . '?php $__blaze->ensureRequired(\'' . $source->path . '\', $__blaze->compiledPath.\'/'. $hash . '.php\'); ?>' . "\n";
 
         if ($node->selfClosing) {
             $output .= '<' . '?php $__blaze->pushData(' . $attributesArrayString . '); ?>' . "\n";
@@ -136,7 +135,6 @@ protected function compileDelegateComponentTag(ComponentNode $node): string
         $output .= '<' . '?php $__blaze->pushData($attributes->all()); ?>' . "\n";
 
         $output .= '<' . '?php if ($__resolved !== false): ?>' . "\n";
-        $output .= '<' . '?php require_once $__blaze->compiledPath . \'/\' . $__resolved . \'.php\'; ?>' . "\n";
 
         if ($node->selfClosing) {
             $output .= '<' . '?php ' . $functionName . '($__blaze, $attributes->all(), $__blaze->mergedComponentSlots(), [], isset($this) ? $this : null); ?>' . "\n";

src/Compiler/Profiler.php

@@ -14,9 +14,9 @@
  *
  * This runs as the final step in the AST pipeline, AFTER folder, memoizer,
  * and compiler. It wraps the call site — not the function body — so the
- * timer captures initialization, require_once, pushData, the render itself,
- * and popData. This gives us unified timing for both Blaze-compiled and
- * standard Blade components.
+ * timer captures initialization, pushData, the render itself, and
+ * popData. This gives us unified timing for both Blaze-compiled
+ * and standard Blade components.
  */
 class Profiler
 {

src/Runtime/BlazeRuntime.php

@@ -22,7 +22,7 @@ class BlazeRuntime
     protected ?string $compiledPath = null;
 
     protected array $paths = [];
-    protected array $compiled = [];
+    protected array $required = [];
     protected array $blazed = [];
 
     protected array $dataStack = [];
@@ -40,19 +40,19 @@ public function __construct(
     /**
      * Compile a component if its source is newer than the cached output.
      */
-    public function ensureCompiled(string $path, string $compiledPath): void
+    public function ensureRequired(string $path, string $compiledPath): void
     {
-        if (isset($this->compiled[$path])) {
+        if (isset($this->required[$path])) {
             return;
         }
 
-        $this->compiled[$path] = true;
-
-        if (file_exists($compiledPath) && filemtime($path) <= filemtime($compiledPath)) {
-            return;
+        if (! file_exists($compiledPath) || filemtime($path) > filemtime($compiledPath)) {
+            $this->compiler->compile($path);
         }
 
-        $this->compiler->compile($path);
+        require_once $compiledPath;
+
+        $this->required[$path] = true;
     }
 
     /**
@@ -77,8 +77,8 @@ public function resolve(string $component): string|false
         $hash = Utils::hash($path);
         $compiled = $this->getCompiledPath().'/'.$hash.'.php';
 
-        if (! isset($this->compiled[$path])) {
-            $this->ensureCompiled($path, $compiled);
+        if (! isset($this->required[$path])) {
+            $this->ensureRequired($path, $compiled);
         }
 
         return $hash;
@@ -251,9 +251,6 @@ public function setApplication(Application $app): void
      */
     public function flushState(): void
     {
-        $this->paths = [];
-        $this->compiled = [];
-        $this->blazed = [];
         $this->dataStack = [];
         $this->slotsStack = [];
     }

tests/Compiler/CompilerTest.php

@@ -14,8 +14,7 @@
     $hash = Utils::hash($path);
 
     expect($compiled->render())->toEqualCollapsingWhitespace(join('', [
-        '<?php $__blaze->ensureCompiled(\''. $path .'\', $__blaze->compiledPath.\'/'. $hash .'.php\'); ?> ',
-        '<?php require_once $__blaze->compiledPath.\'/'. $hash .'.php\'; ?> ',
+        '<?php $__blaze->ensureRequired(\''. $path .'\', $__blaze->compiledPath.\'/'. $hash .'.php\'); ?> ',
         '<?php $__blaze->pushData([\'type\' => \'text\',\'disabled\' => $disabled]); ?> ',
         '<?php _'. $hash .'($__blaze, [\'type\' => \'text\',\'disabled\' => $disabled], [], [\'disabled\'], isset($this) ? $this : null); ?> ',
         '<?php $__blaze->popData(); ?>',
@@ -43,8 +42,7 @@
     $hash = Utils::hash($path);
 
     expect($compiled->render())->toEqualCollapsingWhitespace(join('', [
-        '<?php $__blaze->ensureCompiled(\''. $path .'\', $__blaze->compiledPath.\'/'. $hash .'.php\'); ?> ',
-        '<?php require_once $__blaze->compiledPath.\'/'. $hash .'.php\'; ?> ',
+        '<?php $__blaze->ensureRequired(\''. $path .'\', $__blaze->compiledPath.\'/'. $hash .'.php\'); ?> ',
         '<?php $__attrs'. $hash .' = []; ?> ',
         '<?php $__blaze->pushData($__attrs'. $hash .'); ?> ',
         '<?php $slots'. $hash .' = []; ?> ',
@@ -67,7 +65,6 @@
         '<?php $__resolved = $__blaze->resolve(\'flux::\' . card); ?> ',
         '<?php $__blaze->pushData($attributes->all()); ?> ',
         '<?php if ($__resolved !== false): ?> ',
-        '<?php require_once $__blaze->compiledPath . \'/\' . $__resolved . \'.php\'; ?> ',
         '<?php (\'_\' . $__resolved)($__blaze, $attributes->all(), $__blaze->mergedComponentSlots(), [], isset($this) ? $this : null); ?> ',
         '<?php else: ?> ',
         '<flux:delegate-component component="card" /> ',

tests/IntegrationTest.php

@@ -3,8 +3,10 @@
 use Illuminate\Container\Container;
 use Illuminate\Contracts\View\Engine;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\View\Component;
 use Livewire\Blaze\Blaze;
 use Livewire\Blaze\BlazeManager;
+use Livewire\Blaze\Runtime\BlazeRuntime;
 
 beforeEach(fn () => Artisan::call('view:clear'));
 
@@ -25,6 +27,14 @@
     view('mix')->render();
 })->throwsNoExceptions();
 
+test('renders components after clearing compiled views in the same process', function () {
+    view('mix')->render();
+
+    Artisan::call('view:clear');
+
+    view('mix')->render();
+})->throwsNoExceptions();
+
 test('supports php engine', function () {
     view('php-view')->render();
 })->throwsNoExceptions();

tests/Memoizer/MemoizerTest.php

@@ -22,8 +22,7 @@
         '<?php echo \Livewire\Blaze\Memoizer\Memo::get($blaze_memoized_key); ?>',
         '<?php else : ?>',
         '<?php ob_start(); ?>',
-        '<?php $__blaze->ensureCompiled(\''. $path .'\', $__blaze->compiledPath.\'/'. $hash .'.php\'); ?> ',
-        '<?php require_once $__blaze->compiledPath.\'/'. $hash .'.php\'; ?> ',
+        '<?php $__blaze->ensureRequired(\''. $path .'\', $__blaze->compiledPath.\'/'. $hash .'.php\'); ?> ',
         '<?php $__blaze->pushData([\'src\' => $user->avatar]); ?> ',
         '<?php _'. $hash .'($__blaze, [\'src\' => $user->avatar], [], [\'src\'], isset($this) ? $this : null); ?> ',
         '<?php $__blaze->popData(); ?>',