@rangojs/router 0.0.0-experimental.9 → 0.0.0-experimental.b9cb8739

package/src/router/match-api.ts

@@ -6,15 +6,16 @@
  */
 
 import { CacheScope, createCacheScope } from "../cache/cache-scope.js";
-import {
-  RouteNotFoundError,
-} from "../errors";
+import { RouteNotFoundError } from "../errors";
 import {
   createErrorInfo,
   createErrorSegment,
   findNearestErrorBoundary as findErrorBoundary,
 } from "./error-handling.js";
-import { createHandlerContext } from "./handler-context.js";
+import {
+  createHandlerContext,
+  stripInternalParams,
+} from "./handler-context.js";
 import { setupLoaderAccess } from "./loader-resolution.js";
 import { loadManifest, clearManifestCache } from "./manifest.js";
 import { collectRouteMiddleware } from "./middleware.js";
@@ -25,24 +26,17 @@ import {
   LoaderEntry,
   getContext,
   InterceptSelectorContext,
-  type MetricsStore,
 } from "../server/context";
-import {
-  getGlobalRouteMap,
-} from "../route-map-builder.js";
-import type {
-  ErrorBoundaryHandler,
-  ErrorInfo,
-  HandlerContext,
-  MatchResult,
-  ResolvedSegment,
-} from "../types";
+import type { ErrorBoundaryHandler, ErrorInfo, MatchResult } from "../types";
 import type { ReactNode } from "react";
-import type { MatchContext, ActionContext as MatchActionContext } from "./match-context.js";
+import type { MatchContext } from "./match-context.js";
 import type { MatchApiDeps, ActionContext } from "./types.js";
