@vituum/vite-plugin-latte 1.0.0-beta.1 → 1.1.0

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

@@ -9,8 +9,8 @@ declare(strict_types=1);
 
 namespace Latte\Compiler;
 
-use Latte;
 use Latte\CompileException;
+use Latte\Compiler\Nodes\AreaNode;
 use Latte\Compiler\Nodes\Html\ElementNode;
 
 
@@ -19,8 +19,6 @@ use Latte\Compiler\Nodes\Html\ElementNode;
  */
 final class Tag
 {
-	use Latte\Strict;
-
 	public const
 		PrefixInner = 'inner',
 		PrefixTag = 'tag',
@@ -41,26 +39,27 @@ final class Tag
 		public /*readonly*/ Position $position,
 		public /*readonly*/ bool $void = false,
 		public /*readonly*/ bool $closing = false,
-		public /*readonly*/ int $location = 0,
+		public /*readonly*/ bool $inHead = false,
+		public /*readonly*/ bool $inTag = false,
 		public /*readonly*/ ?ElementNode $htmlElement = null,
 		public ?self $parent = null,
 		public /*readonly*/ ?string $prefix = null,
-		public ?\stdClass $data = null,
+		public ?AreaNode $node = null,
+		public ?AreaNode $nAttributeNode = null,
 	) {
-		$this->data ??= new \stdClass;
 		$this->parser = new TagParser($tokens);
 	}
 
 
 	public function isInHead(): bool
 	{
-		return $this->location === TemplateParser::LocationHead && !$this->parent;
+		return $this->inHead && !$this->parent;
 	}
 
 
 	public function isInText(): bool
 	{
-		return $this->location <= TemplateParser::LocationText;
+		return !$this->inTag;
 	}
 
 
@@ -85,13 +84,13 @@ final class Tag
 
 
 	/**
-	 * @param  string[]  $names
+	 * @param  class-string[]  $classes
 	 */
-	public function closestTag(array $names, ?callable $condition = null): ?self
+	public function closestTag(array $classes, ?callable $condition = null): ?self
 	{
 		$tag = $this->parent;
 		while ($tag && (
-			!in_array($tag->name, $names, true)
+			(!in_array($tag->node ? $tag->node::class : null, $classes, true) && !in_array($tag->name, $classes, true))
 			|| ($condition && !$condition($tag))
 		)) {
 			$tag = $tag->parent;
@@ -109,9 +108,9 @@ final class Tag
 	}
 
 
-	public function replaceNAttribute(Node $node): void
+	public function replaceNAttribute(AreaNode $node): void
 	{
-		$index = array_search($this->data->node, $this->htmlElement->attributes->children, true);
-		$this->htmlElement->attributes->children[$index] = $node;
+		$index = array_search($this->nAttributeNode, $this->htmlElement->attributes->children, true);
+		$this->htmlElement->attributes->children[$index] = $this->nAttributeNode = $node;
 	}
 }

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

@@ -9,9 +9,7 @@ declare(strict_types=1);
 
 namespace Latte\Compiler;
 
-use Latte;
 use Latte\CompileException;
