@vituum/vite-plugin-latte 2.0.0-next.4 → 2.0.0

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

@@ -1,15 +1,15 @@
-<?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\ContentType;
+use Latte\Engine;
+use function array_filter, compact, implode, is_int, str_contains, str_replace, trim;
 
 
 /**
@@ -28,45 +28,29 @@ final class TemplateGenerator
 
 
 	/**
-	 * Compiles nodes to PHP file
+	 * Builds template class.
+	 * @param array<string, bool>  $features
 	 */
-	public function generate(
-		Nodes\TemplateNode $node,
-		string $className,
-		?string $templateName = null,
-		bool $strictMode = false,
-	): string
+	public function buildClass(Nodes\TemplateNode $node, array $features = []): void
 	{
-		$context = new PrintContext($node->contentType);
-		$code = $node->main->print($context);
-		$code = self::buildParams($code, [], '$ʟ_args', $context);
-		$this->addMethod('main', $code, 'array $ʟ_args');
-
-		$head = (new NodeTraverser)->traverse($node->head, fn(Node $node) => $node instanceof Nodes\TextNode ? new Nodes\NopNode : $node);
-		$code = $head->print($context);
-		if ($code || $context->paramsExtraction) {
-			$code .= 'return get_defined_vars();';
-			$code = self::buildParams($code, $context->paramsExtraction, '$this->params', $context);
-			$this->addMethod('prepare', $code, '', 'array');
-		}
-
-		if ($node->contentType !== ContentType::Html) {
-			$this->addConstant('ContentType', $node->contentType);
-		}
-
-		if ($templateName !== null && !preg_match('#\n|\?#', $templateName)) {
-			$this->addConstant('Source', $templateName);
-		}
+		$context = new PrintContext($node->contentType, $features);
+		$this->generateBase($node, $context);
+		$this->generateBlocks($context);
+	}
 
-		$this->generateBlocks($context->blocks, $context);
 
+	/**
+	 * Compiles to PHP file
+	 */
+	public function generateCode(string $className, ?string $templateName, bool $strictMode): string
+	{
 		$members = [];
 		foreach ($this->constants as $name => $value) {
-			$members[] = "\tpublic const $name = " . PhpHelpers::dump($value, true) . ';';
+			$members[] = "\tpublic const $name = " . PhpHelpers::dump($value, multiline: true) . ';';
 		}
 
 		foreach ($this->properties as $name => $value) {
-			$members[] = "\tpublic $$name = " . PhpHelpers::dump($value, true) . ';';
+			$members[] = "\tpublic $$name = " . PhpHelpers::dump($value, multiline: true) . ';';
 		}
 
 		foreach (array_filter($this->methods) as $name => $method) {
@@ -78,6 +62,7 @@ final class TemplateGenerator
 		}
 
 		$code = "<?php\n\n"
+			. '/** Generated by Latte ' . Engine::Version . " */\n\n"
 			. ($strictMode ? "declare(strict_types=1);\n\n" : '')
 			. "use Latte\\Runtime as LR;\n\n"
 			. ($templateName === null ? '' : '/** source: ' . str_replace('*/', '* /', $templateName) . " */\n")
@@ -91,13 +76,38 @@ final class TemplateGenerator
 	}
 
 