-import type { InterceptEntry } from "../server/context";
-import type { RouteMatchResult } from "./pattern-matching.js";
-import { getRequestContext } from "../server/request-context.js";
+import {
+  getRequestContext,
+  setRequestContextPrevRouteKey,
+} from "../server/request-context.js";
+import { isAutoGeneratedRouteName } from "../route-name.js";
+import { debugLog, debugWarn } from "./logging.js";
 
 /**
  * Create match context for full requests (document/SSR).
@@ -97,22 +91,32 @@ export async function createMatchContextForFull<TEnv>(
     });
   }
 
+  if (
+    manifestEntry.type === "route" &&
+    manifestEntry.prerenderDef?.options?.passthrough === true
+  ) {
+    matched.pt = true;
+  }
+
   const routeMiddleware = collectRouteMiddleware(
     traverseBack(manifestEntry),
     matched.params,
   );
 
-  const bindings = (env as any)?.Bindings ?? env;
+  // Clean URL without internal _rsc* params for userland access
+  const cleanUrl = stripInternalParams(url);
 
   const handlerContext = createHandlerContext(
     matched.params,
     request,
-    url.searchParams,
+    cleanUrl.searchParams,
     pathname,
-    url,
-    bindings,
-    getGlobalRouteMap(),
+    cleanUrl,
+    env,
+    deps.getRouteMap(),
     matched.routeKey,
+    matched.responseType,
+    matched.pt === true,
   );
 
   const loaderPromises = new Map<string, Promise<any>>();
@@ -140,14 +144,13 @@ export async function createMatchContextForFull<TEnv>(
 
   return {
     request,
-    url,
+    url: cleanUrl,
     pathname,
     env,
-    bindings,
     clientSegmentIds: [],
     clientSegmentSet: new Set(),
     stale: false,
-    prevUrl: url,
+    prevUrl: cleanUrl,
     prevParams: {},
     prevMatch: null,
     matched,
@@ -159,17 +162,21 @@ export async function createMatchContextForFull<TEnv>(
       : matched.routeKey,
     handlerContext,
     loaderPromises,
-    routeMap: getGlobalRouteMap(),
+    routeMap: deps.getRouteMap(),
     metricsStore,
     Store,
     interceptContextMatch: null,
     interceptSelectorContext: {
-      from: url,
-      to: url,
+      from: cleanUrl,
+      to: cleanUrl,
       params: matched.params,
       request,
       env,
       segments: { path: [], ids: [] },
+      toRouteName:
+        matched.routeKey && !isAutoGeneratedRouteName(matched.routeKey)
+          ? matched.routeKey
+          : undefined,
     },
     isSameRouteNavigation: false,
     interceptResult: null,
@@ -195,7 +202,6 @@ export async function createMatchContextForPartial<TEnv>(
   const url = new URL(request.url);
   const pathname = url.pathname;
 
-  const requestStartTime = performance.now();
   const metricsStore = deps.getMetricsStore();
 
   const clientSegmentIds =
@@ -217,10 +223,21 @@ export async function createMatchContextForPartial<TEnv>(
     return null;
   }
 
-  const prevUrl = new URL(previousUrl, url.origin);
-  const interceptContextUrl = interceptSourceUrl
-    ? new URL(interceptSourceUrl, url.origin)
-    : prevUrl;
+  let prevUrl: URL;
+  try {
+    prevUrl = new URL(previousUrl, url.origin);
+  } catch {
+    return null;
+  }
+
+  let interceptContextUrl: URL;
+  try {
+    interceptContextUrl = interceptSourceUrl
+      ? new URL(interceptSourceUrl, url.origin)
+      : prevUrl;
+  } catch {
+    interceptContextUrl = prevUrl;
+  }
 
   const routeMatchStart = metricsStore ? performance.now() : 0;
   const prevMatch = deps.findMatch(prevUrl.pathname);
@@ -250,9 +267,10 @@ export async function createMatchContextForPartial<TEnv>(
   }
 
   if (prevMatch && prevMatch.entry !== matched.entry && !matched.pr) {
-    console.log(
-      `[Router.matchPartial] Route group changed: ${prevMatch.routeKey} → ${matched.routeKey}`,
-    );
+    debugLog("matchPartial", "route group changed", {
+      from: prevMatch.routeKey,
+      to: matched.routeKey,
+    });
   }
 
   const manifestStart = metricsStore ? performance.now() : 0;
@@ -271,28 +289,38 @@ export async function createMatchContextForPartial<TEnv>(
     });
   }
 
+  if (
+    manifestEntry.type === "route" &&
+    manifestEntry.prerenderDef?.options?.passthrough === true
+  ) {
+    matched.pt = true;
+  }
+
   const routeMiddleware = collectRouteMiddleware(
     traverseBack(manifestEntry),
     matched.params,
   );
 
-  const bindings = (env as any)?.Bindings ?? env;
+  // Clean URL without internal _rsc* params for userland access
+  const cleanUrl = stripInternalParams(url);
+
   const handlerContext = createHandlerContext(
     matched.params,
     request,
-    url.searchParams,
+    cleanUrl.searchParams,
     pathname,
-    url,
-    bindings,
-    getGlobalRouteMap(),
+    cleanUrl,
+    env,
+    deps.getRouteMap(),
     matched.routeKey,
+    matched.responseType,
+    matched.pt === true,
   );
 
   const clientSegmentSet = new Set(clientSegmentIds);
-  console.log(
-    `[Router.matchPartial] Client segments:`,
-    Array.from(clientSegmentSet),
-  );
+  debugLog("matchPartial", "client segments", {
+    segments: Array.from(clientSegmentSet),
+  });
 
   const loaderPromises = new Map<string, Promise<any>>();
   setupLoaderAccess(handlerContext, loaderPromises);
@@ -310,17 +338,17 @@ export async function createMatchContextForPartial<TEnv>(
   }
 
   const isSameRouteNavigation = !!(
-    interceptContextMatch &&
-    interceptContextMatch.routeKey === matched.routeKey
+    interceptContextMatch && interceptContextMatch.routeKey === matched.routeKey
   );
 
   if (interceptSourceUrl) {
-    console.log(`[Router.matchPartial] Intercept context detected:`);
-    console.log(`  - Current URL: ${pathname}`);
-    console.log(`  - Intercept source: ${interceptSourceUrl}`);
-    console.log(`  - Context match: ${interceptContextMatch?.routeKey}`);
-    console.log(`  - Current route: ${matched.routeKey}`);
-    console.log(`  - Same route navigation: ${isSameRouteNavigation}`);
+    debugLog("matchPartial.intercept", "intercept context detected", {
+      currentUrl: pathname,
+      interceptSource: interceptSourceUrl,
+      contextRoute: interceptContextMatch?.routeKey,
+      currentRoute: matched.routeKey,
+      sameRouteNavigation: isSameRouteNavigation,
+    });
   }
 
   const localRouteName = matched.routeKey.includes(".")
@@ -332,16 +360,35 @@ export async function createMatchContextForPartial<TEnv>(
     if (/D\d+\./.test(id)) return false;
     return true;
   });
+  const effectiveFromUrl = interceptSourceUrl ? interceptContextUrl : prevUrl;
+  const effectiveFromMatch = interceptSourceUrl
+    ? interceptContextMatch
+    : prevMatch;
+
+  // Store previous route key on the request context for revalidation
+  // fromRouteName. Uses effectiveFromMatch so intercept-source navigations
+  // see the intercept origin route, not the plain previous URL route.
+  setRequestContextPrevRouteKey(effectiveFromMatch?.routeKey);
+
   const interceptSelectorContext: InterceptSelectorContext = {
-    from: prevUrl,
-    to: url,
+    from: effectiveFromUrl,
+    to: cleanUrl,
     params: matched.params,
     request,
     env,
     segments: {
-      path: prevUrl.pathname.split("/").filter(Boolean),
+      path: effectiveFromUrl.pathname.split("/").filter(Boolean),
       ids: filteredSegmentIds,
     },
+    fromRouteName:
+      effectiveFromMatch?.routeKey &&
+      !isAutoGeneratedRouteName(effectiveFromMatch.routeKey)
+        ? effectiveFromMatch.routeKey
+        : undefined,
+    toRouteName:
+      matched.routeKey && !isAutoGeneratedRouteName(matched.routeKey)
+        ? matched.routeKey
+        : undefined,
   };
   const isAction = !!actionContext;
 
@@ -372,9 +419,9 @@ export async function createMatchContextForPartial<TEnv>(
     manifestEntry.type === "route" &&
     interceptSourceUrl
   ) {
-    console.log(
-      `[Router.matchPartial] Leaving intercept - forcing route segment render: ${manifestEntry.shortCode}`,
-    );
+    debugLog("matchPartial.intercept", "forcing route segment render", {
+      segmentId: manifestEntry.shortCode,
+    });
     clientSegmentSet.delete(manifestEntry.shortCode);
   }
 
@@ -390,10 +437,9 @@ export async function createMatchContextForPartial<TEnv>(
 
   return {
     request,
-    url,
+    url: cleanUrl,
     pathname,
     env,
-    bindings,
     clientSegmentIds,
     clientSegmentSet,
     stale,
@@ -407,7 +453,7 @@ export async function createMatchContextForPartial<TEnv>(
     localRouteName,
     handlerContext,
     loaderPromises,
-    routeMap: getGlobalRouteMap(),
+    routeMap: deps.getRouteMap(),
     metricsStore,
     Store,
     interceptContextMatch,
@@ -437,11 +483,11 @@ export async function matchError<TEnv>(
   const url = new URL(request.url);
   const pathname = url.pathname;
 
-  console.log(`[Router.matchError] Matching error for ${pathname}`);
+  debugLog("matchError", "matching error", { pathname });
 
   const matched = deps.findMatch(pathname);
   if (!matched) {
-    console.warn(`[Router.matchError] No route matched for ${pathname}`);
+    debugWarn("matchError", "no route matched", { pathname });
     return null;
   }
 
@@ -545,10 +591,7 @@ export async function matchError<TEnv>(
 
   const reqCtx = getRequestContext();
   if (reqCtx) {
-    reqCtx.res = new Response(null, {
-      status: 500,
-      headers: reqCtx.res.headers,
-    });
+    reqCtx._setStatus(500);
   }
 
   const effectiveFallback = fallback || DefaultErrorFallback;
@@ -560,14 +603,13 @@ export async function matchError<TEnv>(
   );
 
   if (useDefaultFallback) {
-    console.log(
-      `[Router.matchError] Using default error boundary (no user-defined boundary found)`,
-    );
+    debugLog("matchError", "using default error boundary");
   }
 
-  console.log(
-    `[Router.matchError] Boundary: ${boundaryEntry.shortCode}, outlet replaced: ${outletEntry.shortCode}`,
-  );
+  debugLog("matchError", "resolved boundary", {
+    boundarySegmentId: boundaryEntry.shortCode,
+    outletSegmentId: outletEntry.shortCode,
+  });
 
   return {
     segments: [errorSegment],
@@ -576,46 +618,3 @@ export async function matchError<TEnv>(
     params: matched.params,
   };
 }
-
-/**
- * Preview match - returns route middleware without segment resolution.
- */
-export async function previewMatch<TEnv>(
-  request: Request,
-  context: TEnv,
-  deps: MatchApiDeps<TEnv>,
-): Promise<{
-  routeMiddleware?: Array<{
-    handler: import("./middleware.js").MiddlewareFn;
-    params: Record<string, string>;
-  }>;
-} | null> {
-  const url = new URL(request.url);
-  const pathname = url.pathname;
-
-  const matched = deps.findMatch(pathname);
-  if (!matched) {
-    return null;
-  }
-
-  if (matched.redirectTo) {
-    return { routeMiddleware: undefined };
-  }
-
-  const manifestEntry = await loadManifest(
-    matched.entry,
-    matched.routeKey,
-    pathname,
-    undefined,
-    false,
-  );
-
-  const routeMiddleware = collectRouteMiddleware(
-    traverseBack(manifestEntry),
-    matched.params,
-  );
-
-  return {
-    routeMiddleware: routeMiddleware.length > 0 ? routeMiddleware : undefined,
-  };
-}

package/src/router/match-context.ts

@@ -45,7 +45,7 @@
  *   - request, url, pathname: The incoming HTTP request
  *
  * Environment:
- *   - env, bindings: Server environment (Cloudflare bindings, etc.)
+ *   - env: Server environment (Cloudflare bindings, etc.)
  *
  * Client State (from RSC request headers):
  *   - clientSegmentIds: Segments the client currently has
@@ -140,7 +140,6 @@ export interface MatchContext<TEnv = any> {
 
   // Environment
   env: TEnv;
-  bindings: TEnv;
 
   // Client state
   clientSegmentIds: string[];
@@ -211,6 +210,9 @@ export interface MatchPipelineState {
   // Whether cache should be revalidated (SWR)
   shouldRevalidate?: boolean;
 
+  // Source of cache hit ("runtime" or "prerender")
+  cacheSource?: "runtime" | "prerender";
+
   // Resolved segments from pipeline
   segments: ResolvedSegment[];
   matchedIds: string[];