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

package/dist/index.cjs

@@ -15034,7 +15034,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;
@@ -15046,14 +15046,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;
@@ -15191,6 +15203,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)) {
@@ -15214,7 +15227,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) {
@@ -15249,6 +15262,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;
@@ -15320,7 +15344,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) {
@@ -15404,7 +15428,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) {
@@ -15498,6 +15529,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,
@@ -15507,7 +15539,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) {
@@ -15545,15 +15577,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);
@@ -17559,12 +17594,29 @@ var APP_CONTAINER_ID2 = "__app";
 var ROUTER_NAVIGATE_KEY = "__LOLY_ROUTER_NAVIGATE__";
 
 // modules/runtime/client/window-data.ts
+var LAYOUT_PROPS_KEY = "__FW_LAYOUT_PROPS__";
 function getWindowData() {
   if (typeof window === "undefined") {
     return null;
   }
   return window[WINDOW_DATA_KEY2] ?? null;
 }
+function getPreservedLayoutProps() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  return window[LAYOUT_PROPS_KEY] ?? null;
+}
+function setPreservedLayoutProps(props) {
+  if (typeof window === "undefined") {
+    return;
+  }
+  if (props === null) {
+    delete window[LAYOUT_PROPS_KEY];
+  } else {
+    window[LAYOUT_PROPS_KEY] = props;
+  }
+}
 function getRouterData() {
   if (typeof window === "undefined") {
     return null;
@@ -17900,14 +17952,16 @@ function deleteCacheEntry(key) {
 function buildDataUrl(url) {
   return url + (url.includes("?") ? "&" : "?") + "__fw_data=1";
 }
-async function fetchRouteDataOnce(url) {
+async function fetchRouteDataOnce(url, skipLayoutHooks = true) {
   const dataUrl = buildDataUrl(url);
-  const res = await fetch(dataUrl, {
-    headers: {
-      "x-fw-data": "1",
-      Accept: "application/json"
-    }
-  });
+  const headers = {
+    "x-fw-data": "1",
+    Accept: "application/json"
+  };
+  if (skipLayoutHooks) {
+    headers["x-skip-layout-hooks"] = "true";
+  }
+  const res = await fetch(dataUrl, { headers });
   let json = {};
   try {
     const text = await res.text();
@@ -17933,7 +17987,7 @@ async function getRouteData(url, options) {
     deleteCacheEntry(key);
   }
   const entry = dataCache.get(key);
-  if (entry) {
+  if (entry && !options?.revalidate) {
     if (entry.status === "fulfilled") {
       updateLRU(key);
       return entry.value;
@@ -17942,12 +17996,29 @@ async function getRouteData(url, options) {
       return entry.promise;
     }
   }
-  const promise = fetchRouteDataOnce(url).then((value) => {
-    setCacheEntry(key, { status: "fulfilled", value });
+  const skipLayoutHooks = !options?.revalidate;
+  const currentEntry = dataCache.get(key);
+  if (currentEntry && !options?.revalidate) {
+    if (currentEntry.status === "fulfilled") {
+      updateLRU(key);
+      return currentEntry.value;
+    }
+    if (currentEntry.status === "pending") {
+      return currentEntry.promise;
+    }
+  }
+  const promise = fetchRouteDataOnce(url, skipLayoutHooks).then((value) => {
+    const entryAfterFetch = dataCache.get(key);
+    if (!entryAfterFetch || entryAfterFetch.status === "pending") {
+      setCacheEntry(key, { status: "fulfilled", value });
+    }
     return value;
   }).catch((error) => {
     console.error("[client][cache] Error fetching route data:", error);
-    dataCache.set(key, { status: "rejected", error });
+    const entryAfterFetch = dataCache.get(key);
+    if (!entryAfterFetch || entryAfterFetch.status === "pending") {
+      dataCache.set(key, { status: "rejected", error });
+    }
     throw error;
   });
   dataCache.set(key, { status: "pending", promise });
@@ -17972,10 +18043,22 @@ async function handleErrorRoute(nextUrl, json, errorRoute, setState) {
     } else if (json.theme) {
       theme = json.theme;
     }
+    let layoutProps = {};
+    if (json.layoutProps !== void 0 && json.layoutProps !== null) {
+      layoutProps = json.layoutProps;
+      setPreservedLayoutProps(layoutProps);
+    } else {
+      const preserved = getPreservedLayoutProps();
+      if (preserved) {
+        layoutProps = preserved;
+      }
+    }
+    const pageProps = json.pageProps ?? json.props ?? {
+      error: json.message || "An error occurred"
+    };
     const errorProps = {
-      ...json.props || {
-        error: json.message || "An error occurred"
-      },
+      ...layoutProps,
+      ...pageProps,
       theme
     };
     const windowData = {
@@ -18032,8 +18115,20 @@ async function handleNotFoundRoute(nextUrl, json, notFoundRoute, setState) {
   } else if (json.theme) {
     theme = json.theme;
   }
+  let layoutProps = {};
+  if (json.layoutProps !== void 0 && json.layoutProps !== null) {
+    layoutProps = json.layoutProps;
+    setPreservedLayoutProps(layoutProps);
+  } else {
+    const preserved = getPreservedLayoutProps();
+    if (preserved) {
+      layoutProps = preserved;
+    }
+  }
+  const pageProps = json.pageProps ?? json.props ?? {};
   const notFoundProps = {
-    ...json.props ?? {},
+    ...layoutProps,
+    ...pageProps,
     theme
   };
   const windowData = {
@@ -18090,8 +18185,20 @@ async function handleNormalRoute(nextUrl, json, routes, setState) {
   } else if (json.theme) {
     theme = json.theme;
   }
-  const newProps = {
-    ...json.props ?? {},
+  let layoutProps = {};
+  if (json.layoutProps !== void 0 && json.layoutProps !== null) {
+    layoutProps = json.layoutProps;
+    setPreservedLayoutProps(layoutProps);
+  } else {
+    const preserved = getPreservedLayoutProps();
+    if (preserved) {
+      layoutProps = preserved;
+    }
+  }
+  const pageProps = json.pageProps ?? json.props ?? {};
+  const combinedProps = {
+    ...layoutProps,
+    ...pageProps,
     theme
     // Always include theme
   };
@@ -18103,7 +18210,7 @@ async function handleNormalRoute(nextUrl, json, routes, setState) {
   const windowData = {
     pathname: nextUrl,
     params: matched.params,
-    props: newProps,
+    props: combinedProps,
     metadata: json.metadata ?? null,
     theme,
     notFound: false,
@@ -18131,7 +18238,7 @@ async function handleNormalRoute(nextUrl, json, routes, setState) {
     route: matched.route,
     params: matched.params,
     components,
-    props: newProps
+    props: combinedProps
   });
   return true;
 }
@@ -18364,7 +18471,7 @@ function AppShell({
     return () => {
       window.removeEventListener("fw-data-refresh", handleDataRefresh);
     };
-  }, [state.url]);
+  }, []);
   const isError = state.route === errorRoute;
   const isNotFound = state.route === notFoundRoute;
   const routeType = isError ? "error" : isNotFound ? "notfound" : "normal";
@@ -18563,6 +18670,9 @@ function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
       }
       const initialData = getWindowData();
       const initialUrl = window.location.pathname + window.location.search;
+      if (initialData?.props) {
+        setPreservedLayoutProps(initialData.props);
+      }
       initializeRouterData(initialUrl, initialData);
       await hydrateInitialRoute(
         container,