reroute-js 0.45.11 → 0.45.12-beta.1

package/core/src/og/discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/og/discovery.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAsB,kBAAkB,CACvC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA6CxB;AAED;;GAEG;AAEH,wBAAsB,oBAAoB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,OAAO,gBAcpB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAmCxB"}
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/og/discovery.ts"],"names":[],"mappings":"AAmFA;;;GAGG;AACH,wBAAsB,kBAAkB,CACvC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;GAEG;AAEH,wBAAsB,oBAAoB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,OAAO,gBAcpB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAuBxB"}

package/core/src/ssr/lib/compute/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/ssr/lib/compute/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAoCnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,CAAC;AA0B5B,iBAAe,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,OAAO,GAClB,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAgBrB;AAwBD;;;GAGG;AACH,wBAAsB,cAAc,CACnC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,OAAO,EACpB,OAAO,GAAE,cAAmB,EAC5B,YAAY,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,aAAa,CAAC,CAyFxB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAWpE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/ssr/lib/compute/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAKnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAkB5B,iBAAe,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,OAAO,GAClB,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAgBrB;AAwBD;;;GAGG;AACH,wBAAsB,cAAc,CACnC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,OAAO,EACpB,OAAO,GAAE,cAAmB,EAC5B,YAAY,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,aAAa,CAAC,CAyFxB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAWpE"}

package/core/src/ssr/lib/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/ssr/lib/data.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAY,MAAM,SAAS,CAAC;AAgMvD,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,aAAa,GACnB,OAAO,CAAC,OAAO,CAAC,CA0ClB"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/ssr/lib/data.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAY,MAAM,SAAS,CAAC;AAyJvD,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,aAAa,GACnB,OAAO,CAAC,OAAO,CAAC,CA0ClB"}

package/core/src/ssr/lib/index.d.ts

@@ -21,6 +21,7 @@ export * from './mime';
 export * from './modules';
 export * from './path';
 export * from './preload';
+export * from './route-match';
 export * from './scripts';
 export * from './seed';
 export * from './setup';

package/core/src/ssr/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/ssr/lib/index.ts"],"names":[],"mappings":"AAGA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAE1B,cAAc,eAAe,CAAC;AAE9B,cAAc,eAAe,CAAC;AAE9B,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAE/C,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAE1B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AAEvB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/ssr/lib/index.ts"],"names":[],"mappings":"AAGA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAE1B,cAAc,eAAe,CAAC;AAE9B,cAAc,eAAe,CAAC;AAE9B,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAE/C,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAE9B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AAEvB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC"}

package/core/src/ssr/lib/route-match.d.ts

@@ -0,0 +1,20 @@
+/**
+ * reroute-js v0.45.11
+ *
+ * @license MIT
+ * @copyright 2026 stewones <hi@stewan.io>
+ * @see https://github.com/stewones/reroute
+ *
+ * Built with Bun <3
+ */
+type MatchableRoute = {
+    pattern: string;
+};
+export declare function compareRouteSpecificity(a: MatchableRoute, b: MatchableRoute): number;
+export declare function matchRoutePattern(pattern: string, pathname: string): Record<string, string> | null;
+export declare function matchRoutes<T extends MatchableRoute>(routes: readonly T[], pathname: string): {
+    route: T;
+    params: Record<string, string>;
+} | null;
+export {};
+//# sourceMappingURL=route-match.d.ts.map

package/core/src/ssr/lib/route-match.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-match.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/ssr/lib/route-match.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AA8BF,wBAAgB,uBAAuB,CACtC,CAAC,EAAE,cAAc,EACjB,CAAC,EAAE,cAAc,GACf,MAAM,CAwBR;AAsED,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CA0B/B;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,cAAc,EACnD,MAAM,EAAE,SAAS,CAAC,EAAE,EACpB,QAAQ,EAAE,MAAM,GACd;IAAE,KAAK,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,IAAI,CASrD"}

