fix(view): don't throw when using a <table> element (#1133)

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

Author: erikaraujo

phpstan.neon.dist

@@ -29,8 +29,6 @@ parameters:
 		    message: '#.*uninitialized readonly property \$composer*#'
 		-
 		    message: '#.*uninitialized readonly property \$stubFileGenerator*#'
-		-
-		    message: '#.*undefined method Dom*#'
 
 	disallowedFunctionCalls:
 		-

src/Tempest/View/src/Elements/ElementFactory.php

@@ -88,6 +88,7 @@ private function makeElement(Token $token, ?Element $parent): ?Element
             $element = new ViewComponentElement(
                 environment: $this->appConfig->environment,
                 compiler: $this->compiler,
+                elementFactory: $this,
                 viewComponent: $viewComponentClass,
                 attributes: $attributes,
             );

src/Tempest/View/src/Elements/ViewComponentElement.php

@@ -8,6 +8,7 @@
 use Tempest\Core\Environment;
 use Tempest\View\Element;
 use Tempest\View\Parser\TempestViewCompiler;
+use Tempest\View\Parser\TempestViewParser;
 use Tempest\View\Slot;
 use Tempest\View\ViewComponent;
 
@@ -25,6 +26,7 @@ final class ViewComponentElement implements Element
     public function __construct(
         private readonly Environment $environment,
         private readonly TempestViewCompiler $compiler,
+        private readonly ElementFactory $elementFactory,
         private readonly ViewComponent $viewComponent,
         array $attributes,
     ) {
@@ -100,12 +102,9 @@ public function compile(): string
                 replace: function ($matches) {
                     $closingTag = '</' . $matches['tag'] . '>';
 
-                    $html = $matches[0] . $closingTag;
+                    $ast = TempestViewParser::ast($matches[0] . $closingTag);
 
-                    $dom = HTMLDocument::createFromString($html, LIBXML_HTML_NOIMPLIED | LIBXML_NOERROR | HTML_NO_DEFAULT_NS);
-
-                    /** @var \Dom\HTMLElement $element */
-                    $element = $dom->childNodes[0];
+                    $element = $this->elementFactory->make($ast[0]);
 
                     foreach (['class', 'style', 'id'] as $attributeName) {
                         if (! isset($this->dataAttributes[$attributeName])) {
@@ -125,12 +124,12 @@ public function compile(): string
                         }
 
                         $element->setAttribute(
-                            qualifiedName: $attributeName,
+                            name: $attributeName,
                             value: $value,
                         );
                     }
 
-                    return str($element->ownerDocument->saveHTML($element))->replaceLast($closingTag, '');
+                    return str($element->compile())->replaceLast($closingTag, '');
                 },
             )
             ->prepend(

src/Tempest/View/src/Parser/TempestViewAst.php

@@ -2,11 +2,11 @@
 
 namespace Tempest\View\Parser;
 
-use ArrayIterator;
+use ArrayAccess;
 use IteratorAggregate;
 use Traversable;
 
-final class TempestViewAst implements IteratorAggregate
+final class TempestViewAst implements IteratorAggregate, ArrayAccess
 {
     public function __construct(
         private(set) TokenCollection $tokens = new TokenCollection(),
@@ -31,4 +31,24 @@ public function getIterator(): Traversable
     {
         return $this->tokens->getIterator();
     }
+
+    public function offsetExists(mixed $offset): bool
+    {
+        return $this->tokens->offsetExists($offset);
+    }
+
+    public function offsetGet(mixed $offset): mixed
+    {
+        return $this->tokens->offsetGet($offset);
+    }
+
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+        $this->tokens->offsetSet($offset, $value);
+    }
+
+    public function offsetUnset(mixed $offset): void
+    {
+        $this->tokens->offsetUnset($offset);
+    }
 }

src/Tempest/View/src/Parser/TokenCollection.php

@@ -2,14 +2,15 @@
 
 namespace Tempest\View\Parser;
 
+use ArrayAccess;
 use ArrayIterator;
 use IteratorAggregate;
 use Traversable;
 
 /**
  * @implements IteratorAggregate<\Tempest\View\Parser\Token>
  */
-final class TokenCollection implements IteratorAggregate
+final class TokenCollection implements IteratorAggregate, ArrayAccess
 {
     public function __construct(
         private array $tokens = [],
@@ -36,4 +37,24 @@ public function __debugInfo(): array
             ),
         ];
     }
+
+    public function offsetExists(mixed $offset): bool
+    {
+        return $this->tokens[$offset] ?? false;
+    }
+
+    public function offsetGet(mixed $offset): mixed
+    {
+        return $this->tokens[$offset] ?? null;
+    }
+
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+        $this->tokens[$offset] = $value;
+    }
+
+    public function offsetUnset(mixed $offset): void
+    {
+        unset($this->tokens[$offset]);
+    }
 }

tests/Integration/View/ViewComponentTest.php

@@ -752,6 +752,45 @@ public function test_slots_with_hyphens(): void
         HTML, $html);
     }
 
+    public function test_nested_table_components(): void
+    {
+        $this->registerViewComponent('x-my-table-thead', '<thead><x-slot/></thead>');
+        $this->registerViewComponent('x-my-table-tbody', '<tbody><x-slot/></tbody>');
+        $this->registerViewComponent('x-my-table-tr', '<tr><x-slot/></tr>');
+        $this->registerViewComponent('x-my-table-td', '<td><x-slot/></td>');
+        $this->registerViewComponent('x-my-table-th', '<th><x-slot/></th>');
+
+        $html = $this->render(<<<'HTML'
+        <table>
+            <x-my-table-thead>
+                <x-my-table-tr>
+                    <x-my-table-th>Header 1</x-my-table-th>
+                </x-my-table-tr>
+            </x-my-table-thead>
+            <x-my-table-tbody>
+                <x-my-table-tr>
+                    <x-my-table-td>Row 1, Cell 1</x-my-table-td>
+                </x-my-table-tr>
+            </x-my-table-tbody>
+        </table>
+        HTML);
+
+        $this->assertSnippetsMatch(<<<'HTML'
+            <table>
+                <thead>
+                    <tr>
+                        <th>Header1</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Row 1, Cell 1</td>
+                    </tr>
+                </tbody>
+            </table>
+        HTML, $html);
+    }
+
     private function assertSnippetsMatch(string $expected, string $actual): void
     {
         $expected = str_replace([PHP_EOL, ' '], '', $expected);