webspresso 0.0.79 → 0.0.81

package/plugins/upload/index.js

@@ -54,12 +54,12 @@ function extensionFromName(name) {
  * @param {string} fieldName
  * @returns {import('express').RequestHandler}
  */
-function createMulterSingleMiddleware(maxBytes, fieldName) {
+function createMulterMiddleware(maxBytes, fieldName, multiple, maxFiles) {
   const upload = multer({
     storage: multer.memoryStorage(),
-    limits: { fileSize: maxBytes, files: 1 },
+    limits: { fileSize: maxBytes, files: multiple ? maxFiles : 1 },
   });
-  return upload.single(fieldName);
+  return multiple ? upload.array(fieldName, maxFiles) : upload.single(fieldName);
 }
 
 /**
@@ -91,6 +91,8 @@ function multerErrorResponse(err) {
  * @param {string[]|null} [options.extensionAllowlist] — Optional extra guard on original extension
  * @param {import('express').RequestHandler|import('express').RequestHandler[]} [options.middleware]
  * @param {string} [options.fieldName='file'] — Multipart field name
+ * @param {boolean} [options.multiple=false] — Allow multiple file uploads
+ * @param {number} [options.maxFiles=10] — Max files to allow when multiple is true
  * @returns {Object} Webspresso plugin
  */
 function uploadPlugin(options = {}) {
@@ -103,6 +105,8 @@ function uploadPlugin(options = {}) {
     extensionAllowlist = null,
     middleware = [],
     fieldName = 'file',
+    multiple = false,
+    maxFiles = 10,
   } = options;
 
   const normalizedPath = normalizeRoutePath(routePath);
@@ -115,7 +119,7 @@ function uploadPlugin(options = {}) {
     });
 
   const mw = (Array.isArray(middleware) ? middleware : [middleware]).filter(Boolean);
-  const parseMultipart = createMulterSingleMiddleware(maxBytes, fieldName);
+  const parseMultipart = createMulterMiddleware(maxBytes, fieldName, multiple, maxFiles);
 
   return {
     name: 'upload',
@@ -133,39 +137,58 @@ function uploadPlugin(options = {}) {
             return res.status(status).json({ error: message, message });
           }
 
-          const file = req.file;
-          if (!file || !file.buffer) {
+          const files = multiple ? (req.files || []) : (req.file ? [req.file] : []);
+          if (files.length === 0) {
             return res.status(400).json({ error: 'No file uploaded', message: 'No file uploaded' });
           }
 
-          const mime = file.mimetype || 'application/octet-stream';
-          const originalName = file.originalname || 'upload';
-          const ext = extensionFromName(originalName);
-
-          if (mimeAllowlist && mimeAllowlist.length && !mimeAllowlist.includes(mime)) {
-            return res.status(415).json({ error: 'MIME type not allowed', message: 'MIME type not allowed' });
-          }
-          if (
-            extensionAllowlist &&
-            extensionAllowlist.length &&
-            (!ext || !extensionAllowlist.includes(ext))
-          ) {
-            return res.status(400).json({ error: 'File extension not allowed', message: 'File extension not allowed' });
+          // Validate all files first
+          for (const file of files) {
+            if (!file || !file.buffer) {
+              return res.status(400).json({ error: 'No file uploaded', message: 'No file uploaded' });
+            }
+
+            const mime = file.mimetype || 'application/octet-stream';
+            const originalName = file.originalname || 'upload';
+            const ext = extensionFromName(originalName);
+
+            if (mimeAllowlist && mimeAllowlist.length && !mimeAllowlist.includes(mime)) {
+              return res.status(415).json({ error: 'MIME type not allowed', message: 'MIME type not allowed' });
+            }
+            if (
+              extensionAllowlist &&
+              extensionAllowlist.length &&
+              (!ext || !extensionAllowlist.includes(ext))
+            ) {
+              return res.status(400).json({ error: 'File extension not allowed', message: 'File extension not allowed' });
+            }
           }
 
           try {
-            const result = await provider.put({
-              buffer: file.buffer,
-              originalName,
-              mimeType: mime,
-              size: file.size,
-              req,
-            });
-            res.json({
-              url: result.publicUrl,
-              publicUrl: result.publicUrl,
-              key: result.key,
+            const uploadPromises = files.map(async (file) => {
+              const mime = file.mimetype || 'application/octet-stream';
+              const originalName = file.originalname || 'upload';
+              const result = await provider.put({
+                buffer: file.buffer,
+                originalName,
+                mimeType: mime,
+                size: file.size,
+                req,
+              });
+              return {
+                url: result.publicUrl,
+                publicUrl: result.publicUrl,
+                key: result.key,
+              };
             });
+
+            const results = await Promise.all(uploadPromises);
+
+            if (multiple) {
+              res.json(results);
+            } else {
+              res.json(results[0]);
+            }
           } catch (e) {
             const message = e instanceof Error ? e.message : String(e);
             res.status(500).json({ error: message, message });

package/src/file-router.js

@@ -644,6 +644,81 @@ function mountPages(app, options) {
   
   // Get absolute path to pages directory
   const absolutePagesDir = path.resolve(pagesDir);
+
+  // Routing and file-system checks at startup
+  function checkRoutesAtStartup() {
+    function getGenericSegment(name) {
+      if (name.startsWith('[') && name.endsWith(']')) {
+        const inner = name.slice(1, -1);
+        if (inner.startsWith('...')) return '*';
+        return ':param';
+      }
+      return name;
+    }
+
+    function checkDir(dirPath, relativeDir = '', isApi = false) {
+      if (!fs.existsSync(dirPath)) return;
+      const children = fs.readdirSync(dirPath);
+      const kept = [];
+
+      for (const child of children) {
+        if (child.startsWith('_') || child === 'locales') continue;
+        const fullPath = path.join(dirPath, child);
+        const relPath = relativeDir ? path.join(relativeDir, child) : child;
+        const stats = fs.statSync(fullPath);
+
+        // 1. Check case-sensitivity issues
+        if (child !== child.toLowerCase()) {
+          console.warn(`[webspresso] WARNING: Path "pages/${relPath.split(path.sep).join('/')}" contains uppercase letters. Use lowercase to avoid routing issues on case-sensitive filesystems.`);
+        }
+
+        if (stats.isDirectory()) {
+          if (child === 'api' && relativeDir === '') {
+            checkDir(fullPath, relPath, true);
+          } else {
+            checkDir(fullPath, relPath, isApi);
+            if (!isApi) {
+              kept.push({ name: child, isDir: true, original: child });
+            }
+          }
+        } else {
+          const ext = path.extname(child);
+          if (isApi) {
+            if (ext === '.js') {
+              const base = path.basename(child, ext);
+              kept.push({ name: base, isDir: false, original: child });
+            }
+          } else {
+            if (ext === '.njk') {
+              const base = path.basename(child, ext);
+              kept.push({ name: base, isDir: false, original: child });
+            }
+          }
+        }
+      }
+
+      // 2. Check dynamic route collisions
+      const groups = new Map();
+      for (const item of kept) {
+        const normalized = getGenericSegment(item.name);
+        if (!groups.has(normalized)) {
+          groups.set(normalized, []);
+        }
+        groups.get(normalized).push(item);
+      }
+
+      for (const [norm, items] of groups.entries()) {
+        if (items.length > 1) {
+          const namesList = items.map(item => `"${item.original}"`).join(' and ');
+          console.warn(`[webspresso] WARNING: Dynamic route collision in "pages/${relativeDir.split(path.sep).join('/')}": ${namesList} resolve to the same segment "${norm}" and will conflict at runtime.`);
+        }
+      }
+    }
+
+    checkDir(absolutePagesDir, '');
+  }
+
+  checkRoutesAtStartup();
   
   // Load global hooks
   const globalHooks = loadGlobalHooks(absolutePagesDir, isDev);

package/templates/skills/webspresso-usage/REFERENCE-framework.md

@@ -202,6 +202,7 @@ Pass **`db`** into **`createApp({ db })`** so **`ctx.db`** works in pages and pl
 | `siteAnalyticsPlugin` | Self-hosted page views + admin charts |
 | `auditLogPlugin` | Admin mutation audit trail |
 | `recaptchaPlugin` | v2/v3 + middleware |
+| `emailPlugin` | MJML + Nodemailer sending with optional admin UI and auth bridge |
 | `seoCheckerPlugin` | Dev SEO panel |
 | `restResourcePlugin` | Opt-in REST CRUD from models; `?include=` uses ORM eager load (single-level relations only) |
 | `ormCacheAdminPlugin` | Admin page for ORM cache metrics / purge / invalidate (`db.cache` required) |