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

package/dist/cli.cjs

@@ -12550,7 +12550,7 @@ async function runRouteServerHook(route, ctx) {
 }
 
 // modules/server/handlers/response.ts
-function handleDataResponse(res, loaderResult, theme) {
+function handleDataResponse(res, loaderResult, theme, layoutProps, pageProps, error, message) {
   res.setHeader("Content-Type", "application/json; charset=utf-8");
   if (loaderResult.redirect) {
     res.statusCode = 200;
@@ -12562,14 +12562,26 @@ function handleDataResponse(res, loaderResult, theme) {
     res.end(JSON.stringify({ notFound: true }));
     return;
   }
-  res.statusCode = 200;
-  res.end(
-    JSON.stringify({
-      props: loaderResult.props ?? {},
-      metadata: loaderResult.metadata ?? null,
-      theme: loaderResult.theme ?? theme ?? null
-    })
-  );
+  const response = {
+    // Combined props for backward compatibility
+    props: loaderResult.props ?? {},
+    metadata: loaderResult.metadata ?? null,
+    theme: loaderResult.theme ?? theme ?? null
+  };
+  if (layoutProps !== void 0 && layoutProps !== null) {
+    response.layoutProps = layoutProps;
+  }
+  if (pageProps !== void 0 && pageProps !== null) {
+    response.pageProps = pageProps;
+  }
+  if (error !== void 0) {
+    response.error = error;
+  }
+  if (message !== void 0) {
+    response.message = message;
+  }
+  res.statusCode = error ? 500 : 200;
+  res.end(JSON.stringify(response));
 }
 function handleRedirect(res, redirect) {
   const { destination, permanent } = redirect;
@@ -12761,6 +12773,7 @@ async function handlePageRequestInternal(options) {
   const clientCssPath = env === "dev" ? "/static/client.css" : projectRoot ? getClientCssPath(projectRoot) : "/static/client.css";
   const assetManifest = env === "prod" && projectRoot ? loadAssetManifest(projectRoot) : null;
   const isDataReq = isDataRequest(req);
+  const skipLayoutHooks = isDataReq && req.headers["x-skip-layout-hooks"] === "true";
   if (env === "prod" && ssgOutDir) {
     if (isDataReq) {
       if (tryServeSsgData(res, ssgOutDir, urlPath)) {
@@ -12784,7 +12797,7 @@ async function handlePageRequestInternal(options) {
         locals: {}
       };
       const layoutProps2 = {};
-      if (notFoundPage.layoutServerHooks && notFoundPage.layoutServerHooks.length > 0) {
+      if (!skipLayoutHooks && notFoundPage.layoutServerHooks && notFoundPage.layoutServerHooks.length > 0) {
         for (let i = 0; i < notFoundPage.layoutServerHooks.length; i++) {
           const layoutServerHook = notFoundPage.layoutServerHooks[i];
           if (layoutServerHook) {
@@ -12819,6 +12832,17 @@ async function handlePageRequestInternal(options) {
         ...loaderResult2,
         props: combinedProps2
       };
+      if (isDataReq) {
+        const pagePropsOnly = loaderResult2.props || {};
+        handleDataResponse(
+          res,
+          combinedLoaderResult2,
+          theme,
+          skipLayoutHooks ? null : Object.keys(layoutProps2).length > 0 ? layoutProps2 : null,
+          pagePropsOnly
+        );
+        return;
+      }
       const initialData2 = buildInitialData(urlPath, {}, combinedLoaderResult2);
       const appTree2 = buildAppTree(notFoundPage, {}, initialData2.props);
       initialData2.notFound = true;
@@ -12890,7 +12914,7 @@ async function handlePageRequestInternal(options) {
   const layoutProps = {};
   const layoutMetadata = [];
   const reqLogger = getRequestLogger(req);
-  if (route.layoutServerHooks && route.layoutServerHooks.length > 0) {
+  if (!skipLayoutHooks && route.layoutServerHooks && route.layoutServerHooks.length > 0) {
     for (let i = 0; i < route.layoutServerHooks.length; i++) {
       const layoutServerHook = route.layoutServerHooks[i];
       if (layoutServerHook) {
@@ -12974,7 +12998,14 @@ async function handlePageRequestInternal(options) {
     metadata: combinedMetadata
   };
   if (isDataReq) {
-    handleDataResponse(res, combinedLoaderResult, theme);
+    const pagePropsOnly = loaderResult.props || {};
+    handleDataResponse(
+      res,
+      combinedLoaderResult,
+      theme,
+      skipLayoutHooks ? null : Object.keys(layoutProps).length > 0 ? layoutProps : null,
+      pagePropsOnly
+    );
     return;
   }
   if (loaderResult.redirect) {
@@ -13068,6 +13099,7 @@ async function handlePageRequestInternal(options) {
 async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks, theme, projectRoot, env = "dev") {
   try {
     const isDataReq = isDataRequest(req);
+    const skipLayoutHooks = isDataReq && req.headers["x-skip-layout-hooks"] === "true";
     const ctx = {
       req,
       res,
@@ -13077,7 +13109,7 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
     };
     const layoutProps = {};
     const reqLogger = getRequestLogger(req);
-    if (errorPage.layoutServerHooks && errorPage.layoutServerHooks.length > 0) {
+    if (!skipLayoutHooks && errorPage.layoutServerHooks && errorPage.layoutServerHooks.length > 0) {
       for (let i = 0; i < errorPage.layoutServerHooks.length; i++) {
         const layoutServerHook = errorPage.layoutServerHooks[i];
         if (layoutServerHook) {
@@ -13115,15 +13147,18 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
     const routerData = buildRouterData(req);
     initialData.error = true;
     if (isDataReq) {
-      res.statusCode = 500;
-      res.setHeader("Content-Type", "application/json; charset=utf-8");
-      res.end(JSON.stringify({
-        error: true,
-        message: String(error),
-        props: initialData.props,
-        metadata: combinedLoaderResult.metadata ?? null,
-        theme: combinedLoaderResult.theme ?? theme ?? null
-      }));
+      const pagePropsOnly = loaderResult.props || {};
+      handleDataResponse(
+        res,
+        combinedLoaderResult,
+        theme,
+        skipLayoutHooks ? null : Object.keys(layoutProps).length > 0 ? layoutProps : null,
+        pagePropsOnly,
+        true,
+        // error flag
+        String(error)
+        // error message
+      );
       return;
     }
     const appTree = buildAppTree(errorPage, { error: String(error) }, initialData.props);