@lolyjs/core 0.1.0-alpha.6 → 0.1.0-alpha.9

package/dist/index.d.mts

@@ -1,7 +1,6 @@
 import http from 'http';
 import { Request, Response } from 'express';
 import { Socket, Server } from 'socket.io';
-export { c as bootstrapClient } from './bootstrap-BiCQmSkx.mjs';
 import { ZodSchema, z } from 'zod';
 import * as express_rate_limit from 'express-rate-limit';
 import pino, { Logger as Logger$1 } from 'pino';
@@ -216,6 +215,40 @@ interface BuildAppOptions {
 }
 declare function buildApp(options?: BuildAppOptions): Promise<void>;
 
+declare const WINDOW_DATA_KEY = "__FW_DATA__";
+
+type InitialData = {
+    pathname: string;
+    params: Record<string, string>;
+    props: Record<string, any>;
+    metadata?: {
+        title?: string;
+        description?: string;
+    } | null;
+    notFound?: boolean;
+    error?: boolean;
+    theme?: string;
+};
+declare global {
+    interface Window {
+        [WINDOW_DATA_KEY]?: InitialData;
+    }
+}
+type ClientLoadedComponents = {
+    Page: React.ComponentType<any>;
+    layouts: React.ComponentType<any>[];
+};
+type ClientRouteLoaded = {
+    pattern: string;
+    paramNames: string[];
+    load: () => Promise<ClientLoadedComponents>;
+};
+
+/**
+ * Bootstraps the client-side application.
+ */
+declare function bootstrapClient(routes: ClientRouteLoaded[], notFoundRoute: ClientRouteLoaded | null, errorRoute?: ClientRouteLoaded | null): void;
+
 declare function withCache(fn: any, options: any): any;
 
 /**
@@ -442,4 +475,4 @@ declare function requestLoggerMiddleware(options?: {
  */
 declare function getRequestLogger(req: Request): Logger;
 
-export { type ApiContext, type ApiMiddleware, DEFAULT_CONFIG, type FrameworkConfig, type GenerateStaticParams, type InitServerData, type LoaderResult, type LogLevel, Logger, type LoggerContext, type LoggerOptions, type MetadataLoader, type RouteMiddleware, type ServerConfig, type ServerContext, type ServerLoader, ValidationError, type WssContext, buildApp, commonSchemas, createModuleLogger, createRateLimiter, defaultRateLimiter, generateRequestId, getAppDir, getBuildDir, getLogger, getRequestLogger, getStaticDir, lenientRateLimiter, loadConfig, logger, requestLoggerMiddleware, resetLogger, safeValidate, sanitizeObject, sanitizeParams, sanitizeQuery, sanitizeString, setLogger, startDevServer, startProdServer, strictRateLimiter, validate, withCache };
+export { type ApiContext, type ApiMiddleware, DEFAULT_CONFIG, type FrameworkConfig, type GenerateStaticParams, type InitServerData, type LoaderResult, type LogLevel, Logger, type LoggerContext, type LoggerOptions, type MetadataLoader, type RouteMiddleware, type ServerConfig, type ServerContext, type ServerLoader, ValidationError, type WssContext, bootstrapClient, buildApp, commonSchemas, createModuleLogger, createRateLimiter, defaultRateLimiter, generateRequestId, getAppDir, getBuildDir, getLogger, getRequestLogger, getStaticDir, lenientRateLimiter, loadConfig, logger, requestLoggerMiddleware, resetLogger, safeValidate, sanitizeObject, sanitizeParams, sanitizeQuery, sanitizeString, setLogger, startDevServer, startProdServer, strictRateLimiter, validate, withCache };

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import http from 'http';
 import { Request, Response } from 'express';
 import { Socket, Server } from 'socket.io';
-export { c as bootstrapClient } from './bootstrap-BiCQmSkx.js';
 import { ZodSchema, z } from 'zod';
 import * as express_rate_limit from 'express-rate-limit';
 import pino, { Logger as Logger$1 } from 'pino';
@@ -216,6 +215,40 @@ interface BuildAppOptions {
 }
 declare function buildApp(options?: BuildAppOptions): Promise<void>;
 
+declare const WINDOW_DATA_KEY = "__FW_DATA__";
+
+type InitialData = {
+    pathname: string;
+    params: Record<string, string>;
+    props: Record<string, any>;
+    metadata?: {
+        title?: string;
+        description?: string;
+    } | null;
+    notFound?: boolean;
+    error?: boolean;
+    theme?: string;
+};
+declare global {
+    interface Window {
+        [WINDOW_DATA_KEY]?: InitialData;
+    }
+}
+type ClientLoadedComponents = {
+    Page: React.ComponentType<any>;
+    layouts: React.ComponentType<any>[];
+};
+type ClientRouteLoaded = {
+    pattern: string;
+    paramNames: string[];
+    load: () => Promise<ClientLoadedComponents>;
+};
+
+/**
+ * Bootstraps the client-side application.
+ */
+declare function bootstrapClient(routes: ClientRouteLoaded[], notFoundRoute: ClientRouteLoaded | null, errorRoute?: ClientRouteLoaded | null): void;
+
 declare function withCache(fn: any, options: any): any;
 
 /**
@@ -442,4 +475,4 @@ declare function requestLoggerMiddleware(options?: {
  */
 declare function getRequestLogger(req: Request): Logger;
 
