@vituum/vite-plugin-latte 1.1.0 → 1.2.0

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

@@ -11,7 +11,6 @@ namespace Latte\Essential;
 
 use Latte;
 use Latte\Compiler\Nodes\Php\Scalar;
-use Latte\Compiler\Nodes\TemplateNode;
 use Latte\Compiler\Nodes\TextNode;
 use Latte\Compiler\Tag;
 use Latte\Compiler\TemplateParser;
@@ -25,21 +24,19 @@ use Nette;
  */
 final class CoreExtension extends Latte\Extension
 {
-	private array $functions;
-	private bool $strict;
-	private Runtime\Template $template;
+	private Latte\Engine $engine;
+	private Filters $filters;
 
 
-	public function beforeCompile(Latte\Engine $engine): void
+	public function __construct()
 	{
-		$this->functions = $engine->getFunctions();
-		$this->strict = $engine->isStrictParsing();
+		$this->filters = new Filters;
 	}
 
 
-	public function beforeRender(Runtime\Template $template): void
+	public function beforeCompile(Latte\Engine $engine): void
 	{
-		$this->template = $template;
+		$this->engine = $engine;
 	}
 
 
@@ -109,18 +106,19 @@ final class CoreExtension extends Latte\Extension
 	public function getFilters(): array
 	{
 		return [
-			'batch' => [Filters::class, 'batch'],
-			'breakLines' => [Filters::class, 'breaklines'],
-			'breaklines' => [Filters::class, 'breaklines'],
-			'bytes' => [Filters::class, 'bytes'],
+			'batch' => [$this->filters, 'batch'],
+			'breakLines' => [$this->filters, 'breaklines'],
+			'breaklines' => [$this->filters, 'breaklines'],
+			'bytes' => [$this->filters, 'bytes'],
 			'capitalize' => extension_loaded('mbstring')
-				? [Filters::class, 'capitalize']
-				: function () { throw new RuntimeException('Filter |capitalize requires mbstring extension.'); },
-			'ceil' => [Filters::class, 'ceil'],
-			'clamp' => [Filters::class, 'clamp'],
-			'dataStream' => [Filters::class, 'dataStream'],
-			'datastream' => [Filters::class, 'dataStream'],
-			'date' => [Filters::class, 'date'],
+				? [$this->filters, 'capitalize']
+				: fn() => throw new RuntimeException('Filter |capitalize requires mbstring extension.'),
+			'ceil' => [$this->filters, 'ceil'],
+			'checkUrl' => [Latte\Runtime\Filters::class, 'safeUrl'],
+			'clamp' => [$this->filters, 'clamp'],
+			'dataStream' => [$this->filters, 'dataStream'],
+			'datastream' => [$this->filters, 'dataStream'],
+			'date' => [$this->filters, 'date'],
 			'escape' => [Latte\Runtime\Filters::class, 'nop'],
 			'escapeCss' => [Latte\Runtime\Filters::class, 'escapeCss'],
 			'escapeHtml' => [Latte\Runtime\Filters::class, 'escapeHtml'],
@@ -129,50 +127,50 @@ final class CoreExtension extends Latte\Extension
 			'escapeJs' => [Latte\Runtime\Filters::class, 'escapeJs'],
 			'escapeUrl' => 'rawurlencode',
 			'escapeXml' => [Latte\Runtime\Filters::class, 'escapeXml'],
-			'explode' => [Filters::class, 'explode'],
-			'first' => [Filters::class, 'first'],
+			'explode' => [$this->filters, 'explode'],
+			'first' => [$this->filters, 'first'],
 			'firstUpper' => extension_loaded('mbstring')
-				? [Filters::class, 'firstUpper']
-				: function () { throw new RuntimeException('Filter |firstUpper requires mbstring extension.'); },
-			'floor' => [Filters::class, 'floor'],
-			'checkUrl' => [Latte\Runtime\Filters::class, 'safeUrl'],
-			'implode' => [Filters::class, 'implode'],
-			'indent' => [Filters::class, 'indent'],
-			'join' => [Filters::class, 'implode'],
-			'last' => [Filters::class, 'last'],
-			'length' => [Filters::class, 'length'],
+				? [$this->filters, 'firstUpper']
+				: fn() => throw new RuntimeException('Filter |firstUpper requires mbstring extension.'),
+			'floor' => [$this->filters, 'floor'],
+			'group' => [$this->filters, 'group'],
+			'implode' => [$this->filters, 'implode'],
+			'indent' => [$this->filters, 'indent'],
+			'join' => [$this->filters, 'implode'],
+			'last' => [$this->filters, 'last'],
+			'length' => [$this->filters, 'length'],
 			'lower' => extension_loaded('mbstring')
-				? [Filters::class, 'lower']
-				: function () { throw new RuntimeException('Filter |lower requires mbstring extension.'); },
+				? [$this->filters, 'lower']
+				: fn() => throw new RuntimeException('Filter |lower requires mbstring extension.'),
 			'number' => 'number_format',
-			'padLeft' => [Filters::class, 'padLeft'],
-			'padRight' => [Filters::class, 'padRight'],
-			'query' => [Filters::class, 'query'],
-			'random' => [Filters::class, 'random'],
-			'repeat' => [Filters::class, 'repeat'],
-			'replace' => [Filters::class, 'replace'],
-			'replaceRe' => [Filters::class, 'replaceRe'],
-			'replaceRE' => [Filters::class, 'replaceRe'],
-			'reverse' => [Filters::class, 'reverse'],
-			'round' => [Filters::class, 'round'],
-			'slice' => [Filters::class, 'slice'],
-			'sort' => [Filters::class, 'sort'],
-			'spaceless' => [Filters::class, 'strip'],
-			'split' => [Filters::class, 'explode'],
-			'strip' => [Filters::class, 'strip'], // obsolete
-			'stripHtml' => [Filters::class, 'stripHtml'],
-			'striphtml' => [Filters::class, 'stripHtml'],
-			'stripTags' => [Filters::class, 'stripTags'],
-			'striptags' => [Filters::class, 'stripTags'],
-			'substr' => [Filters::class, 'substring'],
-			'trim' => [Filters::class, 'trim'],
-			'truncate' => [Filters::class, 'truncate'],
+			'padLeft' => [$this->filters, 'padLeft'],
+			'padRight' => [$this->filters, 'padRight'],
+			'query' => [$this->filters, 'query'],
+			'random' => [$this->filters, 'random'],
+			'repeat' => [$this->filters, 'repeat'],
+			'replace' => [$this->filters, 'replace'],
+			'replaceRe' => [$this->filters, 'replaceRe'],
+			'replaceRE' => [$this->filters, 'replaceRe'],
+			'reverse' => [$this->filters, 'reverse'],
+			'round' => [$this->filters, 'round'],
+			'slice' => [$this->filters, 'slice'],
+			'sort' => [$this->filters, 'sort'],
+			'spaceless' => [$this->filters, 'strip'],
+			'split' => [$this->filters, 'explode'],
+			'strip' => [$this->filters, 'strip'], // obsolete
+			'stripHtml' => [$this->filters, 'stripHtml'],
+			'striphtml' => [$this->filters, 'stripHtml'],
+			'stripTags' => [$this->filters, 'stripTags'],
+			'striptags' => [$this->filters, 'stripTags'],
+			'substr' => [$this->filters, 'substring'],
+			'trim' => [$this->filters, 'trim'],
+			'truncate' => [$this->filters, 'truncate'],
 			'upper' => extension_loaded('mbstring')
-				? [Filters::class, 'upper']
-				: function () { throw new RuntimeException('Filter |upper requires mbstring extension.'); },
+				? [$this->filters, 'upper']
+				: fn() => throw new RuntimeException('Filter |upper requires mbstring extension.'),
 			'webalize' => class_exists(Nette\Utils\Strings::class)
 				? [Nette\Utils\Strings::class, 'webalize']
-				: function () { throw new RuntimeException('Filter |webalize requires nette/utils package.'); },
+				: fn() => throw new RuntimeException('Filter |webalize requires nette/utils package.'),
 		];
 	}
 
@@ -180,25 +178,27 @@ final class CoreExtension extends Latte\Extension
 	public function getFunctions(): array
 	{
 		return [
-			'clamp' => [Filters::class, 'clamp'],
-			'divisibleBy' => [Filters::class, 'divisibleBy'],
-			'even' => [Filters::class, 'even'],
-			'first' => [Filters::class, 'first'],
-			'last' => [Filters::class, 'last'],
-			'odd' => [Filters::class, 'odd'],
-			'slice' => [Filters::class, 'slice'],
-			'hasBlock' => fn(string $name): bool => $this->template->hasBlock($name),
+			'clamp' => [$this->filters, 'clamp'],
+			'divisibleBy' => [$this->filters, 'divisibleBy'],
+			'even' => [$this->filters, 'even'],
+			'first' => [$this->filters, 'first'],
+			'group' => [$this->filters, 'group'],
+			'last' => [$this->filters, 'last'],
+			'odd' => [$this->filters, 'odd'],
+			'slice' => [$this->filters, 'slice'],
+			'hasBlock' => fn(Runtime\Template $template, string $name): bool => $template->hasBlock($name),
 		];
 	}
 
 
 	public function getPasses(): array
 	{
+		$passes = new Passes($this->engine);
 		return [
-			'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'],
+			'internalVariables' => [$passes, 'forbiddenVariablesPass'],
+			'overwrittenVariables' => [Nodes\ForeachNode::class, 'overwrittenVariablesPass'],
+			'customFunctions' => [$passes, 'customFunctionsPass'],
+			'moveTemplatePrintToHead' => [Nodes\TemplatePrintNode::class, 'moveToHeadPass'],
 			'nElse' => [Nodes\NElseNode::class, 'processPass'],
 		];
 	}