package/elysia/index.js

@@ -9,13 +9,17 @@
  */
 import { createRequire } from "node:module";
 var __defProp = Object.defineProperty;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -790,6 +794,103 @@ function compressStreamIfAccepted(stream, contentType, _acceptEncoding) {
 }
 var init_compression = () => {};
 
+// packages/core/src/ssr/lib/route-match.ts
+function getPatternParts(pattern) {
+  return pattern.split("/").filter(Boolean);
+}
+function isDynamicPatternPart(patternPart) {
+  return patternPart.startsWith(":");
+}
+function isCatchAllPatternPart(patternPart) {
+  return patternPart.startsWith(":...");
+}
+function isCatchAllParamName(paramName) {
+  return paramName.startsWith("...");
+}
+function getPatternPartSpecificity(patternPart) {
+  if (isCatchAllPatternPart(patternPart)) {
+    return 2;
+  }
+  if (isDynamicPatternPart(patternPart)) {
+    return 1;
+  }
+  return 0;
+}
+function compareRouteSpecificity(a, b) {
+  const aPatternParts = getPatternParts(a.pattern);
+  const bPatternParts = getPatternParts(b.pattern);
+  const aDepth = aPatternParts.length;
+  const bDepth = bPatternParts.length;
+  if (aDepth !== bDepth) {
+    return bDepth - aDepth;
+  }
+  for (let i = 0;i < aPatternParts.length; i++) {
+    const aSpecificity = getPatternPartSpecificity(aPatternParts[i]);
+    const bSpecificity = getPatternPartSpecificity(bPatternParts[i]);
+    if (aSpecificity !== bSpecificity) {
+      return aSpecificity - bSpecificity;
+    }
+    if (aSpecificity === 0 && aPatternParts[i] !== bPatternParts[i]) {
+      return aPatternParts[i].localeCompare(bPatternParts[i]);
+    }
+  }
+  return a.pattern.localeCompare(b.pattern);
+}
+function matchCatchAllParam(paramName, patternIndex, patternLength, pathnameParts, pathnameIndex, params) {
+  if (patternIndex !== patternLength - 1 || pathnameIndex >= pathnameParts.length) {
+    return false;
+  }
+  params[paramName.slice(3)] = pathnameParts.slice(pathnameIndex).join("/");
+  return true;
+}
+function matchDynamicParam(paramName, pathnameParts, pathnameIndex, params) {
+  const pathnamePart = pathnameParts[pathnameIndex];
+  if (pathnamePart === undefined) {
+    return null;
+  }
+  params[paramName] = pathnamePart;
+  return pathnameIndex + 1;
+}
+function matchPatternPart(patternPart, patternIndex, patternLength, pathnameParts, pathnameIndex, params) {
+  if (isDynamicPatternPart(patternPart)) {
+    const paramName = patternPart.slice(1);
+    if (isCatchAllParamName(paramName)) {
+      return matchCatchAllParam(paramName, patternIndex, patternLength, pathnameParts, pathnameIndex, params) ? "catch-all" : null;
+    }
+    return matchDynamicParam(paramName, pathnameParts, pathnameIndex, params);
+  }
+  if (patternPart !== pathnameParts[pathnameIndex]) {
+    return null;
+  }
+  return pathnameIndex + 1;
+}
+function matchRoutePattern(pattern, pathname) {
+  const patternParts = getPatternParts(pattern);
+  const pathnameParts = pathname.split("/").filter(Boolean);
+  const params = {};
+  let pathnameIndex = 0;
+  for (let i = 0;i < patternParts.length; i++) {
+    const nextPathnameIndex = matchPatternPart(patternParts[i], i, patternParts.length, pathnameParts, pathnameIndex, params);
+    if (nextPathnameIndex === null) {
+      return null;
+    }
+    if (nextPathnameIndex === "catch-all") {
+      return params;
+    }
+    pathnameIndex = nextPathnameIndex;
+  }
+  return pathnameIndex === pathnameParts.length ? params : null;
+}
+function matchRoutes(routes, pathname) {
+  for (const route of routes) {
+    const params = matchRoutePattern(route.pattern, pathname);
+    if (params) {
+      return { route, params };
+    }
+  }
+  return null;
+}
+
 // packages/core/src/ssr/lib/compute/content.ts
 function checkStatusCache(statusCacheKey, maxAgeMs) {
   if (maxAgeMs <= 0)
@@ -1256,40 +1357,13 @@ var init_routes = __esm(() => {
 });
 
 // packages/core/src/ssr/lib/compute/index.ts
-function matchPatternUtil(pattern, pathname) {
-  const patternParts = pattern.split("/").filter(Boolean);
-  const pathnameParts = pathname.split("/").filter(Boolean);
-  if (patternParts.length !== pathnameParts.length) {
-    return null;
-  }
-  const params = {};
-  for (let i = 0;i < patternParts.length; i++) {
-    const patternPart = patternParts[i];
-    const pathnamePart = pathnameParts[i];
-    if (patternPart.startsWith(":")) {
-      params[patternPart.slice(1)] = pathnamePart;
-    } else if (patternPart !== pathnamePart) {
-      return null;
-    }
-  }
-  return params;
-}
 function createBundledRoutesModule(bundledRoutes, bundledLayouts) {
   const bundledNotFoundRoutes = globalThis.__REROUTE_NOT_FOUND_ROUTES__;
   return {
     routes: bundledRoutes,
     layouts: bundledLayouts,
     notFoundRoutes: bundledNotFoundRoutes,
-    matchRoute: (pathname) => {
-      for (const route of bundledRoutes) {
-        const pattern = String(route?.pattern || "");
-        const match = matchPatternUtil(pattern, pathname);
-        if (match) {
-          return { route, params: match };
-        }
-      }
-      return null;
-    }
+    matchRoute: (pathname) => matchRoutes(bundledRoutes, pathname)
   };
 }
 async function loadRoutesModule(cwd, isWatchMode) {
@@ -1522,24 +1596,6 @@ var init_seed = __esm(() => {
 });
 
 // packages/core/src/ssr/lib/data.ts
-function matchPattern(pattern, pathname) {
-  const patternParts = pattern.split("/").filter(Boolean);
-  const pathnameParts = pathname.split("/").filter(Boolean);
-  if (patternParts.length !== pathnameParts.length) {
-    return null;
-  }
-  const params = {};
-  for (let i = 0;i < patternParts.length; i++) {
-    const patternPart = patternParts[i];
-    const pathnamePart = pathnameParts[i];
-    if (patternPart.startsWith(":")) {
-      params[patternPart.slice(1)] = pathnamePart;
-    } else if (patternPart !== pathnamePart) {
-      return null;
-    }
-  }
-  return params;
-}
 function loadContentData(pathname, searchParams) {
   try {
     const parts = pathname.split("/").filter(Boolean);
@@ -1574,16 +1630,7 @@ async function loadRouteDataInternal(pathname, clientDir, cwd, isWatchMode, sear
       routes = m?.routes;
       matchRouteFn = m?.matchRoute;
     } else {
-      matchRouteFn = (pathname2) => {
-        for (const route of routes || []) {
-          const pattern = String(route?.pattern || "");
-          const match2 = matchPattern(pattern, pathname2);
-          if (match2) {
-            return { route, params: match2 };
-          }
-        }
-        return null;
-      };
+      matchRouteFn = (pathname2) => matchRoutes(routes || [], pathname2);
     }
     const pathnameOnly = pathname.split("?")[0];
     const match = typeof matchRouteFn === "function" ? matchRouteFn(pathnameOnly) : null;
@@ -1924,18 +1971,53 @@ function replaceAppRoot(html, appHtml, appId) {
 var init_html = () => {};
 
 // packages/core/src/og/discovery.ts
+import { readdir as readdir3 } from "node:fs/promises";
 import { pathToFileURL as pathToFileURL4 } from "node:url";
+function isCatchAllRouteDirectory(name) {
+  return CATCH_ALL_ROUTE_DIRECTORY.test(name);
+}
+async function listDynamicRouteDirectories(baseDir) {
+  try {
+    const entries = await readdir3(baseDir, { withFileTypes: true });
+    return entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name).filter((name) => DYNAMIC_ROUTE_DIRECTORY.test(name)).sort((a, b) => {
+      const aIsCatchAll = isCatchAllRouteDirectory(a);
+      const bIsCatchAll = isCatchAllRouteDirectory(b);
+      if (aIsCatchAll !== bIsCatchAll) {
+        return Number(aIsCatchAll) - Number(bIsCatchAll);
+      }
+      return a.localeCompare(b);
+    });
+  } catch {
+    return [];
+  }
+}
+async function collectOGCandidatePaths(currentDir, parts, depth, pathsToTry, allowPartialFallback) {
+  if (depth === parts.length) {
+    pathsToTry.push(join(currentDir, "[og].tsx"));
+    return;
+  }
+  const literalDir = join(currentDir, parts[depth]);
+  try {
+    await readdir3(literalDir);
+    await collectOGCandidatePaths(literalDir, parts, depth + 1, pathsToTry, true);
+  } catch {}
+  const dynamicDirs = await listDynamicRouteDirectories(currentDir);
+  for (const dynamicDir of dynamicDirs) {
+    if (isCatchAllRouteDirectory(dynamicDir)) {
+      pathsToTry.push(join(currentDir, dynamicDir, "[og].tsx"));
+      continue;
+    }
+    await collectOGCandidatePaths(join(currentDir, dynamicDir), parts, depth + 1, pathsToTry, false);
+  }
+  if (allowPartialFallback) {
+    pathsToTry.push(join(currentDir, "[og].tsx"));
+  }
+}
 async function findOGImageForPath(pathname, clientDir) {
   const parts = pathname.split("/").filter(Boolean).filter((p) => !p.startsWith("__reroute"));
   const routesDir = join(clientDir, "routes");
   const pathsToTry = [];
-  if (parts.length > 0) {
-    for (let i = parts.length;i > 0; i--) {
-      const dirPath = join(routesDir, ...parts.slice(0, i), "[og].tsx");
-      pathsToTry.push(dirPath);
-    }
-  }
-  pathsToTry.push(join(routesDir, "[og].tsx"));
+  await collectOGCandidatePaths(routesDir, parts, 0, pathsToTry, true);
   const uniquePaths = [...new Set(pathsToTry)];
   for (const path of uniquePaths) {
     try {
@@ -1959,28 +2041,28 @@ async function loadOGImageComponent(ogPath, isWatchMode) {
 function extractParamsFromPath(pathname, ogPath, clientDir) {
   const params = {};
   const ogDir = ogPath.replace(/\/\[og\]\.tsx$/, "");
-  const pagesDir = join(clientDir, "pages");
-  const relativePath = ogDir.replace(pagesDir, "").split("/").filter(Boolean);
+  const routesDir = join(clientDir, "routes");
+  const relativePath = ogDir.replace(routesDir, "").split("/").filter(Boolean);
   const pathnameParts = pathname.split("/").filter(Boolean);
   for (let i = 0;i < relativePath.length && i < pathnameParts.length; i++) {
     const part = relativePath[i];
-    const match = part.match(/^\[([^\]]+)\]$/);
-    if (match) {
-      const paramName = match[1];
-      params[paramName] = pathnameParts[i];
+    const catchAllMatch = part.match(/^\[\.\.\.([^\]]+)\]$/);
+    if (catchAllMatch) {
+      params[catchAllMatch[1]] = pathnameParts.slice(i).join("/");
+      break;
     }
-  }
-  if (pathnameParts.length > relativePath.length && relativePath.length > 0) {
-    const lastRelativePart = relativePath[relativePath.length - 1];
-    const match = lastRelativePart.match(/^\[([^\]]+)\]$/);
-    if (match) {
-      const paramName = match[1];
-      params[paramName] = pathnameParts[relativePath.length - 1];
+    const dynamicMatch = part.match(/^\[([^\]]+)\]$/);
+    if (dynamicMatch) {
+      params[dynamicMatch[1]] = pathnameParts[i];
     }
   }
   return params;
 }
-var init_discovery2 = () => {};
+var CATCH_ALL_ROUTE_DIRECTORY, DYNAMIC_ROUTE_DIRECTORY;
+var init_discovery2 = __esm(() => {
+  CATCH_ALL_ROUTE_DIRECTORY = /^\[\.\.\.([^\]]+)\]$/;
+  DYNAMIC_ROUTE_DIRECTORY = /^\[(?:\.\.\.)?[^\]]+\]$/;
+});
 
 // packages/core/src/og/meta.ts
 async function generateOGImageMetaTags(pathname, clientDir, ogConfig) {
@@ -2427,7 +2509,7 @@ var init_metadata2 = __esm(() => {
 });
 
 // packages/core/src/ssr/lib/preload.ts
-import { readdir as readdir3, stat as stat4 } from "node:fs/promises";
+import { readdir as readdir4, stat as stat4 } from "node:fs/promises";
 async function preloadContentModule(pathname, clientDir, cwd, isWatchMode) {
   let extraHead = "";
   let hydrationScript = "";
@@ -2503,7 +2585,7 @@ async function findContentModulePath(collection, name, clientDir, cwd, isWatchMo
   } catch {}
   try {
     const chunkDir = join(cwd, ".reroute", "chunks", collection);
-    const files = await readdir3(chunkDir);
+    const files = await readdir4(chunkDir);
     const candidates = files.filter((n) => n.startsWith(`${name}.`) && n.endsWith(".js"));
     if (candidates.length) {
       const latest = await findLatestCandidate(chunkDir, candidates);
@@ -5600,6 +5682,8 @@ __export(exports_core, {
   preloadContentModule: () => preloadContentModule,
   performSSRSetup: () => performSSRSetup,
   mergeLayoutData: () => mergeLayoutData,
+  matchRoutes: () => matchRoutes,
+  matchRoutePattern: () => matchRoutePattern,
   loadRoutesModule: () => loadRoutesModule,
   loadOGImageComponent: () => loadOGImageComponent,
   loadIndexHtml: () => loadIndexHtml,
@@ -5669,6 +5753,7 @@ __export(exports_core, {
   computeLayoutData: () => computeLayoutData,
   computeContentData: () => computeContentData,
   compressStreamIfAccepted: () => compressStreamIfAccepted,
+  compareRouteSpecificity: () => compareRouteSpecificity,
   cleanupPathScopedSSRData: () => cleanupPathScopedSSRData,
   buildHeadFromMeta: () => buildHeadFromMeta,
   blockSearchCrawlers: () => blockSearchCrawlers,
@@ -7213,44 +7298,60 @@ async function loadContentMeta(clientDir, collection, slug, isWatchMode, meta) {
       return;
   }
 }
-async function loadOgImageFromRoute(_cwd, clientDir, pathname, isWatchMode) {
+async function loadMatchedRouteModule(clientDir, routePath, isWatchMode) {
+  const { existsSync: existsSync3 } = await import("node:fs");
+  const { pathToFileURL: pathToFileURL8 } = await import("node:url");
+  const normalizedRoutePath = routePath === "" ? "index" : routePath;
+  const possiblePaths = [
+    `${clientDir}/routes/${normalizedRoutePath}.tsx`,
+    `${clientDir}/routes/${normalizedRoutePath}/index.tsx`,
+    `${clientDir}/routes/${normalizedRoutePath}.ts`,
+    `${clientDir}/routes/${normalizedRoutePath}/index.ts`,
+    `${clientDir}/routes/${normalizedRoutePath}.mdx`,
+    `${clientDir}/routes/${normalizedRoutePath}/index.mdx`,
+    `${clientDir}/routes/${normalizedRoutePath}.md`,
+    `${clientDir}/routes/${normalizedRoutePath}/index.md`
+  ];
+  for (const possiblePath of possiblePaths) {
+    if (existsSync3(possiblePath)) {
+      return await import(pathToFileURL8(possiblePath).href + (isWatchMode ? `?t=${Date.now()}` : ""));
+    }
+  }
+  return null;
+}
+async function loadOgImageFromRoute(cwd, clientDir, pathname, isWatchMode) {
   try {
+    const pathnameOnly = pathname.split("?")[0];
     const routesGlobal = globalThis.__REROUTE_ROUTES__;
     if (routesGlobal && Array.isArray(routesGlobal)) {
-      const matchedRoute = routesGlobal.find((r) => {
-        if (r.isDynamic) {
-          const pattern = r.pattern.replace(/:[^/]+/g, "[^/]+");
-          const regex = new RegExp(`^${pattern}$`);
-          return regex.test(pathname);
-        }
-        return r.pattern === pathname;
-      });
-      if (matchedRoute) {
+      const matchedRoute2 = matchRoutes(routesGlobal, pathnameOnly)?.route;
+      if (matchedRoute2) {
         return {
-          meta: matchedRoute.meta,
-          ogImage: matchedRoute.ssr?.ogImage
+          meta: matchedRoute2.meta,
+          ogImage: matchedRoute2.ssr?.ogImage
         };
       }
     }
     const { pathToFileURL: pathToFileURL8 } = await import("node:url");
-    const { existsSync: existsSync3 } = await import("node:fs");
-    const pathnameOnly = pathname.split("?")[0];
-    const cleanPath = pathnameOnly === "/" ? "index" : pathnameOnly.replace(/^\//, "").replace(/\/$/, "");
-    const possiblePaths = [
-      `${clientDir}/routes/${cleanPath}.tsx`,
-      `${clientDir}/routes/${cleanPath}/index.tsx`,
-      `${clientDir}/routes/${cleanPath}.ts`,
-      `${clientDir}/routes/${cleanPath}/index.ts`
-    ];
-    for (const routePath of possiblePaths) {
-      if (existsSync3(routePath)) {
-        const routeMod = await import(pathToFileURL8(routePath).href + (isWatchMode ? `?t=${Date.now()}` : ""));
+    const routesPath = `${cwd}/.reroute/routes.ts`;
+    const routesMod = await import(pathToFileURL8(routesPath).href + (isWatchMode ? `?t=${Date.now()}` : ""));
+    const match = typeof routesMod.matchRoute === "function" ? routesMod.matchRoute(pathnameOnly) : Array.isArray(routesMod.routes) ? matchRoutes(routesMod.routes, pathnameOnly) : null;
+    const matchedRoute = match?.route;
+    if (matchedRoute && typeof matchedRoute.path === "string") {
+      const routeMod = await loadMatchedRouteModule(clientDir, String(matchedRoute.path), isWatchMode);
+      if (routeMod) {
         return {
           meta: routeMod.meta,
           ogImage: routeMod.ssr?.ogImage
         };
       }
     }
+    if (matchedRoute) {
+      return {
+        meta: matchedRoute.meta,
+        ogImage: matchedRoute.ssr?.ogImage
+      };
+    }
   } catch (error) {
     console.warn("[reroute/og] Error loading route metadata:", error);
   }
@@ -9012,4 +9113,4 @@ export {
   reroute
 };
 
-//# debugId=46D34975F51945E064756E2164756E21
+//# debugId=C4FE93DB6E1B24E664756E2164756E21