webspresso 0.0.101 → 0.0.103

package/src/file-router.js

@@ -5,9 +5,9 @@
 
 const fs = require('fs');
 const path = require('path');
-const { ZodError } = require('zod');
 const { compileSchema, invalidateSchema } = require('../core/compileSchema');
 const { applySchema } = require('../core/applySchema');
+const { translateValidationIssues, getTranslatorForRequest } = require('./api/validation-i18n');
 const { createHelpers, getAssetManager } = require('./helpers');
 const {
   loadNjkRouteTemplate,
@@ -190,6 +190,10 @@ const translatorCache = new Map();
 
 function clearTranslatorCache() {
   translatorCache.clear();
+  intlNumberFormatCache.clear();
+  intlDateTimeFormatCache.clear();
+  intlRelativeTimeFormatCache.clear();
+  filePathToRouteCache.clear();
 }
 
 // Cache for route configs in production
@@ -215,6 +219,48 @@ const methodFromFilenameCache = new Map();
 // Cache for translation param replacement regexes
 const paramRegexCache = new Map();
 
+// Caches for file-to-route resolution and Intl formatters
+const filePathToRouteCache = new Map();
+const intlNumberFormatCache = new Map();
+const intlDateTimeFormatCache = new Map();
+const intlRelativeTimeFormatCache = new Map();
+
+function getCachedNumberFormat(locale, opts) {
+  const key = opts ? `${locale}::${JSON.stringify(opts)}` : locale;
+  let fmt = intlNumberFormatCache.get(key);
+  if (!fmt) {
+    fmt = new Intl.NumberFormat(locale, opts);
+    if (intlNumberFormatCache.size < 500) {
+      intlNumberFormatCache.set(key, fmt);
+    }
+  }
+  return fmt;
+}
+
+function getCachedDateTimeFormat(locale, opts) {
+  const key = opts ? `${locale}::${JSON.stringify(opts)}` : locale;
+  let fmt = intlDateTimeFormatCache.get(key);
+  if (!fmt) {
+    fmt = new Intl.DateTimeFormat(locale, opts);
+    if (intlDateTimeFormatCache.size < 500) {
+      intlDateTimeFormatCache.set(key, fmt);
+    }
+  }
+  return fmt;
+}
+
+function getCachedRelativeTimeFormat(locale, opts) {
+  const key = opts ? `${locale}::${JSON.stringify(opts)}` : locale;
+  let fmt = intlRelativeTimeFormatCache.get(key);
+  if (!fmt) {
+    fmt = new Intl.RelativeTimeFormat(locale, opts);
+    if (intlRelativeTimeFormatCache.size < 500) {
+      intlRelativeTimeFormatCache.set(key, fmt);
+    }
+  }
+  return fmt;
+}
+
 const MAX_LOCALE_LEN = 16;
 
 let cachedSupportedLocalesRaw = null;
@@ -404,6 +450,12 @@ function isApiRouteFile(file) {
  * @returns {string} Express route pattern
  */
 function filePathToRoute(filePath, ext) {
+  const cacheKey = filePath + '::' + ext;
+  const cached = filePathToRouteCache.get(cacheKey);
+  if (cached !== undefined) {
+    return cached;
+  }
+
   // Remove extension
   let route = filePath.replace(ext, '');
   
@@ -429,6 +481,10 @@ function filePathToRoute(filePath, ext) {
     route = '/' + route;
   }
   
+  if (filePathToRouteCache.size < 5000) {
+    filePathToRouteCache.set(cacheKey, route);
+  }
+
   return route;
 }
 
@@ -494,15 +550,15 @@ function routeRegistrationMeta(routePath) {
  * @param {{ routePath: string }} b
  */
 function compareRouteRegistrationOrder(a, b) {
-  const ma = routeRegistrationMeta(a.routePath);
-  const mb = routeRegistrationMeta(b.routePath);
+  const ma = a._regMeta || (a._regMeta = routeRegistrationMeta(a.routePath));
+  const mb = b._regMeta || (b._regMeta = routeRegistrationMeta(b.routePath));
   if (ma.tier !== mb.tier) return ma.tier - mb.tier;
   if (ma.literalSegCount !== mb.literalSegCount) {
     return mb.literalSegCount - ma.literalSegCount;
   }
   if (ma.depth !== mb.depth) return mb.depth - ma.depth;
   if (ma.paramSegCount !== mb.paramSegCount) return ma.paramSegCount - mb.paramSegCount;
-  return ma.routePath.localeCompare(mb.routePath);
+  return ma.routePath < mb.routePath ? -1 : (ma.routePath > mb.routePath ? 1 : 0);
 }
 
 /**
@@ -886,8 +942,8 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
       return value;
     }
 
-    // Replace params like {{name}} in the translation
-    if (interpolationParams && interpolationParams !== EMPTY_OBJECT && Object.keys(interpolationParams).length > 0) {
+    // Replace params like {{name}} in the translation (skip if no placeholders in template)
+    if (value.includes('{{') && interpolationParams && interpolationParams !== EMPTY_OBJECT && Object.keys(interpolationParams).length > 0) {
       for (const [paramKey, paramValue] of Object.entries(interpolationParams)) {
         let regex = paramRegexCache.get(paramKey);
         if (regex === undefined) {
@@ -911,7 +967,7 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
   t.number = function formatNumber(num, numOpts) {
     if (num === null || num === undefined || Number.isNaN(Number(num))) return '';
     try {
-      return new Intl.NumberFormat(locale, numOpts).format(Number(num));
+      return getCachedNumberFormat(locale, numOpts).format(Number(num));
     } catch {
       return String(num);
     }
@@ -921,7 +977,7 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
   t.currency = function formatCurrency(amount, currency = 'USD', currOpts = {}) {
     if (amount === null || amount === undefined || Number.isNaN(Number(amount))) return '';
     try {
-      return new Intl.NumberFormat(locale, { style: 'currency', currency, ...currOpts }).format(Number(amount));
+      return getCachedNumberFormat(locale, { style: 'currency', currency, ...currOpts }).format(Number(amount));
     } catch {
       return `${amount} ${currency}`;
     }
@@ -933,7 +989,7 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
     try {
       const d = date instanceof Date ? date : new Date(date);
       if (Number.isNaN(d.getTime())) return '';
-      return new Intl.DateTimeFormat(locale, dateOpts).format(d);
+      return getCachedDateTimeFormat(locale, dateOpts).format(d);
     } catch {
       return String(date);
     }
@@ -943,7 +999,7 @@ function createTranslator(translations = {}, options = EMPTY_OBJECT) {
   t.relativeTime = function formatRelativeTime(val, unit = 'day', relOpts = { numeric: 'auto' }) {
     if (val === null || val === undefined || Number.isNaN(Number(val))) return '';
     try {
-      return new Intl.RelativeTimeFormat(locale, relOpts).format(Number(val), unit);
+      return getCachedRelativeTimeFormat(locale, relOpts).format(Number(val), unit);
     } catch {
       return `${val} ${unit}`;
     }
@@ -1133,86 +1189,92 @@ 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;
+  // Single-pass directory scanner with startup collision & case-sensitivity checks (0 statSync calls)
+  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);
+  function scanAndCheckDir(dirPath, relativeDir = '', isApi = false) {
+    if (!fs.existsSync(dirPath)) return [];
+    let children;
+    try {
+      children = fs.readdirSync(dirPath, { withFileTypes: true });
+    } catch (_) {
+      return [];
+    }
+    const kept = [];
+    const files = [];
+
+    for (const entry of children) {
+      const child = entry.name;
+      if (child.startsWith('_') || child === 'locales') continue;
+      const fullPath = path.join(dirPath, child);
+      const relPath = relativeDir ? path.join(relativeDir, child) : child;
+
+      // 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.`);
+      }
 
-        // 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 (entry.isDirectory()) {
+        if (child === 'api' && relativeDir === '') {
+          files.push(...scanAndCheckDir(fullPath, relPath, true));
+        } else {
+          files.push(...scanAndCheckDir(fullPath, relPath, isApi));
+          if (!isApi) {
+            kept.push({ name: child, isDir: true, original: child });
+          }
         }
-
-        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 if (entry.isFile()) {
+        files.push(relPath);
+        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 {
-          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 });
-            }
+          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);
+    // 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.`);
-        }
+    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, '');
+    return files;
   }
 
-  checkRoutesAtStartup();
-  
   // Load global hooks
   const globalHooks = loadGlobalHooks(absolutePagesDir, isDev);
   
-  // Scan for files
-  const files = scanDirectory(absolutePagesDir);
+  // Single-pass scan for files and checks (bypassed if pre-scanned files provided by discovery phase)
+  const files = (Array.isArray(options.scannedFiles) && options.scannedFiles.length >= 0)
+    ? options.scannedFiles
+    : scanAndCheckDir(absolutePagesDir, '');
+  const filesSet = new Set(files);
   
   // Separate SSR pages and API routes
   const ssrRoutes = [];
@@ -1239,7 +1301,9 @@ function mountPages(app, options) {
     } else if (ext === '.njk') {
       // SSR page
       const routePath = filePathToRoute(file, '.njk');
-      const configPath = path.join(absolutePagesDir, file.replace('.njk', '.js'));
+      const configRel = file.replace(/\.njk$/, '.js');
+      const hasCompanionConfig = filesSet.has(configRel);
+      const configPath = path.join(absolutePagesDir, configRel);
       const routeDir = path.dirname(path.join(absolutePagesDir, file));
       
       ssrRoutes.push({
@@ -1247,6 +1311,7 @@ function mountPages(app, options) {
         routePath,
         fullPath: path.join(absolutePagesDir, file),
         configPath,
+        hasCompanionConfig,
         routeDir
       });
     }
@@ -1280,21 +1345,27 @@ function mountPages(app, options) {
       if (options.skipExistingRoutes && options.skipExistingRoutes.has(route.method || 'GET', route.routePath)) {
         continue;
       }
-      const handler = require(route.fullPath);
-      const handlerFn = typeof handler === 'function' ? handler : handler.default || handler.handler;
-      const routeMiddleware = handler.middleware;
-
-      const preResolvedMw = routeMiddleware
-        ? resolveMiddlewares(routeMiddleware, middlewares)
-        : EMPTY_ARRAY;
-    
-      if (typeof handlerFn !== 'function') {
-        console.warn(`API route ${route.file} does not export a function`);
-        continue;
-      }
-
+      let handlerFn = null;
+      let preResolvedMw = null;
       let preCompiledSchema = null;
+
+      // In production, eager-load to compile schemas & fail fast at startup
       if (!isDev) {
+        let handler;
+        try {
+          handler = require(route.fullPath);
+        } catch (loadErr) {
+          console.error(`Failed to load API route ${route.file}:`, loadErr);
+          continue;
+        }
+        handlerFn = typeof handler === 'function' ? handler : handler.default || handler.handler;
+        if (typeof handlerFn !== 'function') {
+          console.warn(`API route ${route.file} does not export a function`);
+          continue;
+        }
+        preResolvedMw = handler.middleware
+          ? resolveMiddlewares(handler.middleware, middlewares)
+          : EMPTY_ARRAY;
         try {
           preCompiledSchema = compileSchema(route.fullPath, handler);
         } catch (schemaErr) {
@@ -1329,11 +1400,29 @@ function mountPages(app, options) {
             if (require.cache[require.resolve(route.fullPath)]) {
               delete require.cache[require.resolve(route.fullPath)];
             }
-            const currentHandler = require(route.fullPath);
+            let currentHandler;
+            try {
+              currentHandler = require(route.fullPath);
+            } catch (err) {
+              console.error(`Failed to load API route ${route.file}:`, err);
+              return res.status(500).json({ error: 'Internal Server Error', message: `Failed to load API route: ${err.message}` });
+            }
             fn = typeof currentHandler === 'function' 
               ? currentHandler 
               : currentHandler.default || currentHandler.handler;
 
+            if (typeof fn !== 'function') {
+              console.warn(`API route ${route.file} does not export a function`);
+              return res.status(500).json({ error: 'Internal Server Error', message: `Route ${route.file} does not export a valid handler function` });
+            }
+
+            // Stateful middlewares (e.g. rate limiters) must be resolved once and preserved across requests
+            if (preResolvedMw === null) {
+              preResolvedMw = currentHandler.middleware
+                ? resolveMiddlewares(currentHandler.middleware, middlewares)
+                : EMPTY_ARRAY;
+            }
+
             invalidateSchema(route.fullPath);
             try {
               compiledSchema = compileSchema(route.fullPath, currentHandler);
@@ -1344,13 +1433,21 @@ function mountPages(app, options) {
             }
           }
 
+          const routeMw = preResolvedMw || EMPTY_ARRAY;
+
           try {
             applySchema(req, compiledSchema);
           } catch (err) {
-            if (err instanceof ZodError) {
+            if (err && (err.name === 'ZodError' || Array.isArray(err.issues))) {
+              const translatedIssues = translateValidationIssues(err.issues, {
+                req,
+                pagesDir: absolutePagesDir,
+                routeDir: route.routeDir || (route.fullPath ? path.dirname(route.fullPath) : ''),
+                isDev,
+              });
               return res.status(400).json({
                 error: 'Validation Error',
-                issues: err.issues,
+                issues: translatedIssues,
               });
             }
             throw err;
@@ -1363,11 +1460,18 @@ function mountPages(app, options) {
             if (res.headersSent) return;
           }
 
-          // Run middleware if defined (resolved at route registration — required for stateful middleware like express-rate-limit)
-          if (preResolvedMw.length) {
-            await runMiddlewareChain(preResolvedMw, req, res);
+          // Run middleware if defined
+          if (routeMw.length) {
+            await runMiddlewareChain(routeMw, req, res);
             if (res.headersSent) return;
           }
+
+          const tr = getTranslatorForRequest(req, {
+            pagesDir: absolutePagesDir,
+            routeDir: route.routeDir || (route.fullPath ? path.dirname(route.fullPath) : ''),
+            isDev,
+          });
+
           const apiCtx = Object.assign((err) => next(err), {
             req,
             res,
@@ -1376,6 +1480,8 @@ function mountPages(app, options) {
             query: req.query || {},
             body: req.body || {},
             input: req.input,
+            locale: tr.locale,
+            t: tr.t,
             service: req.service,
             db,
             sse: res.sse,
@@ -1404,10 +1510,12 @@ function mountPages(app, options) {
       if (options.skipExistingRoutes && options.skipExistingRoutes.has('GET', route.routePath)) {
         continue;
       }
-      const mountConfig = loadRouteConfig(route.configPath, isDev);
-      const preResolvedPageMw = mountConfig?.middleware
+      const mountConfig = (!isDev && route.hasCompanionConfig)
+        ? loadRouteConfig(route.configPath, false)
+        : null;
+      let preResolvedPageMw = mountConfig?.middleware
         ? resolveMiddlewares(mountConfig.middleware, middlewares)
-        : EMPTY_ARRAY;
+        : (!isDev ? EMPTY_ARRAY : null);
       const staticRouteHooks = mountConfig?.hooks || EMPTY_OBJECT;
 
       app.get(route.routePath, async (req, res, next) => {
@@ -1455,8 +1563,16 @@ function mountPages(app, options) {
           }
           
           // Load route config
-          const config = isDev ? loadRouteConfig(route.configPath, true) : mountConfig;
+          const config = isDev
+            ? (route.hasCompanionConfig ? loadRouteConfig(route.configPath, true) : null)
+            : mountConfig;
           const routeHooks = isDev ? (config?.hooks || EMPTY_OBJECT) : staticRouteHooks;
+          if (preResolvedPageMw === null) {
+            preResolvedPageMw = config?.middleware
+              ? resolveMiddlewares(config.middleware, middlewares)
+              : EMPTY_ARRAY;
+          }
+          const pageMw = preResolvedPageMw;
         
         // Create context with plugin helpers merged
         const baseHelpers = createHelpers({ req, res, locale, t });
@@ -1521,9 +1637,9 @@ function mountPages(app, options) {
           if (res.headersSent) return;
         }
 
-        // Run route middleware (chain fixed at route registration; edit middleware in dev → restart)
-        if (preResolvedPageMw.length) {
-          await runMiddlewareChain(preResolvedPageMw, req, res);
+        // Run route middleware
+        if (pageMw.length) {
+          await runMiddlewareChain(pageMw, req, res);
           if (res.headersSent) return;
         }
         
@@ -1758,5 +1874,7 @@ module.exports = {
   clearCompiledStringTemplateCache,
   translatorCache,
   clearTranslatorCache,
+  translateValidationIssues,
+  getTranslatorForRequest,
 };