From ac852446dd964c40ee2f465a1e955b997cd0d096 Mon Sep 17 00:00:00 2001
From: brendt <brent.roose@gmail.com>
Date: Thu, 16 Jul 2026 09:55:58 +0200
Subject: [PATCH 1/2] wip

---
 packages/view/src/Parser/TempestViewLexer.php | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/packages/view/src/Parser/TempestViewLexer.php b/packages/view/src/Parser/TempestViewLexer.php
index 36750baae..f1f26bf5a 100644
--- a/packages/view/src/Parser/TempestViewLexer.php
+++ b/packages/view/src/Parser/TempestViewLexer.php
@@ -24,17 +24,17 @@ public function lex(): TokenCollection
         $tokens = [];
 
         while ($this->current !== null) {
-            if ($this->comesNext('<?xml')) {
+            if ($this->comesNext('<?xml', 5)) {
                 $tokens[] = $this->lexXml();
-            } elseif ($this->comesNext('<?')) {
+            } elseif ($this->comesNext('<?', 2)) {
                 $tokens[] = $this->lexPhp();
-            } elseif ($this->comesNext('<!--')) {
+            } elseif ($this->comesNext('<!--', 4)) {
                 $tokens[] = $this->lexComment();
-            } elseif ($this->comesNext('<!doctype') || $this->comesNext('<!DOCTYPE')) {
+            } elseif ($this->comesNext('<!doctype', 9) || $this->comesNext('<!DOCTYPE', 9)) {
                 $tokens[] = $this->lexDocType();
-            } elseif ($this->comesNext('<![CDATA')) {
+            } elseif ($this->comesNext('<![CDATA', 8)) {
                 $tokens = [...$tokens, ...$this->lexCharacterData()];
-            } elseif ($this->comesNext('<')) {
+            } elseif ($this->comesNext('<', 1)) {
                 $tokens = [...$tokens, ...$this->lexTag()];
             } elseif (str_contains(self::WHITESPACE, $this->current)) {
                 $tokens[] = $this->lexWhitespace();
@@ -46,9 +46,15 @@ public function lex(): TokenCollection
         return new TokenCollection($tokens);
     }
 
-    private function comesNext(string $search): bool
+    private function comesNext(string $search, ?int $length = null): bool
     {
-        return $this->seek(strlen($search)) === $search;
+        $length ??= strlen($search);
+
+        if ($length === 1) {
+            return ($this->html[$this->position] ?? null) === $search;
+        }
+
+        return substr_compare($this->html, $search, $this->position, $length) === 0;
     }
 
     private function seek(int $length = 1, int $offset = 0): ?string
@@ -71,9 +77,18 @@ private function seekIgnoringWhitespace(int $length = 1): ?string
 
     private function consume(int $length = 1): string
     {
+        if ($length === 0) {
+            return '';
+        }
+
+        if ($length === 1) {
+            $char = $this->html[$this->position++] ?? null;
+            $this->current = $this->html[$this->position] ?? null;
+            return $char ?? '';
+        }
+
         $buffer = substr($this->html, $this->position, $length);
         $this->position += $length;
-        $this->line += substr_count($buffer, "\n");
         $this->current = $this->html[$this->position] ?? null;
 
         return $buffer;
@@ -135,7 +150,7 @@ private function lexTag(): array
 
                 $attributeName .= $this->consumeUntil(self::WHITESPACE . '=/>');
 
-                $hasValue = $this->seek() === '=';
+                $hasValue = $this->comesNext('=', 1);
 
                 if ($hasValue) {
                     $attributeName .= $this->consume();
@@ -148,7 +163,7 @@ private function lexTag(): array
                 );
 
                 if ($hasValue) {
-                    $quote = $this->seek() === "'"
+                    $quote = $this->comesNext("'", 1)
                         ? "'"
                         : '"';
 
@@ -191,7 +206,7 @@ private function lexXml(): Token
         $line = $this->line;
         $buffer = '';
 
-        while ($this->seek(2) !== '?>' && $this->current !== null) {
+        while (! $this->comesNext('?>', 2) && $this->current !== null) {
             $buffer .= $this->consume();
         }
 
@@ -205,7 +220,7 @@ private function lexPhp(): Token
         $line = $this->line;
         $buffer = '';
 
-        while ($this->seek(2) !== '?>' && $this->current !== null) {
+        while (! $this->comesNext('?>', 2) && $this->current !== null) {
             $buffer .= $this->consume();
         }
 
@@ -227,7 +242,7 @@ private function lexComment(): Token
         $line = $this->line;
         $buffer = '';
 
-        while ($this->seek(3) !== '-->' && $this->current !== null) {
+        while (! $this->comesNext('-->', 3) && $this->current !== null) {
             $buffer .= $this->consume();
         }
 
@@ -264,7 +279,7 @@ private function lexCharacterData(): array
 
         $contentLine = $this->line;
 
-        while ($this->seek(3) !== ']]>' && $this->current !== null) {
+        while (! $this->comesNext(']]>', 3) && $this->current !== null) {
             $buffer .= $this->consume();
         }
 

From 904e9dfec6a62eef25863d276ea991d7fa1a2c85 Mon Sep 17 00:00:00 2001
From: brendt <brent.roose@gmail.com>
Date: Thu, 16 Jul 2026 10:31:35 +0200
Subject: [PATCH 2/2] wip

---
 packages/view/src/Parser/TempestViewLexer.php | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/view/src/Parser/TempestViewLexer.php b/packages/view/src/Parser/TempestViewLexer.php
index f1f26bf5a..83ee0ff78 100644
--- a/packages/view/src/Parser/TempestViewLexer.php
+++ b/packages/view/src/Parser/TempestViewLexer.php
@@ -59,6 +59,10 @@ private function comesNext(string $search, ?int $length = null): bool
 
     private function seek(int $length = 1, int $offset = 0): ?string
     {
+        if ($length === 1) {
+            return $this->html[$this->position + $offset] ?? null;
+        }
+
         $seek = substr($this->html, $this->position + $offset, $length);
 
         if ($seek === '') {
@@ -68,11 +72,12 @@ private function seek(int $length = 1, int $offset = 0): ?string
         return $seek;
     }
 
-    private function seekIgnoringWhitespace(int $length = 1): ?string
+    private function seekIgnoringWhitespace(): ?string
     {
-        $offset = strspn($this->html, self::WHITESPACE, $this->position);
-
-        return $this->seek(length: $length, offset: $offset);
+        return $this->seek(
+            // Whitespace offset
+            offset: strspn($this->html, self::WHITESPACE, $this->position),
+        );
     }
 
     private function consume(int $length = 1): string
@@ -139,8 +144,15 @@ private function lexTag(): array
         } else {
             $tokens[] = $this->makeToken($tag, TokenType::OPEN_TAG_START, $tagLine);
 
-            while ($this->seek() !== null && $this->seekIgnoringWhitespace() !== '>' && $this->seekIgnoringWhitespace() !== '/') {
-                if ($this->seekIgnoringWhitespace(2) === '<?') {
+            while ($this->current !== null) {
+                $whitespaceOffset = strspn($this->html, self::WHITESPACE, $this->position);
+                $next = $this->seek(offset: $whitespaceOffset);
+
+                if ($next === '>' || $next === '/') {
+                    break;
+                }
+
+                if ($next === '<' && $this->seek(length: 2, offset: $whitespaceOffset) === '<?') {
                     $tokens[] = $this->lexPhp();
                     continue;
                 }
@@ -179,7 +191,12 @@ private function lexTag(): array
                 }
             }
 
-            if ($this->seekIgnoringWhitespace() === '>') {
+            $next = $this->seek(
+                // Whitespace offset
+                offset: strspn($this->html, self::WHITESPACE, $this->position),
+            );
+
+            if ($next === '>') {
                 $openTagEndLine = $this->line;
 
                 $tokens[] = $this->makeToken(
@@ -187,7 +204,7 @@ private function lexTag(): array
                     type: TokenType::OPEN_TAG_END,
                     line: $openTagEndLine,
                 );
-            } elseif ($this->seekIgnoringWhitespace() === '/') {
+            } elseif ($next === '/') {
                 $selfClosingTagEndLine = $this->line;
 
                 $tokens[] = $this->makeToken(