@lolyjs/core 0.2.0-alpha.32 → 0.2.0-alpha.34

package/dist/cli.cjs

@@ -9866,7 +9866,7 @@ var require_built3 = __commonJS({
 });
 
 // modules/cli/index.ts
-var import_path34 = __toESM(require("path"));
+var import_path35 = __toESM(require("path"));
 var import_process = __toESM(require("process"));
 
 // modules/router/loader-pages.ts
@@ -10409,7 +10409,7 @@ function matchApiRoute(routes, pathname) {
     if (!match) continue;
     const params = {};
     r.paramNames.forEach((name, idx) => {
-      params[name] = match[idx + 1];
+      params[name] = decodeURIComponent(match[idx + 1] || "");
     });
     return { route: r, params };
   }
@@ -12394,7 +12394,7 @@ function buildClientBundle(projectRoot) {
 }
 
 // modules/build/ssg/builder.ts
-var import_path24 = __toESM(require("path"));
+var import_path25 = __toESM(require("path"));
 
 // modules/build/ssg/path.ts
 var import_path17 = __toESM(require("path"));
@@ -12430,8 +12430,8 @@ function pathToOutDir(baseDir, urlPath) {
 }
 
 // modules/build/ssg/renderer.ts
-var import_fs16 = __toESM(require("fs"));
-var import_path22 = __toESM(require("path"));
+var import_fs17 = __toESM(require("fs"));
+var import_path23 = __toESM(require("path"));
 var import_server2 = require("react-dom/server");
 
 // modules/rendering/createDocumentTree/index.ts
@@ -12986,12 +12986,12 @@ var DEFAULT_IGNORED_PATHS = [
   /^\/sockjs-node/
   // Hot reload websocket
 ];
