Merge pull request #26 from Stillat/improve-compatibility

Improve compatibility with other component compilers

Author: JohnathonKoster

src/Compiler/TemplateCompiler.php

@@ -181,7 +181,7 @@ protected function isRoot(): bool
     /**
      * Replaces all raw placeholders within the provided string.
      */
-    protected function resolveBlocks(string $value): string
+    public function resolveBlocks(string $value): string
     {
         $placeholders = array_keys($this->componentBlocks);
 
@@ -742,7 +742,7 @@ protected function simplifyNodes(array $nodes): array
 
     protected function storeComponentBlock(string $value): string
     {
-        $placeholder = '__RAW::'.Utils::makeRandomString();
+        $placeholder = '__DAGGER_RAW::'.Utils::makeRandomString();
         $this->componentBlocks[$placeholder] = $value;
 
         return $placeholder;

src/Facades/Compiler.php

@@ -16,6 +16,7 @@
  * @method static bool compiledDynamicComponentExists(string $proxyName, string $componentName)
  * @method static void compileDynamicComponent(array $proxyDetails, string $componentName)
  * @method static CompilerOptions getOptions()
+ * @method static resolveBlocks(string $value): string
  * @method static cleanup()
  */
 class Compiler extends Facade

src/Listeners/ResponsePreparedListener.php

@@ -17,6 +17,7 @@ public function __construct(ViewManifest $manifest)
     public function handle()
     {
         Compiler::cleanup();
+        ViewCreatingListener::clearCheckedViews();
 
         foreach ($this->manifest->getTracked() as $rootView => $tracked) {
             file_put_contents(

src/Listeners/ViewCreatingListener.php

@@ -2,24 +2,61 @@
 
 namespace Stillat\Dagger\Listeners;
 
+use Illuminate\Support\Str;
+use Stillat\Dagger\Facades\Compiler;
 use Stillat\Dagger\Runtime\ViewManifest;
 
 class ViewCreatingListener
 {
     protected ViewManifest $manifest;
 
+    protected static array $checkedViews = [];
+
     public function __construct(ViewManifest $manifest)
     {
         $this->manifest = $manifest;
     }
 
     public function create($view): void
     {
+        $this->checkForBladeRenderCall($view);
+
         $this->manifest->push($view);
 
         $this->checkForInvalidation($view);
     }
 
+    protected function checkForBladeRenderCall($view): void
+    {
+        $name = $view->getName();
+
+        if (! Str::startsWith($name, '__components::')) {
+            return;
+        }
+
+        if (isset(static::$checkedViews[$name])) {
+            return;
+        }
+
+        static::$checkedViews[$name] = true;
+
+        $path = $view->getPath();
+
+        if (! file_exists($path)) {
+            return;
+        }
+
+        file_put_contents(
+            $path,
+            Compiler::resolveBlocks(file_get_contents($path))
+        );
+    }
+
+    public static function clearCheckedViews(): void
+    {
+        static::$checkedViews = [];
+    }
+
     protected function checkForInvalidation($view): void
     {
         $name = $view->getName();