fix(view): preserve source location in text elements (#1999)

Author: xHeaven

packages/view/src/Elements/ElementFactory.php

@@ -61,7 +61,10 @@ public function make(Token $token, Element $parent): ?Element
                 return null;
             }
 
-            $element = new TextElement(text: $text);
+            $element = new TextElement(
+                text: $text,
+                token: $token,
+            );
         } elseif ($token->type === TokenType::WHITESPACE) {
             $element = new WhitespaceElement($token->content);
         } elseif ($token->type !== TokenType::PHP && (! $token->tag || $token->type === TokenType::COMMENT)) {

packages/view/src/Elements/TextElement.php

@@ -5,6 +5,7 @@
 namespace Tempest\View\Elements;
 
 use Tempest\View\Element;
+use Tempest\View\Parser\Token;
 
 use function Tempest\Support\str;
 
@@ -14,6 +15,7 @@ final class TextElement implements Element
 
     public function __construct(
         private readonly string $text,
+        public readonly ?Token $token = null,
     ) {}
 
     public function compile(): string

packages/view/src/Parser/TempestViewCompiler.php

@@ -12,6 +12,7 @@
 use Tempest\View\Element;
 use Tempest\View\Elements\ElementFactory;
 use Tempest\View\Elements\RootElement;
+use Tempest\View\Elements\TextElement;
 use Tempest\View\Exceptions\ViewNotFound;
 use Tempest\View\Exceptions\XmlDeclarationCouldNotBeParsed;
 use Tempest\View\ShouldBeRemoved;
@@ -234,6 +235,13 @@ private function sourceLineMarker(int $sourceLine): string
     /** @return array{sourcePath: string|null, sourceLine: int}|null */
     private function resolveSourceLocation(Element $element): ?array
     {
+        if ($element instanceof TextElement && $element->token !== null) {
+            return [
+                'sourcePath' => $element->token->sourcePath,
+                'sourceLine' => $element->token->line,
+            ];
+        }
+
         if ($element instanceof WithToken) {
             return [
                 'sourcePath' => $element->token->sourcePath,

packages/view/tests/Fixtures/standalone-error-slot-expression-usage.view.php

@@ -0,0 +1,3 @@
+<x-standalone-base>
+    {{ missing_slot_expression_function() }}
+</x-standalone-base>

packages/view/tests/StandaloneViewRendererTest.php

@@ -191,6 +191,27 @@ public function test_maps_source_path_and_line_for_slot_content_errors(): void
         }
     }
 
+    #[Test]
+    public function test_maps_source_path_and_line_for_slot_expression_errors(): void
+    {
+        $viewConfig = new ViewConfig()->addViewComponents(
+            __DIR__ . '/Fixtures/x-standalone-base.view.php',
+        );
+
+        $renderer =
+            TempestViewRenderer::make(
+                viewConfig: $viewConfig,
+            );
+
+        try {
+            $renderer->render(view(__DIR__ . '/Fixtures/standalone-error-slot-expression-usage.view.php'));
+            $this->fail('Expected a view compilation exception.');
+        } catch (ViewCompilationFailed $exception) {
+            $this->assertSame(__DIR__ . '/Fixtures/standalone-error-slot-expression-usage.view.php', $exception->sourcePath);
+            $this->assertSame(2, $exception->sourceLine);
+        }
+    }
+
     #[Test]
     public function test_maps_source_path_and_line_for_expression_attribute_errors_after_component_rendering(): void
     {