@lolyjs/core 0.3.0-alpha.2 → 0.3.0-alpha.4

package/dist/index.mjs

@@ -9993,6 +9993,9 @@ var INIT_FILE_NAME = "init.server";
 async function runInitIfExists(projectRoot, serverData) {
   try {
     let mod = await getServerFile(projectRoot, INIT_FILE_NAME);
+    if (!mod) {
+      return {};
+    }
     if (typeof mod?.init === "function") {
       const serverContext = { ...serverData };
       await mod.init({ serverContext });
@@ -10118,7 +10121,7 @@ var NAMING = {
   // Files
   SERVER_HOOK: "server.hook"
 };
-async function loadServerHookForDir(currentDir) {
+async function loadServerHookForDir(currentDir, projectRoot) {
   const isDev = process.env.NODE_ENV === "development";
   const isBuild = process.env.LOLY_BUILD === "1";
   let file = null;
@@ -10144,10 +10147,24 @@ async function loadServerHookForDir(currentDir) {
       generateStaticParams: null
     };
   }
+  let resolvedProjectRoot = projectRoot;
+  if (!resolvedProjectRoot) {
+    let current = path4.resolve(currentDir);
+    while (current !== path4.dirname(current)) {
+      if (fs4.existsSync(path4.join(current, "package.json"))) {
+        resolvedProjectRoot = current;
+        break;
+      }
+      current = path4.dirname(current);
+    }
+    if (!resolvedProjectRoot) {
+      resolvedProjectRoot = currentDir;
+    }
+  }
   let mod;
   try {
     const { loadModule: loadModule2 } = await Promise.resolve().then(() => (init_module_loader(), module_loader_exports));
-    mod = await loadModule2(file, { projectRoot: currentDir });
+    mod = await loadModule2(file, { projectRoot: resolvedProjectRoot });
   } catch (error) {
     console.error(
       `[framework][server-hook] Error loading server hook from ${file}:`,
@@ -10190,7 +10207,7 @@ async function loadServerHookForDir(currentDir) {
     generateStaticParams
   };
 }
-async function loadLayoutServerHook(layoutFile) {
+async function loadLayoutServerHook(layoutFile, projectRoot) {
   const layoutDir = path4.dirname(layoutFile);
   const layoutExt = path4.extname(layoutFile);
   const layoutBasename = path4.basename(layoutFile, layoutExt);
@@ -10216,7 +10233,20 @@ async function loadLayoutServerHook(layoutFile) {
   }
   try {
     const { loadModule: loadModule2 } = await Promise.resolve().then(() => (init_module_loader(), module_loader_exports));
-    const mod = await loadModule2(file, { projectRoot: path4.dirname(file) });
+    if (!projectRoot) {
+      let current = path4.dirname(layoutFile);
+      while (current !== path4.dirname(current)) {
+        if (fs4.existsSync(path4.join(current, "package.json"))) {
+          projectRoot = current;
+          break;
+        }
+        current = path4.dirname(current);
+      }
+      if (!projectRoot) {
+        projectRoot = path4.dirname(layoutFile);
+      }
+    }
+    const mod = await loadModule2(file, { projectRoot });
     const serverHook = typeof mod?.getServerSideProps === "function" ? mod.getServerSideProps : null;
     let middlewares = [];
     const rawMiddlewares = mod?.[NAMING.BEFORE_MIDDLEWARES];
@@ -10304,6 +10334,15 @@ async function loadRoutes(appDir) {
   if (!fs5.existsSync(appDir)) {
     return [];
   }
+  let projectRoot = appDir;
+  let current = path5.resolve(appDir);
+  while (current !== path5.dirname(current)) {
+    if (fs5.existsSync(path5.join(current, "package.json"))) {
+      projectRoot = current;
+      break;
+    }
+    current = path5.dirname(current);
+  }
   const routes = [];
   async function walk(currentDir) {
     const entries = fs5.readdirSync(currentDir, { withFileTypes: true });
@@ -10322,7 +10361,7 @@ async function loadRoutes(appDir) {
       const { regex, paramNames } = buildRegexFromRoutePath(routePath);
       const { loadDefaultExport: loadDefaultExport2 } = await Promise.resolve().then(() => (init_module_loader(), module_loader_exports));
       const component = await loadDefaultExport2(fullPath, {
-        projectRoot: appDir
+        projectRoot
       });
       if (!component) {
         continue;
@@ -10334,7 +10373,7 @@ async function loadRoutes(appDir) {
       const layoutServerHooks = [];
       const layoutMiddlewares = [];
       for (const layoutFile of layoutFiles) {
-        const layoutHookData = await loadLayoutServerHook(layoutFile);
+        const layoutHookData = await loadLayoutServerHook(layoutFile, projectRoot);
         if (layoutHookData) {
           layoutServerHooks.push(layoutHookData.serverHook);
           layoutMiddlewares.push(layoutHookData.middlewares);
@@ -10343,7 +10382,7 @@ async function loadRoutes(appDir) {
           layoutMiddlewares.push([]);
         }
       }
-      const { middlewares, serverHook, dynamic, generateStaticParams } = await loadServerHookForDir(currentDir);
+      const { middlewares, serverHook, dynamic, generateStaticParams } = await loadServerHookForDir(currentDir, projectRoot);
       routes.push({
         pattern: routePath,
         regex,
@@ -10939,7 +10978,7 @@ async function loadRoutesFromManifest(projectRoot) {
     const layoutServerHooks = [];
     const layoutMiddlewares = [];
     for (const layoutFile of layoutFiles) {
-      const layoutHookData = await loadLayoutServerHook(layoutFile);
+      const layoutHookData = await loadLayoutServerHook(layoutFile, projectRoot);
       if (layoutHookData) {
         layoutServerHooks.push(layoutHookData.serverHook);
         layoutMiddlewares.push(layoutHookData.middlewares);
@@ -10948,7 +10987,7 @@ async function loadRoutesFromManifest(projectRoot) {
         layoutMiddlewares.push([]);
       }
     }
-    const { middlewares, serverHook, dynamic, generateStaticParams } = await loadServerHookForDir(pageDir);
+    const { middlewares, serverHook, dynamic, generateStaticParams } = await loadServerHookForDir(pageDir, projectRoot);
     pageRoutes.push({
       pattern: entry.pattern,
       regex,
@@ -11332,7 +11371,14 @@ var FilesystemRouteLoader = class {
     if (hasFilesChanged(this.appDir, this.projectRoot, this.cache.fileStats) || this.cache.apiRoutes.length === 0) {
       const files = getRelevantFiles(this.appDir, this.projectRoot);
       const fileStats = buildFileStats(files);
-      this.cache.apiRoutes = await loadApiRoutes(this.appDir);
+      const apiRoutes = await loadApiRoutes(this.appDir);
+      if (!this.cache) {
+        await this.loadRoutes();
+        if (!this.cache) {
+          throw new Error("Failed to initialize route cache");
+        }
+      }
+      this.cache.apiRoutes = apiRoutes;
       this.cache.fileStats = fileStats;
       this.cache.timestamp = Date.now();
     }
@@ -11349,7 +11395,14 @@ var FilesystemRouteLoader = class {
     if (hasFilesChanged(this.appDir, this.projectRoot, this.cache.fileStats) || this.cache.wssRoutes.length === 0) {
       const files = getRelevantFiles(this.appDir, this.projectRoot);
       const fileStats = buildFileStats(files);
-      this.cache.wssRoutes = await loadWssRoutes(this.appDir);
+      const wssRoutes = await loadWssRoutes(this.appDir);
+      if (!this.cache) {
+        await this.loadRoutes();
+        if (!this.cache) {
+          throw new Error("Failed to initialize route cache");
+        }
+      }
+      this.cache.wssRoutes = wssRoutes;
       this.cache.fileStats = fileStats;
       this.cache.timestamp = Date.now();
     }
@@ -11366,7 +11419,14 @@ var FilesystemRouteLoader = class {
     if (hasFilesChanged(this.appDir, this.projectRoot, this.cache.fileStats) || this.cache.notFoundRoute === void 0) {
       const files = getRelevantFiles(this.appDir, this.projectRoot);
       const fileStats = buildFileStats(files);
-      this.cache.notFoundRoute = await loadNotFoundRouteFromFilesystem(this.appDir);
+      const notFoundRoute = await loadNotFoundRouteFromFilesystem(this.appDir, this.projectRoot);
+      if (!this.cache) {
+        await this.loadRoutes();
+        if (!this.cache) {
+          throw new Error("Failed to initialize route cache");
+        }
+      }
+      this.cache.notFoundRoute = notFoundRoute;
       this.cache.fileStats = fileStats;
       this.cache.timestamp = Date.now();
     }
@@ -11383,7 +11443,14 @@ var FilesystemRouteLoader = class {
     if (hasFilesChanged(this.appDir, this.projectRoot, this.cache.fileStats) || this.cache.errorRoute === void 0) {
       const files = getRelevantFiles(this.appDir, this.projectRoot);
       const fileStats = buildFileStats(files);
-      this.cache.errorRoute = await loadErrorRouteFromFilesystem(this.appDir);
+      const errorRoute = await loadErrorRouteFromFilesystem(this.appDir, this.projectRoot);
+      if (!this.cache) {
+        await this.loadRoutes();
+        if (!this.cache) {
+          throw new Error("Failed to initialize route cache");
+        }
+      }
+      this.cache.errorRoute = errorRoute;
       this.cache.fileStats = fileStats;
       this.cache.timestamp = Date.now();
     }
@@ -11459,7 +11526,7 @@ var ManifestRouteLoader = class {
     return chunks;
   }
 };
-async function loadNotFoundRouteFromFilesystem(appDir) {
+async function loadNotFoundRouteFromFilesystem(appDir, projectRoot) {
   const notFoundCandidates = [
     path11.join(appDir, `${NOT_FOUND_FILE_PREFIX}.tsx`),
     path11.join(appDir, `${NOT_FOUND_FILE_PREFIX}.ts`),
@@ -11483,7 +11550,7 @@ async function loadNotFoundRouteFromFilesystem(appDir) {
   }
   const { loadDefaultExport: loadDefaultExport2 } = await Promise.resolve().then(() => (init_module_loader(), module_loader_exports));
   const component = await loadDefaultExport2(notFoundFile, {
-    projectRoot: appDir
+    projectRoot
   });
   if (!component) {
     return null;
@@ -11496,7 +11563,7 @@ async function loadNotFoundRouteFromFilesystem(appDir) {
   const layoutServerHooks = [];
   const layoutMiddlewares = [];
   for (const layoutFile of layoutFiles) {
-    const layoutHookData = await loadLayoutServerHook(layoutFile);
+    const layoutHookData = await loadLayoutServerHook(layoutFile, projectRoot);
     if (layoutHookData) {
       layoutServerHooks.push(layoutHookData.serverHook);
       layoutMiddlewares.push(layoutHookData.middlewares);
@@ -11505,7 +11572,7 @@ async function loadNotFoundRouteFromFilesystem(appDir) {
       layoutMiddlewares.push([]);
     }
   }
-  const { middlewares, serverHook, dynamic, generateStaticParams } = await loadServerHookForDir(notFoundDir);
+  const { middlewares, serverHook, dynamic, generateStaticParams } = await loadServerHookForDir(notFoundDir, projectRoot);
   return {
     pattern: NOT_FOUND_PATTERN,
     regex: new RegExp(`^${NOT_FOUND_PATTERN}/?$`),
@@ -11525,7 +11592,7 @@ async function loadNotFoundRouteFromFilesystem(appDir) {
     generateStaticParams
   };
 }
-async function loadErrorRouteFromFilesystem(appDir) {
+async function loadErrorRouteFromFilesystem(appDir, projectRoot) {
   const errorCandidates = [
     path11.join(appDir, `${ERROR_FILE_PREFIX}.tsx`),
     path11.join(appDir, `${ERROR_FILE_PREFIX}.ts`),
@@ -11544,7 +11611,7 @@ async function loadErrorRouteFromFilesystem(appDir) {
   }
   const { loadDefaultExport: loadDefaultExport2 } = await Promise.resolve().then(() => (init_module_loader(), module_loader_exports));
   const component = await loadDefaultExport2(errorFile, {
-    projectRoot: appDir
+    projectRoot
   });
   if (!component) {
     return null;
@@ -11556,7 +11623,7 @@ async function loadErrorRouteFromFilesystem(appDir) {
   const layoutServerHooks = [];
   const layoutMiddlewares = [];
   for (const layoutFile of layoutFiles) {
-    const layoutHookData = await loadLayoutServerHook(layoutFile);
+    const layoutHookData = await loadLayoutServerHook(layoutFile, projectRoot);
     if (layoutHookData) {
       layoutServerHooks.push(layoutHookData.serverHook);
       layoutMiddlewares.push(layoutHookData.middlewares);
@@ -11565,7 +11632,7 @@ async function loadErrorRouteFromFilesystem(appDir) {
       layoutMiddlewares.push([]);
     }
   }
-  const { middlewares, serverHook, dynamic, generateStaticParams } = await loadServerHookForDir(appDir);
+  const { middlewares, serverHook, dynamic, generateStaticParams } = await loadServerHookForDir(appDir, projectRoot);
   return {
     pattern: ERROR_PATTERN,
     regex: new RegExp(`^${ERROR_PATTERN}/?$`),
@@ -18867,8 +18934,8 @@ async function buildApp(options = {}) {
   const apiRoutes = await loadApiRoutes(appDir);
   const wssRoutes = await loadWssRoutes(appDir);
   const { outDir: serverOutDir } = await buildServerApp(projectRoot, appDir, config);
-  const notFoundRoute = await loadNotFoundRouteFromFilesystem(appDir);
-  const errorRoute = await loadErrorRouteFromFilesystem(appDir);
+  const notFoundRoute = await loadNotFoundRouteFromFilesystem(appDir, projectRoot);
+  const errorRoute = await loadErrorRouteFromFilesystem(appDir, projectRoot);
   if (!notFoundRoute) {
     console.warn(
       `[framework][build] No not-found route found. Consider creating ${config.directories.app}/${config.conventions.notFound}.tsx`