@webtypen/webframez-react 0.0.22 → 0.0.24

package/dist/http.cjs

@@ -311,21 +311,38 @@ function toRouteEntry(pagesDir, filePath) {
   const relativeDir = import_node_path2.default.dirname(import_node_path2.default.relative(pagesDir, filePath)).replace(/\\/g, "/");
   const segments = relativeDir === "." ? [] : relativeDir.split("/").filter(Boolean);
   const staticCount = segments.filter((segment) => !segment.startsWith("[")).length;
+  const catchAllCount = segments.filter(
+    (segment) => segment.startsWith("[...") && segment.endsWith("]")
+  ).length;
   return {
     filePath,
     segments,
-    staticCount
+    staticCount,
+    catchAllCount
   };
 }
 function matchRoute(entry, pathname) {
   const targetSegments = splitSegments(pathname);
-  if (entry.segments.length !== targetSegments.length) {
-    return null;
-  }
   const params = {};
   for (let index = 0; index < entry.segments.length; index += 1) {
     const routeSegment = entry.segments[index];
+    const isCatchAll = routeSegment.startsWith("[...") && routeSegment.endsWith("]");
+    if (isCatchAll) {
+      const paramName = routeSegment.slice(4, -1);
+      if (!paramName || index !== entry.segments.length - 1) {
+        return null;
+      }
+      const restSegments = targetSegments.slice(index);
+      if (restSegments.length === 0) {
+        return null;
+      }
+      params[paramName] = restSegments.map((segment) => decodeURIComponent(segment));
+      return params;
+    }
     const targetSegment = targetSegments[index];
+    if (typeof targetSegment !== "string") {
+      return null;
+    }
     if (routeSegment.startsWith("[") && routeSegment.endsWith("]")) {
       const paramName = routeSegment.slice(1, -1);
       if (!paramName) {
@@ -338,6 +355,9 @@ function matchRoute(entry, pathname) {
       return null;
     }
   }
+  if (entry.segments.length !== targetSegments.length) {
+    return null;
+  }
   return params;
 }
 function mergeHead(...configs) {
@@ -389,8 +409,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -417,6 +454,9 @@ function findBestMatch(entries, pathname) {
     if (b.entry.staticCount !== a.entry.staticCount) {
       return b.entry.staticCount - a.entry.staticCount;
     }
+    if (a.entry.catchAllCount !== b.entry.catchAllCount) {
+      return a.entry.catchAllCount - b.entry.catchAllCount;
+    }
     return b.entry.segments.length - a.entry.segments.length;
   });
   return matches[0] ?? null;
@@ -461,6 +501,9 @@ function createFileRouter(options) {
       if (b.staticCount !== a.staticCount) {
         return b.staticCount - a.staticCount;
       }
+      if (a.catchAllCount !== b.catchAllCount) {
+        return a.catchAllCount - b.catchAllCount;
+      }
       return b.segments.length - a.segments.length;
     });
   }
@@ -471,7 +514,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!import_node_fs.default.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h1", { children: statusCode }),
@@ -485,7 +528,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -534,7 +577,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -589,8 +635,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/dist/http.js

