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

package/dist/react/hooks.js

@@ -18,41 +18,213 @@ var useBroadcastChannel = (channelName) => {
   return { message, sendMessage };
 };
 
-// modules/react/hooks/usePageProps/index.ts
-import { useEffect as useEffect2, useState as useState2 } from "react";
-function usePageProps() {
-  const [state, setState] = useState2(() => {
-    if (typeof window !== "undefined" && window?.__FW_DATA__) {
-      const data = window.__FW_DATA__;
+// modules/react/hooks/useRouter/index.ts
+import { useState as useState2, useEffect as useEffect2, useCallback, useContext as useContext2, useRef } from "react";
+
+// modules/runtime/client/RouterContext.tsx
+import { createContext, useContext } from "react";
+var RouterContext = createContext(null);
+
+// modules/runtime/client/constants.ts
+var WINDOW_DATA_KEY = "__FW_DATA__";
+var ROUTER_DATA_KEY = "__LOLY_ROUTER_DATA__";
+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_KEY] ?? null;
+}
+function getRouterData() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  return window[ROUTER_DATA_KEY] ?? null;
+}
+
+// modules/react/hooks/useRouter/index.ts
+function useRouter() {
+  const context = useContext2(RouterContext);
+  const navigate = context?.navigate;
+  const navigateRef = useRef(navigate);
+  useEffect2(() => {
+    navigateRef.current = navigate;
+  }, [navigate]);
+  const [routeData, setRouteData] = useState2(() => {
+    if (typeof window === "undefined") {
       return {
-        params: data.params || {},
-        props: data.props || {}
+        pathname: "",
+        query: {},
+        searchParams: {},
+        params: {}
       };
     }
+    const data = getWindowData();
+    const routerData = getRouterData();
+    const searchParams = routerData?.searchParams || parseQueryString(window.location.search);
     return {
-      params: {},
-      props: {}
+      pathname: routerData?.pathname || data?.pathname || window.location.pathname,
+      query: searchParams,
+      // For backward compatibility
+      searchParams,
+      params: routerData?.params || data?.params || {}
     };
   });
   useEffect2(() => {
+    if (typeof window === "undefined") return;
     const handleDataRefresh = () => {
-      if (window?.__FW_DATA__) {
-        const data = window.__FW_DATA__;
-        setState({
-          params: data.params || {},
-          props: data.props || {}
-        });
-      }
+      const data = getWindowData();
+      const routerData = getRouterData();
+      const currentPathname = window.location.pathname;
+      const currentSearch = window.location.search;
+      const searchParams = routerData?.searchParams || parseQueryString(currentSearch);
+      setRouteData({
+        pathname: routerData?.pathname || data?.pathname || currentPathname,
+        query: searchParams,
+        // For backward compatibility
+        searchParams,
+        params: routerData?.params || data?.params || {}
+      });
     };
     window.addEventListener("fw-data-refresh", handleDataRefresh);
+    window.addEventListener("fw-router-data-refresh", handleDataRefresh);
+    const handlePopState = () => {
+      handleDataRefresh();
+    };
+    window.addEventListener("popstate", handlePopState);
     return () => {
       window.removeEventListener("fw-data-refresh", handleDataRefresh);
+      window.removeEventListener("fw-router-data-refresh", handleDataRefresh);
+      window.removeEventListener("popstate", handlePopState);
     };
   }, []);
-  return { params: state.params, props: state.props };
+  const push = useCallback(
+    async (url, options) => {
+      const fullUrl = url.startsWith("/") ? url : `/${url}`;
+      const getCurrentNavigate = () => {
+        if (navigateRef.current) return navigateRef.current;
+        if (navigate) return navigate;
+        if (typeof window !== "undefined" && window[ROUTER_NAVIGATE_KEY]) {
+          return window[ROUTER_NAVIGATE_KEY];
+        }
+        return null;
+      };
+      let currentNavigate = getCurrentNavigate();
+      if (typeof window === "undefined") {
+        return;
+      }
+      if (!currentNavigate) {
+        for (let i = 0; i < 10; i++) {
+          await new Promise((resolve) => setTimeout(resolve, 10));
+          currentNavigate = getCurrentNavigate();
+          if (currentNavigate) break;
+        }
+      }
+      if (!currentNavigate) {
+        window.location.href = fullUrl;
+        return;
+      }
+      const currentUrl = window.location.pathname + window.location.search;
+      if (fullUrl === currentUrl) {
+        return;
+      }
+      window.history.pushState({}, "", fullUrl);
+      await currentNavigate(fullUrl, options);
+    },
+    [navigate]
+    // Include navigate in dependencies so it updates when context becomes available
+  );
+  const replace = useCallback(
+    async (url, options) => {
+      const fullUrl = url.startsWith("/") ? url : `/${url}`;
+      const getCurrentNavigate = () => {
+        if (navigateRef.current) return navigateRef.current;
+        if (navigate) return navigate;
+        if (typeof window !== "undefined" && window[ROUTER_NAVIGATE_KEY]) {
+          return window[ROUTER_NAVIGATE_KEY];
+        }
+        return null;
+      };
+      let currentNavigate = getCurrentNavigate();
+      if (typeof window === "undefined") {
+        return;
+      }
+      if (!currentNavigate) {
+        for (let i = 0; i < 10; i++) {
+          await new Promise((resolve) => setTimeout(resolve, 10));
+          currentNavigate = getCurrentNavigate();
+          if (currentNavigate) break;
+        }
+      }
+      if (!currentNavigate) {
+        window.location.replace(fullUrl);
+        return;
+      }
+      window.history.replaceState({}, "", fullUrl);
+      await currentNavigate(fullUrl, options);
+    },
+    [navigate]
+  );
+  const back = useCallback(() => {
+    if (typeof window !== "undefined") {
+      window.history.back();
+    }
+  }, []);
+  const refresh = useCallback(async () => {
+    const currentUrl = typeof window !== "undefined" ? window.location.pathname + window.location.search : routeData.pathname;
+    const getCurrentNavigate = () => {
+      if (navigateRef.current) return navigateRef.current;
+      if (navigate) return navigate;
+      if (typeof window !== "undefined" && window[ROUTER_NAVIGATE_KEY]) {
+        return window[ROUTER_NAVIGATE_KEY];
+      }
+      return null;
+    };
+    let currentNavigate = getCurrentNavigate();
+    if (typeof window === "undefined") {
+      return;
+    }
+    if (!currentNavigate) {
+      for (let i = 0; i < 10; i++) {
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        currentNavigate = getCurrentNavigate();
+        if (currentNavigate) break;
+      }
+    }
+    if (!currentNavigate) {
+      window.location.reload();
+      return;
+    }
+    await currentNavigate(currentUrl, { revalidate: true });
+  }, [navigate, routeData.pathname]);
+  return {
+    push,
+    replace,
+    back,
+    refresh,
+    pathname: routeData.pathname,
+    query: routeData.query,
+    searchParams: routeData.searchParams,
+    params: routeData.params
+  };
+}
+function parseQueryString(search) {
+  const params = {};
+  if (!search || search.length === 0) return params;
+  const queryString = search.startsWith("?") ? search.slice(1) : search;
+  const pairs = queryString.split("&");
+  for (const pair of pairs) {
+    const [key, value] = pair.split("=");
+    if (key) {
+      params[decodeURIComponent(key)] = value ? decodeURIComponent(value) : "";
+    }
+  }
+  return params;
 }
 export {
   useBroadcastChannel,
-  usePageProps
+  useRouter
 };
 //# sourceMappingURL=hooks.js.map

package/dist/react/hooks.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../modules/react/hooks/useBroadcastChannel/index.tsx","../../modules/react/hooks/usePageProps/index.ts"],"sourcesContent":["import React, { useEffect, useState } from \"react\";\r\n\r\nexport const useBroadcastChannel = (channelName: string) => {\r\n  const [message, setMessage] = useState(null);\r\n  const channel = new BroadcastChannel(channelName);\r\n\r\n  useEffect(() => {\r\n    const handleMessage = (event: MessageEvent) => {\r\n      setMessage(event.data);\r\n    };\r\n\r\n    channel.onmessage = handleMessage;\r\n\r\n    // Clean up the channel when the component unmounts\r\n    return () => {\r\n      channel.close();\r\n    };\r\n  }, [channel]);\r\n\r\n  const sendMessage = (msg: unknown) => {\r\n    channel.postMessage(msg);\r\n  };\r\n\r\n  return { message, sendMessage };\r\n};\r\n","import React, { useEffect, useState } from \"react\";\r\n\r\n/**\r\n * Hook to access page props and route parameters.\r\n *\r\n * Reads initial data from window.__FW_DATA__ set during SSR.\r\n * Automatically updates when `revalidate()` is called.\r\n *\r\n * @template P - Type for page props (default: any)\r\n * @template T - Type for route params (default: any)\r\n * @returns Object containing params and props\r\n *\r\n * @example\r\n * // With props type only\r\n * const { props } = usePageProps<{ title: string }>();\r\n *\r\n * @example\r\n * // With both props and params types\r\n * const { props, params } = usePageProps<{ title: string }, { id: string }>();\r\n */\r\nexport function usePageProps<P = any, T = any>(): { params: T, props: P } {\r\n  const [state, setState] = useState<{ params: T, props: P }>(() => {\r\n    // Initialize with current data if available\r\n    if (typeof window !== \"undefined\" && (window as any)?.__FW_DATA__) {\r\n      const data = (window as any).__FW_DATA__;\r\n      return {\r\n        params: data.params || {} as T,\r\n        props: data.props || {} as P,\r\n      };\r\n    }\r\n    return {\r\n      params: {} as T,\r\n      props: {} as P,\r\n    };\r\n  });\r\n\r\n  useEffect(() => {\r\n    // Listen for data refresh events (from revalidate() or navigation)\r\n    const handleDataRefresh = () => {\r\n      if ((window as any)?.__FW_DATA__) {\r\n        const data = (window as any).__FW_DATA__;\r\n        setState({\r\n          params: data.params || {} as T,\r\n          props: data.props || {} as P,\r\n        });\r\n      }\r\n    };\r\n\r\n    window.addEventListener(\"fw-data-refresh\", handleDataRefresh);\r\n\r\n    return () => {\r\n      window.removeEventListener(\"fw-data-refresh\", handleDataRefresh);\r\n    };\r\n  }, []);\r\n\r\n  return { params: state.params as T, props: state.props as P };\r\n};\r\n"],"mappings":";AAAA,SAAgB,WAAW,gBAAgB;AAEpC,IAAM,sBAAsB,CAAC,gBAAwB;AAC1D,QAAM,CAAC,SAAS,UAAU,IAAI,SAAS,IAAI;AAC3C,QAAM,UAAU,IAAI,iBAAiB,WAAW;AAEhD,YAAU,MAAM;AACd,UAAM,gBAAgB,CAAC,UAAwB;AAC7C,iBAAW,MAAM,IAAI;AAAA,IACvB;AAEA,YAAQ,YAAY;AAGpB,WAAO,MAAM;AACX,cAAQ,MAAM;AAAA,IAChB;AAAA,EACF,GAAG,CAAC,OAAO,CAAC;AAEZ,QAAM,cAAc,CAAC,QAAiB;AACpC,YAAQ,YAAY,GAAG;AAAA,EACzB;AAEA,SAAO,EAAE,SAAS,YAAY;AAChC;;;ACxBA,SAAgB,aAAAA,YAAW,YAAAC,iBAAgB;AAoBpC,SAAS,eAA0D;AACxE,QAAM,CAAC,OAAO,QAAQ,IAAIA,UAAkC,MAAM;AAEhE,QAAI,OAAO,WAAW,eAAgB,QAAgB,aAAa;AACjE,YAAM,OAAQ,OAAe;AAC7B,aAAO;AAAA,QACL,QAAQ,KAAK,UAAU,CAAC;AAAA,QACxB,OAAO,KAAK,SAAS,CAAC;AAAA,MACxB;AAAA,IACF;AACA,WAAO;AAAA,MACL,QAAQ,CAAC;AAAA,MACT,OAAO,CAAC;AAAA,IACV;AAAA,EACF,CAAC;AAED,EAAAD,WAAU,MAAM;AAEd,UAAM,oBAAoB,MAAM;AAC9B,UAAK,QAAgB,aAAa;AAChC,cAAM,OAAQ,OAAe;AAC7B,iBAAS;AAAA,UACP,QAAQ,KAAK,UAAU,CAAC;AAAA,UACxB,OAAO,KAAK,SAAS,CAAC;AAAA,QACxB,CAAC;AAAA,MACH;AAAA,IACF;AAEA,WAAO,iBAAiB,mBAAmB,iBAAiB;AAE5D,WAAO,MAAM;AACX,aAAO,oBAAoB,mBAAmB,iBAAiB;AAAA,IACjE;AAAA,EACF,GAAG,CAAC,CAAC;AAEL,SAAO,EAAE,QAAQ,MAAM,QAAa,OAAO,MAAM,MAAW;AAC9D;","names":["useEffect","useState"]}
+{"version":3,"sources":["../../modules/react/hooks/useBroadcastChannel/index.tsx","../../modules/react/hooks/useRouter/index.ts","../../modules/runtime/client/RouterContext.tsx","../../modules/runtime/client/constants.ts","../../modules/runtime/client/window-data.ts"],"sourcesContent":["import React, { useEffect, useState } from \"react\";\r\n\r\nexport const useBroadcastChannel = (channelName: string) => {\r\n  const [message, setMessage] = useState(null);\r\n  const channel = new BroadcastChannel(channelName);\r\n\r\n  useEffect(() => {\r\n    const handleMessage = (event: MessageEvent) => {\r\n      setMessage(event.data);\r\n    };\r\n\r\n    channel.onmessage = handleMessage;\r\n\r\n    // Clean up the channel when the component unmounts\r\n    return () => {\r\n      channel.close();\r\n    };\r\n  }, [channel]);\r\n\r\n  const sendMessage = (msg: unknown) => {\r\n    channel.postMessage(msg);\r\n  };\r\n\r\n  return { message, sendMessage };\r\n};\r\n","import { useState, useEffect, useCallback, useContext, useRef } from \"react\";\r\nimport { RouterContext } from \"../../../runtime/client/RouterContext\";\r\nimport { getWindowData, getRouterData } from \"../../../runtime/client/window-data\";\r\nimport { ROUTER_NAVIGATE_KEY } from \"../../../runtime/client/constants\";\r\n\r\nexport interface Router {\r\n  /**\r\n   * Navigate to a new route.\r\n   * @param url - The URL to navigate to (e.g., \"/about\" or \"/blog/[slug]\" with params)\r\n   * @param options - Navigation options\r\n   */\r\n  push: (url: string, options?: { revalidate?: boolean }) => Promise<void>;\r\n  \r\n  /**\r\n   * Replace the current route without adding to history.\r\n   * @param url - The URL to navigate to\r\n   * @param options - Navigation options\r\n   */\r\n  replace: (url: string, options?: { revalidate?: boolean }) => Promise<void>;\r\n  \r\n  /**\r\n   * Go back in the browser history.\r\n   */\r\n  back: () => void;\r\n  \r\n  /**\r\n   * Refresh the current route data by revalidating.\r\n   */\r\n  refresh: () => Promise<void>;\r\n  \r\n  /**\r\n   * Current pathname (e.g., \"/blog/my-post\")\r\n   */\r\n  pathname: string;\r\n  \r\n  /**\r\n   * Query parameters from the URL (e.g., ?id=123&name=test)\r\n   * Alias for searchParams for backward compatibility\r\n   */\r\n  query: Record<string, string>;\r\n  \r\n  /**\r\n   * Search parameters from the URL (e.g., ?id=123&name=test)\r\n   */\r\n  searchParams: Record<string, unknown>;\r\n  \r\n  /**\r\n   * Dynamic route parameters (e.g., { slug: \"my-post\" } for /blog/[slug])\r\n   */\r\n  params: Record<string, string>;\r\n}\r\n\r\n/**\r\n * Hook to access router functionality and current route information.\r\n * \r\n * Provides methods to navigate programmatically and access current route data.\r\n * \r\n * @returns Router object with navigation methods and route information\r\n * \r\n * @example\r\n * ```tsx\r\n * function MyComponent() {\r\n *   const router = useRouter();\r\n *   \r\n *   const handleClick = () => {\r\n *     router.push(\"/about\");\r\n *   };\r\n *   \r\n *   return (\r\n *     <div>\r\n *       <p>Current path: {router.pathname}</p>\r\n *       <p>Params: {JSON.stringify(router.params)}</p>\r\n *       <button onClick={handleClick}>Go to About</button>\r\n *     </div>\r\n *   );\r\n * }\r\n * ```\r\n * \r\n * @example\r\n * ```tsx\r\n * // Navigate with dynamic params\r\n * router.push(\"/blog/my-post\");\r\n * \r\n * // Replace current route\r\n * router.replace(\"/login\");\r\n * \r\n * // Refresh current route data\r\n * await router.refresh();\r\n * ```\r\n */\r\nexport function useRouter(): Router {\r\n  // Try to get context, but don't throw if it's not available (SSR)\r\n  const context = useContext(RouterContext);\r\n  const navigate = context?.navigate;\r\n  \r\n  // Use a ref to store navigate so we can access it in callbacks even if context updates\r\n  // Initialize with current navigate value\r\n  const navigateRef = useRef(navigate);\r\n  \r\n  // Update ref when navigate changes (this ensures we always have the latest value)\r\n  useEffect(() => {\r\n    navigateRef.current = navigate;\r\n  }, [navigate]);\r\n  \r\n  const [routeData, setRouteData] = useState(() => {\r\n    // During SSR, return empty/default values\r\n    if (typeof window === \"undefined\") {\r\n      return {\r\n        pathname: \"\",\r\n        query: {},\r\n        searchParams: {},\r\n        params: {},\r\n      };\r\n    }\r\n    \r\n    // On client, get data from window\r\n    const data = getWindowData();\r\n    const routerData = getRouterData();\r\n    \r\n    // Parse search params from URL if routerData is not available\r\n    const searchParams = routerData?.searchParams || parseQueryString(window.location.search);\r\n    \r\n    return {\r\n      pathname: routerData?.pathname || data?.pathname || window.location.pathname,\r\n      query: searchParams as Record<string, string>, // For backward compatibility\r\n      searchParams: searchParams,\r\n      params: routerData?.params || data?.params || {},\r\n    };\r\n  });\r\n\r\n  // Listen for route changes (only on client)\r\n  useEffect(() => {\r\n    if (typeof window === \"undefined\") return;\r\n    \r\n    const handleDataRefresh = () => {\r\n      const data = getWindowData();\r\n      const routerData = getRouterData();\r\n      const currentPathname = window.location.pathname;\r\n      const currentSearch = window.location.search;\r\n      \r\n      const searchParams = routerData?.searchParams || parseQueryString(currentSearch);\r\n      \r\n      setRouteData({\r\n        pathname: routerData?.pathname || data?.pathname || currentPathname,\r\n        query: searchParams as Record<string, string>, // For backward compatibility\r\n        searchParams: searchParams,\r\n        params: routerData?.params || data?.params || {},\r\n      });\r\n    };\r\n\r\n    // Listen for navigation events\r\n    window.addEventListener(\"fw-data-refresh\", handleDataRefresh);\r\n    window.addEventListener(\"fw-router-data-refresh\", handleDataRefresh);\r\n    \r\n    // Also listen for popstate (browser back/forward)\r\n    const handlePopState = () => {\r\n      handleDataRefresh();\r\n    };\r\n    window.addEventListener(\"popstate\", handlePopState);\r\n\r\n    return () => {\r\n      window.removeEventListener(\"fw-data-refresh\", handleDataRefresh);\r\n      window.removeEventListener(\"fw-router-data-refresh\", handleDataRefresh);\r\n      window.removeEventListener(\"popstate\", handlePopState);\r\n    };\r\n  }, []);\r\n\r\n  const push = useCallback(\r\n    async (url: string, options?: { revalidate?: boolean }) => {\r\n      const fullUrl = url.startsWith(\"/\") ? url : `/${url}`;\r\n      \r\n      /**\r\n       * SOLUTION: Multi-source navigate function resolution\r\n       * \r\n       * During React hydration, RouterContext may not be available immediately.\r\n       * We try three sources in order:\r\n       * 1. navigateRef.current - Most up-to-date, updated via useEffect\r\n       * 2. navigate from context - Direct context access\r\n       * 3. window.__LOLY_ROUTER_NAVIGATE__ - Global fallback exposed by AppShell\r\n       * \r\n       * This ensures SPA navigation works even during hydration timing issues.\r\n       */\r\n      const getCurrentNavigate = () => {\r\n        if (navigateRef.current) return navigateRef.current;\r\n        if (navigate) return navigate;\r\n        if (typeof window !== \"undefined\" && (window as any)[ROUTER_NAVIGATE_KEY]) {\r\n          return (window as any)[ROUTER_NAVIGATE_KEY];\r\n        }\r\n        return null;\r\n      };\r\n      \r\n      let currentNavigate = getCurrentNavigate();\r\n      \r\n      if (typeof window === \"undefined\") {\r\n        return; // SSR\r\n      }\r\n      \r\n      // Wait for context during hydration (up to 100ms)\r\n      if (!currentNavigate) {\r\n        for (let i = 0; i < 10; i++) {\r\n          await new Promise(resolve => setTimeout(resolve, 10));\r\n          currentNavigate = getCurrentNavigate();\r\n          if (currentNavigate) break;\r\n        }\r\n      }\r\n      \r\n      // Final fallback: full page reload if navigate is still unavailable\r\n      if (!currentNavigate) {\r\n        window.location.href = fullUrl;\r\n        return;\r\n      }\r\n      \r\n      // Check if we're already on this URL (same as link handler)\r\n      const currentUrl = window.location.pathname + window.location.search;\r\n      if (fullUrl === currentUrl) {\r\n        return; // Already on this route, no need to navigate\r\n      }\r\n      \r\n      // Update URL in browser history (same as link handler does)\r\n      // This is done BEFORE navigation to match link behavior\r\n      window.history.pushState({}, \"\", fullUrl);\r\n      \r\n      // Navigate using SPA navigation (same as link handler)\r\n      // If navigation fails, navigate() will handle the reload internally\r\n      await currentNavigate(fullUrl, options);\r\n    },\r\n    [navigate] // Include navigate in dependencies so it updates when context becomes available\r\n  );\r\n\r\n  const replace = useCallback(\r\n    async (url: string, options?: { revalidate?: boolean }) => {\r\n      const fullUrl = url.startsWith(\"/\") ? url : `/${url}`;\r\n      \r\n      const getCurrentNavigate = () => {\r\n        if (navigateRef.current) return navigateRef.current;\r\n        if (navigate) return navigate;\r\n        if (typeof window !== \"undefined\" && (window as any)[ROUTER_NAVIGATE_KEY]) {\r\n          return (window as any)[ROUTER_NAVIGATE_KEY];\r\n        }\r\n        return null;\r\n      };\r\n      \r\n      let currentNavigate = getCurrentNavigate();\r\n      \r\n      if (typeof window === \"undefined\") {\r\n        return;\r\n      }\r\n      \r\n      if (!currentNavigate) {\r\n        for (let i = 0; i < 10; i++) {\r\n          await new Promise(resolve => setTimeout(resolve, 10));\r\n          currentNavigate = getCurrentNavigate();\r\n          if (currentNavigate) break;\r\n        }\r\n      }\r\n      \r\n      if (!currentNavigate) {\r\n        window.location.replace(fullUrl);\r\n        return;\r\n      }\r\n      \r\n      // Update URL in browser history using replace (doesn't add to history)\r\n      window.history.replaceState({}, \"\", fullUrl);\r\n      \r\n      // Navigate using SPA navigation\r\n      await currentNavigate(fullUrl, options);\r\n    },\r\n    [navigate]\r\n  );\r\n\r\n  const back = useCallback(() => {\r\n    if (typeof window !== \"undefined\") {\r\n      window.history.back();\r\n    }\r\n  }, []);\r\n\r\n  const refresh = useCallback(async () => {\r\n    const currentUrl = typeof window !== \"undefined\" \r\n      ? window.location.pathname + window.location.search \r\n      : routeData.pathname;\r\n    \r\n    const getCurrentNavigate = () => {\r\n      if (navigateRef.current) return navigateRef.current;\r\n      if (navigate) return navigate;\r\n      if (typeof window !== \"undefined\" && (window as any)[ROUTER_NAVIGATE_KEY]) {\r\n        return (window as any)[ROUTER_NAVIGATE_KEY];\r\n      }\r\n      return null;\r\n    };\r\n    \r\n    let currentNavigate = getCurrentNavigate();\r\n    \r\n    if (typeof window === \"undefined\") {\r\n      return;\r\n    }\r\n    \r\n    if (!currentNavigate) {\r\n      for (let i = 0; i < 10; i++) {\r\n        await new Promise(resolve => setTimeout(resolve, 10));\r\n        currentNavigate = getCurrentNavigate();\r\n        if (currentNavigate) break;\r\n      }\r\n    }\r\n    \r\n    if (!currentNavigate) {\r\n      window.location.reload();\r\n      return;\r\n    }\r\n    \r\n    await currentNavigate(currentUrl, { revalidate: true });\r\n  }, [navigate, routeData.pathname]);\r\n\r\n  return {\r\n    push,\r\n    replace,\r\n    back,\r\n    refresh,\r\n    pathname: routeData.pathname,\r\n    query: routeData.query,\r\n    searchParams: routeData.searchParams,\r\n    params: routeData.params,\r\n  };\r\n}\r\n\r\n/**\r\n * Parse query string into an object.\r\n * @param search - Query string (e.g., \"?id=123&name=test\")\r\n * @returns Object with query parameters\r\n */\r\nfunction parseQueryString(search: string): Record<string, string> {\r\n  const params: Record<string, string> = {};\r\n  if (!search || search.length === 0) return params;\r\n  \r\n  const queryString = search.startsWith(\"?\") ? search.slice(1) : search;\r\n  const pairs = queryString.split(\"&\");\r\n  \r\n  for (const pair of pairs) {\r\n    const [key, value] = pair.split(\"=\");\r\n    if (key) {\r\n      params[decodeURIComponent(key)] = value ? decodeURIComponent(value) : \"\";\r\n    }\r\n  }\r\n  \r\n  return params;\r\n}\r\n","import { createContext, useContext } from \"react\";\r\n\r\nexport type NavigateFunction = (\r\n  url: string,\r\n  options?: { revalidate?: boolean; replace?: boolean }\r\n) => Promise<void>;\r\n\r\nexport interface RouterContextValue {\r\n  navigate: NavigateFunction;\r\n}\r\n\r\nexport const RouterContext = createContext<RouterContextValue | null>(null);\r\n\r\nexport function useRouterContext(): RouterContextValue {\r\n  const context = useContext(RouterContext);\r\n  if (!context) {\r\n    throw new Error(\r\n      \"useRouter must be used within a RouterProvider. Make sure you're using it inside a Loly app.\"\r\n    );\r\n  }\r\n  return context;\r\n}\r\n","// Client-side constants (hardcoded to avoid alias resolution issues in Rspack)\r\nexport const WINDOW_DATA_KEY = \"__FW_DATA__\";\r\nexport const ROUTER_DATA_KEY = \"__LOLY_ROUTER_DATA__\";\r\nexport const APP_CONTAINER_ID = \"__app\";\r\n// Global key for navigate function fallback (exposed by AppShell for hydration timing issues)\r\nexport const ROUTER_NAVIGATE_KEY = \"__LOLY_ROUTER_NAVIGATE__\";\r\n\r\n","import { WINDOW_DATA_KEY, ROUTER_DATA_KEY } from \"./constants\";\r\nimport type { InitialData, RouterData } from \"./types\";\r\n\r\nexport function getWindowData(): InitialData | null {\r\n  if (typeof window === \"undefined\") {\r\n    return null;\r\n  }\r\n  return ((window as any)[WINDOW_DATA_KEY] as InitialData | undefined) ?? null;\r\n}\r\n\r\nexport function getRouterData(): RouterData | null {\r\n  if (typeof window === \"undefined\") {\r\n    return null;\r\n  }\r\n  return ((window as any)[ROUTER_DATA_KEY] as RouterData | undefined) ?? null;\r\n}\r\n\r\nexport function setWindowData(data: InitialData): void {\r\n  (window as any)[WINDOW_DATA_KEY] = data;\r\n  \r\n  // Dispatch event for components to listen to (e.g., usePageProps, ThemeProvider)\r\n  // This ensures components update when navigating in SPA mode\r\n  if (typeof window !== \"undefined\") {\r\n    window.dispatchEvent(\r\n      new CustomEvent(\"fw-data-refresh\", {\r\n        detail: { data },\r\n      })\r\n    );\r\n  }\r\n}\r\n\r\nexport function setRouterData(data: RouterData): void {\r\n  (window as any)[ROUTER_DATA_KEY] = data;\r\n  \r\n  // Dispatch event for router data updates\r\n  if (typeof window !== \"undefined\") {\r\n    window.dispatchEvent(\r\n      new CustomEvent(\"fw-router-data-refresh\", {\r\n        detail: { data },\r\n      })\r\n    );\r\n  }\r\n}\r\n\r\nexport function getCurrentTheme(): string | null {\r\n  return getWindowData()?.theme ?? null;\r\n}\r\n\r\n"],"mappings":"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","names":["useState","useEffect","useContext","useContext","useEffect","useState"]}