-	/** @param  Block[]  $blocks */
-	private function generateBlocks(array $blocks, PrintContext $context): void
+	private function generateBase(Nodes\TemplateNode $node, PrintContext $context): void
+	{
+		$code = $node->main->print($context);
+		$code = self::buildParams($code, [], '$ʟ_args', $context);
+		$this->addMethod('main', $code, 'array $ʟ_args');
+
+		$head = (new NodeTraverser)->traverse(
+			$node->head,
+			fn(Node $node) => $node instanceof Nodes\TextNode ? new Nodes\NopNode : $node,
+		);
+		$code = $head?->print($context) ?? '';
+		if ($code || $context->paramsExtraction) {
+			$code .= 'return get_defined_vars();';
+			$code = self::buildParams($code, $context->paramsExtraction, '$this->params', $context);
+			$this->addMethod('prepare', $code, '', 'array');
+		}
+
+		if ($node->contentType !== ContentType::Html) {
+			$this->addConstant('ContentType', $node->contentType);
+		}
+	}
+
+
+	private function generateBlocks(PrintContext $context): void
 	{
 		$contentType = $context->getEscaper()->getContentType();
-		foreach ($blocks as $block) {
-			if (!$block->isDynamic()) {
-				$meta[$block->layer][$block->name->value] = $contentType === $block->escaping
+		foreach ($context->blocks as $block) {
+			$name = $block->name;
+			if (!$block->isDynamic()
+				&& ($name instanceof Nodes\Php\Scalar\StringNode || $name instanceof Nodes\Php\Scalar\IntegerNode)
+			) {
+				$meta[$block->layer][$name->value] = $contentType === $block->escaping
 					? $block->method
 					: [$block->method, $block->escaping];
 			}
@@ -123,6 +133,7 @@ final class TemplateGenerator
 	}
 
 
+	/** @param Nodes\Php\ParameterNode[] $params */
 	private function buildParams(string $body, array $params, string $cont, PrintContext $context): string
 	{
 		if (!str_contains($body, '$') && !str_contains($body, 'get_defined_vars()')) {

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

@@ -1,22 +1,26 @@
-<?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;
+use function array_merge, array_pop, array_shift, array_unshift, constant, dechex, is_int, ord, preg_last_error, preg_last_error_msg, preg_match, preg_quote, str_replace, str_starts_with, strlen, substr;
+use const PREG_UNMATCHED_AS_NULL;
 
 
+/**
+ * Tokenizes Latte template source code.
+ */
 final class TemplateLexer
 {
 	public const
 		StatePlain = 'Plain',
 		StateLatteTag = 'LatteTag',
+		StateLatteContent = 'LatteContent',
 		StateLatteComment = 'LatteComment',
 		StateHtmlText = 'HtmlText',
 		StateHtmlTag = 'HtmlTag',
@@ -33,10 +37,12 @@ final class TemplateLexer
 	public const NPrefix = 'n:';
 
 	/** HTML attribute name/value (\p{C} means \x00-\x1F except space) */
-	private const ReAttrName = '[^\p{C} "\'<>=`/]';
+	public const ReAttrName = '[^\p{C} "\'<>=`/]';
 
 	private string $openDelimiter = '';
 	private string $closeDelimiter = '';
+
+	/** @var array{string, string}[] */
 	private array $delimiters = [];
 	private TagLexer $tagLexer;
 
@@ -76,6 +82,7 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function statePlain(): array
 	{
 		return $this->match('~
@@ -90,13 +97,23 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function stateLatteTag(): array
 	{
 		$tokens[] = $this->match('~
 			(?<Slash>/)?
-			(?<Latte_Name> = | _(?!_) | [a-z]\w*+(?:[.:-]\w+)*+(?!::|\(|\\\\))?   # name, /name, but not function( or class:: or namespace\
+			(?<Latte_Name> = | _(?!_) | [a-z]\w*+(?:[.:-]\w+)*+(?!::|\(|\\\))?   # name, /name, but not function( or class:: or namespace\
 		~xsiAu');
 
+		$tokens[] = $this->stateLatteContent();
+
+		return array_merge(...$tokens);
+	}
+
+
+	/** @return Token[] */
+	private function stateLatteContent(): array
+	{
 		$tokens[] = $this->tagLexer->tokenizePartially($this->input, $this->position);
 
 		$tokens[] = $this->match('~
@@ -109,6 +126,7 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function stateLatteComment(): array
 	{
 		return $this->match('~
@@ -121,6 +139,7 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function stateHtmlText(): array
 	{
 		return $this->match('~(?J)
@@ -137,6 +156,7 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function stateHtmlTag(): array
 	{
 		return $this->match('~(?J)
@@ -154,6 +174,7 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function stateHtmlQuotedValue(string $quote): array
 	{
 		return $this->match('~
@@ -168,6 +189,7 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function stateHtmlQuotedNAttrValue(string $quote): array
 	{
 		return $this->match('~
@@ -180,6 +202,7 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function stateHtmlRawText(string $tagName): array
 	{
 		return $this->match('~
@@ -195,6 +218,7 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function stateHtmlComment(): array
 	{
 		return $this->match('~(?J)
@@ -209,6 +233,7 @@ final class TemplateLexer
 	}
 
 
+	/** @return Token[] */
 	private function stateHtmlBogus(): array
 	{
 		return $this->match('~
@@ -236,8 +261,8 @@ final class TemplateLexer
 
 		$tokens = [];
 		foreach ($matches as $k => $v) {
-			if ($v !== null && !\is_int($k)) {
-				$tokens[] = new Token(\constant(Token::class . '::' . $k), $v, $this->position);
+			if ($v !== null && !is_int($k)) {
+				$tokens[] = new Token(constant(Token::class . '::' . $k), $v, $this->position);
 				$this->position = $this->position->advance($v);
 			}
 		}
@@ -246,15 +271,15 @@ final class TemplateLexer
 	}
 
 
-	public function setState(string $state, ...$args): void
+	public function setState(string $state, mixed ...$args): void
 	{
 		$this->states[0] = ['name' => $state, 'args' => $args];
 	}
 
 
-	public function pushState(string $state, ...$args): void
+	public function pushState(string $state, mixed ...$args): void
 	{
-		array_unshift($this->states, null);
+		array_unshift($this->states, ['name' => '', 'args' => []]);
 		$this->setState($state, ...$args);
 	}
 
@@ -281,7 +306,7 @@ final class TemplateLexer
 
 		$this->delimiters[] = [$this->openDelimiter, $this->closeDelimiter];
 		[$this->openDelimiter, $this->closeDelimiter] = match ($type) {
-			null => [$left, '\}'], // {...}
+			null, 'single' => [$left, '\}'], // {...}
 			'off' => [$endTag ? '(?=' . $end . ')\{' : '(?!x)x', '\}'],
 			'double' => $endTag // {{...}}
 				? ['(?:\{' . $left . '|(?=' . $end . ')\{)', '\}(?:\}|(?<=' . $end . '))']
@@ -294,7 +319,7 @@ final class TemplateLexer
 
 	public function popSyntax(): void
 	{
-		[$this->openDelimiter, $this->closeDelimiter] = array_pop($this->delimiters);
+		[$this->openDelimiter, $this->closeDelimiter] = array_pop($this->delimiters) ?? throw new \LogicException;
 	}
 
 

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;
@@ -17,8 +15,12 @@ use Latte\Helpers;
 use Latte\Policy;
 use Latte\Runtime\Template;
 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[][] */
@@ -28,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);
 	}
 
@@ -70,7 +75,7 @@ final class TemplateParser
 		};
 
 		$node = new Nodes\TemplateNode;
-		$node->main = $this->parseFragment([$this->html, 'inTextResolve'], $findLength);
+		$node->main = $this->parseFragment($this->html->inTextResolve(...), $findLength);
 		$node->head = new FragmentNode(array_splice($node->main->children, 0, $headLength));
 		$node->contentType = $this->contentType;
 
@@ -82,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];
@@ -90,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 {
@@ -149,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);
@@ -161,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()
@@ -211,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);
 					}
 				}
 			}
@@ -229,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);
@@ -255,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,
@@ -278,7 +290,8 @@ final class TemplateParser
 	}
 
 
-	private function consumeTag(): array
+	/** @return Token[] */
+	public function consumeTag(): array
 	{
 		$res = [];
 		while ($this->stream->peek()->isPhpKind()) {
@@ -309,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))
@@ -328,6 +341,7 @@ final class TemplateParser
 	}
 
 
+	/** @return array<string, \Closure(Tag, self): (Node|\Generator|void)> */
 	private function completeAttrParsers(): array
 	{
 		$list = Helpers::sortBeforeAfter($this->attrParsersInfo);