vinext 0.0.51 → 0.0.53

package/dist/routing/app-route-graph.js

@@ -97,9 +97,12 @@ function createStaticSegmentGraph(routes) {
 			const treePath = createAppRouteGraphTreePath(route.routeSegments, treePosition);
 			const existingLayout = layouts.get(layoutId);
 			if (existingLayout) assertRouteManifestRootBoundary("layout", route, layoutId, existingLayout.rootBoundaryId);
+			const layoutRouteParts = convertTreePathToRouteParts(treePath);
 			const layout = {
 				id: layoutId,
 				treePath,
+				patternParts: layoutRouteParts.urlSegments,
+				paramNames: layoutRouteParts.params,
 				rootBoundaryId: route.ids.rootBoundary
 			};
 			layouts.set(layoutId, layout);
@@ -140,6 +143,20 @@ function createStaticSegmentGraph(routes) {
 		for (const slot of route.parallelSlots) {
 			const ownerLayoutId = findSlotOwnerLayoutId(route, slot);
 			const defaultId = slot.defaultPath ? createAppRouteGraphDefaultId(slot.id) : null;
+			if (slot.layoutPath) {
+				const slotLayoutTreePath = createSlotLayoutTreePath(slot);
+				const slotLayoutId = createAppRouteGraphLayoutId(slotLayoutTreePath);
+				const existingLayout = layouts.get(slotLayoutId);
+				if (existingLayout) assertRouteManifestRootBoundary("layout", route, slotLayoutId, existingLayout.rootBoundaryId);
+				const slotLayoutRouteParts = convertTreePathToRouteParts(slotLayoutTreePath);
+				layouts.set(slotLayoutId, {
+					id: slotLayoutId,
+					treePath: slotLayoutTreePath,
+					patternParts: slotLayoutRouteParts.urlSegments,
+					paramNames: slotLayoutRouteParts.params,
+					rootBoundaryId: route.ids.rootBoundary
+				});
+			}
 			slots.set(slot.id, {
 				id: slot.id,
 				key: slot.key,
@@ -195,6 +212,11 @@ function findSlotOwnerLayoutId(route, slot) {
 	if (slot.layoutIndex < 0) return null;
 	return route.ids.layouts[slot.layoutIndex] ?? null;
 }
+function createSlotLayoutTreePath(slot) {
+	const slotSegment = `@${slot.name}`;
+	if (slot.ownerTreePath === "/") return `/${slotSegment}`;
+	return `${slot.ownerTreePath}/${slotSegment}`;
+}
 function createRouteManifestSlotBinding(route, slot, ownerLayoutId, defaultId) {
 	const state = getRouteManifestSlotBindingState(slot);
 	const binding = {
@@ -307,7 +329,7 @@ function createRouteManifestGraphVersion(segmentGraph) {
 }
 async function buildAppRouteGraph(appDir, matcher) {
 	const routes = [];
-	const excludeDir = (name) => name.startsWith("@") || name.startsWith("_");
+	const excludeDir = (name) => name.startsWith("@") || name.startsWith("_") || isInterceptionMarkerDir(name);
 	for await (const file of scanWithExtensions("**/page", appDir, matcher.extensions, excludeDir)) {
 		const route = fileToAppRoute(file, appDir, "page", matcher);
 		if (route) routes.push(route);
@@ -317,17 +339,22 @@ async function buildAppRouteGraph(appDir, matcher) {
 		if (route) routes.push(route);
 	}
 	const routePatterns = new Set(routes.map((route) => route.pattern));
+	const ghostParentRoutes = [];
 	for await (const file of scanWithExtensions("**/layout", appDir, matcher.extensions, excludeDir)) {
 		const dir = path.dirname(file);
 		const routeDir = dir === "." ? appDir : path.join(appDir, dir);
 		if (!hasParallelSlotDirectory(routeDir)) continue;
 		if (discoverParallelSlots(routeDir, appDir, matcher).length === 0) continue;
 		const route = directoryToAppRoute(dir, appDir, matcher, null, null);
-		if (!route || routePatterns.has(route.pattern)) continue;
+		if (!route) continue;
+		if (routePatterns.has(route.pattern)) {
+			ghostParentRoutes.push(route);
+			continue;
+		}
 		routes.push(route);
 		routePatterns.add(route.pattern);
 	}
-	const slotSubRoutes = discoverSlotSubRoutes(routes, matcher);
+	const slotSubRoutes = discoverSlotSubRoutes(routes, matcher, ghostParentRoutes);
 	routes.push(...slotSubRoutes);
 	validatePageRouteConflicts(routes, appDir);
 	validateRoutePatterns(routes.map((route) => route.pattern));
@@ -381,7 +408,7 @@ function formatAppFilePath(filePath, appDir) {
 * - @audience slot → @audience/demographics/page.tsx (matched)
 * - other slots → their default.tsx (fallback)
 */
-function discoverSlotSubRoutes(routes, matcher) {
+function discoverSlotSubRoutes(routes, matcher, ghostParents = []) {
 	const syntheticRoutes = [];
 	const routesByPattern = new Map(routes.map((r) => [r.pattern, r]));
 	const applySlotSubPages = (route, slotPages, rawSegments) => {
@@ -395,7 +422,8 @@ function discoverSlotSubRoutes(routes, matcher) {
 			return slot;
 		});
 	};
-	for (const parentRoute of routes) {
+	const allParents = [...routes, ...ghostParents];
+	for (const parentRoute of allParents) {
 		if (parentRoute.parallelSlots.length === 0) continue;
 		const isLayoutOnlyUiRoute = !parentRoute.pagePath && !parentRoute.routePath && parentRoute.layouts.length > 0;
 		if (!parentRoute.pagePath && !isLayoutOnlyUiRoute) continue;
@@ -632,6 +660,18 @@ function createAppRouteGraphTreePath(routeSegments, treePosition) {
 	if (treePathSegments.length === 0) return "/";
 	return `/${treePathSegments.join("/")}`;
 }
+function convertTreePathToRouteParts(treePath) {
+	if (treePath === "/") return {
+		urlSegments: [],
+		params: []
+	};
+	const routeParts = convertSegmentsToRouteParts(treePath.split("/").filter(Boolean));
+	if (!routeParts) throw new Error(`Invalid App Router layout tree path "${treePath}".`);
+	return {
+		urlSegments: routeParts.urlSegments,
+		params: routeParts.params
+	};
+}
 /**
 * Compute the tree position (directory depth from app root) for each layout.
 * Root layout = 0, a layout at app/blog/ = 1, app/blog/(group)/ = 2.
@@ -991,6 +1031,18 @@ const INTERCEPT_PATTERNS = [
 	}
 ];
 /**
+* Check whether a directory name begins with an interception route marker.
+*
+* Matches the prefixes listed in {@link INTERCEPT_PATTERNS}: `(.)`, `(..)`,
+* `(...)`, `(..)(..)`. The marker is not a real URL segment, so the global
+* page/route scanner must skip these directories to avoid materialising
+* literal patterns like `/templates/(..)showcase`. Interception target
+* registration happens separately via {@link discoverInterceptingRoutes}.
+*/
+function isInterceptionMarkerDir(name) {
+	return matchInterceptConvention(name) !== null;
+}
+/**
 * Discover intercepting routes inside a parallel slot directory.
 *
 * Intercepting routes use conventions like (.)photo, (..)feed, (...), etc.
@@ -1233,6 +1285,6 @@ function joinRoutePattern(basePattern, subPath) {
 	return basePattern === "/" ? `/${subPath}` : `${basePattern}/${subPath}`;
 }
 //#endregion
-export { buildAppRouteGraph, computeRootParamNames };
+export { buildAppRouteGraph, computeRootParamNames, convertSegmentsToRouteParts, isInvisibleSegment };
 
 //# sourceMappingURL=app-route-graph.js.map