@@ -286,21 +286,38 @@ function toRouteEntry(pagesDir, filePath) {
   const relativeDir = path2.dirname(path2.relative(pagesDir, filePath)).replace(/\\/g, "/");
   const segments = relativeDir === "." ? [] : relativeDir.split("/").filter(Boolean);
   const staticCount = segments.filter((segment) => !segment.startsWith("[")).length;
+  const catchAllCount = segments.filter(
+    (segment) => segment.startsWith("[...") && segment.endsWith("]")
+  ).length;
   return {
     filePath,
     segments,
-    staticCount
+    staticCount,
+    catchAllCount
   };
 }
 function matchRoute(entry, pathname) {
   const targetSegments = splitSegments(pathname);
-  if (entry.segments.length !== targetSegments.length) {
-    return null;
-  }
   const params = {};
   for (let index = 0; index < entry.segments.length; index += 1) {
     const routeSegment = entry.segments[index];
+    const isCatchAll = routeSegment.startsWith("[...") && routeSegment.endsWith("]");
+    if (isCatchAll) {
+      const paramName = routeSegment.slice(4, -1);
+      if (!paramName || index !== entry.segments.length - 1) {
+        return null;
+      }
+      const restSegments = targetSegments.slice(index);
+      if (restSegments.length === 0) {
+        return null;
+      }
+      params[paramName] = restSegments.map((segment) => decodeURIComponent(segment));
+      return params;
+    }
     const targetSegment = targetSegments[index];
+    if (typeof targetSegment !== "string") {
+      return null;
+    }
     if (routeSegment.startsWith("[") && routeSegment.endsWith("]")) {
       const paramName = routeSegment.slice(1, -1);
       if (!paramName) {
@@ -313,6 +330,9 @@ function matchRoute(entry, pathname) {
       return null;
     }
   }
+  if (entry.segments.length !== targetSegments.length) {
+    return null;
+  }
   return params;
 }
 function mergeHead(...configs) {
@@ -364,8 +384,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete __require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = __require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = __require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete __require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return __require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -392,6 +429,9 @@ function findBestMatch(entries, pathname) {
     if (b.entry.staticCount !== a.entry.staticCount) {
       return b.entry.staticCount - a.entry.staticCount;
     }
+    if (a.entry.catchAllCount !== b.entry.catchAllCount) {
+      return a.entry.catchAllCount - b.entry.catchAllCount;
+    }
     return b.entry.segments.length - a.entry.segments.length;
   });
   return matches[0] ?? null;
@@ -436,6 +476,9 @@ function createFileRouter(options) {
       if (b.staticCount !== a.staticCount) {
         return b.staticCount - a.staticCount;
       }
+      if (a.catchAllCount !== b.catchAllCount) {
+        return a.catchAllCount - b.catchAllCount;
+      }
       return b.segments.length - a.segments.length;
     });
   }
