vinext 0.0.42 → 0.0.43

package/dist/entries/app-rsc-entry.js

@@ -785,6 +785,10 @@ function matchPattern(urlParts, patternParts) {
   return params;
 }
 
+function mergeMatchedParams(sourceParams, targetParams) {
+  return Object.assign(Object.create(null), sourceParams, targetParams);
+}
+
 // Build a global intercepting route lookup for RSC navigation.
 // Maps target URL patterns to { sourceRouteIndex, slotKey, interceptPage, params }.
 const interceptLookup = [];
@@ -810,12 +814,23 @@ for (let ri = 0; ri < routes.length; ri++) {
  * Check if a pathname matches any intercepting route.
  * Returns the match info or null.
  */
-function findIntercept(pathname) {
+function findIntercept(pathname, sourcePathname = null) {
   const urlParts = pathname.split("/").filter(Boolean);
   for (const entry of interceptLookup) {
     const params = matchPattern(urlParts, entry.targetPatternParts);
     if (params !== null) {
-      return { ...entry, matchedParams: params };
+      let sourceParams = Object.create(null);
+      if (sourcePathname !== null) {
+        const sourceRoute = routes[entry.sourceRouteIndex];
+        const sourceParts = sourcePathname.split("/").filter(Boolean);
+        const matchedSourceParams = sourceRoute
+          ? matchPattern(sourceParts, sourceRoute.patternParts)
+          : null;
+        if (matchedSourceParams !== null) {
+          sourceParams = matchedSourceParams;
+        }
+      }
+      return { ...entry, matchedParams: mergeMatchedParams(sourceParams, params) };
     }
   }
   return null;
@@ -829,8 +844,9 @@ async function buildPageElements(route, params, routePath, pageRequest) {
     request,
     mountedSlotsHeader,
   } = pageRequest;
+  const hasPageModule = !!route.page;
   const PageComponent = route.page?.default;
-  if (!PageComponent) {
+  if (hasPageModule && !PageComponent) {
     const _interceptionContext = opts?.interceptionContext ?? null;
     const _noExportRouteId = __createAppPayloadRouteId(routePath, _interceptionContext);
     let _noExportRootLayout = null;
@@ -954,7 +970,7 @@ async function buildPageElements(route, params, routePath, pageRequest) {
     : null;
 
   return __buildAppPageElements({
-    element: createElement(PageComponent, pageProps),
+    element: PageComponent ? createElement(PageComponent, pageProps) : null,
     globalErrorModule: ${globalErrorVar ? globalErrorVar : "null"},
     isRscRequest,
     mountedSlotIds,
@@ -1696,7 +1712,9 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
           cleanPathname,
           currentParams: actionParams,
           currentRoute: actionRoute,
-          findIntercept,
+          findIntercept(pathname) {
+            return findIntercept(pathname, interceptionContextHeader);
+          },
           getRouteParamNames(sourceRoute) {
             return sourceRoute.params;
           },
@@ -2015,8 +2033,9 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
   }
 
   // Build the component tree: layouts wrapping the page
+  const hasPageModule = !!route.page;
   const PageComponent = route.page?.default;
-  if (!PageComponent) {
+  if (hasPageModule && !PageComponent) {
     setHeadersContext(null);
     setNavigationContext(null);
     return new Response("Page has no default export", { status: 500 });
@@ -2188,7 +2207,9 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
     },
     cleanPathname,
     currentRoute: route,
-    findIntercept,
+    findIntercept(pathname) {
+      return findIntercept(pathname, interceptionContextHeader);
+    },
     getRouteParamNames(sourceRoute) {
       return sourceRoute.params;
     },
@@ -2326,6 +2347,7 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
       return LayoutComp({ params: _asyncLayoutParams, children: null });
     },
     probePage() {
+      if (!PageComponent) return null;
       const _probeSearchObj = {};
       url.searchParams.forEach(function(v, k) {
         if (k in _probeSearchObj) {