@vituum/vite-plugin-latte 2.0.0-next.4 → 2.0.0

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/BinaryOpNode.php

@@ -1,32 +1,35 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\OperatorNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
+use function count, in_array, strtolower;
 
 
-class BinaryOpNode extends ExpressionNode
+/**
+ * Binary operation: arithmetic, logical, bitwise, comparison, null-coalescing, or pipe.
+ */
+class BinaryOpNode extends ExpressionNode implements OperatorNode
 {
-	private const Ops = ['||', '&&', 'or', 'and', 'xor', '&', '^', '.', '+', '-', '*', '/', '%', '<<', '>>', '**',
-		'==', '!=', '===', '!==', '<=>', '<', '<=', '>', '>=', '??', ];
+	private const Ops = ['||', '&&', 'or', 'and', 'xor', '|', '&', '^', '.', '+', '-', '*', '/', '%', '<<', '>>', '**',
+		'==', '!=', '===', '!==', '<=>', '<', '<=', '>', '>=', '??', '|>'];
 
 
 	public function __construct(
 		public ExpressionNode $left,
-		public /*readonly*/ string $operator,
+		public string $operator,
 		public ExpressionNode $right,
 		public ?Position $position = null,
 	) {
-		if (!in_array(strtolower($this->operator), self::Ops, true)) {
+		if (!in_array(strtolower($this->operator), self::Ops, strict: true)) {
 			throw new \InvalidArgumentException("Unexpected operator '$this->operator'");
 		}
 	}
@@ -53,7 +56,33 @@ class BinaryOpNode extends ExpressionNode
 
 	public function print(PrintContext $context): string
 	{
-		return $context->infixOp($this, $this->left, ' ' . $this->operator . ' ', $this->right);
+		return $context->parenthesize($this, $this->left, self::AssocLeft)
+			. ' ' . $this->operator . ' '
+			. $context->parenthesize($this, $this->right, self::AssocRight);
+	}
+
+
+	public function getOperatorPrecedence(): array
+	{
+		return match (strtolower($this->operator)) {
+			'**' => [250, self::AssocRight],
+			'*', '/', '%' => [210, self::AssocLeft],
+			'+', '-' => [200, self::AssocLeft],
+			'<<', '>>' => [190, self::AssocLeft],
+			'.' => [185, self::AssocLeft],
+			'|>' => [183, self::AssocLeft],
+			'<', '<=', '>', '>=', '<=>' => [180, self::AssocNone],
+			'==', '!=', '===', '!==' => [170, self::AssocNone],
+			'&' => [160, self::AssocLeft],
+			'^' => [150, self::AssocLeft],
+			'|' => [140, self::AssocLeft],
+			'&&' => [130, self::AssocLeft],
+			'||' => [120, self::AssocLeft],
+			'??' => [110, self::AssocRight],
+			'and' => [50, self::AssocLeft],
+			'xor' => [40, self::AssocLeft],
+			'or' => [30, self::AssocLeft],
+		};
 	}
 
 

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/CastNode.php

@@ -1,26 +1,28 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\OperatorNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
-class CastNode extends ExpressionNode
+/**
+ * Type cast (int), (string), (array), etc.
+ */
+class CastNode extends ExpressionNode implements OperatorNode
 {
 	private const Types = ['int' => 1, 'float' => 1, 'string' => 1, 'array' => 1, 'object' => 1, 'bool' => 1];
 
 
 	public function __construct(
-		public /*readonly*/ string $type,
+		public string $type,
 		public ExpressionNode $expr,
 		public ?Position $position = null,
 	) {
@@ -32,7 +34,13 @@ class CastNode extends ExpressionNode
 
 	public function print(PrintContext $context): string
 	{
-		return $context->prefixOp($this, '(' . $this->type . ') ', $this->expr);
+		return '(' . $this->type . ') ' . $context->parenthesize($this, $this->expr, self::AssocRight);
+	}
+
+
+	public function getOperatorPrecedence(): array
+	{
+		return [240, self::AssocRight];
 	}
 
 

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ClassConstantFetchNode.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php\ExpressionNode;
@@ -16,6 +14,9 @@ use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Class constant access (Foo::CONST or Foo::class).
+ */
 class ClassConstantFetchNode extends ExpressionNode
 {
 	public function __construct(

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/CloneNode.php

@@ -1,20 +1,22 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\OperatorNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
-class CloneNode extends ExpressionNode
+/**
+ * Object cloning (clone $obj).
+ */
+class CloneNode extends ExpressionNode implements OperatorNode
 {
 	public function __construct(
 		public ExpressionNode $expr,
@@ -29,6 +31,12 @@ class CloneNode extends ExpressionNode
 	}
 
 
+	public function getOperatorPrecedence(): array
+	{
+		return [270, self::AssocNone];
+	}
+
+
 	public function &getIterator(): \Generator
 	{
 		yield $this->expr;

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ClosureNode.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php;
@@ -14,8 +12,12 @@ use Latte\Compiler\Nodes\Php\ClosureUseNode;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
+use Latte\Helpers;
 
 
+/**
+ * Closure or arrow function (fn($x) => $x or function($x) use ($y) {}).
+ */
 class ClosureNode extends ExpressionNode
 {
 	public function __construct(
@@ -35,12 +37,12 @@ class ClosureNode extends ExpressionNode
 
 	public function print(PrintContext $context): string
 	{
-		$arrow = (bool) $this->expr;
+		$usesByRef = false;
 		foreach ($this->uses as $use) {
-			$arrow = $arrow && !$use->byRef;
+			$usesByRef = $usesByRef || $use->byRef;
 		}
 
-		return $arrow
+		return $this->expr && !$usesByRef
 			? 'fn' . ($this->byRef ? '&' : '')
 				. '(' . $context->implode($this->params) . ')'
 				. ($this->returnType !== null ? ': ' . $this->returnType->print($context) : '')
@@ -59,10 +61,12 @@ class ClosureNode extends ExpressionNode
 		foreach ($this->params as &$item) {
 			yield $item;
 		}
+		Helpers::removeNulls($this->params);
 
 		foreach ($this->uses as &$item) {
 			yield $item;
 		}
+		Helpers::removeNulls($this->uses);
 
 		if ($this->returnType) {
 			yield $this->returnType;

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ConstantFetchNode.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php\ExpressionNode;
@@ -15,6 +13,9 @@ use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Global constant access (CONST or \CONST).
+ */
 class ConstantFetchNode extends ExpressionNode
 {
 	public function __construct(
@@ -28,9 +29,9 @@ class ConstantFetchNode extends ExpressionNode
 	{
 		if ($this->name->kind === NameNode::KindNormal) {
 			return match ((string) $this->name) {
-				'__LINE__' => (string) $this->position->line,
-				'__FILE__' => '(is_file(self::Source) ? self::Source : null)',
-				'__DIR__' => '(is_file(self::Source) ? dirname(self::Source) : null)',
+				'__LINE__' => (string) ($this->position->line ?? 0),
+				'__FILE__' => '(is_file($this->getName()) ? $this->getName() : null)',
+				'__DIR__' => '(is_file($this->getName()) ? dirname($this->getName()) : null)',
 				default => $this->name->print($context),
 			};
 		}

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/EmptyNode.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php\ExpressionNode;
@@ -14,6 +12,9 @@ use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * empty() language construct.
+ */
 class EmptyNode extends ExpressionNode
 {
 	public function __construct(

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/FilterCallNode.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php;
@@ -15,6 +13,9 @@ use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Expression with filter applied ($expr|filter).
+ */
 class FilterCallNode extends ExpressionNode
 {
 	public function __construct(
@@ -27,7 +28,12 @@ class FilterCallNode extends ExpressionNode
 
 	public function print(PrintContext $context): string
 	{
-		return $this->filter->printSimple($context, $this->expr->print($context));
+		$filters = [];
+		for ($node = $this; $node instanceof self; $node = $node->expr) {
+			array_unshift($filters, $node->filter);
+		}
+
+		return Php\FilterNode::printSimple($context, $filters, $node->print($context));
 	}
 
 

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/FunctionCallNode.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php;
@@ -14,17 +12,27 @@ use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\Php\NameNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
+use Latte\Helpers;
 
 
+/**
+ * Function call with partial application or first-class callable support.
+ */
 class FunctionCallNode extends ExpressionNode
 {
 	public function __construct(
 		public NameNode|ExpressionNode $name,
-		/** @var array<Php\ArgumentNode> */
+		/** @var array<Php\ArgumentNode|Php\VariadicPlaceholderNode> */
 		public array $args = [],
 		public ?Position $position = null,
 	) {
-		(function (Php\ArgumentNode ...$args) {})(...$args);
+		(function (Php\ArgumentNode|Php\VariadicPlaceholderNode ...$args) {})(...$args);
+	}
+
+
+	public function isPartialFunction(): bool
+	{
+		return ($this->args[0] ?? null) instanceof Php\VariadicPlaceholderNode;
 	}
 
 
@@ -41,5 +49,6 @@ class FunctionCallNode extends ExpressionNode
 		foreach ($this->args as &$item) {
 			yield $item;
 		}
+		Helpers::removeNulls($this->args);
 	}
 }

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/InNode.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php\ExpressionNode;
@@ -14,6 +12,9 @@ use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Latte's `in` operator compiled to in_array() with strict mode.
+ */
 class InNode extends ExpressionNode
 {
 	public function __construct(

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/InstanceofNode.php

@@ -1,21 +1,23 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\Php\NameNode;
+use Latte\Compiler\Nodes\Php\OperatorNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
-class InstanceofNode extends ExpressionNode
+/**
+ * instanceof type check.
+ */
+class InstanceofNode extends ExpressionNode implements OperatorNode
 {
 	public function __construct(
 		public ExpressionNode $expr,
@@ -27,11 +29,18 @@ class InstanceofNode extends ExpressionNode
 
 	public function print(PrintContext $context): string
 	{
-		return $context->postfixOp($this, $this->expr, ' instanceof ')
+		return $context->parenthesize($this, $this->expr, self::AssocLeft)
+			. ' instanceof '
 			. $context->dereferenceExpr($this->class);
 	}
 
 
+	public function getOperatorPrecedence(): array
+	{
+		return [230, self::AssocNone];
+	}
+
+
 	public function &getIterator(): \Generator
 	{
 		yield $this->expr;

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/IssetNode.php

@@ -1,20 +1,22 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\CompileException;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
+use Latte\Helpers;
 
 
+/**
+ * isset() language construct.
+ */
 class IssetNode extends ExpressionNode
 {
 	public function __construct(
@@ -50,5 +52,6 @@ class IssetNode extends ExpressionNode
 		foreach ($this->vars as &$item) {
 			yield $item;
 		}
+		Helpers::removeNulls($this->vars);
 	}
 }

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/MatchNode.php

@@ -1,20 +1,22 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php;
 use Latte\Compiler\Nodes\Php\MatchArmNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
+use Latte\Helpers;
 
 
+/**
+ * Match expression.
+ */
 class MatchNode extends Php\ExpressionNode
 {
 	public function __construct(
@@ -45,5 +47,6 @@ class MatchNode extends Php\ExpressionNode
 		foreach ($this->arms as &$item) {
 			yield $item;
 		}
+		Helpers::removeNulls($this->arms);
 	}
 }

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/MethodCallNode.php

@@ -1,37 +1,49 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
+use Latte\CompileException;
 use Latte\Compiler\Nodes\Php;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\Php\IdentifierNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
+use Latte\Helpers;
 
 
+/**
+ * Method call with nullsafe support, partial application, or first-class callable.
+ */
 class MethodCallNode extends ExpressionNode
 {
 	public function __construct(
 		public ExpressionNode $object,
 		public IdentifierNode|ExpressionNode $name,
-		/** @var array<Php\ArgumentNode> */
+		/** @var array<Php\ArgumentNode|Php\VariadicPlaceholderNode> */
 		public array $args = [],
 		public bool $nullsafe = false,
 		public ?Position $position = null,
 	) {
-		(function (Php\ArgumentNode ...$args) {})(...$args);
+		(function (Php\ArgumentNode|Php\VariadicPlaceholderNode ...$args) {})(...$args);
+	}
+
+
+	public function isPartialFunction(): bool
+	{
+		return ($this->args[0] ?? null) instanceof Php\VariadicPlaceholderNode;
 	}
 
 
 	public function print(PrintContext $context): string
 	{
+		if ($this->nullsafe && $this->isPartialFunction()) {
+			throw new CompileException('Cannot combine nullsafe operator with Closure creation', $this->position);
+		}
 		return $context->dereferenceExpr($this->object)
 			. ($this->nullsafe ? '?->' : '->')
 			. $context->objectProperty($this->name)
@@ -46,5 +58,6 @@ class MethodCallNode extends ExpressionNode
 		foreach ($this->args as &$item) {
 			yield $item;
 		}
+		Helpers::removeNulls($this->args);
 	}
 }

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/NewNode.php

@@ -1,22 +1,25 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Php\Expression;
 
 use Latte\Compiler\Nodes\Php;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\Php\NameNode;
+use Latte\Compiler\Nodes\Php\OperatorNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
+use Latte\Helpers;
 
 
-class NewNode extends ExpressionNode
+/**
+ * Object instantiation (new ClassName or new $expr).
+ */
+class NewNode extends ExpressionNode implements OperatorNode
 {
 	public function __construct(
 		public NameNode|ExpressionNode $class,
@@ -35,11 +38,18 @@ class NewNode extends ExpressionNode
 	}
 
 
+	public function getOperatorPrecedence(): array
+	{
+		return [270, self::AssocNone];
+	}
+
+
 	public function &getIterator(): \Generator
 	{
 		yield $this->class;
 		foreach ($this->args as &$item) {
 			yield $item;
 		}
+		Helpers::removeNulls($this->args);
 	}
 }