@vituum/vite-plugin-latte 1.3.0 → 2.0.0-next.1

package/handler-single.js

@@ -1,3 +1,6 @@
+import process from 'node:process'
+import { Buffer } from 'node:buffer'
+
 let params = JSON.parse(process.argv[3])
 const path = process.argv[2]
 
@@ -6,5 +9,5 @@ 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'))
+  console.log(Buffer.from(output.toString(), 'utf-8').toString('base64'))
 }

package/handler.js

@@ -1,41 +1,44 @@
 import { resolve } from 'node:path'
 import fs from 'node:fs'
+import process from 'node:process'
+import { Buffer } from 'node:buffer'
 
-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
-                }
-            }
+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
+  return null
 }
 
 const DEFAULT_CONFIG_FILES = [
-    'vite.config.js',
-    'vite.config.mjs',
-    'vite.config.ts',
-    'vite.config.cjs',
-    'vite.config.mts',
-    'vite.config.cts'
+  '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
+  const filePath = resolve(process.cwd(), filename)
+  if (!fs.existsSync(filePath)) continue
 
-    resolvedPath = filePath
-    break
+  resolvedPath = filePath
+  break
 }
 
 const vite = (await import(resolvedPath)).default
@@ -48,5 +51,5 @@ params = params.map(value => Buffer.from(value, 'base64').toString('utf-8'))
 const output = await find(vite.plugins)._options[type][name](...params)
 
 if (output) {
-    console.log(Buffer.from(output.toString(), 'utf-8').toString('base64'))
+  console.log(Buffer.from(output.toString(), 'utf-8').toString('base64'))
 }

package/index.js

@@ -6,13 +6,13 @@ import * as childProcess from 'node:child_process'
 import FastGlob from 'fast-glob'
 import { minimatch } from 'minimatch'
 import {
-    getPackageInfo,
-    pluginError,
-    pluginReload,
-    merge,
-    pluginBundle,
-    normalizePath,
-    pluginMiddleware
+  getPackageInfo,
+  pluginError,
+  pluginReload,
+  merge,
+  pluginBundle,
+  normalizePath,
+  pluginMiddleware,
 } from 'vituum/utils/common.js'
 import { renameBuildEnd, renameBuildStart } from 'vituum/utils/build.js'
 
@@ -22,70 +22,71 @@ const { name } = getPackageInfo(import.meta.url)
  * @type {import('@vituum/vite-plugin-latte/types').PluginUserConfig} options
  */
 const defaultOptions = {
-    reload: true,
-    root: null,
-    filters: {},
-    functions: {},
-    tags: {},
-    globals: {
-        format: 'latte'
-    },
-    data: ['src/data/**/*.json'],
-    formats: ['latte', 'json.latte', 'json'],
-    bin: 'php',
-    renderTransformedHtml: () => false,
-    ignoredPaths: []
+  reload: true,
+  root: null,
+  filters: {},
+  functions: {},
+  tags: {},
+  globals: {
+    format: 'latte',
+  },
+  data: ['src/data/**/*.json'],
+  formats: ['latte', 'json.latte', 'json'],
+  bin: 'php',
+  renderTransformedHtml: () => false,
+  ignoredPaths: [],
 }
 
 const execSync = (cmd) => {
-    try {
-        return {
-            output: childProcess.execSync(cmd).toString()
-        }
-    } catch ({ output }) {
-        return {
-            error: true,
-            output: output[1].toString()
-        }
+  try {
+    return {
+      output: childProcess.execSync(cmd).toString(),
+    }
+  }
+  catch ({ output }) {
+    return {
+      error: true,
+      output: output[1].toString(),
     }
+  }
 }
 
-const renderTemplate = ({ server, path, filename, cwd, packageRoot }, options, content) => {
-    const renderTransformedHtml = options.renderTransformedHtml(server ? filename.replace('.html', '') : filename)
+const renderTemplate = ({ server, path, filename, cwd, packageRoot, viteServer }, options, content) => {
+  const renderTransformedHtml = options.renderTransformedHtml(server ? filename.replace('.html', '') : filename)
 
-    if (options.data) {
-        const normalizePaths = Array.isArray(options.data) ? options.data.map(path => normalizePath(path)) : normalizePath(options.data)
+  if (options.data) {
+    const normalizePaths = Array.isArray(options.data) ? options.data.map(path => normalizePath(path)) : normalizePath(options.data)
 
-        options.data = FastGlob.sync(normalizePaths).map(entry => resolve(cwd, entry))
-    }
-
-    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(',')
-        }
-    })
+    options.data = FastGlob.sync(normalizePaths).map(entry => resolve(cwd, entry))
+  }
 
