wip

Author: brendt

packages/debug/src/Debug.php

@@ -12,6 +12,7 @@
 use Tempest\EventBus\EventBus;
 use Tempest\Highlight\Themes\TerminalStyle;
 use Tempest\Support\Filesystem;
+use Throwable;
 
 final readonly class Debug
 {
@@ -27,7 +28,7 @@ public static function resolve(): self
                 config: GenericContainer::instance()->get(DebugConfig::class),
                 eventBus: GenericContainer::instance()->get(EventBus::class),
             );
-        } catch (Exception) {
+        } catch (Throwable) {
             return new self();
         }
     }

packages/view/src/Elements/ElementFactory.php

@@ -69,6 +69,10 @@ private function makeElement(Token $token, ?Element $parent): ?Element
             return new TextElement(text: $text);
         }
 
+        if ($token->type === TokenType::WHITESPACE) {
+            return new WhitespaceElement($token->content);
+        }
+
         if (! $token->tag || $token->type === TokenType::COMMENT || $token->type === TokenType::PHP) {
             return new RawElement(token: $token, tag: null, content: $token->compile());
         }

packages/view/src/Elements/IsElement.php

@@ -110,6 +110,10 @@ public function setPrevious(?Element $previous): self
 
     public function getPrevious(): ?Element
     {
+        if ($this->previous instanceof WhitespaceElement) {
+            return $this->previous->getPrevious();
+        }
+
         return $this->previous;
     }
 

packages/view/src/Elements/WhitespaceElement.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\View\Elements;
+
+use Tempest\View\Element;
+
+final class WhitespaceElement implements Element
+{
+    use IsElement;
+
+    public function __construct(
+        public string $content,
+    ) {}
+
+    public function compile(): string
+    {
+        return $this->content;
+    }
+}

packages/view/src/Parser/TempestViewLexer.php

@@ -14,7 +14,8 @@ final class TempestViewLexer
 
     public function __construct(
         private readonly string $html,
-    ) {
+    )
+    {
         $this->current = $this->html[$this->position] ?? null;
     }
 
@@ -35,6 +36,8 @@ public function lex(): TokenCollection
                 $tokens = [...$tokens, ...$this->lexCharacterData()];
             } elseif ($this->comesNext('<')) {
                 $tokens = [...$tokens, ...$this->lexTag()];
+            } elseif ($this->comesNext(' ') || $this->comesNext(PHP_EOL)) {
+                $tokens[] = $this->lexWhitespace();
             } else {
                 $tokens[] = $this->lexContent();
             }
@@ -214,6 +217,23 @@ private function lexDoctype(): Token
         return new Token($buffer, TokenType::DOCTYPE);
     }
 
+    private function lexWhitespace(): Token
+    {
+        $buffer = '';
+
+        while ($this->current !== null) {
+            $seek = $this->seek();
+
+            if ($seek !== ' ' && $seek !== PHP_EOL) {
+                break;
+            }
+
+            $buffer .= $this->consume();
+        }
+
+        return new Token($buffer, TokenType::WHITESPACE);
+    }
+
     private function lexCharacterData(): array
     {
         $tokens = [

packages/view/src/Parser/TokenType.php

@@ -18,4 +18,5 @@ enum TokenType
     case DOCTYPE;
     case CHARACTER_DATA_OPEN;
     case CHARACTER_DATA_CLOSE;
+    case WHITESPACE;
 }

packages/view/tests/TempestViewLexerTest.php

@@ -173,13 +173,40 @@ class=', TokenType::ATTRIBUTE_NAME),
                 new Token("\n>", TokenType::OPEN_TAG_END),
                 new Token('
 
-', TokenType::CONTENT),
+', TokenType::WHITESPACE),
                 new Token('</div>', TokenType::CLOSING_TAG),
             ],
             actual: $tokens,
         );
     }
 
+    public function test_whitespace(): void
+    {
+        $html = <<<'HTML'
+<p><strong>Test</strong> <em>Test</em></p>
+HTML;
+
+        $tokens = new TempestViewLexer($html)->lex();
+
+        $this->assertTokens(
+            expected: [
+                new Token('<p', TokenType::OPEN_TAG_START),
+                new Token('>', TokenType::OPEN_TAG_END),
+                new Token('<strong', TokenType::OPEN_TAG_START),
+                new Token('>', TokenType::OPEN_TAG_END),
+                new Token('Test', TokenType::CONTENT),
+                new Token('</strong>', TokenType::CLOSING_TAG),
+                new Token(' ', TokenType::WHITESPACE),
+                new Token('<em', TokenType::OPEN_TAG_START),
+                new Token('>', TokenType::OPEN_TAG_END),
+                new Token('Test', TokenType::CONTENT),
+                new Token('</em>', TokenType::CLOSING_TAG),
+                new Token('</p>', TokenType::CLOSING_TAG)
+            ],
+            actual: $tokens,
+        );
+    }
+
     public function test_lexer_with_falsy_values(): void
     {
         $html = <<<'HTML'
@@ -317,7 +344,8 @@ public function test_cdata(): void
     {
         $tokens = new TempestViewLexer(<<<'RSS'
         <title><![CDATA[ {{ $post['title'] }} ]]></title>
-        RSS)->lex();
+        RSS,
+        )->lex();
 
         $this->assertTokens(
             expected: [
@@ -336,7 +364,8 @@ public function test_xml(): void
     {
         $tokens = new TempestViewLexer(<<<'XML'
         <?xml version="1.0" encoding="UTF-8" ?>
-        XML)->lex();
+        XML,
+        )->lex();
 
         $this->assertTokens(
             expected: [

tests/Integration/View/TempestViewRendererTest.php

@@ -292,7 +292,7 @@ public function test_default_slot(): void
 
     public function test_implicit_default_slot(): void
     {
-        $this->assertStringEqualsStringIgnoringLineEndings(
+        $this->assertSnippetsMatch(
             <<<'HTML'
             <div class="base">
                 
@@ -891,4 +891,40 @@ public function test_discovery_locations_are_passed_to_compiler(): void
 
         $this->assertSnippetsMatch('<div>Hi</div>', $html);
     }
+
+    public function test_whitespace_between_inline_elements_is_preserved(): void
+    {
+        /** @var TempestViewRenderer $renderer */
+        $renderer = $this->get(TempestViewRenderer::class);
+
+        $this->assertSame(
+            '<p><strong>Test</strong> <em>Test</em></p>',
+            $renderer->render('<p><strong>Test</strong> <em>Test</em></p>'),
+        );
+    }
+
+    public function test_whitespace_introduced_by_line_breaks_is_preserved(): void
+    {
+        /** @var TempestViewRenderer $renderer */
+        $renderer = $this->get(TempestViewRenderer::class);
+
+        $this->assertSame(
+            '<p><strong>Test</strong> <em>Test</em></p>',
+            $renderer->render('<p><strong>Test</strong>
+<em>Test</em></p>'),
+        );
+    }
+
+    public function test_whitespace_with_blank_lines_between_inline_elements_is_preserved(): void
+    {
+        /** @var TempestViewRenderer $renderer */
+        $renderer = $this->get(TempestViewRenderer::class);
+
+        $this->assertSame(
+            '<p><strong>Test</strong> <em>Test</em></p>',
+            $renderer->render('<p><strong>Test</strong>
+            
+<em>Test</em></p>'),
+        );
+    }
 }