svelteesp32 3.1.0 → 3.1.2

package/README.md

@@ -88,7 +88,7 @@ void setup() {
 
 ## What's New
 
-- **v3.1.0** — Removed `handlebars` dependency; C++ generation is now pure TypeScript. `--cachetime-html` → `--cachetimehtml`, `--cachetime-assets` → `--cachetimeassets` (CLI now matches RC file keys); `--dry-run` alias removed — use `--dryrun`
+- **v3.1.0** — Removed `handlebars`, `picomatch`, and `mime-types` dependencies; C++ generation is now pure TypeScript with a built-in MIME type map and direct `tinyglobby` exclude handling. `--cachetime-html` → `--cachetimehtml`, `--cachetime-assets` → `--cachetimeassets` (CLI now matches RC file keys); `--dry-run` alias removed — use `--dryrun`
 - **v3.0.0** — **Vite plugin** (`import { svelteESP32 } from 'svelteesp32/vite'`) generates the header automatically after every build — call with no argument for RC file mode or pass an options object for plugin-options mode; `npx svelteesp32 init` interactive RC file wizard; Node.js >= 22 required
 - **v2.4.0** — `--analyze` for CI size budget checks (per-file table, exits 1 on over-budget); `--manifest` to write a companion JSON manifest alongside the header
 - **v2.3.0** — `--cachetimehtml` and `--cachetimeassets` for per-type cache control (e.g. `no-cache` for HTML, 1-year for content-hashed JS/CSS)
@@ -370,12 +370,12 @@ void initSvelteStaticFiles(PsychicHttpServer * server) {
 
 ## Supported Web Server Engines
 
-| Engine                   | Flag           | Best For                     | Platform        |
-| ------------------------ | -------------- | ---------------------------- | --------------- |
-| **PsychicHttpServer V2** | `-e psychic`   | Maximum performance          | ESP32 only      |
-| **ESPAsyncWebServer**    | `-e async`     | Cross-platform compatibility | ESP32 + ESP8266 |
-| **Arduino WebServer**    | `-e webserver` | No dependencies, simplicity  | ESP32 only      |
-| **Native ESP-IDF**       | `-e espidf`    | Pure ESP-IDF projects        | ESP32 only      |
+| Engine                   | Flag           | Best For                     | Platform        | Library                                                                      |
+| ------------------------ | -------------- | ---------------------------- | --------------- | ---------------------------------------------------------------------------- |
+| **PsychicHttpServer V2** | `-e psychic`   | Maximum performance          | ESP32 only      | [PsychicHttp 2.2.0, 3.1.1](https://github.com/hoeken/PsychicHttp)            |
+| **ESPAsyncWebServer**    | `-e async`     | Cross-platform compatibility | ESP32 + ESP8266 | [ESPAsyncWebServer v3.11.1](https://github.com/ESP32Async/ESPAsyncWebServer) |
+| **Arduino WebServer**    | `-e webserver` | No dependencies, simplicity  | ESP32 only      | (built-in)                                                                   |
+| **Native ESP-IDF**       | `-e espidf`    | Pure ESP-IDF projects        | ESP32 only      | (built-in)                                                                   |
 
 **Recommendation:** For ESP32-only projects, use PsychicHttpServer V2 (`-e psychic`) for the fastest, most stable experience.
 
@@ -745,7 +745,7 @@ platform = espressif32
 board = esp32dev
 framework = arduino
 lib_deps =
-    ESP Async WebServer
+    https://github.com/ESP32Async/ESPAsyncWebServer#v3.11.1
 extra_scripts = pre:scripts/build_frontend.py
 ```
 

package/dist/commandLine.js

@@ -77,13 +77,13 @@ RC File:
     process.exit(0);
 }
 function validateEngine(value) {
-    if (value === 'psychic' || value === 'async' || value === 'espidf' || value === 'webserver')
+    if (['psychic', 'async', 'espidf', 'webserver'].includes(value))
         return value;
     console.error((0, errorMessages_1.getInvalidEngineError)(value));
     process.exit(1);
 }
 function validateTriState(value, name) {
-    if (value === 'always' || value === 'never' || value === 'compiler')
+    if (['always', 'never', 'compiler'].includes(value))
         return value;
     throw new Error(`Invalid ${name}: ${value}`);
 }
@@ -117,7 +117,7 @@ function parseSize(value, name) {
     const match = trimmed.match(/^(\d+(?:\.\d+)?)\s*([KMkm])?$/);
     if (!match || !match[1])
         throw new Error(`${name} must be a positive number with optional k/K (×1024) or m/M (×1024²) suffix: ${value}`);
-    const numericPart = Number.parseFloat(match[1]);
+    const numericPart = Number(match[1]);
     const suffix = match[2]?.toLowerCase();
     let bytes;
     if (suffix === 'k')
@@ -385,7 +385,7 @@ function parseArguments() {
         const argument = arguments_[index];
         if (!argument)
             continue;
-        if (argument === '--config' && arguments_[index + 1]) {
+        if (argument === '--config' && arguments_[index + 1] !== undefined) {
             customConfigPath = arguments_[index + 1];
             break;
         }
@@ -395,12 +395,12 @@ function parseArguments() {
         }
     }
     const rcPath = findRcFile(customConfigPath);
-    const rcConfig = rcPath ? loadRcFile(rcPath) : {};
     if (rcPath) {
         console.log((0, consoleColor_1.cyanLog)(`[SvelteESP32] Using config from: ${rcPath}`));
         if (!customConfigPath && node_path_1.default.dirname(rcPath) === process.cwd())
             console.warn((0, consoleColor_1.yellowLog)(`Warning: Loading config from current directory — verify this file is trusted before proceeding.`));
     }
+    const rcConfig = rcPath ? loadRcFile(rcPath) : {};
     const result = {
         engine: 'psychic',
         outputfile: 'svelteesp32.h',
@@ -487,14 +487,14 @@ function parseArguments() {
                 result.define = validateCppIdentifier(value, 'define');
                 break;
             case 'cachetime':
-                result.cachetime = Number.parseInt(value, 10);
+                result.cachetime = Math.trunc(Number(value));
                 if (Number.isNaN(result.cachetime))
                     throw new TypeError(`Invalid cachetime: ${value}`);
                 if (result.cachetime < 0)
                     throw new TypeError(`Invalid cachetime: ${value} (must be non-negative)`);
                 break;
             case 'cachetimehtml': {
-                result.cachetimeHtml = Number.parseInt(value, 10);
+                result.cachetimeHtml = Math.trunc(Number(value));
                 if (Number.isNaN(result.cachetimeHtml))
                     throw new TypeError(`Invalid cachetimehtml: ${value}`);
                 if (result.cachetimeHtml < 0)
@@ -502,7 +502,7 @@ function parseArguments() {
                 break;
             }
             case 'cachetimeassets': {
-                result.cachetimeAssets = Number.parseInt(value, 10);
+                result.cachetimeAssets = Math.trunc(Number(value));
                 if (Number.isNaN(result.cachetimeAssets))
                     throw new TypeError(`Invalid cachetimeassets: ${value}`);
                 if (result.cachetimeAssets < 0)

package/dist/consoleColor.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cyanLog = exports.redLog = exports.yellowLog = exports.greenLog = void 0;
-const greenLog = (s) => `\u001B[32m${s}\u001B[0m`;
+const greenLog = (s) => `\u{1B}[32m${s}\u{1B}[0m`;
 exports.greenLog = greenLog;
-const yellowLog = (s) => `\u001B[33m${s}\u001B[0m`;
+const yellowLog = (s) => `\u{1B}[33m${s}\u{1B}[0m`;
 exports.yellowLog = yellowLog;
-const redLog = (s) => `\u001B[31m${s}\u001B[0m`;
+const redLog = (s) => `\u{1B}[31m${s}\u{1B}[0m`;
 exports.redLog = redLog;
-const cyanLog = (s) => `\u001B[36m${s}\u001B[0m`;
+const cyanLog = (s) => `\u{1B}[36m${s}\u{1B}[0m`;
 exports.cyanLog = cyanLog;

package/dist/file.js

@@ -7,13 +7,12 @@ exports.getFiles = void 0;
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
-const picomatch_1 = __importDefault(require("picomatch"));
 const tinyglobby_1 = require("tinyglobby");
 const consoleColor_1 = require("./consoleColor");
 const errorMessages_1 = require("./errorMessages");
 const findSimilarFiles = (files) => {
     const contentComparer = new Map();
-    for (const [filename, fileData] of files.entries()) {
+    for (const [filename, fileData] of files) {
         const existingFiles = contentComparer.get(fileData.hash);
         if (existingFiles)
             existingFiles.push(filename);
@@ -38,17 +37,6 @@ const shouldSkipFile = (filename, allFilenames) => {
     }
     return false;
 };
-const isExcluded = (filename, excludePatterns) => {
-    if (excludePatterns.length === 0)
-        return false;
-    const normalizedFilename = filename.replace(/\\/g, '/');
-    const isMatch = (0, picomatch_1.default)(excludePatterns, {
-        dot: true,
-        noglobstar: false,
-        matchBase: false
-    });
-    return isMatch(normalizedFilename);
-};
 const getFiles = (options) => {
     const allFilenames = (0, tinyglobby_1.globSync)('**/*', {
         cwd: options.sourcepath,
@@ -59,13 +47,22 @@ const getFiles = (options) => {
     const withoutCompressed = allFilenames.filter((filename) => !shouldSkipFile(filename, allFilenames));
     const excludePatterns = options.exclude;
     const excludedFiles = [];
-    const filenames = withoutCompressed.filter((filename) => {
-        if (isExcluded(filename, excludePatterns)) {
-            excludedFiles.push(filename);
-            return false;
-        }
-        return true;
-    });
+    let filenames = withoutCompressed;
+    if (excludePatterns.length > 0) {
+        const allowedSet = new Set((0, tinyglobby_1.globSync)('**/*', {
+            cwd: options.sourcepath,
+            onlyFiles: true,
+            dot: false,
+            followSymbolicLinks: false,
+            ignore: excludePatterns
+        }));
+        filenames = [];
+        for (const filename of withoutCompressed)
+            if (allowedSet.has(filename))
+                filenames.push(filename);
+            else
+                excludedFiles.push(filename);
+    }
     if (excludedFiles.length > 0) {
         console.log(`\nExcluded ${excludedFiles.length} file(s):`);
         const displayLimit = 10;
@@ -91,7 +88,9 @@ const getFiles = (options) => {
     const duplicates = findSimilarFiles(result);
     for (const sameFiles of duplicates)
         console.log((0, consoleColor_1.yellowLog)(` ${sameFiles.join(', ')} files appear identical`));
-    const hasIndex = [...result.keys()].some((f) => f === 'index.html' || f === 'index.htm' || f.endsWith('/index.html') || f.endsWith('/index.htm'));
+    const hasIndex = result
+        .keys()
+        .some((f) => f === 'index.html' || f === 'index.htm' || f.endsWith('/index.html') || f.endsWith('/index.htm'));
     if (!hasIndex && !options.noIndexCheck)
         throw new Error((0, errorMessages_1.getMissingIndexError)(options.engine));
     return result;

package/dist/pipeline.js

@@ -8,11 +8,43 @@ exports.runPipeline = runPipeline;
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const node_zlib_1 = require("node:zlib");
-const mime_types_1 = require("mime-types");
 const consoleColor_1 = require("./consoleColor");
 const cppCode_1 = require("./cppCode");
 const errorMessages_1 = require("./errorMessages");
 const file_1 = require("./file");
+const MIME_TYPES = {
+    html: 'text/html',
+    htm: 'text/html',
+    css: 'text/css',
+    js: 'text/javascript',
+    mjs: 'text/javascript',
+    json: 'application/json',
+    png: 'image/png',
+    jpg: 'image/jpeg',
+    jpeg: 'image/jpeg',
+    gif: 'image/gif',
+    svg: 'image/svg+xml',
+    ico: 'image/x-icon',
+    webp: 'image/webp',
+    woff: 'font/woff',
+    woff2: 'font/woff2',
+    ttf: 'font/ttf',
+    otf: 'font/otf',
+    eot: 'application/vnd.ms-fontobject',
+    mp3: 'audio/mpeg',
+    wav: 'audio/wav',
+    mp4: 'video/mp4',
+    webm: 'video/webm',
+    ogg: 'audio/ogg',
+    txt: 'text/plain',
+    xml: 'application/xml',
+    pdf: 'application/pdf',
+    map: 'application/json'
+};
+const mimeLookup = (filename) => {
+    const extension = node_path_1.default.extname(filename).slice(1).toLowerCase();
+    return MIME_TYPES[extension] ?? false;
+};
 const GZIP_MIN_SIZE = 1024;
 const GZIP_MIN_REDUCTION_RATIO = 0.85;
 const shouldUseGzip = (originalSize, compressedSize) => originalSize > GZIP_MIN_SIZE && compressedSize < originalSize * GZIP_MIN_REDUCTION_RATIO;
@@ -187,14 +219,14 @@ function runPipeline(options) {
     const files = (0, file_1.getFiles)(options);
     if (files.size === 0)
         throw new Error(`Directory ${options.sourcepath} is empty`);
-    if (options.spa && ![...files.keys()].some((f) => f === 'index.html' || f === 'index.htm'))
+    if (options.spa && files.keys().every((f) => !(f === 'index.html' || f === 'index.htm')))
         console.warn((0, consoleColor_1.yellowLog)('[SvelteESP32] Warning: --spa is set but no index.html/index.htm found; catch-all will not be generated.'));
     console.log();
     console.log('Translation to header file');
-    const longestFilename = [...files.keys()].reduce((p, c) => Math.max(c.length, p), 0);
+    const longestFilename = files.keys().reduce((p, c) => Math.max(c.length, p), 0);
     for (const [originalFilename, fileData] of files) {
         const { content, hash: sha256 } = fileData;
-        const rawMime = (0, mime_types_1.lookup)(originalFilename);
+        const rawMime = mimeLookup(originalFilename);
         if (!rawMime)
             console.log((0, consoleColor_1.yellowLog)(` [${originalFilename}] unknown MIME type for extension '${node_path_1.default.extname(originalFilename)}', using text/plain`));
         const mimeType = rawMime || 'text/plain';
@@ -253,8 +285,9 @@ function runPipeline(options) {
             }
             catch {
             }
+        const now = new Date();
         const manifest = {
-            generated: new Date().toISOString(),
+            generated: now.toISOString(),
             engine: options.engine,
             etag: options.etag,
             gzip: options.gzip,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelteesp32",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Convert Svelte (or any frontend) JS application to serve it from ESP32 webserver (PsychicHttp)",
   "author": "BCsabaEngine",
   "license": "ISC",
@@ -71,24 +71,23 @@
   ],
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/mime-types": "^3.0.1",
-    "@types/node": "^25.6.2",
+    "@types/node": "^25.9.3",
     "@types/picomatch": "^4.0.3",
-    "@typescript-eslint/eslint-plugin": "^8.59.3",
-    "@typescript-eslint/parser": "^8.59.3",
-    "@vitest/coverage-v8": "^4.1.6",
-    "eslint": "^10.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.61.1",
+    "@typescript-eslint/parser": "^8.61.1",
+    "@vitest/coverage-v8": "^4.1.9",
+    "eslint": "^10.5.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-simple-import-sort": "^13.0.0",
-    "eslint-plugin-unicorn": "^64.0.0",
+    "eslint-plugin-unicorn": "^66.0.0",
     "globals": "^17.6.0",
-    "memfs": "^4.57.2",
+    "memfs": "^4.57.7",
     "nodemon": "^3.1.14",
-    "prettier": "^3.8.3",
+    "prettier": "^3.8.4",
     "ts-node": "^10.9.2",
-    "tsx": "^4.21.0",
+    "tsx": "^4.22.4",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.6"
+    "vitest": "^4.1.9"
   },
   "peerDependencies": {
     "vite": ">=5"
@@ -99,8 +98,6 @@
     }
   },
   "dependencies": {
-    "mime-types": "^3.0.2",
-    "picomatch": "^4.0.4",
-    "tinyglobby": "^0.2.16"
+    "tinyglobby": "^0.2.17"
   }
 }