-    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(',')
-        }
-    })
+  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(',')
+    }
+  })
 
-    if (renderTransformedHtml) {
-        const timestamp = Math.floor(Date.now() * Math.random())
+  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(',')
+    }
+  })
 
-        options.contentTimestamp = timestamp
+  if (renderTransformedHtml) {
+    const timestamp = Math.floor(Date.now() * Math.random())
 
-        if (!fs.existsSync(resolve(packageRoot, 'temp'))) {
-            fs.mkdirSync(resolve(packageRoot, 'temp'))
-        }
+    options.contentTimestamp = timestamp
 
-        fs.writeFileSync(resolve(packageRoot, `temp/${timestamp}.html`), content)
+    if (!fs.existsSync(resolve(packageRoot, 'temp'))) {
+      fs.mkdirSync(resolve(packageRoot, 'temp'))
     }
 
-    const data = Object.assign({ packageRoot, cwd, isRenderTransformedHtml: renderTransformedHtml }, options)
+    fs.writeFileSync(resolve(packageRoot, `temp/${timestamp}.html`), content)
+  }
+
+  const data = Object.assign({ packageRoot, cwd, isRenderTransformedHtml: renderTransformedHtml, viteServer }, options)
 
-    return execSync(`${options.bin} ${packageRoot}/index.php ${join(options.root, server ? path.replace('.html', '') : path)} ${JSON.stringify(JSON.stringify(data))}`)
+  return execSync(`${options.bin} ${packageRoot}/index.php ${join(options.root, server ? path.replace('.html', '') : path)} ${JSON.stringify(JSON.stringify(data))}`)
 }
 
 /**
@@ -93,91 +94,95 @@ const renderTemplate = ({ server, path, filename, cwd, packageRoot }, options, c
  * @returns [import('vite').Plugin]
  */
 const plugin = (options = {}) => {
-    let resolvedConfig
-    let userEnv
+  let resolvedConfig
+  let userEnv
 
-    options = merge(defaultOptions, options)
+  options = merge(defaultOptions, options)
 
-    const cwd = process.cwd()
-    const packageRoot = dirname((fileURLToPath(import.meta.url)))
+  const cwd = process.cwd()
+  const packageRoot = dirname((fileURLToPath(import.meta.url)))
 
-    if (fs.existsSync(resolve(packageRoot, 'temp'))) {
-        fs.rmSync(resolve(packageRoot, 'temp'), { recursive: true, force: true })
-    }
+  if (fs.existsSync(resolve(packageRoot, 'temp'))) {
+    fs.rmSync(resolve(packageRoot, 'temp'), { recursive: true, force: true })
+  }
 
-    if (options.bin === 'docker') {
-        options.bin = `docker run --rm --name index -v "${process.cwd()}":/usr/src/app -w /usr/src/app php:8-cli php`
-    }
+  if (options.bin === 'docker') {
+    options.bin = `docker run --rm --name index -v "${process.cwd()}":/usr/src/app -w /usr/src/app php:8-cli php`
+  }
+
+  return [{
+    _options: options,
+    name,
+    config(userConfig, env) {
+      userEnv = env
+    },
+    configResolved(config) {
+      resolvedConfig = config
+
+      if (!options.root) {
+        options.root = config.root
+      }
+      else {
+        options.root = normalizePath(options.root)
+      }
+    },
+    buildStart: async () => {
+      if (userEnv.command !== 'build' || !resolvedConfig.build.rollupOptions.input) {
+        return
+      }
+
+      await renameBuildStart(resolvedConfig.build.rollupOptions.input, options.formats)
+    },
+    buildEnd: async () => {
+      if (userEnv.command !== 'build' || !resolvedConfig.build.rollupOptions.input) {
+        return
+      }
+
+      await renameBuildEnd(resolvedConfig.build.rollupOptions.input, options.formats)
+    },
+    transformIndexHtml: {
+      order: 'pre',
+      async handler(content, { path, filename, server }) {
+        if (options.ignoredPaths.find(ignoredPath => minimatch(path.replace('.html', ''), ignoredPath) === true)) {
+          return content
+        }
+
+        if (
+          !options.formats.find(format => filename.replace('.html', '').endsWith(format))
+          || (filename.replace('.html', '').endsWith('.json') && !content.startsWith('{'))
+        ) {
+          return content
+        }
 
-    return [{
-        _options: options,
-        name,
-        config (userConfig, env) {
-            userEnv = env
-        },
-        configResolved (config) {
-            resolvedConfig = config
-
-            if (!options.root) {
-                options.root = config.root
-            } else {
-                options.root = normalizePath(options.root)
-            }
-        },
-        buildStart: async () => {
-            if (userEnv.command !== 'build' || !resolvedConfig.build.rollupOptions.input) {
-                return
-            }
-
-            await renameBuildStart(resolvedConfig.build.rollupOptions.input, options.formats)
-        },
-        buildEnd: async () => {
-            if (userEnv.command !== 'build' || !resolvedConfig.build.rollupOptions.input) {
-                return
-            }
-
-            await renameBuildEnd(resolvedConfig.build.rollupOptions.input, options.formats)
-        },
-        transformIndexHtml: {
-            order: 'pre',
-            async handler (content, { path, filename, server }) {
-                if (options.ignoredPaths.find(ignoredPath => minimatch(path.replace('.html', ''), ignoredPath) === true)) {
-                    return content
-                }
-
-                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({ server, path, filename, cwd, packageRoot }, options, content)
-                const warningLog = render.output.includes('Warning: Undefined')
-
-                if (render.error || warningLog) {
-                    const message = warningLog ? 'Warning: Undefined' + render.output.split('Warning: Undefined').pop() : render.output
-                    const renderError = pluginError(message, server, name)
-
-                    if (renderError && server) {
-                        return
-                    } else if (renderError) {
-                        return renderError
-                    }
-                }
-
-                return render.output
-            }
-        },
-        handleHotUpdate: ({ file, server }) => pluginReload({ file, server }, options)
-    }, pluginBundle(options.formats), pluginMiddleware(name, options.formats)]
+        if (
+          (filename.replace('.html', '').endsWith('.json') && content.startsWith('{'))
+          && (JSON.parse(content)?.format && !options.formats.includes(JSON.parse(content)?.format))
+        ) {
+          return content
+        }
+
+        const viteServer = !!server
+
+        const render = renderTemplate({ server, path, filename, cwd, packageRoot, viteServer }, options, content)
+        const warningLog = render.output.includes('Warning: Undefined')
+
+        if (render.error || warningLog) {
+          const message = warningLog ? 'Warning: Undefined' + render.output.split('Warning: Undefined').pop() : render.output
+          const renderError = pluginError(message, server, name)
+
+          if (renderError && server) {
+            return
+          }
+          else if (renderError) {
+            return renderError
+          }
+        }
+
+        return render.output
+      },
+    },
+    handleHotUpdate: ({ file, server }) => pluginReload({ file, server }, options),
+  }, pluginBundle(options.formats), pluginMiddleware(name, options.formats)]
 }
 
 export default plugin

