@lolyjs/core 0.2.0-alpha.13 → 0.2.0-alpha.15

package/dist/cli.js

@@ -164,7 +164,7 @@ function loadLayoutsForDir(pageDir, appDir) {
   };
 }
 
-// modules/router/loader.ts
+// modules/router/server-hook.ts
 import fs2 from "fs";
 import path2 from "path";
 var NAMING = {
@@ -176,14 +176,16 @@ var NAMING = {
   // Files
   SERVER_HOOK: "server.hook"
 };
-function loadLoaderForDir(currentDir) {
-  const loaderTs = path2.join(currentDir, `${NAMING.SERVER_HOOK}.ts`);
-  const loaderJs = path2.join(currentDir, `${NAMING.SERVER_HOOK}.js`);
-  const file = fs2.existsSync(loaderTs) ? loaderTs : fs2.existsSync(loaderJs) ? loaderJs : null;
+function loadServerHookForDir(currentDir) {
+  const pageServerHookTs = path2.join(currentDir, `page.server.hook.ts`);
+  const pageServerHookJs = path2.join(currentDir, `page.server.hook.js`);
+  const serverHookTs = path2.join(currentDir, `${NAMING.SERVER_HOOK}.ts`);
+  const serverHookJs = path2.join(currentDir, `${NAMING.SERVER_HOOK}.js`);
+  const file = fs2.existsSync(pageServerHookTs) ? pageServerHookTs : fs2.existsSync(pageServerHookJs) ? pageServerHookJs : fs2.existsSync(serverHookTs) ? serverHookTs : fs2.existsSync(serverHookJs) ? serverHookJs : null;
   if (!file) {
     return {
       middlewares: [],
-      loader: null,
+      serverHook: null,
       dynamic: "auto",
       generateStaticParams: null
     };
@@ -199,12 +201,12 @@ function loadLoaderForDir(currentDir) {
     mod = __require(file);
   } catch (error) {
     console.error(
-      `[framework][loader] Error loading server hook from ${file}:`,
+      `[framework][server-hook] Error loading server hook from ${file}:`,
       error
     );
     return {
       middlewares: [],
-      loader: null,
+      serverHook: null,
       dynamic: "auto",
       generateStaticParams: null
     };
@@ -212,16 +214,43 @@ function loadLoaderForDir(currentDir) {
   const middlewares = Array.isArray(
     mod?.[NAMING.BEFORE_MIDDLEWARES]
   ) ? mod[NAMING.BEFORE_MIDDLEWARES] : [];
-  const loader = typeof mod?.[NAMING.GET_SERVER_DATA_FN] === "function" ? mod[NAMING.GET_SERVER_DATA_FN] : null;
+  const serverHook = typeof mod?.[NAMING.GET_SERVER_DATA_FN] === "function" ? mod[NAMING.GET_SERVER_DATA_FN] : null;
   const dynamic = mod?.[NAMING.RENDER_TYPE_CONST] === "force-static" || mod?.[NAMING.RENDER_TYPE_CONST] === "force-dynamic" ? mod.dynamic : "auto";
   const generateStaticParams = typeof mod?.[NAMING.GENERATE_SSG_PARAMS] === "function" ? mod[NAMING.GENERATE_SSG_PARAMS] : null;
   return {
     middlewares,
-    loader,
+    serverHook,
     dynamic,
     generateStaticParams
   };
 }
+function loadLayoutServerHook(layoutFile) {
+  const layoutDir = path2.dirname(layoutFile);
+  const layoutBasename = path2.basename(layoutFile, path2.extname(layoutFile));
+  const serverHookTs = path2.join(layoutDir, `${layoutBasename}.server.hook.ts`);
+  const serverHookJs = path2.join(layoutDir, `${layoutBasename}.server.hook.js`);
+  const file = fs2.existsSync(serverHookTs) ? serverHookTs : fs2.existsSync(serverHookJs) ? serverHookJs : null;
+  if (!file) {
+    return null;
+  }
+  if (file.endsWith(".ts") || file.endsWith(".tsx")) {
+    try {
+      __require("tsx/cjs");
+    } catch (e) {
+    }
+  }
+  try {
+    const mod = __require(file);
+    const serverHook = typeof mod?.getServerSideProps === "function" ? mod.getServerSideProps : null;
+    return serverHook;
+  } catch (error) {
+    console.error(
+      `[framework][server-hook] Error loading layout server hook from ${file}:`,
+      error
+    );
+    return null;
+  }
+}
 
 // modules/router/loader-pages.ts
 function loadRoutes(appDir) {
@@ -253,7 +282,12 @@ function loadRoutes(appDir) {
         currentDir,
         appDir
       );
-      const { middlewares, loader, dynamic, generateStaticParams } = loadLoaderForDir(currentDir);
+      const layoutServerHooks = [];
+      for (const layoutFile of layoutFiles) {
+        const layoutServerHook = loadLayoutServerHook(layoutFile);
+        layoutServerHooks.push(layoutServerHook);
+      }
+      const { middlewares, serverHook, dynamic, generateStaticParams } = loadServerHookForDir(currentDir);
       routes.push({
         pattern: routePath,
         regex,
@@ -263,7 +297,10 @@ function loadRoutes(appDir) {
         pageFile: fullPath,
         layoutFiles,
         middlewares,
-        loader,
+        loader: serverHook,
+        // Keep 'loader' field name for backward compatibility
+        layoutServerHooks,
+        // Server hooks for each layout (same order as layouts)
         dynamic,
         generateStaticParams
       });
@@ -782,7 +819,12 @@ function loadRoutesFromManifest(projectRoot) {
       (f) => path7.join(projectRoot, f)
     );
     const pageDir = path7.dirname(pageFile);
-    const { middlewares, loader, dynamic, generateStaticParams } = loadLoaderForDir(pageDir);
+    const layoutServerHooks = [];
+    for (const layoutFile of layoutFiles) {
+      const layoutServerHook = loadLayoutServerHook(layoutFile);
+      layoutServerHooks.push(layoutServerHook);
+    }
+    const { middlewares, serverHook, dynamic, generateStaticParams } = loadServerHookForDir(pageDir);
     pageRoutes.push({
       pattern: entry.pattern,
       regex,
@@ -792,7 +834,10 @@ function loadRoutesFromManifest(projectRoot) {
       pageFile,
       layoutFiles,
       middlewares,
-      loader,
+      loader: serverHook,
+      // Keep 'loader' field name for backward compatibility
+      layoutServerHooks,
+      // Server hooks for each layout (same order as layouts)
       dynamic: entry.dynamic ?? dynamic,
       generateStaticParams
     });
@@ -1046,7 +1091,12 @@ function loadNotFoundRouteFromFilesystem(appDir) {
     notFoundDir,
     appDir
   );
-  const { middlewares, loader, dynamic, generateStaticParams } = loadLoaderForDir(notFoundDir);
+  const layoutServerHooks = [];
+  for (const layoutFile of layoutFiles) {
+    const layoutServerHook = loadLayoutServerHook(layoutFile);
+    layoutServerHooks.push(layoutServerHook);
+  }
+  const { middlewares, serverHook, dynamic, generateStaticParams } = loadServerHookForDir(notFoundDir);
   return {
     pattern: NOT_FOUND_PATTERN,
     regex: new RegExp(`^${NOT_FOUND_PATTERN}/?$`),
@@ -1056,7 +1106,10 @@ function loadNotFoundRouteFromFilesystem(appDir) {
     pageFile: notFoundFile,
     layoutFiles,
     middlewares,
-    loader,
+    loader: serverHook,
+    // Keep 'loader' field name for backward compatibility
+    layoutServerHooks,
+    // Server hooks for each layout (same order as layouts)
     dynamic,
     generateStaticParams
   };
@@ -1087,7 +1140,12 @@ function loadErrorRouteFromFilesystem(appDir) {
     appDir,
     appDir
   );
-  const { middlewares, loader, dynamic, generateStaticParams } = loadLoaderForDir(appDir);
+  const layoutServerHooks = [];
+  for (const layoutFile of layoutFiles) {
+    const layoutServerHook = loadLayoutServerHook(layoutFile);
+    layoutServerHooks.push(layoutServerHook);
+  }
+  const { middlewares, serverHook, dynamic, generateStaticParams } = loadServerHookForDir(appDir);
   return {
     pattern: ERROR_PATTERN,
     regex: new RegExp(`^${ERROR_PATTERN}/?$`),
@@ -1097,7 +1155,10 @@ function loadErrorRouteFromFilesystem(appDir) {
     pageFile: errorFile,
     layoutFiles,
     middlewares,
-    loader,
+    loader: serverHook,
+    // Keep 'loader' field name for backward compatibility
+    layoutServerHooks,
+    // Server hooks for each layout (same order as layouts)
     dynamic,
     generateStaticParams
   };
@@ -4208,7 +4269,6 @@ function requestLoggerMiddleware(options = {}) {
       const startTime = Date.now();
       res.on("finish", () => {
         const duration = Date.now() - startTime;
-        const shouldLogSuccess = logRequests === true;
         if (res.statusCode >= 500) {
           reqLogger.error(`${req.method} ${req.path} ${res.statusCode}`, {
             statusCode: res.statusCode,
@@ -4219,11 +4279,6 @@ function requestLoggerMiddleware(options = {}) {
             statusCode: res.statusCode,
             duration: `${duration}ms`
           });
-        } else if (shouldLogSuccess) {
-          reqLogger.debug(`${req.method} ${req.path} ${res.statusCode}`, {
-            statusCode: res.statusCode,
-            duration: `${duration}ms`
-          });
         }
       });
     }
@@ -4332,8 +4387,8 @@ async function runRouteMiddlewares(route, ctx) {
   }
 }
 
-// modules/server/handlers/loader.ts
-async function runRouteLoader(route, ctx) {
+// modules/server/handlers/server-hook.ts
+async function runRouteServerHook(route, ctx) {
   if (!route.loader) {
     return { props: {} };
   }
@@ -4490,11 +4545,39 @@ async function handlePageRequestInternal(options) {
         pathname: urlPath,
         locals: {}
       };
-      let loaderResult2 = await runRouteLoader(notFoundPage, ctx2);
+      const layoutProps2 = {};
+      if (notFoundPage.layoutServerHooks && notFoundPage.layoutServerHooks.length > 0) {
+        for (let i = 0; i < notFoundPage.layoutServerHooks.length; i++) {
+          const layoutServerHook = notFoundPage.layoutServerHooks[i];
+          if (layoutServerHook) {
+            try {
+              const layoutResult = await layoutServerHook(ctx2);
+              if (layoutResult.props) {
+                Object.assign(layoutProps2, layoutResult.props);
+              }
+            } catch (error) {
+              const reqLogger2 = getRequestLogger(req);
+              reqLogger2.warn(`Layout server hook ${i} failed for not-found`, {
+                error,
+                layoutFile: notFoundPage.layoutFiles[i]
+              });
+            }
+          }
+        }
+      }
+      let loaderResult2 = await runRouteServerHook(notFoundPage, ctx2);
       if (!loaderResult2.theme) {
         loaderResult2.theme = theme;
       }
-      const initialData2 = buildInitialData(urlPath, {}, loaderResult2);
+      const combinedProps2 = {
+        ...layoutProps2,
+        ...loaderResult2.props || {}
+      };
+      const combinedLoaderResult2 = {
+        ...loaderResult2,
+        props: combinedProps2
+      };
+      const initialData2 = buildInitialData(urlPath, {}, combinedLoaderResult2);
       const appTree2 = buildAppTree(notFoundPage, {}, initialData2.props);
       initialData2.notFound = true;
       const nonce2 = res.locals.nonce || void 0;
@@ -4502,7 +4585,7 @@ async function handlePageRequestInternal(options) {
         appTree: appTree2,
         initialData: initialData2,
         routerData,
-        meta: loaderResult2.metadata ?? null,
+        meta: combinedLoaderResult2.metadata ?? null,
         titleFallback: "Not found",
         descriptionFallback: "Loly demo",
         chunkHref: null,
@@ -4521,8 +4604,8 @@ async function handlePageRequestInternal(options) {
         },
         onShellError(err) {
           didError2 = true;
-          const reqLogger = getRequestLogger(req);
-          reqLogger.error("SSR shell error", err, { route: "not-found" });
+          const reqLogger2 = getRequestLogger(req);
+          reqLogger2.error("SSR shell error", err, { route: "not-found" });
           if (!res.headersSent && errorPage) {
             renderErrorPageWithStream(errorPage, req, res, err, routeChunks, theme, projectRoot, env);
           } else if (!res.headersSent) {
@@ -4534,8 +4617,8 @@ async function handlePageRequestInternal(options) {
         },
         onError(err) {
           didError2 = true;
-          const reqLogger = getRequestLogger(req);
-          reqLogger.error("SSR error", err, { route: "not-found" });
+          const reqLogger2 = getRequestLogger(req);
+          reqLogger2.error("SSR error", err, { route: "not-found" });
         }
       });
       req.on("close", () => abort2());
@@ -4557,9 +4640,30 @@ async function handlePageRequestInternal(options) {
   if (res.headersSent) {
     return;
   }
+  const layoutProps = {};
+  const reqLogger = getRequestLogger(req);
+  if (route.layoutServerHooks && route.layoutServerHooks.length > 0) {
+    for (let i = 0; i < route.layoutServerHooks.length; i++) {
+      const layoutServerHook = route.layoutServerHooks[i];
+      if (layoutServerHook) {
+        try {
+          const layoutResult = await layoutServerHook(ctx);
+          if (layoutResult.props) {
+            Object.assign(layoutProps, layoutResult.props);
+          }
+        } catch (error) {
+          reqLogger.warn(`Layout server hook ${i} failed`, {
+            error,
+            layoutFile: route.layoutFiles[i],
+            route: route.pattern
+          });
+        }
+      }
+    }
+  }
   let loaderResult;
   try {
-    loaderResult = await runRouteLoader(route, ctx);
+    loaderResult = await runRouteServerHook(route, ctx);
     if (!loaderResult.theme) {
       loaderResult.theme = theme;
     }
@@ -4578,8 +4682,18 @@ async function handlePageRequestInternal(options) {
       }
     }
   }
+  const combinedProps = {
+    ...layoutProps,
+    // Props from layouts (stable)
+    ...loaderResult.props || {}
+    // Props from page (overrides layout)
+  };
+  const combinedLoaderResult = {
+    ...loaderResult,
+    props: combinedProps
+  };
   if (isDataReq) {
-    handleDataResponse(res, loaderResult, theme);
+    handleDataResponse(res, combinedLoaderResult, theme);
     return;
   }
   if (loaderResult.redirect) {
@@ -4594,7 +4708,7 @@ async function handlePageRequestInternal(options) {
     }
     return;
   }
-  const initialData = buildInitialData(urlPath, params, loaderResult);
+  const initialData = buildInitialData(urlPath, params, combinedLoaderResult);
   const appTree = buildAppTree(route, params, initialData.props);
   const chunkName = routeChunks[route.pattern];
   let chunkHref = null;
@@ -4610,7 +4724,7 @@ async function handlePageRequestInternal(options) {
     appTree,
     initialData,
     routerData,
-    meta: loaderResult.metadata,
+    meta: combinedLoaderResult.metadata,
     titleFallback: "Loly framework",
     descriptionFallback: "Loly demo",
     chunkHref,
@@ -4631,8 +4745,8 @@ async function handlePageRequestInternal(options) {
     },
     onShellError(err) {
       didError = true;
-      const reqLogger = getRequestLogger(req);
-      reqLogger.error("SSR shell error", err, { route: matched?.route?.pattern || "unknown" });
+      const reqLogger2 = getRequestLogger(req);
+      reqLogger2.error("SSR shell error", err, { route: matched?.route?.pattern || "unknown" });
       if (!res.headersSent && errorPage) {
         renderErrorPageWithStream(errorPage, req, res, err, routeChunks, theme, projectRoot, env);
       } else if (!res.headersSent) {
@@ -4644,8 +4758,8 @@ async function handlePageRequestInternal(options) {
     },
     onError(err) {
       didError = true;
-      const reqLogger = getRequestLogger(req);
-      reqLogger.error("SSR error", err, { route: matched?.route?.pattern || "unknown" });
+      const reqLogger2 = getRequestLogger(req);
+      reqLogger2.error("SSR error", err, { route: matched?.route?.pattern || "unknown" });
     }
   });
   req.on("close", () => {
@@ -4662,11 +4776,39 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
       pathname: req.path,
       locals: { error }
     };
-    let loaderResult = await runRouteLoader(errorPage, ctx);
+    const layoutProps = {};
+    const reqLogger = getRequestLogger(req);
+    if (errorPage.layoutServerHooks && errorPage.layoutServerHooks.length > 0) {
+      for (let i = 0; i < errorPage.layoutServerHooks.length; i++) {
+        const layoutServerHook = errorPage.layoutServerHooks[i];
+        if (layoutServerHook) {
+          try {
+            const layoutResult = await layoutServerHook(ctx);
+            if (layoutResult.props) {
+              Object.assign(layoutProps, layoutResult.props);
+            }
+          } catch (err) {
+            reqLogger.warn(`Layout server hook ${i} failed for error page`, {
+              error: err,
+              layoutFile: errorPage.layoutFiles[i]
+            });
+          }
+        }
+      }
+    }
+    let loaderResult = await runRouteServerHook(errorPage, ctx);
     if (!loaderResult.theme && theme) {
       loaderResult.theme = theme;
     }
-    const initialData = buildInitialData(req.path, { error: String(error) }, loaderResult);
+    const combinedProps = {
+      ...layoutProps,
+      ...loaderResult.props || {}
+    };
+    const combinedLoaderResult = {
+      ...loaderResult,
+      props: combinedProps
+    };
+    const initialData = buildInitialData(req.path, { error: String(error) }, combinedLoaderResult);
     const routerData = buildRouterData(req);
     initialData.error = true;
     if (isDataReq) {
@@ -4676,8 +4818,8 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
         error: true,
         message: String(error),
         props: initialData.props,
-        metadata: loaderResult.metadata ?? null,
-        theme: loaderResult.theme ?? theme ?? null
+        metadata: combinedLoaderResult.metadata ?? null,
+        theme: combinedLoaderResult.theme ?? theme ?? null
       }));
       return;
     }
@@ -4699,7 +4841,7 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
       appTree,
       initialData,
       routerData,
-      meta: loaderResult.metadata ?? null,
+      meta: combinedLoaderResult.metadata ?? null,
       titleFallback: "Error",
       descriptionFallback: "An error occurred",
       chunkHref,
@@ -4720,8 +4862,8 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
       },
       onShellError(err) {
         didError = true;
-        const reqLogger = getRequestLogger(req);
-        reqLogger.error("Error rendering error page", err, { type: "shellError" });
+        const reqLogger2 = getRequestLogger(req);
+        reqLogger2.error("Error rendering error page", err, { type: "shellError" });
         if (!res.headersSent) {
           res.statusCode = 500;
           res.setHeader("Content-Type", "text/html; charset=utf-8");
@@ -4731,8 +4873,8 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
       },
       onError(err) {
         didError = true;
-        const reqLogger = getRequestLogger(req);
-        reqLogger.error("Error in error page", err);
+        const reqLogger2 = getRequestLogger(req);
+        reqLogger2.error("Error in error page", err);
       }
     });
     req.on("close", () => {
@@ -5104,26 +5246,22 @@ async function startServer(options = {}) {
   });
   httpServer.listen(port, host, () => {
     if (isDev) {
-      logger3.info("\u{1F680} Dev server running", {
-        url: `http://${host}:${port}`,
-        appDir
-      });
-      logger3.info("\u{1F9ED} Reading routes from", { appDir });
-      logger3.info("\u{1F4E6} Client served from /static/client.js");
+      const reset = "\x1B[0m";
+      const cyan = "\x1B[36m";
+      const green = "\x1B[32m";
+      const dim = "\x1B[2m";
+      const bold = "\x1B[1m";
+      const url = `http://${host === "0.0.0.0" ? "localhost" : host}:${port}`;
+      console.log();
+      console.log(`${bold}${green}\u2713${reset} ${bold}Dev server ready${reset}`);
+      console.log(`${dim}  Local:${reset}    ${cyan}${url}${reset}`);
+      if (routes.length > 0 || apiRoutes.length > 0 || wssRoutes.length > 0) {
+        console.log(`${dim}  Routes:${reset}  ${routes.length} pages, ${apiRoutes.length} API, ${wssRoutes.length} WSS`);
+      }
+      console.log();
     } else {
-      const buildDir = config.directories.build;
-      logger3.info("\u{1F680} Prod server running", {
-        url: `http://${host}:${port}`,
-        appDir,
-        buildDir
-      });
-      logger3.info("\u{1F9ED} Reading compiled routes from", { appDir });
-      logger3.info("\u{1F4E6} Client served from", {
-        path: `/static (${buildDir}/client)`
-      });
-      logger3.info("\u{1F4C4} SSG served from", {
-        path: `${buildDir}/ssg (if exists)`
-      });
+      const url = `http://${host}:${port}`;
+      console.log(`\u{1F680} Server running on ${url}`);
     }
   });
 }