@lolyjs/core 0.2.0-alpha.19 → 0.2.0-alpha.20

package/dist/cli.js

@@ -10057,7 +10057,30 @@ function loadLayoutServerHook(layoutFile) {
   try {
     const mod = __require(file);
     const serverHook = typeof mod?.getServerSideProps === "function" ? mod.getServerSideProps : null;
-    return serverHook;
+    let middlewares = [];
+    const rawMiddlewares = mod?.[NAMING.BEFORE_MIDDLEWARES];
+    if (rawMiddlewares !== void 0) {
+      if (!Array.isArray(rawMiddlewares)) {
+        console.warn(
+          `[framework][server-hook] ${NAMING.BEFORE_MIDDLEWARES} must be an array in ${file}, ignoring invalid value`
+        );
+      } else {
+        for (let i = 0; i < rawMiddlewares.length; i++) {
+          const mw = rawMiddlewares[i];
+          if (typeof mw !== "function") {
+            console.warn(
+              `[framework][server-hook] Middleware at index ${i} in ${NAMING.BEFORE_MIDDLEWARES} is not a function in ${file}, skipping`
+            );
+            continue;
+          }
+          middlewares.push(mw);
+        }
+      }
+    }
+    return {
+      serverHook,
+      middlewares
+    };
   } catch (error) {
     console.error(
       `[framework][server-hook] Error loading layout server hook from ${file}:`,
@@ -10142,9 +10165,16 @@ function loadRoutes(appDir) {
         appDir
       );
       const layoutServerHooks = [];
+      const layoutMiddlewares = [];
       for (const layoutFile of layoutFiles) {
-        const layoutServerHook = loadLayoutServerHook(layoutFile);
-        layoutServerHooks.push(layoutServerHook);
+        const layoutHookData = loadLayoutServerHook(layoutFile);
+        if (layoutHookData) {
+          layoutServerHooks.push(layoutHookData.serverHook);
+          layoutMiddlewares.push(layoutHookData.middlewares);
+        } else {
+          layoutServerHooks.push(null);
+          layoutMiddlewares.push([]);
+        }
       }
       const { middlewares, serverHook, dynamic, generateStaticParams } = loadServerHookForDir(currentDir);
       routes.push({
@@ -10160,6 +10190,8 @@ function loadRoutes(appDir) {
         // Keep 'loader' field name for backward compatibility
         layoutServerHooks,
         // Server hooks for each layout (same order as layouts)
+        layoutMiddlewares,
+        // Middlewares for each layout (same order as layouts)
         dynamic,
         generateStaticParams
       });
@@ -10723,9 +10755,16 @@ function loadRoutesFromManifest(projectRoot) {
     );
     const pageDir = path7.dirname(pageFile);
     const layoutServerHooks = [];
+    const layoutMiddlewares = [];
     for (const layoutFile of layoutFiles) {
-      const layoutServerHook = loadLayoutServerHook(layoutFile);
-      layoutServerHooks.push(layoutServerHook);
+      const layoutHookData = loadLayoutServerHook(layoutFile);
+      if (layoutHookData) {
+        layoutServerHooks.push(layoutHookData.serverHook);
+        layoutMiddlewares.push(layoutHookData.middlewares);
+      } else {
+        layoutServerHooks.push(null);
+        layoutMiddlewares.push([]);
+      }
     }
     const { middlewares, serverHook, dynamic, generateStaticParams } = loadServerHookForDir(pageDir);
     pageRoutes.push({
@@ -10741,6 +10780,8 @@ function loadRoutesFromManifest(projectRoot) {
       // Keep 'loader' field name for backward compatibility
       layoutServerHooks,
       // Server hooks for each layout (same order as layouts)
+      layoutMiddlewares,
+      // Middlewares for each layout (same order as layouts)
       dynamic: entry.dynamic ?? dynamic,
       generateStaticParams
     });
@@ -11269,9 +11310,16 @@ function loadNotFoundRouteFromFilesystem(appDir) {
     appDir
   );
   const layoutServerHooks = [];
+  const layoutMiddlewares = [];
   for (const layoutFile of layoutFiles) {
-    const layoutServerHook = loadLayoutServerHook(layoutFile);
-    layoutServerHooks.push(layoutServerHook);
+    const layoutHookData = loadLayoutServerHook(layoutFile);
+    if (layoutHookData) {
+      layoutServerHooks.push(layoutHookData.serverHook);
+      layoutMiddlewares.push(layoutHookData.middlewares);
+    } else {
+      layoutServerHooks.push(null);
+      layoutMiddlewares.push([]);
+    }
   }
   const { middlewares, serverHook, dynamic, generateStaticParams } = loadServerHookForDir(notFoundDir);
   return {
@@ -11287,6 +11335,8 @@ function loadNotFoundRouteFromFilesystem(appDir) {
     // Keep 'loader' field name for backward compatibility
     layoutServerHooks,
     // Server hooks for each layout (same order as layouts)
+    layoutMiddlewares,
+    // Middlewares for each layout (same order as layouts)
     dynamic,
     generateStaticParams
   };
@@ -11318,9 +11368,16 @@ function loadErrorRouteFromFilesystem(appDir) {
     appDir
   );
   const layoutServerHooks = [];
+  const layoutMiddlewares = [];
   for (const layoutFile of layoutFiles) {
-    const layoutServerHook = loadLayoutServerHook(layoutFile);
-    layoutServerHooks.push(layoutServerHook);
+    const layoutHookData = loadLayoutServerHook(layoutFile);
+    if (layoutHookData) {
+      layoutServerHooks.push(layoutHookData.serverHook);
+      layoutMiddlewares.push(layoutHookData.middlewares);
+    } else {
+      layoutServerHooks.push(null);
+      layoutMiddlewares.push([]);
+    }
   }
   const { middlewares, serverHook, dynamic, generateStaticParams } = loadServerHookForDir(appDir);
   return {
@@ -11336,6 +11393,8 @@ function loadErrorRouteFromFilesystem(appDir) {
     // Keep 'loader' field name for backward compatibility
     layoutServerHooks,
     // Server hooks for each layout (same order as layouts)
+    layoutMiddlewares,
+    // Middlewares for each layout (same order as layouts)
     dynamic,
     generateStaticParams
   };
@@ -12805,6 +12864,29 @@ async function handlePageRequestInternal(options) {
       if (!skipLayoutHooks && notFoundPage.layoutServerHooks && notFoundPage.layoutServerHooks.length > 0) {
         for (let i = 0; i < notFoundPage.layoutServerHooks.length; i++) {
           const layoutServerHook = notFoundPage.layoutServerHooks[i];
+          const layoutMiddlewares = notFoundPage.layoutMiddlewares?.[i] || [];
+          if (layoutMiddlewares.length > 0) {
+            for (const mw of layoutMiddlewares) {
+              try {
+                await Promise.resolve(
+                  mw(ctx2, async () => {
+                  })
+                );
+              } catch (error) {
+                const reqLogger2 = getRequestLogger(req);
+                const layoutFile = notFoundPage.layoutFiles[i];
+                const relativeLayoutPath = layoutFile ? path17.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
+                reqLogger2.error("Layout middleware failed for not-found page", error instanceof Error ? error : new Error(String(error)), {
+                  layoutIndex: i,
+                  layoutFile: relativeLayoutPath
+                });
+                throw error;
+              }
+              if (ctx2.res.headersSent) {
+                return;
+              }
+            }
+          }
           if (layoutServerHook) {
             try {
               const layoutResult = await layoutServerHook(ctx2);
@@ -12922,6 +13004,29 @@ async function handlePageRequestInternal(options) {
   if (!skipLayoutHooks && route.layoutServerHooks && route.layoutServerHooks.length > 0) {
     for (let i = 0; i < route.layoutServerHooks.length; i++) {
       const layoutServerHook = route.layoutServerHooks[i];
+      const layoutMiddlewares = route.layoutMiddlewares?.[i] || [];
+      if (layoutMiddlewares.length > 0) {
+        for (const mw of layoutMiddlewares) {
+          try {
+            await Promise.resolve(
+              mw(ctx, async () => {
+              })
+            );
+          } catch (error) {
+            const layoutFile = route.layoutFiles[i];
+            const relativeLayoutPath = layoutFile ? path17.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
+            reqLogger.error("Layout middleware failed", error instanceof Error ? error : new Error(String(error)), {
+              route: route.pattern,
+              layoutIndex: i,
+              layoutFile: relativeLayoutPath
+            });
+            throw error;
+          }
+          if (ctx.res.headersSent) {
+            return;
+          }
+        }
+      }
       if (layoutServerHook) {
         try {
           const layoutResult = await layoutServerHook(ctx);
@@ -13117,6 +13222,28 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
     if (!skipLayoutHooks && errorPage.layoutServerHooks && errorPage.layoutServerHooks.length > 0) {
       for (let i = 0; i < errorPage.layoutServerHooks.length; i++) {
         const layoutServerHook = errorPage.layoutServerHooks[i];
+        const layoutMiddlewares = errorPage.layoutMiddlewares?.[i] || [];
+        if (layoutMiddlewares.length > 0) {
+          for (const mw of layoutMiddlewares) {
+            try {
+              await Promise.resolve(
+                mw(ctx, async () => {
+                })
+              );
+            } catch (error2) {
+              const layoutFile = errorPage.layoutFiles[i];
+              const relativeLayoutPath = layoutFile ? path17.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
+              reqLogger.error("Layout middleware failed for error page", error2 instanceof Error ? error2 : new Error(String(error2)), {
+                layoutIndex: i,
+                layoutFile: relativeLayoutPath
+              });
+              throw error2;
+            }
+            if (ctx.res.headersSent) {
+              return;
+            }
+          }
+        }
         if (layoutServerHook) {
           try {
             const layoutResult = await layoutServerHook(ctx);