@vituum/vite-plugin-latte 1.0.0 → 1.1.0

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 */

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) . ')';
 	}
 }

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

@@ -44,15 +44,15 @@ class SandboxNode extends StatementNode
 				ob_start(fn() => '');
 				try {
 					$this->createTemplate(%node, %node, 'sandbox')->renderToContentType(%dump) %line;
-					echo ob_get_clean();
 				} catch (\Throwable $ʟ_e) {
 					if (isset($this->global->coreExceptionHandler)) {
-						ob_end_clean();
+						ob_clean();
 						($this->global->coreExceptionHandler)($ʟ_e, $this);
 					} else {
-						echo ob_get_clean();
 						throw $ʟ_e;
 					}
+				} finally {
+					echo ob_get_clean();
 				}
 
 

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/{StaticCallNode.php → StaticMethodCallNode.php}

@@ -13,9 +13,9 @@ use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\PrintContext;
 
 
-class StaticCallNode extends Expression\StaticCallNode
+class StaticMethodCallNode extends Expression\StaticMethodCallNode
 {
-	public function __construct(Expression\StaticCallNode $from)
+	public function __construct(Expression\StaticMethodCallNode $from)
 	{
 		parent::__construct($from->class, $from->name, $from->args, $from->position);
 	}
@@ -26,6 +26,6 @@ class StaticCallNode extends Expression\StaticCallNode
 		return '$this->global->sandbox->call(['
 			. $context->memberAsString($this->class) . ', '
 			. $context->memberAsString($this->name) . '], '
-			. Expression\ArrayNode::fromArguments($this->args)->print($context) . ')';
+			. $context->argumentsAsArray($this->args) . ')';
 	}
 }

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/{StaticCallableNode.php → StaticMethodCallableNode.php}