@@ -446,7 +489,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!fs.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ jsxs("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ jsx("h1", { children: statusCode }),
@@ -460,7 +503,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -509,7 +552,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -564,8 +610,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/dist/index.cjs

@@ -344,21 +344,38 @@ function toRouteEntry(pagesDir, filePath) {
   const relativeDir = import_node_path2.default.dirname(import_node_path2.default.relative(pagesDir, filePath)).replace(/\\/g, "/");
   const segments = relativeDir === "." ? [] : relativeDir.split("/").filter(Boolean);
   const staticCount = segments.filter((segment) => !segment.startsWith("[")).length;
+  const catchAllCount = segments.filter(
+    (segment) => segment.startsWith("[...") && segment.endsWith("]")
+  ).length;
   return {
     filePath,
     segments,
-    staticCount
+    staticCount,
+    catchAllCount
   };
 }
 function matchRoute(entry, pathname) {
   const targetSegments = splitSegments(pathname);
-  if (entry.segments.length !== targetSegments.length) {
-    return null;
-  }
   const params = {};
   for (let index = 0; index < entry.segments.length; index += 1) {
     const routeSegment = entry.segments[index];
+    const isCatchAll = routeSegment.startsWith("[...") && routeSegment.endsWith("]");
+    if (isCatchAll) {
+      const paramName = routeSegment.slice(4, -1);
+      if (!paramName || index !== entry.segments.length - 1) {
+        return null;
+      }
+      const restSegments = targetSegments.slice(index);
+      if (restSegments.length === 0) {
+        return null;
+      }
+      params[paramName] = restSegments.map((segment) => decodeURIComponent(segment));
+      return params;
+    }
     const targetSegment = targetSegments[index];
+    if (typeof targetSegment !== "string") {
+      return null;
+    }
     if (routeSegment.startsWith("[") && routeSegment.endsWith("]")) {
       const paramName = routeSegment.slice(1, -1);
       if (!paramName) {
@@ -371,6 +388,9 @@ function matchRoute(entry, pathname) {
       return null;
     }
   }
+  if (entry.segments.length !== targetSegments.length) {
+    return null;
+  }
   return params;
 }
 function mergeHead(...configs) {
@@ -422,8 +442,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -450,6 +487,9 @@ function findBestMatch(entries, pathname) {
     if (b.entry.staticCount !== a.entry.staticCount) {
       return b.entry.staticCount - a.entry.staticCount;
     }
+    if (a.entry.catchAllCount !== b.entry.catchAllCount) {
+      return a.entry.catchAllCount - b.entry.catchAllCount;
+    }
     return b.entry.segments.length - a.entry.segments.length;
   });
   return matches[0] ?? null;
@@ -494,6 +534,9 @@ function createFileRouter(options) {
       if (b.staticCount !== a.staticCount) {
         return b.staticCount - a.staticCount;
       }
+      if (a.catchAllCount !== b.catchAllCount) {
+        return a.catchAllCount - b.catchAllCount;
+      }
       return b.segments.length - a.segments.length;
     });
   }
@@ -504,7 +547,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!import_node_fs.default.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h1", { children: statusCode }),
@@ -518,7 +561,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -567,7 +610,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -622,8 +668,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/dist/index.js

@@ -308,21 +308,38 @@ function toRouteEntry(pagesDir, filePath) {
   const relativeDir = path2.dirname(path2.relative(pagesDir, filePath)).replace(/\\/g, "/");
   const segments = relativeDir === "." ? [] : relativeDir.split("/").filter(Boolean);
   const staticCount = segments.filter((segment) => !segment.startsWith("[")).length;
+  const catchAllCount = segments.filter(
+    (segment) => segment.startsWith("[...") && segment.endsWith("]")
+  ).length;
   return {
     filePath,
     segments,
-    staticCount
+    staticCount,
+    catchAllCount
   };
 }
 function matchRoute(entry, pathname) {
   const targetSegments = splitSegments(pathname);
-  if (entry.segments.length !== targetSegments.length) {
-    return null;
-  }
   const params = {};
   for (let index = 0; index < entry.segments.length; index += 1) {
     const routeSegment = entry.segments[index];
+    const isCatchAll = routeSegment.startsWith("[...") && routeSegment.endsWith("]");
+    if (isCatchAll) {
+      const paramName = routeSegment.slice(4, -1);
+      if (!paramName || index !== entry.segments.length - 1) {
+        return null;
+      }
+      const restSegments = targetSegments.slice(index);
+      if (restSegments.length === 0) {
+        return null;
+      }
+      params[paramName] = restSegments.map((segment) => decodeURIComponent(segment));
+      return params;
+    }
     const targetSegment = targetSegments[index];
+    if (typeof targetSegment !== "string") {
+      return null;
+    }
     if (routeSegment.startsWith("[") && routeSegment.endsWith("]")) {
       const paramName = routeSegment.slice(1, -1);
       if (!paramName) {
@@ -335,6 +352,9 @@ function matchRoute(entry, pathname) {
       return null;
     }
   }
+  if (entry.segments.length !== targetSegments.length) {
+    return null;
+  }
   return params;
 }
 function mergeHead(...configs) {
@@ -386,8 +406,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete __require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = __require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = __require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete __require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return __require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -414,6 +451,9 @@ function findBestMatch(entries, pathname) {
     if (b.entry.staticCount !== a.entry.staticCount) {
       return b.entry.staticCount - a.entry.staticCount;
     }
+    if (a.entry.catchAllCount !== b.entry.catchAllCount) {
+      return a.entry.catchAllCount - b.entry.catchAllCount;
+    }
     return b.entry.segments.length - a.entry.segments.length;
   });
   return matches[0] ?? null;
@@ -458,6 +498,9 @@ function createFileRouter(options) {
       if (b.staticCount !== a.staticCount) {
         return b.staticCount - a.staticCount;
       }
+      if (a.catchAllCount !== b.catchAllCount) {
+        return a.catchAllCount - b.catchAllCount;
+      }
       return b.segments.length - a.segments.length;
     });
   }
@@ -468,7 +511,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!fs.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ jsxs("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ jsx("h1", { children: statusCode }),
@@ -482,7 +525,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -531,7 +574,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -586,8 +632,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/dist/router.cjs

@@ -202,21 +202,38 @@ function toRouteEntry(pagesDir, filePath) {
   const relativeDir = import_node_path.default.dirname(import_node_path.default.relative(pagesDir, filePath)).replace(/\\/g, "/");
   const segments = relativeDir === "." ? [] : relativeDir.split("/").filter(Boolean);
   const staticCount = segments.filter((segment) => !segment.startsWith("[")).length;
+  const catchAllCount = segments.filter(
+    (segment) => segment.startsWith("[...") && segment.endsWith("]")
+  ).length;
   return {
     filePath,
     segments,
-    staticCount
+    staticCount,
+    catchAllCount
   };
 }
 function matchRoute(entry, pathname) {
   const targetSegments = splitSegments(pathname);
-  if (entry.segments.length !== targetSegments.length) {
-    return null;
-  }
   const params = {};
   for (let index = 0; index < entry.segments.length; index += 1) {
     const routeSegment = entry.segments[index];
+    const isCatchAll = routeSegment.startsWith("[...") && routeSegment.endsWith("]");
+    if (isCatchAll) {
+      const paramName = routeSegment.slice(4, -1);
+      if (!paramName || index !== entry.segments.length - 1) {
+        return null;
+      }
+      const restSegments = targetSegments.slice(index);
+      if (restSegments.length === 0) {
+        return null;
+      }
+      params[paramName] = restSegments.map((segment) => decodeURIComponent(segment));
+      return params;
+    }
     const targetSegment = targetSegments[index];
+    if (typeof targetSegment !== "string") {
+      return null;
+    }
     if (routeSegment.startsWith("[") && routeSegment.endsWith("]")) {
       const paramName = routeSegment.slice(1, -1);
       if (!paramName) {
@@ -229,6 +246,9 @@ function matchRoute(entry, pathname) {
       return null;
     }
   }
+  if (entry.segments.length !== targetSegments.length) {
+    return null;
+  }
   return params;
 }
 function mergeHead(...configs) {
@@ -280,8 +300,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -308,6 +345,9 @@ function findBestMatch(entries, pathname) {
     if (b.entry.staticCount !== a.entry.staticCount) {
       return b.entry.staticCount - a.entry.staticCount;
     }
+    if (a.entry.catchAllCount !== b.entry.catchAllCount) {
+      return a.entry.catchAllCount - b.entry.catchAllCount;
+    }
     return b.entry.segments.length - a.entry.segments.length;
   });
   return matches[0] ?? null;
@@ -352,6 +392,9 @@ function createFileRouter(options) {
       if (b.staticCount !== a.staticCount) {
         return b.staticCount - a.staticCount;
       }
+      if (a.catchAllCount !== b.catchAllCount) {
+        return a.catchAllCount - b.catchAllCount;
+      }
       return b.segments.length - a.segments.length;
     });
   }
@@ -362,7 +405,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!import_node_fs.default.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h1", { children: statusCode }),
@@ -376,7 +419,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -425,7 +468,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -480,8 +526,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/dist/router.js

@@ -172,21 +172,38 @@ function toRouteEntry(pagesDir, filePath) {
   const relativeDir = path.dirname(path.relative(pagesDir, filePath)).replace(/\\/g, "/");
   const segments = relativeDir === "." ? [] : relativeDir.split("/").filter(Boolean);
   const staticCount = segments.filter((segment) => !segment.startsWith("[")).length;
+  const catchAllCount = segments.filter(
+    (segment) => segment.startsWith("[...") && segment.endsWith("]")
+  ).length;
   return {
     filePath,
     segments,
-    staticCount
+    staticCount,
+    catchAllCount
   };
 }
 function matchRoute(entry, pathname) {
   const targetSegments = splitSegments(pathname);
-  if (entry.segments.length !== targetSegments.length) {
-    return null;
-  }
   const params = {};
   for (let index = 0; index < entry.segments.length; index += 1) {
     const routeSegment = entry.segments[index];
+    const isCatchAll = routeSegment.startsWith("[...") && routeSegment.endsWith("]");
+    if (isCatchAll) {
+      const paramName = routeSegment.slice(4, -1);
+      if (!paramName || index !== entry.segments.length - 1) {
+        return null;
+      }
+      const restSegments = targetSegments.slice(index);
+      if (restSegments.length === 0) {
+        return null;
+      }
+      params[paramName] = restSegments.map((segment) => decodeURIComponent(segment));
+      return params;
+    }
     const targetSegment = targetSegments[index];
+    if (typeof targetSegment !== "string") {
+      return null;
+    }
     if (routeSegment.startsWith("[") && routeSegment.endsWith("]")) {
       const paramName = routeSegment.slice(1, -1);
       if (!paramName) {
@@ -199,6 +216,9 @@ function matchRoute(entry, pathname) {
       return null;
     }
   }
+  if (entry.segments.length !== targetSegments.length) {
+    return null;
+  }
   return params;
 }
 function mergeHead(...configs) {
@@ -250,8 +270,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete __require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = __require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = __require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete __require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return __require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -278,6 +315,9 @@ function findBestMatch(entries, pathname) {
     if (b.entry.staticCount !== a.entry.staticCount) {
       return b.entry.staticCount - a.entry.staticCount;
     }
+    if (a.entry.catchAllCount !== b.entry.catchAllCount) {
+      return a.entry.catchAllCount - b.entry.catchAllCount;
+    }
     return b.entry.segments.length - a.entry.segments.length;
   });
   return matches[0] ?? null;
@@ -322,6 +362,9 @@ function createFileRouter(options) {
       if (b.staticCount !== a.staticCount) {
         return b.staticCount - a.staticCount;
       }
+      if (a.catchAllCount !== b.catchAllCount) {
+        return a.catchAllCount - b.catchAllCount;
+      }
       return b.segments.length - a.segments.length;
     });
   }
@@ -332,7 +375,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!fs.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ jsxs("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ jsx("h1", { children: statusCode }),
@@ -346,7 +389,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -395,7 +438,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -450,8 +496,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import type { ReactNode } from "react";
 
-export type RouteParams = Record<string, string>;
+export type RouteParams = Record<string, string | string[]>;
 export type RouteSearchParams = Record<string, string | string[]>;
 
 export type AbortRouteOptions = {

package/dist/webframez-core.cjs

@@ -314,21 +314,38 @@ function toRouteEntry(pagesDir, filePath) {
   const relativeDir = import_node_path2.default.dirname(import_node_path2.default.relative(pagesDir, filePath)).replace(/\\/g, "/");
   const segments = relativeDir === "." ? [] : relativeDir.split("/").filter(Boolean);
   const staticCount = segments.filter((segment) => !segment.startsWith("[")).length;
+  const catchAllCount = segments.filter(
+    (segment) => segment.startsWith("[...") && segment.endsWith("]")
+  ).length;
   return {
     filePath,
     segments,
-    staticCount
+    staticCount,
+    catchAllCount
   };
 }
 function matchRoute(entry, pathname) {
   const targetSegments = splitSegments(pathname);
-  if (entry.segments.length !== targetSegments.length) {
-    return null;
-  }
   const params = {};
   for (let index = 0; index < entry.segments.length; index += 1) {
     const routeSegment = entry.segments[index];
+    const isCatchAll = routeSegment.startsWith("[...") && routeSegment.endsWith("]");
+    if (isCatchAll) {
+      const paramName = routeSegment.slice(4, -1);
+      if (!paramName || index !== entry.segments.length - 1) {
+        return null;
+      }
+      const restSegments = targetSegments.slice(index);
+      if (restSegments.length === 0) {
+        return null;
+      }
+      params[paramName] = restSegments.map((segment) => decodeURIComponent(segment));
+      return params;
+    }
     const targetSegment = targetSegments[index];
+    if (typeof targetSegment !== "string") {
+      return null;
+    }
     if (routeSegment.startsWith("[") && routeSegment.endsWith("]")) {
       const paramName = routeSegment.slice(1, -1);
       if (!paramName) {
@@ -341,6 +358,9 @@ function matchRoute(entry, pathname) {
       return null;
     }
   }
+  if (entry.segments.length !== targetSegments.length) {
+    return null;
+  }
   return params;
 }
 function mergeHead(...configs) {
@@ -392,8 +412,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -420,6 +457,9 @@ function findBestMatch(entries, pathname) {
     if (b.entry.staticCount !== a.entry.staticCount) {
       return b.entry.staticCount - a.entry.staticCount;
     }
+    if (a.entry.catchAllCount !== b.entry.catchAllCount) {
+      return a.entry.catchAllCount - b.entry.catchAllCount;
+    }
     return b.entry.segments.length - a.entry.segments.length;
   });
   return matches[0] ?? null;
@@ -464,6 +504,9 @@ function createFileRouter(options) {
       if (b.staticCount !== a.staticCount) {
         return b.staticCount - a.staticCount;
       }
+      if (a.catchAllCount !== b.catchAllCount) {
+        return a.catchAllCount - b.catchAllCount;
+      }
       return b.segments.length - a.segments.length;
     });
   }
@@ -474,7 +517,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!import_node_fs.default.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h1", { children: statusCode }),
@@ -488,7 +531,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -537,7 +580,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -592,8 +638,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = import_node_fs.default.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/dist/webframez-core.js

@@ -286,21 +286,38 @@ function toRouteEntry(pagesDir, filePath) {
   const relativeDir = path2.dirname(path2.relative(pagesDir, filePath)).replace(/\\/g, "/");
   const segments = relativeDir === "." ? [] : relativeDir.split("/").filter(Boolean);
   const staticCount = segments.filter((segment) => !segment.startsWith("[")).length;
+  const catchAllCount = segments.filter(
+    (segment) => segment.startsWith("[...") && segment.endsWith("]")
+  ).length;
   return {
     filePath,
     segments,
-    staticCount
+    staticCount,
+    catchAllCount
   };
 }
 function matchRoute(entry, pathname) {
   const targetSegments = splitSegments(pathname);
-  if (entry.segments.length !== targetSegments.length) {
-    return null;
-  }
   const params = {};
   for (let index = 0; index < entry.segments.length; index += 1) {
     const routeSegment = entry.segments[index];
+    const isCatchAll = routeSegment.startsWith("[...") && routeSegment.endsWith("]");
+    if (isCatchAll) {
+      const paramName = routeSegment.slice(4, -1);
+      if (!paramName || index !== entry.segments.length - 1) {
+        return null;
+      }
+      const restSegments = targetSegments.slice(index);
+      if (restSegments.length === 0) {
+        return null;
+      }
+      params[paramName] = restSegments.map((segment) => decodeURIComponent(segment));
+      return params;
+    }
     const targetSegment = targetSegments[index];
+    if (typeof targetSegment !== "string") {
+      return null;
+    }
     if (routeSegment.startsWith("[") && routeSegment.endsWith("]")) {
       const paramName = routeSegment.slice(1, -1);
       if (!paramName) {
@@ -313,6 +330,9 @@ function matchRoute(entry, pathname) {
       return null;
     }
   }
+  if (entry.segments.length !== targetSegments.length) {
+    return null;
+  }
   return params;
 }
 function mergeHead(...configs) {
@@ -364,8 +384,25 @@ function renderHeadToString(head) {
   }
   return tags.join("\n");
 }
-function resolveModule(modulePath) {
-  delete __require.cache[modulePath];
+function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
+  const resolvedPath = __require.resolve(modulePath);
+  if (visited.has(resolvedPath)) {
+    return;
+  }
+  visited.add(resolvedPath);
+  const cachedModule = __require.cache[resolvedPath];
+  if (!cachedModule) {
+    return;
+  }
+  for (const child of cachedModule.children) {
+    if (child.id.startsWith(rootDir)) {
+      clearModuleCache(child.id, rootDir, visited);
+    }
+  }
+  delete __require.cache[resolvedPath];
+}
+function resolveModule(modulePath, rootDir) {
+  clearModuleCache(modulePath, rootDir);
   return __require(modulePath);
 }
 async function resolveHead(candidate, context) {
@@ -392,6 +429,9 @@ function findBestMatch(entries, pathname) {
     if (b.entry.staticCount !== a.entry.staticCount) {
       return b.entry.staticCount - a.entry.staticCount;
     }
+    if (a.entry.catchAllCount !== b.entry.catchAllCount) {
+      return a.entry.catchAllCount - b.entry.catchAllCount;
+    }
     return b.entry.segments.length - a.entry.segments.length;
   });
   return matches[0] ?? null;
@@ -436,6 +476,9 @@ function createFileRouter(options) {
       if (b.staticCount !== a.staticCount) {
         return b.staticCount - a.staticCount;
       }
+      if (a.catchAllCount !== b.catchAllCount) {
+        return a.catchAllCount - b.catchAllCount;
+      }
       return b.segments.length - a.segments.length;
     });
   }
@@ -446,7 +489,7 @@ function createFileRouter(options) {
       message,
       payload
     };
-    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+    const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
     if (!fs.existsSync(errorPath)) {
       const fallback = /* @__PURE__ */ jsxs("main", { style: { fontFamily: "system-ui, sans-serif", padding: 24 }, children: [
         /* @__PURE__ */ jsx("h1", { children: statusCode }),
@@ -460,7 +503,7 @@ function createFileRouter(options) {
         }
       };
     }
-    const errorModule = resolveModule(errorPath);
+    const errorModule = resolveModule(errorPath, pagesDir);
     const errorNode = await errorModule.default(errorProps);
     const layoutHead = layoutModule ? await resolveHead(layoutModule, context) : void 0;
     const errorHead = await resolveHead(errorModule, errorProps);
@@ -509,7 +552,10 @@ function createFileRouter(options) {
         message: `Invalid middleware '${middlewareNames[0]}'`
       });
     }
-    const middlewareModule = resolveModule(middlewaresPath);
+    const middlewareModule = resolveModule(
+      middlewaresPath,
+      pagesDir
+    );
     const registry = middlewareModule.middlewares;
     if (!registry) {
       if (!requiresNamedMiddleware) {
@@ -564,8 +610,8 @@ function createFileRouter(options) {
         params: match.params
       };
       activeContext = context;
-      const pageModule = resolveModule(match.entry.filePath);
-      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath) : null;
+      const pageModule = resolveModule(match.entry.filePath, pagesDir);
+      const layoutModule = fs.existsSync(layoutPath) ? resolveModule(layoutPath, pagesDir) : null;
       const middlewareContext = await resolveMiddlewares(pageModule.middlewares, context);
       activeContext = middlewareContext;
       const pageData = await resolvePageData(pageModule, middlewareContext);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-react",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "TypeScript React RSC addition for @webtypen/webframez-core",
   "homepage": "https://webtypen.de/",
   "author": {