@rebask/core 0.2.1 → 0.3.0

package/dist/lib/proxy/types.d.ts

@@ -10,7 +10,7 @@ import type { RouteParams } from "../route-matcher.js";
  */
 export type ProxyHandler = (request: Request, params: RouteParams) => Response | void | Promise<Response | void>;
 /**
- * An object mapping wint route patterns to proxy handler functions.
+ * An object mapping rou3 route patterns to proxy handler functions.
  *
  * @example
  * ```ts
@@ -43,6 +43,8 @@ export interface ProxyBundle {
     proxyRouter: ProxyRouter | null;
     /** The route patterns, or `null` if there are no proxy routes. */
     proxyPatterns: string[] | null;
+    /** Match-only regex sources for the route patterns, or `null` if there are no proxy routes. */
+    proxyRegexps: string[] | null;
 }
 /** Standalone proxy bundle path, relative to the project root. */
 export declare const REBASK_PROXY_BUNDLE_PATH = "dist/proxy/index.js";

package/dist/lib/proxy/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/proxy/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEtD;;;;;;;;GAQG;AACH,MAAM,MAAM,YAAY,GAAG,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,WAAW,KACf,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;AAE/C;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,WAAW,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAA;CAAE,CAAA;AAE7D,+BAA+B;AAC/B,MAAM,WAAW,WAAW;IAC3B;;;OAGG;IACH,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,UAAU,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAAA;CACnF;AAED,8CAA8C;AAC9C,MAAM,WAAW,WAAW;IAC3B,mEAAmE;IACnE,WAAW,EAAE,WAAW,GAAG,IAAI,CAAA;IAC/B,kEAAkE;IAClE,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CAC9B;AAED,kEAAkE;AAClE,eAAO,MAAM,wBAAwB,wBAAwB,CAAA;AAE7D;;;GAGG;AACH,eAAO,MAAM,iBAAiB,wBAAwB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/proxy/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEtD;;;;;;;;GAQG;AACH,MAAM,MAAM,YAAY,GAAG,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,WAAW,KACf,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;AAE/C;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,WAAW,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAAA;CAAE,CAAA;AAE7D,+BAA+B;AAC/B,MAAM,WAAW,WAAW;IAC3B;;;OAGG;IACH,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,UAAU,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAAA;CACnF;AAED,8CAA8C;AAC9C,MAAM,WAAW,WAAW;IAC3B,mEAAmE;IACnE,WAAW,EAAE,WAAW,GAAG,IAAI,CAAA;IAC/B,kEAAkE;IAClE,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IAC9B,+FAA+F;IAC/F,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CAC7B;AAED,kEAAkE;AAClE,eAAO,MAAM,wBAAwB,wBAAwB,CAAA;AAE7D;;;GAGG;AACH,eAAO,MAAM,iBAAiB,wBAAwB,CAAA"}