package/index.php

@@ -29,6 +29,8 @@ if ($isDocker) {
     define("TEMPLATES_DIR", $config->cwd . '/src/templates/');
 }
 
+define("VITE_SERVER", $config->viteServer);
+
 define("PACKAGE_DIR", str_replace($config->cwd, ROOT_DIR, $config->packageRoot));
 
 /**

package/package.json

@@ -1,28 +1,32 @@
 {
   "name": "@vituum/vite-plugin-latte",
-  "version": "1.3.0",
+  "version": "2.0.0-next.1",
   "type": "module",
   "main": "index.js",
   "types": "types/index.d.ts",
   "scripts": {
     "tsc": "tsc",
-    "eslint": "eslint '**/*.js' --fix",
+    "eslint": "eslint '**/*.js'",
+    "eslint-fix": "eslint '**/*.js' --fix",
     "dev": "vite dev",
     "build": "vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "publish-next": "npm publish --tag next"
   },
   "dependencies": {
-    "vituum": "^1.1",
+    "vituum": "^2.0.0-next.1",
     "fast-glob": "^3.3",
     "lodash": "^4.17",
-    "minimatch": "^10.0"
+    "minimatch": "^10.1"
   },
   "devDependencies": {
-    "@types/node": "^22.9.3",
-    "vite": "^5.4.11",
-    "eslint": "^8.57.1",
-    "eslint-config-standard": "^17.1.0",
-    "typescript": "^5.7.2"
+    "@eslint/js": "^9.39",
+    "@stylistic/eslint-plugin": "^5.6",
+    "@types/node": "^25",
+    "vite": "^8.0.0-beta.3",
+    "eslint": "^9.39",
+    "globals": "^16.5",
+    "typescript": "^5.9"
   },
   "files": [
     "index.js",

package/vendor/composer/InstalledVersions.php

@@ -322,6 +322,7 @@ class InstalledVersions
         }
 
         $installed = array();
