@vituum/vite-plugin-latte 1.0.0 → 1.2.0

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

@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 namespace Latte\Compiler;
 
-use Latte;
 use Latte\Compiler\Nodes\Html\ElementNode;
 use Latte\ContentType;
 use Latte\Runtime\Filters;
@@ -20,8 +19,6 @@ use Latte\Runtime\Filters;
  */
 final class Escaper
 {
-	use Latte\Strict;
-
 	public const
 		Text = 'text',
 		JavaScript = 'js',
@@ -33,21 +30,63 @@ final class Escaper
 		HtmlText = 'html',
 		HtmlComment = 'html/comment',
 		HtmlBogusTag = 'html/bogus',
-		HtmlCss = 'html/css',
-		HtmlJavaScript = 'html/js',
+		HtmlRawText = 'html/raw',
 		HtmlTag = 'html/tag',
 		HtmlAttribute = 'html/attr';
 
+	private const Convertors = [
+		self::Text => [
+			self::HtmlText => 'escapeHtmlText',
+			self::HtmlAttribute => 'escapeHtmlAttr',
+			self::HtmlAttribute . '/' . self::JavaScript => 'escapeHtmlAttr',
+			self::HtmlAttribute . '/' . self::Css => 'escapeHtmlAttr',
+			self::HtmlAttribute . '/' . self::Url => 'escapeHtmlAttr',
+			self::HtmlComment => 'escapeHtmlComment',
+			'xml' => 'escapeXml',
+			'xml/attr' => 'escapeXml',
+		],
+		self::JavaScript => [
+			self::HtmlText => 'escapeHtmlText',
+			self::HtmlAttribute => 'escapeHtmlAttr',
+			self::HtmlAttribute . '/' . self::JavaScript => 'escapeHtmlAttr',
+			self::HtmlRawText . '/' . self::JavaScript => 'convertJSToHtmlRawText',
+			self::HtmlComment => 'escapeHtmlComment',
+		],
+		self::Css => [
+			self::HtmlText => 'escapeHtmlText',
+			self::HtmlAttribute => 'escapeHtmlAttr',
+			self::HtmlAttribute . '/' . self::Css => 'escapeHtmlAttr',
+			self::HtmlRawText . '/' . self::Css => 'convertJSToHtmlRawText',
+			self::HtmlComment => 'escapeHtmlComment',
+		],
+		self::HtmlText => [
+			self::HtmlAttribute => 'convertHtmlToHtmlAttr',
+			self::HtmlAttribute . '/' . self::JavaScript => 'convertHtmlToHtmlAttr',
+			self::HtmlAttribute . '/' . self::Css => 'convertHtmlToHtmlAttr',
+			self::HtmlAttribute . '/' . self::Url => 'convertHtmlToHtmlAttr',
+			self::HtmlComment => 'escapeHtmlComment',
+			self::HtmlRawText . '/' . self::HtmlText => 'convertHtmlToHtmlRawText',
+		],
+		self::HtmlAttribute => [
+			self::HtmlText => 'convertHtmlToHtmlAttr',
+		],
+		self::HtmlAttribute . '/' . self::Url => [
+			self::HtmlText => 'convertHtmlToHtmlAttr',
+			self::HtmlAttribute => 'nop',
+		],
+	];
+
 	private string $state = '';
 	private string $tag = '';
-	private string $quote = '';
 	private string $subType = '';
 
 
 	public function __construct(
 		private string $contentType,
 	) {
-		$this->state = $this->contentType;
+		$this->state = in_array($contentType, [ContentType::Html, ContentType::Xml], true)
+			? self::HtmlText
+			: $contentType;
 	}
 
 
@@ -65,8 +104,7 @@ final class Escaper
 
 	public function export(): string
 	{
-		return ($this->state === self::HtmlAttribute && $this->quote === '' ? 'html/unquoted-attr' : $this->state)
-			. ($this->subType ? '/' . $this->subType : '');
+		return $this->state . ($this->subType ? '/' . $this->subType : '');
 	}
 
 
@@ -76,20 +114,29 @@ final class Escaper
 	}
 
 
