@vituum/vite-plugin-latte 1.1.0 → 1.2.0

package/latte/PlaceholderFunction.php

@@ -5,7 +5,7 @@ namespace App\Latte;
 class PlaceholderFunction {
 
     public static function execute($width, $height): string {
-        $colors = ["333", "444", "666", "222", "777", "888", "111"];
-        return 'https://via.placeholder.com/' . $width . 'x' . $height . '/' . $colors[array_rand($colors)];
+        $colors = ["333333", "444444", "666666", "222222", "777777", "888888", "111111"];
+        return 'https://placehold.co/' . $width . 'x' . $height . '/' . $colors[array_rand($colors)] . '/' . 'webp';
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vituum/vite-plugin-latte",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "main": "index.js",
   "types": "types/index.d.ts",

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitda1ce49ef3085539a79eddbb995629f3::getLoader();
+return ComposerAutoloaderInit19cfb30b66a778b432af39bbd1e78bca::getLoader();

package/vendor/composer/autoload_classmap.php

@@ -108,6 +108,7 @@ return array(
     'Latte\\Compiler\\TokenStream' => $vendorDir . '/latte/latte/src/Latte/Compiler/TokenStream.php',
     'Latte\\ContentType' => $vendorDir . '/latte/latte/src/Latte/ContentType.php',
     'Latte\\Engine' => $vendorDir . '/latte/latte/src/Latte/Engine.php',
+    'Latte\\Essential\\AuxiliaryIterator' => $vendorDir . '/latte/latte/src/Latte/Essential/AuxiliaryIterator.php',
     'Latte\\Essential\\Blueprint' => $vendorDir . '/latte/latte/src/Latte/Essential/Blueprint.php',
     'Latte\\Essential\\CachingIterator' => $vendorDir . '/latte/latte/src/Latte/Essential/CachingIterator.php',
     'Latte\\Essential\\CoreExtension' => $vendorDir . '/latte/latte/src/Latte/Essential/CoreExtension.php',
@@ -169,6 +170,7 @@ return array(
     'Latte\\Runtime\\FilterExecutor' => $vendorDir . '/latte/latte/src/Latte/Runtime/FilterExecutor.php',
     'Latte\\Runtime\\FilterInfo' => $vendorDir . '/latte/latte/src/Latte/Runtime/FilterInfo.php',
     'Latte\\Runtime\\Filters' => $vendorDir . '/latte/latte/src/Latte/Runtime/Filters.php',
+    'Latte\\Runtime\\FunctionExecutor' => $vendorDir . '/latte/latte/src/Latte/Runtime/FunctionExecutor.php',
     'Latte\\Runtime\\Html' => $vendorDir . '/latte/latte/src/Latte/Runtime/Html.php',
     'Latte\\Runtime\\HtmlStringable' => $vendorDir . '/latte/latte/src/Latte/Runtime/HtmlStringable.php',
     'Latte\\Runtime\\Template' => $vendorDir . '/latte/latte/src/Latte/Runtime/Template.php',

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitda1ce49ef3085539a79eddbb995629f3
+class ComposerAutoloaderInit19cfb30b66a778b432af39bbd1e78bca
 {
     private static $loader;
 
@@ -24,12 +24,12 @@ class ComposerAutoloaderInitda1ce49ef3085539a79eddbb995629f3
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitda1ce49ef3085539a79eddbb995629f3', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit19cfb30b66a778b432af39bbd1e78bca', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitda1ce49ef3085539a79eddbb995629f3', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit19cfb30b66a778b432af39bbd1e78bca', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitda1ce49ef3085539a79eddbb995629f3::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit19cfb30b66a778b432af39bbd1e78bca::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitda1ce49ef3085539a79eddbb995629f3
+class ComposerStaticInit19cfb30b66a778b432af39bbd1e78bca
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -109,6 +109,7 @@ class ComposerStaticInitda1ce49ef3085539a79eddbb995629f3
         'Latte\\Compiler\\TokenStream' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/TokenStream.php',
         'Latte\\ContentType' => __DIR__ . '/..' . '/latte/latte/src/Latte/ContentType.php',
         'Latte\\Engine' => __DIR__ . '/..' . '/latte/latte/src/Latte/Engine.php',
+        'Latte\\Essential\\AuxiliaryIterator' => __DIR__ . '/..' . '/latte/latte/src/Latte/Essential/AuxiliaryIterator.php',
         'Latte\\Essential\\Blueprint' => __DIR__ . '/..' . '/latte/latte/src/Latte/Essential/Blueprint.php',
         'Latte\\Essential\\CachingIterator' => __DIR__ . '/..' . '/latte/latte/src/Latte/Essential/CachingIterator.php',
         'Latte\\Essential\\CoreExtension' => __DIR__ . '/..' . '/latte/latte/src/Latte/Essential/CoreExtension.php',
@@ -170,6 +171,7 @@ class ComposerStaticInitda1ce49ef3085539a79eddbb995629f3
         'Latte\\Runtime\\FilterExecutor' => __DIR__ . '/..' . '/latte/latte/src/Latte/Runtime/FilterExecutor.php',
         'Latte\\Runtime\\FilterInfo' => __DIR__ . '/..' . '/latte/latte/src/Latte/Runtime/FilterInfo.php',
         'Latte\\Runtime\\Filters' => __DIR__ . '/..' . '/latte/latte/src/Latte/Runtime/Filters.php',
+        'Latte\\Runtime\\FunctionExecutor' => __DIR__ . '/..' . '/latte/latte/src/Latte/Runtime/FunctionExecutor.php',
         'Latte\\Runtime\\Html' => __DIR__ . '/..' . '/latte/latte/src/Latte/Runtime/Html.php',
         'Latte\\Runtime\\HtmlStringable' => __DIR__ . '/..' . '/latte/latte/src/Latte/Runtime/HtmlStringable.php',
         'Latte\\Runtime\\Template' => __DIR__ . '/..' . '/latte/latte/src/Latte/Runtime/Template.php',
@@ -192,7 +194,7 @@ class ComposerStaticInitda1ce49ef3085539a79eddbb995629f3
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitda1ce49ef3085539a79eddbb995629f3::$classMap;
+            $loader->classMap = ComposerStaticInit19cfb30b66a778b432af39bbd1e78bca::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.json

@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "latte/latte",
-            "version": "v3.0.12",
-            "version_normalized": "3.0.12.0",
+            "version": "v3.0.16",
+            "version_normalized": "3.0.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/latte.git",
-                "reference": "af6fc60e7a28cbc1717b8185ef04d36fd69f8711"
+                "reference": "0984953d961123075e95a9fa33ec4c4f4de266d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/latte/zipball/af6fc60e7a28cbc1717b8185ef04d36fd69f8711",
-                "reference": "af6fc60e7a28cbc1717b8185ef04d36fd69f8711",
+                "url": "https://api.github.com/repos/nette/latte/zipball/0984953d961123075e95a9fa33ec4c4f4de266d2",
+                "reference": "0984953d961123075e95a9fa33ec4c4f4de266d2",
                 "shasum": ""
             },
             "require": {
@@ -38,7 +38,7 @@
                 "nette/php-generator": "to use tag {templatePrint}",
                 "nette/utils": "to use filter |webalize"
             },
-            "time": "2023-11-13T11:31:09+00:00",
+            "time": "2024-05-14T09:54:10+00:00",
             "bin": [
                 "bin/latte-lint"
             ],
@@ -84,7 +84,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/latte/issues",
-                "source": "https://github.com/nette/latte/tree/v3.0.12"
+                "source": "https://github.com/nette/latte/tree/v3.0.16"
             },
             "install-path": "../latte/latte"
         }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '202e2f59016da40ea7a1d08e72c8efcebaf9d61c',
+        'reference' => '403b80671511fbd5ac645fa46031fe26ae02ff09',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,16 +13,16 @@
         '__root__' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '202e2f59016da40ea7a1d08e72c8efcebaf9d61c',
+            'reference' => '403b80671511fbd5ac645fa46031fe26ae02ff09',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'latte/latte' => array(
-            'pretty_version' => 'v3.0.12',
-            'version' => '3.0.12.0',
-            'reference' => 'af6fc60e7a28cbc1717b8185ef04d36fd69f8711',
+            'pretty_version' => 'v3.0.16',
+            'version' => '3.0.16.0',
+            'reference' => '0984953d961123075e95a9fa33ec4c4f4de266d2',
             'type' => 'library',
             'install_path' => __DIR__ . '/../latte/latte',
             'aliases' => array(),

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

@@ -84,7 +84,9 @@ final class Escaper
 	public function __construct(
 		private string $contentType,
 	) {
-		$this->state = $this->contentType;
+		$this->state = in_array($contentType, [ContentType::Html, ContentType::Xml], true)
+			? self::HtmlText
+			: $contentType;
 	}
 
 
@@ -120,7 +122,7 @@ final class Escaper
 			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)|text/plain|module|importmap|)$#Ai', $type)
+					|| 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;
 
@@ -146,6 +148,13 @@ final class Escaper
 	}
 
 