package/dist/runtime.cjs

@@ -29,12 +29,23 @@ var import_client = require("react-dom/client");
 
 // modules/runtime/client/constants.ts
 var WINDOW_DATA_KEY = "__FW_DATA__";
+var ROUTER_DATA_KEY = "__LOLY_ROUTER_DATA__";
 var APP_CONTAINER_ID = "__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_KEY] ?? null;
 }
+function getRouterData() {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  return window[ROUTER_DATA_KEY] ?? null;
+}
 function setWindowData(data) {
   window[WINDOW_DATA_KEY] = data;
   if (typeof window !== "undefined") {
@@ -45,6 +56,16 @@ function setWindowData(data) {
     );
   }
 }
+function setRouterData(data) {
+  window[ROUTER_DATA_KEY] = data;
+  if (typeof window !== "undefined") {
+    window.dispatchEvent(
+      new CustomEvent("fw-router-data-refresh", {
+        detail: { data }
+      })
+    );
+  }
+}
 function getCurrentTheme() {
   return getWindowData()?.theme ?? null;
 }
@@ -109,7 +130,7 @@ function applyMetadata(md) {
 }
 
 // modules/runtime/client/AppShell.tsx
-var import_react = require("react");
+var import_react2 = require("react");
 
 // modules/runtime/client/RouterView.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -306,6 +327,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,
