@vituum/vite-plugin-latte 1.1.0 → 1.2.1

package/vendor/latte/latte/src/Latte/Compiler/TemplateGenerator.php

@@ -33,7 +33,7 @@ final class TemplateGenerator
 	public function generate(
 		Nodes\TemplateNode $node,
 		string $className,
-		?string $sourceName = null,
+		?string $templateName = null,
 		bool $strictMode = false,
 	): string
 	{
@@ -54,8 +54,8 @@ final class TemplateGenerator
 			$this->addConstant('ContentType', $node->contentType);
 		}
 
-		if ($sourceName !== null) {
-			$this->addConstant('Source', $sourceName);
+		if ($templateName !== null && !preg_match('#\n|\?#', $templateName)) {
+			$this->addConstant('Source', $templateName);
 		}
 
 		$this->generateBlocks($context->blocks, $context);
@@ -80,7 +80,7 @@ final class TemplateGenerator
 		$code = "<?php\n\n"
 			. ($strictMode ? "declare(strict_types=1);\n\n" : '')
 			. "use Latte\\Runtime as LR;\n\n"
-			. ($sourceName === null ? '' : '/** source: ' . str_replace('*/', '* /', $sourceName) . " */\n")
+			. ($templateName === null ? '' : '/** source: ' . str_replace('*/', '* /', $templateName) . " */\n")
 			. "final class $className extends Latte\\Runtime\\Template\n{\n"
 			. implode("\n\n", $members)
 			. "\n}\n";

package/vendor/latte/latte/src/Latte/Compiler/TemplateLexer.php

@@ -35,8 +35,9 @@ final class TemplateLexer
 	/** HTML attribute name/value (\p{C} means \x00-\x1F except space) */
 	private const ReAttrName = '[^\p{C} "\'<>=`/]';
 
-	public string $openDelimiter;
-	public string $closeDelimiter;
+	private string $openDelimiter = '';
+	private string $closeDelimiter = '';
+	private array $delimiters = [];
 	private TagLexer $tagLexer;
 
 	/** @var array<array{name: string, args: mixed[]}> */
@@ -278,6 +279,7 @@ final class TemplateLexer
 		$left = '\{(?![\s\'"{}])';
 		$end = $endTag ? '\{/' . preg_quote($endTag, '~') . '\}' : null;
 
+		$this->delimiters[] = [$this->openDelimiter, $this->closeDelimiter];
 		[$this->openDelimiter, $this->closeDelimiter] = match ($type) {
 			null => [$left, '\}'], // {...}
 			'off' => [$endTag ? '(?=' . $end . ')\{' : '(?!x)x', '\}'],
@@ -290,6 +292,12 @@ final class TemplateLexer
 	}
 
 
+	public function popSyntax(): void
+	{
+		[$this->openDelimiter, $this->closeDelimiter] = array_pop($this->delimiters);
+	}
+
+
 	private function normalize(string $str): string
 	{
 		if (str_starts_with($str, "\u{FEFF}")) { // BOM

package/vendor/latte/latte/src/Latte/Compiler/TemplateParserHtml.php

@@ -217,13 +217,17 @@ final class TemplateParserHtml
 	private function parseEndTag(): array
 	{
 		$stream = $this->parser->getStream();
+		$lexer = $this->parser->getLexer();
 		$stream->consume(Token::Html_TagOpen);
-		$this->parser->getLexer()->setState(TemplateLexer::StateHtmlTag);
+		$lexer->setState(TemplateLexer::StateHtmlTag);
 		$stream->consume(Token::Slash);
+		if (isset($this->element->nAttributes['syntax'])) {  // hardcoded
+			$lexer->popSyntax();
+		}
 		$name = $this->parseTagName();
 		$stream->tryConsume(Token::Whitespace);
 		$stream->consume(Token::Html_TagClose);
-		$this->parser->getLexer()->setState(TemplateLexer::StateHtmlText);
+		$lexer->setState(TemplateLexer::StateHtmlText);
 		return $name;
 	}
 

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

@@ -17,8 +17,8 @@ use Latte\Compiler\Nodes\TemplateNode;
  */
 class Engine
 {
-	public const Version = '3.0.12';
-	public const VersionId = 30012;
+	public const Version = '3.0.16';
+	public const VersionId = 30016;
 
 	/** @deprecated use Engine::Version */
 	public const
@@ -36,7 +36,7 @@ class Engine
 
 	private ?Loader $loader = null;
 	private Runtime\FilterExecutor $filters;
-	private \stdClass $functions;
+	private Runtime\FunctionExecutor $functions;
 	private \stdClass $providers;
 
 	/** @var Extension[] */
@@ -49,12 +49,13 @@ class Engine
 	private ?Policy $policy = null;
 	private bool $sandboxed = false;
 	private ?string $phpBinary = null;
+	private ?string $cacheKey;
 
 
 	public function __construct()
 	{
 		$this->filters = new Runtime\FilterExecutor;
-		$this->functions = new \stdClass;
+		$this->functions = new Runtime\FunctionExecutor;
 		$this->providers = new \stdClass;
 		$this->addExtension(new Essential\CoreExtension);
 		$this->addExtension(new Sandbox\SandboxExtension);
@@ -89,8 +90,9 @@ class Engine
 	 * Creates template object.
 	 * @param  mixed[]  $params
 	 */
-	public function createTemplate(string $name, array $params = []): Runtime\Template
+	public function createTemplate(string $name, array $params = [], $clearCache = true): Runtime\Template
 	{
+		$this->cacheKey = $clearCache ? null : $this->cacheKey;
 		$class = $this->getTemplateClass($name);
 		if (!class_exists($class, false)) {
 			$this->loadTemplate($name);
@@ -116,33 +118,33 @@ class Engine
 			throw new \LogicException('In sandboxed mode you need to set a security policy.');
 		}
 
-		$source = $this->getLoader()->getContent($name);
+		$template = $this->getLoader()->getContent($name);
 
 		try {
-			$node = $this->parse($source);
+			$node = $this->parse($template);
 			$this->applyPasses($node);
-			$code = $this->generate($node, $name);
+			$compiled = $this->generate($node, $name);
 
 		} catch (\Throwable $e) {
 			if (!$e instanceof CompileException && !$e instanceof SecurityViolationException) {
 				$e = new CompileException("Thrown exception '{$e->getMessage()}'", previous: $e);
 			}
 
-			throw $e->setSource($source, $name);
+			throw $e->setSource($template, $name);
 		}
 
 		if ($this->phpBinary) {
-			Compiler\PhpHelpers::checkCode($this->phpBinary, $code, "(compiled $name)");
+			Compiler\PhpHelpers::checkCode($this->phpBinary, $compiled, "(compiled $name)");
 		}
 
-		return $code;
+		return $compiled;
 	}
 
 
 	/**
 	 * Parses template to AST node.
 	 */
-	public function parse(string $source): TemplateNode
+	public function parse(string $template): TemplateNode
 	{
 		$parser = new Compiler\TemplateParser;
 		$parser->strict = $this->strictParsing;
@@ -155,7 +157,7 @@ class Engine
 		return $parser
 			->setContentType($this->contentType)
 			->setPolicy($this->getPolicy(effective: true))
-			->parse($source);
+			->parse($template);
 	}
 
 
@@ -178,16 +180,15 @@ class Engine
 
 
 	/**
-	 * Generates template PHP code.
+	 * Generates compiled PHP code.
 	 */
 	public function generate(TemplateNode $node, string $name): string
 	{
-		$sourceName = preg_match('#\n|\?#', $name) ? null : $name;
 		$generator = new Compiler\TemplateGenerator;
 		return $generator->generate(
 			$node,
 			$this->getTemplateClass($name),
-			$sourceName,
+			$name,
 			$this->strictTypes,
 		);
 	}
@@ -213,10 +214,10 @@ class Engine
 	private function loadTemplate(string $name): void
 	{
 		if (!$this->tempDirectory) {
-			$code = $this->compile($name);
-			if (@eval(substr($code, 5)) === false) { // @ is escalated to exception, substr removes <?php
+			$compiled = $this->compile($name);
+			if (@eval(substr($compiled, 5)) === false) { // @ is escalated to exception, substr removes <?php
 				throw (new CompileException('Error in template: ' . error_get_last()['message']))
-					->setSource($code, "$name (compiled)");
+					->setSource($compiled, "$name (compiled)");
 			}
 
 			return;
@@ -226,36 +227,50 @@ class Engine
 		// 1) We want to do as little as possible IO calls on production and also directory and file can be not writable
 		// so on Linux we include the file directly without shared lock, therefore, the file must be created atomically by renaming.
 		// 2) On Windows file cannot be renamed-to while is open (ie by include), so we have to acquire a lock.
-		$file = $this->getCacheFile($name);
-		$lock = defined('PHP_WINDOWS_VERSION_BUILD')
-			? $this->acquireLock("$file.lock", LOCK_SH)
+		$cacheFile = $this->getCacheFile($name);
+		$cacheKey = $this->autoRefresh
+			? md5(serialize($this->getCacheSignature($name)))
+			: null;
+		$lock = defined('PHP_WINDOWS_VERSION_BUILD') || $this->autoRefresh
+			? $this->acquireLock("$cacheFile.lock", LOCK_SH)
 			: null;
 
-		if (!$this->isExpired($file, $name) && (@include $file) !== false) { // @ - file may not exist
+		if (
+			!($this->autoRefresh && $cacheKey !== stream_get_contents($lock))
+			&& (@include $cacheFile) !== false // @ - file may not exist
+		) {
 			return;
 		}
 
 		if ($lock) {
 			flock($lock, LOCK_UN); // release shared lock so we can get exclusive
+			fseek($lock, 0);
 		}
 
-		$lock = $this->acquireLock("$file.lock", LOCK_EX);
+		$lock = $this->acquireLock("$cacheFile.lock", LOCK_EX);
 
 		// while waiting for exclusive lock, someone might have already created the cache
-		if (!is_file($file) || $this->isExpired($file, $name)) {
-			$code = $this->compile($name);
-			if (file_put_contents("$file.tmp", $code) !== strlen($code) || !rename("$file.tmp", $file)) {
-				@unlink("$file.tmp"); // @ - file may not exist
-				throw new RuntimeException("Unable to create '$file'.");
+		if (!is_file($cacheFile) || ($this->autoRefresh && $cacheKey !== stream_get_contents($lock))) {
+			$compiled = $this->compile($name);
+			if (
+				file_put_contents("$cacheFile.tmp", $compiled) !== strlen($compiled)
+				|| !rename("$cacheFile.tmp", $cacheFile)
+			) {
+				@unlink("$cacheFile.tmp"); // @ - file may not exist
+				throw new RuntimeException("Unable to create '$cacheFile'.");
 			}
 
+			fseek($lock, 0);
+			fwrite($lock, $cacheKey ?? md5(serialize($this->getCacheSignature($name))));
+			ftruncate($lock, ftell($lock));
+
 			if (function_exists('opcache_invalidate')) {
-				@opcache_invalidate($file, true); // @ can be restricted
+				@opcache_invalidate($cacheFile, true); // @ can be restricted
 			}
 		}
 
-		if ((include $file) === false) {
-			throw new RuntimeException("Unable to load '$file'.");
+		if ((include $cacheFile) === false) {
+			throw new RuntimeException("Unable to load '$cacheFile'.");
 		}
 
 		flock($lock, LOCK_UN);
@@ -272,7 +287,7 @@ class Engine
 			throw new RuntimeException("Unable to create directory '$dir'. " . error_get_last()['message']);
 		}
 
-		$handle = @fopen($file, 'w'); // @ is escalated to exception
+		$handle = @fopen($file, 'c+'); // @ is escalated to exception
 		if (!$handle) {
 			throw new RuntimeException("Unable to create file '$file'. " . error_get_last()['message']);
 		} elseif (!@flock($handle, $mode)) { // @ is escalated to exception
@@ -283,54 +298,62 @@ class Engine
 	}
 
 
-	private function isExpired(string $file, string $name): bool
+	public function getCacheFile(string $name): string
 	{
-		if (!$this->autoRefresh) {
-			return false;
-		}
-
-		$time = @filemtime($file); // @ - file may not exist
-		if ($time === false) {
-			return true;
-		}
+		$base = preg_match('#([/\\\\][\w@.-]{3,35}){1,3}$#D', '/' . $name, $m)
+			? preg_replace('#[^\w@.-]+#', '-', substr($m[0], 1)) . '--'
+			: '';
+		return $this->tempDirectory . '/' . $base . $this->generateCacheHash($name) . '.php';
+	}
 
-		foreach ($this->extensions as $extension) {
-			$r = new \ReflectionObject($extension);
-			if (is_file($r->getFileName()) && filemtime($r->getFileName()) > $time) {
-				return true;
-			}
-		}
 
-		return $this->getLoader()->isExpired($name, $time);
+	public function getTemplateClass(string $name): string
+	{
+		return 'Template_' . $this->generateCacheHash($name);
 	}
 
 
-	public function getCacheFile(string $name): string
+	private function generateCacheHash(string $name): string
 	{
-		$hash = substr($this->getTemplateClass($name), 8);
-		$base = preg_match('#([/\\\\][\w@.-]{3,35}){1,3}$#D', $name, $m)
-			? preg_replace('#[^\w@.-]+#', '-', substr($m[0], 1)) . '--'
-			: '';
-		return "$this->tempDirectory/$base$hash.php";
+		$this->cacheKey ??= md5(serialize($this->getCacheKey()));
+		$hash = $this->cacheKey . $this->getLoader()->getUniqueId($name);
+		return substr(md5($hash), 0, 10);
 	}
 
 
-	public function getTemplateClass(string $name): string
+	/**
+	 * Values that affect the results of compilation and the name of the cache file.
+	 */
+	protected function getCacheKey(): array
 	{
-		$key = [
-			$this->getLoader()->getUniqueId($name),
-			self::Version,
-			array_keys((array) $this->functions),
+		return [
 			$this->contentType,
+			array_keys($this->getFunctions()),
+			array_map(
+				fn($extension) => [
+					get_debug_type($extension),
+					$extension->getCacheKey($this),
+					filemtime((new \ReflectionObject($extension))->getFileName()),
+				],
+				$this->extensions,
+			),
 		];
-		foreach ($this->extensions as $extension) {
-			$key[] = [
-				get_debug_type($extension),
-				$extension->getCacheKey($this),
-			];
-		}
+	}
 
-		return 'Template' . substr(md5(serialize($key)), 0, 10);
+
+	/**
+	 * Values that check the expiration of the compiled template.
+	 */
+	protected function getCacheSignature(string $name): array
+	{
+		return [
+			self::Version,
+			$this->getLoader()->getContent($name),
+			array_map(
+				fn($extension) => filemtime((new \ReflectionObject($extension))->getFileName()),
+				$this->extensions,
+			),
+		];
 	}
 
 
@@ -351,9 +374,9 @@ class Engine
 	/**
 	 * Registers filter loader.
 	 */
-	public function addFilterLoader(callable $callback): static
+	public function addFilterLoader(callable $loader): static
 	{
-		$this->filters->add(null, $callback);
+		$this->filters->add(null, $loader);
 		return $this;
 	}
 
@@ -389,7 +412,7 @@ class Engine
 		}
 
 		foreach ($extension->getFunctions() as $name => $value) {
-			$this->functions->$name = $value;
+			$this->functions->add($name, $value);
 		}
 
 		foreach ($extension->getProviders() as $name => $value) {
@@ -415,7 +438,7 @@ class Engine
 			throw new \LogicException("Invalid function name '$name'.");
 		}
 
-		$this->functions->$name = $callback;
+		$this->functions->add($name, $callback);
 		return $this;
 	}
 
@@ -426,14 +449,7 @@ class Engine
 	 */
 	public function invokeFunction(string $name, array $args): mixed
 	{
-		if (!isset($this->functions->$name)) {
-			$hint = ($t = Helpers::getSuggestion(array_keys((array) $this->functions), $name))
-				? ", did you mean '$t'?"
-				: '.';
-			throw new \LogicException("Function '$name' is not defined$hint");
-		}
-
-		return ($this->functions->$name)(...$args);
+		return ($this->functions->$name)(null, ...$args);
 	}
 
 
@@ -442,20 +458,20 @@ class Engine
 	 */
 	public function getFunctions(): array
 	{
-		return (array) $this->functions;
+		return $this->functions->getAll();
 	}
 
 
 	/**
 	 * Adds new provider.
 	 */
-	public function addProvider(string $name, mixed $value): static
+	public function addProvider(string $name, mixed $provider): static
 	{
 		if (!preg_match('#^[a-z]\w*$#iD', $name)) {
 			throw new \LogicException("Invalid provider name '$name'.");
 		}
 
-		$this->providers->$name = $value;
+		$this->providers->$name = $provider;
 		return $this;
 	}
 
@@ -485,16 +501,16 @@ class Engine
 	}
 
 
-	public function setExceptionHandler(callable $callback): static
+	public function setExceptionHandler(callable $handler): static
 	{
-		$this->providers->coreExceptionHandler = $callback;
+		$this->providers->coreExceptionHandler = $handler;
 		return $this;
 	}
 
 
-	public function setSandboxMode(bool $on = true): static
+	public function setSandboxMode(bool $state = true): static
 	{
-		$this->sandboxed = $on;
+		$this->sandboxed = $state;
 		return $this;
 	}
 
@@ -519,9 +535,9 @@ class Engine
 	/**
 	 * Sets auto-refresh mode.
 	 */
-	public function setAutoRefresh(bool $on = true): static
+	public function setAutoRefresh(bool $state = true): static
 	{
-		$this->autoRefresh = $on;
+		$this->autoRefresh = $state;
 		return $this;
 	}
 
@@ -529,16 +545,16 @@ class Engine
 	/**
 	 * Enables declare(strict_types=1) in templates.
 	 */
-	public function setStrictTypes(bool $on = true): static
+	public function setStrictTypes(bool $state = true): static
 	{
-		$this->strictTypes = $on;
+		$this->strictTypes = $state;
 		return $this;
 	}
 
 
-	public function setStrictParsing(bool $on = true): static
+	public function setStrictParsing(bool $state = true): static
 	{
-		$this->strictParsing = $on;
+		$this->strictParsing = $state;
 		return $this;
 	}
 
@@ -558,11 +574,7 @@ class Engine
 
 	public function getLoader(): Loader
 	{
-		if (!$this->loader) {
-			$this->loader = new Loaders\FileLoader;
-		}
-
-		return $this->loader;
+		return $this->loader ??= new Loaders\FileLoader;
 	}
 
 

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

@@ -0,0 +1,46 @@
+<?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;
+
+
+/**
+ * Iterates over key-value pairs.
+ * @internal
+ * @template K
+ * @template V
+ * @implements \IteratorAggregate<K, V>
+ */
+class AuxiliaryIterator implements \IteratorAggregate, \Countable
+{
+	/**
+	 * @param  array<array{K, V}>  $pairs
+	 */
+	public function __construct(
+		private array $pairs,
+	) {
+	}
+
+
+	/**
+	 * @return \Generator<K, V>
+	 */
+	public function getIterator(): \Generator
+	{
+		foreach ($this->pairs as [$key, $value]) {
+			yield $key => $value;
+		}
+	}
+
+
+	public function count(): int
+	{
+		return count($this->pairs);
+	}
+}

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

@@ -9,8 +9,6 @@ declare(strict_types=1);
 
 namespace Latte\Essential;
 
-use Latte;
-use Latte\Runtime\Template;
 use Nette\PhpGenerator as Php;
 
 
@@ -20,24 +18,46 @@ use Nette\PhpGenerator as Php;
  */
 final class Blueprint
 {
-	public function printClass(Template $template, ?string $name = null): void
+	public function generateTemplateClass(
+		array $params,
+		?string $name = 'Template',
+		?string $extends = null,
+	): Php\ClassType
 	{
 		if (!class_exists(Php\ClassType::class)) {
-			throw new \LogicException('Nette PhpGenerator is required to print template, install package `nette/php-generator`.');
+			throw new \LogicException('Nette PhpGenerator is required to generate blueprint, install package `nette/php-generator`.');
 		}
 
-		$name = $name ?: 'Template';
 		$namespace = new Php\PhpNamespace(Php\Helpers::extractNamespace($name));
 		$class = $namespace->addClass(Php\Helpers::extractShortName($name));
+		if ($extends) {
+			if (class_exists($extends)) {
+				if ((new \ReflectionClass($extends))->isFinal()) {
+					throw new \LogicException("Blueprint error: Unable to extend final class $extends");
+				}
+				$class->setExtends($extends);
+			} elseif (trait_exists($extends)) {
+				$class->addTrait($extends);
+			} else {
+				throw new \LogicException("Blueprint error: Class '$extends' doesn't exist.");
+			}
+			$params = array_diff_key($params, get_class_vars($extends));
+		}
+		$this->addProperties($class, $params);
+		return $class;
+	}
+
 
-		$this->addProperties($class, $template->getParameters());
-		$functions = array_diff_key((array) $template->global->fn, (new Latte\Essential\CoreExtension)->getFunctions());
-		$this->addFunctions($class, $functions);
+	public function printClass(Php\ClassType $class): void
+	{
+		$this->printCode((string) $class->getNamespace());
+	}
 
-		$end = $this->printCanvas();
-		$this->printHeader('Native types');
-		$this->printCode((string) $namespace);
-		echo $end;
+
+	public function clickableFile(string $file, int $line = 1): string
+	{
+		$link = 'editor://open/?file=' . rawurlencode(strtr($file, '/', DIRECTORY_SEPARATOR)) . '&line=' . $line;
+		return '<a href="' . htmlspecialchars($link) . '">' . htmlspecialchars($file) . '</a>';
 	}
 
 
@@ -46,24 +66,16 @@ final class Blueprint
 	 */
 	public function printVars(array $vars): void
 	{
-		if (!class_exists(Php\Type::class)) {
-			throw new \LogicException('Nette PhpGenerator is required to print template, install package `nette/php-generator`.');
-		}
-
 		$res = '';
 		foreach ($vars as $name => $value) {
-			if (str_starts_with($name, 'ʟ_')) {
-				continue;
+			if (!str_starts_with($name, 'ʟ_')) {
+				$type = $this->getType($value);
+				$res .= "{varType $type $$name}\n";
 			}
-
-			$type = $this->getType($value);
-			$res .= "{varType $type $$name}\n";
 		}
 
-		$end = $this->printCanvas();
 		$this->printHeader('varPrint');
 		$this->printCode($res ?: 'No variables', 'latte');
-		echo $end;
 	}
 
 
@@ -134,12 +146,17 @@ final class Blueprint
 	}
 
 
-	public function printCanvas(): string
+	public function printBegin(): void
 	{
 		echo '<script src="https://nette.github.io/resources/prism/prism.js"></script>';
 		echo '<link rel="stylesheet" href="https://nette.github.io/resources/prism/prism.css">';
 		echo "<div style='all:initial;position:fixed;overflow:auto;z-index:1000;left:0;right:0;top:0;bottom:0;color:black;background:white;padding:1em'>\n";
-		return "</div>\n";
+	}
+
+
+	public function printEnd(): void
+	{
+		echo "</div>\n";
 	}