+        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
@@ -330,9 +331,11 @@ class InstalledVersions
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
                     /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                     $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
+                    self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = $required;
+                    if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $required;
+                        $copiedLocalDir = true;
                     }
                 }
             }
@@ -350,7 +353,7 @@ class InstalledVersions
             }
         }
 
-        if (self::$installed !== array()) {
+        if (self::$installed !== array() && !$copiedLocalDir) {
             $installed[] = self::$installed;
         }
 

package/vendor/composer/autoload_classmap.php

@@ -204,6 +204,7 @@ return array(
     'Nette\\NotImplementedException' => $vendorDir . '/nette/utils/src/exceptions.php',
     'Nette\\NotSupportedException' => $vendorDir . '/nette/utils/src/exceptions.php',
     'Nette\\OutOfRangeException' => $vendorDir . '/nette/utils/src/exceptions.php',
+    'Nette\\ShouldNotHappenException' => $vendorDir . '/nette/utils/src/exceptions.php',
     'Nette\\SmartObject' => $vendorDir . '/nette/utils/src/SmartObject.php',
     'Nette\\StaticClass' => $vendorDir . '/nette/utils/src/StaticClass.php',
     'Nette\\UnexpectedValueException' => $vendorDir . '/nette/utils/src/exceptions.php',

package/vendor/composer/autoload_static.php

@@ -205,6 +205,7 @@ class ComposerStaticInit8535741375194e2773348db6a0091487
         'Nette\\NotImplementedException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
         'Nette\\NotSupportedException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
         'Nette\\OutOfRangeException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
+        'Nette\\ShouldNotHappenException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
         'Nette\\SmartObject' => __DIR__ . '/..' . '/nette/utils/src/SmartObject.php',
         'Nette\\StaticClass' => __DIR__ . '/..' . '/nette/utils/src/StaticClass.php',
         'Nette\\UnexpectedValueException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',

package/vendor/composer/installed.json

@@ -91,17 +91,17 @@
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.5",
-            "version_normalized": "4.0.5.0",
+            "version": "v4.0.6",
+            "version_normalized": "4.0.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
+                "reference": "ce708655043c7050eb050df361c5e313cf708309"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
-                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+                "url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
+                "reference": "ce708655043c7050eb050df361c5e313cf708309",
                 "shasum": ""
             },
             "require": {
@@ -125,7 +125,7 @@
                 "ext-mbstring": "to use Strings::lower() etc...",
                 "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
             },
-            "time": "2024-08-07T15:39:19+00:00",
+            "time": "2025-03-30T21:06:30+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -174,7 +174,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.5"
+                "source": "https://github.com/nette/utils/tree/v4.0.6"
             },
             "install-path": "../nette/utils"
         }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '8a6c00e087e36248e86eba645c654c3b499411cc',