-	public function enterHtmlText(?ElementNode $node): void
+	public function enterHtmlText(ElementNode $el): void
 	{
-		$this->state = self::HtmlText;
-		if ($this->contentType === ContentType::Html && $node) {
-			$name = strtolower($node->name);
-			if (
-				($name === 'script' || $name === 'style')
-				&& is_string($attr = $node->getAttribute('type') ?? 'css')
-				&& preg_match('#(java|j|ecma|live)script|module|json|css|plain#i', $attr)
-			) {
-				$this->state = $name === 'script'
-					? self::HtmlJavaScript
-					: self::HtmlCss;
+		if ($el->isRawText()) {
+			$this->state = self::HtmlRawText;
+			$this->subType = self::Text;
+			if ($el->is('script')) {
+				$type = $el->getAttribute('type');
+				if ($type === true || $type === null
+					|| is_string($type) && preg_match('#((application|text)/(((x-)?java|ecma|j|live)script|json)|application/.+\+json|text/plain|module|importmap|)$#Ai', $type)
+				) {
+					$this->subType = self::JavaScript;
+
+				} elseif (is_string($type) && preg_match('#text/((x-)?template|html)$#Ai', $type)) {
+					$this->subType = self::HtmlText;
+				}
+
+			} elseif ($el->is('style')) {
+				$this->subType = self::Css;
 			}
+
+		} else {
+			$this->state = self::HtmlText;
+			$this->subType = '';
 		}
 	}
 
@@ -101,10 +148,16 @@ final class Escaper
 	}
 
 
-	public function enterHtmlAttribute(?string $name = null, string $quote = ''): void
+	public function enterHtmlRaw(string $subType): void
+	{
+		$this->state = self::HtmlRawText;
+		$this->subType = $subType;
+	}
+
+
+	public function enterHtmlAttribute(?string $name = null): void
 	{
 		$this->state = self::HtmlAttribute;
-		$this->quote = $quote;
 		$this->subType = '';
 
 		if ($this->contentType === ContentType::Html && is_string($name)) {
@@ -122,12 +175,6 @@ final class Escaper
 	}
 
 
-	public function enterHtmlAttributeQuote(string $quote = '"'): void
-	{
-		$this->quote = $quote;
-	}
-
-
 	public function enterHtmlBogusTag(): void
 	{
 		$this->state = self::HtmlBogusTag;
@@ -142,27 +189,30 @@ final class Escaper
 
 	public function escape(string $str): string
 	{
-		[$lq, $rq] = $this->state === self::HtmlAttribute && !$this->quote ? ["'\"' . ", " . '\"'"] : ['', ''];
 		return match ($this->contentType) {
 			ContentType::Html => match ($this->state) {
 				self::HtmlText => 'LR\Filters::escapeHtmlText(' . $str . ')',
 				self::HtmlTag => 'LR\Filters::escapeHtmlTag(' . $str . ')',
 				self::HtmlAttribute => match ($this->subType) {
 					'',
-					self::Url => $lq . 'LR\Filters::escapeHtmlAttr(' . $str . ')' . $rq,
-					self::JavaScript => $lq . 'LR\Filters::escapeHtmlAttr(LR\Filters::escapeJs(' . $str . '))' . $rq,
-					self::Css => $lq . 'LR\Filters::escapeHtmlAttr(LR\Filters::escapeCss(' . $str . '))' . $rq,
+					self::Url => 'LR\Filters::escapeHtmlAttr(' . $str . ')',
+					self::JavaScript => 'LR\Filters::escapeHtmlAttr(LR\Filters::escapeJs(' . $str . '))',
+					self::Css => 'LR\Filters::escapeHtmlAttr(LR\Filters::escapeCss(' . $str . '))',
 				},
 				self::HtmlComment => 'LR\Filters::escapeHtmlComment(' . $str . ')',
 				self::HtmlBogusTag => 'LR\Filters::escapeHtml(' . $str . ')',
-				self::HtmlJavaScript => 'LR\Filters::escapeJs(' . $str . ')',
-				self::HtmlCss => 'LR\Filters::escapeCss(' . $str . ')',
+				self::HtmlRawText => match ($this->subType) {
+					self::Text => 'LR\Filters::convertJSToHtmlRawText(' . $str . ')', // sanitization, escaping is not possible
+					self::HtmlText => 'LR\Filters::escapeHtmlRawTextHtml(' . $str . ')',
+					self::JavaScript => 'LR\Filters::escapeJs(' . $str . ')',
+					self::Css => 'LR\Filters::escapeCss(' . $str . ')',
+				},
 				default => throw new \LogicException("Unknown context $this->contentType, $this->state."),
 			},
 			ContentType::Xml => match ($this->state) {
 				self::HtmlText,
 				self::HtmlBogusTag => 'LR\Filters::escapeXml(' . $str . ')',
-				self::HtmlAttribute => $lq . 'LR\Filters::escapeXml(' . $str . ')' . $rq,
+				self::HtmlAttribute => 'LR\Filters::escapeXml(' . $str . ')',
 				self::HtmlComment => 'LR\Filters::escapeHtmlComment(' . $str . ')',
 				self::HtmlTag => 'LR\Filters::escapeXmlTag(' . $str . ')',
 				default => throw new \LogicException("Unknown context $this->contentType, $this->state."),
@@ -176,6 +226,28 @@ final class Escaper
 	}
 
 
+	public function escapeMandatory(string $str): string
+	{
+		return match ($this->contentType) {
+			ContentType::Html => match ($this->state) {
+				self::HtmlAttribute => "LR\\Filters::escapeHtmlQuotes($str)",
+				self::HtmlRawText => match ($this->subType) {
+					self::HtmlText => 'LR\Filters::convertHtmlToHtmlRawText(' . $str . ')',
+					default => "LR\\Filters::convertJSToHtmlRawText($str)",
+				},
+				self::HtmlComment => 'LR\Filters::escapeHtmlComment(' . $str . ')',
+				default => $str,
+			},
+			ContentType::Xml => match ($this->state) {
+				self::HtmlAttribute => "LR\\Filters::escapeHtmlQuotes($str)",
+				self::HtmlComment => 'LR\Filters::escapeHtmlComment(' . $str . ')',
+				default => $str,
+			},
+			default => $str,
+		};
+	}
+
+
 	public function check(string $str): string
 	{
 		if ($this->state === self::HtmlAttribute && $this->subType === self::Url) {
@@ -187,58 +259,10 @@ final class Escaper
 
 	public static function getConvertor(string $source, string $dest): ?callable
 	{
-		$table = [
-			self::Text => [
-				'html' => 'escapeHtmlText',
-				'html/attr' => 'escapeHtmlAttr',
-				'html/attr/js' => 'escapeHtmlAttr',
-				'html/attr/css' => 'escapeHtmlAttr',
-				'html/attr/url' => 'escapeHtmlAttr',
-				'html/comment' => 'escapeHtmlComment',
-				'xml' => 'escapeXml',
-				'xml/attr' => 'escapeXml',
-			],
-			self::JavaScript => [
-				'html' => 'escapeHtmlText',
-				'html/attr' => 'escapeHtmlAttr',
-				'html/attr/js' => 'escapeHtmlAttr',
-				'html/js' => 'convertJSToHtmlRawText',
-				'html/comment' => 'escapeHtmlComment',
-			],
-			self::Css => [
-				'html' => 'escapeHtmlText',
-				'html/attr' => 'escapeHtmlAttr',
-				'html/attr/css' => 'escapeHtmlAttr',
-				'html/css' => 'convertJSToHtmlRawText',
-				'html/comment' => 'escapeHtmlComment',
-			],
-			'html' => [
-				'html/attr' => 'convertHtmlToHtmlAttr',
-				'html/attr/js' => 'convertHtmlToHtmlAttr',
-				'html/attr/css' => 'convertHtmlToHtmlAttr',
-				'html/attr/url' => 'convertHtmlToHtmlAttr',
-				'html/comment' => 'escapeHtmlComment',
-				'html/unquoted-attr' => 'convertHtmlToUnquotedAttr',
-			],
-			'html/attr' => [
-				'html' => 'convertHtmlToHtmlAttr',
-				'html/unquoted-attr' => 'convertHtmlAttrToUnquotedAttr',
-			],
-			'html/attr/url' => [
-				'html' => 'convertHtmlToHtmlAttr',
-				'html/attr' => 'nop',
-			],
-			'html/unquoted-attr' => [
-				'html' => 'convertHtmlToHtmlAttr',
-			],
-		];
-
-		if ($source === $dest) {
-			return [Filters::class, 'nop'];
-		}
-
-		return isset($table[$source][$dest])
-			? [Filters::class, $table[$source][$dest]]
-			: null;
+		return match (true) {
+			$source === $dest => [Filters::class, 'nop'],
+			isset(self::Convertors[$source][$dest]) => [Filters::class, self::Convertors[$source][$dest]],
+			default => null,
+		};
 	}
 }

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

@@ -17,6 +17,7 @@ use Latte\Compiler\Nodes\Php\NameNode;
 use Latte\Compiler\Nodes\Php\Scalar;
 
 
+/** @deprecated */
 final class ExpressionBuilder
 {
 	public function __construct(
@@ -69,7 +70,7 @@ final class ExpressionBuilder
 		$name = is_string($name)
 			? new IdentifierNode($name)
 			: ($name instanceof self ? $name->expr : $name);
-		return new self(new Expression\StaticCallNode($this->expr, $name, self::arrayToArgs($args)));
+		return new self(new Expression\StaticMethodCallNode($this->expr, $name, self::arrayToArgs($args)));
 	}
 
 

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

@@ -4,16 +4,12 @@ declare(strict_types=1);
 
 namespace Latte\Compiler;
 
-use Latte;
-
 
 /**
  * @implements \IteratorAggregate<Node>
  */
 abstract class Node implements \IteratorAggregate
 {
-	use Latte\Strict;
-
 	public ?Position $position = null;
 
 

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

@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 namespace Latte\Compiler;
 
-use Latte;
 use Latte\Compiler\Nodes\Php;
 use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
@@ -18,8 +17,6 @@ use Latte\Compiler\Nodes\Php\Scalar;
 
 final class NodeHelpers
 {
-	use Latte\Strict;
-
 	/** @return Node[] */
 	public static function find(Node $node, callable $filter): array
 	{
@@ -124,7 +121,6 @@ final class NodeHelpers
 
 		return match (true) {
 			$node instanceof Nodes\TextNode => $node->content,
-			$node instanceof Nodes\Html\QuotedValue => self::toText($node->value),
 			$node instanceof Nodes\NopNode => '',
 			default => null,
 		};

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

@@ -9,13 +9,9 @@ declare(strict_types=1);
 
 namespace Latte\Compiler;
 
-use Latte;
-
 
 final class NodeTraverser
 {
-	use Latte\Strict;
-
 	public const DontTraverseChildren = 1;
 	public const StopTraversal = 2;
 

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

@@ -9,25 +9,33 @@ declare(strict_types=1);
 
 namespace Latte\Compiler\Nodes;
 
+use Latte\Compiler\Node;
 use Latte\Compiler\PrintContext;
 
 
 class AuxiliaryNode extends AreaNode
 {
 	public function __construct(
-		public /*readonly*/ \Closure $callable,
+		public /*readonly*/ \Closure $print,
+		/** @var (?Node)[] */
+		public array $nodes = [],
 	) {
+		(function (?Node ...$nodes) {})(...$nodes);
 	}
 
 
 	public function print(PrintContext $context): string
 	{
-		return ($this->callable)($context);
+		return ($this->print)($context, ...$this->nodes);
 	}
 
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		foreach ($this->nodes as &$node) {
+			if ($node) {
+				yield $node;
+			}
+		}
 	}
 }

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

@@ -39,6 +39,16 @@ final class FragmentNode extends AreaNode
 	}
 
 
+	public function simplify(bool $allowsNull = true): ?AreaNode
+	{
+		return match (true) {
+			!$this->children => $allowsNull ? null : $this,
+			count($this->children) === 1 => $this->children[0],
+			default => $this,
+		};
+	}
+
+
 	public function print(PrintContext $context): string
 	{
 		$res = '';

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

@@ -11,6 +11,8 @@ namespace Latte\Compiler\Nodes\Html;
 
 use Latte\Compiler\NodeHelpers;
 use Latte\Compiler\Nodes\AreaNode;
+use Latte\Compiler\Nodes\FragmentNode;
+use Latte\Compiler\Nodes\TextNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
@@ -20,6 +22,7 @@ class AttributeNode extends AreaNode
 	public function __construct(
 		public AreaNode $name,
 		public ?AreaNode $value = null,
+		public ?string $quote = null,
 		public ?Position $position = null,
 	) {
 	}
@@ -28,12 +31,27 @@ class AttributeNode extends AreaNode
 	public function print(PrintContext $context): string
 	{
 		$res = $this->name->print($context);
-		if ($this->value) {
-			$context->beginEscape()->enterHtmlAttribute(NodeHelpers::toText($this->name));
-			$res .= "echo '=';";
+		if (!$this->value) {
+			return $res;
+		}
+
+		$res .= "echo '=';";
+		$quote = $this->quote ?? ($this->value instanceof TextNode ? null : '"');
+		$res .= $quote ? 'echo ' . var_export($quote, true) . ';' : '';
+
+		$escaper = $context->beginEscape();
+		$escaper->enterHtmlAttribute(NodeHelpers::toText($this->name));
+		if ($this->value instanceof FragmentNode && $escaper->export() === 'html/attr/url') {
+			foreach ($this->value->children as $child) {
+				$res .= $child->print($context);
+				$escaper->enterHtmlAttribute(null);
+			}
+		} else {
 			$res .= $this->value->print($context);
-			$context->restoreEscape();
 		}
+
+		$context->restoreEscape();
+		$res .= $quote ? 'echo ' . var_export($quote, true) . ';' : '';
 		return $res;
 	}
 

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

@@ -18,6 +18,7 @@ use Latte\Compiler\Nodes\FragmentNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
+use Latte\ContentType;
 
 
 /**
@@ -25,7 +26,7 @@ use Latte\Compiler\Tag;
  */
 class ElementNode extends AreaNode
 {
-	public ?Node $customName = null;
+	public ?Nodes\Php\ExpressionNode $variableName = null;
 	public ?FragmentNode $attributes = null;
 	public bool $selfClosing = false;
 	public ?AreaNode $content = null;
@@ -36,6 +37,7 @@ class ElementNode extends AreaNode
 	/** n:tag & n:tag- support */
 	public AreaNode $tagNode;
 	public bool $captureTagName = false;
+	public bool $breakable = false;
 	private ?string $endTagVar;
 
 
@@ -44,6 +46,7 @@ class ElementNode extends AreaNode
 		public ?Position $position = null,
 		public /*readonly*/ ?self $parent = null,
 		public ?\stdClass $data = null,
+		public string $contentType = ContentType::Html,
 	) {
 		$this->data ??= new \stdClass;
 		$this->tagNode = new AuxiliaryNode(\Closure::fromCallable([$this, 'printStartTag']));
@@ -65,10 +68,25 @@ class ElementNode extends AreaNode
 	}
 
 
+	public function is(string $name): bool
+	{
+		return $this->contentType === ContentType::Html
+			? strcasecmp($this->name, $name) === 0
+			: $this->name === $name;
+	}
+
+
+	public function isRawText(): bool
+	{
+		return $this->contentType === ContentType::Html
+			&& ($this->is('script') || $this->is('style'));
+	}
+
+
 	public function print(PrintContext $context): string
 	{
 		$res = $this->endTagVar = null;
-		if ($this->captureTagName || $this->customName) {
+		if ($this->captureTagName || $this->variableName) {
 			$endTag = $this->endTagVar = '$ʟ_tag[' . $context->generateId() . ']';
 			$res = "$this->endTagVar = '';";
 		} else {
@@ -79,9 +97,11 @@ class ElementNode extends AreaNode
 
 		if ($this->content) {
 			$context->beginEscape()->enterHtmlText($this);
-			$res .= $this->content->print($context);
+			$content = $this->content->print($context);
 			$context->restoreEscape();
-			$res .= 'echo ' . $endTag . ';';
+			$res .= $this->breakable
+				? 'try { ' . $content . ' } finally { echo ' . $endTag . '; } '
+				: $content . 'echo ' . $endTag . ';';
 		}
 
 		return $res;
@@ -93,14 +113,17 @@ class ElementNode extends AreaNode
 		$context->beginEscape()->enterHtmlTag($this->name);
 		$res = "echo '<';";
 
-		$namePhp = var_export($this->name, true);
 		if ($this->endTagVar) {
-			$res .= 'echo $ʟ_tmp = (' . ($this->customName ? $this->customName->print($context) : $namePhp) . ');';
-			$res .= $this->endTagVar . ' = '
-				. "'</' . \$ʟ_tmp . '>'"
-				. ' . ' . $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 ' . $namePhp . ';';
+			$res .= 'echo ' . var_export($this->name, true) . ';';
 		}
 
 		foreach ($this->attributes?->children ?? [] as $attr) {
@@ -116,8 +139,8 @@ class ElementNode extends AreaNode
 	public function &getIterator(): \Generator
 	{
 		yield $this->tagNode;
-		if ($this->customName) {
-			yield $this->customName;
+		if ($this->variableName) {
+			yield $this->variableName;
 		}
 		if ($this->attributes) {
 			yield $this->attributes;

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

@@ -35,6 +35,12 @@ class ArgumentNode extends Node
 	}
 
 
+	public function toArrayItem(): ArrayItemNode
+	{
+		return new ArrayItemNode($this->value, $this->name, $this->byRef, $this->unpack, $this->position);
+	}
+
+
 	public function &getIterator(): \Generator
 	{
 		if ($this->name) {

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

@@ -40,6 +40,18 @@ class ArrayItemNode extends Node
 	}
 
 
+	public function toArgument(): ArgumentNode
+	{
+		$key = match (true) {
+			$this->key instanceof Scalar\StringNode => new IdentifierNode($this->key->value),
+			$this->key instanceof IdentifierNode => $this->key,
+			$this->key === null => null,
+			default => throw new \InvalidArgumentException('The expression used in the key cannot be converted to an argument.'),
+		};
+		return new ArgumentNode($this->value, $this->byRef, $this->unpack, $key, $this->position);
+	}
+
+
 	public function &getIterator(): \Generator
 	{
 		if ($this->key) {

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

@@ -12,8 +12,6 @@ namespace Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\Nodes\Php\ArgumentNode;
 use Latte\Compiler\Nodes\Php\ArrayItemNode;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
-use Latte\Compiler\Nodes\Php\IdentifierNode;
-use Latte\Compiler\Nodes\Php\Scalar;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
@@ -21,41 +19,18 @@ use Latte\Compiler\PrintContext;
 class ArrayNode extends ExpressionNode
 {
 	public function __construct(
-		/** @var array<ArrayItemNode|null> */
+		/** @var array<ArrayItemNode> */
 		public array $items = [],
 		public ?Position $position = null,
 	) {
-		(function (?ArrayItemNode ...$args) {})(...$items);
-	}
-
-
-	/** @param  ArgumentNode[]  $args */
-	public static function fromArguments(array $args): self
-	{
-		$node = new self;
-		foreach ($args as $arg) {
-			$node->items[] = new ArrayItemNode($arg->value, $arg->name, $arg->byRef, $arg->unpack, $arg->position);
-		}
-
-		return $node;
+		(function (ArrayItemNode ...$args) {})(...$items);
 	}
 
 
 	/** @return ArgumentNode[] */
 	public function toArguments(): array
 	{
-		$args = [];
-		foreach ($this->items as $item) {
-			$key = match (true) {
-				$item->key instanceof Scalar\StringNode => new IdentifierNode($item->key->value),
-				$item->key instanceof IdentifierNode => $item->key,
-				$item->key === null => null,
-				default => throw new \InvalidArgumentException('The expression used in the key cannot be converted to an argument.'),
-			};
-			$args[] = new ArgumentNode($item->value, $item->byRef, $item->unpack, $key, $item->position);
-		}
-
-		return $args;
+		return array_map(fn(ArrayItemNode $item) => $item->toArgument(), $this->items);
 	}
 
 
@@ -87,9 +62,7 @@ class ArrayNode extends ExpressionNode
 	public function &getIterator(): \Generator
 	{
 		foreach ($this->items as &$item) {
-			if ($item) {
-				yield $item;
-			}
+			yield $item;
 		}
 	}
 }