@vituum/vite-plugin-latte 1.0.0-beta.1 → 1.1.0

package/vendor/latte/latte/src/Latte/Essential/CachingIterator.php

@@ -9,8 +9,6 @@ declare(strict_types=1);
 
 namespace Latte\Essential;
 
-use Latte;
-
 
 /**
  * Smarter caching iterator.
@@ -29,8 +27,6 @@ use Latte;
  */
 class CachingIterator extends \CachingIterator implements \Countable
 {
-	use Latte\Strict;
-
 	private int $counter = 0;
 	private ?self $parent = null;
 

package/vendor/latte/latte/src/Latte/Essential/CoreExtension.php

@@ -15,6 +15,7 @@ use Latte\Compiler\Nodes\TemplateNode;
 use Latte\Compiler\Nodes\TextNode;
 use Latte\Compiler\Tag;
 use Latte\Compiler\TemplateParser;
+use Latte\Runtime;
 use Latte\RuntimeException;
 use Nette;
 
@@ -24,14 +25,21 @@ use Nette;
  */
 final class CoreExtension extends Latte\Extension
 {
-	use Latte\Strict;
-
 	private array $functions;
+	private bool $strict;
+	private Runtime\Template $template;
 
 
 	public function beforeCompile(Latte\Engine $engine): void
 	{
 		$this->functions = $engine->getFunctions();
+		$this->strict = $engine->isStrictParsing();
+	}
+
+
+	public function beforeRender(Runtime\Template $template): void
+	{
+		$this->template = $template;
 	}
 
 
@@ -92,6 +100,7 @@ final class CoreExtension extends Latte\Extension
 			'ifset' => [Nodes\IfNode::class, 'create'],
 			'ifchanged' => [Nodes\IfChangedNode::class, 'create'],
 			'n:ifcontent' => [Nodes\IfContentNode::class, 'create'],
+			'n:else' => [Nodes\NElseNode::class, 'create'],
 			'switch' => [Nodes\SwitchNode::class, 'create'],
 		];
 	}
@@ -178,6 +187,7 @@ final class CoreExtension extends Latte\Extension
 			'last' => [Filters::class, 'last'],
 			'odd' => [Filters::class, 'odd'],
 			'slice' => [Filters::class, 'slice'],
+			'hasBlock' => fn(string $name): bool => $this->template->hasBlock($name),
 		];
 	}
 
@@ -185,10 +195,11 @@ final class CoreExtension extends Latte\Extension
 	public function getPasses(): array
 	{
 		return [
-			'internalVariables' => [Passes::class, 'internalVariablesPass'],
+			'internalVariables' => fn(TemplateNode $node) => Passes::internalVariablesPass($node, $this->strict),
 			'overwrittenVariables' => [Passes::class, 'overwrittenVariablesPass'],
 			'customFunctions' => fn(TemplateNode $node) => Passes::customFunctionsPass($node, $this->functions),
 			'moveTemplatePrintToHead' => [Passes::class, 'moveTemplatePrintToHeadPass'],
+			'nElse' => [Nodes\NElseNode::class, 'processPass'],
 		];
 	}
 

package/vendor/latte/latte/src/Latte/Essential/Filters.php