+        'reference' => '53b0d437bebe1b115ebfbaf941ac81a3f787bf96',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '8a6c00e087e36248e86eba645c654c3b499411cc',
+            'reference' => '53b0d437bebe1b115ebfbaf941ac81a3f787bf96',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -29,9 +29,9 @@
             'dev_requirement' => false,
         ),
         'nette/utils' => array(
-            'pretty_version' => 'v4.0.5',
-            'version' => '4.0.5.0',
-            'reference' => '736c567e257dbe0fcf6ce81b4d6dbe05c6899f96',
+            'pretty_version' => 'v4.0.6',
+            'version' => '4.0.6.0',
+            'reference' => 'ce708655043c7050eb050df361c5e313cf708309',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nette/utils',
             'aliases' => array(),

package/vendor/nette/utils/src/Utils/Arrays.php

@@ -277,7 +277,8 @@ class Arrays
 	 */
 	public static function isList(mixed $value): bool
 	{
-		return is_array($value) && (PHP_VERSION_ID < 80100
+		return is_array($value) && (
+			PHP_VERSION_ID < 80100
 			? !$value || array_keys($value) === range(0, count($value) - 1)
 			: array_is_list($value)
 		);

package/vendor/nette/utils/src/Utils/FileSystem.php

@@ -271,7 +271,7 @@ final class FileSystem
 	 */
 	public static function isAbsolute(string $path): bool
 	{
-		return (bool) preg_match('#([a-z]:)?[/\\\\]|[a-z][a-z0-9+.-]*://#Ai', $path);
+		return (bool) preg_match('#([a-z]:)?[/\\\]|[a-z][a-z0-9+.-]*://#Ai', $path);
 	}
 
 
@@ -280,7 +280,7 @@ final class FileSystem
 	 */
 	public static function normalizePath(string $path): string
 	{
-		$parts = $path === '' ? [] : preg_split('~[/\\\\]+~', $path);
+		$parts = $path === '' ? [] : preg_split('~[/\\\]+~', $path);
 		$res = [];
 		foreach ($parts as $part) {
 			if ($part === '..' && $res && end($res) !== '..' && end($res) !== '') {
@@ -305,6 +305,19 @@ final class FileSystem
 	}
 
 
+	/**
+	 * Resolves a path against a base path. If the path is absolute, returns it directly, if it's relative, joins it with the base path.
+	 */
+	public static function resolvePath(string $basePath, string $path): string
+	{
+		return match (true) {
+			self::isAbsolute($path) => self::platformSlashes($path),
+			$path === '' => self::platformSlashes($basePath),
+			default => self::joinPaths($basePath, $path),
+		};
+	}
+
+
 	/**
 	 * Converts backslashes to slashes.
 	 */

package/vendor/nette/utils/src/Utils/Finder.php

@@ -505,6 +505,6 @@ class Finder implements \IteratorAggregate
 				'\-' => '-',
 			],
 		);
-		return '#' . $anchor . $pattern . '$#D' . (defined('PHP_WINDOWS_VERSION_BUILD') ? 'i' : '');
+		return '#' . $anchor . $pattern . '$#D' . (Helpers::IsWindows ? 'i' : '');
 	}
 }

package/vendor/nette/utils/src/Utils/Helpers.php

@@ -14,6 +14,9 @@ use Nette;
 
 class Helpers
 {
+	public const IsWindows = PHP_OS_FAMILY === 'Windows';
+
+
 	/**
 	 * Executes a callback and returns the captured output as a string.
 	 */

package/vendor/nette/utils/src/Utils/Image.php

@@ -718,42 +718,27 @@ class Image
 	 */
 	private function output(int $type, ?int $quality, ?string $file = null): void
 	{
-		switch ($type) {
-			case ImageType::JPEG:
-				$quality = $quality === null ? 85 : max(0, min(100, $quality));
-				$success = @imagejpeg($this->image, $file, $quality); // @ is escalated to exception
-				break;
-
-			case ImageType::PNG:
-				$quality = $quality === null ? 9 : max(0, min(9, $quality));
-				$success = @imagepng($this->image, $file, $quality); // @ is escalated to exception
-				break;
-
-			case ImageType::GIF:
-				$success = @imagegif($this->image, $file); // @ is escalated to exception
-				break;
-
-			case ImageType::WEBP:
-				$quality = $quality === null ? 80 : max(0, min(100, $quality));
-				$success = @imagewebp($this->image, $file, $quality); // @ is escalated to exception
-				break;
-
-			case ImageType::AVIF:
-				$quality = $quality === null ? 30 : max(0, min(100, $quality));
-				$success = @imageavif($this->image, $file, $quality); // @ is escalated to exception
-				break;
-
-			case ImageType::BMP:
-				$success = @imagebmp($this->image, $file); // @ is escalated to exception
-				break;
-
-			default:
-				throw new Nette\InvalidArgumentException("Unsupported image type '$type'.");
-		}
-
-		if (!$success) {
-			throw new ImageException(Helpers::getLastError() ?: 'Unknown error');
-		}
+		[$defQuality, $min, $max] = match ($type) {
+			ImageType::JPEG => [85, 0, 100],
+			ImageType::PNG => [9, 0, 9],
+			ImageType::GIF => [null, null, null],
+			ImageType::WEBP => [80, 0, 100],
+			ImageType::AVIF => [30, 0, 100],
+			ImageType::BMP => [null, null, null],
+			default => throw new Nette\InvalidArgumentException("Unsupported image type '$type'."),
+		};
+
+		$args = [$this->image, $file];
+		if ($defQuality !== null) {
+			$args[] = $quality === null ? $defQuality : max($min, min($max, $quality));
+		}
+
+		Callback::invokeSafe('image' . self::Formats[$type], $args, function (string $message) use ($file): void {
+			if ($file !== null) {
+				@unlink($file);
+			}
+			throw new ImageException($message);
+		});
 	}
 
 

package/vendor/nette/utils/src/Utils/Iterables.php

@@ -233,6 +233,7 @@ final class Iterables
 			$iterable instanceof \Iterator => $iterable,
 			$iterable instanceof \IteratorAggregate => self::toIterator($iterable->getIterator()),
 			is_array($iterable) => new \ArrayIterator($iterable),
+			default => throw new Nette\ShouldNotHappenException,
 		};
 	}
 }

