@lolyjs/core 0.1.0-alpha.5 → 0.1.0-alpha.8

package/dist/runtime.cjs

@@ -33,7 +33,8 @@ var APP_CONTAINER_ID = "__app";
 
 // modules/runtime/client/window-data.ts
 function getWindowData() {
-  return window[WINDOW_DATA_KEY] ?? null;
+  var _a;
+  return (_a = window[WINDOW_DATA_KEY]) != null ? _a : null;
 }
 function setWindowData(data) {
   window[WINDOW_DATA_KEY] = data;
@@ -46,7 +47,8 @@ function setWindowData(data) {
   }
 }
 function getCurrentTheme() {
-  return getWindowData()?.theme ?? null;
+  var _a, _b;
+  return (_b = (_a = getWindowData()) == null ? void 0 : _a.theme) != null ? _b : null;
 }
 
 // modules/runtime/client/route-matcher.ts
@@ -114,6 +116,11 @@ var import_react = require("react");
 // modules/runtime/client/RouterView.tsx
 var import_jsx_runtime = require("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;
@@ -125,6 +132,11 @@ 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__ */ (0, import_jsx_runtime.jsx)(Page, { params, ...props });
   const layoutChain = layouts.slice().reverse();
   for (const Layout of layoutChain) {
@@ -193,7 +205,7 @@ function evictOldest() {
 }
 function setCacheEntry(key, entry) {
   const existingEntry = dataCache.get(key);
-  const wasFulfilled = existingEntry?.status === "fulfilled";
+  const wasFulfilled = (existingEntry == null ? void 0 : existingEntry.status) === "fulfilled";
   dataCache.set(key, entry);
   if (entry.status === "fulfilled") {
     if (!wasFulfilled) {
@@ -247,7 +259,7 @@ async function fetchRouteDataOnce(url) {
 }
 async function getRouteData(url, options) {
   const key = buildDataUrl(url);
-  if (options?.revalidate) {
+  if (options == null ? void 0 : options.revalidate) {
     deleteCacheEntry(key);
   }
   const entry = dataCache.get(key);
@@ -274,6 +286,7 @@ 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";
@@ -300,7 +313,7 @@ async function handleErrorRoute(nextUrl, json, errorRoute, setState) {
       pathname: nextUrl,
       params: json.params || {},
       props: errorProps,
-      metadata: json.metadata ?? null,
+      metadata: (_a = json.metadata) != null ? _a : null,
       theme,
       notFound: false,
       error: true
@@ -324,6 +337,7 @@ 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=([^;]+)/);
@@ -339,14 +353,14 @@ async function handleNotFoundRoute(nextUrl, json, notFoundRoute, setState) {
     theme = json.theme;
   }
   const notFoundProps = {
-    ...json.props ?? {},
+    ...(_a = json.props) != null ? _a : {},
     theme
   };
   const windowData = {
     pathname: nextUrl,
     params: {},
     props: notFoundProps,
-    metadata: json.metadata ?? null,
+    metadata: (_b = json.metadata) != null ? _b : null,
     theme,
     notFound: true,
     error: false
@@ -372,7 +386,8 @@ async function handleNotFoundRoute(nextUrl, json, notFoundRoute, setState) {
   }
 }
 async function handleNormalRoute(nextUrl, json, routes, setState) {
-  applyMetadata(json.metadata ?? null);
+  var _a, _b, _c;
+  applyMetadata((_a = json.metadata) != null ? _a : null);
   let theme = "light";
   if (typeof document !== "undefined") {
     const cookieMatch = document.cookie.match(/theme=([^;]+)/);
@@ -390,7 +405,7 @@ async function handleNormalRoute(nextUrl, json, routes, setState) {
     theme = json.theme;
   }
   const newProps = {
-    ...json.props ?? {},
+    ...(_b = json.props) != null ? _b : {},
     theme
     // Always include theme
   };
@@ -403,7 +418,7 @@ async function handleNormalRoute(nextUrl, json, routes, setState) {
     pathname: nextUrl,
     params: matched.params,
     props: newProps,
-    metadata: json.metadata ?? null,
+    metadata: (_c = json.metadata) != null ? _c : null,
     theme,
     notFound: false,
     error: false
@@ -427,7 +442,7 @@ async function navigate(nextUrl, handlers, options) {
   const { setState, routes, notFoundRoute, errorRoute } = handlers;
   try {
     const { ok, json } = await getRouteData(nextUrl, {
-      revalidate: options?.revalidate
+      revalidate: options == null ? void 0 : options.revalidate
     });
     if (json && json.error) {
       console.log("[client] Error detected in response:", json);
@@ -472,24 +487,50 @@ 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) return;
-      if (ev.type !== "click") return;
-      if (ev.button !== 0) return;
-      if (ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) return;
+      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.clientX === 0 && ev.clientY === 0 && ev.detail === 0) {
-        const target2 = ev.target;
-        if (target2) {
-          const tagName2 = target2.tagName.toLowerCase();
-          if (tagName2 === "input" || tagName2 === "textarea" || tagName2 === "button" || tagName2 === "select") {
+        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 });
             return;
           }
         }
       }
-      const target = ev.target;
-      if (!target) return;
-      const tagName = target.tagName.toLowerCase();
-      if (tagName === "input" || tagName === "textarea" || tagName === "button" || tagName === "select" || target.isContentEditable || target.getAttribute("contenteditable") === "true") {
+      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 });
         return;
       }
       const interactiveParent = target.closest("input, textarea, button, select, [contenteditable], label");
@@ -497,29 +538,60 @@ 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) return;
+      if (!anchor) {
+        console.log("[loly:click] No anchor found, skipping");
+        return;
+      }
+      console.log("[loly:click] Anchor found, processing navigation", {
+        href: anchor.getAttribute("href")
+      });
       const href = anchor.getAttribute("href");
-      if (!href) return;
-      if (href.startsWith("#")) return;
+      if (!href) {
+        console.log("[loly:click] No href attribute, skipping");
+        return;
+      }
+      if (href.startsWith("#")) {
+        console.log("[loly:click] Hash link, skipping");
+        return;
+      }
       const url = new URL(href, window.location.href);
-      if (url.origin !== window.location.origin) return;
-      if (anchor.target && anchor.target !== "_self") return;
+      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;
+      }
       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) return;
+      if (nextUrl === currentUrl) {
+        console.log("[loly:click] Same URL, skipping", { nextUrl });
+        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("[navigation] Error in click handler:", error);
+      console.error("[loly:click] Error in click handler:", error);
     }
   };
 }
@@ -538,6 +610,10 @@ function AppShell({
   notFoundRoute,
   errorRoute
 }) {
+  console.log("[loly:AppShell] Component rendering", {
+    url: initialState.url,
+    hasRoute: !!initialState.route
+  });
   const [state, setState] = (0, import_react.useState)(initialState);
   const handlersRef = (0, import_react.useRef)({
     setState,
@@ -546,6 +622,11 @@ function AppShell({
     errorRoute
   });
   (0, import_react.useEffect)(() => {
+    console.log("[loly:AppShell] Updating handlersRef", {
+      routesCount: routes.length,
+      hasNotFound: !!notFoundRoute,
+      hasError: !!errorRoute
+    });
     handlersRef.current = {
       setState,
       routes,
@@ -554,16 +635,34 @@ function AppShell({
     };
   }, [routes, notFoundRoute, errorRoute]);
   (0, import_react.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) return;
+      if (!isMounted) {
+        console.warn("[loly:AppShell] navigate called but component is unmounted");
+        return;
+      }
+      console.log("[loly:AppShell] Navigating to", nextUrl, options);
       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);
@@ -579,14 +678,15 @@ function AppShell({
 // modules/runtime/client/bootstrap.tsx
 var import_jsx_runtime3 = require("react/jsx-runtime");
 async function loadInitialRoute(initialUrl, initialData, routes, notFoundRoute, errorRoute) {
-  const isInitialNotFound = initialData?.notFound === true;
-  const isInitialError = initialData?.error === true;
+  var _a, _b;
+  const isInitialNotFound = (initialData == null ? void 0 : initialData.notFound) === true;
+  const isInitialError = (initialData == null ? void 0 : initialData.error) === true;
   let initialRoute = null;
   let initialParams = {};
   let initialComponents = null;
   if (isInitialError && errorRoute) {
     initialRoute = errorRoute;
-    initialParams = initialData?.params ?? {};
+    initialParams = (_a = initialData == null ? void 0 : initialData.params) != null ? _a : {};
     initialComponents = await errorRoute.load();
   } else if (isInitialNotFound && notFoundRoute) {
     initialRoute = notFoundRoute;
@@ -614,18 +714,29 @@ async function loadInitialRoute(initialUrl, initialData, routes, notFoundRoute,
     route: initialRoute,
     params: initialParams,
     components: initialComponents,
-    props: initialData?.props ?? {}
+    props: (_b = initialData == null ? void 0 : initialData.props) != null ? _b : {}
   };
 }
 function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
+  console.log("[loly:runtime] bootstrapClient called", {
+    routesCount: routes.length,
+    hasNotFound: !!notFoundRoute,
+    hasError: !!errorRoute
+  });
   (async function bootstrap() {
     const container = document.getElementById(APP_CONTAINER_ID);
     const initialData = getWindowData();
+    console.log("[loly:runtime] bootstrap starting", {
+      hasContainer: !!container,
+      containerId: APP_CONTAINER_ID,
+      hasInitialData: !!initialData
+    });
     if (!container) {
-      console.error(`Container #${APP_CONTAINER_ID} not found for hydration`);
+      console.error(`[loly:runtime] 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,
@@ -634,9 +745,15 @@ function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
         notFoundRoute,
         errorRoute
       );
-      if (initialData?.metadata) {
+      console.log("[loly:runtime] Initial route loaded", {
+        url: initialState.url,
+        hasRoute: !!initialState.route,
+        hasComponents: !!initialState.components
+      });
+      if (initialData == null ? void 0 : initialData.metadata) {
         applyMetadata(initialData.metadata);
       }
+      console.log("[loly:runtime] Hydrating React app");
       (0, import_client.hydrateRoot)(
         container,
         /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
@@ -649,9 +766,10 @@ function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
           }
         )
       );
+      console.log("[loly:runtime] React app hydrated successfully");
     } catch (error) {
       console.error(
-        "[client] Error loading initial route components for",
+        "[loly:runtime] Error loading initial route components for",
         initialUrl,
         error
       );
@@ -659,8 +777,4 @@ function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
     }
   })();
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  bootstrapClient
-});
 //# sourceMappingURL=runtime.cjs.map