@@ -120,7 +120,7 @@ final class Filters
 		} elseif ($info->contentType === ContentType::Html) {
 			$s = preg_replace_callback('#<(textarea|pre).*?</\1#si', fn($m) => strtr($m[0], " \t\r\n", "\x1F\x1E\x1D\x1A"), $s);
 			if (preg_last_error()) {
-				throw new Latte\RegexpException;
+				throw new Latte\RuntimeException(preg_last_error_msg());
 			}
 
 			$s = preg_replace('#(?:^|[\r\n]+)(?=[^\r\n])#', '$0' . str_repeat($chars, $level), $s);
@@ -250,7 +250,7 @@ final class Filters
 	{
 		$res = preg_replace($pattern, $replacement, $subject);
 		if (preg_last_error()) {
-			throw new Latte\RegexpException;
+			throw new Latte\RuntimeException(preg_last_error_msg());
 		}
 
 		return $res;
@@ -372,9 +372,11 @@ final class Filters
 
 	private static function strLength(string $s): int
 	{
-		return function_exists('mb_strlen')
-			? mb_strlen($s, 'UTF-8')
-			: strlen(utf8_decode($s));
+		return match (true) {
+			extension_loaded('mbstring') => mb_strlen($s, 'UTF-8'),
+			extension_loaded('iconv') => iconv_strlen($s, 'UTF-8'),
+			default => strlen(@utf8_decode($s)), // deprecated
+		};
 	}
 
 
@@ -386,7 +388,7 @@ final class Filters
 		$charlist = preg_quote($charlist, '#');
 		$s = preg_replace('#^[' . $charlist . ']+|[' . $charlist . ']+$#Du', '', (string) $s);
 		if (preg_last_error()) {
-			throw new Latte\RegexpException;
+			throw new Latte\RuntimeException(preg_last_error_msg());
 		}
 
 		return $s;

package/vendor/latte/latte/src/Latte/Essential/Nodes/BlockNode.php

@@ -40,7 +40,7 @@ class BlockNode extends StatementNode
 	{
 		$tag->outputMode = $tag::OutputRemoveIndentation;
 		$stream = $tag->parser->stream;
-		$node = new static;
+		$node = $tag->node = new static;
 
 		if (!$stream->is('|', Token::End)) {
 			$layer = $tag->parser->tryConsumeTokenBeforeUnquotedString('local')
@@ -52,7 +52,6 @@ class BlockNode extends StatementNode
 
 			if (!$node->block->isDynamic()) {
 				$parser->checkBlockIsUnique($node->block);
-				$tag->data->block = $node->block; // for {include}
 			}
 		}
 

package/vendor/latte/latte/src/Latte/Essential/Nodes/CaptureNode.php

@@ -11,9 +11,7 @@ namespace Latte\Essential\Nodes;
 
 use Latte\CompileException;
 use Latte\Compiler\Escaper;
-use Latte\Compiler\Node;
 use Latte\Compiler\Nodes\AreaNode;
-use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\Php\ModifierNode;
 use Latte\Compiler\Nodes\StatementNode;
@@ -36,7 +34,7 @@ class CaptureNode extends StatementNode
 	{
 		$tag->expectArguments();
 		$variable = $tag->parser->parseExpression();
-		if (!self::canBeAssignedTo($variable)) {
+		if (!$variable->isWritable()) {
 			$text = '';
 			$i = 0;
 			while ($token = $tag->parser->stream->peek(--$i)) {
@@ -45,7 +43,7 @@ class CaptureNode extends StatementNode
 
 			throw new CompileException("It is not possible to write into '$text' in " . $tag->getNotation(), $tag->position);
 		}
-		$node = new static;
+		$node = $tag->node = new static;
 		$node->variable = $variable;
 		$node->modifier = $tag->parser->parseModifier();
 		[$node->content] = yield;
@@ -80,15 +78,6 @@ class CaptureNode extends StatementNode
 	}
 
 
-	private static function canBeAssignedTo(Node $node): bool
-	{
-		return $node instanceof Expression\VariableNode
-			|| $node instanceof Expression\ArrayAccessNode
-			|| $node instanceof Expression\PropertyFetchNode
-			|| $node instanceof Expression\StaticPropertyFetchNode;
-	}
-
-
 	public function &getIterator(): \Generator
 	{
 		yield $this->variable;

package/vendor/latte/latte/src/Latte/Essential/Nodes/ContentTypeNode.php

@@ -32,7 +32,7 @@ class ContentTypeNode extends StatementNode
 		while (!$tag->parser->stream->consume()->isEnd());
 		$type = trim($tag->parser->text);
 
-		if (!$tag->isInHead() && !($tag->htmlElement?->name === 'script' && str_contains($type, 'html'))) {
+		if (!$tag->isInHead() && !($tag->htmlElement?->is('script') && str_contains($type, 'html'))) {
 			throw new CompileException('{contentType} is allowed only in template header.', $tag->position);
 		}
 

package/vendor/latte/latte/src/Latte/Essential/Nodes/DefineNode.php

@@ -42,11 +42,10 @@ class DefineNode extends StatementNode
 		$tag->parser->stream->tryConsume('#');
 		$name = $tag->parser->parseUnquotedStringOrExpression();
 
-		$node = new static;
+		$node = $tag->node = new static;
 		$node->block = new Block($name, $layer, $tag);
 		if (!$node->block->isDynamic()) {
 			$parser->checkBlockIsUnique($node->block);
-			$tag->data->block = $node->block; // for {include}
 			$tag->parser->stream->tryConsume(',');
 			$node->block->parameters = self::parseParameters($tag);
 		}

package/vendor/latte/latte/src/Latte/Essential/Nodes/EmbedNode.php

@@ -43,7 +43,7 @@ class EmbedNode extends StatementNode
 		$tag->outputMode = $tag::OutputRemoveIndentation;
 		$tag->expectArguments();
 
-		$node = new static;
+		$node = $tag->node = new static;
 		$mode = $tag->parser->tryConsumeTokenBeforeUnquotedString('block', 'file')?->text;
 		$node->name = $tag->parser->parseUnquotedStringOrExpression();
 		$node->mode = $mode ?? ($node->name instanceof StringNode && preg_match('~[\w-]+$~DA', $node->name->value) ? 'block' : 'file');

package/vendor/latte/latte/src/Latte/Essential/Nodes/ExtendsNode.php

@@ -33,8 +33,6 @@ class ExtendsNode extends StatementNode
 		$node = new static;
 		if (!$tag->isInHead()) {
 			throw new CompileException("{{$tag->name}} must be placed in template head.", $tag->position);
-		} elseif (isset($tag->data->extends)) {
-			throw new CompileException("Multiple {{$tag->name}} declarations are not allowed.", $tag->position);
 		} elseif ($tag->parser->stream->tryConsume('auto')) {
 			$node->extends = new NullNode;
 		} elseif ($tag->parser->stream->tryConsume('none')) {
@@ -42,7 +40,6 @@ class ExtendsNode extends StatementNode
 		} else {
 			$node->extends = $tag->parser->parseUnquotedStringOrExpression();
 		}
-		$tag->data->extends = true;
 		return $node;
 	}
 

package/vendor/latte/latte/src/Latte/Essential/Nodes/FirstLastSepNode.php

@@ -34,7 +34,7 @@ class FirstLastSepNode extends StatementNode
 	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
 	public static function create(Tag $tag): \Generator
 	{
-		$node = new static;
+		$node = $tag->node = new static;
 		$node->name = $tag->name;
 		$node->width = $tag->parser->isEnd() ? null : $tag->parser->parseExpression();
 

package/vendor/latte/latte/src/Latte/Essential/Nodes/ForNode.php

@@ -35,7 +35,7 @@ class ForNode extends StatementNode
 	{
 		$tag->expectArguments();
 		$stream = $tag->parser->stream;
-		$node = new static;
+		$node = $tag->node = new static;
 		while (!$stream->is(';')) {
 			$node->init[] = $tag->parser->parseExpression();
 			$stream->tryConsume(',');

package/vendor/latte/latte/src/Latte/Essential/Nodes/ForeachNode.php

@@ -13,6 +13,7 @@ use Latte\CompileException;
 use Latte\Compiler\Nodes\AreaNode;
 use Latte\Compiler\Nodes\NopNode;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\ListNode;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
@@ -28,7 +29,7 @@ class ForeachNode extends StatementNode
 	public ExpressionNode $expression;
 	public ?ExpressionNode $key = null;
 	public bool $byRef = false;
-	public ExpressionNode $value;
+	public ExpressionNode|ListNode $value;
 	public AreaNode $content;
 	public ?AreaNode $else = null;
 	public ?Position $elseLine = null;
@@ -40,9 +41,8 @@ class ForeachNode extends StatementNode
 	public static function create(Tag $tag): \Generator
 	{
 		$tag->expectArguments();
-		$node = new static;
+		$node = $tag->node = new static;
 		self::parseArguments($tag->parser, $node);
-		$tag->data->iterateWhile = [$node->key, $node->value];
 
 		$modifier = $tag->parser->parseModifier();
 		foreach ($modifier->filters as $filter) {
@@ -73,16 +73,7 @@ class ForeachNode extends StatementNode
 		$stream = $parser->stream;
 		$node->expression = $parser->parseExpression();
 		$stream->consume('as');
-		if (!$stream->is('&')) {
-			$node->value = $parser->parseExpression();
-			if (!$stream->tryConsume('=>')) {
-				return;
-			}
-			$node->key = $node->value;
-		}
-
-		$node->byRef = (bool) $stream->tryConsume('&');
-		$node->value = $parser->parseExpression();
+		[$node->key, $node->value, $node->byRef] = $parser->parseForeach();
 	}
 
 

package/vendor/latte/latte/src/Latte/Essential/Nodes/IfChangedNode.php

@@ -31,7 +31,7 @@ class IfChangedNode extends StatementNode
 	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
 	public static function create(Tag $tag): \Generator
 	{
-		$node = new static;
+		$node = $tag->node = new static;
 		$node->conditions = $tag->parser->parseArguments();
 
 		[$node->then, $nextTag] = yield ['else'];

package/vendor/latte/latte/src/Latte/Essential/Nodes/IfContentNode.php

@@ -27,12 +27,13 @@ class IfContentNode extends StatementNode
 	public AreaNode $content;
 	public int $id;
 	public ElementNode $htmlElement;
+	public ?AreaNode $else = null;
 
 
 	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
 	public static function create(Tag $tag, TemplateParser $parser): \Generator
 	{
-		$node = new static;
+		$node = $tag->node = new static;
 		$node->id = $parser->generateId();
 		[$node->content] = yield;
 		$node->htmlElement = $tag->htmlElement;
@@ -47,6 +48,7 @@ class IfContentNode extends StatementNode
 	{
 		try {
 			$saved = $this->htmlElement->content;
+			$else = $this->else ?? new AuxiliaryNode(fn() => '');
 			$this->htmlElement->content = new AuxiliaryNode(fn() => <<<XX
 				ob_start();
 				try {
@@ -63,6 +65,7 @@ class IfContentNode extends StatementNode
 				} finally {
 					if (\$ʟ_ifc[$this->id] ?? null) {
 						ob_end_clean();
+						{$else->print($context)}
 					} else {
 						echo ob_get_clean();
 					}

package/vendor/latte/latte/src/Latte/Essential/Nodes/IfNode.php

@@ -10,7 +10,6 @@ declare(strict_types=1);
 namespace Latte\Essential\Nodes;
 
 use Latte\CompileException;
-use Latte\Compiler\ExpressionBuilder;
 use Latte\Compiler\Nodes\AreaNode;
 use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
@@ -42,7 +41,7 @@ class IfNode extends StatementNode
 	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
 	public static function create(Tag $tag, TemplateParser $parser): \Generator
 	{
-		$node = new static;
+		$node = $tag->node = new static;
 		$node->ifset = in_array($tag->name, ['ifset', 'elseifset'], true);
 		$node->capture = !$tag->isNAttribute() && $tag->name === 'if' && $tag->parser->isEnd();
 		$node->position = $tag->position;
@@ -83,7 +82,10 @@ class IfNode extends StatementNode
 			$block = $parser->tryConsumeTokenBeforeUnquotedString('block') ?? $parser->stream->tryConsume('#');
 			$name = $parser->parseUnquotedStringOrExpression();
 			$list[] = $block || $name instanceof StringNode
-				? ExpressionBuilder::variable('$this')->method('hasBlock', [$name])->build()
+				? new Expression\AuxiliaryNode(
+					fn(PrintContext $context, ExpressionNode $name) => '$this->hasBlock(' . $name->print($context) . ')',
+					[$name],
+				)
 				: new Expression\IssetNode([$name]);
 		} while ($parser->stream->tryConsume(','));
 

package/vendor/latte/latte/src/Latte/Essential/Nodes/IncludeBlockNode.php

@@ -65,12 +65,15 @@ class IncludeBlockNode extends StatementNode
 			throw new CompileException('Filters are not allowed in {include parent}', $tag->position);
 
 		} elseif ($node->parent || $tokenName->is('this')) {
-			$item = $tag->closestTag(['block', 'define'], fn($item) => isset($item->data->block) && $item->data->block->name !== '');
+			$item = $tag->closestTag(
+				[BlockNode::class, DefineNode::class],
+				fn($item) => $item->node?->block && !$item->node->block->isDynamic() && $item->node->block->name !== ''
+			);
 			if (!$item) {
 				throw new CompileException("Cannot include $tokenName->text block outside of any block.", $tag->position);
 			}
 
-			$node->name = $item->data->block->name;
+			$node->name = $item->node->block->name;
 		}
 
 		$node->blocks = &$parser->blocks;

package/vendor/latte/latte/src/Latte/Essential/Nodes/IterateWhileNode.php

@@ -12,6 +12,7 @@ namespace Latte\Essential\Nodes;
 use Latte\CompileException;
 use Latte\Compiler\Nodes\AreaNode;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\ListNode;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
@@ -25,25 +26,26 @@ class IterateWhileNode extends StatementNode
 	public ExpressionNode $condition;
 	public AreaNode $content;
 	public ?ExpressionNode $key;
-	public ExpressionNode $value;
+	public ExpressionNode|ListNode $value;
 	public bool $postTest;
 
 
 	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
 	public static function create(Tag $tag): \Generator
 	{
-		$foreach = $tag->closestTag(['foreach']);
+		$foreach = $tag->closestTag([ForeachNode::class])?->node;
 		if (!$foreach) {
 			throw new CompileException("Tag {{$tag->name}} must be inside {foreach} ... {/foreach}.", $tag->position);
 		}
 
-		$node = new static;
+		$node = $tag->node = new static;
 		$node->postTest = $tag->parser->isEnd();
 		if (!$node->postTest) {
 			$node->condition = $tag->parser->parseExpression();
 		}
 
-		[$node->key, $node->value] = $foreach->data->iterateWhile;
+		$node->key = $foreach->key;
+		$node->value = $foreach->value;
 		[$node->content, $nextTag] = yield;
 		if ($node->postTest) {
 			$nextTag->expectArguments();

package/vendor/latte/latte/src/Latte/Essential/Nodes/JumpNode.php

@@ -26,54 +26,57 @@ class JumpNode extends StatementNode
 {
 	public string $type;
 	public ExpressionNode $condition;
-	public ?string $endTag = null;
 
 
 	public static function create(Tag $tag): static
 	{
 		$tag->expectArguments();
-		$allowed = match ($tag->name) {
-			'breakIf', 'continueIf' => ['for', 'foreach', 'while'],
-			'skipIf' => ['foreach'],
-			'exitIf' => ['block', null],
-		};
+		$tag->outputMode = $tag->name === 'exitIf' // to not be in prepare()
+			? $tag::OutputRemoveIndentation
+			: $tag::OutputNone;
+
 		for (
 			$parent = $tag->parent;
-			in_array($parent?->name, ['if', 'ifset', 'ifcontent'], true);
+			$parent?->node instanceof IfNode || $parent?->node instanceof IfContentNode;
 			$parent = $parent->parent
 		);
-		if (!in_array($parent?->name, $allowed, true)) {
+		$pnode = $parent?->node;
+		if (!match ($tag->name) {
+			'breakIf', 'continueIf' => $pnode instanceof ForNode || $pnode instanceof ForeachNode || $pnode instanceof WhileNode,
+			'skipIf' => $pnode instanceof ForeachNode,
+			'exitIf' => !$pnode || $pnode instanceof BlockNode || $pnode instanceof DefineNode,
+		}) {
 			throw new CompileException("Tag {{$tag->name}} is unexpected here.", $tag->position);
 		}
 
+		$last = $parent?->prefix === Tag::PrefixNone
+			? $parent->htmlElement->parent
+			: $parent?->htmlElement;
+		$el = $tag->htmlElement;
+		while ($el && $el !== $last) {
+			$el->breakable = true;
+			$el = $el->parent;
+		}
+
 		$node = new static;
 		$node->type = $tag->name;
 		$node->condition = $tag->parser->parseExpression();
-		if (isset($tag->htmlElement->nAttributes['foreach'])) {
-			$node->endTag = $tag->htmlElement->name;
-		}
 		return $node;
 	}
 
 
 	public function print(PrintContext $context): string
 	{
-		$cmd = match ($this->type) {
-			'breakIf' => 'break;',
-			'continueIf' => 'continue;',
-			'skipIf' => '{ $iterator->skipRound(); continue; }',
-			'exitIf' => 'return;',
-		};
-
-		if ($this->endTag) {
-			$cmd = "{ echo \"</$this->endTag>\\n\"; $cmd; } ";
-		}
-
 		return $context->format(
 			"if (%node) %line %raw\n",
 			$this->condition,
 			$this->position,
-			$cmd,
+			match ($this->type) {
+				'breakIf' => 'break;',
+				'continueIf' => 'continue;',
+				'skipIf' => '{ $iterator->skipRound(); continue; }',
+				'exitIf' => 'return;',
+			},
 		);
 	}
 

package/vendor/latte/latte/src/Latte/Essential/Nodes/NElseNode.php

@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * 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\Essential\Nodes;
+
+use Latte\CompileException;
+use Latte\Compiler\Node;
+use Latte\Compiler\Nodes;
+use Latte\Compiler\Nodes\AreaNode;
+use Latte\Compiler\Nodes\StatementNode;
+use Latte\Compiler\NodeTraverser;
+use Latte\Compiler\PrintContext;
+use Latte\Compiler\Tag;
+
+
+/**
+ * n:else
+ */
+final class NElseNode extends StatementNode
+{
+	public AreaNode $content;
+
+
+	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
+	public static function create(Tag $tag): \Generator
+	{
+		$node = $tag->node = new static;
+		[$node->content] = yield;
+		return $node;
+	}
+
+
+	public function print(PrintContext $context): string
+	{
+		throw new \LogicException('Cannot directly print');
+	}
+
+
+	public function &getIterator(): \Generator
+	{
+		yield $this->content;
+	}
+
+
+	public static function processPass(Node $node): void
+	{
+		(new NodeTraverser)->traverse($node, function (Node $node) {
+			if ($node instanceof Nodes\FragmentNode) {
+				for ($i = count($node->children) - 1; $i >= 0; $i--) {
+					$nElse = $node->children[$i];
+					if (!$nElse instanceof self) {
+						continue;
+					}
+
+					array_splice($node->children, $i, 1);
+					$prev = $node->children[--$i] ?? null;
+					if ($prev instanceof Nodes\TextNode && trim($prev->content) === '') {
+						array_splice($node->children, $i, 1);
+						$prev = $node->children[--$i] ?? null;
+					}
+
+					if (
+						$prev instanceof IfNode
+						|| $prev instanceof ForeachNode
+						|| $prev instanceof TryNode
+						|| $prev instanceof IfChangedNode
+						|| $prev instanceof IfContentNode
+					) {
+						if ($prev->else) {
+							throw new CompileException('Multiple "else" found.', $nElse->position);
+						}
+						$prev->else = $nElse->content;
+					} else {
+						throw new CompileException('n:else must be immediately after n:if, n:foreach etc', $nElse->position);
+					}
+				}
+			} elseif ($node instanceof self) {
+				throw new CompileException('n:else must be immediately after n:if, n:foreach etc', $node->position);
+			}
+		});
+	}
+}