@@ -233,13 +233,17 @@ final class CoreExtension extends Latte\Extension
 	 */
 	private function parseSyntax(Tag $tag, TemplateParser $parser): \Generator
 	{
+		if ($tag->isNAttribute() && $tag->prefix !== $tag::PrefixNone) {
+			throw new Latte\CompileException("Use n:syntax instead of {$tag->getNotation()}", $tag->position);
+		}
 		$tag->expectArguments();
 		$token = $tag->parser->stream->consume();
 		$lexer = $parser->getLexer();
-		$saved = [$lexer->openDelimiter, $lexer->closeDelimiter];
 		$lexer->setSyntax($token->text, $tag->isNAttribute() ? null : $tag->name);
 		[$inner] = yield;
-		[$lexer->openDelimiter, $lexer->closeDelimiter] = $saved;
+		if (!$tag->isNAttribute()) {
+			$lexer->popSyntax();
+		}
 		return $inner;
 	}
 }

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

@@ -172,17 +172,12 @@ final class Filters
 			return null;
 		}
 
-		if (!isset($format)) {
-			$format = Latte\Runtime\Filters::$dateFormat;
-		}
-
+		$format ??= Latte\Runtime\Filters::$dateFormat;
 		if ($time instanceof \DateInterval) {
 			return $time->format($format);
 
 		} elseif (is_numeric($time)) {
-			$time = new \DateTime('@' . $time);
-			$time->setTimeZone(new \DateTimeZone(date_default_timezone_get()));
-
+			$time = (new \DateTime)->setTimestamp((int) $time);
 		} elseif (!$time instanceof \DateTimeInterface) {
 			$time = new \DateTime($time);
 		}