@@ -352,6 +380,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({
@@ -409,6 +444,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,
@@ -528,6 +570,10 @@ function createPopStateHandler(navigate2) {
   };
 }
 
+// modules/runtime/client/RouterContext.tsx
+var import_react = require("react");
+var RouterContext = (0, import_react.createContext)(null);
+
 // modules/runtime/client/AppShell.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
 function AppShell({
@@ -536,14 +582,14 @@ function AppShell({
   notFoundRoute,
   errorRoute
 }) {
-  const [state, setState] = (0, import_react.useState)(initialState);
-  const handlersRef = (0, import_react.useRef)({
+  const [state, setState] = (0, import_react2.useState)(initialState);
+  const handlersRef = (0, import_react2.useRef)({
     setState,
     routes,
     notFoundRoute,
     errorRoute
   });
-  (0, import_react.useEffect)(() => {
+  (0, import_react2.useEffect)(() => {
     handlersRef.current = {
       setState,
       routes,
@@ -551,14 +597,30 @@ function AppShell({
       errorRoute
     };
   }, [routes, notFoundRoute, errorRoute]);
-  (0, import_react.useEffect)(() => {
+  const handleNavigate = (0, import_react2.useCallback)(
+    async (nextUrl, options) => {
+      await navigate(nextUrl, handlersRef.current, {
+        revalidate: options?.revalidate
+      });
+    },
+    []
+  );
+  (0, import_react2.useEffect)(() => {
+    if (typeof window !== "undefined") {
+      window[ROUTER_NAVIGATE_KEY] = handleNavigate;
+      return () => {
+        delete window[ROUTER_NAVIGATE_KEY];
+      };
+    }
+  }, [handleNavigate]);
+  (0, import_react2.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 () => {
@@ -567,11 +629,33 @@ function AppShell({
       window.removeEventListener("popstate", handlePopState, false);
     };
   }, []);
+  (0, import_react2.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__ */ (0, import_jsx_runtime2.jsx)(RouterView, { state }, routeKey);
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(RouterContext.Provider, { value: { navigate: handleNavigate }, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(RouterView, { state }, routeKey) });
 }
 
 // modules/runtime/client/bootstrap.tsx
@@ -671,6 +755,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,