@vituum/vite-plugin-latte 1.0.0-alpha.1 → 1.0.0-alpha.10

package/handler-single.js

@@ -0,0 +1,10 @@
+let params = JSON.parse(process.argv[3])
+const path = process.argv[2]
+
+params = params.map(value => Buffer.from(value, 'base64').toString('utf-8'))
+
+const output = await (await import([path])).default(...params)
+
+if (output) {
+    console.log(Buffer.from(output.toString(), 'utf-8').toString('base64'))
+}

package/handler.js

@@ -1,13 +1,51 @@
-import { resolve } from 'path'
+import { resolve } from 'node:path'
+import fs from 'node:fs'
 
-const vite = (await import(resolve(process.cwd(), 'vite.config.js'))).default
+function find (obj) {
+    if (typeof obj === 'object') {
+        if (obj.name === '@vituum/vite-plugin-latte') {
+            return obj
+        } else {
+            for (const key in obj) {
+                const result = find(obj[key])
+
+                if (result !== null) {
+                    return result
+                }
+            }
+        }
+    }
+
+    return null
+}
+
+const DEFAULT_CONFIG_FILES = [
+    'vite.config.js',
+    'vite.config.mjs',
+    'vite.config.ts',
+    'vite.config.cjs',
+    'vite.config.mts',
+    'vite.config.cts'
+]
+
+let resolvedPath
+
+for (const filename of DEFAULT_CONFIG_FILES) {
+    const filePath = resolve(process.cwd(), filename)
+    if (!fs.existsSync(filePath)) continue
+
+    resolvedPath = filePath
+    break
+}
+
+const vite = (await import(resolvedPath)).default
 let params = JSON.parse(process.argv[4])
 const name = process.argv[2]
 const type = process.argv[3]
 
 params = params.map(value => Buffer.from(value, 'base64').toString('utf-8'))
 
