[Twig] prepare for embedded components

Author: kbond

src/TwigComponent/src/ComponentRenderer.php

@@ -37,7 +37,19 @@ public function __construct(
     ) {
     }
 
+    public function createAndRender(string $name, array $props = []): string
+    {
+        return $this->render($this->factory->create($name, $props));
+    }
+
     public function render(MountedComponent $mounted): string
+    {
+        $event = $this->preRender($mounted);
+
+        return $this->twig->render($event->getTemplate(), $event->getVariables());
+    }
+
+    private function preRender(MountedComponent $mounted): PreRenderEvent
     {
         if (!$this->safeClassesRegistered) {
             $this->twig->getExtension(EscaperExtension::class)->addSafeClass(ComponentAttributes::class, ['html']);
@@ -64,7 +76,7 @@ public function render(MountedComponent $mounted): string
 
         $this->dispatcher->dispatch($event);
 
-        return $this->twig->render($event->getTemplate(), $event->getVariables());
+        return $event;
     }
 
     private function exposedVariables(object $component, bool $exposePublicProps): \Iterator

src/TwigComponent/src/DependencyInjection/TwigComponentExtension.php

@@ -24,7 +24,6 @@
 use Symfony\UX\TwigComponent\ComponentRenderer;
 use Symfony\UX\TwigComponent\DependencyInjection\Compiler\TwigComponentPass;
 use Symfony\UX\TwigComponent\Twig\ComponentExtension;
-use Symfony\UX\TwigComponent\Twig\ComponentRuntime;
 
 /**
  * @author Kevin Bond <[email protected]>
@@ -67,14 +66,7 @@ class_exists(AbstractArgument::class) ? new AbstractArgument(sprintf('Added in %
 
         $container->register('ux.twig_component.twig.component_extension', ComponentExtension::class)
             ->addTag('twig.extension')
-        ;
-
-        $container->register('ux.twig_component.twig.component_runtime', ComponentRuntime::class)
-            ->setArguments([
-                new Reference('ux.twig_component.component_factory'),
-                new Reference('ux.twig_component.component_renderer'),
-            ])
-            ->addTag('twig.runtime')
+            ->addTag('container.service_subscriber', ['key' => ComponentRenderer::class, 'id' => 'ux.twig_component.component_renderer'])
         ;
     }
 }

src/TwigComponent/src/Twig/ComponentExtension.php

@@ -11,6 +11,9 @@
 
 namespace Symfony\UX\TwigComponent\Twig;
 
+use Psr\Container\ContainerInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
+use Symfony\UX\TwigComponent\ComponentRenderer;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -21,12 +24,26 @@
  *
  * @internal
  */
-final class ComponentExtension extends AbstractExtension
+final class ComponentExtension extends AbstractExtension implements ServiceSubscriberInterface
 {
+    public function __construct(private ContainerInterface $container)
+    {
+    }
+
+    public static function getSubscribedServices(): array
+    {
+        return [ComponentRenderer::class];
+    }
+
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('component', [ComponentRuntime::class, 'render'], ['is_safe' => ['all']]),
+            new TwigFunction('component', [$this, 'render'], ['is_safe' => ['all']]),
         ];
     }
+
+    public function render(string $name, array $props = []): string
+    {
+        return $this->container->get(ComponentRenderer::class)->createAndRender($name, $props);
+    }
 }