@webtypen/webframez-react 0.0.22 → 0.0.23

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) {
@@ -417,6 +437,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 +484,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;
     });
   }

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) {
@@ -392,6 +412,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 +459,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;
     });
   }

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) {
@@ -450,6 +470,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 +517,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;
     });
   }

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) {
@@ -414,6 +434,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 +481,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;
     });
   }

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) {
@@ -308,6 +328,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 +375,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;
     });
   }

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) {
@@ -278,6 +298,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 +345,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;
     });
   }

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) {
@@ -420,6 +440,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 +487,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;
     });
   }

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) {
@@ -392,6 +412,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 +459,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;
     });
   }

package/package.json

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