-use Latte\RegexpException;
 
 
 /**
@@ -19,8 +17,6 @@ use Latte\RegexpException;
  */
 final class TagLexer
 {
-	use Latte\Strict;
-
 	private const Keywords = [
 		'and' => Token::Php_LogicalAnd,
 		'array' => Token::Php_Array,
@@ -57,7 +53,7 @@ final class TagLexer
 	/** @return Token[] */
 	public function tokenize(string $input, ?Position $position = null): array
 	{
-		$position ??= new Position(1, 1, 0);
+		$position ??= new Position;
 		$this->tokens = $this->tokenizePartially($input, $position, 0);
 		if ($this->offset !== strlen($input)) {
 			$token = str_replace("\n", '\n', substr($input, $this->offset, 10));
@@ -185,7 +181,7 @@ final class TagLexer
 		matchRE:
 		preg_match_all($re, $this->input, $matches, PREG_SET_ORDER | PREG_UNMATCHED_AS_NULL, $this->offset);
 		if (preg_last_error()) {
-			throw new RegexpException;
+			throw new CompileException(preg_last_error_msg());
 		}
 
 		foreach ($matches as $m) {
@@ -330,7 +326,7 @@ final class TagLexer
 		matchRE:
 		preg_match_all($re, $this->input, $matches, PREG_SET_ORDER | PREG_UNMATCHED_AS_NULL, $this->offset);
 		if (preg_last_error()) {
-			throw new RegexpException;
+			throw new CompileException(preg_last_error_msg());
 		}
 
 		$buffer = '';

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

@@ -10,6 +10,7 @@ declare(strict_types=1);
 namespace Latte\Compiler;
 
 use Latte;
+use Latte\CompileException;
 use Latte\Compiler\Nodes\Php as Node;
 use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
@@ -23,17 +24,19 @@ use Latte\Compiler\Nodes\Php\Scalar;
  */
 final class TagParser extends TagParserData
 {
-	use Latte\Strict;
-
 	private const
 		SchemaExpression = 'e',
 		SchemaArguments = 'a',
-		SchemaFilters = 'm';
+		SchemaFilters = 'm',
+		SchemaForeach = 'f';
 
 	private const SymbolNone = -1;
 
 	public TokenStream /*readonly*/ $stream;
 	public string $text;
+
+	/** @var \SplObjectStorage<Expression\ArrayNode> */
+	protected \SplObjectStorage $shortArrays;
 	private int /*readonly*/ $offsetDelta;
 
 
@@ -116,6 +119,16 @@ final class TagParser extends TagParserData
 	}
 
 
+	/**
+	 * Parses variables used in foreach.
+	 * @internal
+	 */
+	public function parseForeach(): array
+	{
+		return $this->parse(self::SchemaForeach);
+	}
+
+
 	/**
 	 * Consumes optional token followed by whitespace. Suitable before parseUnquotedStringOrExpression().
 	 */
@@ -152,6 +165,7 @@ final class TagParser extends TagParserData
 		$stateStack = [$state];
 		$this->semStack = []; // Semantic value stack (contains values of tokens and semantic action results)
 		$stackPos = 0; // Current position in the stack(s)
+		$this->shortArrays = new \SplObjectStorage;
 
 		do {
 			if (self::ActionBase[$state] === 0) {
@@ -206,6 +220,7 @@ final class TagParser extends TagParserData
 
 			do {
 				if ($rule === 0) { // accept
+					$this->finalizeShortArrays();
 					return $this->semValue;
 
 				} elseif ($rule !== self::UnexpectedTokenRule) { // reduce
@@ -407,6 +422,40 @@ final class TagParser extends TagParserData
 	}
 
 
+	public function convertArrayToList(Expression\ArrayNode $array): Node\ListNode
+	{
+		$this->shortArrays->detach($array);
+		$items = [];
+		foreach ($array->items as $item) {
+			$value = $item->value;
+			if ($item->unpack) {
+				throw new CompileException('Spread operator is not supported in assignments.', $value->position);
+			}
+			$value = match (true) {
+				$value instanceof Expression\TemporaryNode => $value->value,
+				$value instanceof Expression\ArrayNode && $this->shortArrays->contains($value) => $this->convertArrayToList($value),
+				default => $value,
+			};
+			$items[] = $value
+				? new Node\ListItemNode($value, $item->key, $item->byRef, $item->position)
+				: null;
+		}
+		return new Node\ListNode($items, $array->position);
+	}
+
+
+	private function finalizeShortArrays(): void
+	{
+		foreach ($this->shortArrays as $node) {
+			foreach ($node->items as $item) {
+				if ($item->value instanceof Expression\TemporaryNode) {
+					throw new CompileException('Cannot use empty array elements or list() in arrays.', $item->position);
+				}
+			}
+		}
+	}
+
+
 	/** @param  Token[]  $tokens */
 	private function filterTokens(array $tokens): array
 	{