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

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

@@ -11,10 +11,12 @@ namespace Latte\Essential\Nodes;
 
 use Latte;
 use Latte\CompileException;
-use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\Expression\AuxiliaryNode;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
+use Latte\Compiler\TemplateParser;
+use Latte\ContentType;
 
 
 /**
@@ -22,50 +24,40 @@ use Latte\Compiler\Tag;
  */
 final class NTagNode extends StatementNode
 {
-	public ExpressionNode $name;
-	public string $origName;
-
-
-	public static function create(Tag $tag): void
+	public static function create(Tag $tag, TemplateParser $parser): void
 	{
 		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();
-		$node = new static;
-		$node->name = $tag->parser->parseExpression();
-		$node->origName = $tag->htmlElement->name;
-		$tag->htmlElement->customName = $node;
+		$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()],
+		);
 	}
 
 
 	public function print(PrintContext $context): string
 	{
-		return self::class . '::check('
-			. var_export($this->origName, true)
-			. ', '
-			. $this->name->print($context)
-			. ')';
+		throw new \LogicException('Cannot directly print');
 	}
 
 
-	public static function check(string $orig, $new): string
+	public static function check(string $orig, mixed $new, bool $xml): mixed
 	{
 		if ($new === null) {
 			return $orig;
-
-		} elseif (
-			!is_string($new)
-			|| !preg_match('~' . Latte\Compiler\TemplateLexer::ReTagName . '$~DA', $new)
-		) {
-			throw new Latte\RuntimeException('Invalid tag name ' . var_export($new, true));
-
-		} elseif (
-			in_array($lower = strtolower($new), ['style', 'script'], true)
-			|| isset(Latte\Helpers::$emptyElements[strtolower($orig)]) !== isset(Latte\Helpers::$emptyElements[$lower])
+		} 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>.");
+			throw new Latte\RuntimeException("Forbidden tag <$orig> change to <$new>");
 		}
 
 		return $new;
@@ -74,6 +66,6 @@ final class NTagNode extends StatementNode
 
 	public function &getIterator(): \Generator
 	{
-		yield $this->name;
+		false && yield;
 	}
 }

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

@@ -16,7 +16,6 @@ use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
 use Latte\Compiler\TemplateParser;
-use Latte\ContentType;
 
 
 /**
@@ -26,24 +25,17 @@ class PrintNode extends StatementNode
 {
 	public ExpressionNode $expression;
 	public ModifierNode $modifier;
+	private ?string $followsQuote = null;
 
 
 	public static function create(Tag $tag, TemplateParser $parser): static
 	{
 		$tag->outputMode = $tag::OutputKeepIndentation;
-
-		$stream = $parser->getStream();
-		if (
-			$tag->isInText()
-			&& $parser->getContentType() === ContentType::Html
-			&& $tag->htmlElement?->name === 'script'
-			&& preg_match('#["\']#A', $stream->peek()->text)
-		) {
-			throw new CompileException("Do not place {$tag->getNotation(true)} inside quotes in JavaScript.", $tag->position);
-		}
-
 		$tag->expectArguments();
 		$node = new static;
+		$node->followsQuote = preg_match('#["\']#A', $parser->getStream()->peek()->text)
+			? $tag->getNotation(true)
+			: null;
 		$node->expression = $tag->parser->parseExpression();
 		$node->modifier = $tag->parser->parseModifier();
 		$node->modifier->escape = true;
@@ -53,6 +45,9 @@ class PrintNode extends StatementNode
 
 	public function print(PrintContext $context): string
 	{
+		if ($this->followsQuote && $context->getEscaper()->export() === 'html/raw/js') {
+			throw new CompileException("Do not place {$this->followsQuote} inside quotes in JavaScript.", $this->position);
+		}
 		return $context->format(
 			"echo %modify(%node) %line;\n",
 			$this->modifier,

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

@@ -22,7 +22,7 @@ class RollbackNode extends StatementNode
 {
 	public static function create(Tag $tag): static
 	{
-		if (!$tag->closestTag(['try'])) {
+		if (!$tag->closestTag([TryNode::class])) {
 			throw new CompileException('Tag {rollback} must be inside {try} ... {/try}.', $tag->position);
 		}
 

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

@@ -27,7 +27,7 @@ class SpacelessNode 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->content] = yield;
 		return $node;
 	}

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

@@ -37,7 +37,7 @@ class SwitchNode extends StatementNode
 			throw new CompileException('Attribute n:switch is not supported.', $tag->position);
 		}
 
-		$node = new static;
+		$node = $tag->node = new static;
 		$node->expression = $tag->parser->isEnd()
 			? null
 			: $tag->parser->parseExpression();

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

@@ -35,7 +35,7 @@ class TranslateNode extends StatementNode
 	{
 		$tag->outputMode = $tag::OutputKeepIndentation;
 
-		$node = new static;
+		$node = $tag->node = new static;
 		$args = $tag->parser->parseArguments();
 		$node->modifier = $tag->parser->parseModifier();
 		$node->modifier->escape = true;

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

@@ -25,9 +25,9 @@ class TryNode extends StatementNode
 
 
 	/** @return \Generator<int, ?array, array{AreaNode, ?Tag}, static> */
