@rangojs/router 0.0.0-experimental.18 → 0.0.0-experimental.19

package/dist/vite/index.js

@@ -1454,7 +1454,7 @@ function useCacheTransform() {
           transformWrapExport
         );
       }
-      return transformFunctionLevelUseCache(
+      const functionResult = transformFunctionLevelUseCache(
         code,
         ast,
         filePath,
@@ -1462,21 +1462,33 @@ function useCacheTransform() {
         isBuild,
         transformHoistInlineDirective
       );
+      warnOnNearMissDirectives(ast, id, this.warn.bind(this));
+      if (functionResult) return functionResult;
     }
   };
 }
 function transformFileLevelUseCache(code, ast, filePath, sourceId, isBuild, isLayoutOrTemplate, transformWrapExport) {
+  const nonFunctionExports = [];
   const { exportNames, output } = transformWrapExport(code, ast, {
     runtime: (value, name) => {
       const funcId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
       return `__rango_registerCachedFunction(${value}, ${JSON.stringify(funcId)}, "default")`;
     },
     rejectNonAsyncFunction: false,
-    filter: (name) => {
+    filter: (name, meta) => {
       if (name === "default" && isLayoutOrTemplate) return false;
+      if (meta.isFunction === false) {
+        nonFunctionExports.push(name);
+        return false;
+      }
       return true;
     }
   });
+  if (nonFunctionExports.length > 0) {
+    throw new Error(
+      `[rango:use-cache] File-level "use cache" in ${sourceId} cannot wrap non-function export${nonFunctionExports.length > 1 ? "s" : ""}: ${nonFunctionExports.map((n) => `"${n}"`).join(", ")}. Only function exports can be cached. Either remove "use cache" from the file level and add it inside individual functions, or move the non-function exports to a separate module.`
+    );
+  }
   if (exportNames.length === 0) {
     const s = new MagicString5(code);
     const directive2 = findFileLevelDirective(ast);
@@ -1513,7 +1525,7 @@ function transformFileLevelUseCache(code, ast, filePath, sourceId, isBuild, isLa
 function transformFunctionLevelUseCache(code, ast, filePath, sourceId, isBuild, transformHoistInlineDirective) {
   try {
     const { output, names } = transformHoistInlineDirective(code, ast, {
-      directive: /^use cache(:\s*\w+)?$/,
+      directive: /^use cache(:\s*[\w-]+)?$/,
       runtime: (value, name, meta) => {
         const funcId = isBuild ? hashId(filePath, name) : `${filePath}#${name}`;
         const profileMatch = meta.directiveMatch[1];
@@ -1543,6 +1555,35 @@ function findFileLevelDirective(ast) {
   }
   return null;
 }
+var VALID_DIRECTIVE_RE = /^use cache(:\s*[\w-]+)?$/;
+var NEAR_MISS_RE = /^use cache:\s*.+$/;
+function warnOnNearMissDirectives(ast, fileId, warn) {
+  const visit = (node) => {
+    if (!node || typeof node !== "object") return;
+    if (node.type === "ExpressionStatement" && node.expression?.type === "Literal" && typeof node.expression.value === "string") {
+      const value = node.expression.value;
+      if (value.startsWith("use cache") && NEAR_MISS_RE.test(value) && !VALID_DIRECTIVE_RE.test(value)) {
+        const profilePart = value.slice("use cache:".length).trim();
+        warn(
+          `[rango:use-cache] "${value}" in ${fileId} has an invalid profile name "${profilePart}". Profile names must match [a-zA-Z0-9_-]+. This directive will be ignored.`
+        );
+      }
+    }
+    for (const key of Object.keys(node)) {
+      const child = node[key];
+      if (Array.isArray(child)) {
+        for (const item of child) {
+          visit(item);
+        }
+      } else if (child && typeof child === "object" && child.type) {
+        visit(child);
+      }
+    }
+  };
+  for (const node of ast.body ?? []) {
+    visit(node);
+  }
+}
 
 // src/vite/plugins/virtual-entries.ts
 var VIRTUAL_ENTRY_BROWSER = `
@@ -1657,7 +1698,7 @@ import { resolve } from "node:path";
 // package.json
 var package_default = {
   name: "@rangojs/router",
-  version: "0.0.0-experimental.18",
+  version: "0.0.0-experimental.19",
   description: "Django-inspired RSC router with composable URL patterns",
   keywords: [
     "react",
@@ -1970,15 +2011,27 @@ function extractRouteFromCallExpression(node) {
   };
 }
 
+// src/route-name.ts
+var AUTO_GENERATED_ROUTE_PREFIX = "$path_";
+var INTERNAL_INCLUDE_SCOPE_PREFIX = "$prefix_";
+function isAutoGeneratedRouteName(name) {
+  return name.split(".").some((segment) => {
+    return segment.startsWith(AUTO_GENERATED_ROUTE_PREFIX) || segment.startsWith(INTERNAL_INCLUDE_SCOPE_PREFIX);
+  });
+}
+
 // src/build/route-types/codegen.ts
 function generateRouteTypesSource(routeManifest, searchSchemas) {
-  const entries = Object.entries(routeManifest).sort(
-    ([a], [b]) => a.localeCompare(b)
-  );
+  const entries = Object.entries(routeManifest).filter(([name]) => !isAutoGeneratedRouteName(name)).sort(([a], [b]) => a.localeCompare(b));
+  const filteredSearchSchemas = searchSchemas ? Object.fromEntries(
+    Object.entries(searchSchemas).filter(
+      ([name]) => !isAutoGeneratedRouteName(name)
+    )
+  ) : void 0;
   const objectBody = entries.map(([name, pattern]) => {
     const key = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name) ? name : `"${name}"`;
     const params = extractParamsFromPattern(pattern);
-    const search = searchSchemas?.[name];
+    const search = filteredSearchSchemas?.[name];
     return formatRouteEntry(key, pattern, params, search);
   }).join("\n");
   return `// Auto-generated by @rangojs/router - do not edit
@@ -2244,6 +2297,9 @@ function buildRouteMapFromBlock(block, fullSource, filePath, visited, searchSche
         diagnosticsOut
       );
     }
+    if (namePrefix === null) {
+      continue;
+    }
     for (const [name, pattern] of Object.entries(childResult.routes)) {
       const prefixedName = namePrefix ? `${namePrefix}.${name}` : name;
       let prefixedPattern;
@@ -2294,6 +2350,7 @@ function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagno
     searchSchemas,
     diagnosticsOut
   );
+  visited.delete(key);
   return { routes, searchSchemas };
 }
 
@@ -2301,6 +2358,17 @@ function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagno
 import { readFileSync as readFileSync2, writeFileSync, existsSync as existsSync3, unlinkSync } from "node:fs";
 import { join as join2, dirname as dirname2, resolve as resolve3, basename as pathBasename } from "node:path";
 import ts5 from "typescript";
+function countPublicRouteEntries(source) {
+  const matches = source.matchAll(/^\s+(?:"([^"]+)"|([a-zA-Z_$][^:]*)):\s*["{]/gm) ?? [];
+  let count = 0;
+  for (const match of matches) {
+    const routeName = match[1] || match[2];
+    if (routeName && !isAutoGeneratedRouteName(routeName.trim())) {
+      count++;
+    }
+  }
+  return count;
+}
 function extractUrlsVariableFromRouter(code) {
   const sourceFile = ts5.createSourceFile(
     "router.tsx",
@@ -2439,8 +2507,10 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
     );
     if (existing !== source) {
       if (opts?.preserveIfLarger && existing) {
-        const existingCount = (existing.match(/^\s+["a-zA-Z_$][^:]*:\s*["{]/gm) || []).length;
-        const newCount = Object.keys(result.routes).length;
+        const existingCount = countPublicRouteEntries(existing);
+        const newCount = Object.keys(result.routes).filter(
+          (name) => !isAutoGeneratedRouteName(name)
+        ).length;
         if (existingCount > newCount) {
           continue;
         }
@@ -2684,7 +2754,8 @@ function createVirtualEntriesPlugin(entries, routerPathRef) {
           return virtualModules[virtualId];
         }
         if (virtualId === VIRTUAL_IDS.rsc && routerPathRef?.path) {
-          const absoluteRouterPath = routerPathRef.path.startsWith(".") ? "/" + routerPathRef.path.slice(2) : routerPathRef.path;
+          const raw = routerPathRef.path.startsWith(".") ? "/" + routerPathRef.path.slice(2) : routerPathRef.path;
+          const absoluteRouterPath = raw.replaceAll("\\", "/");
           return getVirtualEntryRSC(absoluteRouterPath);
         }
       }
@@ -2881,7 +2952,7 @@ function createVirtualStubPlugin() {
 }
 
 // src/vite/plugins/client-ref-hashing.ts
-import { relative as relative2, posix } from "node:path";
+import { relative as relative2 } from "node:path";
 import { createHash as createHash2 } from "node:crypto";
 var CLIENT_PKG_PROXY_PREFIX = "/@id/__x00__virtual:vite-rsc/client-package-proxy/";
 var CLIENT_IN_SERVER_PKG_PROXY_PREFIX = "/@id/__x00__virtual:vite-rsc/client-in-server-package-proxy/";
@@ -2894,10 +2965,10 @@ function computeProductionHash(projectRoot, refKey) {
     const absPath = decodeURIComponent(
       refKey.slice(CLIENT_IN_SERVER_PKG_PROXY_PREFIX.length)
     );
-    toHash = posix.normalize(relative2(projectRoot, absPath));
+    toHash = relative2(projectRoot, absPath).replaceAll("\\", "/");
   } else if (refKey.startsWith(FS_PREFIX)) {
     const absPath = refKey.slice(FS_PREFIX.length - 1);
-    toHash = posix.normalize(relative2(projectRoot, absPath));
+    toHash = relative2(projectRoot, absPath).replaceAll("\\", "/");
   } else if (refKey.startsWith("/")) {
     toHash = refKey.slice(1);
   } else {
@@ -3143,6 +3214,18 @@ function escapeRegExp2(str) {
 function encodePathParam(value) {
   return String(value).split("/").map((segment) => encodeURIComponent(segment)).join("/");
 }
+function substituteRouteParams(pattern, params, encode = encodeURIComponent) {
+  let result = pattern;
+  for (const [key, value] of Object.entries(params)) {
+    const escaped = escapeRegExp2(key);
+    result = result.replace(
+      new RegExp(`:${escaped}(\\([^)]*\\))?\\??`),
+      encode(value)
+    );
+    result = result.replace(`*${key}`, encode(value));
+  }
+  return result;
+}
 async function runWithConcurrency(items, concurrency, fn) {
   const limit = Math.max(1, Math.min(concurrency, items.length));
   if (limit <= 1) {
@@ -3215,18 +3298,8 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
   const getParamsReverse = (name, params) => {
     const pattern = allRoutes[name];
     if (!pattern) throw new Error(`Unknown route: "${name}"`);
-    let result = pattern;
-    if (params) {
-      for (const [key, value] of Object.entries(params)) {
-        const escaped = escapeRegExp2(key);
-        result = result.replace(
-          new RegExp(`:${escaped}(\\([^)]*\\))?`),
-          encodeURIComponent(value)
-        );
-        result = result.replace(`*${key}`, encodeURIComponent(value));
-      }
-    }
-    return result;
+    if (!params) return pattern;
+    return substituteRouteParams(pattern, params);
   };
   for (const { manifest } of allManifests) {
     if (!manifest.prerenderRoutes) continue;
@@ -3234,15 +3307,17 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
     for (const routeName of manifest.prerenderRoutes) {
       const pattern = manifest.routeManifest[routeName];
       if (!pattern) continue;
+      const def = defs[routeName];
+      const isPassthroughRoute = !!def?.options?.passthrough;
       const hasDynamic = pattern.includes(":") || pattern.includes("*");
       if (!hasDynamic) {
         entries.push({
           urlPath: pattern.replace(/\/$/, "") || "/",
           routeName,
-          concurrency: 1
+          concurrency: 1,
+          isPassthroughRoute
         });
       } else {
-        const def = defs[routeName];
         if (def?.getParams) {
           try {
             const buildVars = {};
@@ -3257,18 +3332,11 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             const concurrency = def.options?.concurrency ?? 1;
             const hasBuildVars = Object.keys(buildVars).length > 0 || Object.getOwnPropertySymbols(buildVars).length > 0;
             for (const params of paramsList) {
-              let url = pattern;
-              for (const [key, value] of Object.entries(
-                params
-              )) {
-                const encoded = encodePathParam(value);
-                const escaped = escapeRegExp2(key);
-                url = url.replace(
-                  new RegExp(`:${escaped}(\\([^)]*\\))?`),
-                  encoded
-                );
-                url = url.replace(`*${key}`, encoded);
-              }
+              let url = substituteRouteParams(
+                pattern,
+                params,
+                encodePathParam
+              );
               if (url.includes("*")) {
                 const wildcardValue = params["*"] ?? params.splat;
                 if (wildcardValue !== void 0) {
@@ -3279,7 +3347,8 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
                 urlPath: url.replace(/\/$/, "") || "/",
                 routeName,
                 concurrency,
-                ...hasBuildVars ? { buildVars } : {}
+                ...hasBuildVars ? { buildVars } : {},
+                isPassthroughRoute
               });
             }
           } catch (err) {
@@ -3335,9 +3404,18 @@ async function expandPrerenderRoutes(state, rscEnv, registry, allManifests) {
             const result = await routerInstance.matchForPrerender(
               entry.urlPath,
               {},
-              entry.buildVars
+              entry.buildVars,
+              entry.isPassthroughRoute
             );
             if (!result) continue;
+            if (result.passthrough) {
+              const elapsed2 = (performance.now() - startUrl).toFixed(0);
+              console.log(
+                `[rsc-router]   PASS ${entry.urlPath.padEnd(40)} (${elapsed2}ms) - live fallback`
+              );
+              doneCount++;
+              break;
+            }
             const paramHash = hashParams(result.params || {});
             collectedData[`${result.routeName}/${paramHash}`] = {
               segments: result.segments,
@@ -3537,12 +3615,12 @@ async function discoverRouters(state, rscEnv) {
   }
   const buildMod = await rscEnv.runner.import("@rangojs/router/build");
   const generateManifestFull = buildMod.generateManifestFull;
-  state.mergedRouteManifest = {};
-  state.mergedPrecomputedEntries = [];
-  state.perRouterManifests = [];
-  state.perRouterManifestDataMap = /* @__PURE__ */ new Map();
-  state.perRouterPrecomputedMap = /* @__PURE__ */ new Map();
-  state.perRouterTrieMap = /* @__PURE__ */ new Map();
+  const newMergedRouteManifest = {};
+  const newMergedPrecomputedEntries = [];
+  const newPerRouterManifests = [];
+  const newPerRouterManifestDataMap = /* @__PURE__ */ new Map();
+  const newPerRouterPrecomputedMap = /* @__PURE__ */ new Map();
+  const newPerRouterTrieMap = /* @__PURE__ */ new Map();
   let mergedRouteAncestry = {};
   let mergedRouteTrailingSlash = {};
   let routerMountIndex = 0;
@@ -3559,7 +3637,7 @@ async function discoverRouters(state, rscEnv) {
       (p) => !p.includes(":") && !p.includes("*")
     ).length;
     const dynamicRoutes = routeCount - staticRoutes;
-    Object.assign(state.mergedRouteManifest, manifest.routeManifest);
+    Object.assign(newMergedRouteManifest, manifest.routeManifest);
     let factoryOnlyPrefixes;
     if (router.__sourceFile) {
       const staticParsed = buildCombinedRouteMapForRouterFile(
@@ -3577,7 +3655,7 @@ async function discoverRouters(state, rscEnv) {
       }
       if (factoryOnlyPrefixes.size === 0) factoryOnlyPrefixes = void 0;
     }
-    state.perRouterManifests.push({
+    newPerRouterManifests.push({
       id,
       routeManifest: manifest.routeManifest,
       routeSearchSchemas: manifest.routeSearchSchemas,
@@ -3593,16 +3671,16 @@ async function discoverRouters(state, rscEnv) {
     flattenLeafEntries(
       manifest.prefixTree,
       manifest.routeManifest,
-      state.mergedPrecomputedEntries
+      newMergedPrecomputedEntries
     );
-    state.perRouterManifestDataMap.set(id, manifest.routeManifest);
+    newPerRouterManifestDataMap.set(id, manifest.routeManifest);
     const routerPrecomputed = [];
     flattenLeafEntries(
       manifest.prefixTree,
       manifest.routeManifest,
       routerPrecomputed
     );
-    state.perRouterPrecomputedMap.set(id, routerPrecomputed);
+    newPerRouterPrecomputedMap.set(id, routerPrecomputed);
     console.log(
       `[rsc-router] Router "${id}" -> ${routeCount} routes (${staticRoutes} static, ${dynamicRoutes} dynamic)`
     );
@@ -3617,7 +3695,8 @@ async function discoverRouters(state, rscEnv) {
       );
     }
   }
-  if (state.mergedRouteManifest && Object.keys(state.mergedRouteManifest).length > 0) {
+  let newMergedRouteTrie = null;
+  if (Object.keys(newMergedRouteManifest).length > 0) {
     const buildRouteTrie = buildMod.buildRouteTrie;
     if (buildRouteTrie && mergedRouteAncestry) {
       const routeToStaticPrefix = {};
@@ -3647,8 +3726,8 @@ async function discoverRouters(state, rscEnv) {
           Object.assign(mergedResponseTypeRoutes, manifest.responseTypeRoutes);
         }
       }
-      state.mergedRouteTrie = buildRouteTrie(
-        state.mergedRouteManifest,
+      newMergedRouteTrie = buildRouteTrie(
+        newMergedRouteManifest,
         mergedRouteAncestry,
         routeToStaticPrefix,
         Object.keys(mergedRouteTrailingSlash).length > 0 ? mergedRouteTrailingSlash : void 0,
@@ -3675,10 +3754,17 @@ async function discoverRouters(state, rscEnv) {
           perRouterPassthroughNames && perRouterPassthroughNames.size > 0 ? perRouterPassthroughNames : void 0,
           manifest.responseTypeRoutes && Object.keys(manifest.responseTypeRoutes).length > 0 ? manifest.responseTypeRoutes : void 0
         );
-        state.perRouterTrieMap.set(id, perRouterTrie);
+        newPerRouterTrieMap.set(id, perRouterTrie);
       }
     }
   }
+  state.mergedRouteManifest = newMergedRouteManifest;
+  state.mergedPrecomputedEntries = newMergedPrecomputedEntries;
+  state.perRouterManifests = newPerRouterManifests;
+  state.perRouterManifestDataMap = newPerRouterManifestDataMap;
+  state.perRouterPrecomputedMap = newPerRouterPrecomputedMap;
+  state.perRouterTrieMap = newPerRouterTrieMap;
+  state.mergedRouteTrie = newMergedRouteTrie;
   await expandPrerenderRoutes(state, rscEnv, registry, allManifests);
   await renderStaticHandlers(state, rscEnv, registry);
   return serverMod;
@@ -3690,7 +3776,7 @@ import { readFileSync as readFileSync4, writeFileSync as writeFileSync2, existsS
 function filterUserNamedRoutes(manifest) {
   const filtered = {};
   for (const [name, pattern] of Object.entries(manifest)) {
-    if (!name.startsWith("$")) {
+    if (!isAutoGeneratedRouteName(name)) {
       filtered[name] = pattern;
     }
   }
@@ -3813,7 +3899,7 @@ function supplementGenFilesWithRuntimeRoutes(state) {
       ...staticParsed.searchSchemas
     };
     for (const [name, pattern] of Object.entries(routeManifest)) {
-      if (name.startsWith("$")) continue;
+      if (isAutoGeneratedRouteName(name)) continue;
       const dotIdx = name.indexOf(".");
       if (dotIdx <= 0) continue;
       const prefix = name.substring(0, dotIdx + 1);
@@ -3858,7 +3944,7 @@ function generateRoutesManifestModule(state) {
         const genPath = join4(
           routerDir,
           `${routerBasename}.named-routes.gen.js`
-        );
+        ).replaceAll("\\", "/");
         const varName = `_r${varIdx++}`;
         genFileImports.push(
           `import { NamedRoutes as ${varName} } from ${JSON.stringify(genPath)};`
@@ -3952,7 +4038,10 @@ function generatePerRouterModule(state, routerId) {
       /\.(tsx?|jsx?)$/,
       ""
     );
-    const genPath = join4(routerDir, `${routerBasename}.named-routes.gen.js`);
+    const genPath = join4(
+      routerDir,
+      `${routerBasename}.named-routes.gen.js`
+    ).replaceAll("\\", "/");
     lines.push(`import { NamedRoutes as _r } from ${JSON.stringify(genPath)};`);
     lines.push(
       `function __flat(r) { const o = {}; for (const [k, v] of Object.entries(r)) o[k] = typeof v === "string" ? v : v.path; return o; }`
@@ -4034,7 +4123,7 @@ function postprocessBundle(state) {
   state.staticHandlerChunkInfo = null;
   if (hasPrerenderData && existsSync5(rscEntryPath)) {
     const rscCode = readFileSync5(rscEntryPath, "utf-8");
-    if (!rscCode.includes("__PRERENDER_MANIFEST")) {
+    if (!rscCode.includes("__prerender-manifest.js")) {
       try {
         const assetsDir = resolve6(state.projectRoot, "dist/rsc/assets");
         mkdirSync(assetsDir, { recursive: true });
@@ -4089,11 +4178,11 @@ globalThis.__PRERENDER_MANIFEST = __pm;
         for (const [handlerId, { encoded, handles }] of Object.entries(
           state.staticCollectedData
         )) {
-          const contentHash = createHash4("sha256").update(encoded).digest("hex").slice(0, 8);
-          const assetFileName = `__st-${contentHash}.js`;
-          const assetPath = resolve6(assetsDir, assetFileName);
           const hasHandles = Object.keys(handles).length > 0;
           const exportValue = hasHandles ? JSON.stringify({ encoded, handles }) : JSON.stringify(encoded);
+          const contentHash = createHash4("sha256").update(exportValue).digest("hex").slice(0, 8);
+          const assetFileName = `__st-${contentHash}.js`;
+          const assetPath = resolve6(assetsDir, assetFileName);
           const assetCode = `export default ${exportValue};
 `;
           writeFileSync3(assetPath, assetCode);
@@ -4293,34 +4382,10 @@ ${err.stack}`
           if (serverMod?.setManifestReadyPromise) {
             serverMod.setManifestReadyPromise(discoveryPromise);
           }
-          const serverModAfterDiscovery = await discoverRouters(s, rscEnv);
-          mainRegistry = serverModAfterDiscovery?.RouterRegistry ?? null;
+          await discoverRouters(s, rscEnv);
           s.devServerOrigin = getDevServerOrigin();
           writeRouteTypesFiles(s);
-          if (s.mergedRouteManifest && serverMod?.setCachedManifest) {
-            serverMod.setCachedManifest(s.mergedRouteManifest);
-          }
-          if (s.mergedPrecomputedEntries && s.mergedPrecomputedEntries.length > 0 && serverMod?.setPrecomputedEntries) {
-            serverMod.setPrecomputedEntries(s.mergedPrecomputedEntries);
-          }
-          if (s.mergedRouteTrie && serverMod?.setRouteTrie) {
-            serverMod.setRouteTrie(s.mergedRouteTrie);
-          }
-          if (serverMod?.setRouterManifest) {
-            for (const [routerId, manifest] of s.perRouterManifestDataMap) {
-              serverMod.setRouterManifest(routerId, manifest);
-            }
-          }
-          if (serverMod?.setRouterTrie) {
-            for (const [routerId, trie] of s.perRouterTrieMap) {
-              serverMod.setRouterTrie(routerId, trie);
-            }
-          }
-          if (serverMod?.setRouterPrecomputedEntries) {
-            for (const [routerId, entries] of s.perRouterPrecomputedMap) {
-              serverMod.setRouterPrecomputedEntries(routerId, entries);
-            }
-          }
+          await propagateDiscoveryState(rscEnv);
         } catch (err) {
           console.warn(
             `[rsc-router] Router discovery failed: ${err.message}
@@ -4334,6 +4399,38 @@ ${err.stack}`
         setTimeout(() => discover().then(resolve8, resolve8), 0);
       });
       let mainRegistry = null;
+      const propagateDiscoveryState = async (rscEnv) => {
+        const serverMod = await rscEnv.runner.import("@rangojs/router/server");
+        if (!serverMod) return;
+        if (serverMod.clearAllRouterData) {
+          serverMod.clearAllRouterData();
+        }
+        mainRegistry = serverMod.RouterRegistry ?? null;
+        if (s.mergedRouteManifest && serverMod.setCachedManifest) {
+          serverMod.setCachedManifest(s.mergedRouteManifest);
+        }
+        if (s.mergedPrecomputedEntries && s.mergedPrecomputedEntries.length > 0 && serverMod.setPrecomputedEntries) {
+          serverMod.setPrecomputedEntries(s.mergedPrecomputedEntries);
+        }
+        if (s.mergedRouteTrie && serverMod.setRouteTrie) {
+          serverMod.setRouteTrie(s.mergedRouteTrie);
+        }
+        if (serverMod.setRouterManifest) {
+          for (const [routerId, manifest] of s.perRouterManifestDataMap) {
+            serverMod.setRouterManifest(routerId, manifest);
+          }
+        }
+        if (serverMod.setRouterTrie) {
+          for (const [routerId, trie] of s.perRouterTrieMap) {
+            serverMod.setRouterTrie(routerId, trie);
+          }
+        }
+        if (serverMod.setRouterPrecomputedEntries) {
+          for (const [routerId, entries] of s.perRouterPrecomputedMap) {
+            serverMod.setRouterPrecomputedEntries(routerId, entries);
+          }
+        }
+      };
       server.middlewares.use("/__rsc_prerender", async (req, res) => {
         if (s.discoveryDone) await s.discoveryDone;
         const url = new URL(req.url || "/", "http://localhost");
@@ -4356,11 +4453,20 @@ ${err.stack}`
           return;
         }
         const wantIntercept = url.searchParams.get("intercept") === "1";
+        const wantRouteName = url.searchParams.get("routeName");
+        const wantPassthrough = url.searchParams.get("passthrough") === "1";
         for (const [, routerInstance] of registry) {
           if (!routerInstance.matchForPrerender) continue;
           try {
-            const result = await routerInstance.matchForPrerender(pathname, {});
+            const result = await routerInstance.matchForPrerender(
+              pathname,
+              {},
+              void 0,
+              wantPassthrough
+            );
             if (!result) continue;
+            if (result.passthrough) continue;
+            if (wantRouteName && result.routeName !== wantRouteName) continue;
             res.setHeader("content-type", "application/json");
             let payload;
             if (wantIntercept && result.interceptSegments?.length) {
@@ -4397,10 +4503,29 @@ ${err.stack}`
         const maybeHandleGeneratedRouteFileMutation = (filePath) => {
           if (!isGeneratedRouteFile(filePath)) return false;
           if (consumeSelfGenWrite(s, filePath)) return true;
+          const hasRunner = !!server.environments?.rsc?.runner;
+          if (!hasRunner) return true;
           regenerateGeneratedRouteFiles();
           return true;
         };
         let routeChangeTimer;
+        let runtimeRediscoveryInProgress = false;
+        const refreshRuntimeDiscovery = async () => {
+          const rscEnv = server.environments?.rsc;
+          if (!rscEnv?.runner || runtimeRediscoveryInProgress) return;
+          runtimeRediscoveryInProgress = true;
+          try {
+            await discoverRouters(s, rscEnv);
+            writeRouteTypesFiles(s);
+            await propagateDiscoveryState(rscEnv);
+          } catch (err) {
+            console.warn(
+              `[rsc-router] Runtime re-discovery failed: ${err.message}`
+            );
+          } finally {
+            runtimeRediscoveryInProgress = false;
+          }
+        };
         const scheduleRouteRegeneration = () => {
           clearTimeout(routeChangeTimer);
           routeChangeTimer = setTimeout(() => {
@@ -4415,6 +4540,13 @@ ${err.stack}`
                 `[rsc-router] Route regeneration error: ${err.message}`
               );
             }
+            if (s.perRouterManifests.length > 0) {
+              refreshRuntimeDiscovery().catch((err) => {
+                console.warn(
+                  `[rsc-router] Runtime re-discovery error: ${err.message}`
+                );
+              });
+            }
           }, 100);
         };
         const handleRouteFileChange = (filePath) => {
@@ -4441,6 +4573,8 @@ ${err.stack}`
         server.watcher.on("change", handleRouteFileChange);
         server.watcher.on("unlink", (filePath) => {
           if (!isGeneratedRouteFile(filePath)) return;
+          const hasRunner = !!server.environments?.rsc?.runner;
+          if (!hasRunner) return;
           regenerateGeneratedRouteFiles();
         });
       }
@@ -4699,7 +4833,7 @@ async function rango(options) {
           const candidates = findRouterFiles(root, filter);
           if (candidates.length === 1) {
             const abs = candidates[0];
-            routerRef.path = abs.startsWith(root) ? "./" + abs.slice(root.length + 1) : abs;
+            routerRef.path = (abs.startsWith(root) ? "./" + abs.slice(root.length + 1) : abs).replaceAll("\\", "/");
           } else if (candidates.length > 1) {
             const list = candidates.map(
               (f) => "  - " + (f.startsWith(root) ? f.slice(root.length + 1) : f)