wip

Author: brendt

src/Tempest/View/src/Components/DynamicViewComponent.php

@@ -2,16 +2,17 @@
 
 namespace Tempest\View\Components;
 
-use Tempest\Container\Container;
+use Stringable;
 use Tempest\Core\AppConfig;
-use Tempest\View\Elements\ElementFactory;
+use Tempest\Support\Str\ImmutableString;
+use Tempest\Support\Str\MutableString;
+use Tempest\View\Elements\CollectionElement;
 use Tempest\View\Elements\ViewComponentElement;
-use Tempest\View\GenericView;
 use Tempest\View\Parser\TempestViewCompiler;
 use Tempest\View\Parser\Token;
 use Tempest\View\ViewComponent;
 use Tempest\View\ViewConfig;
-use Tempest\View\ViewRenderer;
+use function Tempest\Support\arr;
 
 final class DynamicViewComponent implements ViewComponent
 {
@@ -36,27 +37,43 @@ public static function getName(): string
     public function compile(ViewComponentElement $element): string
     {
         $name = $this->token->getAttribute('is') ?? $this->token->getAttribute(':is');
+
         $isExpression = $this->token->getAttribute(':is') !== null;
 
-        return sprintf(
-            '<?php eval(\'?>\' . \Tempest\get(%s::class)->render(%s, %s)); ?>',
-            self::class,
-            $isExpression ? $name : "'{$name}'",
-            var_export($element->getAttributes(), true), // @mago-expect best-practices/no-debug-symbols
-        );
-    }
+        $collectionElement = new CollectionElement($element->getChildren());
 
-    public function render(string $name, array $attributes): string
-    {
-        $viewComponent = $this->viewConfig->viewComponents[$name] ?? null;
+        $attributes = arr($element->getAttributes())
+            ->filter(fn (string $value, string $key) => $key !== 'is' && $key !== ':is')
+            ->map(function (string $value, string $key) {
+                return sprintf('%s="%s"', $key, trim($value));
+            })
+            ->implode(' ')
+            ->when(
+                fn (Stringable $string) => (string) $string !== '',
+                fn (Stringable $string) => new ImmutableString(" {$string}"),
+            );
 
-        $element = new ViewComponentElement(
-            environment: $this->appConfig->environment,
-            compiler: $this->compiler,
-            viewComponent: $viewComponent,
-            attributes: $attributes,
+        $compiledChildren = sprintf(
+            <<<'HTML'
+            <%s%s>
+            %s
+            </%s>
+            HTML,
+            '%s',
+            $attributes,
+            $collectionElement->compile(),
+            '%s',
         );
 
-        return $element->compile();
+        $compiled = sprintf(
+            '<?php echo \Tempest\get(\Tempest\View\Renderers\TempestViewRenderer::class)->render(sprintf(<<<\'HTML\'
+%s
+HTML, %s, %s)); ?>',
+            $compiledChildren,
+            $isExpression ? $name : "'{$name}'",
+            $isExpression ? $name : "'{$name}'",
+        );
+lw($compiled);
+        return $compiled;
     }
 }

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

@@ -17,9 +17,6 @@
 use Tempest\View\ViewRenderer;
 use Throwable;
 
-use function Tempest\Support\arr;
-use function Tempest\Support\str;
-
 final class TempestViewRenderer implements ViewRenderer
 {
     private ?View $currentView = null;

tests/Integration/View/ViewComponentTest.php

@@ -830,12 +830,10 @@ public function test_dynamic_view_component_with_slot(): void
         $this->registerViewComponent('x-test', '<div><x-slot/></div>');
 
         $html = $this->render(<<<'HTML'
-            <x-dynamic-component :is="$name">
-                <p>test</p>
-            </x-dynamic-component>
+        <x-dynamic-component :is="$name">test</x-dynamic-component>
         HTML, name: 'x-test');
 
-        $this->assertSame('<div><p>test</p></div>', $html);
+        $this->assertSnippetsMatch('<div>test</div>', $html);
     }
 
     public function test_nested_slots(): void