@lolyjs/core 0.1.0-alpha.9 → 0.2.0-alpha.1

package/dist/runtime.js

@@ -7,8 +7,7 @@ var APP_CONTAINER_ID = "__app";
 
 // modules/runtime/client/window-data.ts
 function getWindowData() {
-  var _a;
-  return (_a = window[WINDOW_DATA_KEY]) != null ? _a : null;
+  return window[WINDOW_DATA_KEY] ?? null;
 }
 function setWindowData(data) {
   window[WINDOW_DATA_KEY] = data;
@@ -21,8 +20,7 @@ function setWindowData(data) {
   }
 }
 function getCurrentTheme() {
-  var _a, _b;
-  return (_b = (_a = getWindowData()) == null ? void 0 : _a.theme) != null ? _b : null;
+  return getWindowData()?.theme ?? null;
 }
 
 // modules/runtime/client/route-matcher.ts
@@ -90,11 +88,6 @@ import { useEffect, useState, useRef } from "react";
 // modules/runtime/client/RouterView.tsx
 import { jsx } from "react/jsx-runtime";
 function RouterView({ state }) {
-  console.log("[loly:RouterView] Rendering", {
-    url: state.url,
-    hasRoute: !!state.route,
-    hasComponents: !!state.components
-  });
   if (!state.route) {
     if (state.components === null) {
       return null;
@@ -106,11 +99,6 @@ function RouterView({ state }) {
   }
   const { Page, layouts } = state.components;
   const { params, props } = state;
-  console.log("[loly:RouterView] Creating page element", {
-    hasPage: !!Page,
-    layoutsCount: layouts.length,
-    paramsKeys: Object.keys(params)
-  });
   let element = /* @__PURE__ */ jsx(Page, { params, ...props });
   const layoutChain = layouts.slice().reverse();
   for (const Layout of layoutChain) {
@@ -179,7 +167,7 @@ function evictOldest() {
 }
 function setCacheEntry(key, entry) {
   const existingEntry = dataCache.get(key);
-  const wasFulfilled = (existingEntry == null ? void 0 : existingEntry.status) === "fulfilled";
+  const wasFulfilled = existingEntry?.status === "fulfilled";
   dataCache.set(key, entry);
   if (entry.status === "fulfilled") {
     if (!wasFulfilled) {
@@ -233,7 +221,7 @@ async function fetchRouteDataOnce(url) {
 }
 async function getRouteData(url, options) {
   const key = buildDataUrl(url);
-  if (options == null ? void 0 : options.revalidate) {
+  if (options?.revalidate) {
     deleteCacheEntry(key);
   }
   const entry = dataCache.get(key);
@@ -260,7 +248,6 @@ async function getRouteData(url, options) {
 
 // modules/runtime/client/navigation.ts
 async function handleErrorRoute(nextUrl, json, errorRoute, setState) {
-  var _a;
   try {
     const components = await errorRoute.load();
     let theme = "light";
@@ -287,7 +274,7 @@ async function handleErrorRoute(nextUrl, json, errorRoute, setState) {
       pathname: nextUrl,
       params: json.params || {},
       props: errorProps,
-      metadata: (_a = json.metadata) != null ? _a : null,
+      metadata: json.metadata ?? null,
       theme,
       notFound: false,
       error: true
@@ -311,7 +298,6 @@ async function handleErrorRoute(nextUrl, json, errorRoute, setState) {
   }
 }
 async function handleNotFoundRoute(nextUrl, json, notFoundRoute, setState) {
-  var _a, _b;
   let theme = "light";
   if (typeof document !== "undefined") {
     const cookieMatch = document.cookie.match(/theme=([^;]+)/);
@@ -327,14 +313,14 @@ async function handleNotFoundRoute(nextUrl, json, notFoundRoute, setState) {
     theme = json.theme;
   }
   const notFoundProps = {
-    ...(_a = json.props) != null ? _a : {},
+    ...json.props ?? {},
     theme
   };
   const windowData = {
     pathname: nextUrl,
     params: {},
     props: notFoundProps,
-    metadata: (_b = json.metadata) != null ? _b : null,
+    metadata: json.metadata ?? null,
     theme,
     notFound: true,
     error: false
@@ -360,8 +346,7 @@ async function handleNotFoundRoute(nextUrl, json, notFoundRoute, setState) {
   }
 }
 async function handleNormalRoute(nextUrl, json, routes, setState) {
-  var _a, _b, _c;
-  applyMetadata((_a = json.metadata) != null ? _a : null);
+  applyMetadata(json.metadata ?? null);
   let theme = "light";
   if (typeof document !== "undefined") {
     const cookieMatch = document.cookie.match(/theme=([^;]+)/);
@@ -379,7 +364,7 @@ async function handleNormalRoute(nextUrl, json, routes, setState) {
     theme = json.theme;
   }
   const newProps = {
-    ...(_b = json.props) != null ? _b : {},
+    ...json.props ?? {},
     theme
     // Always include theme
   };
@@ -392,7 +377,7 @@ async function handleNormalRoute(nextUrl, json, routes, setState) {
     pathname: nextUrl,
     params: matched.params,
     props: newProps,
-    metadata: (_c = json.metadata) != null ? _c : null,
+    metadata: json.metadata ?? null,
     theme,
     notFound: false,
     error: false
@@ -416,10 +401,9 @@ async function navigate(nextUrl, handlers, options) {
   const { setState, routes, notFoundRoute, errorRoute } = handlers;
   try {
     const { ok, json } = await getRouteData(nextUrl, {
-      revalidate: options == null ? void 0 : options.revalidate
+      revalidate: options?.revalidate
     });
     if (json && json.error) {
-      console.log("[client] Error detected in response:", json);
       if (errorRoute) {
         const handled = await handleErrorRoute(
           nextUrl,
@@ -461,50 +445,23 @@ async function navigate(nextUrl, handlers, options) {
 }
 function createClickHandler(navigate2) {
   return function handleClick(ev) {
-    const target = ev.target;
-    const tagName = (target == null ? void 0 : target.tagName.toLowerCase()) || "unknown";
-    console.log("[loly:click] Click event received", {
-      type: ev.type,
-      tagName,
-      target: target == null ? void 0 : target.tagName,
-      defaultPrevented: ev.defaultPrevented,
-      button: ev.button,
-      clientX: ev.clientX,
-      clientY: ev.clientY
-    });
     try {
-      if (ev.defaultPrevented) {
-        console.log("[loly:click] Event already prevented, skipping");
-        return;
-      }
-      if (ev.type !== "click") {
-        console.log("[loly:click] Not a click event, skipping", { type: ev.type });
-        return;
-      }
-      if (ev.button !== 0) {
-        console.log("[loly:click] Not left button, skipping", { button: ev.button });
-        return;
-      }
-      if (ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) {
-        console.log("[loly:click] Modifier keys pressed, skipping");
-        return;
-      }
+      if (ev.defaultPrevented) return;
+      if (ev.type !== "click") return;
+      if (ev.button !== 0) return;
+      if (ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) return;
+      const target = ev.target;
       if (ev.clientX === 0 && ev.clientY === 0 && ev.detail === 0) {
         if (target) {
-          const tagName3 = target.tagName.toLowerCase();
-          if (tagName3 === "input" || tagName3 === "textarea" || tagName3 === "button" || tagName3 === "select") {
-            console.log("[loly:click] Synthetic event on interactive element, skipping", { tagName: tagName3 });
+          const tagName2 = target.tagName.toLowerCase();
+          if (tagName2 === "input" || tagName2 === "textarea" || tagName2 === "button" || tagName2 === "select") {
             return;
           }
         }
       }
-      if (!target) {
-        console.log("[loly:click] No target, skipping");
-        return;
-      }
-      const tagName2 = target.tagName.toLowerCase();
-      if (tagName2 === "input" || tagName2 === "textarea" || tagName2 === "button" || tagName2 === "select" || target.isContentEditable || target.getAttribute("contenteditable") === "true") {
-        console.log("[loly:click] Target is interactive element, skipping", { tagName: tagName2 });
+      if (!target) return;
+      const tagName = target.tagName.toLowerCase();
+      if (tagName === "input" || tagName === "textarea" || tagName === "button" || tagName === "select" || target.isContentEditable || target.getAttribute("contenteditable") === "true") {
         return;
       }
       const interactiveParent = target.closest("input, textarea, button, select, [contenteditable], label");
@@ -512,60 +469,29 @@ function createClickHandler(navigate2) {
         if (interactiveParent.tagName.toLowerCase() === "label") {
           const label = interactiveParent;
           if (label.control) {
-            console.log("[loly:click] Inside label with control, skipping");
             return;
           }
         } else {
-          console.log("[loly:click] Inside interactive parent, skipping", {
-            parentTag: interactiveParent.tagName.toLowerCase()
-          });
           return;
         }
       }
       const anchor = target.closest("a[href]");
-      if (!anchor) {
-        console.log("[loly:click] No anchor found, skipping");
-        return;
-      }
-      console.log("[loly:click] Anchor found, processing navigation", {
-        href: anchor.getAttribute("href")
-      });
+      if (!anchor) return;
       const href = anchor.getAttribute("href");
-      if (!href) {
-        console.log("[loly:click] No href attribute, skipping");
-        return;
-      }
-      if (href.startsWith("#")) {
-        console.log("[loly:click] Hash link, skipping");
-        return;
-      }
+      if (!href) return;
+      if (href.startsWith("#")) return;
       const url = new URL(href, window.location.href);
-      if (url.origin !== window.location.origin) {
-        console.log("[loly:click] External link, skipping", { origin: url.origin });
-        return;
-      }
-      if (anchor.target && anchor.target !== "_self") {
-        console.log("[loly:click] Link has target, skipping", { target: anchor.target });
-        return;
-      }
+      if (url.origin !== window.location.origin) return;
+      if (anchor.target && anchor.target !== "_self") return;
       ev.preventDefault();
-      console.log("[loly:click] Prevented default, navigating");
       const nextUrl = url.pathname + url.search;
       const currentUrl = window.location.pathname + window.location.search;
-      if (nextUrl === currentUrl) {
-        console.log("[loly:click] Same URL, skipping", { nextUrl });
-        return;
-      }
+      if (nextUrl === currentUrl) return;
       const shouldRevalidate = anchor.hasAttribute("data-revalidate") && anchor.getAttribute("data-revalidate") !== "false";
-      console.log("[loly:click] Pushing state and navigating", {
-        nextUrl,
-        currentUrl,
-        shouldRevalidate
-      });
       window.history.pushState({}, "", nextUrl);
       navigate2(nextUrl, shouldRevalidate ? { revalidate: true } : void 0);
     } catch (error) {
-      console.error("[loly:click] Error in click handler:", error);
+      console.error("[navigation] Error in click handler:", error);
     }
   };
 }
@@ -584,10 +510,6 @@ function AppShell({
   notFoundRoute,
   errorRoute
 }) {
-  console.log("[loly:AppShell] Component rendering", {
-    url: initialState.url,
-    hasRoute: !!initialState.route
-  });
   const [state, setState] = useState(initialState);
   const handlersRef = useRef({
     setState,
@@ -596,11 +518,6 @@ function AppShell({
     errorRoute
   });
   useEffect(() => {
-    console.log("[loly:AppShell] Updating handlersRef", {
-      routesCount: routes.length,
-      hasNotFound: !!notFoundRoute,
-      hasError: !!errorRoute
-    });
     handlersRef.current = {
       setState,
       routes,
@@ -609,34 +526,16 @@ function AppShell({
     };
   }, [routes, notFoundRoute, errorRoute]);
   useEffect(() => {
-    const effectId = Math.random().toString(36).substring(7);
-    console.log("[loly:AppShell] Setting up event listeners", { effectId });
     let isMounted = true;
-    let listenerCount = 0;
     async function handleNavigate(nextUrl, options) {
-      if (!isMounted) {
-        console.warn("[loly:AppShell] navigate called but component is unmounted");
-        return;
-      }
-      console.log("[loly:AppShell] Navigating to", nextUrl, options);
+      if (!isMounted) return;
       await navigate(nextUrl, handlersRef.current, options);
     }
     const handleClick = createClickHandler(handleNavigate);
     const handlePopState = createPopStateHandler(handleNavigate);
     window.addEventListener("click", handleClick, false);
     window.addEventListener("popstate", handlePopState, false);
-    listenerCount = 2;
-    console.log("[loly:AppShell] Event listeners added", {
-      clickListener: true,
-      popStateListener: true,
-      totalListeners: listenerCount
-    });
     return () => {
-      console.log("[loly:AppShell] Cleaning up event listeners", {
-        effectId,
-        wasMounted: isMounted,
-        listenersToRemove: listenerCount
-      });
       isMounted = false;
       window.removeEventListener("click", handleClick, false);
       window.removeEventListener("popstate", handlePopState, false);
@@ -651,17 +550,15 @@ function AppShell({
 
 // modules/runtime/client/bootstrap.tsx
 import { jsx as jsx3 } from "react/jsx-runtime";
-var __loly_hydrated = false;
 async function loadInitialRoute(initialUrl, initialData, routes, notFoundRoute, errorRoute) {
-  var _a, _b;
-  const isInitialNotFound = (initialData == null ? void 0 : initialData.notFound) === true;
-  const isInitialError = (initialData == null ? void 0 : initialData.error) === true;
+  const isInitialNotFound = initialData?.notFound === true;
+  const isInitialError = initialData?.error === true;
   let initialRoute = null;
   let initialParams = {};
   let initialComponents = null;
   if (isInitialError && errorRoute) {
     initialRoute = errorRoute;
-    initialParams = (_a = initialData == null ? void 0 : initialData.params) != null ? _a : {};
+    initialParams = initialData?.params ?? {};
     initialComponents = await errorRoute.load();
   } else if (isInitialNotFound && notFoundRoute) {
     initialRoute = notFoundRoute;
@@ -679,7 +576,7 @@ async function loadInitialRoute(initialUrl, initialData, routes, notFoundRoute,
       initialComponents = await notFoundRoute.load();
     } else {
       console.warn(
-        `[client] No route match found for ${initialUrl}. Routes:`,
+        `[client] No route match found for ${initialUrl}. Available routes:`,
         routes.map((r) => r.pattern)
       );
     }
@@ -689,32 +586,65 @@ async function loadInitialRoute(initialUrl, initialData, routes, notFoundRoute,
     route: initialRoute,
     params: initialParams,
     components: initialComponents,
-    props: (_b = initialData == null ? void 0 : initialData.props) != null ? _b : {}
+    props: initialData?.props ?? {}
   };
 }
-function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
-  if (__loly_hydrated) {
-    console.warn("[loly:runtime] bootstrapClient SKIPPED (already hydrated)");
+function setupHotReload() {
+  const nodeEnv = typeof process !== "undefined" && process?.env?.NODE_ENV || "production";
+  const isDev = nodeEnv !== "production";
+  if (!isDev) {
     return;
   }
-  __loly_hydrated = true;
-  console.log("[loly:runtime] bootstrapClient START");
+  try {
+    console.log("[hot-reload] Attempting to connect to /__fw/hot...");
+    const eventSource = new EventSource("/__fw/hot");
+    let reloadTimeout = null;
+    eventSource.addEventListener("message", (event) => {
+      const data = event.data;
+      if (data && data.startsWith("reload:")) {
+        const filePath = data.slice(7);
+        console.log(`[hot-reload] File changed: ${filePath}`);
+        if (reloadTimeout) {
+          clearTimeout(reloadTimeout);
+        }
+        reloadTimeout = setTimeout(() => {
+          console.log("[hot-reload] Reloading page...");
+          window.location.reload();
+        }, 500);
+      }
+    });
+    eventSource.addEventListener("ping", () => {
+      console.log("[hot-reload] \u2713 Connected to hot reload server");
+    });
+    eventSource.onopen = () => {
+      console.log("[hot-reload] \u2713 SSE connection opened");
+    };
+    eventSource.onerror = (error) => {
+      const states = ["CONNECTING", "OPEN", "CLOSED"];
+      const state = states[eventSource.readyState] || "UNKNOWN";
+      if (eventSource.readyState === EventSource.CONNECTING) {
+        console.log("[hot-reload] Connecting...");
+      } else if (eventSource.readyState === EventSource.OPEN) {
+        console.warn("[hot-reload] Connection error (but connection is open):", error);
+      } else {
+        console.log("[hot-reload] Connection closed (readyState:", state, ")");
+      }
+    };
+  } catch (error) {
+    console.log("[hot-reload] EventSource not supported or error:", error);
+  }
+}
+function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
+  console.log("[client] Bootstrap starting, setting up hot reload...");
+  setupHotReload();
   (async function bootstrap() {
     const container = document.getElementById(APP_CONTAINER_ID);
     const initialData = getWindowData();
-    console.log("[loly:runtime] bootstrap starting", {
-      hasContainer: !!container,
-      hasInitialData: !!initialData,
-      containerId: APP_CONTAINER_ID
-    });
     if (!container) {
-      console.error(
-        `[loly:runtime] Container #${APP_CONTAINER_ID} not found.`
-      );
+      console.error(`Container #${APP_CONTAINER_ID} not found for hydration`);
       return;
     }
     const initialUrl = window.location.pathname + window.location.search;
-    console.log("[loly:runtime] Loading initial route", { initialUrl });
     try {
       const initialState = await loadInitialRoute(
         initialUrl,
@@ -723,15 +653,9 @@ function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
         notFoundRoute,
         errorRoute
       );
-      console.log("[loly:runtime] Initial route loaded", {
-        url: initialState.url,
-        hasRoute: !!initialState.route,
-        hasComponents: !!initialState.components
-      });
-      if (initialData == null ? void 0 : initialData.metadata) {
+      if (initialData?.metadata) {
         applyMetadata(initialData.metadata);
       }
-      console.log("[loly:runtime] Hydrating React app");
       hydrateRoot(
         container,
         /* @__PURE__ */ jsx3(
@@ -744,9 +668,12 @@ function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
           }
         )
       );
-      console.log("[loly:runtime] Hydrated successfully");
     } catch (error) {
-      console.error("[loly:runtime] Error during hydration:", error);
+      console.error(
+        "[client] Error loading initial route components for",
+        initialUrl,
+        error
+      );
       window.location.reload();
     }
   })();