@vituum/vite-plugin-latte 1.1.0 → 1.2.0

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

@@ -9,71 +9,31 @@ declare(strict_types=1);
 
 namespace Latte\Essential;
 
-use Latte;
 use Latte\CompileException;
 use Latte\Compiler\Node;
-use Latte\Compiler\Nodes\AuxiliaryNode;
 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
 {
-	/**
-	 * 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);
 
@@ -87,7 +47,7 @@ final class Passes
 				}
 
 				return new Expression\AuxiliaryNode(
-					fn(PrintContext $context, ...$args) => '($this->global->fn->' . $orig . ')(' . $context->implode($args) . ')',
+					fn(PrintContext $context, ...$args) => '($this->global->fn->' . $orig . ')($this, ' . $context->implode($args) . ')',
 					$node->args,
 				);
 			}
@@ -96,11 +56,11 @@ final class Passes
 
 
 	/**
-	 * $ʟ_xxx variables are forbidden
+	 * $ʟ_xxx, $GLOBALS and $this are forbidden
 	 */
-	public static function internalVariablesPass(TemplateNode $node, bool $forbidThis = false): void
+	public function forbiddenVariablesPass(TemplateNode $node): void
 	{
-		$forbidden = $forbidThis ? ['GLOBALS', 'this'] : ['GLOBALS'];
+		$forbidden = $this->engine->isStrictParsing() ? ['GLOBALS', 'this'] : ['GLOBALS'];
 		(new NodeTraverser)->traverse($node, function (Node $node) use ($forbidden) {
 			if ($node instanceof VariableNode
 				&& is_string($node->name)

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

@@ -50,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/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).
@@ -259,7 +256,7 @@ class Filters
 	/**
 	 * Sanitizes string for use inside href attribute.
 	 */
-	public static function safeUrl(string|\Stringable $s): string
+	public static function safeUrl($s): string
 	{
 		$s = $s instanceof HtmlStringable
 			? self::convertHtmlToText((string) $s)

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/Template.php

@@ -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;