webspresso 0.0.97 → 0.0.99

package/src/njk-frontmatter.js

@@ -152,9 +152,20 @@ function loadNjkRouteTemplate(absPath, isDev) {
   return fresh;
 }
 
+const clearHooks = new Set();
+
+function registerClearHook(fn) {
+  if (typeof fn === 'function') clearHooks.add(fn);
+}
+
 function clearNjkFrontmatterCaches() {
   prodRouteCache.clear();
   devRouteCache.clear();
+  for (const fn of clearHooks) {
+    try {
+      fn();
+    } catch (_) {}
+  }
 }
 
 module.exports = {
@@ -162,5 +173,6 @@ module.exports = {
   frontmatterToPatches,
   loadNjkRouteTemplate,
   clearNjkFrontmatterCaches,
+  registerClearHook,
   extractFrontmatterBlock,
 };

package/src/pages/page-loader.js

@@ -8,8 +8,16 @@
 
 const fs = require('fs');
 const path = require('path');
-const { createHelpers } = require('../helpers');
-const { loadI18n, createTranslator, detectLocale, resolveMiddlewares } = require('../file-router');
+const { createHelpers, getAssetManager } = require('../helpers');
+const {
+  loadI18n,
+  createTranslator,
+  detectLocale,
+  resolveMiddlewares,
+  translatorCache,
+  resolvePageAssets,
+  applyPageAssetsToTemplateData,
+} = require('../file-router');
 
 const EMPTY_ARRAY = Object.freeze([]);
 
@@ -111,13 +119,29 @@ function createPageHandler(descriptor, context) {
 
       // i18n
       const defaultLocale = process.env.DEFAULT_LOCALE || 'en';
-      const translations = loadI18n(pagesDir, '', locale, isDev);
-      const fallbackTranslations = locale !== defaultLocale ? loadI18n(pagesDir, '', defaultLocale, isDev) : undefined;
-      const t = createTranslator(translations, {
-        locale,
-        fallbackTranslations,
-        fallbackLocale: defaultLocale,
-      });
+      let t;
+      if (!isDev && translatorCache) {
+        const transKey = `${pagesDir}::::${locale}::${defaultLocale}`;
+        t = translatorCache.get(transKey);
+        if (!t) {
+          const translations = loadI18n(pagesDir, '', locale, false);
+          const fallbackTranslations = locale !== defaultLocale ? loadI18n(pagesDir, '', defaultLocale, false) : undefined;
+          t = createTranslator(translations, {
+            locale,
+            fallbackTranslations,
+            fallbackLocale: defaultLocale,
+          });
+          translatorCache.set(transKey, t);
+        }
+      } else {
+        const translations = loadI18n(pagesDir, '', locale, isDev);
+        const fallbackTranslations = locale !== defaultLocale ? loadI18n(pagesDir, '', defaultLocale, isDev) : undefined;
+        t = createTranslator(translations, {
+          locale,
+          fallbackTranslations,
+          fallbackLocale: defaultLocale,
+        });
+      }
 
       const pageCtx = {
         req,
@@ -163,10 +187,36 @@ function createPageHandler(descriptor, context) {
       const templateExists = hasNjkTemplate !== null ? hasNjkTemplate : fs.existsSync(njkCandidate);
 
       if (templateExists && nunjucks) {
+        let pageHead = headData;
+        let pageAssetsActive = false;
+        const pageAssetsOpt = context.pageAssets || (appOptions && appOptions.pageAssets);
+        if (pageAssetsOpt) {
+          const pageAssetsResolved = resolvePageAssets(pageAssetsOpt);
+          if (pageAssetsResolved.enabled) {
+            const pageAssetBundle = applyPageAssetsToTemplateData(
+              pageAssetsResolved,
+              loadedData,
+              {
+                file: descriptor.source || descriptor.file,
+                routePath: descriptor.path,
+              },
+              fsy?.assetManager || getAssetManager()
+            );
+            loadedData = pageAssetBundle.data;
+            pageHead = {
+              ...headData,
+              stylesheets: [...(headData.stylesheets || []), ...(pageAssetBundle.pageHead?.stylesheets || [])],
+              scripts: [...(headData.scripts || []), ...(pageAssetBundle.pageHead?.scripts || [])],
+            };
+            pageAssetsActive = true;
+          }
+        }
+
         const templateData = {
           ...loadedData,
-          head: headData,
-          pageHead: headData,
+          head: pageHead,
+          pageHead,
+          pageAssets: pageAssetsActive || Boolean(loadedData.pageAssets),
           fsy,
           locale,
           t,

package/src/routing/cascading.js

@@ -0,0 +1,378 @@
+/**
+ * Webspresso Cascading Middleware & Nested Layout Engine
+ * Provides folder-level _middleware.js inheritance and _layout.njk template nesting
+ * @module src/routing/cascading
+ */
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { resolveMiddlewares } = require('./middleware-resolver');
+const { loadNjkRouteTemplate } = require('../njk-frontmatter');
+
+const EMPTY_ARRAY = Object.freeze([]);
+
+// Caches for production mode (key: directory path)
+const middlewareFileCache = new Map();
+const layoutFileCache = new Map();
+
+/**
+ * Returns ancestor directory segments from root down to file's directory.
+ * E.g., 'dashboard/settings/profile.njk' -> ['', 'dashboard', 'dashboard/settings']
+ *
+ * @param {string} relativeFilePath
+ * @returns {string[]}
+ */
+function getDirectoryChain(relativeFilePath) {
+  const normalized = relativeFilePath.split(/[/\\]/).join('/');
+  const dir = path.posix.dirname(normalized);
+
+  if (dir === '.' || dir === '') {
+    return [''];
+  }
+
+  const parts = dir.split('/');
+  const chain = [''];
+  let current = '';
+
+  for (const part of parts) {
+    if (!part) continue;
+    current = current ? `${current}/${part}` : part;
+    chain.push(current);
+  }
+
+  return chain;
+}
+
+/**
+ * Check if a template content explicitly declares its own layout inheritance via `{% extends ... %}`
+ *
+ * @param {string} [templateBody]
+ * @param {string} [fullPath]
+ * @returns {boolean}
+ */
+function templateHasExtends(templateBody, fullPath) {
+  if (typeof templateBody === 'string' && /\{%\s*extends\s+/.test(templateBody)) {
+    return true;
+  }
+  if (fullPath && fs.existsSync(fullPath)) {
+    try {
+      const content = fs.readFileSync(fullPath, 'utf8');
+      return /\{%\s*extends\s+/.test(content);
+    } catch (_) {}
+  }
+  return false;
+}
+
+/**
+ * Discover all existing _middleware.js files in directory chain (from root to target dir).
+ *
+ * @param {string} baseDir - Base pages directory
+ * @param {string} relativeFilePath - Relative file path
+ * @param {boolean} [isDev=false]
+ * @returns {string[]} Absolute paths to existing _middleware.js files
+ */
+function findCascadingMiddlewareFiles(baseDir, relativeFilePath, isDev = false) {
+  const chain = getDirectoryChain(relativeFilePath);
+  const cacheKey = `${baseDir}::${chain.join('>')}`;
+
+  if (!isDev && middlewareFileCache.has(cacheKey)) {
+    return middlewareFileCache.get(cacheKey);
+  }
+
+  const existingFiles = [];
+  for (const dirSegment of chain) {
+    const middlewarePath = dirSegment === ''
+      ? path.join(baseDir, '_middleware.js')
+      : path.join(baseDir, ...dirSegment.split('/'), '_middleware.js');
+
+    if (fs.existsSync(middlewarePath)) {
+      existingFiles.push(middlewarePath);
+    }
+  }
+
+  if (!isDev) {
+    middlewareFileCache.set(cacheKey, existingFiles);
+  }
+
+  return existingFiles;
+}
+
+/**
+ * Loads and resolves cascading middlewares for a given route file.
+ *
+ * @param {string} baseDir - Base directory (e.g. pagesDir)
+ * @param {string} relativeFilePath - Relative file path
+ * @param {Object} middlewareRegistry - Available named middlewares
+ * @param {boolean} [isDev=false]
+ * @returns {Function[]} Ordered list of resolved Express middleware functions
+ */
+function loadCascadingMiddlewares(baseDir, relativeFilePath, middlewareRegistry = {}, isDev = false) {
+  const files = findCascadingMiddlewareFiles(baseDir, relativeFilePath, isDev);
+  if (files.length === 0) return EMPTY_ARRAY;
+
+  const resolved = [];
+
+  for (const file of files) {
+    try {
+      if (isDev && require.cache[require.resolve(file)]) {
+        delete require.cache[require.resolve(file)];
+      }
+
+      const mod = require(file);
+      const candidate = mod?.default || mod;
+      const raw = typeof candidate === 'function'
+        ? candidate
+        : (candidate?.middleware || mod?.middleware || candidate);
+
+      if (!raw) continue;
+
+      if (typeof raw === 'function') {
+        resolved.push(raw);
+      } else if (Array.isArray(raw)) {
+        const chain = resolveMiddlewares(raw, middlewareRegistry);
+        resolved.push(...chain);
+      } else if (typeof raw === 'string') {
+        const chain = resolveMiddlewares([raw], middlewareRegistry);
+        resolved.push(...chain);
+      }
+    } catch (err) {
+      console.error(`[webspresso] Failed to load middleware from "${file}":`, err.message);
+    }
+  }
+
+  return resolved;
+}
+
+/**
+ * Run a single Express middleware with support for async functions, early completion (res.finish/close),
+ * and standard next()/next(err).
+ *
+ * @param {Function} mw
+ * @param {import('http').IncomingMessage} req
+ * @param {import('http').ServerResponse} res
+ * @returns {Promise<void>}
+ */
+function runMiddleware(mw, req, res) {
+  if (res.headersSent) return Promise.resolve();
+
+  return new Promise((resolve, reject) => {
+    let settled = false;
+
+    const onFinish = () => {
+      if (!settled) {
+        settled = true;
+        cleanup();
+        resolve();
+      }
+    };
+
+    const cleanup = () => {
+      res.removeListener('finish', onFinish);
+      res.removeListener('close', onFinish);
+    };
+
+    res.once('finish', onFinish);
+    res.once('close', onFinish);
+
+    try {
+      const result = mw(req, res, (err) => {
+        if (settled) return;
+        settled = true;
+        cleanup();
+        if (err) reject(err);
+        else resolve();
+      });
+
+      if (result && typeof result.then === 'function') {
+        result.then(
+          () => {
+            if (!settled) {
+              settled = true;
+              cleanup();
+              resolve();
+            }
+          },
+          (err) => {
+            if (!settled) {
+              settled = true;
+              cleanup();
+              reject(err);
+            }
+          }
+        );
+      }
+    } catch (err) {
+      if (!settled) {
+        settled = true;
+        cleanup();
+        reject(err);
+      }
+    }
+  });
+}
+
+/**
+ * Run a chain of middlewares sequentially. Halts early if response is sent.
+ *
+ * @param {Function[]} chain
+ * @param {import('http').IncomingMessage} req
+ * @param {import('http').ServerResponse} res
+ * @returns {Promise<void>}
+ */
+async function runMiddlewareChain(chain, req, res) {
+  if (!chain || chain.length === 0) return;
+  for (const mw of chain) {
+    if (res.headersSent) return;
+    await runMiddleware(mw, req, res);
+    if (res.headersSent) return;
+  }
+}
+
+/**
+ * Discover all existing _layout.njk files in directory chain (from root to target dir).
+ *
+ * @param {string} baseDir - Base pages directory
+ * @param {string} relativeFilePath - Relative file path
+ * @param {boolean} [isDev=false]
+ * @returns {Array<{ layoutRelPath: string, fullPath: string, configPath: string|null }>}
+ */
+function findCascadingLayouts(baseDir, relativeFilePath, isDev = false) {
+  const chain = getDirectoryChain(relativeFilePath);
+  const cacheKey = `${baseDir}::${chain.join('>')}`;
+
+  if (!isDev && layoutFileCache.has(cacheKey)) {
+    return layoutFileCache.get(cacheKey);
+  }
+
+  const layouts = [];
+
+  for (const dirSegment of chain) {
+    const layoutNjkName = '_layout.njk';
+    const layoutJsName = '_layout.js';
+
+    const layoutRelPath = dirSegment === ''
+      ? layoutNjkName
+      : `${dirSegment}/${layoutNjkName}`;
+
+    const fullPath = dirSegment === ''
+      ? path.join(baseDir, layoutNjkName)
+      : path.join(baseDir, ...dirSegment.split('/'), layoutNjkName);
+
+    const fullJsPath = dirSegment === ''
+      ? path.join(baseDir, layoutJsName)
+      : path.join(baseDir, ...dirSegment.split('/'), layoutJsName);
+
+    if (fs.existsSync(fullPath)) {
+      layouts.push({
+        layoutRelPath: layoutRelPath.split(path.sep).join('/'),
+        fullPath,
+        configPath: fs.existsSync(fullJsPath) ? fullJsPath : null,
+      });
+    }
+  }
+
+  if (!isDev) {
+    layoutFileCache.set(cacheKey, layouts);
+  }
+
+  return layouts;
+}
+
+/**
+ * Executes load() functions from companion _layout.js files in top-down order (outermost first).
+ *
+ * @param {Array<{ configPath: string|null }>} layouts
+ * @param {import('http').IncomingMessage} req
+ * @param {Object} ctx - Route execution context
+ * @param {boolean} [isDev=false]
+ * @returns {Promise<void>}
+ */
+async function executeCascadingLayoutLoads(layouts, req, ctx, isDev = false) {
+  for (const layout of layouts) {
+    if (!layout.configPath) continue;
+
+    try {
+      if (isDev && require.cache[require.resolve(layout.configPath)]) {
+        delete require.cache[require.resolve(layout.configPath)];
+      }
+
+      const mod = require(layout.configPath);
+      const candidate = mod?.default || mod;
+      const loadFn = typeof candidate === 'function' ? candidate : candidate?.load;
+
+      if (typeof loadFn === 'function') {
+        const loadedData = await loadFn(req, ctx);
+        if (loadedData && typeof loadedData === 'object' && !Array.isArray(loadedData)) {
+          ctx.data = Object.assign({}, ctx.data, loadedData);
+        }
+      }
+    } catch (err) {
+      console.error(`[webspresso] Error in layout loader "${layout.configPath}":`, err.message);
+    }
+  }
+}
+
+/**
+ * Wraps page HTML with discovered nested layouts (from innermost to outermost).
+ *
+ * @param {Object} nunjucksEnv - Nunjucks environment instance
+ * @param {Array<{ layoutRelPath: string, fullPath: string }>} layouts - Discovered layouts from outermost to innermost
+ * @param {string} pageHtml - Rendered child HTML
+ * @param {Object} renderContext - Full template render context
+ * @param {boolean} [isDev=false]
+ * @returns {string} Fully wrapped HTML
+ */
+function applyCascadingLayouts(nunjucksEnv, layouts, pageHtml, renderContext, isDev = false) {
+  if (!layouts || layouts.length === 0) {
+    return pageHtml;
+  }
+
+  let currentHtml = pageHtml;
+
+  // Wrap from innermost layout up to outermost (reverse of chain)
+  const reversedLayouts = [...layouts].reverse();
+
+  for (const layout of reversedLayouts) {
+    try {
+      const layoutContext = Object.assign({}, renderContext, {
+        content: currentHtml,
+      });
+
+      const njkTpl = loadNjkRouteTemplate(layout.fullPath, isDev);
+      if (njkTpl.dataPatch && Object.keys(njkTpl.dataPatch).length > 0) {
+        Object.assign(layoutContext, njkTpl.dataPatch);
+      }
+
+      if (njkTpl.useStringRender && njkTpl.templateBody != null) {
+        currentHtml = nunjucksEnv.renderString(njkTpl.templateBody, layoutContext, { path: layout.fullPath });
+      } else {
+        currentHtml = nunjucksEnv.render(layout.layoutRelPath, layoutContext);
+      }
+    } catch (err) {
+      console.error(`[webspresso] Failed rendering layout "${layout.layoutRelPath}":`, err.message);
+      throw err;
+    }
+  }
+
+  return currentHtml;
+}
+
+function clearCascadingCaches() {
+  middlewareFileCache.clear();
+  layoutFileCache.clear();
+}
+
+module.exports = {
+  getDirectoryChain,
+  templateHasExtends,
+  findCascadingMiddlewareFiles,
+  loadCascadingMiddlewares,
+  runMiddleware,
+  runMiddlewareChain,
+  findCascadingLayouts,
+  executeCascadingLayoutLoads,
+  applyCascadingLayouts,
+  clearCascadingCaches,
+};

package/src/routing/middleware-resolver.js

@@ -0,0 +1,92 @@
+'use strict';
+
+const EMPTY_OBJECT = Object.freeze({});
+const EMPTY_ARRAY = Object.freeze([]);
+
+/**
+ * True when the registry entry is (options) => (req, res, next) => …
+ * Express handlers typically have length >= 2 (req, res) or 3 (req, res, next).
+ * @param {Function} fn
+ * @returns {boolean}
+ */
+function isMiddlewareFactory(fn) {
+  return typeof fn === 'function' && fn.length <= 1;
+}
+
+/**
+ * Resolve a named middleware from createApp({ middlewares }).
+ * @param {string} name
+ * @param {Function} entry
+ * @param {boolean} fromTuple - true when route used ['name', options]
+ * @param {unknown} tupleOptions - second element of the tuple (only when fromTuple)
+ * @param {Object} middlewareRegistry - for error messages
+ * @returns {Function} Express middleware
+ */
+function resolveNamedMiddleware(name, entry, fromTuple, tupleOptions, middlewareRegistry) {
+  if (!entry) {
+    throw new Error(`Middleware "${name}" not found in registry. Available: ${Object.keys(middlewareRegistry).join(', ') || 'none'}`);
+  }
+  if (typeof entry !== 'function') {
+    throw new Error(`Middleware "${name}" must be a function`);
+  }
+
+  if (fromTuple) {
+    if (!isMiddlewareFactory(entry)) {
+      throw new Error(
+        `Middleware "${name}" must be a factory (options) => (req, res, next) => … when using ["${name}", options] tuple form`
+      );
+    }
+    const produced = entry(tupleOptions);
+    if (typeof produced !== 'function') {
+      throw new Error(`Middleware factory "${name}" must return an Express middleware function`);
+    }
+    return produced;
+  }
+
+  if (isMiddlewareFactory(entry)) {
+    const produced = entry({});
+    if (typeof produced !== 'function') {
+      throw new Error(`Middleware factory "${name}" must return an Express middleware function`);
+    }
+    return produced;
+  }
+
+  return entry;
+}
+
+/**
+ * Resolve middleware from config — functions, string names, or [name, options] tuples
+ * @param {Array} middlewareConfig - middleware functions, names, or ['name', options] tuples
+ * @param {Object} [middlewareRegistry] - Named middleware registry (plain handlers or option factories)
+ * @returns {Array<Function>} Array of resolved middleware functions
+ */
+function resolveMiddlewares(middlewareConfig, middlewareRegistry = EMPTY_OBJECT) {
+  if (!middlewareConfig || !Array.isArray(middlewareConfig) || middlewareConfig.length === 0) {
+    return EMPTY_ARRAY;
+  }
+  
+  return middlewareConfig.map((mw, index) => {
+    if (typeof mw === 'function') {
+      return mw;
+    }
+    
+    if (typeof mw === 'string') {
+      return resolveNamedMiddleware(mw, middlewareRegistry[mw], false, undefined, middlewareRegistry);
+    }
+
+    if (Array.isArray(mw) && mw.length === 2 && typeof mw[0] === 'string') {
+      const name = mw[0];
+      return resolveNamedMiddleware(name, middlewareRegistry[name], true, mw[1], middlewareRegistry);
+    }
+    
+    throw new Error(
+      `Invalid middleware at index ${index}: must be a function, string name, or [name, options] tuple`
+    );
+  });
+}
+
+module.exports = {
+  isMiddlewareFactory,
+  resolveNamedMiddleware,
+  resolveMiddlewares,
+};