-export { type ApiContext, type ApiMiddleware, DEFAULT_CONFIG, type FrameworkConfig, type GenerateStaticParams, type InitServerData, type LoaderResult, type LogLevel, Logger, type LoggerContext, type LoggerOptions, type MetadataLoader, type RouteMiddleware, type ServerConfig, type ServerContext, type ServerLoader, ValidationError, type WssContext, buildApp, commonSchemas, createModuleLogger, createRateLimiter, defaultRateLimiter, generateRequestId, getAppDir, getBuildDir, getLogger, getRequestLogger, getStaticDir, lenientRateLimiter, loadConfig, logger, requestLoggerMiddleware, resetLogger, safeValidate, sanitizeObject, sanitizeParams, sanitizeQuery, sanitizeString, setLogger, startDevServer, startProdServer, strictRateLimiter, validate, withCache };
+export { type ApiContext, type ApiMiddleware, DEFAULT_CONFIG, type FrameworkConfig, type GenerateStaticParams, type InitServerData, type LoaderResult, type LogLevel, Logger, type LoggerContext, type LoggerOptions, type MetadataLoader, type RouteMiddleware, type ServerConfig, type ServerContext, type ServerLoader, ValidationError, type WssContext, bootstrapClient, buildApp, commonSchemas, createModuleLogger, createRateLimiter, defaultRateLimiter, generateRequestId, getAppDir, getBuildDir, getLogger, getRequestLogger, getStaticDir, lenientRateLimiter, loadConfig, logger, requestLoggerMiddleware, resetLogger, safeValidate, sanitizeObject, sanitizeParams, sanitizeQuery, sanitizeString, setLogger, startDevServer, startProdServer, strictRateLimiter, validate, withCache };

package/dist/index.js

@@ -5099,6 +5099,11 @@ 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;
@@ -5110,6 +5115,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__ */ jsx(Page, { params, ...props });
   const layoutChain = layouts.slice().reverse();
   for (const Layout of layoutChain) {
@@ -5580,6 +5590,10 @@ 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,
@@ -5588,6 +5602,11 @@ function AppShell({
     errorRoute
   });
   useEffect(() => {
+    console.log("[loly:AppShell] Updating handlersRef", {
+      routesCount: routes.length,
+      hasNotFound: !!notFoundRoute,
+      hasError: !!errorRoute
+    });
     handlersRef.current = {
       setState,
       routes,
@@ -5596,7 +5615,8 @@ function AppShell({
     };
   }, [routes, notFoundRoute, errorRoute]);
   useEffect(() => {
-    console.log("[loly:AppShell] Setting up event listeners");
+    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) {
@@ -5619,6 +5639,7 @@ function AppShell({
     });
     return () => {
       console.log("[loly:AppShell] Cleaning up event listeners", {
+        effectId,
         wasMounted: isMounted,
         listenersToRemove: listenerCount
       });
@@ -5636,6 +5657,7 @@ 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) {
   const isInitialNotFound = initialData?.notFound === true;
   const isInitialError = initialData?.error === true;
@@ -5662,7 +5684,7 @@ async function loadInitialRoute(initialUrl, initialData, routes, notFoundRoute,
       initialComponents = await notFoundRoute.load();
     } else {
       console.warn(
-        `[client] No route match found for ${initialUrl}. Available routes:`,
+        `[client] No route match found for ${initialUrl}. Routes:`,
         routes.map((r) => r.pattern)
       );
     }
@@ -5676,21 +5698,24 @@ async function loadInitialRoute(initialUrl, initialData, routes, notFoundRoute,
   };
 }
 function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
-  console.log("[loly:runtime] bootstrapClient called", {
-    routesCount: routes.length,
-    hasNotFound: !!notFoundRoute,
-    hasError: !!errorRoute
-  });
+  if (__loly_hydrated) {
+    console.warn("[loly:runtime] bootstrapClient SKIPPED (already hydrated)");
+    return;
+  }
+  __loly_hydrated = true;
+  console.log("[loly:runtime] bootstrapClient START");
   (async function bootstrap() {
     const container = document.getElementById(APP_CONTAINER_ID2);
     const initialData = getWindowData();
     console.log("[loly:runtime] bootstrap starting", {
       hasContainer: !!container,
-      containerId: APP_CONTAINER_ID2,
-      hasInitialData: !!initialData
+      hasInitialData: !!initialData,
+      containerId: APP_CONTAINER_ID2
     });
     if (!container) {
-      console.error(`[loly:runtime] Container #${APP_CONTAINER_ID2} not found for hydration`);
+      console.error(
+        `[loly:runtime] Container #${APP_CONTAINER_ID2} not found.`
+      );
       return;
     }
     const initialUrl = window.location.pathname + window.location.search;
@@ -5724,13 +5749,9 @@ function bootstrapClient(routes, notFoundRoute, errorRoute = null) {
           }
         )
       );
-      console.log("[loly:runtime] React app hydrated successfully");
+      console.log("[loly:runtime] Hydrated successfully");
     } catch (error) {
-      console.error(
-        "[loly:runtime] Error loading initial route components for",
-        initialUrl,
-        error
-      );
+      console.error("[loly:runtime] Error during hydration:", error);
       window.location.reload();
     }
   })();