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

package/vendor/latte/latte/src/Latte/Essential/Nodes/IncludeFileNode.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\Essential\Nodes;
 
 use Latte\Compiler\Nodes\Php\Expression\ArrayNode;
@@ -19,7 +17,7 @@ use Latte\Compiler\Tag;
 
 
 /**
- * {include [file] "file" [with blocks] [,] [params]}
+ * {include 'file.latte' [with blocks]}
  */
 class IncludeFileNode extends StatementNode
 {
@@ -48,25 +46,24 @@ class IncludeFileNode extends StatementNode
 		$stream->tryConsume(',');
 		$node->args = $tag->parser->parseArguments();
 		$node->modifier = $tag->parser->parseModifier();
-		$node->modifier->escape = (bool) $node->modifier->filters;
+		$node->modifier->escape = !$node->modifier->removeFilter('noescape');
 		return $node;
 	}
 
 
 	public function print(PrintContext $context): string
 	{
-		$noEscape = $this->modifier->hasFilter('noescape');
 		return $context->format(
-			'$this->createTemplate(%node, %node? + $this->params, %dump)->renderToContentType(%raw) %line;',
-			$this->file,
+			'$this->createTemplate(%raw, %node? + $this->params, %dump)->renderToContentType(%raw) %line;',
+			$context->ensureString($this->file, 'Template name'),
 			$this->args,
 			$this->mode,
-			count($this->modifier->filters) > (int) $noEscape
+			$this->modifier->filters
 				? $context->format(
 					'function ($s, $type) { $ʟ_fi = new LR\FilterInfo($type); return %modifyContent($s); }',
 					$this->modifier,
 				)
-				: PhpHelpers::dump($noEscape ? null : $context->getEscaper()->export()),
+				: PhpHelpers::dump($this->modifier->escape ? $context->getEscaper()->export() : null),
 			$this->position,
 		);
 	}

package/vendor/latte/latte/src/Latte/Essential/Nodes/IterateWhileNode.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\Essential\Nodes;
 
 use Latte\CompileException;
