@rangojs/router 0.0.0-experimental.104 → 0.0.0-experimental.105

package/dist/vite/index.js

@@ -2040,7 +2040,7 @@ import { resolve } from "node:path";
 // package.json
 var package_default = {
   name: "@rangojs/router",
-  version: "0.0.0-experimental.104",
+  version: "0.0.0-experimental.105",
   description: "Django-inspired RSC router with composable URL patterns",
   keywords: [
     "react",
@@ -3842,9 +3842,12 @@ function checkSelfGenWrite(state, filePath, consume) {
 
 // src/vite/utils/manifest-utils.ts
 function flattenLeafEntries(prefixTree, routeManifest, result) {
-  function visit(node) {
+  function visit(node, ancestorStaticPrefixes) {
     const children = node.children || {};
     if (Object.keys(children).length === 0 && node.routes && node.routes.length > 0) {
+      if (ancestorStaticPrefixes.has(node.staticPrefix)) {
+        return;
+      }
       const routes = {};
       for (const name of node.routes) {
         if (name in routeManifest) {
@@ -3853,13 +3856,15 @@ function flattenLeafEntries(prefixTree, routeManifest, result) {
       }
       result.push({ staticPrefix: node.staticPrefix, routes });
     } else {
+      const nextAncestors = new Set(ancestorStaticPrefixes);
+      nextAncestors.add(node.staticPrefix);
       for (const child of Object.values(children)) {
-        visit(child);
+        visit(child, nextAncestors);
       }
     }
   }
   for (const node of Object.values(prefixTree)) {
-    visit(node);
+    visit(node, /* @__PURE__ */ new Set());
   }
 }
 function buildRouteToStaticPrefix(prefixTree, result) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rangojs/router",
-  "version": "0.0.0-experimental.104",
+  "version": "0.0.0-experimental.105",
   "description": "Django-inspired RSC router with composable URL patterns",
   "keywords": [
     "react",

package/src/vite/utils/manifest-utils.ts

@@ -4,20 +4,33 @@
  * used directly by evaluateLazyEntry() without running the handler.
  * Non-leaf nodes are skipped because they have nested lazy includes that
  * require the handler to run for discovery.
+ *
+ * A leaf is also skipped when its staticPrefix collides with an ancestor
+ * include node's staticPrefix. That happens when a dynamic param collapses the
+ * staticPrefix of nested includes onto the parent's (e.g. `/m/:id/edit` -> sp
+ * `/m`): precomputing such a leaf under the collapsed prefix would let the
+ * ancestor's lazy entry claim a route it cannot register (the route is behind
+ * further nested lazy includes), producing a RouteNotFoundError at request time
+ * (issue #506). Those routes are resolved via the handler chain instead.
  */
 export function flattenLeafEntries(
   prefixTree: Record<string, any>,
   routeManifest: Record<string, string>,
   result: Array<{ staticPrefix: string; routes: Record<string, string> }>,
 ): void {
-  function visit(node: any): void {
+  function visit(node: any, ancestorStaticPrefixes: Set<string>): void {
     const children = node.children || {};
     if (
       Object.keys(children).length === 0 &&
       node.routes &&
       node.routes.length > 0
     ) {
-      // Leaf node: collect its routes from the manifest
+      // Leaf node. Skip if its staticPrefix collides with an ancestor include
+      // node's staticPrefix (dynamic-param collapse) — see doc comment above.
+      if (ancestorStaticPrefixes.has(node.staticPrefix)) {
+        return;
+      }
+      // Collect its routes from the manifest
       const routes: Record<string, string> = {};
       for (const name of node.routes) {
         if (name in routeManifest) {
@@ -26,14 +39,17 @@ export function flattenLeafEntries(
       }
       result.push({ staticPrefix: node.staticPrefix, routes });
     } else {
-      // Non-leaf: recurse into children
+      // Non-leaf: recurse into children, tracking this node's staticPrefix as
+      // an ancestor so a collapsed nested leaf below it is not over-claimed.
+      const nextAncestors = new Set(ancestorStaticPrefixes);
+      nextAncestors.add(node.staticPrefix);
       for (const child of Object.values(children)) {
-        visit(child);
+        visit(child, nextAncestors);
       }
     }
   }
   for (const node of Object.values(prefixTree)) {
-    visit(node);
+    visit(node, new Set());
   }
 }