@@ -200,7 +195,7 @@ final class Filters
 
 
 	/**
-	 * Converts to human readable file size.
+	 * Converts to human-readable file size.
 	 */
 	public static function bytes(float $bytes, int $precision = 2): string
 	{
@@ -262,10 +257,7 @@ final class Filters
 	 */
 	public static function dataStream(string $data, ?string $type = null): string
 	{
-		if ($type === null) {
-			$type = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $data);
-		}
-
+		$type ??= finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $data);
 		return 'data:' . ($type ? "$type;" : '') . 'base64,' . base64_encode($data);
 	}
 
@@ -273,7 +265,7 @@ final class Filters
 	public static function breaklines(string|Stringable|null $s): Html
 	{
 		$s = htmlspecialchars((string) $s, ENT_NOQUOTES | ENT_SUBSTITUTE, 'UTF-8');
-		return new Html(nl2br($s, Latte\Runtime\Filters::$xml));
+		return new Html(nl2br($s, false));
 	}
 
 
@@ -283,15 +275,11 @@ final class Filters
 	public static function substring(string|Stringable|null $s, int $start, ?int $length = null): string
 	{
 		$s = (string) $s;
-		if ($length === null) {
-			$length = self::strLength($s);
-		}
-
-		if (function_exists('mb_substr')) {
-			return mb_substr($s, $start, $length, 'UTF-8'); // MB is much faster
-		}
-
-		return iconv_substr($s, $start, $length, 'UTF-8');
+		return match (true) {
+			extension_loaded('mbstring') => mb_substr($s, $start, $length, 'UTF-8'),
+			extension_loaded('iconv') => iconv_substr($s, $start, $length, 'UTF-8'),
+			default => throw new Latte\RuntimeException("Filter |substr requires 'mbstring' or 'iconv' extension."),
+		};
 	}
 
 
