@vituum/vite-plugin-latte 1.0.0 → 1.2.0

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

@@ -9,79 +9,36 @@ declare(strict_types=1);
 
 namespace Latte\Essential;
 
-use Latte;
 use Latte\CompileException;
-use Latte\Compiler\ExpressionBuilder;
 use Latte\Compiler\Node;
-use Latte\Compiler\Nodes\AuxiliaryNode;
-use Latte\Compiler\Nodes\Php\Expression\FunctionCallNode;
+use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\Nodes\Php\Expression\VariableNode;
 use Latte\Compiler\Nodes\Php\NameNode;
 use Latte\Compiler\Nodes\TemplateNode;
 use Latte\Compiler\NodeTraverser;
 use Latte\Compiler\PrintContext;
-use Latte\Essential\Nodes\ForeachNode;
+use Latte\Engine;
 
 
 final class Passes
 {
-	use Latte\Strict;
-
-	/**
-	 * 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 ForeachNode && $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),
-			)));
-		}
-	}
-
-
-	/**
-	 * Move TemplatePrintNode to head.
-	 */
-	public static function moveTemplatePrintToHeadPass(TemplateNode $templateNode): void
-	{
-		(new NodeTraverser)->traverse($templateNode->main, function (Node $node) use ($templateNode) {
-			if ($node instanceof Latte\Essential\Nodes\TemplatePrintNode) {
-				array_unshift($templateNode->head->children, $node);
-				return new Latte\Compiler\Nodes\NopNode;
-			}
-		});
+	public function __construct(
+		private Engine $engine,
+	) {
 	}
 
 
 	/**
 	 * Enable custom functions.
 	 */
-	public static function customFunctionsPass(TemplateNode $node, array $functions): void
+	public function customFunctionsPass(TemplateNode $node): void
 	{
+		$functions = $this->engine->getFunctions();
 		$names = array_keys($functions);
 		$names = array_combine(array_map('strtolower', $names), $names);
 
 		(new NodeTraverser)->traverse($node, function (Node $node) use ($names) {
-			if (($node instanceof FunctionCallNode || $node instanceof FunctionCallableNode)
+			if (($node instanceof Expression\FunctionCallNode || $node instanceof Expression\FunctionCallableNode)
 				&& $node->name instanceof NameNode
 				&& ($orig = $names[strtolower((string) $node->name)] ?? null)
 			) {
@@ -89,24 +46,25 @@ final class Passes
 					trigger_error("Case mismatch on function name '{$node->name}', correct name is '$orig'.", E_USER_WARNING);
 				}
 
-				return ExpressionBuilder::function(
-					ExpressionBuilder::variable('$this')->property('global')->property('fn')->property($orig),
+				return new Expression\AuxiliaryNode(
+					fn(PrintContext $context, ...$args) => '($this->global->fn->' . $orig . ')($this, ' . $context->implode($args) . ')',
 					$node->args,
-				)->build();
+				);
 			}
 		});
 	}
 
 
 	/**
-	 * $ʟ_xxx variables are forbidden
+	 * $ʟ_xxx, $GLOBALS and $this are forbidden
 	 */
-	public static function internalVariablesPass(TemplateNode $node): void
+	public function forbiddenVariablesPass(TemplateNode $node): void
 	{
-		(new NodeTraverser)->traverse($node, function (Node $node) {
+		$forbidden = $this->engine->isStrictParsing() ? ['GLOBALS', 'this'] : ['GLOBALS'];
+		(new NodeTraverser)->traverse($node, function (Node $node) use ($forbidden) {
 			if ($node instanceof VariableNode
 				&& is_string($node->name)
-				&& (str_starts_with($node->name, 'ʟ_'))
+				&& (str_starts_with($node->name, 'ʟ_') || in_array($node->name, $forbidden, true))
 			) {
 				throw new CompileException("Forbidden variable \$$node->name.", $node->position);
 			}

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

@@ -17,8 +17,6 @@ use Latte;
  */
 final class RawPhpExtension extends Latte\Extension
 {
-	use Latte\Strict;
-
 	public function getTags(): array
 	{
 		return [

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

@@ -23,10 +23,15 @@ use Nette\Localization\Translator;
  */
 final class TranslatorExtension extends Latte\Extension
 {
+	/** @var callable|Translator|null */
+	private $translator;
+
+
 	public function __construct(
-		private /*?callable|Translator*/ $translator,
+		callable|Translator|null $translator,
 		private ?string $key = null,
 	) {
+		$this->translator = $translator;
 		if ($translator instanceof Translator) {
 			$this->translator = [$translator, 'translate'];
 		}

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

@@ -46,7 +46,9 @@ class Helpers
 	public static function toReflection($callable): \ReflectionFunctionAbstract
 	{
 		if (is_string($callable) && strpos($callable, '::')) {
-			return new \ReflectionMethod($callable);
+			return PHP_VERSION_ID < 80300
+				? new \ReflectionMethod($callable)
+				: \ReflectionMethod::createFromMethodName($callable);
 		} elseif (is_array($callable)) {
 			return new \ReflectionMethod($callable[0], $callable[1]);
 		} elseif (is_object($callable) && !$callable instanceof \Closure) {

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

@@ -22,6 +22,7 @@ interface Loader
 
 	/**
 	 * Checks whether template is expired.
+	 * @deprecated
 	 */
 	function isExpired(string $name, int $time): bool;
 

package/vendor/latte/latte/src/Latte/Loaders/FileLoader.php

@@ -17,8 +17,6 @@ use Latte;
  */
 class FileLoader implements Latte\Loader
 {
-	use Latte\Strict;
-
 	protected ?string $baseDir = null;
 
 
@@ -52,8 +50,7 @@ class FileLoader implements Latte\Loader
 
 	public function isExpired(string $file, int $time): bool
 	{
-		$mtime = @filemtime($this->baseDir . $file); // @ - stat may fail
-		return !$mtime || $mtime > $time;
+		return false;
 	}
 
 

package/vendor/latte/latte/src/Latte/Loaders/StringLoader.php

@@ -17,8 +17,6 @@ use Latte;
  */
 class StringLoader implements Latte\Loader
 {
-	use Latte\Strict;
-
 	/** @var string[]|null  [name => content] */
 	private ?array $templates = null;
 

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

@@ -38,7 +38,7 @@ trait PositionAwareException
 			$info[] = "in '" . str_replace(dirname($this->sourceName, 2), '...', $this->sourceName) . "'";
 		}
 		if ($this->position) {
-			$info[] = $this->position->toWords();
+			$info[] = $this->position;
 		}
 		$this->message = $info
 			? rtrim($this->origMessage, '.') . ' (' . implode(' ', $info) . ')'

package/vendor/latte/latte/src/Latte/Runtime/Block.php

@@ -9,14 +9,10 @@ declare(strict_types=1);
 
 namespace Latte\Runtime;
 
-use Latte;
-
 
 /** @internal */
 final class Block
 {
-	use Latte\Strict;
-
 	public ?string $contentType = null;
 
 	/** @var callable[] */

package/vendor/latte/latte/src/Latte/Runtime/FilterExecutor.php

@@ -59,39 +59,10 @@ class FilterExecutor
 	 */
 	public function __get(string $name): callable
 	{
-		if (isset($this->_static[$name])) {
-			[$callback, $aware] = $this->prepareFilter($name);
-			if ($aware) { // FilterInfo aware filter
-				return $this->$name = function (...$args) use ($callback) {
-					array_unshift($args, $info = new FilterInfo);
-					if ($args[1] instanceof HtmlStringable) {
-						$args[1] = $args[1]->__toString();
-						$info->contentType = ContentType::Html;
-					}
-
-					$res = $callback(...$args);
-					return $info->contentType === ContentType::Html
-						? new Html($res)
-						: $res;
-				};
-			} else { // classic filter
-				return $this->$name = $callback;
-			}
-		}
-
-		// dynamic filter
-		foreach ($this->_dynamic as $loader) {
-			$callback = $loader($name);
-			if ($callback !== null) {
-				$this->_static[$name] = [$callback, null];
-				return $this->__get($name);
-			}
-		}
-
-		$hint = ($t = Helpers::getSuggestion(array_keys($this->_static), $name))
-			? ", did you mean '$t'?"
-			: '.';
-		throw new \LogicException("Filter '$name' is not defined$hint");
+		[$callback, $infoAware] = $this->prepareFilter($name);
+		return $this->$name = $infoAware
+			? fn(...$args) => $this->callInfoAwareAsClassic($callback, ...$args)
+			: $callback;
 	}
 
 
@@ -100,31 +71,23 @@ class FilterExecutor
 	 */
 	public function filterContent(string $name, FilterInfo $info, mixed ...$args): mixed
 	{
-		if (!isset($this->_static[$name])) {
-			$hint = ($t = Helpers::getSuggestion(array_keys($this->_static), $name))
-				? ", did you mean '$t'?"
-				: '.';
-			throw new \LogicException("Filter |$name is not defined$hint");
-		}
-
-		[$callback, $aware] = $this->prepareFilter($name);
-
 		if ($info->contentType === ContentType::Html && $args[0] instanceof HtmlStringable) {
 			$args[0] = $args[0]->__toString();
 		}
 
-		if ($aware) { // FilterInfo aware filter
+		[$callback, $infoAware] = $this->prepareFilter($name);
+		if ($infoAware) {
 			array_unshift($args, $info);
 			return $callback(...$args);
 		}
 
 		// classic filter
 		if ($info->contentType !== ContentType::Text) {
-			throw new Latte\RuntimeException("Filter |$name is called with incompatible content type " . strtoupper($info->contentType)
+			throw new Latte\RuntimeException("Filter |$name is called with incompatible content type " . strtoupper($info->contentType ?? 'NULL')
 				. ($info->contentType === ContentType::Html ? ', try to prepend |stripHtml.' : '.'));
 		}
 
-		$res = ($this->$name)(...$args);
+		$res = $callback(...$args);
 		if ($res instanceof HtmlStringable) {
 			trigger_error("Filter |$name should be changed to content-aware filter.");
 			$info->contentType = ContentType::Html;
@@ -140,13 +103,42 @@ class FilterExecutor
 	 */
 	private function prepareFilter(string $name): array
 	{
-		if (!isset($this->_static[$name][1])) {
-			$params = Helpers::toReflection($this->_static[$name][0])->getParameters();
-			$this->_static[$name][1] = $params
-				&& $params[0]->getType() instanceof \ReflectionNamedType
-				&& $params[0]->getType()->getName() === FilterInfo::class;
+		if (isset($this->_static[$name])) {
+			$this->_static[$name][1] ??= $this->isInfoAware($this->_static[$name][0]);
+			return $this->_static[$name];
+		}
+
+		foreach ($this->_dynamic as $loader) {
+			if ($callback = $loader($name)) {
+				return $this->_static[$name] = [$callback, $this->isInfoAware($callback)];
+			}
+		}
+
+		$hint = ($t = Helpers::getSuggestion(array_keys($this->_static), $name))
+			? ", did you mean '$t'?"
+			: '.';
+		throw new \LogicException("Filter '$name' is not defined$hint");
+	}
+
+
+	private function isInfoAware(callable $filter): bool
+	{
+		$params = Helpers::toReflection($filter)->getParameters();
+		return $params && (string) $params[0]->getType() === FilterInfo::class;
+	}
+
+
+	private function callInfoAwareAsClassic(callable $filter, mixed ...$args): mixed
+	{
+		array_unshift($args, $info = new FilterInfo);
+		if ($args[1] instanceof HtmlStringable) {
+			$args[1] = $args[1]->__toString();
+			$info->contentType = ContentType::Html;
 		}
 
-		return $this->_static[$name];
+		$res = $filter(...$args);
+		return $info->contentType === ContentType::Html
+			? new Html($res)
+			: $res;
 	}
 }

package/vendor/latte/latte/src/Latte/Runtime/FilterInfo.php

@@ -17,8 +17,6 @@ use Latte;
  */
 class FilterInfo
 {
-	use Latte\Strict;
-
 	public ?string $contentType = null;
 
 

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

@@ -24,9 +24,6 @@ class Filters
 	/** @deprecated */
 	public static string $dateFormat = "j.\u{a0}n.\u{a0}Y";
 
-	/** @internal use XML syntax? */
-	public static bool $xml = false;
-
 
 	/**
 	 * Escapes string for use everywhere inside HTML (except for comments).
@@ -75,9 +72,12 @@ class Filters
 	public static function escapeHtmlTag($s): string
 	{
 		$s = (string) $s;
-		return preg_match('#^[a-z0-9:-]+$#i', $s)
-			? $s
-			: '"' . self::escapeHtmlAttr($s) . '"';
+		$s = htmlspecialchars($s, ENT_QUOTES | ENT_HTML5 | ENT_SUBSTITUTE, 'UTF-8');
+		return preg_replace_callback(
+			'#[=/\s]#',
+			fn($m) => '&#' . ord($m[0]) . ';',
+			$s,
+		);
 	}
 
 
@@ -100,6 +100,28 @@ class Filters
 	}
 
 
+	/**
+	 * Escapes HTML for usage in <script type=text/html>
+	 */
+	public static function escapeHtmlRawTextHtml($s): string
+	{
+		if ($s instanceof HtmlStringable || $s instanceof Nette\HtmlStringable) {
+			return self::convertHtmlToHtmlRawText($s->__toString());
+		}
+
+		return htmlspecialchars((string) $s, ENT_QUOTES | ENT_HTML5 | ENT_SUBSTITUTE, 'UTF-8');
+	}
+
+
+	/**
+	 * Escapes only quotes.
+	 */
+	public static function escapeHtmlQuotes($s): string
+	{
+		return strtr((string) $s, ['"' => '&quot;', "'" => '&apos;']);
+	}
+
+
 	/**
 	 * Escapes string for use everywhere inside XML (except for comments and tags).
 	 */
@@ -122,10 +144,12 @@ class Filters
 	 */
 	public static function escapeXmlTag($s): string
 	{
-		$s = (string) $s;
-		return preg_match('#^[a-z0-9:-]+$#i', $s)
-			? $s
-			: '"' . self::escapeXml($s) . '"';
+		$s = self::escapeXml((string) $s);
+		return preg_replace_callback(
+			'#[=/\s]#',
+			fn($m) => '&#' . ord($m[0]) . ';',
+			$s,
+		);
 	}
 
 
@@ -150,7 +174,7 @@ class Filters
 
 		$json = json_encode($s, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_INVALID_UTF8_SUBSTITUTE);
 		if ($error = json_last_error()) {
-			throw new Latte\RuntimeException(json_last_error_msg(), $error);
+			throw new Latte\RuntimeException(json_last_error_msg());
 		}
 
 		return str_replace([']]>', '<!', '</'], [']]\u003E', '\u003C!', '<\/'], $json);
@@ -169,15 +193,6 @@ class Filters
 	}
 
 
-	/**
-	 * Converts JS and CSS for usage in <script> or <style>
-	 */
-	public static function convertJSToHtmlRawText($s): string
-	{
-		return preg_replace('#</(script|style)#i', '<\/$1', (string) $s);
-	}
-
-
 	/**
 	 * Converts ... to ...
 	 */
@@ -202,29 +217,29 @@ class Filters
 
 
 	/**
-	 * Converts HTML text to quoted attribute. The quotation marks need to be escaped.
+	 * Converts JS and CSS for usage in <script> or <style>
 	 */
-	public static function convertHtmlToHtmlAttr(string $s): string
+	public static function convertJSToHtmlRawText($s): string
 	{
-		return self::escapeHtmlAttr($s, false);
+		return preg_replace('#</(script|style)#i', '<\/$1', (string) $s);
 	}
 
 
 	/**
-	 * Converts HTML text to unquoted attribute. The quotation marks need to be escaped.
+	 * Sanitizes <script> in <script type=text/html>
 	 */
-	public static function convertHtmlToUnquotedAttr(string $s): string
+	public static function convertHtmlToHtmlRawText(string $s): string
 	{
-		return '"' . self::escapeHtmlAttr($s, false) . '"';
+		return preg_replace('#(</?)(script)#i', '$1x-$2', $s);
 	}
 
 
 	/**
-	 * Converts HTML quoted attribute to unquoted.
+	 * Converts HTML text to quoted attribute. The quotation marks need to be escaped.
 	 */
-	public static function convertHtmlAttrToUnquotedAttr(string $s): string
+	public static function convertHtmlToHtmlAttr(string $s): string
 	{
-		return '"' . $s . '"';
+		return self::escapeHtmlAttr($s, false);
 	}
 
 
@@ -241,12 +256,28 @@ class Filters
 	/**
 	 * Sanitizes string for use inside href attribute.
 	 */
-	public static function safeUrl(string|HtmlStringable $s): string
+	public static function safeUrl($s): string
 	{
-		if ($s instanceof HtmlStringable) {
-			$s = self::convertHtmlToText((string) $s);
-		}
+		$s = $s instanceof HtmlStringable
+			? self::convertHtmlToText((string) $s)
+			: (string) $s;
 
 		return preg_match('~^(?:(?:https?|ftp)://[^@]+(?:/.*)?|(?:mailto|tel|sms):.+|[/?#].*|[^:]+)$~Di', $s) ? $s : '';
 	}
+
+
+	/**
+	 * Validates HTML tag name.
+	 */
+	public static function safeTag(mixed $name, bool $xml = false): string
+	{
+		if (!is_string($name)) {
+			throw new Latte\RuntimeException('Tag name must be string, ' . get_debug_type($name) . ' given');
+		} elseif (!preg_match('~' . Latte\Compiler\TemplateLexer::ReTagName . '$~DA', $name)) {
+			throw new Latte\RuntimeException("Invalid tag name '$name'");
+		} elseif (!$xml && in_array(strtolower($name), ['style', 'script'], true)) {
+			throw new Latte\RuntimeException("Forbidden variable tag name <$name>");
+		}
+		return $name;
+	}
 }

package/vendor/latte/latte/src/Latte/Runtime/FunctionExecutor.php

@@ -0,0 +1,68 @@
+<?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\Runtime;
+
+use Latte\Helpers;
+
+
+/**
+ * Functions executor.
+ * @internal
+ */
+#[\AllowDynamicProperties]
+class FunctionExecutor
+{
+	/** @var callable[] */
+	private array $_list = [];
+
+	/** @var bool[] */
+	private array $_aware = [];
+
+
+	/**
+	 * Registers run-time function.
+	 */
+	public function add(string $name, callable $callback): static
+	{
+		$this->_list[$name] = $callback;
+		unset($this->$name, $this->_aware[$name]);
+		return $this;
+	}
+
+
+	/**
+	 * Returns all run-time functions.
+	 * @return callable[]
+	 */
+	public function getAll(): array
+	{
+		return $this->_list;
+	}
+
+
+	public function __get(string $name): callable
+	{
+		$callback = $this->_list[$name] ?? null;
+		if (!$callback) {
+			$hint = ($t = Helpers::getSuggestion(array_keys($this->_list), $name))
+				? ", did you mean '$t'?"
+				: '.';
+			throw new \LogicException("Function '$name' is not defined$hint");
+
+		} elseif (!isset($this->_aware[$name])) {
+			$params = Helpers::toReflection($callback)->getParameters();
+			$this->_aware[$name] = $params && (string) $params[0]->getType() === Template::class;
+		}
+
+		return $this->$name = $this->_aware[$name]
+			? $callback
+			: fn($info, ...$args) => $callback(...$args);
+	}
+}

package/vendor/latte/latte/src/Latte/Runtime/Html.php

@@ -9,16 +9,12 @@ declare(strict_types=1);
 
 namespace Latte\Runtime;
 
-use Latte;
-
 
 /**
  * HTML literal.
  */
 class Html implements HtmlStringable
 {
-	use Latte\Strict;
-
 	private string $value;
 
 

package/vendor/latte/latte/src/Latte/Runtime/Template.php

@@ -19,8 +19,6 @@ use Latte\Engine;
  */
 class Template
 {
-	use Latte\Strict;
-
 	public const
 		LayerTop = 0,
 		LayerSnippet = 'snippet',
@@ -28,6 +26,8 @@ class Template
 
 	public const ContentType = Latte\ContentType::Html;
 
+	public const Source = null;
+
 	public const Blocks = [];
 
 	/** global accumulators for intermediate results */
@@ -142,8 +142,6 @@ class Template
 			$this->parentName = ($this->global->coreParentFinder)($this);
 		}
 
-		Filters::$xml = static::ContentType === Latte\ContentType::Xml;
-
 		if ($this->referenceType === 'import') {
 			if ($this->parentName) {
 				throw new Latte\RuntimeException('Imported template cannot use {extends} or {layout}, use {import}');
@@ -172,7 +170,7 @@ class Template
 		$name = $this->engine->getLoader()->getReferredName($name, $this->name);
 		$referred = $referenceType === 'sandbox'
 			? (clone $this->engine)->setSandboxMode()->createTemplate($name, $params)
-			: $this->engine->createTemplate($name, $params);
+			: $this->engine->createTemplate($name, $params, clearCache: false);
 
 		$referred->referringTemplate = $this;
 		$referred->referenceType = $referenceType;

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/FunctionCallNode.php

@@ -25,6 +25,7 @@ class FunctionCallNode extends Expression\FunctionCallNode
 	{
 		return '$this->global->sandbox->call('
 			. $context->memberAsString($this->name) . ', '
-			. Expression\ArrayNode::fromArguments($this->args)->print($context) . ')';
+			. $context->argumentsAsArray($this->args) . ')';
+
 	}
 }

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/MethodCallNode.php

@@ -26,7 +26,7 @@ class MethodCallNode extends Expression\MethodCallNode
 		return '$this->global->sandbox->callMethod('
 			. $this->object->print($context) . ', '
 			. $context->memberAsString($this->name) . ', '
-			. Expression\ArrayNode::fromArguments($this->args)->print($context)
+			. $context->argumentsAsArray($this->args)
 			. ', ' . var_export($this->nullsafe, true) . ')';
 	}
 }