@rangojs/router 0.1.0 → 0.2.0

package/src/router.ts

@@ -5,10 +5,14 @@ import { isCachedFunction } from "./cache/taint.js";
 import { assertClientComponent } from "./component-utils.js";
 import { DefaultDocument } from "./components/DefaultDocument.js";
 import type { SerializedManifest } from "./debug.js";
+import {
+  DEV_DISCOVERY_EPOCH_HEADER,
+  DEV_DISCOVERY_PROBE_HEADER,
+  isValidDevDiscoveryEpoch,
+} from "./dev-discovery-protocol.js";
 import { createReverse, type ReverseFunction } from "./reverse.js";
 import {
   registerRouteMap,
-  getPrecomputedEntries,
   getRouterManifest,
   getRouterPrecomputedEntries,
   ensureRouterManifest,
@@ -229,6 +233,14 @@ export function createRouter<TEnv = any>(
   // order (unlike the counter which depends on import order).
   const routerId =
     userProvidedId ?? injectedId ?? `router_${nextRouterAutoId()}`;
+  const rawDevDiscoveryEpoch = (
+    globalThis as typeof globalThis & {
+      __RANGO_DEV_DISCOVERY_EPOCH?: unknown;
+    }
+  ).__RANGO_DEV_DISCOVERY_EPOCH;
+  const devDiscoveryEpoch = isValidDevDiscoveryEpoch(rawDevDiscoveryEpoch)
+    ? rawDevDiscoveryEpoch
+    : undefined;
 
   // Resolve the rango state cookie name once, here, so the two cookie writers
   // (the client document.cookie writer and the server Set-Cookie writer)
@@ -405,8 +417,7 @@ export function createRouter<TEnv = any>(
     string,
     Record<string, string>
   > | null {
-    const current =
-      getRouterPrecomputedEntries(routerId) ?? getPrecomputedEntries();
+    const current = getRouterPrecomputedEntries(routerId);
     if (current !== precomputedSource) {
       precomputedSource = current;
       // buildPrecomputedByPrefix drops any staticPrefix owned by more than one
@@ -669,6 +680,7 @@ export function createRouter<TEnv = any>(
 
   // Prerender/static match deps (bind closure state for extracted functions)
   const prerenderDeps = {
+    routerId,
     findMatch,
     buildRouterContext,
     mergedRouteMap,
@@ -700,6 +712,7 @@ export function createRouter<TEnv = any>(
     routeName?: string,
     buildEnv?: TEnv,
     devMode?: boolean,
+    rootScoped?: boolean,
   ) {
     return _renderStaticSegment<TEnv>(
       handler,
@@ -708,6 +721,8 @@ export function createRouter<TEnv = any>(
       routeName,
       buildEnv,
       devMode,
+      routerId,
+      rootScoped,
     );
   }
 
@@ -788,6 +803,7 @@ export function createRouter<TEnv = any>(
           parent: syntheticMapRoot,
           counters: {},
           mountIndex: currentMountIndex,
+          routerId,
           cacheProfiles: resolvedCacheProfiles,
           // basename sets the initial URL prefix so all path() patterns
           // are registered with the prefix (e.g. "/admin" + "/users" = "/admin/users").
@@ -1078,6 +1094,9 @@ export function createRouter<TEnv = any>(
     // Expose basename for runtime manifest generation
     __basename: basename,
 
+    // Pin payload metadata to the worker generation that created this router.
+    __devDiscoveryEpoch: devDiscoveryEpoch,
+
     // Expose router-level boundary defaults for build-time clientChunks
     // discovery (so a "use client" default boundary lands in app-fallback).
     // These are createRouter options, never pushed onto EntryData.
@@ -1096,6 +1115,18 @@ export function createRouter<TEnv = any>(
         | null = null;
 
       return async (request: Request, input: RouterRequestInput<TEnv> = {}) => {
+        if (
+          devDiscoveryEpoch !== undefined &&
+          request.headers.get(DEV_DISCOVERY_PROBE_HEADER) ===
+            String(devDiscoveryEpoch)
+        ) {
+          return new Response(null, {
+            headers: {
+              [DEV_DISCOVERY_EPOCH_HEADER]: String(devDiscoveryEpoch),
+            },
+          });
+        }
+
         // Trigger lazy import of per-router manifest data before route matching.
         // No-op if data is already loaded or no loader is registered.
         await ensureRouterManifest(routerId);

package/src/rsc/handler-context.ts

@@ -15,6 +15,7 @@ import type { SSRStreamMode } from "../router/router-options.js";
 export interface HandlerContext<TEnv = unknown> {
   router: RangoInternal<TEnv, any>;
   version: string;
+  devDiscoveryEpoch?: number;
   renderToReadableStream: RSCDependencies["renderToReadableStream"];
   decodeReply: RSCDependencies["decodeReply"];
   createTemporaryReferenceSet: RSCDependencies["createTemporaryReferenceSet"];

package/src/rsc/handler.ts

@@ -389,6 +389,7 @@ export function createRSCHandler<
   const handlerCtx: HandlerContext<TEnv> = {
     router,
     version,
+    devDiscoveryEpoch: router.__devDiscoveryEpoch,
     renderToReadableStream,
     decodeReply,
     createTemporaryReferenceSet,
@@ -583,6 +584,7 @@ export function createRSCHandler<
     // - Streaming
     // Store basename on request context (scoped per-request via existing ALS)
     requestContext._basename = router.basename;
+    requestContext._routerId = router.id;
 
     // Resolved span tracing for this request (read at each traced phase).
     requestContext._tracing = router.tracing;
@@ -1236,7 +1238,7 @@ export function createRSCHandler<
           };
           return renderRscResponse(
             {
-              ctx: { renderToReadableStream, callOnError },
+              ctx: handlerCtx,
               request,
               url,
               env,

package/src/rsc/loader-fetch.ts

@@ -209,7 +209,7 @@ export async function handleLoaderFetch<TEnv>(
           const cleanUrl = stripInternalParams(url);
           const cleanSearchParams = cleanUrl.searchParams;
           const searchSchema = reqCtx._routeName
-            ? getSearchSchema(reqCtx._routeName)
+            ? getSearchSchema(reqCtx._routeName, reqCtx._routerId)
             : undefined;
           const loaderCtx: any = {
             ...reqCtx,
@@ -228,7 +228,7 @@ export async function handleLoaderFetch<TEnv>(
               reqCtx._routeName,
               mergedParams,
               reqCtx._routeName
-                ? isRouteRootScoped(reqCtx._routeName)
+                ? isRouteRootScoped(reqCtx._routeName, reqCtx._routerId)
                 : undefined,
             ),
             ...(loaderFormData ? { formData: loaderFormData } : {}),

package/src/rsc/manifest-init.ts

@@ -9,8 +9,6 @@ import {
   getGlobalRouteMap,
   hasCachedManifest,
   setCachedManifest,
-  getRouteTrie,
-  setRouteTrie,
   setRouterManifest,
   setRouterTrie,
   setRouterPrecomputedEntries,
@@ -32,11 +30,10 @@ export async function buildRouterTrieFromUrlpatterns(
 ): Promise<void> {
   const { generateManifestFull } =
     await import("../build/generate-manifest.js");
-  const generated = await generateManifestFull(
-    router.urlpatterns,
-    undefined,
-    router.basename ? { urlPrefix: router.basename } : undefined,
-  );
+  const generated = await generateManifestFull(router.urlpatterns, undefined, {
+    routerId: router.id,
+    ...(router.basename ? { urlPrefix: router.basename } : {}),
+  });
   // Build the trie through the SAME shared helper the production discovery uses
   // (discover-routers.ts), so the dev runtime-rebuilt trie and the prod
   // serialized trie cannot drift. buildPerRouterTrie returns null when there
@@ -45,10 +42,6 @@ export async function buildRouterTrieFromUrlpatterns(
   const trie = buildPerRouterTrie(generated);
   if (trie) {
     setRouterTrie(router.id, trie);
-    // Set global trie only if not already set by another router
-    if (!getRouteTrie()) {
-      setRouteTrie(trie);
-    }
   }
   setRouterManifest(router.id, generated.routeManifest);
 

package/src/rsc/progressive-enhancement.ts

@@ -277,10 +277,15 @@ export async function handleProgressiveEnhancement<TEnv>(
     // JS/PE parity: this is an action's revalidation render, so mark it BEFORE
     // matching — a stale `foregroundOnAction` cache entry must re-execute in the
     // foreground during the re-render, exactly as the JS path's
-    // revalidateAfterAction does. The transition({ when }) gate fields below are
-    // set post-match (the gate reads them after rendering); foregroundOnAction
-    // reads _inActionRevalidation during the match, so it must be set here.
-    getRequestContext()._inActionRevalidation = true;
+    // revalidateAfterAction does. PPR transition({ when }) runs during match,
+    // while foregroundOnAction reads _inActionRevalidation there too, so all
+    // action metadata must be available before matching.
+    const peReqCtx = getRequestContext();
+    peReqCtx._inActionRevalidation = true;
+    peReqCtx._gateActionId = directActionId ?? undefined;
+    peReqCtx._gateActionUrl = new URL(url);
+    peReqCtx._gateActionResult = actionResult;
+    peReqCtx._gateFormData = formData;
 
     const match = await ctx.router.match(renderRequest, { env });
 
@@ -291,16 +296,6 @@ export async function handleProgressiveEnhancement<TEnv>(
       });
     }
 
-    // Expose the no-JS action to the transition({ when }) gate. currentUrl/Params
-    // are absent on this full-render path (no navigation snapshot); useActionState
-    // ids are block-scoped, so only a direct action id is available here.
-    // actionUrl is the page the action was submitted from (this request's url).
-    const peReqCtx = getRequestContext();
-    peReqCtx._gateActionId = directActionId ?? undefined;
-    peReqCtx._gateActionUrl = new URL(url);
-    peReqCtx._gateActionResult = actionResult;
-    peReqCtx._gateFormData = formData;
-
     const payload: RscPayload = {
       metadata: {
         pathname: url.pathname,

package/src/rsc/render-pipeline.ts

@@ -53,8 +53,13 @@ export interface RscRenderStageTracking {
   span?: TraceSpan;
 }
 
+type RscRenderContext<TEnv> = Pick<
+  HandlerContext<TEnv>,
+  "renderToReadableStream" | "callOnError" | "devDiscoveryEpoch"
+>;
+
 export interface RscRenderInput<TEnv> {
-  ctx: Pick<HandlerContext<TEnv>, "renderToReadableStream" | "callOnError">;
+  ctx: RscRenderContext<TEnv>;
   request: Request;
   url: URL;
   env: TEnv;
@@ -66,7 +71,7 @@ export interface RscRenderInput<TEnv> {
 }
 
 export interface RscFlightStageInput<TEnv> {
-  ctx: Pick<HandlerContext<TEnv>, "renderToReadableStream" | "callOnError">;
+  ctx: RscRenderContext<TEnv>;
   request: Request;
   url: URL;
   env: TEnv;
@@ -146,6 +151,9 @@ function createFlightStage<TEnv>(
   input: RscFlightStageInput<TEnv>,
   init: ResponseInit,
 ): RscFlightStage {
+  if (input.ctx.devDiscoveryEpoch !== undefined && input.payload.metadata) {
+    input.payload.metadata.devDiscoveryEpoch = input.ctx.devDiscoveryEpoch;
+  }
   const stream = input.ctx.renderToReadableStream<RscPayload>(input.payload, {
     temporaryReferences: input.temporaryReferences,
     onError: (error: unknown) => {