-	public static function create(): \Generator
+	public static function create(Tag $tag): \Generator
 	{
-		$node = new static;
+		$node = $tag->node = new static;
 		[$node->try, $nextTag] = yield ['else'];
 		if ($nextTag?->name === 'else') {
 			[$node->else] = yield;
@@ -46,12 +46,11 @@ class TryNode extends StatementNode
 				try %line {
 					%node
 				} catch (Throwable $ʟ_e) {
-					ob_end_clean();
+					ob_clean();
 					if (!($ʟ_e instanceof Latte\Essential\RollbackException) && isset($this->global->coreExceptionHandler)) {
 						($this->global->coreExceptionHandler)($ʟ_e, $this);
 					}
 					%node
-					ob_start();
 				} finally {
 					echo ob_get_clean();
 					$iterator = $ʟ_it = $ʟ_try[%0.dump][0];

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

@@ -29,7 +29,7 @@ class WhileNode 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->postTest = $tag->parser->isEnd();
 		if (!$node->postTest) {
 			$node->condition = $tag->parser->parseExpression();

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

@@ -11,10 +11,9 @@ 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;
@@ -25,8 +24,6 @@ use Latte\Essential\Nodes\ForeachNode;
 
 final class Passes
 {
-	use Latte\Strict;
-
 	/**
 	 * Checks if foreach overrides template variables.
 	 */
@@ -81,7 +78,7 @@ final class Passes
 		$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,10 +86,10 @@ 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 . ')(' . $context->implode($args) . ')',
 					$node->args,
-				)->build();
+				);
 			}
 		});
 	}
@@ -101,12 +98,13 @@ final class Passes
 	/**
 	 * $ʟ_xxx variables are forbidden
 	 */
-	public static function internalVariablesPass(TemplateNode $node): void
+	public static function internalVariablesPass(TemplateNode $node, bool $forbidThis = false): void
 	{
-		(new NodeTraverser)->traverse($node, function (Node $node) {
+		$forbidden = $forbidThis ? ['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/Loaders/FileLoader.php

@@ -17,8 +17,6 @@ use Latte;
  */
 class FileLoader implements Latte\Loader
 {
-	use Latte\Strict;
-
 	protected ?string $baseDir = null;
 
 

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

@@ -75,9 +75,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 +103,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 +147,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 +177,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 +196,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 +220,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 +259,28 @@ class Filters
 	/**
 	 * Sanitizes string for use inside href attribute.
 	 */
-	public static function safeUrl(string|HtmlStringable $s): string
+	public static function safeUrl(string|\Stringable $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/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;