@vituum/vite-plugin-latte 2.0.0-next.5 → 2.0.1

package/vendor/latte/latte/src/Latte/Compiler/TemplateParser.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * This file is part of the Latte (https://latte.nette.org)
  * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
  */
 
-declare(strict_types=1);
-
 namespace Latte\Compiler;
 
 use Latte;
@@ -20,6 +18,9 @@ use Latte\SecurityViolationException;
 use function array_keys, array_splice, count, end, in_array, preg_match, str_ends_with, str_starts_with, substr, trim, ucfirst;
 
 
+/**
+ * Parses Latte template tokens into AST.
+ */
 final class TemplateParser
 {
 	/** @var Block[][] */
@@ -29,26 +30,29 @@ final class TemplateParser
 	public bool $strict = false;
 	public ?Nodes\TextNode $lastIndentation = null;
 
-	/** @var array<string, callable(Tag, self): (Node|\Generator|void)> */
+	/** @var array<string, \Closure(Tag, self): (Node|\Generator|void)> */
 	private array $tagParsers = [];
 
 	/** @var array<string, \stdClass> */
 	private array $attrParsersInfo = [];
 
 	private TemplateParserHtml $html;
-	private ?TokenStream $stream = null;
+	private TokenStream $stream;
 	private TemplateLexer $lexer;
 	private ?Policy $policy = null;
 	private string $contentType;
 	private int $counter = 0;
 	private ?Tag $tag = null;
-	private $lastResolver;
+	private ?\Closure $lastResolver = null;
+
+	/** @var \WeakMap<Tag, ?list<string>> */
 	private \WeakMap $lookFor;
 
 
 	public function __construct()
 	{
 		$this->lexer = new TemplateLexer;
+		$this->stream = new TokenStream(new \EmptyIterator);
 		$this->setContentType(ContentType::Html);
 	}
 
@@ -83,7 +87,11 @@ final class TemplateParser
 	}
 
 
-	public function parseFragment(callable $resolver, ?callable $after = null): FragmentNode
+	/**
+	 * @param  \Closure(FragmentNode): ?Node  $resolver
+	 * @param  ?(\Closure(FragmentNode): void)  $after
+	 */
+	public function parseFragment(\Closure $resolver, ?\Closure $after = null): FragmentNode
 	{
 		$res = new FragmentNode;
 		$save = [$this->lastResolver, $this->tag];
@@ -91,6 +99,7 @@ final class TemplateParser
 		try {
 			while (!$this->stream->peek()->isEnd()) {
 				if ($node = $resolver($res)) {
+					assert($node instanceof Nodes\AreaNode);
 					$res->append($node);
 					$after && $after($res);
 				} else {
@@ -150,7 +159,7 @@ final class TemplateParser
 
 	public function parseLatteComment(): Nodes\NopNode
 	{
-		if (str_ends_with($this->stream->peek(-1)?->text ?? "\n", "\n")) {
+		if (str_ends_with($this->stream->tryPeek(-1)->text ?? "\n", "\n")) {
 			$this->lastIndentation ??= new Nodes\TextNode('');
 		}
 		$openToken = $this->stream->consume(Token::Latte_CommentOpen);
@@ -162,11 +171,11 @@ final class TemplateParser
 	}
 
 
-	public function parseLatteStatement(?callable $resolver = null): ?Node
+	public function parseLatteStatement(?\Closure $resolver = null): ?Node
 	{
 		$this->lexer->pushState(TemplateLexer::StateLatteTag);
 		if ($this->stream->peek(1)->is(Token::Slash)
-			|| (isset($this->tag, $this->lookFor[$this->tag]) && in_array($this->stream->peek(1)->text, $this->lookFor[$this->tag], true))
+			|| (isset($this->tag, $this->lookFor[$this->tag]) && in_array($this->stream->peek(1)->text, $this->lookFor[$this->tag], strict: true))
 		) {
 			$this->lexer->popState();
 			return null; // go back to previous parseLatteStatement()
@@ -212,13 +221,13 @@ final class TemplateParser
 						$res->send([$content, $tag]);
 						$this->ensureIsConsumed($tag);
 						break;
-					} elseif (in_array($tag->name, $this->lookFor[$startTag] ?? [], true)) {
+					} elseif (in_array($tag->name, $this->lookFor[$startTag] ?? [], strict: true)) {
 						$this->pushTag($tag);
 						$res->send([$content, $tag]);
 						$this->ensureIsConsumed($tag);
 						$this->popTag();
 					} else {
-						throw new CompileException('Unexpected tag ' . substr($tag->getNotation(true), 0, -1) . '}', $tag->position);
+						throw new CompileException('Unexpected tag ' . substr($tag->getNotation(withArgs: true), 0, -1) . '}', $tag->position);
 					}
 				}
 			}
@@ -230,7 +239,7 @@ final class TemplateParser
 			$node = $res->getReturn();
 
 		} elseif ($startTag->void) {
-			throw new CompileException('Unexpected /} in tag ' . substr($startTag->getNotation(true), 0, -1) . '/}', $startTag->position);
+			throw new CompileException('Unexpected /} in tag ' . substr($startTag->getNotation(withArgs: true), 0, -1) . '/}', $startTag->position);
 
 		} else {
 			$this->ensureIsConsumed($startTag);
@@ -256,17 +265,19 @@ final class TemplateParser
 	private function parseLatteTag(): Tag
 	{
 		$stream = $this->stream;
-		if (str_ends_with($stream->peek(-1)?->text ?? "\n", "\n")) {
+		if (str_ends_with($stream->tryPeek(-1)->text ?? "\n", "\n")) {
 			$this->lastIndentation ??= new Nodes\TextNode('');
 		}
 
-		$inTag = in_array($this->lexer->getState(), [TemplateLexer::StateHtmlTag, TemplateLexer::StateHtmlQuotedValue, TemplateLexer::StateHtmlComment, TemplateLexer::StateHtmlBogus], true);
+		$inTag = in_array($this->lexer->getState(), [TemplateLexer::StateHtmlTag, TemplateLexer::StateHtmlQuotedValue, TemplateLexer::StateHtmlComment, TemplateLexer::StateHtmlBogus], strict: true);
 		$openToken = $stream->consume(Token::Latte_TagOpen);
 		$this->lexer->pushState(TemplateLexer::StateLatteTag);
+		$closing = (bool) $stream->tryConsume(Token::Slash);
+		$nameToken = $stream->tryConsume(Token::Latte_Name);
 		$tag = new Tag(
 			position: $openToken->position,
-			closing: $closing = (bool) $stream->tryConsume(Token::Slash),
-			name: $stream->tryConsume(Token::Latte_Name)?->text ?? ($closing ? '' : '='),
+			closing: $closing,
+			name: $nameToken ? $nameToken->text : ($closing ? '' : '='),
 			tokens: $this->consumeTag(),
 			void: (bool) $stream->tryConsume(Token::Slash),
 			inHead: $this->inHead,
@@ -279,6 +290,7 @@ final class TemplateParser
 	}
 
 
+	/** @return Token[] */
 	public function consumeTag(): array
 	{
 		$res = [];
@@ -310,8 +322,8 @@ final class TemplateParser
 	}
 
 
-	/** @return callable(Tag, self): (Node|\Generator|void) */
-	private function getTagParser(string $name, Position $pos): callable
+	/** @return \Closure(Tag, self): (Node|\Generator|void) */
+	private function getTagParser(string $name, Position $pos): \Closure
 	{
 		if (!isset($this->tagParsers[$name])) {
 			$hint = ($t = Helpers::getSuggestion(array_keys($this->tagParsers), $name))
@@ -329,6 +341,7 @@ final class TemplateParser
 	}
 
 
+	/** @return array<string, \Closure(Tag, self): (Node|\Generator|void)> */
 	private function completeAttrParsers(): array
 	{
 		$list = Helpers::sortBeforeAfter($this->attrParsersInfo);

package/vendor/latte/latte/src/Latte/Compiler/TemplateParserHtml.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * This file is part of the Latte (https://latte.nette.org)
  * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
  */
 
-declare(strict_types=1);
-
 namespace Latte\Compiler;
 
 use Latte;
@@ -25,22 +23,20 @@ use function array_keys, array_pop, end, implode, in_array, key, preg_replace, s
  */
 final class TemplateParserHtml
 {
-	/** @var array<string, callable(Tag, TemplateParser): (Node|\Generator|void)> */
-	private readonly array $attrParsers;
 	private ?Html\ElementNode $element = null;
-	private readonly TemplateParser $parser;
 
-	/** @var array{string, ?Nodes\Php\ExpressionNode} */
+	/** @var array{string, ?Nodes\Php\ExpressionNode}|null */
 	private ?array $endName = null;
 
 	/** @var \WeakMap<Html\ElementNode, object{tag: mixed, textualName: string, unclosedTags?: array<string>}> */
 	private \WeakMap $elementData;
 
 
-	public function __construct(TemplateParser $parser, array $attrParsers)
-	{
-		$this->parser = $parser;
-		$this->attrParsers = $attrParsers;
+	public function __construct(
+		private readonly TemplateParser $parser,
+		/** @var array<string, \Closure(Tag, TemplateParser): (Node|\Generator|void)> */
+		private readonly array $attrParsers,
+	) {
 		$this->elementData = new \WeakMap;
 	}
 
@@ -85,7 +81,7 @@ final class TemplateParserHtml
 		$stream = $this->parser->getStream();
 		$lexer = $this->parser->getLexer();
 		$lexer->pushState(TemplateLexer::StateHtmlTag);
-		$closing = $stream->peek(1)?->is(Token::Slash);
+		$closing = $stream->tryPeek(1)?->is(Token::Slash);
 		$lexer->popState();
 		if (!$closing) {
 			return $this->parseElement();
@@ -100,7 +96,7 @@ final class TemplateParserHtml
 				return null; // go to parseElement() one level up to close the element
 			}
 			$stream->seek($save);
-			if (!in_array($endText, $this->elementData[$this->element]->unclosedTags ?? [], true)) {
+			if (!in_array($endText, $this->elementData[$this->element]->unclosedTags ?? [], strict: true)) {
 				return null; // go to parseElement() one level up to collapse
 			}
 		}
@@ -145,7 +141,7 @@ final class TemplateParserHtml
 				$this->parser->getLexer()->popState();
 			}
 
-			[$endText, $endVariable] = $this->endName;
+			[$endText, $endVariable] = $this->endName ?? [null, null];
 			$this->endName = null;
 			if ($endText && ($this->element->is($endText) || $this->elementData[$this->element]->textualName === $endText)) {
 				$elem->content = $content;
@@ -159,7 +155,7 @@ final class TemplateParserHtml
 			) {
 				$stream->throwUnexpectedException(
 					addendum: ", expecting </{$this->elementData[$elem]->textualName}> for element started $elem->position",
-					excerpt: $endText ? "/{$endText}>" : $stream->peek(1)?->text . $stream->peek(2)?->text,
+					excerpt: $endText ? "/{$endText}>" : ($stream->tryPeek(1)->text ?? '') . ($stream->tryPeek(2)->text ?? ''),
 				);
 			} else { // element collapsed to tags
 				$res->append($content);
@@ -193,6 +189,7 @@ final class TemplateParserHtml
 	}
 
 
+	/** @param-out Html\ElementNode $elem */
 	private function parseStartTag(&$elem = null): Html\ElementNode
 	{
 		$stream = $this->parser->getStream();
@@ -252,7 +249,8 @@ final class TemplateParserHtml
 	/** @return array{string, ?Nodes\Php\ExpressionNode} */
 	private function parseTagName(bool $strict = true): array
 	{
-		$variable = $text = null;
+		$variable = null;
+		$text = '';
 		$parts = [];
 		$stream = $this->parser->getStream();
 		do {
@@ -261,7 +259,7 @@ final class TemplateParserHtml
 				$statement = $this->parser->parseLatteStatement($this->inTagResolve(...));
 				if (!$statement instanceof Nodes\PrintNode) {
 					if (!$parts || $strict) {
-						throw new CompileException('Only expression can be used as a HTML tag name.', $statement->position);
+						throw new CompileException('Only expression can be used as a HTML tag name.', $statement?->position);
 					}
 					$stream->seek($save);
 					break;
@@ -291,7 +289,7 @@ final class TemplateParserHtml
 	}
 
 
-	private function parseBogusEndTag(): ?Html\BogusTagNode
+	private function parseBogusEndTag(): Html\BogusTagNode
 	{
 		$stream = $this->parser->getStream();
 		$lexer = $this->parser->getLexer();
@@ -371,7 +369,7 @@ final class TemplateParserHtml
 			$name = $this->parser->parseText();
 		}
 
-		[$value, $quote] = $this->parseAttributeValue();
+		[$value, $quote] = $this->parseAttributeValue() ?? [null, null];
 		if ($name instanceof Nodes\TextNode && $value instanceof Nodes\PrintNode && $value->modifier->escape) {
 			if (($indent = end($fragment->children)) instanceof Nodes\TextNode && $indent->isWhitespace()) {
 				array_pop($fragment->children);
@@ -395,6 +393,7 @@ final class TemplateParserHtml
 	}
 
 
+	/** @return ?array{AreaNode|Nodes\PrintNode, ?string} */
 	private function parseAttributeValue(): ?array
 	{
 		$stream = $this->parser->getStream();
@@ -410,6 +409,7 @@ final class TemplateParserHtml
 			$lexer = $this->parser->getLexer();
 			$lexer->pushState(TemplateLexer::StateHtmlQuotedValue, $quoteToken->text);
 			$value = $this->parser->parseFragment($this->parser->inTextResolve(...))->simplify(allowsNull: false);
+			assert($value !== null);
 			$stream->tryConsume(Token::Quote) || $stream->throwUnexpectedException([$quoteToken->text], addendum: ", end of HTML attribute started $quoteToken->position");
 			$lexer->popState();
 			return [$value, $quoteToken->text];
@@ -429,6 +429,7 @@ final class TemplateParserHtml
 
 	private function parseNAttribute(): Nodes\TextNode
 	{
+		assert($this->element !== null);
 		$stream = $this->parser->getStream();
 		$nameToken = $stream->consume(Token::Html_Name);
 		$save = $stream->getIndex();
@@ -468,6 +469,8 @@ final class TemplateParserHtml
 		}
 		$tokens ??= [new Token(Token::End, '', $pos)];
 
+		assert($nameToken->position !== null);
+		assert($this->element !== null);
 		$this->element->nAttributes[$name] = new Tag(
 			name: preg_replace('~(inner-|tag-|)~', '', $name),
 			tokens: $tokens,
@@ -520,6 +523,10 @@ final class TemplateParserHtml
 	}
 
 
+	/**
+	 * @param  array<Tag>  $attrs
+	 * @return array<string, list<Tag>>
+	 */
 	private function prepareNAttrs(array $attrs, bool $void): array
 	{
 		$res = [];
@@ -591,8 +598,8 @@ final class TemplateParserHtml
 	}
 
 
-	/** @return callable(Tag, TemplateParser): (Node|\Generator|void) */
-	private function getAttrParser(string $name, Position $pos): callable
+	/** @return \Closure(Tag, TemplateParser): (Node|\Generator|void) */
+	private function getAttrParser(string $name, Position $pos): \Closure
 	{
 		if (!isset($this->attrParsers[$name])) {
 			$hint = ($t = Helpers::getSuggestion(array_keys($this->attrParsers), $name))

package/vendor/latte/latte/src/Latte/Compiler/Token.php

@@ -1,18 +1,19 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * This file is part of the Latte (https://latte.nette.org)
  * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
  */
 
-declare(strict_types=1);
-
 namespace Latte\Compiler;
 
 use function in_array;
 
 
-final class Token
+/**
+ * Token produced by lexers.
+ */
+final readonly class Token
 {
 	public const
 		End = 0,
@@ -236,17 +237,17 @@ final class Token
 
 
 	public function __construct(
-		public readonly int $type,
-		public readonly string $text,
-		public readonly ?Position $position = null,
+		public int $type,
+		public string $text,
+		public ?Position $position = null,
 	) {
 	}
 
 
 	public function is(int|string ...$kind): bool
 	{
-		return in_array($this->type, $kind, true)
-			|| in_array($this->text, $kind, true);
+		return in_array($this->type, $kind, strict: true)
+			|| in_array($this->text, $kind, strict: true);
 	}
 
 

package/vendor/latte/latte/src/Latte/Compiler/TokenStream.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * This file is part of the Latte (https://latte.nette.org)
  * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
  */
 
-declare(strict_types=1);
-
 namespace Latte\Compiler;
 
 use Latte\CompileException;
@@ -21,13 +19,12 @@ final class TokenStream
 {
 	/** @var Token[] */
 	private array $tokens = [];
-	private readonly \Iterator $source;
 	private int $index = 0;
 
 
-	public function __construct(\Iterator $source)
-	{
-		$this->source = $source;
+	public function __construct(
+		private readonly \Iterator $source,
+	) {
 	}
 
 
@@ -40,10 +37,19 @@ final class TokenStream
 	}
 
 
+	/**
+	 * Gets the token at $offset from the current position or throws.
+	 */
+	public function peek(int $offset = 0): Token
+	{
+		return $this->tryPeek($offset) ?? throw new CompileException('Unexpected end');
+	}
+
+
 	/**
 	 * Gets the token at $offset from the current position.
 	 */
-	public function peek(int $offset = 0): ?Token
+	public function tryPeek(int $offset = 0): ?Token
 	{
 		$pos = $this->index + $offset;
 		while ($pos >= 0 && !isset($this->tokens[$pos]) && $this->source->valid()) {
@@ -82,8 +88,8 @@ final class TokenStream
 	 */
 	public function tryConsume(int|string ...$kind): ?Token
 	{
-		$token = $this->peek();
-		if (!$token->is(...$kind)) {
+		$token = $this->tryPeek();
+		if (!$token?->is(...$kind)) {
 			return null;
 		} elseif (!$token->isEnd()) {
 			$this->index++;
@@ -115,11 +121,11 @@ final class TokenStream
 
 	/**
 	 * @throws CompileException
-	 * @return never
+	 * @param  array<string|int>  $expected
 	 */
-	public function throwUnexpectedException(array $expected = [], string $addendum = '', string $excerpt = ''): void
+	public function throwUnexpectedException(array $expected = [], string $addendum = '', string $excerpt = ''): never
 	{
-		$token = $this->peek()->text . $excerpt;
+		$token = ($this->tryPeek()->text ?? '') . $excerpt;
 		$expected = array_map(fn($item) => is_int($item) ? Token::Names[$item] : $item, $expected);
 		throw new CompileException(
 			'Unexpected '
@@ -130,7 +136,7 @@ final class TokenStream
 				? ', expecting ' . implode(', ', $expected)
 				: '')
 			. $addendum,
-			$this->peek()->position,
+			$this->tryPeek()?->position,
 		);
 	}
 }

package/vendor/latte/latte/src/Latte/ContentType.php

@@ -1,15 +1,16 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * This file is part of the Latte (https://latte.nette.org)
  * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
  */
 
-declare(strict_types=1);
-
 namespace Latte;
 
 
+/**
+ * Content type constants for context-aware escaping.
+ */
 /*enum*/ final class ContentType
 {
 	public const