@@ -13,9 +13,9 @@ use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\PrintContext;
 
 
-class StaticCallableNode extends Expression\StaticCallableNode
+class StaticMethodCallableNode extends Expression\StaticMethodCallableNode
 {
-	public function __construct(Expression\StaticCallableNode $from)
+	public function __construct(Expression\StaticMethodCallableNode $from)
 	{
 		parent::__construct($from->class, $from->name, $from->position);
 	}

package/vendor/latte/latte/src/Latte/Sandbox/RuntimeChecker.php

@@ -15,8 +15,6 @@ use Latte;
 /** @internal */
 final class RuntimeChecker
 {
-	use Latte\Strict;
-
 	public function __construct(
 		public Latte\Policy $policy,
 	) {

package/vendor/latte/latte/src/Latte/Sandbox/SandboxExtension.php

@@ -10,12 +10,12 @@ declare(strict_types=1);
 namespace Latte\Sandbox;
 
 use Latte;
-use Latte\Compiler\ExpressionBuilder;
 use Latte\Compiler\Node;
 use Latte\Compiler\Nodes\Php;
 use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\Nodes\TemplateNode;
 use Latte\Compiler\NodeTraverser;
+use Latte\Compiler\PrintContext;
 use Latte\Engine;
 use Latte\Runtime\Template;
 use Latte\SecurityViolationException;
@@ -26,8 +26,6 @@ use Latte\SecurityViolationException;
  */
 final class SandboxExtension extends Latte\Extension
 {
-	use Latte\Strict;
-
 	private ?Latte\Policy $policy;
 
 
@@ -95,8 +93,10 @@ final class SandboxExtension extends Latte\Extension
 				throw new SecurityViolationException("Function $node->name() is not allowed.", $node->position);
 
 			} elseif ($node->args) {
-				$arg = ExpressionBuilder::variable('$this')->property('global')->property('sandbox')->method('args', $node->args)
-					->build();
+				$arg = new Expression\AuxiliaryNode(
+					fn(PrintContext $context, ...$args) => '$this->global->sandbox->args(' . $context->implode($args) . ')',
+					$node->args,
+				);
 				$node->args = [new Php\ArgumentNode($arg, unpack: true)];
 			}
 
@@ -108,8 +108,10 @@ final class SandboxExtension extends Latte\Extension
 				throw new SecurityViolationException("Filter |$name is not allowed.", $node->position);
 
 			} elseif ($node->args) {
-				$arg = ExpressionBuilder::variable('$this')->property('global')->property('sandbox')->method('args', $node->args)
-					->build();
+				$arg = new Expression\AuxiliaryNode(
+					fn(PrintContext $context, ...$args) => '$this->global->sandbox->args(' . $context->implode($args) . ')',
+					$node->args,
+				);
 				$node->args = [new Php\ArgumentNode($arg, unpack: true)];
 			}
 
@@ -121,8 +123,8 @@ final class SandboxExtension extends Latte\Extension
 			|| $node instanceof Expression\FunctionCallableNode
 			|| $node instanceof Expression\MethodCallNode
 			|| $node instanceof Expression\MethodCallableNode
-			|| $node instanceof Expression\StaticCallNode
-			|| $node instanceof Expression\StaticCallableNode
+			|| $node instanceof Expression\StaticMethodCallNode
+			|| $node instanceof Expression\StaticMethodCallableNode
 		) {
 			$class = namespace\Nodes::class . strrchr($node::class, '\\');
 			return new $class($node);

package/vendor/latte/latte/src/Latte/Sandbox/SecurityPolicy.php

@@ -17,8 +17,6 @@ use Latte;
  */
 class SecurityPolicy implements Latte\Policy
 {
-	use Latte\Strict;
-
 	public const All = ['*'];
 	public const ALL = self::All;
 

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

@@ -37,14 +37,10 @@ class CompileException extends \Exception implements Exception
 
 
 /**
- * The exception that indicates error of the last Regexp execution.
+ * The exception occurred during template rendering.
  */
-class RegexpException extends \Exception implements Exception
+class RuntimeException extends \RuntimeException implements Exception
 {
-	public function __construct()
-	{
-		parent::__construct(preg_last_error_msg(), preg_last_error());
-	}
 }
 
 
@@ -62,8 +58,3 @@ class SecurityViolationException extends \Exception implements Exception
 		$this->generateMessage();
 	}
 }
-
-
-class RuntimeException extends \RuntimeException implements Exception
-{
-}

package/vendor/latte/latte/src/Tools/Linter.php

@@ -15,11 +15,10 @@ use Nette;
 
 final class Linter
 {
-	use Latte\Strict;
-
 	public function __construct(
 		private ?Latte\Engine $engine = null,
 		private bool $debug = false,
+		private bool $strict = false,
 	) {
 	}
 
@@ -31,10 +30,6 @@ final class Linter
 		echo "Scanning $path\n";
 
 		$files = $this->getFiles($path);
-
-		$this->engine ??= $this->createEngine();
-		$this->engine->setLoader(new Latte\Loaders\StringLoader);
-
 		$counter = 0;
 		$errors = 0;
 		foreach ($files as $file) {
@@ -53,6 +48,8 @@ final class Linter
 	private function createEngine(): Latte\Engine
 	{
 		$engine = new Latte\Engine;
+		$engine->enablePhpLinter(PHP_BINARY);
+		$engine->setStrictParsing($this->strict);
 		$engine->addExtension(new Latte\Essential\TranslatorExtension(null));
 
 		if (class_exists(Nette\Bridges\ApplicationLatte\UIExtension::class)) {
@@ -71,6 +68,13 @@ final class Linter
 	}
 
 
+	public function getEngine(): Latte\Engine
+	{
+		$this->engine ??= $this->createEngine();
+		return $this->engine;
+	}
+
+
 	public function lintLatte(string $file): bool
 	{
 		set_error_handler(function (int $severity, string $message) use ($file) {
@@ -91,7 +95,9 @@ final class Linter
 		}
 
 		try {
-			$code = $this->engine->compile($s);
+			$this->getEngine()
+				->setLoader(new Latte\Loaders\StringLoader)
+				->compile($s);
 
 		} catch (Latte\CompileException $e) {
 			if ($this->debug) {
@@ -106,40 +112,10 @@ final class Linter
 			restore_error_handler();
 		}
 
-		if ($error = $this->lintPHP($code)) {
-			fwrite(STDERR, "[ERROR]      $file    $error\n");
-			return false;
-		}
-
 		return true;
 	}
 
 
-	private function lintPHP(string $code): ?string
-	{
-		$php = defined('PHP_BINARY') ? PHP_BINARY : 'php';
-		$stdin = tmpfile();
-		fwrite($stdin, $code);
-		fseek($stdin, 0);
-		$process = proc_open(
-			$php . ' -l -d display_errors=1',
-			[$stdin, ['pipe', 'w'], ['pipe', 'w']],
-			$pipes,
-			null,
-			null,
-			['bypass_shell' => true],
-		);
-		if (!is_resource($process)) {
-			return 'Unable to lint PHP code';
-		}
-		$error = stream_get_contents($pipes[1]);
-		if (proc_close($process)) {
-			return strip_tags(explode("\n", $error)[1]);
-		}
-		return null;
-	}
-
-
 	private function initialize(): void
 	{
 		if (function_exists('pcntl_signal')) {

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Html/QuotedValue.php

@@ -1,53 +0,0 @@
-<?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\Compiler\Nodes\Html;
-
-use Latte\Compiler\Nodes\AreaNode;
-use Latte\Compiler\Nodes\FragmentNode;
-use Latte\Compiler\Position;
-use Latte\Compiler\PrintContext;
-
-
-class QuotedValue extends AreaNode
-{
-	public function __construct(
-		public AreaNode $value,
-		public string $quote,
-		public ?Position $position = null,
-	) {
-	}
-
-
-	public function print(PrintContext $context): string
-	{
-		$res = 'echo ' . var_export($this->quote, true) . ';';
-		$escaper = $context->beginEscape();
-		$escaper->enterHtmlAttributeQuote($this->quote);
-
-		if ($this->value instanceof FragmentNode && $escaper->export() === 'html/attr/url') {
-			foreach ($this->value->children as $child) {
-				$res .= $child->print($context);
-				$escaper->enterHtmlAttribute(null, $this->quote);
-			}
-		} else {
-			$res .= $this->value->print($context);
-		}
-
-		$res .= 'echo ' . var_export($this->quote, true) . ';';
-		$context->restoreEscape();
-		return $res;
-	}
-
-
-	public function &getIterator(): \Generator
-	{
-		yield $this->value;
-	}
-}

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

@@ -1,101 +0,0 @@
-<?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;
-
-use LogicException;
-
-
-/**
- * Better OOP experience.
- */
-trait Strict
-{
-	/**
-	 * Call to undefined method.
-	 * @param  mixed[]  $args
-	 * @throws LogicException
-	 */
-	public function __call(string $name, array $args): mixed
-	{
-		$class = method_exists($this, $name) ? 'parent' : static::class;
-		$items = (new \ReflectionClass($this))->getMethods(\ReflectionMethod::IS_PUBLIC);
-		$items = array_map(fn($item) => $item->getName(), $items);
-		$hint = ($t = Helpers::getSuggestion($items, $name))
-			? ", did you mean $t()?"
-			: '.';
-		throw new LogicException("Call to undefined method $class::$name()$hint");
-	}
-
-
-	/**
-	 * Call to undefined static method.
-	 * @param  mixed[]  $args
-	 * @throws LogicException
-	 */
-	public static function __callStatic(string $name, array $args): mixed
-	{
-		$rc = new \ReflectionClass(static::class);
-		$items = array_filter($rc->getMethods(\ReflectionMethod::IS_STATIC), fn($m) => $m->isPublic());
-		$items = array_map(fn($item) => $item->getName(), $items);
-		$hint = ($t = Helpers::getSuggestion($items, $name))
-			? ", did you mean $t()?"
-			: '.';
-		throw new LogicException("Call to undefined static method $rc->name::$name()$hint");
-	}
-
-
-	/**
-	 * Access to undeclared property.
-	 * @throws LogicException
-	 */
-	public function &__get(string $name): mixed
-	{
-		$rc = new \ReflectionClass($this);
-		$items = array_filter($rc->getProperties(\ReflectionProperty::IS_PUBLIC), fn($p) => !$p->isStatic());
-		$items = array_map(fn($item) => $item->getName(), $items);
-		$hint = ($t = Helpers::getSuggestion($items, $name))
-			? ", did you mean $$t?"
-			: '.';
-		throw new LogicException("Attempt to read undeclared property $rc->name::$$name$hint");
-	}
-
-
-	/**
-	 * Access to undeclared property.
-	 * @throws LogicException
-	 */
-	public function __set(string $name, mixed $value): void
-	{
-		$rc = new \ReflectionClass($this);
-		$items = array_filter($rc->getProperties(\ReflectionProperty::IS_PUBLIC), fn($p) => !$p->isStatic());
-		$items = array_map(fn($item) => $item->getName(), $items);
-		$hint = ($t = Helpers::getSuggestion($items, $name))
-			? ", did you mean $$t?"
-			: '.';
-		throw new LogicException("Attempt to write to undeclared property $rc->name::$$name$hint");
-	}
-
-
-	public function __isset(string $name): bool
-	{
-		return false;
-	}
-
-
-	/**
-	 * Access to undeclared property.
-	 * @throws LogicException
-	 */
-	public function __unset(string $name): void
-	{
-		$class = static::class;
-		throw new LogicException("Attempt to unset undeclared property $class::$$name.");
-	}
-}