package/vendor/nette/utils/src/Utils/Reflection.php

@@ -19,14 +19,14 @@ final class Reflection
 {
 	use Nette\StaticClass;
 
-	/** @deprecated use Nette\Utils\Validator::isBuiltinType() */
+	/** @deprecated use Nette\Utils\Validators::isBuiltinType() */
 	public static function isBuiltinType(string $type): bool
 	{
 		return Validators::isBuiltinType($type);
 	}
 
 
-	/** @deprecated use Nette\Utils\Validator::isClassKeyword() */
+	/** @deprecated use Nette\Utils\Validators::isClassKeyword() */
 	public static function isClassKeyword(string $name): bool
 	{
 		return Validators::isClassKeyword($name);

package/vendor/nette/utils/src/Utils/Strings.php

@@ -28,7 +28,7 @@ class Strings
 
 
 	/**
-	 * @deprecated use Nette\Utils\Validator::isUnicode()
+	 * @deprecated use Nette\Utils\Validators::isUnicode()
 	 */
 	public static function checkEncoding(string $s): bool
 	{
@@ -547,7 +547,6 @@ class Strings
 		return $utf8 && $captureOffset
 			? self::bytesToChars($subject, [$m])[0]
 			: $m;
-
 	}
 
 

package/vendor/nette/utils/src/Utils/Type.php

@@ -260,8 +260,8 @@ final class Type
 				$subtypes,
 				fn($subtype) => Validators::isBuiltinType($type)
 					? strcasecmp($type, $subtype) === 0
-					: is_a($subtype, $type, allow_string: true)
-			)
+					: is_a($subtype, $type, allow_string: true),
+			),
 		);
 	}
 }

package/vendor/nette/utils/src/Utils/exceptions.php