-function shouldIgnorePath(path31, ignoredPaths) {
+function shouldIgnorePath(path32, ignoredPaths) {
   return ignoredPaths.some((pattern) => {
     if (typeof pattern === "string") {
-      return path31 === pattern || path31.startsWith(pattern);
+      return path32 === pattern || path32.startsWith(pattern);
     }
-    return pattern.test(path31);
+    return pattern.test(path32);
   });
 }
 function requestLoggerMiddleware(options = {}) {
@@ -13161,25 +13161,89 @@ function handleNotFound(res, urlPath) {
   }
 }
 
-// modules/server/handlers/ssg.ts
-var import_fs15 = __toESM(require("fs"));
+// modules/server/global-middleware.ts
 var import_path20 = __toESM(require("path"));
+var import_fs15 = __toESM(require("fs"));
+var cachedGlobalMiddlewares = null;
+async function loadGlobalMiddlewares(projectRoot) {
+  if (cachedGlobalMiddlewares !== null) {
+    return cachedGlobalMiddlewares;
+  }
+  const globalMiddlewareFile = import_path20.default.join(projectRoot, "global.middleware.ts");
+  const globalMiddlewareFileJs = import_path20.default.join(projectRoot, "global.middleware.js");
+  const file = import_fs15.default.existsSync(globalMiddlewareFile) ? globalMiddlewareFile : import_fs15.default.existsSync(globalMiddlewareFileJs) ? globalMiddlewareFileJs : null;
+  if (!file) {
+    cachedGlobalMiddlewares = [];
+    return cachedGlobalMiddlewares;
+  }
+  if (file.endsWith(".ts") || file.endsWith(".tsx")) {
+    try {
+      require("tsx/cjs");
+    } catch (e) {
+    }
+  }
+  try {
+    const mod = require(file);
+    const middlewares = mod?.globalMiddlewares;
+    if (Array.isArray(middlewares)) {
+      const validMiddlewares = [];
+      for (let i = 0; i < middlewares.length; i++) {
+        const mw = middlewares[i];
+        if (typeof mw === "function") {
+          validMiddlewares.push(mw);
+        } else {
+          console.warn(
+            `[framework][global-middleware] Middleware at index ${i} in global.middleware.ts is not a function, skipping`
+          );
+        }
+      }
+      cachedGlobalMiddlewares = validMiddlewares;
+      return cachedGlobalMiddlewares;
+    } else if (middlewares !== void 0) {
+      console.warn(
+        "[framework][global-middleware] globalMiddlewares must be an array in global.middleware.ts, ignoring invalid value"
+      );
+    }
+  } catch (error) {
+    console.error("[framework][global-middleware] Error loading global.middleware.ts:", error);
+  }
+  cachedGlobalMiddlewares = [];
+  return cachedGlobalMiddlewares;
+}
+async function runGlobalMiddlewares(ctx, globalMiddlewares) {
+  for (const mw of globalMiddlewares) {
+    try {
+      await Promise.resolve(mw(ctx, async () => {
+      }));
+    } catch (error) {
+      console.error("[framework][global-middleware] Error in global middleware:", error);
+      continue;
+    }
+    if (ctx.res.headersSent) {
+      return;
+    }
+  }
+}
+
+// modules/server/handlers/ssg.ts
+var import_fs16 = __toESM(require("fs"));
+var import_path21 = __toESM(require("path"));
 var logger2 = createModuleLogger("ssg");
 function getSsgDirForPath(baseDir, urlPath) {
   const clean = urlPath === "/" ? "" : urlPath.replace(/^\/+/, "");
-  return import_path20.default.join(baseDir, clean);
+  return import_path21.default.join(baseDir, clean);
 }
 function getSsgHtmlPath(baseDir, urlPath) {
   const dir = getSsgDirForPath(baseDir, urlPath);
-  return import_path20.default.join(dir, "index.html");
+  return import_path21.default.join(dir, "index.html");
 }
 function getSsgDataPath(baseDir, urlPath) {
   const dir = getSsgDirForPath(baseDir, urlPath);
-  return import_path20.default.join(dir, "data.json");
+  return import_path21.default.join(dir, "data.json");
 }
 function tryServeSsgHtml(res, ssgOutDir, urlPath) {
   const ssgHtmlPath = getSsgHtmlPath(ssgOutDir, urlPath);
-  if (!import_fs15.default.existsSync(ssgHtmlPath)) {
+  if (!import_fs16.default.existsSync(ssgHtmlPath)) {
     return false;
   }
   logger2.info("Serving SSG HTML", { urlPath, ssgHtmlPath });
@@ -13189,17 +13253,17 @@ function tryServeSsgHtml(res, ssgOutDir, urlPath) {
   );
   res.statusCode = 200;
   res.setHeader("Content-Type", "text/html; charset=utf-8");
-  const stream = import_fs15.default.createReadStream(ssgHtmlPath, { encoding: "utf-8" });
+  const stream = import_fs16.default.createReadStream(ssgHtmlPath, { encoding: "utf-8" });
   stream.pipe(res);
   return true;
 }
 function tryServeSsgData(res, ssgOutDir, urlPath) {
   const ssgDataPath = getSsgDataPath(ssgOutDir, urlPath);
-  if (!import_fs15.default.existsSync(ssgDataPath)) {
+  if (!import_fs16.default.existsSync(ssgDataPath)) {
     return false;
   }
   try {
-    const raw = import_fs15.default.readFileSync(ssgDataPath, "utf-8");
+    const raw = import_fs16.default.readFileSync(ssgDataPath, "utf-8");
     res.setHeader("Content-Type", "application/json; charset=utf-8");
     res.status(200).end(raw);
     return true;
@@ -13265,7 +13329,7 @@ function sanitizeQuery(query) {
 }
 
 // modules/server/handlers/pages.ts
-var import_path21 = __toESM(require("path"));
+var import_path22 = __toESM(require("path"));
 function mergeMetadata(base, override) {
   if (!base && !override) return null;
   if (!base) return override;
@@ -13323,7 +13387,7 @@ async function renderNotFoundPage(notFoundPage, req, res, urlPath, finalUrlPath,
           } catch (error) {
             const reqLogger = getRequestLogger(req);
             const layoutFile = notFoundPage.layoutFiles[i];
-            const relativeLayoutPath = layoutFile ? import_path21.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
+            const relativeLayoutPath = layoutFile ? import_path22.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
             reqLogger.error("Layout middleware failed for not-found page", error instanceof Error ? error : new Error(String(error)), {
               layoutIndex: i,
               layoutFile: relativeLayoutPath
@@ -13352,7 +13416,7 @@ async function renderNotFoundPage(notFoundPage, req, res, urlPath, finalUrlPath,
         } catch (error) {
           const reqLogger = getRequestLogger(req);
           const layoutFile = notFoundPage.layoutFiles[i];
-          const relativeLayoutPath = layoutFile ? import_path21.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
+          const relativeLayoutPath = layoutFile ? import_path22.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
           reqLogger.warn("Layout server hook failed for not-found page", {
             error: error instanceof Error ? error.message : String(error),
             stack: error instanceof Error ? error.stack : void 0,
@@ -13589,6 +13653,11 @@ async function handlePageRequestInternal(options) {
     Redirect: (destination, permanent = false) => new RedirectResponse(destination, permanent),
     NotFound: () => new NotFoundResponse()
   };
+  const globalMiddlewares = await loadGlobalMiddlewares(projectRoot || process.cwd());
+  await runGlobalMiddlewares(ctx, globalMiddlewares);
+  if (res.headersSent) {
+    return;
+  }
   await runRouteMiddlewares(route, ctx);
   if (res.headersSent) {
     return;
@@ -13609,7 +13678,7 @@ async function handlePageRequestInternal(options) {
             );
           } catch (error) {
             const layoutFile = route.layoutFiles[i];
-            const relativeLayoutPath = layoutFile ? import_path21.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
+            const relativeLayoutPath = layoutFile ? import_path22.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
             reqLogger.error("Layout middleware failed", error instanceof Error ? error : new Error(String(error)), {
               route: route.pattern,
               layoutIndex: i,
@@ -13675,7 +13744,7 @@ async function handlePageRequestInternal(options) {
           }
         } catch (error) {
           const layoutFile = route.layoutFiles[i];
-          const relativeLayoutPath = layoutFile ? import_path21.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
+          const relativeLayoutPath = layoutFile ? import_path22.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
           reqLogger.warn("Layout server hook failed", {
             error: error instanceof Error ? error.message : String(error),
             stack: error instanceof Error ? error.stack : void 0,
@@ -13738,7 +13807,7 @@ async function handlePageRequestInternal(options) {
       pageLoaderResult2.theme = theme;
     }
   } catch (error) {
-    const relativePagePath = route.pageFile ? import_path21.default.relative(projectRoot || process.cwd(), route.pageFile) : "unknown";
+    const relativePagePath = route.pageFile ? import_path22.default.relative(projectRoot || process.cwd(), route.pageFile) : "unknown";
     reqLogger.error("Page server hook failed", {
       error: error instanceof Error ? error.message : String(error),
       stack: error instanceof Error ? error.stack : void 0,
@@ -13908,7 +13977,7 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
               );
             } catch (error2) {
               const layoutFile = errorPage.layoutFiles[i];
-              const relativeLayoutPath = layoutFile ? import_path21.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
+              const relativeLayoutPath = layoutFile ? import_path22.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
               reqLogger.error("Layout middleware failed for error page", error2 instanceof Error ? error2 : new Error(String(error2)), {
                 layoutIndex: i,
                 layoutFile: relativeLayoutPath
@@ -13948,7 +14017,7 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
             }
           } catch (err) {
             const layoutFile = errorPage.layoutFiles[i];
-            const relativeLayoutPath = layoutFile ? import_path21.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
+            const relativeLayoutPath = layoutFile ? import_path22.default.relative(projectRoot || process.cwd(), layoutFile) : "unknown";
             reqLogger.warn("Layout server hook failed for error page", {
               error: err instanceof Error ? err.message : String(err),
               stack: err instanceof Error ? err.stack : void 0,
@@ -14244,16 +14313,16 @@ async function renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params,
   const html = "<!DOCTYPE html>" + (0, import_server2.renderToString)(documentTree);
   const dir = pathToOutDir(ssgOutDir, urlPath);
   ensureDir(dir);
-  const htmlFile = import_path22.default.join(dir, "index.html");
-  const dataFile = import_path22.default.join(dir, "data.json");
-  import_fs16.default.writeFileSync(htmlFile, html, "utf-8");
-  import_fs16.default.writeFileSync(dataFile, JSON.stringify(initialData, null, 2), "utf-8");
+  const htmlFile = import_path23.default.join(dir, "index.html");
+  const dataFile = import_path23.default.join(dir, "data.json");
+  import_fs17.default.writeFileSync(htmlFile, html, "utf-8");
+  import_fs17.default.writeFileSync(dataFile, JSON.stringify(initialData, null, 2), "utf-8");
 }
 
 // modules/build/ssg/builder.ts
 init_globals();
 async function buildStaticPages(projectRoot, routes, config) {
-  const ssgOutDir = import_path24.default.join(projectRoot, BUILD_FOLDER_NAME, "ssg");
+  const ssgOutDir = import_path25.default.join(projectRoot, BUILD_FOLDER_NAME, "ssg");
   ensureDir(ssgOutDir);
   for (const route of routes) {
     if (route.dynamic !== "force-static") continue;
@@ -14308,27 +14377,27 @@ async function buildStaticPages(projectRoot, routes, config) {
 }
 
 // modules/build/bundler/server.ts
-var import_path27 = __toESM(require("path"));
-var import_fs18 = __toESM(require("fs"));
+var import_path28 = __toESM(require("path"));
+var import_fs19 = __toESM(require("fs"));
 var import_esbuild = __toESM(require("esbuild"));
 
 // modules/server/utils/server-dir.ts
-var import_fs17 = __toESM(require("fs"));
-var import_path26 = __toESM(require("path"));
+var import_fs18 = __toESM(require("fs"));
+var import_path27 = __toESM(require("path"));
 init_globals();
 var getServerFile = async (projectRoot, fileName) => {
-  const fileTS = import_path26.default.join(projectRoot, `${fileName}.ts`);
-  const fileJS = import_path26.default.join(projectRoot, BUILD_FOLDER_NAME, "server", `${fileName}.js`);
+  const fileTS = import_path27.default.join(projectRoot, `${fileName}.ts`);
+  const fileJS = import_path27.default.join(projectRoot, BUILD_FOLDER_NAME, "server", `${fileName}.js`);
   const isDev = process.env.NODE_ENV === "development";
   let mod = null;
   if (isDev) {
-    if (!import_fs17.default.existsSync(fileTS)) {
+    if (!import_fs18.default.existsSync(fileTS)) {
       return null;
     }
     require("tsx/cjs");
     mod = require(fileTS);
   } else {
-    if (!import_fs17.default.existsSync(fileJS)) {
+    if (!import_fs18.default.existsSync(fileJS)) {
       return null;
     }
     mod = require(fileJS);
@@ -14510,29 +14579,29 @@ init_globals();
 var SERVER_FILES = [INIT_FILE_NAME, CONFIG_FILE_NAME];
 function createPathAliasPlugin(projectRoot, outDir) {
   const aliases = loadAliasesFromTsconfig(projectRoot);
-  const tsconfigPath = import_path27.default.join(projectRoot, "tsconfig.json");
+  const tsconfigPath = import_path28.default.join(projectRoot, "tsconfig.json");
   let baseUrl = ".";
-  if (import_fs18.default.existsSync(tsconfigPath)) {
+  if (import_fs19.default.existsSync(tsconfigPath)) {
     try {
-      const tsconfig = JSON.parse(import_fs18.default.readFileSync(tsconfigPath, "utf-8"));
+      const tsconfig = JSON.parse(import_fs19.default.readFileSync(tsconfigPath, "utf-8"));
       baseUrl = tsconfig.compilerOptions?.baseUrl ?? ".";
     } catch {
     }
   }
   function resolveAliasToRelative(importPath, sourceFile) {
-    if (importPath.startsWith(".") || importPath.startsWith("/") || import_path27.default.isAbsolute(importPath) || importPath.includes("node_modules")) {
+    if (importPath.startsWith(".") || importPath.startsWith("/") || import_path28.default.isAbsolute(importPath) || importPath.includes("node_modules")) {
       return null;
     }
     for (const [aliasKey, aliasPath] of Object.entries(aliases)) {
       if (importPath.startsWith(aliasKey + "/") || importPath === aliasKey) {
         const restPath = importPath.startsWith(aliasKey + "/") ? importPath.slice(aliasKey.length + 1) : "";
-        const resolvedPath = restPath ? import_path27.default.join(aliasPath, restPath) : aliasPath;
+        const resolvedPath = restPath ? import_path28.default.join(aliasPath, restPath) : aliasPath;
         let actualPath = null;
         const extensions = [".ts", ".tsx", ".js", ".jsx", ".json"];
-        if (import_fs18.default.existsSync(resolvedPath) && import_fs18.default.statSync(resolvedPath).isDirectory()) {
+        if (import_fs19.default.existsSync(resolvedPath) && import_fs19.default.statSync(resolvedPath).isDirectory()) {
           for (const ext of extensions) {
-            const indexPath = import_path27.default.join(resolvedPath, `index${ext}`);
-            if (import_fs18.default.existsSync(indexPath)) {
+            const indexPath = import_path28.default.join(resolvedPath, `index${ext}`);
+            if (import_fs19.default.existsSync(indexPath)) {
               actualPath = indexPath;
               break;
             }
@@ -14540,20 +14609,20 @@ function createPathAliasPlugin(projectRoot, outDir) {
         } else {
           for (const ext of extensions) {
             const filePath = resolvedPath + ext;
-            if (import_fs18.default.existsSync(filePath)) {
+            if (import_fs19.default.existsSync(filePath)) {
               actualPath = filePath;
               break;
             }
           }
-          if (!actualPath && import_fs18.default.existsSync(resolvedPath)) {
+          if (!actualPath && import_fs19.default.existsSync(resolvedPath)) {
             actualPath = resolvedPath;
           }
         }
         if (actualPath) {
-          const relativePath = import_path27.default.relative(outDir, actualPath);
+          const relativePath = import_path28.default.relative(outDir, actualPath);
           const normalizedPath = relativePath.replace(/\\/g, "/");
           const finalPath = normalizedPath.startsWith(".") ? normalizedPath : `./${normalizedPath}`;
-          const ext = import_path27.default.extname(finalPath);
+          const ext = import_path28.default.extname(finalPath);
           const pathWithoutExt = ext === ".json" ? finalPath : finalPath.slice(0, -ext.length);
           return pathWithoutExt;
         }
@@ -14565,13 +14634,13 @@ function createPathAliasPlugin(projectRoot, outDir) {
     name: "path-alias-resolver",
     setup(build) {
       build.onLoad({ filter: /\.(ts|tsx|js|jsx)$/ }, (args) => {
-        const fileName = import_path27.default.basename(args.path);
+        const fileName = import_path28.default.basename(args.path);
         const isServerFile = SERVER_FILES.some((f) => fileName === `${f}.ts` || fileName === `${f}.tsx` || fileName === `${f}.js` || fileName === `${f}.jsx`);
-        const isInProjectRoot = import_path27.default.dirname(args.path) === projectRoot;
+        const isInProjectRoot = import_path28.default.dirname(args.path) === projectRoot;
         if (!isServerFile || !isInProjectRoot) {
           return null;
         }
-        const contents = import_fs18.default.readFileSync(args.path, "utf-8");
+        const contents = import_fs19.default.readFileSync(args.path, "utf-8");
         let transformed = contents;
         const aliasPatterns = Object.keys(aliases).sort((a, b) => b.length - a.length);
         for (const aliasKey of aliasPatterns) {
@@ -14591,7 +14660,7 @@ function createPathAliasPlugin(projectRoot, outDir) {
         }
         return {
           contents: transformed,
-          loader: import_path27.default.extname(args.path).slice(1)
+          loader: import_path28.default.extname(args.path).slice(1)
         };
       });
       build.onResolve({ filter: /.*/ }, (args) => {
@@ -14610,9 +14679,9 @@ function createPathAliasPlugin(projectRoot, outDir) {
 function collectAppSources(appDir) {
   const entries = [];
   function walk(dir) {
-    const items = import_fs18.default.readdirSync(dir, { withFileTypes: true });
+    const items = import_fs19.default.readdirSync(dir, { withFileTypes: true });
     for (const item of items) {
-      const full = import_path27.default.join(dir, item.name);
+      const full = import_path28.default.join(dir, item.name);
       if (item.isDirectory()) {
         walk(full);
         continue;
@@ -14629,7 +14698,7 @@ function collectAppSources(appDir) {
   return entries;
 }
 async function buildServerApp(projectRoot, appDir) {
-  const outDir = import_path27.default.join(projectRoot, BUILD_FOLDER_NAME, "server");
+  const outDir = import_path28.default.join(projectRoot, BUILD_FOLDER_NAME, "server");
   const entryPoints = collectAppSources(appDir);
   ensureDir(outDir);
   if (entryPoints.length === 0) {
@@ -14647,14 +14716,14 @@ async function buildServerApp(projectRoot, appDir) {
     bundle: true,
     splitting: false,
     logLevel: "info",
-    tsconfig: import_path27.default.join(projectRoot, "tsconfig.json"),
+    tsconfig: import_path28.default.join(projectRoot, "tsconfig.json"),
     packages: "external"
   });
   const pathAliasPlugin = createPathAliasPlugin(projectRoot, outDir);
   for (const fileName of SERVER_FILES) {
-    const initTS = import_path27.default.join(projectRoot, `${fileName}.ts`);
-    const initJS = import_path27.default.join(outDir, `${fileName}.js`);
-    if (import_fs18.default.existsSync(initTS)) {
+    const initTS = import_path28.default.join(projectRoot, `${fileName}.ts`);
+    const initJS = import_path28.default.join(outDir, `${fileName}.js`);
+    if (import_fs19.default.existsSync(initTS)) {
       await import_esbuild.default.build({
         entryPoints: [initTS],
         outfile: initJS,
@@ -14665,7 +14734,7 @@ async function buildServerApp(projectRoot, appDir) {
         sourcemap: true,
         bundle: false,
         logLevel: "info",
-        tsconfig: import_path27.default.join(projectRoot, "tsconfig.json"),
+        tsconfig: import_path28.default.join(projectRoot, "tsconfig.json"),
         plugins: [pathAliasPlugin]
       });
     }
@@ -14677,8 +14746,8 @@ async function buildServerApp(projectRoot, appDir) {
 init_globals();
 
 // src/config.ts
-var import_path28 = __toESM(require("path"));
-var import_fs19 = __toESM(require("fs"));
+var import_path29 = __toESM(require("path"));
+var import_fs20 = __toESM(require("fs"));
 init_globals();
 var DEFAULT_CONFIG2 = {
   directories: {
@@ -14745,8 +14814,8 @@ function validateConfig(config, projectRoot) {
   if (!config.directories.app || typeof config.directories.app !== "string") {
     errors.push("config.directories.app must be a non-empty string");
   } else {
-    const appDir = import_path28.default.join(projectRoot, config.directories.app);
-    if (!import_fs19.default.existsSync(appDir) && process.env.NODE_ENV !== "test") {
+    const appDir = import_path29.default.join(projectRoot, config.directories.app);
+    if (!import_fs20.default.existsSync(appDir) && process.env.NODE_ENV !== "test") {
       errors.push(
         `App directory not found: ${config.directories.app}
   Expected at: ${appDir}
@@ -14850,17 +14919,17 @@ function validateConfig(config, projectRoot) {
 }
 function loadConfig(projectRoot) {
   const configFiles = [
-    import_path28.default.join(projectRoot, "loly.config.ts"),
-    import_path28.default.join(projectRoot, "loly.config.js"),
-    import_path28.default.join(projectRoot, "loly.config.json")
+    import_path29.default.join(projectRoot, "loly.config.ts"),
+    import_path29.default.join(projectRoot, "loly.config.js"),
+    import_path29.default.join(projectRoot, "loly.config.json")
   ];
   let userConfig = {};
   let loadedConfigFile = null;
   for (const configFile of configFiles) {
-    if (import_fs19.default.existsSync(configFile)) {
+    if (import_fs20.default.existsSync(configFile)) {
       try {
         if (configFile.endsWith(".json")) {
-          const content = import_fs19.default.readFileSync(configFile, "utf-8");
+          const content = import_fs20.default.readFileSync(configFile, "utf-8");
           userConfig = JSON.parse(content);
         } else {
           if (process.env.NODE_ENV === "development") {
@@ -14869,12 +14938,12 @@ function loadConfig(projectRoot) {
           const mod = require(configFile);
           userConfig = typeof mod.default === "function" ? mod.default(process.env.NODE_ENV) : mod.default || mod.config || mod;
         }
-        loadedConfigFile = import_path28.default.relative(projectRoot, configFile);
+        loadedConfigFile = import_path29.default.relative(projectRoot, configFile);
         break;
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         throw new ConfigValidationError(
-          `Failed to load configuration from ${import_path28.default.relative(projectRoot, configFile)}:
+          `Failed to load configuration from ${import_path29.default.relative(projectRoot, configFile)}:
   ${errorMessage}
   \u{1F4A1} Suggestion: Check that your config file exports a valid configuration object`
         );
@@ -14898,13 +14967,13 @@ ${error.message}`;
   return config;
 }
 function getAppDir(projectRoot, config) {
-  return import_path28.default.resolve(projectRoot, config.directories.app);
+  return import_path29.default.resolve(projectRoot, config.directories.app);
 }
 function getBuildDir(projectRoot, config) {
-  return import_path28.default.join(projectRoot, config.directories.build);
+  return import_path29.default.join(projectRoot, config.directories.build);
 }
 function getStaticDir(projectRoot, config) {
-  return import_path28.default.resolve(projectRoot, config.directories.static);
+  return import_path29.default.resolve(projectRoot, config.directories.static);
 }
 
 // modules/build/index.ts
@@ -14957,16 +15026,16 @@ async function buildApp(options = {}) {
 }
 
 // src/server.ts
-var import_fs23 = __toESM(require("fs"));
-var import_path33 = __toESM(require("path"));
+var import_fs24 = __toESM(require("fs"));
+var import_path34 = __toESM(require("path"));
 
 // modules/server/setup.ts
 var import_express = __toESM(require("express"));
-var import_path31 = __toESM(require("path"));
-var import_fs22 = __toESM(require("fs"));
+var import_path32 = __toESM(require("path"));
+var import_fs23 = __toESM(require("fs"));
 
 // ../../node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/index.js
-var import_fs21 = require("fs");
+var import_fs22 = require("fs");
 var import_promises3 = require("fs/promises");
 var import_events = require("events");
 var sysPath2 = __toESM(require("path"), 1);
@@ -15041,7 +15110,7 @@ var ReaddirpStream = class extends import_node_stream.Readable {
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
     const statMethod = opts.lstat ? import_promises.lstat : import_promises.stat;
     if (wantBigintFsStats) {
-      this._stat = (path31) => statMethod(path31, { bigint: true });
+      this._stat = (path32) => statMethod(path32, { bigint: true });
     } else {
       this._stat = statMethod;
     }
@@ -15066,8 +15135,8 @@ var ReaddirpStream = class extends import_node_stream.Readable {
         const par = this.parent;
         const fil = par && par.files;
         if (fil && fil.length > 0) {
-          const { path: path31, depth } = par;
-          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path31));
+          const { path: path32, depth } = par;
+          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path32));
           const awaited = await Promise.all(slice);
           for (const entry of awaited) {
             if (!entry)
@@ -15107,20 +15176,20 @@ var ReaddirpStream = class extends import_node_stream.Readable {
       this.reading = false;
     }
   }
-  async _exploreDir(path31, depth) {
+  async _exploreDir(path32, depth) {
     let files;
     try {
-      files = await (0, import_promises.readdir)(path31, this._rdOptions);
+      files = await (0, import_promises.readdir)(path32, this._rdOptions);
     } catch (error) {
       this._onError(error);
     }
-    return { files, depth, path: path31 };
+    return { files, depth, path: path32 };
   }
-  async _formatEntry(dirent, path31) {
+  async _formatEntry(dirent, path32) {
     let entry;
     const basename3 = this._isDirent ? dirent.name : dirent;
     try {
-      const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path31, basename3));
+      const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path32, basename3));
       entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename3 };
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
@@ -15191,7 +15260,7 @@ function readdirp(root, options = {}) {
 }
 
 // ../../node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/handler.js
-var import_fs20 = require("fs");
+var import_fs21 = require("fs");
 var import_promises2 = require("fs/promises");
 var sysPath = __toESM(require("path"), 1);
 var import_os = require("os");
@@ -15520,16 +15589,16 @@ var delFromSet = (main, prop, item) => {
 };
 var isEmptySet = (val) => val instanceof Set ? val.size === 0 : !val;
 var FsWatchInstances = /* @__PURE__ */ new Map();
-function createFsWatchInstance(path31, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path32, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path31);
-    emitRaw(rawEvent, evPath, { watchedPath: path31 });
-    if (evPath && path31 !== evPath) {
-      fsWatchBroadcast(sysPath.resolve(path31, evPath), KEY_LISTENERS, sysPath.join(path31, evPath));
+    listener(path32);
+    emitRaw(rawEvent, evPath, { watchedPath: path32 });
+    if (evPath && path32 !== evPath) {
+      fsWatchBroadcast(sysPath.resolve(path32, evPath), KEY_LISTENERS, sysPath.join(path32, evPath));
     }
   };
   try {
-    return (0, import_fs20.watch)(path31, {
+    return (0, import_fs21.watch)(path32, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error) {
@@ -15545,12 +15614,12 @@ var fsWatchBroadcast = (fullPath, listenerType, val1, val2, val3) => {
     listener(val1, val2, val3);
   });
 };
-var setFsWatchListener = (path31, fullPath, options, handlers) => {
+var setFsWatchListener = (path32, fullPath, options, handlers) => {
   const { listener, errHandler, rawEmitter } = handlers;
   let cont = FsWatchInstances.get(fullPath);
   let watcher;
   if (!options.persistent) {
-    watcher = createFsWatchInstance(path31, options, listener, errHandler, rawEmitter);
+    watcher = createFsWatchInstance(path32, options, listener, errHandler, rawEmitter);
     if (!watcher)
       return;
     return watcher.close.bind(watcher);
@@ -15561,7 +15630,7 @@ var setFsWatchListener = (path31, fullPath, options, handlers) => {
     addAndConvert(cont, KEY_RAW, rawEmitter);
   } else {
     watcher = createFsWatchInstance(
-      path31,
+      path32,
       options,
       fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
       errHandler,
@@ -15576,7 +15645,7 @@ var setFsWatchListener = (path31, fullPath, options, handlers) => {
         cont.watcherUnusable = true;
       if (isWindows && error.code === "EPERM") {
         try {
-          const fd = await (0, import_promises2.open)(path31, "r");
+          const fd = await (0, import_promises2.open)(path32, "r");
           await fd.close();
           broadcastErr(error);
         } catch (err) {
@@ -15607,12 +15676,12 @@ var setFsWatchListener = (path31, fullPath, options, handlers) => {
   };
 };
 var FsWatchFileInstances = /* @__PURE__ */ new Map();
-var setFsWatchFileListener = (path31, fullPath, options, handlers) => {
+var setFsWatchFileListener = (path32, fullPath, options, handlers) => {
   const { listener, rawEmitter } = handlers;
   let cont = FsWatchFileInstances.get(fullPath);
   const copts = cont && cont.options;
   if (copts && (copts.persistent < options.persistent || copts.interval > options.interval)) {
-    (0, import_fs20.unwatchFile)(fullPath);
+    (0, import_fs21.unwatchFile)(fullPath);
     cont = void 0;
   }
   if (cont) {
@@ -15623,13 +15692,13 @@ var setFsWatchFileListener = (path31, fullPath, options, handlers) => {
       listeners: listener,
       rawEmitters: rawEmitter,
       options,
-      watcher: (0, import_fs20.watchFile)(fullPath, options, (curr, prev) => {
+      watcher: (0, import_fs21.watchFile)(fullPath, options, (curr, prev) => {
         foreach(cont.rawEmitters, (rawEmitter2) => {
           rawEmitter2(EV.CHANGE, fullPath, { curr, prev });
         });
         const currmtime = curr.mtimeMs;
         if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-          foreach(cont.listeners, (listener2) => listener2(path31, curr));
+          foreach(cont.listeners, (listener2) => listener2(path32, curr));
         }
       })
     };
@@ -15640,7 +15709,7 @@ var setFsWatchFileListener = (path31, fullPath, options, handlers) => {
     delFromSet(cont, KEY_RAW, rawEmitter);
     if (isEmptySet(cont.listeners)) {
       FsWatchFileInstances.delete(fullPath);
-      (0, import_fs20.unwatchFile)(fullPath);
+      (0, import_fs21.unwatchFile)(fullPath);
       cont.options = cont.watcher = void 0;
       Object.freeze(cont);
     }
@@ -15657,13 +15726,13 @@ var NodeFsHandler = class {
    * @param listener on fs change
    * @returns closer for the watcher instance
    */
-  _watchWithNodeFs(path31, listener) {
+  _watchWithNodeFs(path32, listener) {
     const opts = this.fsw.options;
-    const directory = sysPath.dirname(path31);
-    const basename3 = sysPath.basename(path31);
+    const directory = sysPath.dirname(path32);
+    const basename3 = sysPath.basename(path32);
     const parent = this.fsw._getWatchedDir(directory);
     parent.add(basename3);
-    const absolutePath = sysPath.resolve(path31);
+    const absolutePath = sysPath.resolve(path32);
     const options = {
       persistent: opts.persistent
     };
@@ -15673,12 +15742,12 @@ var NodeFsHandler = class {
     if (opts.usePolling) {
       const enableBin = opts.interval !== opts.binaryInterval;
       options.interval = enableBin && isBinaryPath(basename3) ? opts.binaryInterval : opts.interval;
-      closer = setFsWatchFileListener(path31, absolutePath, options, {
+      closer = setFsWatchFileListener(path32, absolutePath, options, {
         listener,
         rawEmitter: this.fsw._emitRaw
       });
     } else {
-      closer = setFsWatchListener(path31, absolutePath, options, {
+      closer = setFsWatchListener(path32, absolutePath, options, {
         listener,
         errHandler: this._boundHandleError,
         rawEmitter: this.fsw._emitRaw
@@ -15700,7 +15769,7 @@ var NodeFsHandler = class {
     let prevStats = stats;
     if (parent.has(basename3))
       return;
-    const listener = async (path31, newStats) => {
+    const listener = async (path32, newStats) => {
       if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5))
         return;
       if (!newStats || newStats.mtimeMs === 0) {
@@ -15714,11 +15783,11 @@ var NodeFsHandler = class {
             this.fsw._emit(EV.CHANGE, file, newStats2);
           }
           if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-            this.fsw._closeFile(path31);
+            this.fsw._closeFile(path32);
             prevStats = newStats2;
             const closer2 = this._watchWithNodeFs(file, listener);
             if (closer2)
-              this.fsw._addPathCloser(path31, closer2);
+              this.fsw._addPathCloser(path32, closer2);
           } else {
             prevStats = newStats2;
           }
@@ -15750,7 +15819,7 @@ var NodeFsHandler = class {
    * @param item basename of this item
    * @returns true if no more processing is needed for this entry.
    */
-  async _handleSymlink(entry, directory, path31, item) {
+  async _handleSymlink(entry, directory, path32, item) {
     if (this.fsw.closed) {
       return;
     }
@@ -15760,7 +15829,7 @@ var NodeFsHandler = class {
       this.fsw._incrReadyCount();
       let linkPath;
       try {
-        linkPath = await (0, import_promises2.realpath)(path31);
+        linkPath = await (0, import_promises2.realpath)(path32);
       } catch (e) {
         this.fsw._emitReady();
         return true;
@@ -15770,12 +15839,12 @@ var NodeFsHandler = class {
       if (dir.has(item)) {
         if (this.fsw._symlinkPaths.get(full) !== linkPath) {
           this.fsw._symlinkPaths.set(full, linkPath);
-          this.fsw._emit(EV.CHANGE, path31, entry.stats);
+          this.fsw._emit(EV.CHANGE, path32, entry.stats);
         }
       } else {
         dir.add(item);
         this.fsw._symlinkPaths.set(full, linkPath);
-        this.fsw._emit(EV.ADD, path31, entry.stats);
+        this.fsw._emit(EV.ADD, path32, entry.stats);
       }
       this.fsw._emitReady();
       return true;
@@ -15804,9 +15873,9 @@ var NodeFsHandler = class {
         return;
       }
       const item = entry.path;
-      let path31 = sysPath.join(directory, item);
+      let path32 = sysPath.join(directory, item);
       current.add(item);
-      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path31, item)) {
+      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path32, item)) {
         return;
       }
       if (this.fsw.closed) {
@@ -15815,8 +15884,8 @@ var NodeFsHandler = class {
       }
       if (item === target || !target && !previous.has(item)) {
         this.fsw._incrReadyCount();
-        path31 = sysPath.join(dir, sysPath.relative(dir, path31));
-        this._addToNodeFs(path31, initialAdd, wh, depth + 1);
+        path32 = sysPath.join(dir, sysPath.relative(dir, path32));
+        this._addToNodeFs(path32, initialAdd, wh, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
     return new Promise((resolve3, reject) => {
@@ -15885,13 +15954,13 @@ var NodeFsHandler = class {
    * @param depth Child path actually targeted for watch
    * @param target Child path actually targeted for watch
    */
-  async _addToNodeFs(path31, initialAdd, priorWh, depth, target) {
+  async _addToNodeFs(path32, initialAdd, priorWh, depth, target) {
     const ready = this.fsw._emitReady;
-    if (this.fsw._isIgnored(path31) || this.fsw.closed) {
+    if (this.fsw._isIgnored(path32) || this.fsw.closed) {
       ready();
       return false;
     }
-    const wh = this.fsw._getWatchHelpers(path31);
+    const wh = this.fsw._getWatchHelpers(path32);
     if (priorWh) {
       wh.filterPath = (entry) => priorWh.filterPath(entry);
       wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -15907,8 +15976,8 @@ var NodeFsHandler = class {
       const follow = this.fsw.options.followSymlinks;
       let closer;
       if (stats.isDirectory()) {
-        const absPath = sysPath.resolve(path31);
-        const targetPath = follow ? await (0, import_promises2.realpath)(path31) : path31;
+        const absPath = sysPath.resolve(path32);
+        const targetPath = follow ? await (0, import_promises2.realpath)(path32) : path32;
         if (this.fsw.closed)
           return;
         closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -15918,29 +15987,29 @@ var NodeFsHandler = class {
           this.fsw._symlinkPaths.set(absPath, targetPath);
         }
       } else if (stats.isSymbolicLink()) {
-        const targetPath = follow ? await (0, import_promises2.realpath)(path31) : path31;
+        const targetPath = follow ? await (0, import_promises2.realpath)(path32) : path32;
         if (this.fsw.closed)
           return;
         const parent = sysPath.dirname(wh.watchPath);
         this.fsw._getWatchedDir(parent).add(wh.watchPath);
         this.fsw._emit(EV.ADD, wh.watchPath, stats);
-        closer = await this._handleDir(parent, stats, initialAdd, depth, path31, wh, targetPath);
+        closer = await this._handleDir(parent, stats, initialAdd, depth, path32, wh, targetPath);
         if (this.fsw.closed)
           return;
         if (targetPath !== void 0) {
-          this.fsw._symlinkPaths.set(sysPath.resolve(path31), targetPath);
+          this.fsw._symlinkPaths.set(sysPath.resolve(path32), targetPath);
         }
       } else {
         closer = this._handleFile(wh.watchPath, stats, initialAdd);
       }
       ready();
       if (closer)
-        this.fsw._addPathCloser(path31, closer);
+        this.fsw._addPathCloser(path32, closer);
       return false;
     } catch (error) {
       if (this.fsw._handleError(error)) {
         ready();
-        return path31;
+        return path32;
       }
     }
   }
@@ -15983,26 +16052,26 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path31) {
-  if (typeof path31 !== "string")
+function normalizePath(path32) {
+  if (typeof path32 !== "string")
     throw new Error("string expected");
-  path31 = sysPath2.normalize(path31);
-  path31 = path31.replace(/\\/g, "/");
+  path32 = sysPath2.normalize(path32);
+  path32 = path32.replace(/\\/g, "/");
   let prepend = false;
-  if (path31.startsWith("//"))
+  if (path32.startsWith("//"))
     prepend = true;
   const DOUBLE_SLASH_RE2 = /\/\//;
-  while (path31.match(DOUBLE_SLASH_RE2))
-    path31 = path31.replace(DOUBLE_SLASH_RE2, "/");
+  while (path32.match(DOUBLE_SLASH_RE2))
+    path32 = path32.replace(DOUBLE_SLASH_RE2, "/");
   if (prepend)
-    path31 = "/" + path31;
-  return path31;
+    path32 = "/" + path32;
+  return path32;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path31 = normalizePath(testString);
+  const path32 = normalizePath(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path31, stats)) {
+    if (pattern(path32, stats)) {
       return true;
     }
   }
@@ -16042,19 +16111,19 @@ var toUnix = (string) => {
   }
   return str;
 };
-var normalizePathToUnix = (path31) => toUnix(sysPath2.normalize(toUnix(path31)));
-var normalizeIgnored = (cwd = "") => (path31) => {
-  if (typeof path31 === "string") {
-    return normalizePathToUnix(sysPath2.isAbsolute(path31) ? path31 : sysPath2.join(cwd, path31));
+var normalizePathToUnix = (path32) => toUnix(sysPath2.normalize(toUnix(path32)));
+var normalizeIgnored = (cwd = "") => (path32) => {
+  if (typeof path32 === "string") {
+    return normalizePathToUnix(sysPath2.isAbsolute(path32) ? path32 : sysPath2.join(cwd, path32));
   } else {
-    return path31;
+    return path32;
   }
 };
-var getAbsolutePath = (path31, cwd) => {
-  if (sysPath2.isAbsolute(path31)) {
-    return path31;
+var getAbsolutePath = (path32, cwd) => {
+  if (sysPath2.isAbsolute(path32)) {
+    return path32;
   }
-  return sysPath2.join(cwd, path31);
+  return sysPath2.join(cwd, path32);
 };
 var EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
 var DirEntry = class {
@@ -16109,10 +16178,10 @@ var DirEntry = class {
 var STAT_METHOD_F = "stat";
 var STAT_METHOD_L = "lstat";
 var WatchHelper = class {
-  constructor(path31, follow, fsw) {
+  constructor(path32, follow, fsw) {
     this.fsw = fsw;
-    const watchPath = path31;
-    this.path = path31 = path31.replace(REPLACER_RE, "");
+    const watchPath = path32;
+    this.path = path32 = path32.replace(REPLACER_RE, "");
     this.watchPath = watchPath;
     this.fullWatchPath = sysPath2.resolve(watchPath);
     this.dirParts = [];
@@ -16234,20 +16303,20 @@ var FSWatcher = class extends import_events.EventEmitter {
     this._closePromise = void 0;
     let paths = unifyPaths(paths_);
     if (cwd) {
-      paths = paths.map((path31) => {
-        const absPath = getAbsolutePath(path31, cwd);
+      paths = paths.map((path32) => {
+        const absPath = getAbsolutePath(path32, cwd);
         return absPath;
       });
     }
-    paths.forEach((path31) => {
-      this._removeIgnoredPath(path31);
+    paths.forEach((path32) => {
+      this._removeIgnoredPath(path32);
     });
     this._userIgnored = void 0;
     if (!this._readyCount)
       this._readyCount = 0;
     this._readyCount += paths.length;
-    Promise.all(paths.map(async (path31) => {
-      const res = await this._nodeFsHandler._addToNodeFs(path31, !_internal, void 0, 0, _origAdd);
+    Promise.all(paths.map(async (path32) => {
+      const res = await this._nodeFsHandler._addToNodeFs(path32, !_internal, void 0, 0, _origAdd);
       if (res)
         this._emitReady();
       return res;
@@ -16269,17 +16338,17 @@ var FSWatcher = class extends import_events.EventEmitter {
       return this;
     const paths = unifyPaths(paths_);
     const { cwd } = this.options;
-    paths.forEach((path31) => {
-      if (!sysPath2.isAbsolute(path31) && !this._closers.has(path31)) {
+    paths.forEach((path32) => {
+      if (!sysPath2.isAbsolute(path32) && !this._closers.has(path32)) {
         if (cwd)
-          path31 = sysPath2.join(cwd, path31);
-        path31 = sysPath2.resolve(path31);
+          path32 = sysPath2.join(cwd, path32);
+        path32 = sysPath2.resolve(path32);
       }
-      this._closePath(path31);
-      this._addIgnoredPath(path31);
-      if (this._watched.has(path31)) {
+      this._closePath(path32);
+      this._addIgnoredPath(path32);
+      if (this._watched.has(path32)) {
         this._addIgnoredPath({
-          path: path31,
+          path: path32,
           recursive: true
         });
       }
@@ -16343,38 +16412,38 @@ var FSWatcher = class extends import_events.EventEmitter {
    * @param stats arguments to be passed with event
    * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
    */
-  async _emit(event, path31, stats) {
+  async _emit(event, path32, stats) {
     if (this.closed)
       return;
     const opts = this.options;
     if (isWindows)
-      path31 = sysPath2.normalize(path31);
+      path32 = sysPath2.normalize(path32);
     if (opts.cwd)
-      path31 = sysPath2.relative(opts.cwd, path31);
-    const args = [path31];
+      path32 = sysPath2.relative(opts.cwd, path32);
+    const args = [path32];
     if (stats != null)
       args.push(stats);
     const awf = opts.awaitWriteFinish;
     let pw;
-    if (awf && (pw = this._pendingWrites.get(path31))) {
+    if (awf && (pw = this._pendingWrites.get(path32))) {
       pw.lastChange = /* @__PURE__ */ new Date();
       return this;
     }
     if (opts.atomic) {
       if (event === EVENTS.UNLINK) {
-        this._pendingUnlinks.set(path31, [event, ...args]);
+        this._pendingUnlinks.set(path32, [event, ...args]);
         setTimeout(() => {
-          this._pendingUnlinks.forEach((entry, path32) => {
+          this._pendingUnlinks.forEach((entry, path33) => {
             this.emit(...entry);
             this.emit(EVENTS.ALL, ...entry);
-            this._pendingUnlinks.delete(path32);
+            this._pendingUnlinks.delete(path33);
           });
         }, typeof opts.atomic === "number" ? opts.atomic : 100);
         return this;
       }
-      if (event === EVENTS.ADD && this._pendingUnlinks.has(path31)) {
+      if (event === EVENTS.ADD && this._pendingUnlinks.has(path32)) {
         event = EVENTS.CHANGE;
-        this._pendingUnlinks.delete(path31);
+        this._pendingUnlinks.delete(path32);
       }
     }
     if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -16392,16 +16461,16 @@ var FSWatcher = class extends import_events.EventEmitter {
           this.emitWithAll(event, args);
         }
       };
-      this._awaitWriteFinish(path31, awf.stabilityThreshold, event, awfEmit);
+      this._awaitWriteFinish(path32, awf.stabilityThreshold, event, awfEmit);
       return this;
     }
     if (event === EVENTS.CHANGE) {
-      const isThrottled = !this._throttle(EVENTS.CHANGE, path31, 50);
+      const isThrottled = !this._throttle(EVENTS.CHANGE, path32, 50);
       if (isThrottled)
         return this;
     }
     if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path31) : path31;
+      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path32) : path32;
       let stats2;
       try {
         stats2 = await (0, import_promises3.stat)(fullPath);
@@ -16432,23 +16501,23 @@ var FSWatcher = class extends import_events.EventEmitter {
    * @param timeout duration of time to suppress duplicate actions
    * @returns tracking object or false if action should be suppressed
    */
-  _throttle(actionType, path31, timeout) {
+  _throttle(actionType, path32, timeout) {
     if (!this._throttled.has(actionType)) {
       this._throttled.set(actionType, /* @__PURE__ */ new Map());
     }
     const action = this._throttled.get(actionType);
     if (!action)
       throw new Error("invalid throttle");
-    const actionPath = action.get(path31);
+    const actionPath = action.get(path32);
     if (actionPath) {
       actionPath.count++;
       return false;
     }
     let timeoutObject;
     const clear = () => {
-      const item = action.get(path31);
+      const item = action.get(path32);
       const count = item ? item.count : 0;
-      action.delete(path31);
+      action.delete(path32);
       clearTimeout(timeoutObject);
       if (item)
         clearTimeout(item.timeoutObject);
@@ -16456,7 +16525,7 @@ var FSWatcher = class extends import_events.EventEmitter {
     };
     timeoutObject = setTimeout(clear, timeout);
     const thr = { timeoutObject, clear, count: 0 };
-    action.set(path31, thr);
+    action.set(path32, thr);
     return thr;
   }
   _incrReadyCount() {
@@ -16470,44 +16539,44 @@ var FSWatcher = class extends import_events.EventEmitter {
    * @param event
    * @param awfEmit Callback to be called when ready for event to be emitted.
    */
-  _awaitWriteFinish(path31, threshold, event, awfEmit) {
+  _awaitWriteFinish(path32, threshold, event, awfEmit) {
     const awf = this.options.awaitWriteFinish;
     if (typeof awf !== "object")
       return;
     const pollInterval = awf.pollInterval;
     let timeoutHandler;
-    let fullPath = path31;
-    if (this.options.cwd && !sysPath2.isAbsolute(path31)) {
-      fullPath = sysPath2.join(this.options.cwd, path31);
+    let fullPath = path32;
+    if (this.options.cwd && !sysPath2.isAbsolute(path32)) {
+      fullPath = sysPath2.join(this.options.cwd, path32);
     }
     const now = /* @__PURE__ */ new Date();
     const writes = this._pendingWrites;
     function awaitWriteFinishFn(prevStat) {
-      (0, import_fs21.stat)(fullPath, (err, curStat) => {
-        if (err || !writes.has(path31)) {
+      (0, import_fs22.stat)(fullPath, (err, curStat) => {
+        if (err || !writes.has(path32)) {
           if (err && err.code !== "ENOENT")
             awfEmit(err);
           return;
         }
         const now2 = Number(/* @__PURE__ */ new Date());
         if (prevStat && curStat.size !== prevStat.size) {
-          writes.get(path31).lastChange = now2;
+          writes.get(path32).lastChange = now2;
         }
-        const pw = writes.get(path31);
+        const pw = writes.get(path32);
         const df = now2 - pw.lastChange;
         if (df >= threshold) {
-          writes.delete(path31);
+          writes.delete(path32);
           awfEmit(void 0, curStat);
         } else {
           timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
         }
       });
     }
-    if (!writes.has(path31)) {
-      writes.set(path31, {
+    if (!writes.has(path32)) {
+      writes.set(path32, {
         lastChange: now,
         cancelWait: () => {
-          writes.delete(path31);
+          writes.delete(path32);
           clearTimeout(timeoutHandler);
           return event;
         }
@@ -16518,8 +16587,8 @@ var FSWatcher = class extends import_events.EventEmitter {
   /**
    * Determines whether user has asked to ignore this path.
    */
-  _isIgnored(path31, stats) {
-    if (this.options.atomic && DOT_RE.test(path31))
+  _isIgnored(path32, stats) {
+    if (this.options.atomic && DOT_RE.test(path32))
       return true;
     if (!this._userIgnored) {
       const { cwd } = this.options;
@@ -16529,17 +16598,17 @@ var FSWatcher = class extends import_events.EventEmitter {
       const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
       this._userIgnored = anymatch(list, void 0);
     }
-    return this._userIgnored(path31, stats);
+    return this._userIgnored(path32, stats);
   }
-  _isntIgnored(path31, stat4) {
-    return !this._isIgnored(path31, stat4);
+  _isntIgnored(path32, stat4) {
+    return !this._isIgnored(path32, stat4);
   }
   /**
    * Provides a set of common helpers and properties relating to symlink handling.
    * @param path file or directory pattern being watched
    */
-  _getWatchHelpers(path31) {
-    return new WatchHelper(path31, this.options.followSymlinks, this);
+  _getWatchHelpers(path32) {
+    return new WatchHelper(path32, this.options.followSymlinks, this);
   }
   // Directory helpers
   // -----------------
@@ -16571,63 +16640,63 @@ var FSWatcher = class extends import_events.EventEmitter {
    * @param item      base path of item/directory
    */
   _remove(directory, item, isDirectory) {
-    const path31 = sysPath2.join(directory, item);
-    const fullPath = sysPath2.resolve(path31);
-    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path31) || this._watched.has(fullPath);
-    if (!this._throttle("remove", path31, 100))
+    const path32 = sysPath2.join(directory, item);
+    const fullPath = sysPath2.resolve(path32);
+    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path32) || this._watched.has(fullPath);
+    if (!this._throttle("remove", path32, 100))
       return;
     if (!isDirectory && this._watched.size === 1) {
       this.add(directory, item, true);
     }
-    const wp = this._getWatchedDir(path31);
+    const wp = this._getWatchedDir(path32);
     const nestedDirectoryChildren = wp.getChildren();
-    nestedDirectoryChildren.forEach((nested) => this._remove(path31, nested));
+    nestedDirectoryChildren.forEach((nested) => this._remove(path32, nested));
     const parent = this._getWatchedDir(directory);
     const wasTracked = parent.has(item);
     parent.remove(item);
     if (this._symlinkPaths.has(fullPath)) {
       this._symlinkPaths.delete(fullPath);
     }
-    let relPath = path31;
+    let relPath = path32;
     if (this.options.cwd)
-      relPath = sysPath2.relative(this.options.cwd, path31);
+      relPath = sysPath2.relative(this.options.cwd, path32);
     if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
       const event = this._pendingWrites.get(relPath).cancelWait();
       if (event === EVENTS.ADD)
         return;
     }
-    this._watched.delete(path31);
+    this._watched.delete(path32);
     this._watched.delete(fullPath);
     const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-    if (wasTracked && !this._isIgnored(path31))
-      this._emit(eventName, path31);
-    this._closePath(path31);
+    if (wasTracked && !this._isIgnored(path32))
+      this._emit(eventName, path32);
+    this._closePath(path32);
   }
   /**
    * Closes all watchers for a path
    */
-  _closePath(path31) {
-    this._closeFile(path31);
-    const dir = sysPath2.dirname(path31);
-    this._getWatchedDir(dir).remove(sysPath2.basename(path31));
+  _closePath(path32) {
+    this._closeFile(path32);
+    const dir = sysPath2.dirname(path32);
+    this._getWatchedDir(dir).remove(sysPath2.basename(path32));
   }
   /**
    * Closes only file-specific watchers
    */
-  _closeFile(path31) {
-    const closers = this._closers.get(path31);
+  _closeFile(path32) {
+    const closers = this._closers.get(path32);
     if (!closers)
       return;
     closers.forEach((closer) => closer());
-    this._closers.delete(path31);
+    this._closers.delete(path32);
   }
-  _addPathCloser(path31, closer) {
+  _addPathCloser(path32, closer) {
     if (!closer)
       return;
-    let list = this._closers.get(path31);
+    let list = this._closers.get(path32);
     if (!list) {
       list = [];
-      this._closers.set(path31, list);
+      this._closers.set(path32, list);
     }
     list.push(closer);
   }
@@ -16657,7 +16726,7 @@ function watch(paths, options = {}) {
 var esm_default = { watch, FSWatcher };
 
 // modules/dev/hot-reload-client/index.ts
-var import_path29 = __toESM(require("path"));
+var import_path30 = __toESM(require("path"));
 init_globals();
 function setupHotReload({
   app,
@@ -16699,7 +16768,7 @@ function setupHotReload({
     });
   });
   console.log(`[hot-reload-server] \u2705 SSE endpoint registered at ${route}`);
-  const resolvedProjectRoot = projectRoot ? import_path29.default.resolve(projectRoot) : import_path29.default.dirname(import_path29.default.resolve(appDir));
+  const resolvedProjectRoot = projectRoot ? import_path30.default.resolve(projectRoot) : import_path30.default.dirname(import_path30.default.resolve(appDir));
   const watcher = esm_default.watch(resolvedProjectRoot, {
     ignoreInitial: true,
     ignored: [
@@ -16739,11 +16808,11 @@ function setupHotReload({
   let broadcastTimeout = null;
   const BROADCAST_DEBOUNCE_MS = 300;
   async function broadcastReload(reason, filePath) {
-    const normalizedPath = import_path29.default.normalize(filePath);
+    const normalizedPath = import_path30.default.normalize(filePath);
     if (normalizedPath.includes(BUILD_FOLDER_NAME) || normalizedPath.includes(".loly") || normalizedPath.endsWith(".map") || normalizedPath.endsWith(".log") || normalizedPath.includes("route-chunks.json") || normalizedPath.includes("routes-client.ts") || normalizedPath.includes("/client/route-")) {
       return;
     }
-    const rel = import_path29.default.relative(appDir, filePath);
+    const rel = import_path30.default.relative(appDir, filePath);
     console.log(`[hot-reload] ${reason}: ${rel}`);
     if (broadcastTimeout) {
       clearTimeout(broadcastTimeout);
@@ -16793,9 +16862,9 @@ data: reload:${rel}
 }
 
 // modules/dev/hot-reload-server/index.ts
-var import_path30 = __toESM(require("path"));
+var import_path31 = __toESM(require("path"));
 function clearAppRequireCache(appDir) {
-  const appDirNormalized = import_path30.default.resolve(appDir);
+  const appDirNormalized = import_path31.default.resolve(appDir);
   for (const id of Object.keys(require.cache)) {
     if (id.startsWith(appDirNormalized)) {
       delete require.cache[id];
@@ -16808,7 +16877,7 @@ init_globals();
 function setupStaticFiles(app, projectRoot, config) {
   if (!config) return;
   const staticDir = getStaticDir(projectRoot, config);
-  if (import_fs22.default.existsSync(staticDir)) {
+  if (import_fs23.default.existsSync(staticDir)) {
     app.use(
       import_express.default.static(staticDir, {
         // In production, add caching headers for better performance
@@ -16834,7 +16903,7 @@ function setupServer(app, options) {
     var getRoutes = getRoutes2;
     const { outDir, waitForBuild } = startClientBundler(projectRoot, "development");
     const onFileChange = async (filePath) => {
-      const rel = import_path31.default.relative(appDir, filePath);
+      const rel = import_path32.default.relative(appDir, filePath);
       const isPageFile = filePath.includes("page.tsx") || filePath.includes("page.ts") || filePath.includes("layout.tsx") || filePath.includes("layout.ts") || filePath.includes("_not-found") || filePath.includes("_error");
       const isTsFile = filePath.endsWith(".ts") || filePath.endsWith(".tsx");
       if (isTsFile) {
@@ -16870,8 +16939,8 @@ function setupServer(app, options) {
     const wssRoutes = routeLoader.loadWssRoutes();
     const notFoundPage = routeLoader.loadNotFoundRoute();
     const errorPage = routeLoader.loadErrorRoute();
-    const buildDir = config ? getBuildDir(projectRoot, config) : import_path31.default.join(projectRoot, BUILD_FOLDER_NAME);
-    const clientOutDir = import_path31.default.join(buildDir, "client");
+    const buildDir = config ? getBuildDir(projectRoot, config) : import_path32.default.join(projectRoot, BUILD_FOLDER_NAME);
+    const clientOutDir = import_path32.default.join(buildDir, "client");
     app.use(
       "/static",
       import_express.default.static(clientOutDir, {
@@ -16998,11 +17067,11 @@ function createStrictRateLimiterFromConfig(config) {
 }
 
 // modules/server/middleware/auto-rate-limit.ts
-function matchesStrictPattern(path31, patterns) {
+function matchesStrictPattern(path32, patterns) {
   for (const pattern of patterns) {
     const regexPattern = pattern.replace(/\*\*/g, ".*").replace(/\*/g, "[^/]*").replace(/\//g, "\\/");
     const regex = new RegExp(`^${regexPattern}$`);
-    if (regex.test(path31)) {
+    if (regex.test(path32)) {
       return true;
     }
   }
@@ -17038,6 +17107,7 @@ function getAutoRateLimiter(route, strictPatterns = [], rateLimitConfig) {
 // modules/server/handlers/api.ts
 async function handleApiRequest(options) {
   const { apiRoutes, urlPath, req, res, env = "dev", rewriteLoader } = options;
+  const originalUrlPath = urlPath;
   let finalUrlPath = urlPath;
   let extractedParams = {};
   if (rewriteLoader) {
@@ -17076,6 +17146,33 @@ async function handleApiRequest(options) {
   }
   const sanitizedParams = sanitizeParams(params);
   const sanitizedQuery = sanitizeQuery(req.query);
+  function reconstructPathFromParams(routePattern, params2) {
+    let reconstructed = routePattern;
+    for (const [key, value] of Object.entries(params2)) {
+      const catchAllPattern = `[...${key}]`;
+      if (reconstructed.includes(catchAllPattern)) {
+        reconstructed = reconstructed.replace(catchAllPattern, value);
+      } else {
+        const normalPattern = `[${key}]`;
+        if (reconstructed.includes(normalPattern)) {
+          reconstructed = reconstructed.replace(normalPattern, value);
+        }
+      }
+    }
+    return reconstructed;
+  }
+  const reconstructedPath = reconstructPathFromParams(route.pattern, sanitizedParams);
+  const queryString = req.url?.includes("?") ? req.url.split("?")[1] : "";
+  const originalUrl = queryString ? `${reconstructedPath}?${queryString}` : reconstructedPath;
+  if (!req.originalUrl) {
+    req.originalUrl = originalUrl;
+  }
+  if (!req.params) {
+    req.params = {};
+  }
+  for (const [key, value] of Object.entries(sanitizedParams)) {
+    req.params[key] = value;
+  }
   const ctx = {
     req,
     res,
@@ -17167,7 +17264,7 @@ async function handleApiRequest(options) {
 
 // modules/server/routes.ts
 init_globals();
-var import_path32 = __toESM(require("path"));
+var import_path33 = __toESM(require("path"));
 var cachedRewriteLoader = null;
 var cachedProjectRoot = null;
 var cachedIsDev = null;
@@ -17195,8 +17292,8 @@ function setupRoutes(options) {
   } = options;
   const routeChunks = routeLoader.loadRouteChunks();
   const rewriteLoader = getRewriteLoader(projectRoot, isDev);
-  const ssgOutDir = import_path32.default.join(
-    config ? getBuildDir(projectRoot, config) : import_path32.default.join(projectRoot, BUILD_FOLDER_NAME),
+  const ssgOutDir = import_path33.default.join(
+    config ? getBuildDir(projectRoot, config) : import_path33.default.join(projectRoot, BUILD_FOLDER_NAME),
     "ssg"
   );
   app.all("/api/*", async (req, res) => {
@@ -18425,8 +18522,8 @@ var setupApplication = async ({
 
 // src/server.ts
 var import_dotenv2 = __toESM(require("dotenv"));
-var envPath = import_path33.default.join(process.cwd(), ".env");
-if (import_fs23.default.existsSync(envPath)) {
+var envPath = import_path34.default.join(process.cwd(), ".env");
+if (import_fs24.default.existsSync(envPath)) {
   import_dotenv2.default.config({ path: envPath });
 } else {
   import_dotenv2.default.config();
@@ -18447,8 +18544,8 @@ async function startServer(options = {}) {
   }
   const port = options.port ?? (process.env.PORT ? parseInt(process.env.PORT, 10) : void 0) ?? config.server.port;
   const host = process.env.HOST ?? (!isDev ? "0.0.0.0" : void 0) ?? config.server.host;
-  const appDir = options.appDir ?? (isDev ? getAppDir(projectRoot, config) : import_path33.default.join(getBuildDir(projectRoot, config), "server"));
-  if (!isDev && !import_fs23.default.existsSync(appDir)) {
+  const appDir = options.appDir ?? (isDev ? getAppDir(projectRoot, config) : import_path34.default.join(getBuildDir(projectRoot, config), "server"));
+  if (!isDev && !import_fs24.default.existsSync(appDir)) {
     logger4.error("Compiled directory not found", void 0, {
       buildDir: config.directories.build,
       appDir,
@@ -18644,7 +18741,7 @@ async function run() {
   }
   const args = parseArgs(argv.slice(1));
   const projectRoot = import_process.default.cwd();
-  const appDir = import_path34.default.resolve(projectRoot, args.appDir || "app");
+  const appDir = import_path35.default.resolve(projectRoot, args.appDir || "app");
   const port = typeof args.port === "string" && args.port.trim().length > 0 ? Number(args.port) : 3e3;
   switch (command) {
     case "dev": {