fix(view): wrong matched imports in view component slots (#1173)

Co-authored-by: brendt <[email protected]>

Author: erikaraujo

src/Tempest/View/src/Parser/TempestViewCompiler.php

@@ -15,6 +15,7 @@
 
 use function Tempest\Support\arr;
 use function Tempest\Support\path;
+use function Tempest\Support\str;
 
 final readonly class TempestViewCompiler
 {
@@ -49,7 +50,10 @@ public function compile(string|View $view): string
         // 5. Compile to PHP
         $compiled = $this->compileElements($elements);
 
-        return $compiled;
+        // 6. Cleanup compiled PHP
+        $cleaned = $this->cleanupCompiled($compiled);
+
+        return $cleaned;
     }
 
     private function retrieveTemplate(string|View $view): string
@@ -172,4 +176,38 @@ private function compileElements(array $elements): string
             ->implode(PHP_EOL)
             ->toString();
     }
+
+    private function cleanupCompiled(string $compiled): string
+    {
+        // Remove strict type declarations
+        $compiled = str($compiled)->replace('declare(strict_types=1);', '');
+
+        // Cleanup and bundle imports
+        $imports = arr();
+
+        $compiled = $compiled->replaceRegex("/^\s*use (function )?.*;/m", function (array $matches) use (&$imports) {
+            // The import contains escaped slashes, meaning it's a var_exported string; we can ignore those
+            if (str_contains($matches[0], '\\\\')) {
+                return $matches[0];
+            }
+
+            $imports[$matches[0]] = $matches[0];
+
+            return '';
+        });
+
+        $compiled = $compiled->prepend(
+            sprintf(
+                '<?php
+%s
+?>',
+                $imports->implode(PHP_EOL),
+            ),
+        );
+
+        // Remove empty PHP blocks
+        $compiled = $compiled->replaceRegex('/<\?php\s*\?>/', '');
+
+        return $compiled->toString();
+    }
 }

src/Tempest/View/src/Renderers/TempestViewRenderer.php

@@ -49,43 +49,14 @@ public function render(string|View $view): string
 
         $path = $this->viewCache->getCachedViewPath(
             path: $view->path,
-            compiledView: fn () => $this->cleanupCompiled($this->compiler->compile($view)),
+            compiledView: fn () => $this->compiler->compile($view),
         );
 
         $view = $this->processView($view);
 
         return $this->renderCompiled($view, $path);
     }
 
-    private function cleanupCompiled(string $compiled): string
-    {
-        // Remove strict type declarations
-        $compiled = str($compiled)->replace('declare(strict_types=1);', '');
-
-        // Cleanup and bundle imports
-        $imports = arr();
-
-        $compiled = $compiled->replaceRegex("/^\s*use (function )?.*;/m", function (array $matches) use (&$imports) {
-            $imports[$matches[0]] = $matches[0];
-
-            return '';
-        });
-
-        $compiled = $compiled->prepend(
-            sprintf(
-                '<?php
-%s
-?>',
-                $imports->implode(PHP_EOL),
-            ),
-        );
-
-        // Remove empty PHP blocks
-        $compiled = $compiled->replaceRegex('/<\?php\s*\?>/', '');
-
-        return $compiled->toString();
-    }
-
     private function processView(View $view): View
     {
         foreach ($this->viewConfig->viewProcessors as $viewProcessorClass) {

tests/Fixtures/Views/view-with-icon-inside-named-slot.view.php

@@ -0,0 +1,6 @@
+<x-test-layout>
+    <x-slot name="icon">
+        <x-icon name="ph:eye" class="size-5" />
+    </x-slot>
+    Test
+</x-test-layout>

tests/Integration/FrameworkIntegrationTestCase.php

@@ -163,4 +163,12 @@ protected function registerStaticPage(array|string|MethodReflector $action): voi
             $reflector,
         );
     }
+
+    protected function assertSnippetsMatch(string $expected, string $actual): void
+    {
+        $expected = str_replace([PHP_EOL, ' '], '', $expected);
+        $actual = str_replace([PHP_EOL, ' '], '', $actual);
+
+        $this->assertSame($expected, $actual);
+    }
 }

tests/Integration/View/IconComponentTest.php

@@ -14,6 +14,8 @@
 use Tempest\View\IconConfig;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
 
