@lolyjs/core 0.2.0-alpha.1 → 0.2.0-alpha.11

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import http from 'http';
 import { Request, Response } from 'express';
 import { Socket, Server } from 'socket.io';
-export { c as bootstrapClient } from './bootstrap-BiCQmSkx.mjs';
+export { c as bootstrapClient } from './bootstrap-DgvWWDim.mjs';
 import { ZodSchema, z } from 'zod';
 import * as express_rate_limit from 'express-rate-limit';
 import pino, { Logger as Logger$1 } from 'pino';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import http from 'http';
 import { Request, Response } from 'express';
 import { Socket, Server } from 'socket.io';
-export { c as bootstrapClient } from './bootstrap-BiCQmSkx.js';
+export { c as bootstrapClient } from './bootstrap-DgvWWDim.js';
 import { ZodSchema, z } from 'zod';
 import * as express_rate_limit from 'express-rate-limit';
 import pino, { Logger as Logger$1 } from 'pino';

package/dist/index.js

@@ -42,17 +42,19 @@ __export(globals_exports, {
   NOT_FOUND_FILE_PREFIX: () => NOT_FOUND_FILE_PREFIX,
   NOT_FOUND_PATTERN: () => NOT_FOUND_PATTERN,
   PAGE_FILE_NAME: () => PAGE_FILE_NAME,
+  ROUTER_DATA_KEY: () => ROUTER_DATA_KEY,
   STATIC_PATH: () => STATIC_PATH,
   STYLE_FILE_NAME: () => STYLE_FILE_NAME,
   WINDOW_DATA_KEY: () => WINDOW_DATA_KEY
 });