package/dist/lib/route-prediction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-prediction.d.ts","sourceRoot":"","sources":["../../src/lib/route-prediction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAElD,4FAA4F;AAC5F,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,CAAC,CAAA;AAEhC,MAAM,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,MAAM;IACf;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IAClF,kFAAkF;IAClF,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;IACpE,iGAAiG;IACjG,UAAU,CAAC,EAAE,OAAO;CACpB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,EAAE,SAAS,CAAA;IACf,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAA;CACX,CAAA;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,iBAAiB,GAAG,GAAG,CAEhE;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,WAAW,EACnB,OAAO,UAAQ,GACb,MAAM,CAgCR"}
+{"version":3,"file":"route-prediction.d.ts","sourceRoot":"","sources":["../../src/lib/route-prediction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAElD,4FAA4F;AAC5F,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,CAAC,CAAA;AAEhC,MAAM,MAAM,eAAe,GAAG;IAC7B,OAAO,EAAE,MAAM;IACf;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IAClF,kFAAkF;IAClF,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;IACpE,iGAAiG;IACjG,UAAU,CAAC,EAAE,OAAO;CACpB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,EAAE,SAAS,CAAA;IACf,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAA;CACX,CAAA;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,iBAAiB,GAAG,GAAG,CAEhE;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,WAAW,EACnB,OAAO,UAAQ,GACb,MAAM,CA+BR"}

package/dist/lib/rsc-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rsc-request.d.ts","sourceRoot":"","sources":["../../src/lib/rsc-request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rsc-request.d.ts","sourceRoot":"","sources":["../../src/lib/rsc-request.ts"],"names":[],"mappings":"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"}

package/dist/lib/rsc-request.js

@@ -3,7 +3,7 @@ import { createClientManifest, renderToReadableStream } from "@vitejs/plugin-rsc
 import { prerender } from "@vitejs/plugin-rsc/vendor/react-server-dom/static.edge";
 import { hooks, hooksOptions } from "virtual:rebask/hooks";
 import { pprConfig } from "virtual:rebask/ppr-config";
-import { getCacheLife, getUsedSearch, hasNotFoundMark, isUncacheable, mergeResponseHeaders, RequestStorage, withRequestStorage, OutgoingResponseHeaders, } from "../request-context.js";
+import { getCacheLife, hasNotFoundMark, isUncacheable, mergeResponseHeaders, RequestStorage, withRequestStorage, OutgoingResponseHeaders, } from "../request-context.js";
 import { CacheKeyTag } from "./cache-key-tags.js";
 import { getCacheKey } from "./cache-keys.js";
 import { streamFromCachePayload, streamToCachePayload } from "./cache-payload.js";
@@ -59,13 +59,15 @@ export function createRscResponse(rscStream, options = {}) {
     const tagHeader = pprConfig?.cacheTagsHeader;
     let trailerNonce;
     if (trailer && rscStream) {
+        // `flush()` can run after the request scope exits, so keep the state instead of looking it
+        // up in AsyncLocalStorage. `trackSearchParam()` fills `usedSearch` lazily during the render.
+        const requestState = RequestStorage.getStore().state;
         trailerNonce = randomBytes(16).toString("hex");
         rscStream = rscStream.pipeThrough(new TransformStream({
             flush(controller) {
                 const used = {};
-                const usedSearch = getUsedSearch();
-                if (usedSearch) {
-                    for (const [key, value] of usedSearch)
+                if (requestState.usedSearch) {
+                    for (const [key, value] of requestState.usedSearch)
                         used[key] = value;
                 }
                 controller.enqueue(TEXT_ENCODER.encode(`\r\n--${trailerNonce}\r\n${JSON.stringify({ used })}`));

package/dist/lib/server-router/build-entries.d.ts

@@ -0,0 +1,76 @@
+import { type LayoutRoute, type PageRoute, type RouteHandlerRoute } from "../route-matcher.js";
+import { RouteType, type ProxyEntry, type RouteEntry } from "./types.js";
+type Handler = (request: Request, params: Record<string, string | string[] | undefined>) => Promise<Response>;
+export interface EntryHandlers {
+    page: (route: PageRoute) => Handler;
+    markdown: (route: PageRoute) => Handler;
+    routeHandler: (route: RouteHandlerRoute) => Handler;
+    layout: (route: LayoutRoute) => Handler;
+}
+export declare function buildEntries(pageRoutes: PageRoute[], routeHandlerRoutes: RouteHandlerRoute[], layoutRoutes: LayoutRoute[], imageEntry: Exclude<RouteEntry, ProxyEntry> | null, handlers: EntryHandlers): {
+    appEntries: ({
+        type: RouteType.IMAGE;
+        methods: import("../route-matcher.js").HttpMethod[];
+        pattern: string;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    } | {
+        methods: import("../route-matcher.js").HttpMethod[];
+        type: RouteType.APP;
+        route: LayoutRoute;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    } | {
+        methods: import("../route-matcher.js").HttpMethod[];
+        type: RouteType.APP;
+        route: import("../route-matcher.js").Route;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    } | {
+        methods: import("../route-matcher.js").HttpMethod[];
+        type: RouteType.APP;
+        route: RouteHandlerRoute;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    })[];
+    layoutEntries: ({
+        type: RouteType.IMAGE;
+        methods: import("../route-matcher.js").HttpMethod[];
+        pattern: string;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    } | {
+        methods: import("../route-matcher.js").HttpMethod[];
+        type: RouteType.APP;
+        route: LayoutRoute;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    } | {
+        methods: import("../route-matcher.js").HttpMethod[];
+        type: RouteType.APP;
+        route: import("../route-matcher.js").Route;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    } | {
+        methods: import("../route-matcher.js").HttpMethod[];
+        type: RouteType.APP;
+        route: RouteHandlerRoute;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    })[];
+    markdownEntries: ({
+        type: RouteType.IMAGE;
+        methods: import("../route-matcher.js").HttpMethod[];
+        pattern: string;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    } | {
+        methods: import("../route-matcher.js").HttpMethod[];
+        type: RouteType.APP;
+        route: LayoutRoute;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    } | {
+        methods: import("../route-matcher.js").HttpMethod[];
+        type: RouteType.APP;
+        route: import("../route-matcher.js").Route;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    } | {
+        methods: import("../route-matcher.js").HttpMethod[];
+        type: RouteType.APP;
+        route: RouteHandlerRoute;
+        handler: (request: Request, params: import("../route-matcher.js").RouteParams) => Promise<Response>;
+    })[];
+};
+export {};
+//# sourceMappingURL=build-entries.d.ts.map

package/dist/lib/server-router/build-entries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-entries.d.ts","sourceRoot":"","sources":["../../../src/lib/server-router/build-entries.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,iBAAiB,EAEtB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AAExE,KAAK,OAAO,GAAG,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,KACjD,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEtB,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAA;IACnC,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAA;IACvC,YAAY,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAA;IACnD,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAA;CACvC;AAUD,wBAAgB,YAAY,CAC3B,UAAU,EAAE,SAAS,EAAE,EACvB,kBAAkB,EAAE,iBAAiB,EAAE,EACvC,YAAY,EAAE,WAAW,EAAE,EAC3B,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,IAAI,EAClD,QAAQ,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4EvB"}

package/dist/lib/server-router/build-entries.js

@@ -0,0 +1,74 @@
+import { HTTP_METHODS, } from "../route-matcher.js";
+import { appPattern, setEntryParams } from "./rou3.js";
+import { RouteType } from "./types.js";
+function setAppParams(entry) {
+    if (entry.type !== RouteType.APP)
+        return entry;
+    setEntryParams(entry, appPattern(entry.route.segments, entry.route.type === "layout"));
+    return entry;
+}
+export function buildEntries(pageRoutes, routeHandlerRoutes, layoutRoutes, imageEntry, handlers) {
+    const appEntries = [];
+    const layoutEntries = [];
+    const markdownEntries = [];
+    const hasMarkdownRoutes = pageRoutes.some((route) => route.markdownFilePath);
+    if (imageEntry) {
+        setAppParams(imageEntry);
+        appEntries.push(imageEntry);
+        if (hasMarkdownRoutes)
+            markdownEntries.push(imageEntry);
+    }
+    for (const route of pageRoutes) {
+        if (route.hasPage !== false) {
+            appEntries.push(setAppParams({
+                type: RouteType.APP,
+                methods: ["GET", "POST"],
+                route,
+                handler: handlers.page(route),
+            }));
+        }
+        if (!hasMarkdownRoutes)
+            continue;
+        if (route.markdownFilePath) {
+            markdownEntries.push(setAppParams({
+                type: RouteType.APP,
+                methods: ["GET", "HEAD"],
+                route,
+                handler: handlers.markdown(route),
+            }));
+        }
+        else if (route.hasPage !== false) {
+            markdownEntries.push(setAppParams({
+                type: RouteType.APP,
+                methods: ["GET"],
+                route,
+                handler: handlers.page(route),
+            }));
+        }
+    }
+    for (const route of routeHandlerRoutes) {
+        const entry = setAppParams({
+            type: RouteType.APP,
+            methods: [...HTTP_METHODS],
+            route,
+            handler: handlers.routeHandler(route),
+        });
+        appEntries.push(entry);
+        if (hasMarkdownRoutes)
+            markdownEntries.push(entry);
+    }
+    for (const route of layoutRoutes) {
+        const segments = [
+            { type: "static", value: "_rebask" },
+            { type: "static", value: "1" },
+            ...route.segments,
+        ];
+        layoutEntries.push(setAppParams({
+            type: RouteType.APP,
+            methods: ["GET"],
+            route: { ...route, segments },
+            handler: handlers.layout(route),
+        }));
+    }
+    return { appEntries, layoutEntries, markdownEntries };
+}

package/dist/lib/server-router/get-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-router.d.ts","sourceRoot":"","sources":["../../../src/lib/server-router/get-router.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AA6O9C,yDAAyD;AACzD,wBAAsB,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC,CA4BvD"}
+{"version":3,"file":"get-router.d.ts","sourceRoot":"","sources":["../../../src/lib/server-router/get-router.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AA4L9C,yDAAyD;AACzD,wBAAsB,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC,CA4BvD"}

package/dist/lib/server-router/get-router.js

@@ -17,117 +17,67 @@ import { buildProxy } from "../proxy/build-proxy.js";
 import { proxyExternal } from "../proxy/proxy-external.js";
 import { REWRITE_HEADER, rewriteHeaders } from "../proxy/rewrite.js";
 import { assertNoPageRouteHandlerConflicts, buildLayoutRoutes, buildRouteHandlerRoutes, buildRoutes, } from "../route-builder.js";
-import { HTTP_METHODS, } from "../route-matcher.js";
-import { RouteType } from "./types.js";
-function buildEntries(pageRoutes, routeHandlerRoutes, layoutRoutes) {
-    const appEntries = [];
-    const layoutEntries = [];
-    const markdownEntries = [];
-    const hasMarkdownRoutes = pageRoutes.some((route) => route.markdownFilePath);
-    // Image optimization route
-    if (imageConfig !== null && loadImageHandler !== undefined) {
-        const imageEntry = {
-            type: RouteType.IMAGE,
-            methods: ["GET"],
-            pattern: imageConfig.path,
-            handler: handleImageRequest,
-        };
-        appEntries.push(imageEntry);
-        if (hasMarkdownRoutes)
-            markdownEntries.push(imageEntry);
-    }
-    // Page routes — registered for GET and POST:
-    // - GET: page loads, RSC requests, segment requests
-    // - POST: server functions, form submissions, PPR resume
-    for (const route of pageRoutes) {
-        if (route.hasPage !== false) {
-            appEntries.push({
-                type: RouteType.APP,
-                methods: ["GET", "POST"],
-                route,
-                handler: (req, params) => handlePageRoute(req, route, params),
-            });
-        }
-        if (!hasMarkdownRoutes)
-            continue;
-        if (route.markdownFilePath) {
-            markdownEntries.push({
-                type: RouteType.APP,
-                methods: ["GET", "HEAD"],
-                route,
-                handler: (req, params) => handleMarkdownRoute(req, route, params),
-            });
-        }
-        else if (route.hasPage !== false) {
-            // A specific page without Markdown still wins negotiation over a Markdown catch-all.
-            markdownEntries.push({
-                type: RouteType.APP,
-                methods: ["GET"],
-                route,
-                handler: (req, params) => handlePageRoute(req, route, params),
-            });
-        }
-    }
-    // Route handlers — registered for all methods so they can return 405 when the path exists but a
-    // specific method is not implemented.
-    for (const route of routeHandlerRoutes) {
-        const entry = {
-            type: RouteType.APP,
-            methods: [...HTTP_METHODS],
-            route,
-            handler: (req, params) => handleRouteHandler(req, route, params),
-        };
-        appEntries.push(entry);
-        if (hasMarkdownRoutes)
-            markdownEntries.push(entry);
-    }
-    // Layout routes — registered under /_rebask/1/{path}
-    for (const route of layoutRoutes) {
-        const segments = [
-            { type: "static", value: "_rebask" },
-            { type: "static", value: "1" },
-            ...route.segments,
-        ];
-        layoutEntries.push({
-            type: RouteType.APP,
-            methods: ["GET"],
-            route: { ...route, segments },
-            handler: (req, params) => handleLayoutRouteRequest(req, route, params),
-        });
-    }
-    return { appEntries, layoutEntries, markdownEntries };
-}
+import { extractAppParams } from "./rou3.js";
+import { buildRouteEntries } from "./route-entries.js";
 function createRouter(pageRoutes, routeHandlerRoutes, layoutRoutes, resolvedProxyRouter = proxyRouter) {
-    const { appEntries, layoutEntries, markdownEntries } = buildEntries(pageRoutes, routeHandlerRoutes, layoutRoutes);
-    const appMatcher = createMatcher(appEntries);
-    const markdownMatcher = markdownEntries.length > 0 ? createMatcher(markdownEntries) : null;
-    const layoutMatcher = layoutEntries.length > 0 ? createMatcher(layoutEntries) : null;
+    const imageEntry = imageConfig !== null && loadImageHandler !== undefined
+        ? { pattern: imageConfig.path, handler: handleImageRequest }
+        : null;
+    const { entries, markdownEnabled } = buildRouteEntries(pageRoutes, routeHandlerRoutes, layoutRoutes, imageEntry, {
+        page: (route) => (request, params) => handlePageRoute(request, route, params),
+        markdown: (route) => (request, params) => handleMarkdownRoute(request, route, params),
+        routeHandler: (route) => (request, params) => handleRouteHandler(request, route, params),
+        layout: (route) => (request, params) => handleLayoutRouteRequest(request, route, params),
+    });
+    const appMatcher = createMatcher(entries);
     const app = async (request) => {
         const method = request.method;
         const accept = request.headers.get("accept");
         const isRscRequest = accept?.startsWith("text/x-component");
-        const isMarkdownMethod = method === "GET" || method === "HEAD";
-        if (!isRscRequest && isMarkdownMethod && markdownMatcher) {
-            const url = new URL(request.url);
-            const markdownPathname = __REBASK_MARKDOWN_URLS ? getMarkdownPathname(url.pathname) : null;
-            if (markdownPathname !== null) {
+        const isMarkdownRequest = markdownEnabled && !isRscRequest && (method === "GET" || method === "HEAD");
+        const url = new URL(request.url);
+        let markdownPathname = null;
+        if (isMarkdownRequest) {
+            markdownPathname = __REBASK_MARKDOWN_URLS ? getMarkdownPathname(url.pathname) : null;
+            if (markdownPathname !== null)
                 url.pathname = markdownPathname;
-                const markdownHandler = markdownMatcher.find(method, url.href);
-                if (markdownHandler?.route?.type === "page" && markdownHandler.route.markdownFilePath) {
-                    return (await markdownHandler(request));
+        }
+        const match = appMatcher.find(method, url.href);
+        const matched = match?.params ?? {};
+        if (markdownPathname !== null) {
+            if (match?.entry.type === "app") {
+                const variant = match.entry.markdown;
+                if (variant?.route.type === "page" && variant.route.markdownFilePath) {
+                    return variant.handler(request, extractAppParams(variant.params, matched));
                 }
-                return markdownNotFound(request);
-            }
-            if (prefersMarkdown(accept)) {
-                const handler = markdownMatcher.find(method, request.url);
-                return handler ? handler(request) : markdownNotFound(request);
             }
+            return markdownNotFound(request);
+        }
+        const wantsMarkdown = isMarkdownRequest && prefersMarkdown(accept);
+        if (!match) {
+            return wantsMarkdown
+                ? markdownNotFound(request)
+                : handlePageRoute(request, buildDefaultNotFoundRoute(), {});
+        }
+        const entry = match.entry;
+        if (wantsMarkdown && entry.type === "app") {
+            const variant = entry.markdown;
+            return variant
+                ? variant.handler(request, extractAppParams(variant.params, matched))
+                : markdownNotFound(request);
+        }
+        if (isRscRequest) {
+            const layout = entry.layout;
+            if (layout)
+                return layout.handler(request, extractAppParams(layout.params, matched));
+        }
+        if (entry.type === "app") {
+            const variant = entry.app;
+            return variant
+                ? variant.handler(request, extractAppParams(variant.params, matched))
+                : handlePageRoute(request, buildDefaultNotFoundRoute(), {});
         }
-        const layoutHandler = isRscRequest
-            ? layoutMatcher?.find(request.method, request.url)
-            : undefined;
-        const handler = layoutHandler ?? appMatcher.find(request.method, request.url);
-        return handler ? handler(request) : handlePageRoute(request, buildDefaultNotFoundRoute(), {});
+        return entry.app(request, matched);
     };
     const mainRouter = { handle: app, app, proxy: async () => null };
     if (!resolvedProxyRouter)
@@ -140,10 +90,10 @@ function createRouter(pageRoutes, routeHandlerRoutes, layoutRoutes, resolvedProx
         const rewriteUrl = result.headers.get(REWRITE_HEADER);
         if (!rewriteUrl)
             return applyCookies(result);
-        const rewrittenUrl = new URL(rewriteUrl, req.url);
-        const reqOrigin = new URL(req.url).origin;
+        const reqUrl = new URL(req.url);
+        const rewrittenUrl = new URL(rewriteUrl, reqUrl);
         let response;
-        if (rewrittenUrl.origin !== reqOrigin) {
+        if (rewrittenUrl.origin !== reqUrl.origin) {
             response = await proxyExternal(rewrittenUrl, req, result, stashed);
         }
         else {

package/dist/lib/server-router/rou3.d.ts

@@ -0,0 +1,20 @@
+import type { RouteParams, RouteSegment } from "../route-matcher.js";
+export type EntryParams = {
+    pattern: string;
+    segments: RouteSegment[];
+};
+/**
+ * Converts filesystem route segments into a rou3 pattern. Static text is escaped, and dynamic
+ * segments use generated `pN` keys because filesystem names are not always valid rou3 param names
+ * (e.g `[foo-bar]`).
+ */
+export declare function appPattern(segments: RouteSegment[], includeGroups: boolean): {
+    pattern: string;
+    segments: RouteSegment[];
+};
+/**
+ * Converts the raw params from an `appPattern` match into the route's original params, decoding
+ * dynamic values and splitting catch-all matches into decoded segment arrays.
+ */
+export declare function extractAppParams(params: EntryParams, matched: Record<string, string>): RouteParams;
+//# sourceMappingURL=rou3.d.ts.map

package/dist/lib/server-router/rou3.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rou3.d.ts","sourceRoot":"","sources":["../../../src/lib/server-router/rou3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAKpE,MAAM,MAAM,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,YAAY,EAAE,CAAA;CAAE,CAAA;AAEvE;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,aAAa,EAAE,OAAO;;;EAmB1E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC/B,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,WAAW,CAsBb"}

package/dist/lib/server-router/rou3.js

@@ -0,0 +1,55 @@
+const ROU3_SYNTAX = /[:*?+(){}]/g;
+const escapeStatic = (value) => value.replace(ROU3_SYNTAX, "\\$&");
+/**
+ * Converts filesystem route segments into a rou3 pattern. Static text is escaped, and dynamic
+ * segments use generated `pN` keys because filesystem names are not always valid rou3 param names
+ * (e.g `[foo-bar]`).
+ */
+export function appPattern(segments, includeGroups) {
+    const parts = [];
+    let index = 0;
+    for (const segment of segments) {
+        if (segment.type === "static") {
+            parts.push(escapeStatic(segment.value));
+        }
+        else if (segment.type === "group") {
+            if (includeGroups)
+                parts.push(escapeStatic(segment.value));
+        }
+        else {
+            const name = `p${index++}`;
+            if (segment.type === "dynamic")
+                parts.push(`:${name}`);
+            else if (segment.type === "catch-all")
+                parts.push(`:${name}+`);
+            else
+                parts.push(`:${name}*`);
+        }
+    }
+    return { pattern: "/" + parts.join("/"), segments };
+}
+/**
+ * Converts the raw params from an `appPattern` match into the route's original params, decoding
+ * dynamic values and splitting catch-all matches into decoded segment arrays.
+ */
+export function extractAppParams(params, matched) {
+    const result = {};
+    let index = 0;
+    for (const segment of params.segments) {
+        if (segment.type === "dynamic") {
+            result[segment.name] = decodeURIComponent(matched[`p${index++}`]);
+        }
+        else if (segment.type === "catch-all" || segment.type === "optional-catch-all") {
+            const value = matched[`p${index++}`];
+            const parts = [];
+            if (value) {
+                for (const part of value.split("/")) {
+                    if (part)
+                        parts.push(decodeURIComponent(part));
+                }
+            }
+            result[segment.name] = parts;
+        }
+    }
+    return result;
+}

package/dist/lib/server-router/route-entries.d.ts

@@ -0,0 +1,16 @@
+import { type LayoutRoute, type PageRoute, type RouteHandlerRoute } from "../route-matcher.js";
+import type { AppEntry, AppHandler } from "./types.js";
+export interface EntryHandlers {
+    page: (route: PageRoute) => AppHandler;
+    markdown: (route: PageRoute) => AppHandler;
+    routeHandler: (route: RouteHandlerRoute) => AppHandler;
+    layout: (route: LayoutRoute) => AppHandler;
+}
+export declare function buildRouteEntries(pageRoutes: PageRoute[], routeHandlerRoutes: RouteHandlerRoute[], layoutRoutes: LayoutRoute[], imageEntry: {
+    pattern: string;
+    handler: AppHandler;
+} | null, handlers: EntryHandlers): {
+    entries: AppEntry[];
+    markdownEnabled: boolean;
+};
+//# sourceMappingURL=route-entries.d.ts.map

package/dist/lib/server-router/route-entries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-entries.d.ts","sourceRoot":"","sources":["../../../src/lib/server-router/route-entries.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,KAAK,WAAW,EAChB,KAAK,SAAS,EAEd,KAAK,iBAAiB,EAEtB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEtD,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,UAAU,CAAA;IACtC,QAAQ,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,UAAU,CAAA;IAC1C,YAAY,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,UAAU,CAAA;IACtD,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,UAAU,CAAA;CAC1C;AAED,wBAAgB,iBAAiB,CAChC,UAAU,EAAE,SAAS,EAAE,EACvB,kBAAkB,EAAE,iBAAiB,EAAE,EACvC,YAAY,EAAE,WAAW,EAAE,EAC3B,UAAU,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,UAAU,CAAA;CAAE,GAAG,IAAI,EAC3D,QAAQ,EAAE,aAAa,GACrB;IAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,CA2EnD"}

package/dist/lib/server-router/route-entries.js

@@ -0,0 +1,67 @@
+import { HTTP_METHODS, } from "../route-matcher.js";
+import { appPattern } from "./rou3.js";
+export function buildRouteEntries(pageRoutes, routeHandlerRoutes, layoutRoutes, imageEntry, handlers) {
+    const entries = new Map();
+    const hasMarkdownRoutes = pageRoutes.some((route) => route.markdownFilePath);
+    const entryKey = (pattern, method) => `${pattern}\n${method}`;
+    function ensureEntry(pattern, method) {
+        const key = entryKey(pattern, method);
+        let entry = entries.get(key);
+        if (!entry) {
+            entry = { type: "app", methods: [method], pattern };
+            entries.set(key, entry);
+        }
+        return entry;
+    }
+    function addApp(route, methods, handler, variant) {
+        const params = appPattern(route.segments, route.type === "layout");
+        const handlerEntry = { handler, route, params };
+        for (const method of methods) {
+            const entry = ensureEntry(params.pattern, method);
+            if (entry.type === "image") {
+                // An image route can collide with a layout route. RSC still gives layout precedence.
+                if (variant === "layout" && !entry.layout)
+                    entry.layout = handlerEntry;
+                continue;
+            }
+            if (!entry[variant])
+                entry[variant] = handlerEntry;
+        }
+    }
+    if (imageEntry) {
+        entries.set(entryKey(imageEntry.pattern, "GET"), {
+            type: "image",
+            methods: ["GET"],
+            pattern: imageEntry.pattern,
+            app: imageEntry.handler,
+        });
+    }
+    for (const route of pageRoutes) {
+        if (route.hasPage !== false) {
+            addApp(route, ["GET", "POST"], handlers.page(route), "app");
+        }
+        if (!hasMarkdownRoutes)
+            continue;
+        if (route.markdownFilePath) {
+            addApp(route, ["GET", "HEAD"], handlers.markdown(route), "markdown");
+        }
+        else if (route.hasPage !== false) {
+            addApp(route, ["GET"], handlers.page(route), "markdown");
+        }
+    }
+    for (const route of routeHandlerRoutes) {
+        const handler = handlers.routeHandler(route);
+        addApp(route, HTTP_METHODS, handler, "app");
+        if (hasMarkdownRoutes)
+            addApp(route, HTTP_METHODS, handler, "markdown");
+    }
+    for (const route of layoutRoutes) {
+        const segments = [
+            { type: "static", value: "_rebask" },
+            { type: "static", value: "1" },
+            ...route.segments,
+        ];
+        addApp({ ...route, segments }, ["GET"], handlers.layout(route), "layout");
+    }
+    return { entries: [...entries.values()], markdownEnabled: hasMarkdownRoutes };
+}