-const output = await vite.plugins.find(plugin => plugin[0]?.name === '@vituum/vite-plugin-latte')[0]._options[type][name](...params)
+const output = await find(vite.plugins)._options[type][name](...params)
 
 if (output) {
     console.log(Buffer.from(output.toString(), 'utf-8').toString('base64'))

package/index.js

@@ -11,7 +11,7 @@ import { renameBuildEnd, renameBuildStart } from 'vituum/utils/build.js'
 const { name } = getPackageInfo(import.meta.url)
 
 /**
- * @type {import('@vituum/vite-plugin-latte/types/index.d.ts').PluginUserConfig} options
+ * @type {import('@vituum/vite-plugin-latte/types').PluginUserConfig} options
  */
 const defaultOptions = {
     reload: true,
@@ -19,7 +19,9 @@ const defaultOptions = {
     filters: {},
     functions: {},
     tags: {},
-    globals: {},
+    globals: {
+        format: 'latte'
+    },
     data: ['src/data/**/*.json'],
     formats: ['latte', 'json.latte', 'json'],
     bin: 'php',
@@ -40,31 +42,31 @@ const execSync = (cmd) => {
     }
 }
 
-const renderTemplate = ({ path, filename, cwd, packageRoot }, params, content) => {
-    const renderTransformedHtml = params.renderTransformedHtml(filename)
+const renderTemplate = ({ server, path, filename, cwd, packageRoot }, options, content) => {
+    const renderTransformedHtml = options.renderTransformedHtml(server ? filename.replace('.html', '') : filename)
 
-    if (params.data) {
-        const normalizePaths = Array.isArray(params.data) ? params.data.map(path => path.replace(/\\/g, '/')) : params.data.replace(/\\/g, '/')
+    if (options.data) {
+        const normalizePaths = Array.isArray(options.data) ? options.data.map(path => path.replace(/\\/g, '/')) : options.data.replace(/\\/g, '/')
 
-        params.data = FastGlob.sync(normalizePaths).map(entry => resolve(process.cwd(), entry))
+        options.data = FastGlob.sync(normalizePaths).map(entry => resolve(process.cwd(), entry))
     }
 
-    Object.keys(params.filters).forEach(key => {
-        if (typeof params.filters[key] === 'function') {
-            params.filters[key] = params.filters[key].toString().match(/\(\s*([^)]+?)\s*\)/)[1].replace(/\s/g, '').split(',')
+    Object.keys(options.filters).forEach(key => {
+        if (typeof options.filters[key] === 'function') {
+            options.filters[key] = options.filters[key].toString().match(/\(\s*([^)]+?)\s*\)/)[1].replace(/\s/g, '').split(',')
         }
     })
 
-    Object.keys(params.functions).forEach(key => {
-        if (typeof params.functions[key] === 'function') {
-            params.functions[key] = params.functions[key].toString().match(/\(\s*([^)]+?)\s*\)/)[1].replace(/\s/g, '').split(',')
+    Object.keys(options.functions).forEach(key => {
+        if (typeof options.functions[key] === 'function') {
+            options.functions[key] = options.functions[key].toString().match(/\(\s*([^)]+?)\s*\)/)[1].replace(/\s/g, '').split(',')
         }
     })
 
     if (renderTransformedHtml) {
         const timestamp = Math.floor(Date.now() * Math.random())
 
-        params.contentTimestamp = timestamp
+        options.contentTimestamp = timestamp
 
         if (!fs.existsSync(resolve(packageRoot, 'temp'))) {
             fs.mkdirSync(resolve(packageRoot, 'temp'))
@@ -73,11 +75,13 @@ const renderTemplate = ({ path, filename, cwd, packageRoot }, params, content) =
         fs.writeFileSync(resolve(packageRoot, `temp/${timestamp}.html`), content)
     }
 
-    return execSync(`${params.bin} ${packageRoot}/index.php ${join(params.root, path)} ${JSON.stringify(JSON.stringify(Object.assign({ packageRoot, cwd, renderTransformedHtml }, params)))}`)
+    const data = Object.assign({ packageRoot, cwd, isRenderTransformedHtml: renderTransformedHtml }, options)
+
+    return execSync(`${options.bin} ${packageRoot}/index.php ${join(options.root, server ? path.replace('.html', '') : path)} ${JSON.stringify(JSON.stringify(data))}`)
 }
 
 /**
- * @param {import('@vituum/vite-plugin-latte/types/index.d.ts').PluginUserConfig} options
+ * @param {import('@vituum/vite-plugin-latte/types').PluginUserConfig} options
  * @returns [import('vite').Plugin]
  */
 const plugin = (options = {}) => {
@@ -127,18 +131,25 @@ const plugin = (options = {}) => {
         transformIndexHtml: {
             enforce: 'pre',
             async transform (content, { path, filename, server }) {
-                path = path.replace('?raw', '')
-                filename = filename.replace('?raw', '')
-
                 if (options.ignoredPaths.find(ignoredPath => minimatch(path.replace('.html', ''), ignoredPath) === true)) {
                     return content
                 }
 
-                if (!options.formats.find(format => path.endsWith(`${format}.html`))) {
+                if (
+                    !options.formats.find(format => filename.replace('.html', '').endsWith(format)) ||
+                    (filename.replace('.html', '').endsWith('.json') && !content.startsWith('{'))
+                ) {
+                    return content
+                }
+
+                if (
+                    (filename.replace('.html', '').endsWith('.json') && content.startsWith('{')) &&
+                    (JSON.parse(content)?.format && !options.formats.includes(JSON.parse(content)?.format))
+                ) {
                     return content
                 }
 
-                const render = renderTemplate({ path, filename, cwd, packageRoot }, options, content)
+                const render = renderTemplate({ server, path, filename, cwd, packageRoot }, options, content)
                 const warningLog = render.output.includes('Warning: Undefined')
 
                 if (render.error || warningLog) {

package/index.php

@@ -42,6 +42,14 @@ function NodeHandler($name, $type, ...$params) : string {
 	return base64_decode($output[0] ?? '') ?? $params[1];
 }
 
+function NodeHandlerSingle($path, ...$params) : string {
+    $params = array_map(static function($value) { return base64_encode((string)$value); }, $params);
+
+    exec('node '. PACKAGE_DIR .'/handler-single.js ' . $path . ' ' . json_encode(json_encode($params, JSON_HEX_QUOT | JSON_HEX_TAG), JSON_THROW_ON_ERROR), $output);
+
+    return base64_decode($output[0] ?? '') ?? $params[1];
+}
+
 if (!file_exists(__DIR__ . '/temp') && !mkdir($concurrentDirectory = __DIR__ . '/temp') && !is_dir($concurrentDirectory)) {
     throw new Error(sprintf('Directory "%s" was not created', $concurrentDirectory));
 }
@@ -124,10 +132,14 @@ foreach (['fetch', 'placeholder', 'randomColor'] as $function) {
 }
 
 foreach ($config->filters  as $filter => $path) {
-    if (is_string($path)) {
+    if (is_string($path) && str_ends_with($path, '.php')) {
         require ROOT_DIR . $path;
         $latte->addFilter($filter, 'App\Latte\\' . ucfirst($filter) . 'Filter::execute');
-    } elseif (!$isDocker) {
+    }  elseif (!$isDocker && is_string($path) && str_ends_with($path, '.js')) {
+        $latte->addFilter($filter, function (...$params) use ($path) : string {
+            return NodeHandlerSingle($path, ...$params);
+        });
+    }  elseif (!$isDocker) {
         $latte->addFilter($filter, function (...$params) use ($filter) : string {
             return NodeHandler($filter, 'filters', ...$params);
         });
@@ -135,9 +147,13 @@ foreach ($config->filters  as $filter => $path) {
 }
 
 foreach ($config->functions  as $function => $path) {
-    if (is_string($path)) {
+    if (is_string($path) && str_ends_with($path, '.php')) {
         require ROOT_DIR . $path;
         $latte->addFunction($function, 'App\Latte\\' . ucfirst($function) . 'Function::execute');
+    }  elseif (!$isDocker && is_string($path) && str_ends_with($path, '.js')) {
+        $latte->addFunction($function, function (...$params) use ($path) : string {
+            return NodeHandlerSingle($path, ...$params);
+        });
     }  elseif (!$isDocker) {
         $latte->addFunction($function, function (...$params) use ($function) : string {
             return NodeHandler($function, 'functions', ...$params);
@@ -164,7 +180,7 @@ if (!file_exists(str_replace($config->cwd, ROOT_DIR, $params->template))) {
     throw new Error('File not found ' . str_replace($config->cwd, ROOT_DIR, $params->template));
 }
 
-if (isset($config->renderTransformedHtml) && $config->renderTransformedHtml) {
+if (isset($config->isRenderTransformedHtml) && $config->isRenderTransformedHtml) {
     if (isset($config->contentTimestamp)) {
         $content = file_get_contents(__DIR__ . '/temp/' . $config->contentTimestamp . '.html');
         unlink(__DIR__ . '/temp/' . $config->contentTimestamp . '.html');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vituum/vite-plugin-latte",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.10",
   "type": "module",
   "main": "index.js",
   "scripts": {
@@ -24,10 +24,16 @@
   "files": [
     "index.js",
     "handler.js",
+    "handler-single.js",
     "index.php",
     "latte",
-    "vendor"
+    "vendor",
+    "types"
   ],
+  "exports": {
+    ".": "./index.js",
+    "./types": "./types/*"
+  },
   "engines": {
     "node": ">=16.0.0",
     "npm": ">=8.0.0"

package/types/index.d.ts

@@ -0,0 +1,13 @@
+export interface PluginUserConfig {
+    reload?: boolean | Function
+    root?: string
+    filters?: Object
+    functions?: Object
+    tags?: Object
+    globals?: Object
+    data?: string | string[]
+    formats?: string[]
+    bin?: string
+    renderTransformedHtml?: (filename: string) => boolean
+    ignoredPaths?: string[]
+}

package/vendor/composer/autoload_classmap.php

@@ -29,10 +29,12 @@ return array(
     'Latte\\Compiler\\Nodes\\Html\\QuotedValue' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Html/QuotedValue.php',
     'Latte\\Compiler\\Nodes\\NopNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/NopNode.php',
     'Latte\\Compiler\\Nodes\\Php\\ArgumentNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/ArgumentNode.php',
+    'Latte\\Compiler\\Nodes\\Php\\ArrayItemNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/ArrayItemNode.php',
+    'Latte\\Compiler\\Nodes\\Php\\ClosureUseNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/ClosureUseNode.php',
     'Latte\\Compiler\\Nodes\\Php\\ComplexTypeNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/ComplexTypeNode.php',
     'Latte\\Compiler\\Nodes\\Php\\ExpressionNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/ExpressionNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Expression\\ArrayAccessNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ArrayAccessNode.php',
-    'Latte\\Compiler\\Nodes\\Php\\Expression\\ArrayItemNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ArrayItemNode.php',
+    'Latte\\Compiler\\Nodes\\Php\\Expression\\ArrayItemNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/ArrayItemNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Expression\\ArrayNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ArrayNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Expression\\AssignNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/AssignNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Expression\\AssignOpNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/AssignOpNode.php',
@@ -41,7 +43,6 @@ return array(
     'Latte\\Compiler\\Nodes\\Php\\Expression\\ClassConstantFetchNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ClassConstantFetchNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Expression\\CloneNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/CloneNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Expression\\ClosureNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ClosureNode.php',
-    'Latte\\Compiler\\Nodes\\Php\\Expression\\ClosureUseNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ClosureUseNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Expression\\ConstantFetchNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ConstantFetchNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Expression\\EmptyNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/EmptyNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Expression\\ErrorSuppressNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ErrorSuppressNode.php',
@@ -67,6 +68,7 @@ return array(
     'Latte\\Compiler\\Nodes\\Php\\Expression\\VariableNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/VariableNode.php',
     'Latte\\Compiler\\Nodes\\Php\\FilterNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/FilterNode.php',
     'Latte\\Compiler\\Nodes\\Php\\IdentifierNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/IdentifierNode.php',
+    'Latte\\Compiler\\Nodes\\Php\\InterpolatedStringPartNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/InterpolatedStringPartNode.php',
     'Latte\\Compiler\\Nodes\\Php\\IntersectionTypeNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/IntersectionTypeNode.php',
     'Latte\\Compiler\\Nodes\\Php\\MatchArmNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/MatchArmNode.php',
     'Latte\\Compiler\\Nodes\\Php\\ModifierNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/ModifierNode.php',
@@ -75,10 +77,9 @@ return array(
     'Latte\\Compiler\\Nodes\\Php\\ParameterNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/ParameterNode.php',
     'Latte\\Compiler\\Nodes\\Php\\ScalarNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/ScalarNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Scalar\\BooleanNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/BooleanNode.php',
-    'Latte\\Compiler\\Nodes\\Php\\Scalar\\EncapsedStringNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/EncapsedStringNode.php',
-    'Latte\\Compiler\\Nodes\\Php\\Scalar\\EncapsedStringPartNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/EncapsedStringPartNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Scalar\\FloatNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/FloatNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Scalar\\IntegerNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/IntegerNode.php',
+    'Latte\\Compiler\\Nodes\\Php\\Scalar\\InterpolatedStringNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/InterpolatedStringNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Scalar\\NullNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/NullNode.php',
     'Latte\\Compiler\\Nodes\\Php\\Scalar\\StringNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/StringNode.php',
     'Latte\\Compiler\\Nodes\\Php\\SuperiorTypeNode' => $vendorDir . '/latte/latte/src/Latte/Compiler/Nodes/Php/SuperiorTypeNode.php',

package/vendor/composer/autoload_static.php

@@ -30,10 +30,12 @@ class ComposerStaticInit19cfb30b66a778b432af39bbd1e78bca
         'Latte\\Compiler\\Nodes\\Html\\QuotedValue' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Html/QuotedValue.php',
         'Latte\\Compiler\\Nodes\\NopNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/NopNode.php',
         'Latte\\Compiler\\Nodes\\Php\\ArgumentNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/ArgumentNode.php',
+        'Latte\\Compiler\\Nodes\\Php\\ArrayItemNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/ArrayItemNode.php',
+        'Latte\\Compiler\\Nodes\\Php\\ClosureUseNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/ClosureUseNode.php',
         'Latte\\Compiler\\Nodes\\Php\\ComplexTypeNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/ComplexTypeNode.php',
         'Latte\\Compiler\\Nodes\\Php\\ExpressionNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/ExpressionNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Expression\\ArrayAccessNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ArrayAccessNode.php',
-        'Latte\\Compiler\\Nodes\\Php\\Expression\\ArrayItemNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ArrayItemNode.php',
+        'Latte\\Compiler\\Nodes\\Php\\Expression\\ArrayItemNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/ArrayItemNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Expression\\ArrayNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ArrayNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Expression\\AssignNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/AssignNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Expression\\AssignOpNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/AssignOpNode.php',
@@ -42,7 +44,6 @@ class ComposerStaticInit19cfb30b66a778b432af39bbd1e78bca
         'Latte\\Compiler\\Nodes\\Php\\Expression\\ClassConstantFetchNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ClassConstantFetchNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Expression\\CloneNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/CloneNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Expression\\ClosureNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ClosureNode.php',
-        'Latte\\Compiler\\Nodes\\Php\\Expression\\ClosureUseNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ClosureUseNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Expression\\ConstantFetchNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ConstantFetchNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Expression\\EmptyNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/EmptyNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Expression\\ErrorSuppressNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/ErrorSuppressNode.php',
@@ -68,6 +69,7 @@ class ComposerStaticInit19cfb30b66a778b432af39bbd1e78bca
         'Latte\\Compiler\\Nodes\\Php\\Expression\\VariableNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Expression/VariableNode.php',
         'Latte\\Compiler\\Nodes\\Php\\FilterNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/FilterNode.php',
         'Latte\\Compiler\\Nodes\\Php\\IdentifierNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/IdentifierNode.php',
+        'Latte\\Compiler\\Nodes\\Php\\InterpolatedStringPartNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/InterpolatedStringPartNode.php',
         'Latte\\Compiler\\Nodes\\Php\\IntersectionTypeNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/IntersectionTypeNode.php',
         'Latte\\Compiler\\Nodes\\Php\\MatchArmNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/MatchArmNode.php',
         'Latte\\Compiler\\Nodes\\Php\\ModifierNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/ModifierNode.php',
@@ -76,10 +78,9 @@ class ComposerStaticInit19cfb30b66a778b432af39bbd1e78bca
         'Latte\\Compiler\\Nodes\\Php\\ParameterNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/ParameterNode.php',
         'Latte\\Compiler\\Nodes\\Php\\ScalarNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/ScalarNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Scalar\\BooleanNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/BooleanNode.php',
-        'Latte\\Compiler\\Nodes\\Php\\Scalar\\EncapsedStringNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/EncapsedStringNode.php',
-        'Latte\\Compiler\\Nodes\\Php\\Scalar\\EncapsedStringPartNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/EncapsedStringPartNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Scalar\\FloatNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/FloatNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Scalar\\IntegerNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/IntegerNode.php',
+        'Latte\\Compiler\\Nodes\\Php\\Scalar\\InterpolatedStringNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/InterpolatedStringNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Scalar\\NullNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/NullNode.php',
         'Latte\\Compiler\\Nodes\\Php\\Scalar\\StringNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/Scalar/StringNode.php',
         'Latte\\Compiler\\Nodes\\Php\\SuperiorTypeNode' => __DIR__ . '/..' . '/latte/latte/src/Latte/Compiler/Nodes/Php/SuperiorTypeNode.php',

package/vendor/composer/installed.json

@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "latte/latte",
-            "version": "v3.0.5",
-            "version_normalized": "3.0.5.0",
+            "version": "v3.0.6",
+            "version_normalized": "3.0.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/latte.git",
-                "reference": "1ccb0add4ddc5e8b5db3b82a145fa9ff2d9d6f8f"
+                "reference": "6f66dcfea7ad76f60b8234139161421e9e1e309f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/latte/zipball/1ccb0add4ddc5e8b5db3b82a145fa9ff2d9d6f8f",
-                "reference": "1ccb0add4ddc5e8b5db3b82a145fa9ff2d9d6f8f",
+                "url": "https://api.github.com/repos/nette/latte/zipball/6f66dcfea7ad76f60b8234139161421e9e1e309f",
+                "reference": "6f66dcfea7ad76f60b8234139161421e9e1e309f",
                 "shasum": ""
             },
             "require": {
@@ -38,7 +38,7 @@
                 "nette/php-generator": "to use tag {templatePrint}",
                 "nette/utils": "to use filter |webalize"
             },
-            "time": "2023-01-16T23:22:36+00:00",
+            "time": "2023-03-09T01:34:56+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.5"
+                "source": "https://github.com/nette/latte/tree/v3.0.6"
             },
             "install-path": "../latte/latte"
         }

package/vendor/composer/installed.php

@@ -1,31 +1,31 @@
 <?php return array(
     'root' => array(
-        'pretty_version' => 'dev-main',
-        'version' => 'dev-main',
+        'pretty_version' => 'dev-next',
+        'version' => 'dev-next',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '4a326211ec39d4137aa4b39a5221b1ac622a4771',
+        'reference' => '713a4283dc3286aa6309d6e931e49e7eeec110da',
         'name' => '__root__',
         'dev' => true,
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'dev-main',
-            'version' => 'dev-main',
+            'pretty_version' => 'dev-next',
+            'version' => 'dev-next',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '4a326211ec39d4137aa4b39a5221b1ac622a4771',
+            'reference' => '713a4283dc3286aa6309d6e931e49e7eeec110da',
             'dev_requirement' => false,
         ),
         'latte/latte' => array(
-            'pretty_version' => 'v3.0.5',
-            'version' => '3.0.5.0',
+            'pretty_version' => 'v3.0.6',
+            'version' => '3.0.6.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../latte/latte',
             'aliases' => array(),
-            'reference' => '1ccb0add4ddc5e8b5db3b82a145fa9ff2d9d6f8f',
+            'reference' => '6f66dcfea7ad76f60b8234139161421e9e1e309f',
             'dev_requirement' => false,
         ),
     ),

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

@@ -202,14 +202,14 @@ final class Escaper
 				'html' => 'escapeHtmlText',
 				'html/attr' => 'escapeHtmlAttr',
 				'html/attr/js' => 'escapeHtmlAttr',
-				'html/js' => 'escapeHtmlRawText',
+				'html/js' => 'convertJSToHtmlRawText',
 				'html/comment' => 'escapeHtmlComment',
 			],
 			self::Css => [
 				'html' => 'escapeHtmlText',
 				'html/attr' => 'escapeHtmlAttr',
 				'html/attr/css' => 'escapeHtmlAttr',
-				'html/css' => 'escapeHtmlRawText',
+				'html/css' => 'convertJSToHtmlRawText',
 				'html/comment' => 'escapeHtmlComment',
 			],
 			'html' => [

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

@@ -99,10 +99,10 @@ final class ExpressionBuilder
 		$lastKey = -1;
 		foreach ($arr as $key => $val) {
 			if ($lastKey !== null && ++$lastKey === $key) {
-				$node->items[] = new Expression\ArrayItemNode(self::valueToNode($val));
+				$node->items[] = new Nodes\Php\ArrayItemNode(self::valueToNode($val));
 			} else {
 				$lastKey = null;
-				$node->items[] = new Expression\ArrayItemNode(self::valueToNode($val), self::valueToNode($key));
+				$node->items[] = new Nodes\Php\ArrayItemNode(self::valueToNode($val), self::valueToNode($key));
 			}
 		}
 

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

@@ -20,9 +20,6 @@ abstract class Node implements \IteratorAggregate
 	abstract public function print(PrintContext $context): string;
 
 
-	public function &getIterator(): \Generator
-	{
-		return;
-		yield;
-	}
+	/** @return \Generator<self> */
+	abstract public function &getIterator(): \Generator;
 }

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/{Expression/ArrayItemNode.php → ArrayItemNode.php}

@@ -7,11 +7,9 @@
 
 declare(strict_types=1);
 
-namespace Latte\Compiler\Nodes\Php\Expression;
+namespace Latte\Compiler\Nodes\Php;
 
 use Latte\Compiler\Node;
-use Latte\Compiler\Nodes\Php\ExpressionNode;
-use Latte\Compiler\Nodes\Php\IdentifierNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
@@ -50,3 +48,15 @@ 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/{Expression/ClosureUseNode.php → ClosureUseNode.php}

@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Latte\Compiler\Nodes\Php\Expression;
+namespace Latte\Compiler\Nodes\Php;
 
 use Latte\Compiler\Node;
+use Latte\Compiler\Nodes\Php\Expression\VariableNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 

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

@@ -10,6 +10,7 @@ declare(strict_types=1);
 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;

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

@@ -10,6 +10,7 @@ declare(strict_types=1);
 namespace Latte\Compiler\Nodes\Php\Expression;
 
 use Latte\Compiler\Nodes\Php;
+use Latte\Compiler\Nodes\Php\ClosureUseNode;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;

package/vendor/latte/latte/src/Latte/Compiler/Nodes/Php/{Scalar/EncapsedStringPartNode.php → InterpolatedStringPartNode.php}

@@ -7,14 +7,14 @@
 
 declare(strict_types=1);
 
-namespace Latte\Compiler\Nodes\Php\Scalar;
+namespace Latte\Compiler\Nodes\Php;
 
-use Latte\Compiler\Nodes\Php\ScalarNode;
+use Latte\Compiler\Node;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
 
 
-class EncapsedStringPartNode extends ScalarNode
+class InterpolatedStringPartNode extends Node
 {
 	public function __construct(
 		public string $value,
@@ -25,6 +25,12 @@ class EncapsedStringPartNode extends ScalarNode
 
 	public function print(PrintContext $context): string
 	{
-		throw new \LogicException('Cannot directly print EncapsedStringPart');
+		throw new \LogicException('Cannot directly print InterpolatedStringPart');
+	}
+
+
+	public function &getIterator(): \Generator
+	{
+		false && yield;
 	}
 }

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

@@ -52,17 +52,17 @@ class NameNode extends Node
 	public function isKeyword(): bool
 	{
 		static $keywords;
-		$keywords ??= array_flip([
-			'include', 'include_once', 'eval', 'require', 'require_once', 'or', 'xor', 'and',
-			'instanceof', 'new', 'clone', 'exit', 'if', 'elseif', 'else', 'endif', 'echo', 'do', 'while',
-			'endwhile', 'for', 'endfor', 'foreach', 'endforeach', 'declare', 'enddeclare', 'as', 'try', 'catch',
-			'finally', 'throw', 'use', 'insteadof', 'global', 'var', 'unset', 'isset', 'empty', 'continue', 'goto',
-			'function', 'const', 'return', 'print', 'yield', 'list', 'switch', 'endswitch', 'case', 'default',
-			'break', 'array', 'callable', 'extends', 'implements', 'namespace', 'trait', 'interface', 'class',
-			'static', 'abstract', 'final', 'private', 'protected', 'public', 'fn', 'match', 'self', 'parent',
+		$keywords ??= array_flip([ // https://www.php.net/manual/en/reserved.keywords.php
+			'__halt_compiler', '__class__', '__dir__', '__file__', '__function__', '__line__', '__method__', '__namespace__', '__trait__',
+			'abstract', 'and', 'array', 'as', 'break', 'callable', 'case', 'catch', 'class', 'clone', 'const', 'continue', 'declare',
+			'default', 'die', 'do', 'echo', 'else', 'elseif', 'empty', 'enddeclare', 'endfor', 'endforeach', 'endif', 'endswitch',
+			'endwhile', 'eval', 'exit', 'extends', 'final', 'finally', 'fn', 'for', 'foreach', 'function', 'global', 'goto', 'if',
+			'implements', 'include', 'include_once', 'instanceof', 'insteadof', 'interface', 'isset', 'list', 'match', 'namespace',
+			'new', 'or', 'print', 'private', 'protected', 'public', 'readonly', 'require', 'require_once', 'return', 'static',
+			'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])]) || str_starts_with($this->parts[0], '__'));
+		return count($this->parts) === 1 && isset($keywords[strtolower($this->parts[0])]);
 	}