+use function Tempest\view;
+
 final class IconComponentTest extends FrameworkIntegrationTestCase
 {
     protected function setUp(): void
@@ -183,4 +185,26 @@ public function test_with_dynamic_data(): void
             $rendered,
         );
     }
+
+    public function test_icon_renders_inside_named_slot_in_a_layout(): void
+    {
+        $this->registerViewComponent('x-test-layout', '<x-index><div><x-slot name="icon" /></div><x-slot /></x-index>');
+
+        $mockHttpClient = $this->createMock(HttpClient::class);
+        $mockHttpClient
+            ->expects($this->exactly(1))
+            ->method('get')
+            ->with('https://api.iconify.design/ph/eye.svg')
+            ->willReturn(new GenericResponse(status: Status::OK, body: '<svg></svg>'));
+
+        $this->container->register(HttpClient::class, fn () => $mockHttpClient);
+
+        $view = view(__DIR__ . '/../../Fixtures/Views/view-with-icon-inside-named-slot.view.php');
+        $html = $this->render($view);
+
+        $this->assertSnippetsMatch(
+            '<html lang="en"><head><title></title></head><body><div><svg class="size-5"></svg></div>Test</body></html>',
+            $html,
+        );
+    }
 }

tests/Integration/View/TempestViewRendererDataPassingTest.php

@@ -347,14 +347,6 @@ public function test_echo_in_attributes(): void
         );
     }
 
-    private function assertSnippetsMatch(string $expected, string $actual): void
-    {
-        $expected = str_replace([PHP_EOL, ' '], '', $expected);
-        $actual = str_replace([PHP_EOL, ' '], '', $actual);
-
-        $this->assertSame($expected, $actual);
-    }
-
     public function test_boolean_attributes_in_view_component(): void
     {
         $this->registerViewComponent('x-test', <<<HTML

tests/Integration/View/TempestViewRendererTest.php

@@ -702,12 +702,4 @@ public function test_if_and_foreach_precedence(): void
 
         $this->assertSnippetsMatch('', $html);
     }
-
-    private function assertSnippetsMatch(string $expected, string $actual): void
-    {
-        $expected = str_replace([PHP_EOL, ' '], '', $expected);
-        $actual = str_replace([PHP_EOL, ' '], '', $actual);
-
-        $this->assertSame($expected, $actual);
-    }
 }

tests/Integration/View/ViewComponentTest.php

@@ -153,7 +153,7 @@ public function test_slots_is_a_reserved_variable(): void
 
     public function test_nested_components(): void
     {
-        $this->assertStringEqualsStringIgnoringLineEndings(
+        $this->assertSnippetsMatch(
             expected: <<<'HTML'
             <form action="#" method="post"><div><div><label for="a">a</label><input type="number" name="a" id="a" value></div></div><div><label for="b">b</label><input type="text" name="b" id="b" value></div></form>
             HTML,
@@ -839,11 +839,25 @@ public function test_nested_slots(): void
         $this->assertSnippetsMatch('<a><b>hi</b></a>', $html);
     }
 
-    private function assertSnippetsMatch(string $expected, string $actual): void
+    public function test_nested_slots_with_escaping(): void
     {
-        $expected = str_replace([PHP_EOL, ' '], '', $expected);
-        $actual = str_replace([PHP_EOL, ' '], '', $actual);
+        $this->registerViewComponent('x-a', '<a><x-slot /></a>');
+        $this->registerViewComponent('x-b', <<<'HTML'
+        <?php 
+        use function \Tempest\get;
+        use \Tempest\Core\AppConfig;
+        ?>
+        {{ get(AppConfig::class)->environment->value }}
+        HTML);
+
+        $html = $this->render(<<<'HTML'
+        <x-a>
+            <x-slot>
+                <x-b />
+            </x-slot>
+        </x-a>
+        HTML);
 
-        $this->assertSame($expected, $actual);
+        $this->assertSnippetsMatch('<a>testing</a>', $html);
     }
 }

tests/Integration/Vite/ViteTagsComponentTest.php

@@ -203,12 +203,4 @@ public function test_production_entrypoints(): void
             ],
         );
     }
-
-    private function assertSnippetsMatch(string $expected, string $actual): void
-    {
-        $expected = str_replace([PHP_EOL, ' '], '', $expected);
-        $actual = str_replace([PHP_EOL, ' '], '', $actual);
-
-        $this->assertSame($expected, $actual);
-    }
 }