@@ -11,7 +11,7 @@ namespace Nette\Utils;
 
 
 /**
- * The exception that is thrown when an image error occurs.
+ * An error occurred while working with the image.
  */
 class ImageException extends \Exception
 {
@@ -19,7 +19,7 @@ class ImageException extends \Exception
 
 
 /**
- * The exception that indicates invalid image file.
+ * The image file is invalid or in an unsupported format.
  */
 class UnknownImageFileException extends ImageException
 {
@@ -27,7 +27,7 @@ class UnknownImageFileException extends ImageException
 
 
 /**
- * The exception that indicates error of JSON encoding/decoding.
+ * JSON encoding or decoding failed.
  */
 class JsonException extends \JsonException
 {
@@ -35,7 +35,7 @@ class JsonException extends \JsonException
 
 
 /**
- * The exception that indicates error of the last Regexp execution.
+ * Regular expression pattern or execution failed.
  */
 class RegexpException extends \Exception
 {
@@ -43,7 +43,7 @@ class RegexpException extends \Exception
 
 
 /**
- * The exception that indicates assertion error.
+ * Type validation failed. The value doesn't match the expected type constraints.
  */
 class AssertionException extends \Exception
 {

package/vendor/nette/utils/src/exceptions.php

@@ -11,8 +11,7 @@ namespace Nette;
 
 
 /**
- * The exception that is thrown when the value of an argument is
- * outside the allowable range of values as defined by the invoked method.
+ * The value is outside the allowed range.
  */
 class ArgumentOutOfRangeException extends \InvalidArgumentException
 {
@@ -20,8 +19,7 @@ class ArgumentOutOfRangeException extends \InvalidArgumentException
 
 
 /**
- * The exception that is thrown when a method call is invalid for the object's
- * current state, method has been invoked at an illegal or inappropriate time.
+ * The object is in a state that does not allow the requested operation.
  */
 class InvalidStateException extends \RuntimeException
 {
@@ -29,7 +27,7 @@ class InvalidStateException extends \RuntimeException
 
 
 /**
- * The exception that is thrown when a requested method or operation is not implemented.
+ * The requested feature is not implemented.
  */
 class NotImplementedException extends \LogicException
 {
@@ -37,8 +35,7 @@ class NotImplementedException extends \LogicException
 
 
 /**
- * The exception that is thrown when an invoked method is not supported. For scenarios where
- * it is sometimes possible to perform the requested operation, see InvalidStateException.
+ * The requested operation is not supported.
  */
 class NotSupportedException extends \LogicException
 {
@@ -46,7 +43,7 @@ class NotSupportedException extends \LogicException
 
 
 /**
- * The exception that is thrown when a requested method or operation is deprecated.
+ * The requested feature is deprecated and no longer available.
  */
 class DeprecatedException extends NotSupportedException
 {
@@ -54,7 +51,7 @@ class DeprecatedException extends NotSupportedException
 
 
 /**
- * The exception that is thrown when accessing a class member (property or method) fails.
+ * Cannot access the requested class property or method.
  */
 class MemberAccessException extends \Error
 {
@@ -62,7 +59,7 @@ class MemberAccessException extends \Error
 
 
 /**
- * The exception that is thrown when an I/O error occurs.
+ * Failed to read from or write to a file or stream.
  */
 class IOException extends \RuntimeException
 {
@@ -70,7 +67,7 @@ class IOException extends \RuntimeException
 
 
 /**
- * The exception that is thrown when accessing a file that does not exist on disk.
+ * The requested file does not exist.
  */
 class FileNotFoundException extends IOException
 {
@@ -78,7 +75,7 @@ class FileNotFoundException extends IOException
 
 
 /**
- * The exception that is thrown when part of a file or directory cannot be found.
+ * The requested directory does not exist.
  */
 class DirectoryNotFoundException extends IOException
 {
@@ -86,7 +83,7 @@ class DirectoryNotFoundException extends IOException
 
 
 /**
- * The exception that is thrown when an argument does not match with the expected value.
+ * The provided argument has invalid type or format.
  */
 class InvalidArgumentException extends \InvalidArgumentException
 {
@@ -94,7 +91,7 @@ class InvalidArgumentException extends \InvalidArgumentException
 
 
 /**
- * The exception that is thrown when an illegal index was requested.
+ * The requested array or collection index does not exist.
  */
 class OutOfRangeException extends \OutOfRangeException
 {
@@ -102,8 +99,16 @@ class OutOfRangeException extends \OutOfRangeException
 
 
 /**
- * The exception that is thrown when a value (typically returned by function) does not match with the expected value.
+ * The returned value has unexpected type or format.
  */
 class UnexpectedValueException extends \UnexpectedValueException
 {
 }
+
+
+/**
+ * Houston, we have a problem.
+ */
+class ShouldNotHappenException extends \LogicException
+{
+}