-var BUILD_FOLDER_NAME, STYLE_FILE_NAME, WINDOW_DATA_KEY, APP_CONTAINER_ID, STATIC_PATH, NOT_FOUND_PATTERN, ERROR_PATTERN, NOT_FOUND_CHUNK_KEY, ERROR_CHUNK_KEY, NOT_FOUND_FILE_PREFIX, ERROR_FILE_PREFIX, PAGE_FILE_NAME, LAYOUT_FILE_NAME, FAVICON_PATH, CLIENT_CSS_PATH, CLIENT_JS_PATH, ASSETS_BASE_DIR;
+var BUILD_FOLDER_NAME, STYLE_FILE_NAME, WINDOW_DATA_KEY, ROUTER_DATA_KEY, APP_CONTAINER_ID, STATIC_PATH, NOT_FOUND_PATTERN, ERROR_PATTERN, NOT_FOUND_CHUNK_KEY, ERROR_CHUNK_KEY, NOT_FOUND_FILE_PREFIX, ERROR_FILE_PREFIX, PAGE_FILE_NAME, LAYOUT_FILE_NAME, FAVICON_PATH, CLIENT_CSS_PATH, CLIENT_JS_PATH, ASSETS_BASE_DIR;
 var init_globals = __esm({
   "constants/globals.ts"() {
     "use strict";
     BUILD_FOLDER_NAME = ".loly";
     STYLE_FILE_NAME = "styles.css";
     WINDOW_DATA_KEY = "__FW_DATA__";
+    ROUTER_DATA_KEY = "__LOLY_ROUTER_DATA__";
     APP_CONTAINER_ID = "__app";
     STATIC_PATH = "/static";
     NOT_FOUND_PATTERN = "/not-found";
@@ -3835,6 +3837,7 @@ function createDocumentTree(options) {
   const {
     appTree,
     initialData,
+    routerData,
     meta,
     titleFallback,
     descriptionFallback,
@@ -3872,6 +3875,9 @@ function createDocumentTree(options) {
     ...initialData,
     theme
   });
+  const routerSerialized = JSON.stringify({
+    ...routerData
+  });
   const documentTree = React.createElement(
     "html",
     { lang },
@@ -3919,6 +3925,12 @@ function createDocumentTree(options) {
       dangerouslySetInnerHTML: {
         __html: `window.${WINDOW_DATA_KEY} = ${serialized};`
       }
+    }),
+    React.createElement("script", {
+      nonce,
+      dangerouslySetInnerHTML: {
+        __html: `window.${ROUTER_DATA_KEY} = ${routerSerialized};`
+      }
     })
   );
   return documentTree;
@@ -3941,6 +3953,15 @@ function buildInitialData(urlPath, params, loaderResult) {
   };
 }
 
+// modules/rendering/routerData/index.ts
+var buildRouterData = (req) => {
+  return {
+    pathname: req.path,
+    params: req.params,
+    searchParams: req.query
+  };
+};
+
 // modules/server/handlers/middleware.ts
 async function runRouteMiddlewares(route, ctx) {
   for (const mw of route.middlewares) {
@@ -4102,6 +4123,7 @@ async function handlePageRequestInternal(options) {
     }
   }
   const matched = matchRoute(routes, urlPath);
+  const routerData = buildRouterData(req);
   if (!matched) {
     if (notFoundPage) {
       const ctx2 = {
@@ -4122,6 +4144,7 @@ async function handlePageRequestInternal(options) {
       const documentTree2 = createDocumentTree({
         appTree: appTree2,
         initialData: initialData2,
+        routerData,
         meta: loaderResult2.metadata ?? null,
         titleFallback: "Not found",
         descriptionFallback: "Loly demo",
@@ -4229,6 +4252,7 @@ async function handlePageRequestInternal(options) {
   const documentTree = createDocumentTree({
     appTree,
     initialData,
+    routerData,
     meta: loaderResult.metadata,
     titleFallback: "Loly framework",
     descriptionFallback: "Loly demo",
@@ -4286,6 +4310,7 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
       loaderResult.theme = theme;
     }
     const initialData = buildInitialData(req.path, { error: String(error) }, loaderResult);
+    const routerData = buildRouterData(req);
     initialData.error = true;
     if (isDataReq) {
       res.statusCode = 500;
@@ -4316,6 +4341,7 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
     const documentTree = createDocumentTree({
       appTree,
       initialData,
+      routerData,
       meta: loaderResult.metadata ?? null,
       titleFallback: "Error",
       descriptionFallback: "An error occurred",
@@ -4589,7 +4615,11 @@ var setupApplication = async ({
       helmetConfig.contentSecurityPolicy = {
         directives: {
           defaultSrc: ["'self'"],
-          styleSrc: ["'self'", "'unsafe-inline'", "https://fonts.googleapis.com"],
+          styleSrc: [
+            "'self'",
+            "'unsafe-inline'",
+            "https://fonts.googleapis.com"
+          ],
           scriptSrc: ["'self'", "'unsafe-inline'", "'unsafe-eval'"],
           imgSrc: ["'self'", "data:", "https:"],
           // Allow fetch/XHR to any HTTPS endpoint - users can restrict in their config if needed
@@ -4606,7 +4636,11 @@ var setupApplication = async ({
       const defaultCSP = {
         directives: {
           defaultSrc: ["'self'"],
-          styleSrc: ["'self'", "'unsafe-inline'", "https://fonts.googleapis.com"],
+          styleSrc: [
+            "'self'",
+            "'unsafe-inline'",
+            "https://fonts.googleapis.com"
+          ],
           scriptSrc: ["'self'", nonceFunction],
           imgSrc: ["'self'", "data:", "https:"],
           // Allow fetch/XHR to any HTTPS endpoint - users can restrict in their config if needed
@@ -4629,10 +4663,7 @@ var setupApplication = async ({
             (src) => typeof src === "function"
           );
           if (!hasNonceSupport) {
-            mergedDirectives.scriptSrc = [
-              ...userScriptSrc,
-              nonceFunction
-            ];
+            mergedDirectives.scriptSrc = [...userScriptSrc, nonceFunction];
           } else {
             mergedDirectives.scriptSrc = userScriptSrc;
           }
@@ -4640,19 +4671,25 @@ var setupApplication = async ({
         const userConnectSrc = userDirectives.connectSrc;
         if (userConnectSrc && Array.isArray(userConnectSrc)) {
           const defaultConnectSrc = defaultCSP.directives.connectSrc || [];
-          const mergedConnectSrc = [.../* @__PURE__ */ new Set([...defaultConnectSrc, ...userConnectSrc])];
+          const mergedConnectSrc = [
+            .../* @__PURE__ */ new Set([...defaultConnectSrc, ...userConnectSrc])
+          ];
           mergedDirectives.connectSrc = mergedConnectSrc;
         }
         const userStyleSrc = userDirectives.styleSrc;
         if (userStyleSrc && Array.isArray(userStyleSrc)) {
           const defaultStyleSrc = defaultCSP.directives.styleSrc || [];
-          const mergedStyleSrc = [.../* @__PURE__ */ new Set([...defaultStyleSrc, ...userStyleSrc])];
+          const mergedStyleSrc = [
+            .../* @__PURE__ */ new Set([...defaultStyleSrc, ...userStyleSrc])
+          ];
           mergedDirectives.styleSrc = mergedStyleSrc;
         }
         const userFontSrc = userDirectives.fontSrc;
         if (userFontSrc && Array.isArray(userFontSrc)) {
           const defaultFontSrc = defaultCSP.directives.fontSrc || [];
-          const mergedFontSrc = [.../* @__PURE__ */ new Set([...defaultFontSrc, ...userFontSrc])];
+          const mergedFontSrc = [
+            .../* @__PURE__ */ new Set([...defaultFontSrc, ...userFontSrc])
+          ];
           mergedDirectives.fontSrc = mergedFontSrc;
         }
         helmetConfig.contentSecurityPolicy = {
@@ -4672,23 +4709,27 @@ var setupApplication = async ({
     helmetConfig.hsts = false;
   }
   if (process.env.NODE_ENV !== "development" && security?.contentSecurityPolicy !== false) {
-    app.use((req, res, next) => {
-      const nonce = crypto.randomBytes(16).toString("base64");
-      res.locals.nonce = nonce;
-      next();
-    });
+    app.use(
+      (req, res, next) => {
+        const nonce = crypto.randomBytes(16).toString("base64");
+        res.locals.nonce = nonce;
+        next();
+      }
+    );
   }
   app.use(helmet(helmetConfig));
   const appLogger = createModuleLogger("framework");
-  app.use(requestLoggerMiddleware({
-    logger: appLogger.child({ component: "server" }),
-    logRequests: process.env.LOG_REQUESTS === "true",
-    // Default to false (only errors/warnings)
-    logResponses: process.env.LOG_RESPONSES !== "false",
-    // Default to true (but filtered)
-    logStaticAssets: process.env.LOG_STATIC_ASSETS === "true"
-    // Default to false
-  }));
+  app.use(
+    requestLoggerMiddleware({
+      logger: appLogger.child({ component: "server" }),
+      logRequests: process.env.LOG_REQUESTS === "true",
+      // Default to false (only errors/warnings)
+      logResponses: process.env.LOG_RESPONSES !== "false",
+      // Default to true (but filtered)
+      logStaticAssets: process.env.LOG_STATIC_ASSETS === "true"
+      // Default to false
+    })
+  );
   const corsOptions = {
     credentials: true
   };
@@ -4704,7 +4745,7 @@ var setupApplication = async ({
     corsOptions.origin = process.env.NODE_ENV === "development";
   }
   app.use(cors(corsOptions));
-  if (rateLimit2) {
+  if (rateLimit2 && process.env.NODE_ENV !== "development") {
     const generalLimiter = createRateLimiter({
       windowMs: rateLimit2.windowMs,
       max: rateLimit2.max
@@ -4898,10 +4939,12 @@ async function renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params)
     return;
   }
   const initialData = buildInitialData(urlPath, params, loaderResult);
+  const routerData = buildRouterData(req);
   const appTree = buildAppTree(route, params, initialData.props);
   const documentTree = createDocumentTree({
     appTree,
     initialData,
+    routerData,
     meta: loaderResult.metadata,
     titleFallback: "My Framework Dev",
     descriptionFallback: "Static page generated by @lolyjs/core.",
@@ -5092,12 +5135,23 @@ import { hydrateRoot } from "react-dom/client";
 
 // modules/runtime/client/constants.ts
 var WINDOW_DATA_KEY2 = "__FW_DATA__";
+var ROUTER_DATA_KEY2 = "__LOLY_ROUTER_DATA__";
 var APP_CONTAINER_ID2 = "__app";
+var ROUTER_NAVIGATE_KEY = "__LOLY_ROUTER_NAVIGATE__";
 
 // modules/runtime/client/window-data.ts
 function getWindowData() {
+  if (typeof window === "undefined") {
+    return null;
+  }
   return window[WINDOW_DATA_KEY2] ?? null;
 }
+function getRouterData() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  return window[ROUTER_DATA_KEY2] ?? null;
+}
 function setWindowData(data) {
   window[WINDOW_DATA_KEY2] = data;
   if (typeof window !== "undefined") {
@@ -5108,6 +5162,16 @@ function setWindowData(data) {
     );
   }
 }
+function setRouterData(data) {
+  window[ROUTER_DATA_KEY2] = data;
+  if (typeof window !== "undefined") {
+    window.dispatchEvent(
+      new CustomEvent("fw-router-data-refresh", {
+        detail: { data }
+      })
+    );
+  }
+}
 function getCurrentTheme() {
   return getWindowData()?.theme ?? null;
 }
@@ -5172,7 +5236,7 @@ function applyMetadata(md) {
 }
 
 // modules/runtime/client/AppShell.tsx
-import { useEffect, useState, useRef } from "react";
+import { useEffect, useState, useRef, useCallback } from "react";
 
 // modules/runtime/client/RouterView.tsx
 import { jsx } from "react/jsx-runtime";
@@ -5369,6 +5433,13 @@ async function handleErrorRoute(nextUrl, json, errorRoute, setState) {
       error: true
     };
     setWindowData(windowData);
+    const url = new URL(nextUrl, typeof window !== "undefined" ? window.location.origin : "http://localhost");
+    const routerData = {
+      pathname: url.pathname,
+      params: json.params || {},
+      searchParams: Object.fromEntries(url.searchParams.entries())
+    };
+    setRouterData(routerData);
     setState({
       url: nextUrl,
       route: errorRoute,
@@ -5415,6 +5486,13 @@ async function handleNotFoundRoute(nextUrl, json, notFoundRoute, setState) {
     error: false
   };
   setWindowData(windowData);
+  const url = new URL(nextUrl, typeof window !== "undefined" ? window.location.origin : "http://localhost");
+  const routerData = {
+    pathname: url.pathname,
+    params: {},
+    searchParams: Object.fromEntries(url.searchParams.entries())
+  };
+  setRouterData(routerData);
   if (notFoundRoute) {
     const components = await notFoundRoute.load();
     setState({
@@ -5472,6 +5550,13 @@ async function handleNormalRoute(nextUrl, json, routes, setState) {
     error: false
   };
   setWindowData(windowData);
+  const url = new URL(nextUrl, typeof window !== "undefined" ? window.location.origin : "http://localhost");
+  const routerData = {
+    pathname: url.pathname,
+    params: matched.params,
+    searchParams: Object.fromEntries(url.searchParams.entries())
+  };
+  setRouterData(routerData);
   const components = await matched.route.load();
   window.scrollTo({
     top: 0,
@@ -5591,6 +5676,10 @@ function createPopStateHandler(navigate2) {
   };
 }
 
+// modules/runtime/client/RouterContext.tsx
+import { createContext, useContext } from "react";
+var RouterContext = createContext(null);
+
 // modules/runtime/client/AppShell.tsx
 import { jsx as jsx2 } from "react/jsx-runtime";
 function AppShell({
@@ -5614,14 +5703,30 @@ function AppShell({
       errorRoute
     };
   }, [routes, notFoundRoute, errorRoute]);
+  const handleNavigate = useCallback(
+    async (nextUrl, options) => {
+      await navigate(nextUrl, handlersRef.current, {
+        revalidate: options?.revalidate
+      });
+    },
+    []
+  );
+  useEffect(() => {
+    if (typeof window !== "undefined") {
+      window[ROUTER_NAVIGATE_KEY] = handleNavigate;
+      return () => {
+        delete window[ROUTER_NAVIGATE_KEY];
+      };
+    }
+  }, [handleNavigate]);
   useEffect(() => {
     let isMounted = true;
-    async function handleNavigate(nextUrl, options) {
+    async function handleNavigateInternal(nextUrl, options) {
       if (!isMounted) return;
       await navigate(nextUrl, handlersRef.current, options);
     }
-    const handleClick = createClickHandler(handleNavigate);
-    const handlePopState = createPopStateHandler(handleNavigate);
+    const handleClick = createClickHandler(handleNavigateInternal);
+    const handlePopState = createPopStateHandler(handleNavigateInternal);
     window.addEventListener("click", handleClick, false);
     window.addEventListener("popstate", handlePopState, false);
     return () => {
@@ -5630,11 +5735,33 @@ function AppShell({
       window.removeEventListener("popstate", handlePopState, false);
     };
   }, []);
+  useEffect(() => {
+    const handleDataRefresh = () => {
+      const freshData = window?.__FW_DATA__;
+      if (!freshData) return;
+      const currentPathname = window.location.pathname;
+      const freshPathname = freshData.pathname;
+      if (freshPathname === currentPathname) {
+        if (freshData.metadata !== void 0) {
+          applyMetadata(freshData.metadata);
+        }
+        setState((prevState) => ({
+          ...prevState,
+          props: freshData.props ?? prevState.props,
+          params: freshData.params ?? prevState.params
+        }));
+      }
+    };
+    window.addEventListener("fw-data-refresh", handleDataRefresh);
+    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";
   const routeKey = `${state.url}:${routeType}`;
-  return /* @__PURE__ */ jsx2(RouterView, { state }, routeKey);
+  return /* @__PURE__ */ jsx2(RouterContext.Provider, { value: { navigate: handleNavigate }, children: /* @__PURE__ */ jsx2(RouterView, { state }, routeKey) });
 }
 
 // modules/runtime/client/bootstrap.tsx
@@ -5734,6 +5861,16 @@ function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
       return;
     }
     const initialUrl = window.location.pathname + window.location.search;
+    let routerData = getRouterData();
+    if (!routerData) {
+      const url = new URL(initialUrl, window.location.origin);
+      routerData = {
+        pathname: url.pathname,
+        params: initialData?.params || {},
+        searchParams: Object.fromEntries(url.searchParams.entries())
+      };
+      setRouterData(routerData);
+    }
     try {
       const initialState = await loadInitialRoute(
         initialUrl,
@@ -5772,7 +5909,6 @@ function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
 function withCache(fn, options) {
   const ttl = options.ttl ?? 60;
   return async function cachedGssp(ctx) {
-    console.log("TTL", ttl);
     return await fn(ctx);
   };
 }