@@ -422,7 +410,7 @@ final class Filters
 	/**
 	 * Reverses string or array.
 	 */
-	public static function reverse(string|array|\Traversable $val, bool $preserveKeys = false): string|array
+	public static function reverse(string|iterable $val, bool $preserveKeys = false): string|array
 	{
 		if (is_array($val)) {
 			return array_reverse($val, $preserveKeys);
@@ -437,7 +425,7 @@ final class Filters
 	/**
 	 * Chunks items by returning an array of arrays with the given number of items.
 	 */
-	public static function batch(array|\Traversable $list, int $length, $rest = null): \Generator
+	public static function batch(iterable $list, int $length, $rest = null): \Generator
 	{
 		$batch = [];
 		foreach ($list as $key => $value) {
@@ -461,14 +449,78 @@ final class Filters
 
 
 	/**
-	 * Sorts an array.
-	 * @param  mixed[]  $array
-	 * @return mixed[]
+	 * Sorts elements using the comparison function and preserves the key association.
+	 * @template K
+	 * @template V
+	 * @param  iterable<K, V>  $data
+	 * @return iterable<K, V>
+	 */
+	public static function sort(
+		iterable $data,
+		?\Closure $comparison = null,
+		string|int|\Closure|null $by = null,
+		string|int|\Closure|bool $byKey = false,
+	): iterable
+	{
+		if ($byKey !== false) {
+			if ($by !== null) {
+				throw new \InvalidArgumentException('Filter |sort cannot use both $by and $byKey.');
+			}
+			$by = $byKey === true ? null : $byKey;
+		}
+
+		$comparison ??= fn($a, $b) => $a <=> $b;
+		$comparison = match (true) {
+			$by === null => $comparison,
+			$by instanceof \Closure => fn($a, $b) => $comparison($by($a), $by($b)),
+			default => fn($a, $b) => $comparison(is_array($a) ? $a[$by] : $a->$by, is_array($b) ? $b[$by] : $b->$by),
+		};
+
+		if (is_array($data)) {
+			$byKey ? uksort($data, $comparison) : uasort($data, $comparison);
+			return $data;
+		}
+
+		$pairs = [];
+		foreach ($data as $key => $value) {
+			$pairs[] = [$key, $value];
+		}
+		uasort($pairs, fn($a, $b) => $byKey ? $comparison($a[0], $b[0]) : $comparison($a[1], $b[1]));
+
+		return new AuxiliaryIterator($pairs);
+	}
+
+
+	/**
+	 * Groups elements by the element indices and preserves the key association and order.
+	 * @template K
+	 * @template V
+	 * @param  iterable<K, V>  $data
+	 * @return iterable<iterable<K, V>>
 	 */
-	public static function sort(array $array, ?\Closure $callback = null): array
+	public static function group(iterable $data, string|int|\Closure $by): iterable
 	{
-		$callback ? uasort($array, $callback) : asort($array);
-		return $array;
+		$fn = $by instanceof \Closure ? $by : fn($a) => is_array($a) ? $a[$by] : $a->$by;
+		$keys = $groups = [];
+
+		foreach ($data as $k => $v) {
+			$groupKey = $fn($v, $k);
+			if (!$groups || $prevKey !== $groupKey) {
+				$index = array_search($groupKey, $keys, true);
+				if ($index === false) {
+					$index = count($keys);
+					$keys[$index] = $groupKey;
+				}
+				$prevKey = $groupKey;
+			}
+			$groups[$index][] = [$k, $v];
+		}
+
+		return new AuxiliaryIterator(array_map(
+			fn($key, $group) => [$key, new AuxiliaryIterator($group)],
+			$keys,
+			$groups,
+		));
 	}
 
 
@@ -524,23 +576,29 @@ final class Filters
 
 
 	/**
-	 * Returns the first item from the array or null if array is empty.
+	 * Returns the first element in an array or character in a string, or null if none.
 	 */
-	public static function first(string|array $value): mixed
+	public static function first(string|iterable $value): mixed
 	{
-		return is_array($value)
-			? (count($value) ? reset($value) : null)
-			: self::substring($value, 0, 1);
+		if (is_string($value)) {
+			return self::substring($value, 0, 1);
+		}
+
+		foreach ($value as $item) {
+			return $item;
+		}
+
+		return null;
 	}
 
 
 	/**
-	 * Returns the last item from the array or null if array is empty.
+	 * Returns the last element in an array or character in a string, or null if none.
 	 */
 	public static function last(string|array $value): mixed
 	{
 		return is_array($value)
-			? (count($value) ? end($value) : null)
+			? ($value[array_key_last($value)] ?? null)
 			: self::substring($value, -1);
 	}
 

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

@@ -24,6 +24,7 @@ class ContentTypeNode extends StatementNode
 {
 	public string $contentType;
 	public ?string $mimeType = null;
+	public bool $inScript;
 
 
 	public static function create(Tag $tag, TemplateParser $parser): static
@@ -37,6 +38,7 @@ class ContentTypeNode extends StatementNode
 		}
 
 		$node = new static;
+		$node->inScript = (bool) $tag->htmlElement;
 		$node->contentType = match (true) {
 			str_contains($type, 'html') => ContentType::Html,
 			str_contains($type, 'xml') => ContentType::Xml,
@@ -56,6 +58,11 @@ class ContentTypeNode extends StatementNode
 
 	public function print(PrintContext $context): string
 	{
+		if ($this->inScript) {
+			$context->getEscaper()->enterHtmlRaw($this->contentType);
+			return '';
+		}
+
 		$context->beginEscape()->enterContentType($this->contentType);
 
 		return $this->mimeType

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

@@ -10,11 +10,16 @@ declare(strict_types=1);
 namespace Latte\Essential\Nodes;
 
 use Latte\CompileException;
+use Latte\Compiler\Node;
 use Latte\Compiler\Nodes\AreaNode;
+use Latte\Compiler\Nodes\AuxiliaryNode;
 use Latte\Compiler\Nodes\NopNode;
+use Latte\Compiler\Nodes\Php\Expression\VariableNode;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\Php\ListNode;
 use Latte\Compiler\Nodes\StatementNode;
+use Latte\Compiler\Nodes\TemplateNode;
+use Latte\Compiler\NodeTraverser;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
@@ -143,4 +148,35 @@ class ForeachNode extends StatementNode
 			yield $this->else;
 		}
 	}
+
+
+	/**
+	 * Pass: checks if foreach overrides template variables.
+	 */
+	public static function overwrittenVariablesPass(TemplateNode $node): void
+	{
+		$vars = [];
+		(new NodeTraverser)->traverse($node, function (Node $node) use (&$vars) {
+			if ($node instanceof self && $node->checkArgs) {
+				foreach ([$node->key, $node->value] as $var) {
+					if ($var instanceof VariableNode) {
+						$vars[$var->name][] = $node->position->line;
+					}
+				}
+			}
+		});
+		if ($vars) {
+			array_unshift($node->head->children, new AuxiliaryNode(fn(PrintContext $context) => $context->format(
+				<<<'XX'
+					if (!$this->getReferringTemplate() || $this->getReferenceType() === 'extends') {
+						foreach (array_intersect_key(%dump, $this->params) as $ʟ_v => $ʟ_l) {
+							trigger_error("Variable \$$ʟ_v overwritten in foreach on line $ʟ_l");
+						}
+					}
+
+					XX,
+				array_map(fn($l) => implode(', ', $l), $vars),
+			)));
+		}
+	}
 }

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

@@ -9,15 +9,17 @@ declare(strict_types=1);
 
 namespace Latte\Essential\Nodes;
 
+use Latte\Compiler\Node;
+use Latte\Compiler\Nodes;
 use Latte\Compiler\Nodes\StatementNode;
-use Latte\Compiler\PhpHelpers;
+use Latte\Compiler\NodeTraverser;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
 use Latte\Compiler\Token;
 
 
 /**
- * {templatePrint [ClassName]}
+ * {templatePrint [ParentClass]}
  */
 class TemplatePrintNode extends StatementNode
 {
@@ -34,7 +36,13 @@ class TemplatePrintNode extends StatementNode
 
 	public function print(PrintContext $context): string
 	{
-		return '(new Latte\Essential\Blueprint)->printClass($this, ' . PhpHelpers::dump($this->template) . '); exit;';
+		return $context->format(<<<'XX'
+			$ʟ_bp = new Latte\Essential\Blueprint;
+			$ʟ_bp->printBegin();
+			$ʟ_bp->printClass($ʟ_bp->generateTemplateClass($this->getParameters(), extends: %dump));
+			$ʟ_bp->printEnd();
+			exit;
+			XX, $this->template);
 	}
 
 
@@ -42,4 +50,18 @@ class TemplatePrintNode extends StatementNode
 	{
 		false && yield;
 	}
+
+
+	/**
+	 * Pass: moves this node to head.
+	 */
+	public static function moveToHeadPass(Nodes\TemplateNode $templateNode): void
+	{
+		(new NodeTraverser)->traverse($templateNode->main, function (Node $node) use ($templateNode) {
+			if ($node instanceof self) {
+				array_unshift($templateNode->head->children, $node);
+				return new Nodes\NopNode;
+			}
+		});
+	}
 }

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

@@ -33,9 +33,16 @@ class VarPrintNode extends StatementNode
 
 	public function print(PrintContext $context): string
 	{
-		$vars = $this->all ? 'get_defined_vars()'
+		$vars = $this->all
+			? 'get_defined_vars()'
 			: 'array_diff_key(get_defined_vars(), $this->getParameters())';
-		return "(new Latte\\Essential\\Blueprint)->printVars($vars); exit;";
+		return <<<XX
+			\$ʟ_bp = new Latte\\Essential\\Blueprint;
+			\$ʟ_bp->printBegin();
+			\$ʟ_bp->printVars($vars);
+			\$ʟ_bp->printEnd();
+			exit;
+			XX;
 	}