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

package/dist/index.js

@@ -10455,7 +10455,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 };
   }
@@ -14991,6 +14991,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) {
@@ -15029,6 +15030,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,