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

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

@@ -1,19 +1,16 @@
-<?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\Html;
 
 use Latte\Compiler\Node;
 use Latte\Compiler\NodeHelpers;
 use Latte\Compiler\Nodes;
 use Latte\Compiler\Nodes\AreaNode;
-use Latte\Compiler\Nodes\AuxiliaryNode;
 use Latte\Compiler\Nodes\FragmentNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
@@ -22,45 +19,42 @@ use Latte\ContentType;
 
 
 /**
- * HTML element node.
+ * HTML/XML element with attributes, content, and n:attribute support.
  */
 class ElementNode extends AreaNode
 {
-	public ?Nodes\Php\ExpressionNode $variableName = null;
-	public ?FragmentNode $attributes = null;
+	public FragmentNode $attributes;
 	public bool $selfClosing = false;
 	public ?AreaNode $content = null;
 
 	/** @var Tag[] */
 	public array $nAttributes = [];
-
-	/** n:tag & n:tag- support */
-	public AreaNode $tagNode;
-	public bool $captureTagName = false;
+	public ?AreaNode $dynamicTag = null;
 	public bool $breakable = false;
-	private ?string $endTagVar;
 
 
 	public function __construct(
-		public /*readonly*/ string $name,
+		public readonly string $name,
 		public ?Position $position = null,
-		public /*readonly*/ ?self $parent = null,
-		public ?\stdClass $data = null,
+		public readonly ?self $parent = null,
 		public string $contentType = ContentType::Html,
 	) {
-		$this->data ??= new \stdClass;
-		$this->tagNode = new AuxiliaryNode(\Closure::fromCallable([$this, 'printStartTag']));
+		$this->attributes = new FragmentNode;
 	}
 
 
 	public function getAttribute(string $name): string|Node|bool|null
 	{
-		foreach ($this->attributes?->children as $child) {
+		foreach ($this->attributes->children as $child) {
 			if ($child instanceof AttributeNode
 				&& $child->name instanceof Nodes\TextNode
-				&& strcasecmp($name, $child->name->content) === 0
+				&& $this->matchesIdentifier($name, $child->name->content)
 			) {
 				return NodeHelpers::toText($child->value) ?? $child->value ?? true;
+			} elseif ($child instanceof ExpressionAttributeNode
+				&& $this->matchesIdentifier($name, $child->name)
+			) {
+				return true;
 			}
 		}
 
@@ -69,10 +63,16 @@ class ElementNode extends AreaNode
 
 
 	public function is(string $name): bool
+	{
+		return $this->matchesIdentifier($this->name, $name);
+	}
+
+
+	private function matchesIdentifier(string $a, string $b): bool
 	{
 		return $this->contentType === ContentType::Html
-			? strcasecmp($this->name, $name) === 0
-			: $this->name === $name;
+			? strcasecmp($a, $b) === 0
+			: $a === $b;
 	}
 
 
@@ -85,66 +85,36 @@ class ElementNode extends AreaNode
 
 	public function print(PrintContext $context): string
 	{
-		$res = $this->endTagVar = null;
-		if ($this->captureTagName || $this->variableName) {
-			$endTag = $this->endTagVar = '$ʟ_tag[' . $context->generateId() . ']';
-			$res = "$this->endTagVar = '';";
-		} else {
-			$endTag = var_export('</' . $this->name . '>', true);
-		}
-
-		$res .= $this->tagNode->print($context); // calls $this->printStartTag()
+		$res = $this->dynamicTag
+			? $this->dynamicTag->print($context)
+			: (new TagNode($this))->print($context, captureEnd: false);
+
+		if ($innerContent = $this->content) {
+			if ($this->dynamicTag) {
+				$endTag = '$ʟ_tags[' . ($context->generateId()) . ']';
+				$res = "\$ʟ_tag = ''; $res $endTag = \$ʟ_tag;";
+			} else {
+				$endTag = var_export('</' . $this->name . '>', return: true);
+			}
 
-		if ($this->content) {
 			$context->beginEscape()->enterHtmlText($this);
-			$content = $this->content->print($context);
+			$content = $innerContent->print($context);
 			$context->restoreEscape();
 			$res .= $this->breakable
 				? 'try { ' . $content . ' } finally { echo ' . $endTag . '; } '
-				: $content . 'echo ' . $endTag . ';';
+				: $content . ' echo ' . $endTag . ';';
 		}
 
 		return $res;
 	}
 
 
-	private function printStartTag(PrintContext $context): string
-	{
-		$context->beginEscape()->enterHtmlTag($this->name);
-		$res = "echo '<';";
-
-		if ($this->endTagVar) {
-			$expr = $this->variableName
-				? 'LR\Filters::safeTag('
-					. $this->variableName->print($context)
-					. ($this->contentType === ContentType::Xml ? ', true' : '')
-					. ')'
-				: var_export($this->name, true);
-			$res .= "echo \$ʟ_tmp = $expr /* line {$this->position->line} */;"
-				. "{$this->endTagVar} = '</' . \$ʟ_tmp . '>' . {$this->endTagVar};";
-		} else {
-			$res .= 'echo ' . var_export($this->name, true) . ';';
-		}
-
-		foreach ($this->attributes?->children ?? [] as $attr) {
-			$res .= $attr->print($context);
-		}
-
-		$res .= "echo '" . ($this->selfClosing ? '/>' : '>') . "';";
-		$context->restoreEscape();
-		return $res;
-	}
-
-
 	public function &getIterator(): \Generator
 	{
-		yield $this->tagNode;
-		if ($this->variableName) {
-			yield $this->variableName;
-		}
-		if ($this->attributes) {
-			yield $this->attributes;
+		if ($this->dynamicTag) {
+			yield $this->dynamicTag;
 		}
+		yield $this->attributes;
 		if ($this->content) {
 			yield $this->content;
 		}

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

@@ -0,0 +1,60 @@
+<?php declare(strict_types=1);
+
+/**
+ * This file is part of the Latte (https://latte.nette.org)
+ * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Latte\Compiler\Nodes\Html;
+
+use Latte\Compiler\Nodes\AreaNode;
+use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\ModifierNode;
+use Latte\Compiler\Position;
+use Latte\Compiler\PrintContext;
+use Latte\ContentType;
+use Latte\Feature;
+use Latte\Runtime as LR;
+
+
+/**
+ * Dynamic HTML attribute generated from expression.
+ */
+class ExpressionAttributeNode extends AreaNode
+{
+	public function __construct(
+		public string $name,
+		public ExpressionNode $value,
+		public ModifierNode $modifier,
+		public ?string $indentation = null,
+		public ?Position $position = null,
+	) {
+	}
+
+
+	public function print(PrintContext $context): string
+	{
+		if ($context->getEscaper()->getContentType() === ContentType::Html) {
+			$type = $this->modifier->removeFilter('toggle') ? 'bool' : LR\HtmlHelpers::classifyAttributeType($this->name);
+			$method = 'LR\HtmlHelpers::format' . ucfirst($type) . 'Attribute';
+		} else {
+			$method = 'LR\XmlHelpers::formatAttribute';
+		}
+		return $context->format(
+			'echo %raw(%dump, %modify(%node), %dump?) %line;',
+			$method,
+			$this->indentation . $this->name,
+			$this->modifier,
+			$this->value,
+			(!$this->modifier->removeFilter('accept') && $context->hasFeature(Feature::MigrationWarnings)) ?: null,
+			$this->value->position,
+		);
+	}
+
+
+	public function &getIterator(): \Generator
+	{
+		yield $this->value;
+		yield $this->modifier;
+	}
+}

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

@@ -0,0 +1,70 @@
+<?php declare(strict_types=1);
+
+/**
+ * This file is part of the Latte (https://latte.nette.org)
+ * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Latte\Compiler\Nodes\Html;
+
+use Latte\Compiler\Nodes;
+use Latte\Compiler\Nodes\AreaNode;
+use Latte\Compiler\PrintContext;
+use Latte\ContentType;
+
+
+/**
+ * Helper node for rendering HTML tags with n:tag and n:tag* support.
+ * Writes end tag to $ʟ_tag.
+ */
+class TagNode extends AreaNode
+{
+	public function __construct(
+		public readonly ElementNode $element,
+		public ?Nodes\Php\ExpressionNode $name = null,
+	) {
+	}
+
+
+	public function print(PrintContext $context, ?bool $captureEnd = null): string
+	{
+		$captureEnd ??= (bool) $this->element->content;
+		$context->beginEscape()->enterHtmlTag($this->element->name);
+
+		$res = $this->name
+			? $context->format(
+				<<<'XX'
+					$ʟ_tmp = LR\%raw::validateTagChange(%node, %dump);
+					%raw
+					echo '<', $ʟ_tmp %line;
+					%node
+					echo %dump;
+					XX,
+				$this->element->contentType === ContentType::Html ? 'HtmlHelpers' : 'XmlHelpers',
+				$this->name,
+				$this->element->name,
+				$captureEnd ? '$ʟ_tag = \'</\' . $ʟ_tmp . \'>\' . $ʟ_tag;' : '',
+				$this->element->position,
+				$this->element->attributes,
+				$this->element->selfClosing ? '/>' : '>',
+			)
+			: $context->format(
+				'%raw echo %dump; %node echo %dump;',
+				$captureEnd ? '$ʟ_tag = ' . $context->encodeString("</{$this->element->name}>") . ' . $ʟ_tag;' : '',
+				'<' . $this->element->name,
+				$this->element->attributes,
+				$this->element->selfClosing ? '/>' : '>',
+			);
+
+		$context->restoreEscape();
+		return $res;
+	}
+
+
+	public function &getIterator(): \Generator
+	{
+		if ($this->name) {
+			yield $this->name;
+		}
+	}
+}

package/vendor/latte/latte/src/Latte/Compiler/Nodes/NopNode.php

@@ -1,17 +1,18 @@
-<?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;
 
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Placeholder for removed or filtered-out content.
+ */
 class NopNode extends AreaNode
 {
 	public function print(PrintContext $context): string

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/ArgumentNode.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;
 
 use Latte\Compiler\Node;
@@ -14,6 +12,9 @@ use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Function/method argument with optional name, reference, and unpacking.
+ */
 class ArgumentNode extends Node
 {
 	public function __construct(

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/ArrayItemNode.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;
 
 use Latte\Compiler\Node;
@@ -14,6 +12,9 @@ use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Array item with optional key, reference, and spread operator.
+ */
 class ArrayItemNode extends Node
 {
 	public function __construct(
@@ -60,15 +61,3 @@ class ArrayItemNode extends Node
 		yield $this->value;
 	}
 }
-
-
-class_alias(ArrayItemNode::class, Expression\ArrayItemNode::class);
-
-namespace Latte\Compiler\Nodes\Php\Expression;
-
-if (false) {
-	/** @deprecated use Latte\Compiler\Nodes\Php\ArrayItemNode */
-	class ArrayItemNode
-	{
-	}
-}

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/ClosureUseNode.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;
 
 use Latte\Compiler\Node;
@@ -15,6 +13,9 @@ use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Closure use variable ($var or &$var).
+ */
 class ClosureUseNode extends Node
 {
 	public function __construct(

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/ComplexTypeNode.php

@@ -1,17 +1,18 @@
-<?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;
 
 use Latte\Compiler\Node;
 
 
+/**
+ * Base for complex type declarations (nullable, union, intersection).
+ */
 abstract class ComplexTypeNode extends Node
 {
 }

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ArrayAccessNode.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;
 
 
+/**
+ * Array or string element access ($arr[$key]).
+ */
 class ArrayAccessNode extends ExpressionNode
 {
 	public function __construct(

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ArrayNode.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\ArgumentNode;
@@ -14,8 +12,12 @@ use Latte\Compiler\Nodes\Php\ArrayItemNode;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
+use Latte\Helpers;
 
 
+/**
+ * Array literal.
+ */
 class ArrayNode extends ExpressionNode
 {
 	public function __construct(
@@ -36,25 +38,6 @@ class ArrayNode extends ExpressionNode
 
 	public function print(PrintContext $context): string
 	{
-		// Converts [...$var] -> $var, because PHP 8.0 doesn't support unpacking with string keys
-		if (PHP_VERSION_ID < 80100) {
-			$res = '[';
-			$merge = false;
-			foreach ($this->items as $item) {
-				if ($item === null) {
-					$res .= ', ';
-				} elseif ($item->unpack) {
-					$res .= '], ' . $item->value->print($context) . ', [';
-					$merge = true;
-				} else {
-					$res .= $item->print($context) . ', ';
-				}
-			}
-
-			$res = str_ends_with($res, ', ') ? substr($res, 0, -2) : $res;
-			return $merge ? "array_merge($res])" : $res . ']';
-		}
-
 		return '[' . $context->implode($this->items) . ']';
 	}
 
@@ -64,5 +47,6 @@ class ArrayNode extends ExpressionNode
 		foreach ($this->items as &$item) {
 			yield $item;
 		}
+		Helpers::removeNulls($this->items);
 	}
 }

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

@@ -1,23 +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\CompileException;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\Php\ListNode;
+use Latte\Compiler\Nodes\Php\OperatorNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
-class AssignNode extends ExpressionNode
+/**
+ * Assignment ($var = expr or $var = &$ref).
+ */
+class AssignNode extends ExpressionNode implements OperatorNode
 {
+	public const Precedence = [90, self::AssocRight];
+
+
 	public function __construct(
 		public ExpressionNode|ListNode $var,
 		public ExpressionNode $expr,
@@ -31,7 +36,15 @@ class AssignNode extends ExpressionNode
 	public function print(PrintContext $context): string
 	{
 		$this->validate();
-		return $context->infixOp($this, $this->var, $this->byRef ? ' = &' : ' = ', $this->expr);
+		return $context->parenthesize($this, $this->var, self::AssocLeft)
+			. ($this->byRef ? ' = &' : ' = ')
+			. $context->parenthesize($this, $this->expr, self::AssocRight);
+	}
+
+
+	public function getOperatorPrecedence(): array
+	{
+		return self::Precedence;
 	}
 
 

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/AssignOpNode.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\CompileException;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\OperatorNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
+use function in_array;
 
 
-class AssignOpNode extends ExpressionNode
+/**
+ * Compound assignment ($var += expr, $var .= expr, etc.).
+ */
+class AssignOpNode extends ExpressionNode implements OperatorNode
 {
 	private const Ops = ['+', '-', '*', '/', '.', '%', '&', '|', '^', '<<', '>>', '**', '??'];
 
 
 	public function __construct(
 		public ExpressionNode $var,
-		public /*readonly*/ string $operator,
+		public string $operator,
 		public ExpressionNode $expr,
 		public ?Position $position = null,
 	) {
-		if (!in_array($this->operator, self::Ops, true)) {
+		if (!in_array($this->operator, self::Ops, strict: true)) {
 			throw new \InvalidArgumentException("Unexpected operator '$this->operator'");
 		}
 		$this->validate();
@@ -36,7 +39,15 @@ class AssignOpNode extends ExpressionNode
 	public function print(PrintContext $context): string
 	{
 		$this->validate();
-		return $context->infixOp($this, $this->var, ' ' . $this->operator . '= ', $this->expr);
+		return $context->parenthesize($this, $this->var, self::AssocLeft)
+			. ' ' . $this->operator . '= '
+			. $context->parenthesize($this, $this->expr, self::AssocRight);
+	}
+
+
+	public function getOperatorPrecedence(): array
+	{
+		return AssignNode::Precedence;
 	}
 
 

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/AuxiliaryNode.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\Node;
@@ -14,10 +12,13 @@ use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Code generator hidden from compiler passes. Pass child nodes for traversal.
+ */
 class AuxiliaryNode extends ExpressionNode
 {
 	public function __construct(
-		public /*readonly*/ \Closure $print,
+		public readonly \Closure $print,
 		/** @var (?Node)[] */
 		public array $nodes = [],
 	) {