@@ -19,7 +17,8 @@ use Latte\Compiler\Tag;
 
 
 /**
- * {iterateWhile $cond}
+ * {iterateWhile [$cond]} ... {/iterateWhile [$cond]}
+ * Groups consecutive items in {foreach} by condition.
  */
 class IterateWhileNode extends StatementNode
 {
@@ -30,11 +29,11 @@ class IterateWhileNode extends StatementNode
 	public bool $postTest;
 
 
-	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
+	/** @return \Generator<int, ?list<string>, array{AreaNode, ?Tag}, static> */
 	public static function create(Tag $tag): \Generator
 	{
 		$foreach = $tag->closestTag([ForeachNode::class])?->node;
-		if (!$foreach) {
+		if (!$foreach instanceof ForeachNode) {
 			throw new CompileException("Tag {{$tag->name}} must be inside {foreach} ... {/foreach}.", $tag->position);
 		}
 
@@ -48,6 +47,7 @@ class IterateWhileNode extends StatementNode
 		$node->value = $foreach->value;
 		[$node->content, $nextTag] = yield;
 		if ($node->postTest) {
+			assert($nextTag !== null);
 			$nextTag->expectArguments();
 			$node->condition = $nextTag->parser->parseExpression();
 		}

package/vendor/latte/latte/src/Latte/Essential/Nodes/JumpNode.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\Essential\Nodes;
 
 use Latte\CompileException;
@@ -17,10 +15,8 @@ use Latte\Compiler\Tag;
 
 
 /**
- * {breakIf ...}
- * {continueIf ...}
- * {skipIf ...}
- * {exitIf ...}
+ * {breakIf $cond}, {continueIf $cond}, {skipIf $cond}, {exitIf $cond}
+ * Note: {skipIf} is like {continueIf} but doesn't increment $iterator->counter.
  */
 class JumpNode extends StatementNode
 {
@@ -50,7 +46,7 @@ class JumpNode extends StatementNode
 		}
 
 		$last = $parent?->prefix === Tag::PrefixNone
-			? $parent->htmlElement->parent
+			? $parent->htmlElement?->parent
 			: $parent?->htmlElement;
 		$el = $tag->htmlElement;
 		while ($el && $el !== $last) {

package/vendor/latte/latte/src/Latte/Essential/Nodes/NAttrNode.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\Essential\Nodes;
 
 use Latte;
@@ -14,10 +12,12 @@ use Latte\Compiler\Nodes\Php\Expression\ArrayNode;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
+use Latte\Runtime as LR;
+use function is_array;
 
 
 /**
- * n:attr="..."
+ * <div n:attr="class => $class, id => $id">
  */
 final class NAttrNode extends StatementNode
 {
@@ -37,64 +37,52 @@ final class NAttrNode extends StatementNode
 	{
 		return $context->format(
 			'$ʟ_tmp = %node;
-			echo %raw::attrs(isset($ʟ_tmp[0]) && is_array($ʟ_tmp[0]) ? $ʟ_tmp[0] : $ʟ_tmp, %dump) %line;',
+			echo %raw::attrs($ʟ_tmp, %dump, %dump?) %line;',
 			$this->args,
 			self::class,
 			$context->getEscaper()->getContentType() === Latte\ContentType::Xml,
+			$context->hasFeature(Latte\Feature::MigrationWarnings) ?: null,
 			$this->position,
 		);
 	}
 
 
-	/** @internal */
-	public static function attrs($attrs, bool $xml): string
+	public static function attrs(mixed $attrs, bool $xml, bool $migrationWarnings = false): string
 	{
+		$attrs = $attrs === [$attrs[0] ?? null] ? $attrs[0] : $attrs; // checks if the value is an array, e.g. n:attr="$attrs"
 		if (!is_array($attrs)) {
 			return '';
 		}
 
-		$s = '';
-		foreach ($attrs as $key => $value) {
-			if ($value === null || $value === false) {
-				continue;
-
-			} elseif ($value === true) {
-				$s .= ' ' . $key . ($xml ? '="' . $key . '"' : '');
-				continue;
-
-			} elseif (is_array($value)) {
-				$tmp = null;
-				foreach ($value as $k => $v) {
-					if ($v != null) { // intentionally ==, skip nulls & empty string
-						//  composite 'style' vs. 'others'
-						$tmp[] = $v === true
-							? $k
-							: (is_string($k) ? $k . ':' . $v : $v);
-					}
-				}
-
-				if ($tmp === null) {
-					continue;
-				}
-
-				$value = implode($key === 'style' || !strncmp($key, 'on', 2) ? ';' : ' ', $tmp);
-
-			} else {
-				$value = (string) $value;
-			}
-
-			$q = !str_contains($value, '"') ? '"' : "'";
-			$s .= ' ' . $key . '=' . $q
-				. str_replace(
-					['&', $q, '<'],
-					['&amp;', $q === '"' ? '&quot;' : '&#39;', $xml ? '&lt;' : '<'],
-					$value,
-				)
-				. (str_contains($value, '`') && strpbrk($value, ' <>"\'') === false ? ' ' : '')
-				. $q;
+		$res = '';
+		foreach ($attrs as $name => $value) {
+			$attr = $xml ? self::formatXmlAttribute($name, $value) : self::formatHtmlAttribute($name, $value, $migrationWarnings);
+			$res .= $attr ? ' ' . $attr : '';
 		}
 
-		return $s;
+		return $res;
+	}
+
+
+	public static function formatHtmlAttribute(mixed $name, mixed $value, bool $migrationWarnings = false): string
+	{
+		LR\HtmlHelpers::validateAttributeName($name);
+		$type = LR\HtmlHelpers::classifyAttributeType($name);
+		if ($value === null || ($value === false && $type !== 'data' && $type !== 'aria')) {
+			return '';
+		} elseif ($value === true && $type === '') {
+			return $name;
+		} elseif ($migrationWarnings && is_array($value) && $type === 'data') {
+			LR\HtmlHelpers::triggerMigrationWarning($name, "array value: previously it rendered as $name=\"val1 val2 ...\", now the attribute is JSON-encoded");
+		}
+		return LR\HtmlHelpers::{"format{$type}Attribute"}($name, $value, $migrationWarnings);
+	}
+
+
+	public static function formatXmlAttribute(mixed $name, mixed $value): string
+	{
+		LR\XmlHelpers::validateAttributeName($name);
+		return $value === false ? '' : LR\XmlHelpers::formatAttribute($name, $value);
 	}
 
 

package/vendor/latte/latte/src/Latte/Essential/Nodes/NClassNode.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\Essential\Nodes;
 
 use Latte\CompileException;
@@ -17,7 +15,7 @@ use Latte\Compiler\Tag;
 
 
 /**
- * n:class="..."
+ * <div n:class="$isActive ? active, highlight">
  */
 final class NClassNode extends StatementNode
 {
@@ -26,6 +24,7 @@ final class NClassNode extends StatementNode
 
 	public static function create(Tag $tag): static
 	{
+		assert($tag->htmlElement !== null);
 		if ($tag->htmlElement->getAttribute('class')) {
 			throw new CompileException('It is not possible to combine class with n:class.', $tag->position);
 		}
@@ -40,7 +39,7 @@ final class NClassNode extends StatementNode
 	public function print(PrintContext $context): string
 	{
 		return $context->format(
-			'echo ($ʟ_tmp = array_filter(%node)) ? \' class="\' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . \'"\' : "" %line;',
+			'echo ($ʟ_tmp = array_filter(%node)) ? \' class="\' . LR\HtmlHelpers::escapeAttr(implode(" ", array_unique($ʟ_tmp))) . \'"\' : "" %line;',
 			$this->args,
 			$this->position,
 		);

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

@@ -1,18 +1,17 @@
-<?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\Essential\Nodes;
 
 use Latte\CompileException;
 use Latte\Compiler\Node;
 use Latte\Compiler\Nodes;
 use Latte\Compiler\Nodes\AreaNode;
+use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\NodeTraverser;
 use Latte\Compiler\PrintContext;
@@ -20,17 +19,23 @@ use Latte\Compiler\Tag;
 
 
 /**
- * n:else
+ * <div n:if="$cond"> ... <div n:else>
+ * <div n:if="$cond"> ... <div n:elseif="$cond2">
  */
 final class NElseNode extends StatementNode
 {
 	public AreaNode $content;
+	public ?ExpressionNode $condition = null;
 
 
-	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
+	/** @return \Generator<int, ?list<string>, array{AreaNode, ?Tag}, static> */
 	public static function create(Tag $tag): \Generator
 	{
 		$node = $tag->node = new static;
+		if ($tag->name === 'elseif') {
+			$tag->expectArguments();
+			$node->condition = $tag->parser->parseExpression();
+		}
 		[$node->content] = yield;
 		return $node;
 	}
@@ -44,6 +49,9 @@ final class NElseNode extends StatementNode
 
 	public function &getIterator(): \Generator
 	{
+		if ($this->condition) {
+			yield $this->condition;
+		}
 		yield $this->content;
 	}
 
@@ -52,37 +60,64 @@ final class NElseNode extends StatementNode
 	{
 		(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);
-					}
-				}
+				$node->children = self::processFragment($node->children);
 			} elseif ($node instanceof self) {
-				throw new CompileException('n:else must be immediately after n:if, n:foreach etc', $node->position);
+				self::processFragment([$node]);
 			}
 		});
 	}
+
+
+	/**
+	 * @param  AreaNode[]  $children
+	 * @return AreaNode[]
+	 */
+	private static function processFragment(array $children): array
+	{
+		$currentNode = null;
+		for ($i = 0; isset($children[$i]); $i++) {
+			$child = $children[$i];
+
+			if ($child instanceof IfNode
+				|| $child instanceof ForeachNode
+				|| $child instanceof TryNode
+				|| $child instanceof IfChangedNode
+				|| $child instanceof IfContentNode
+			) {
+				$currentNode = $child;
+
+			} elseif ($child instanceof Nodes\TextNode && trim($child->content) === '') {
+				continue;
+
+			} elseif ($child instanceof self) {
+				$nElse = $child;
+				if ($currentNode === null) {
+					throw new CompileException('n:else must be immediately after n:if, n:foreach etc', $nElse->position);
+				} elseif ($currentNode->else) {
+					throw new CompileException('Multiple "else" found.', $nElse->position);
+				}
+
+				if ($nElse->condition) {
+					$elseIfNode = new IfNode;
+					$elseIfNode->condition = $nElse->condition;
+					$elseIfNode->then = $nElse->content;
+					$elseIfNode->position = $nElse->position;
+					$currentNode->else = $elseIfNode;
+					$currentNode = $elseIfNode;
+				} else {
+					$currentNode->else = $nElse->content;
+					$currentNode = null;
+				}
+
+				unset($children[$i]);
+				for ($o = 1; ($children[$i - $o] ?? null) instanceof Nodes\TextNode; $o++) {
+					unset($children[$i - $o]);
+				}
+			} else {
+				$currentNode = null;
+			}
+		}
+
+		return array_values($children);
+	}
 }

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

@@ -1,45 +1,36 @@
-<?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\Essential\Nodes;
 
-use Latte;
 use Latte\CompileException;
-use Latte\Compiler\Nodes\Php\Expression\AuxiliaryNode;
+use Latte\Compiler\Nodes\Html\TagNode;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
-use Latte\Compiler\TemplateParser;
-use Latte\ContentType;
+use function preg_match;
 
 
 /**
- * n:tag="..."
+ * <div n:tag="$useSpan ? span">
  */
 final class NTagNode extends StatementNode
 {
-	public static function create(Tag $tag, TemplateParser $parser): void
+	public static function create(Tag $tag): void
 	{
+		assert($tag->htmlElement !== null);
 		if (preg_match('(style$|script$)iA', $tag->htmlElement->name)) {
 			throw new CompileException('Attribute n:tag is not allowed in <script> or <style>', $tag->position);
 		}
 
 		$tag->expectArguments();
-		$tag->htmlElement->variableName = new AuxiliaryNode(
-			fn(PrintContext $context, $newName) => $context->format(
-				self::class . '::check(%dump, %node, %dump)',
-				$tag->htmlElement->name,
-				$newName,
-				$parser->getContentType() === ContentType::Xml,
-			),
-			[$tag->parser->parseExpression()],
-		);
+		$tag->htmlElement->dynamicTag ??= new TagNode($tag->htmlElement);
+		assert($tag->htmlElement->dynamicTag instanceof TagNode);
+		$tag->htmlElement->dynamicTag->name = $tag->parser->parseExpression();
 	}
 
 
@@ -49,21 +40,6 @@ final class NTagNode extends StatementNode
 	}
 
 
-	public static function check(string $orig, mixed $new, bool $xml): mixed
-	{
-		if ($new === null) {
-			return $orig;
-		} elseif (!$xml
-			&& is_string($new)
-			&& isset(Latte\Helpers::$emptyElements[strtolower($orig)]) !== isset(Latte\Helpers::$emptyElements[strtolower($new)])
-		) {
-			throw new Latte\RuntimeException("Forbidden tag <$orig> change to <$new>");
-		}
-
-		return $new;
-	}
-
-
 	public function &getIterator(): \Generator
 	{
 		false && yield;

package/vendor/latte/latte/src/Latte/Essential/Nodes/ParametersNode.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\Essential\Nodes;
 
 use Latte\CompileException;
@@ -18,10 +16,13 @@ use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
 use Latte\Compiler\Token;
+use Latte\Helpers;
+use function is_string;
 
 
 /**
- * {parameters [type] $var, ...}
+ * {parameters [Type] $name [= default], ...}
+ * Declares and filters template parameters.
  */
 class ParametersNode extends StatementNode
 {
@@ -41,6 +42,7 @@ class ParametersNode extends StatementNode
 	}
 
 
+	/** @return ParameterNode[] */
 	private static function parseParameters(Tag $tag): array
 	{
 		$stream = $tag->parser->stream;
@@ -80,5 +82,6 @@ class ParametersNode extends StatementNode
 		foreach ($this->parameters as &$param) {
 			yield $param;
 		}
+		Helpers::removeNulls($this->parameters);
 	}
 }

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

@@ -1,21 +1,20 @@
-<?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\Essential\Nodes;
 
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
+use function preg_match, trim;
 
 
 /**
- * {php statement; statement; ...}
+ * {php code} (requires RawPhpExtension)
  */
 class RawPhpNode extends StatementNode
 {

package/vendor/latte/latte/src/Latte/Essential/Nodes/RollbackNode.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\Essential\Nodes;
 
 use Latte\CompileException;
@@ -17,6 +15,7 @@ use Latte\Compiler\Tag;
 
 /**
  * {rollback}
+ * Discards {try} block output and jumps to {else}.
  */
 class RollbackNode extends StatementNode
 {

package/vendor/latte/latte/src/Latte/Essential/Nodes/SpacelessNode.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\Essential\Nodes;
 
 use Latte\Compiler\Nodes\AreaNode;
@@ -17,14 +15,15 @@ use Latte\ContentType;
 
 
 /**
- * {spaceless}
+ * {spaceless} ... {/spaceless}
+ * Removes whitespace between HTML tags.
  */
 class SpacelessNode extends StatementNode
 {
 	public AreaNode $content;
 
 
-	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
+	/** @return \Generator<int, ?list<string>, array{AreaNode, ?Tag}, static> */
 	public static function create(Tag $tag): \Generator
 	{
 		$node = $tag->node = new static;