+	public function enterHtmlRaw(string $subType): void
+	{
+		$this->state = self::HtmlRawText;
+		$this->subType = $subType;
+	}
+
+
 	public function enterHtmlAttribute(?string $name = null): void
 	{
 		$this->state = self::HtmlAttribute;

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

@@ -34,7 +34,7 @@ class FilterNode extends Node
 
 	public function printSimple(PrintContext $context, string $expr): string
 	{
-		return '($this->filters->' . $this->name . ')('
+		return '($this->filters->' . $context->objectProperty($this->name) . ')('
 			. $expr
 			. ($this->args ? ', ' . $context->implode($this->args) : '')
 			. ')';

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

@@ -51,12 +51,12 @@ class ModifierNode extends Node
 		$check = $this->check;
 		foreach ($this->filters as $filter) {
 			$name = $filter->name->name;
-			if (['nocheck' => 1, 'noCheck' => 1][$name] ?? null) {
+			if ($name === 'nocheck' || $name === 'noCheck') {
 				$check = false;
 			} elseif ($name === 'noescape') {
 				$escape = false;
 			} else {
-				if (['datastream' => 1, 'dataStream' => 1][$name] ?? null) {
+				if ($name === 'datastream' || $name === 'dataStream') {
 					$check = false;
 				}
 				$expr = $filter->printSimple($context, $expr);

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

@@ -20,31 +20,21 @@ class NameNode extends Node
 		KindNormal = 1,
 		KindFullyQualified = 2;
 
-	/** @var string[] */
-	public array $parts;
-
 
 	public function __construct(
-		string|array $name,
+		public string $name,
 		public int $kind = self::KindNormal,
 		public ?Position $position = null,
 	) {
-		if ($name === '' || $name === []) {
+		if ($name === '') {
 			throw new \InvalidArgumentException('Name cannot be empty');
-
-		} elseif (is_string($name)) {
-			if (str_starts_with($name, '\\')) {
-				$this->kind = self::KindFullyQualified;
-				$name = substr($name, 1);
-			} elseif (str_starts_with($name, 'namespace\\')) {
-				throw new \InvalidArgumentException('Relative name is not supported');
-			} else {
-				$this->kind = self::KindNormal;
-			}
-			$this->parts = explode('\\', $name);
-
+		} elseif (str_starts_with($name, 'namespace\\')) {
+			throw new \InvalidArgumentException('Relative name is not supported');
+		} elseif (str_starts_with($name, '\\')) {
+			$this->kind = self::KindFullyQualified;
+			$this->name = substr($name, 1);
 		} else {
-			$this->parts = $name;
+			$this->kind = self::KindNormal;
 		}
 	}
 
@@ -62,7 +52,7 @@ class NameNode extends Node
 			'switch', 'throw', 'trait', 'try', 'unset', 'use', 'var', 'while', 'xor', 'yield',
 			'parent', 'self', 'mixed', 'void', 'enum', // extra
 		]);
-		return count($this->parts) === 1 && isset($keywords[strtolower($this->parts[0])]);
+		return isset($keywords[strtolower($this->name)]);
 	}
 
 
@@ -74,7 +64,7 @@ class NameNode extends Node
 
 	public function __toString(): string
 	{
-		return implode('\\', $this->parts);
+		return $this->name;
 	}
 
 
@@ -84,7 +74,7 @@ class NameNode extends Node
 			self::KindNormal => $this->isKeyword() ? 'namespace\\' : '',
 			self::KindFullyQualified => '\\',
 		};
-		return $prefix . implode('\\', $this->parts);
+		return $prefix . $this->name;
 	}
 
 

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

@@ -102,7 +102,7 @@ final class PrintContext
 			function ($m) use ($args) {
 				[, $pos, $fn, $var] = $m;
 				$var = substr($var, 1, -1);
-				/** @var Nodes\FilterNode[] $args */
+				/** @var Nodes\ModifierNode[] $args */
 				return match ($fn) {
 					'modify' => $args[$pos]->printSimple($this, $var),
 					'modifyContent' => $args[$pos]->printContentAware($this, $var),

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

@@ -82,8 +82,8 @@ final class TagLexer
 	{
 		preg_match(
 			$colon
-				? '~ ( [./@_a-z0-9#!-] | :(?!:) | \{\$ [_a-z0-9\[\]()>-]+ })++  (?=\s+[!"\'$(\[{,\\|\~\w-] | [,|]  | \s*$) ~xAi'
-				: '~ ( [./@_a-z0-9#!-]          | \{\$ [_a-z0-9\[\]()>-]+ })++  (?=\s+[!"\'$(\[{,\\|\~\w-] | [,:|] | \s*$) ~xAi',
+				? '~ ( [./@_a-z0-9#!-] | :(?!:) | \{\$ [_a-z0-9\[\]()>-]+ })++  (?=\s+[!"\'$(\[{,\\\\|\~\w-] | [,|]  | \s*$) ~xAi'
+				: '~ ( [./@_a-z0-9#!-]          | \{\$ [_a-z0-9\[\]()>-]+ })++  (?=\s+[!"\'$(\[{,\\\\|\~\w-] | [,:|] | \s*$) ~xAi',
 			$input,
 			$match,
 			offset: $position->offset - $offsetDelta,