vinext 1.0.0-beta.9 → 1.0.1

package/dist/plugins/use-cache-callable.js

@@ -1,9 +1,10 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { NODE_MODULES_PATH_RE, isPathInside, stripViteModuleQuery } from "../utils/path.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { NODE_MODULES_PATH_RE } from "../utils/path.js";
 import { createRequire } from "node:module";
-import { parseAstAsync } from "vite";
 import { pathToFileURL } from "node:url";
+import { parseAstAsync } from "vite";
+import { createHmac, randomBytes } from "node:crypto";
 //#region src/plugins/use-cache-callable.ts
 const PLUGIN_NAME = "vinext:server-function-directives";
 const SOURCE_MODULE_ID_RE = /\.(?:tsx?|jsx?|mjs)(?:\?.*)?$/;
@@ -43,13 +44,6 @@ function acceptsSecondArgument(meta) {
 	if (node?.type !== "FunctionDeclaration" && node?.type !== "FunctionExpression" && node?.type !== "ArrowFunctionExpression") return true;
 	return node.params.length >= 2 || node.params.some((parameter) => parameter.type === "RestElement");
 }
-function isAppPageDefaultExport(options, id, name, isModuleDirective) {
-	const appDir = options.getAppDir();
-	if (!isModuleDirective || name !== "default" || !appDir) return false;
-	const modulePath = stripViteModuleQuery(id);
-	const moduleFileName = path.basename(modulePath);
-	return isPathInside(appDir, modulePath) && path.parse(moduleFileName).name === "page" && options.matchesPageExtension(moduleFileName);
-}
 function shouldTransformModuleExport(name, id, meta) {
 	if (meta.isFunction === false && (name !== "default" && meta.valueNode?.type === "Literal" || meta.valueNode?.type === "ObjectExpression" || meta.valueNode?.type === "ArrayExpression")) return false;
 	if (/\/(layout|template)\.(tsx?|jsx?|mjs)$/.test(id) && name === "default") return false;
@@ -65,11 +59,21 @@ function hasFunctionDirective(meta, directive) {
 	if (node?.type !== "FunctionDeclaration" && node?.type !== "FunctionExpression" && node?.type !== "ArrowFunctionExpression" || node.body.type !== "BlockStatement") return false;
 	return node.body.body.some((statement) => statement.type === "ExpressionStatement" && "directive" in statement && statement.directive === directive);
 }
-function getCacheWrapperOptions(options, id, name, isModuleDirective, meta) {
+function getFunctionDirectiveExportNames(transforms, ast, directive) {
+	const names = /* @__PURE__ */ new Set();
+	for (const group of transforms.scanModuleExports(ast)) {
+		const entries = group.type === "declaration" ? [group.export] : group.type === "variable-declaration" ? group.declarators.flatMap((declarator) => declarator.exports) : group.type === "specifiers" ? group.exports : group.type === "default" ? [{
+			exportName: "default",
+			meta: group.meta
+		}] : [];
+		for (const entry of entries) if (hasFunctionDirective(entry.meta, directive)) names.add(entry.exportName);
+	}
+	return names;
+}
+function getCacheWrapperOptions(meta) {
 	const argumentCount = getArgumentCount(meta);
 	return {
 		acceptsSecondArgument: acceptsSecondArgument(meta),
-		...isAppPageDefaultExport(options, id, name, isModuleDirective) ? { appPageDefaultExport: true } : {},
 		...argumentCount === void 0 ? {} : { argumentCount }
 	};
 }
@@ -78,6 +82,7 @@ async function createUseCacheCallablePlugin(options) {
 	const transformsPath = resolvePluginRscModule(options.projectRoot, "@vitejs/plugin-rsc/transforms");
 	const rscModule = await import(pathToFileURL(rscModulePath).href);
 	const transforms = await import(pathToFileURL(transformsPath).href);
+	const referenceSecret = randomBytes(32);
 	let manager;
 	return {
 		name: PLUGIN_NAME,
@@ -109,6 +114,8 @@ async function createUseCacheCallablePlugin(options) {
 				const useServerBoundary = transforms.hasDirective(ast.body, "use server");
 				if (moduleDirective && useServerBoundary) throw new Error(`A module cannot contain both ${JSON.stringify(moduleDirective)} and "use server" directives.`);
 				const reference = manager.serverReferences.resolve(id, "rsc");
+				const relativeImportId = manager.toRelativeId(reference.importId);
+				const secureExportName = (name) => `$$vinext_cache_${createHmac("sha256", referenceSecret).update(relativeImportId).update("\0").update(name).digest("hex")}`;
 				if (!(this.environment.name === "rsc")) {
 					if (useServerBoundary) {
 						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
@@ -126,6 +133,7 @@ async function createUseCacheCallablePlugin(options) {
 						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
 						return;
 					}
+					const useServerExportNames = getFunctionDirectiveExportNames(transforms, ast, "use server");
 					const result = transforms.transformDirectiveProxyExport(ast, {
 						code,
 						directive: moduleDirective,
@@ -134,7 +142,7 @@ async function createUseCacheCallablePlugin(options) {
 							validateModuleExport(transforms, meta);
 							return true;
 						},
-						runtime: (name) => `$$ReactClient.createServerReference(${JSON.stringify(`${reference.referenceKey}#${name}`)},$$ReactClient.callServer,undefined,${this.environment.mode === "dev" ? "$$ReactClient.findSourceMapURL" : "undefined"},${JSON.stringify(name)})`
+						runtime: (name) => `$$ReactClient.createServerReference(${JSON.stringify(`${reference.referenceKey}#${useServerExportNames.has(name) ? name : secureExportName(name)}`)},$$ReactClient.callServer,undefined,${this.environment.mode === "dev" ? "$$ReactClient.findSourceMapURL" : "undefined"},${JSON.stringify(name)})`
 					});
 					if (!result?.output.hasChanged()) {
 						manager.serverReferences.deleteClaim(PLUGIN_NAME, id);
@@ -142,7 +150,7 @@ async function createUseCacheCallablePlugin(options) {
 					}
 					manager.serverReferences.replaceClaim(PLUGIN_NAME, id, {
 						...reference,
-						exportNames: result.exportNames
+						exportNames: result.exportNames.map((name) => useServerExportNames.has(name) ? name : secureExportName(name))
 					});
 					const runtimeEnvironment = this.environment.name === "client" ? "browser" : "ssr";
 					result.output.prepend(`import * as $$ReactClient from "@vitejs/plugin-rsc/react/${runtimeEnvironment}";\n`);
@@ -151,16 +159,23 @@ async function createUseCacheCallablePlugin(options) {
 						source: id
 					});
 				}
-				const wrap = (value, name, directiveMatch, meta, isModuleDirective) => {
+				const secureExports = /* @__PURE__ */ new Set();
+				const wrap = (value, name, directiveMatch, meta) => {
 					const variant = directiveMatch[1] ?? "";
-					const wrapperOptions = getCacheWrapperOptions(options, id, name, isModuleDirective, meta);
+					const secureName = secureExportName(name);
+					secureExports.add(secureName);
+					const wrapperOptions = {
+						...getCacheWrapperOptions(meta),
+						serverReferenceId: `${reference.referenceKey}#${secureName}`
+					};
 					return `$$cacheRuntime.registerCachedFunction(${value}, ${JSON.stringify(`${id}:${name}`)}, ${JSON.stringify(variant)}, ${JSON.stringify(wrapperOptions)})`;
 				};
 				let needsReactServer = false;
-				const runtime = (value, name, directiveMatch, meta, isModuleDirective) => {
-					const cached = wrap(value, name, directiveMatch, meta, isModuleDirective);
+				const runtime = (value, name, directiveMatch, meta) => {
+					const cached = wrap(value, name, directiveMatch, meta);
+					const secureName = secureExportName(name);
 					needsReactServer = true;
-					return `$$VinextReactServer.registerServerReference(${cached}, ${JSON.stringify(reference.referenceKey)}, ${JSON.stringify(name)})`;
+					return `(${secureName} = $$VinextReactServer.registerServerReference(${cached}, ${JSON.stringify(reference.referenceKey)}, ${JSON.stringify(secureName)}))`;
 				};
 				const result = moduleDirective ? transforms.transformWrapExport(code, ast, {
 					filter: (name, meta) => {
@@ -168,12 +183,13 @@ async function createUseCacheCallablePlugin(options) {
 						validateModuleExport(transforms, meta);
 						return true;
 					},
-					runtime: (value, name, meta) => runtime(value, name, matchUseCacheDirective(moduleDirective), meta, true)
+					runtime: (value, name, meta) => runtime(value, name, matchUseCacheDirective(moduleDirective), meta)
 				}) : transforms.transformHoistInlineDirective(code, ast, {
 					directive: USE_CACHE_DIRECTIVE_CANDIDATE,
 					rejectNonAsyncFunction: true,
 					hoistRuntime: true,
-					runtime: (value, name, meta) => runtime(value, name, matchUseCacheDirective(meta.directiveMatch[0]), meta, false),
+					noExport: true,
+					runtime: (value, name, meta) => runtime(value, name, matchUseCacheDirective(meta.directiveMatch[0]), meta),
 					encode: (value) => `$$cacheRuntime.encryptCacheCaptures(${value})`,
 					decode: (value) => value
 				});
@@ -183,10 +199,15 @@ async function createUseCacheCallablePlugin(options) {
 				}
 				manager.serverReferences.replaceClaim(PLUGIN_NAME, id, {
 					...reference,
-					exportNames: "names" in result ? result.names : result.exportNames
+					exportNames: [...secureExports]
 				});
 				const importPosition = ast.body.find((node) => !("directive" in node))?.start ?? code.length;
-				result.output.prependLeft(importPosition, [`import * as $$cacheRuntime from ${JSON.stringify(options.cacheRuntime)};`, needsReactServer && `import * as $$VinextReactServer from "@vitejs/plugin-rsc/react/rsc/server";`].filter(Boolean).join("\n") + "\n");
+				result.output.prependLeft(importPosition, [
+					`import * as $$cacheRuntime from ${JSON.stringify(options.cacheRuntime)};`,
+					needsReactServer && `import * as $$VinextReactServer from "@vitejs/plugin-rsc/react/rsc/server";`,
+					secureExports.size > 0 && `let ${[...secureExports].join(",")};`
+				].filter(Boolean).join("\n") + "\n");
+				if (secureExports.size > 0) result.output.append(`\nexport { ${[...secureExports].join(",")} };\n`);
 				return magicStringTransformResult(result.output, {
 					hires: "boundary",
 					source: id

package/dist/plugins/wasm-module-import.d.ts

@@ -9,6 +9,5 @@ import { Plugin } from "vite";
  *
  * Fixes #1351.
  */
-declare function createWasmModuleImportPlugin(): Plugin;
-//#endregion
-export { createWasmModuleImportPlugin };
+export declare function createWasmModuleImportPlugin(): Plugin;
+//#endregion

package/dist/plugins/worker-image-imports.d.ts

@@ -5,8 +5,7 @@ import { Plugin } from "vite";
  * Vite worker graphs. Worker builds use their own plugin container, so the
  * top-level vinext:image-imports plugin cannot perform this transform.
  */
-declare function createWorkerImageImportsPlugin(options?: {
+export declare function createWorkerImageImportsPlugin(options?: {
   deploymentId?: string;
 }): Plugin;
-//#endregion
-export { createWorkerImageImportsPlugin };
+//#endregion

package/dist/plugins/worker-image-imports.js

@@ -1,8 +1,8 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
+import { staticStringValue, walkAst } from "./ast-utils.js";
+import { magicStringTransformResult } from "./transform-result.js";
 import { appendDeploymentIdQuery } from "../utils/deployment-id.js";
 import { NODE_MODULES_PATH_RE, stripViteModuleQuery } from "../utils/path.js";
-import { magicStringTransformResult } from "./transform-result.js";
-import { staticStringValue, walkAst } from "./ast-utils.js";
 import fs from "node:fs";
 import { parseAst } from "vite";
 import MagicString from "magic-string";
@@ -78,9 +78,8 @@ function createWorkerImageImportsPlugin(options = {}) {
 				}
 				const output = new MagicString(code);
 				const imageImports = [];
-				walkAst(ast, (value) => {
-					const node = value;
-					if (node.type === "ImportExpression" && typeof node.start === "number" && typeof node.end === "number" && node.source?.type === "Literal" && typeof node.source.value === "string" && WORKER_IMAGE_EXTENSION_RE.test(node.source.value)) {
+				walkAst(ast, (node) => {
+					if (node.type === "ImportExpression" && node.source.type === "Literal" && typeof node.source.value === "string" && WORKER_IMAGE_EXTENSION_RE.test(node.source.value)) {
 						imageImports.push({
 							end: node.end,
 							importPath: node.source.value,
@@ -116,11 +115,10 @@ function createWorkerImageImportsPlugin(options = {}) {
 				}
 				const output = new MagicString(code);
 				let changed = false;
-				walkAst(ast, (value) => {
-					const node = value;
+				walkAst(ast, (node) => {
 					const source = node.type === "ImportExpression" || node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportAllDeclaration" ? node.source : null;
 					const specifier = staticStringValue(source);
-					if (specifier !== null && chunkSpecifiers.has(specifier) && typeof source?.start === "number" && typeof source.end === "number") {
+					if (specifier !== null && chunkSpecifiers.has(specifier) && source) {
 						output.overwrite(source.start, source.end, JSON.stringify(appendDeploymentIdQuery(specifier, options.deploymentId)));
 						changed = true;
 						return false;

package/dist/routing/app-route-graph.d.ts

@@ -119,7 +119,7 @@ type ParallelSlot = {
    */
   slotParamNames?: string[];
 };
-type AppRoute = {
+export type AppRoute = {
   /** Graph-owned semantic identities. Required on AppRouteGraphRoute. */
   ids?: AppRouteSemanticIds;
   /** URL pattern, e.g. "/" or "/about" or "/blog/:slug" */
@@ -225,7 +225,7 @@ type AppRoute = {
   /** Pre-split pattern segments (computed once at scan time, reused per request) */
   patternParts: string[];
 };
-type AppRouteSemanticIds = {
+export type AppRouteSemanticIds = {
   route: string;
   page: string | null;
   routeHandler: string | null;
@@ -241,7 +241,7 @@ type AppRouteSemanticIds = {
 type AppRouteGraphParallelSlot = ParallelSlot & {
   id: string;
 };
-type AppRouteGraphRoute = Omit<AppRoute, "ids" | "parallelSlots" | "rootParamNames"> & {
+export type AppRouteGraphRoute = Omit<AppRoute, "ids" | "parallelSlots" | "rootParamNames"> & {
   ids: AppRouteSemanticIds;
   parallelSlots: AppRouteGraphParallelSlot[];
   rootParamNames: string[];
@@ -249,9 +249,9 @@ type AppRouteGraphRoute = Omit<AppRoute, "ids" | "parallelSlots" | "rootParamNam
 type Flavor<T, Brand extends string> = T & {
   readonly __flavor?: Brand;
 };
-type GraphVersion = Flavor<string, "GraphVersion">;
-type RootBoundaryId = Flavor<string, "RootBoundaryId">;
-type RouteManifestRoute = {
+export type GraphVersion = Flavor<string, "GraphVersion">;
+export type RootBoundaryId = Flavor<string, "RootBoundaryId">;
+export type RouteManifestRoute = {
   id: string;
   pattern: string;
   patternParts: readonly string[];
@@ -311,7 +311,7 @@ type RouteManifestDefault = {
   rootBoundaryId: RootBoundaryId | null;
 };
 type RouteManifestSlotBindingState = "active" | "default" | "unmatched";
-type RouteManifestSlotBinding = {
+export type RouteManifestSlotBinding = {
   id: string;
   routeId: string;
   slotId: string;
@@ -322,7 +322,7 @@ type RouteManifestSlotBinding = {
   slotPatternParts?: readonly string[];
   slotParamNames?: readonly string[];
 };
-type RouteManifestInterception = {
+export type RouteManifestInterception = {
   id: string;
   sourcePattern: string;
   sourcePatternParts: readonly string[];
@@ -341,12 +341,12 @@ type RouteManifestBoundary = {
   ownerLayoutId: string | null;
   rootBoundaryId: RootBoundaryId | null;
 };
-type RouteManifestRootBoundary = {
+export type RouteManifestRootBoundary = {
   id: RootBoundaryId;
   layoutId: string;
   treePath: string;
 };
-type StaticSegmentGraph = {
+export type StaticSegmentGraph = {
   routes: ReadonlyMap<string, RouteManifestRoute>;
   pages: ReadonlyMap<string, RouteManifestPage>;
   routeHandlers: ReadonlyMap<string, RouteManifestRouteHandler>;
@@ -360,20 +360,19 @@ type StaticSegmentGraph = {
   boundaries: ReadonlyMap<string, RouteManifestBoundary>;
   rootBoundaries: ReadonlyMap<RootBoundaryId, RouteManifestRootBoundary>;
 };
-type RouteManifest = {
+export type RouteManifest = {
   graphVersion: GraphVersion;
   segmentGraph: StaticSegmentGraph;
 };
-declare function createAppRouteGraphInterceptionId(slotId: string, sourcePattern: string, targetPattern: string): string;
 /**
  * Build the App Router route graph by scanning `appDir`.
  */
-declare function buildAppRouteGraph(appDir: string, matcher: ValidFileMatcher): Promise<{
+export declare function buildAppRouteGraph(appDir: string, matcher: ValidFileMatcher): Promise<{
   routes: AppRouteGraphRoute[];
   routeManifest: RouteManifest;
 }>;
-declare function computeRootParamNames(routeSegments: readonly string[], layoutTreePositions: readonly number[]): string[];
-declare function patternsStructurallyEquivalent(a: readonly string[], b: readonly string[]): boolean;
+export declare function computeRootParamNames(routeSegments: readonly string[], layoutTreePositions: readonly number[]): string[];
+export declare function patternsStructurallyEquivalent(a: readonly string[], b: readonly string[]): boolean;
 /**
  * Find the best route to attach a sibling intercept to, given the directory
  * that contains the interception marker.
@@ -392,13 +391,13 @@ declare function patternsStructurallyEquivalent(a: readonly string[], b: readonl
  *
  * Exported for tests.
  */
-declare function findOwnerRouteForDir(dir: string, appDir: string, routes: readonly AppRouteGraphRoute[], routesByDir: Map<string, AppRouteGraphRoute>): AppRouteGraphRoute | null;
+export declare function findOwnerRouteForDir(dir: string, appDir: string, routes: readonly AppRouteGraphRoute[], routesByDir: Map<string, AppRouteGraphRoute>): AppRouteGraphRoute | null;
 /**
  * Convert filesystem path segments to URL route parts, skipping invisible segments
  * (route groups, @slots, ".") and converting dynamic segment syntax to Express-style
  * patterns (e.g. "[id]" → ":id", "[...slug]" → ":slug+").
  */
-declare function convertSegmentsToRouteParts(segments: readonly string[]): {
+export declare function convertSegmentsToRouteParts(segments: readonly string[]): {
   urlSegments: string[];
   params: string[];
   isDynamic: boolean;
@@ -421,10 +420,10 @@ declare function convertSegmentsToRouteParts(segments: readonly string[]): {
  * filesystem tree but not the URL namespace — sibling computation is done on
  * the URL-level `patternParts`, so they are correctly transparent here.
  */
-declare function computeAppRouteStaticSiblings(allRoutes: readonly {
+export declare function computeAppRouteStaticSiblings(allRoutes: readonly {
   patternParts?: readonly string[] | null;
 }[], matchedRoute: {
   patternParts?: readonly string[] | null;
 }): string[];
 //#endregion
-export { AppRoute, AppRouteGraphRoute, AppRouteSemanticIds, GraphVersion, RootBoundaryId, RouteManifest, RouteManifestInterception, RouteManifestRootBoundary, RouteManifestRoute, RouteManifestSlotBinding, StaticSegmentGraph, buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, createAppRouteGraphInterceptionId, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };
+export { isInvisibleSegment };

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

@@ -1,8 +1,9 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { decodeRouteSegment, isInvisibleSegment, sortRoutes } from "./utils.js";
 import { findFileWithExts, scanWithExtensions } from "./file-matcher.js";
+import { decodeRouteSegment, isInvisibleSegment, sortRoutes } from "./utils.js";
 import { validateRoutePatterns } from "./route-validation.js";
 import { compareStrings } from "../utils/compare.js";
+import { createAppRouteGraphInterceptionId } from "./app-route-ids.js";
 import fs from "node:fs";
 import { createHash } from "node:crypto";
 //#region src/routing/app-route-graph.ts
@@ -37,9 +38,6 @@ const SIBLING_INTERCEPT_SLOT_NAME = "__vinext_sibling_intercept";
 function createAppRouteGraphSiblingInterceptSlotId(sourcePattern) {
 	return createAppRouteGraphSlotId(SIBLING_INTERCEPT_SLOT_NAME, sourcePattern);
 }
-function createAppRouteGraphInterceptionId(slotId, sourcePattern, targetPattern) {
-	return `interception:${slotId}:${sourcePattern}->${targetPattern}`;
-}
 function createAppRouteGraphRootBoundaryId(treePath) {
 	return `root-boundary:${treePath}`;
 }
@@ -401,7 +399,8 @@ async function buildAppRouteGraph(appDir, matcher) {
 	discoverSiblingInterceptingRoutes(routes, appDir, scanMatcher);
 	validatePageRouteConflicts(routes, appDir);
 	validateRoutePatterns(routes.map((route) => route.pattern));
-	validateRoutePatterns([...new Set(routes.flatMap((route) => [...route.parallelSlots.flatMap((slot) => slot.interceptingRoutes.map((intercept) => intercept.targetPattern)), ...route.siblingIntercepts.map((intercept) => intercept.targetPattern)]))]);
+	const interceptTargetPatterns = [...new Set(routes.flatMap((route) => [...route.parallelSlots.flatMap((slot) => slot.interceptingRoutes.map((intercept) => intercept.targetPattern)), ...route.siblingIntercepts.map((intercept) => intercept.targetPattern)]))];
+	validateRoutePatterns(interceptTargetPatterns);
 	sortRoutes(routes);
 	return {
 		routes,
@@ -1752,4 +1751,4 @@ function computeAppRouteStaticSiblings(allRoutes, matchedRoute) {
 	return Array.from(siblings);
 }
 //#endregion
-export { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, createAppRouteGraphInterceptionId, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };
+export { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, findOwnerRouteForDir, isInvisibleSegment, patternsStructurallyEquivalent };

package/dist/routing/app-route-ids.d.ts

@@ -0,0 +1,3 @@
+//#region src/routing/app-route-ids.d.ts
+export declare function createAppRouteGraphInterceptionId(slotId: string, sourcePattern: string, targetPattern: string): string;
+//#endregion

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

@@ -0,0 +1,6 @@
+//#region src/routing/app-route-ids.ts
+function createAppRouteGraphInterceptionId(slotId, sourcePattern, targetPattern) {
+	return `interception:${slotId}:${sourcePattern}->${targetPattern}`;
+}
+//#endregion
+export { createAppRouteGraphInterceptionId };

package/dist/routing/app-router.d.ts

@@ -5,7 +5,7 @@ type AppRouteGraph = {
   routes: AppRouteGraphRoute[];
   routeManifest: RouteManifest;
 };
-declare function invalidateAppRouteCache(): void;
+export declare function invalidateAppRouteCache(): void;
 /**
  * Scan the app/ directory and return the route graph.
  * TODO(#726): Layer 4 should consume this read model directly once the
@@ -13,19 +13,32 @@ declare function invalidateAppRouteCache(): void;
  *
  * @internal
  */
-declare function appRouteGraph(appDir: string, pageExtensions?: readonly string[], matcher?: ValidFileMatcher): Promise<AppRouteGraph>;
+export declare function appRouteGraph(appDir: string, pageExtensions?: readonly string[], matcher?: ValidFileMatcher): Promise<AppRouteGraph>;
 /**
  * Scan the app/ directory and return a list of routes.
  */
-declare function appRouter(appDir: string, pageExtensions?: readonly string[], matcher?: ValidFileMatcher): Promise<AppRouteGraphRoute[]>;
+export declare function appRouter(appDir: string, pageExtensions?: readonly string[], matcher?: ValidFileMatcher): Promise<AppRouteGraphRoute[]>;
 /** Whether the route's ordinary main tree has a loading boundary unique to it. */
-declare function appRouteHasMainTreeLoadingBoundary(route: AppRoute): boolean;
+export declare function appRouteHasMainTreeLoadingBoundary(route: AppRoute): boolean;
+/**
+ * A route's layouts below a dynamic URL segment, one generateStaticParams
+ * provider each, keyed by the layout's directory. Next.js composes only the
+ * segments of a route's own loader tree, each segment as its own step
+ * (build/static-paths/app.ts generateRouteStaticParams), and route groups put
+ * different layouts at the same URL pattern prefix, so neither the pattern nor
+ * a shared provider identifies a layout.
+ */
+export declare function appRouteLayoutStaticParamsGroups(route: Pick<AppRoute, "layouts" | "layoutTreePositions" | "routeSegments">): {
+  key: string;
+  layoutPath: string;
+  pattern: string;
+}[];
 /**
  * Match a URL against App Router routes.
  */
-declare function matchAppRoute(url: string, routes: AppRoute[]): {
+export declare function matchAppRoute(url: string, routes: AppRoute[]): {
   route: AppRoute;
   params: Record<string, string | string[]>;
 } | null;
 //#endregion
-export { type AppRoute, appRouteGraph, appRouteHasMainTreeLoadingBoundary, appRouter, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, invalidateAppRouteCache, matchAppRoute };
+export { type AppRoute, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts };

package/dist/routing/app-router.js

@@ -1,6 +1,6 @@
 import { createValidFileMatcher } from "./file-matcher.js";
-import { createRouteTrieCache, matchRouteWithTrie } from "./route-matching.js";
 import { buildAppRouteGraph, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts } from "./app-route-graph.js";
+import { createRouteTrieCache, matchRouteWithTrie } from "./route-matching.js";
 //#region src/routing/app-router.ts
 /**
 * App Router file-system routing.
@@ -58,6 +58,28 @@ async function appRouter(appDir, pageExtensions, matcher) {
 function appRouteHasMainTreeLoadingBoundary(route) {
 	return route.loadingPath != null || (route.loadingPaths?.some((_loadingPath, index) => (route.loadingTreePositions?.[index] ?? 0) > 0) ?? false);
 }
+/**
+* A route's layouts below a dynamic URL segment, one generateStaticParams
+* provider each, keyed by the layout's directory. Next.js composes only the
+* segments of a route's own loader tree, each segment as its own step
+* (build/static-paths/app.ts generateRouteStaticParams), and route groups put
+* different layouts at the same URL pattern prefix, so neither the pattern nor
+* a shared provider identifies a layout.
+*/
+function appRouteLayoutStaticParamsGroups(route) {
+	const groups = [];
+	for (const [index, layoutPath] of route.layouts.entries()) {
+		const segments = route.routeSegments.slice(0, route.layoutTreePositions[index] ?? 0);
+		const pattern = `/${(convertSegmentsToRouteParts(segments)?.urlSegments ?? []).join("/")}`;
+		if (!pattern.includes(":")) continue;
+		groups.push({
+			key: `layouts:${segments.join("/")}`,
+			layoutPath,
+			pattern
+		});
+	}
+	return groups;
+}
 const appTrieCache = createRouteTrieCache();
 /**
 * Match a URL against App Router routes.
@@ -66,4 +88,4 @@ function matchAppRoute(url, routes) {
 	return matchRouteWithTrie(url, routes, appTrieCache);
 }
 //#endregion
-export { appRouteGraph, appRouteHasMainTreeLoadingBoundary, appRouter, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, invalidateAppRouteCache, matchAppRoute };
+export { appRouteGraph, appRouteHasMainTreeLoadingBoundary, appRouteLayoutStaticParamsGroups, appRouter, computeAppRouteStaticSiblings, computeRootParamNames, convertSegmentsToRouteParts, invalidateAppRouteCache, matchAppRoute };

package/dist/routing/file-matcher.d.ts

@@ -1,6 +1,6 @@
 //#region src/routing/file-matcher.d.ts
-declare function normalizePageExtensions(pageExtensions?: readonly string[] | null): string[];
-type ValidFileMatcher = {
+export declare function normalizePageExtensions(pageExtensions?: readonly string[] | null): string[];
+export type ValidFileMatcher = {
   extensions: string[];
   dottedExtensions: string[];
   extensionRegex: RegExp;
@@ -15,14 +15,14 @@ type ValidFileMatcher = {
  * Ported in spirit from Next.js createValidFileMatcher:
  * packages/next/src/server/lib/find-page-file.ts
  */
-declare function createValidFileMatcher(pageExtensions?: readonly string[] | null): ValidFileMatcher;
+export declare function createValidFileMatcher(pageExtensions?: readonly string[] | null): ValidFileMatcher;
 /** Check if a file exists with any configured page extension. */
-declare function findFileWithExtensions(basePath: string, matcher: ValidFileMatcher): boolean;
+export declare function findFileWithExtensions(basePath: string, matcher: ValidFileMatcher): boolean;
 /**
  * Find a file by basename and configured page extension in a directory.
  * Returns the first matching absolute path, or null if not found.
  */
-declare function findFileWithExts(dir: string, name: string, matcher: ValidFileMatcher): string | null;
+export declare function findFileWithExts(dir: string, name: string, matcher: ValidFileMatcher): string | null;
 /**
  * Add the config extensions produced by `vinext init` to vinext's resolver.
  *
@@ -38,7 +38,7 @@ declare function findFileWithExts(dir: string, name: string, matcher: ValidFileM
  * `.cjs`/`.cts` go last because `vinext init` renames CJS config files when it
  * adds `"type": "module"`, and app code may import those files extensionlessly.
  */
-declare function buildViteResolveExtensions(viteExtensions?: readonly string[]): string[];
+export declare function buildViteResolveExtensions(viteExtensions?: readonly string[]): string[];
 /**
  * Normalize an explicit Next.js resolver extension list for Vite.
  *
@@ -47,7 +47,7 @@ declare function buildViteResolveExtensions(viteExtensions?: readonly string[]):
  * webpack/Turbopack convention for trying the import exactly as written; Vite
  * already does that before appending extensions, so it must be omitted here.
  */
-declare function normalizeViteResolveExtensions(extensions: readonly string[]): string[];
+export declare function normalizeViteResolveExtensions(extensions: readonly string[]): string[];
 /**
  * Use function-form exclude for Node < 22.14 compatibility.
  *
@@ -55,6 +55,5 @@ declare function normalizeViteResolveExtensions(extensions: readonly string[]):
  * separators on Windows, so each match goes through `toSlash` — this is the
  * boundary where external fs output enters the canonical forward-slash space.
  */
-declare function scanWithExtensions(stem: string, cwd: string, extensions: readonly string[], exclude?: (name: string) => boolean): AsyncGenerator<string>;
-//#endregion
-export { ValidFileMatcher, buildViteResolveExtensions, createValidFileMatcher, findFileWithExtensions, findFileWithExts, normalizePageExtensions, normalizeViteResolveExtensions, scanWithExtensions };
+export declare function scanWithExtensions(stem: string, cwd: string, extensions: readonly string[], exclude?: (name: string) => boolean): AsyncGenerator<string>;
+//#endregion

package/dist/routing/pages-router.d.ts

@@ -1,7 +1,7 @@
 import { ValidFileMatcher } from "./file-matcher.js";
 import { patternToNextFormat } from "./route-validation.js";
 //#region src/routing/pages-router.d.ts
-type Route = {
+export type Route = {
   /** URL pattern, e.g. "/" or "/about" or "/posts/:id" */
   pattern: string;
   /** Pre-split pattern segments (computed once at scan time, reused per request) */
@@ -17,7 +17,7 @@ type Route = {
  * Invalidate cached routes for a given pages directory.
  * Called by the file watcher when pages are added/removed.
  */
-declare function invalidateRouteCache(pagesDir: string): void;
+export declare function invalidateRouteCache(pagesDir: string): void;
 /**
  * Scan the pages/ directory and return a list of routes.
  * Results are cached — call invalidateRouteCache() when files change.
@@ -30,12 +30,12 @@ declare function invalidateRouteCache(pagesDir: string): void;
  * - Ignores _app.tsx, _document.tsx, _error.tsx (Next.js special files)
  * - Ignores pages/api/ (handled separately later)
  */
-declare function pagesRouter(pagesDir: string, pageExtensions?: readonly string[], matcher?: ValidFileMatcher): Promise<Route[]>;
+export declare function pagesRouter(pagesDir: string, pageExtensions?: readonly string[], matcher?: ValidFileMatcher): Promise<Route[]>;
 /**
  * Match a URL path against a route pattern.
  * Returns the matched params or null if no match.
  */
-declare function matchRoute(url: string, routes: Route[]): {
+export declare function matchRoute(url: string, routes: Route[]): {
   route: Route;
   params: Record<string, string | string[]>;
 } | null;
@@ -47,6 +47,6 @@ declare function matchRoute(url: string, routes: Route[]): {
  * - pages/api/hello.ts -> /api/hello
  * - pages/api/users/[id].ts -> /api/users/:id
  */
-declare function apiRouter(pagesDir: string, pageExtensions?: readonly string[], matcher?: ValidFileMatcher): Promise<Route[]>;
+export declare function apiRouter(pagesDir: string, pageExtensions?: readonly string[], matcher?: ValidFileMatcher): Promise<Route[]>;
 //#endregion
-export { Route, apiRouter, invalidateRouteCache, matchRoute, pagesRouter, patternToNextFormat };
+export { patternToNextFormat };

package/dist/routing/pages-router.js

@@ -1,6 +1,6 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { decodeRouteSegment, sortRoutes } from "./utils.js";
 import { createValidFileMatcher, scanWithExtensions } from "./file-matcher.js";
+import { decodeRouteSegment, sortRoutes } from "./utils.js";
 import { patternToNextFormat, validateRoutePatterns } from "./route-validation.js";
 import { createRouteTrieCache, matchRouteWithTrieRawPathname } from "./route-matching.js";
 //#region src/routing/pages-router.ts

package/dist/routing/route-matching.d.ts

@@ -3,7 +3,7 @@ import { TrieNode } from "./route-trie.js";
 type RouteTrieCache<R extends {
   patternParts: string[];
 }> = WeakMap<R[], TrieNode<R>>;
-declare function createRouteTrieCache<R extends {
+export declare function createRouteTrieCache<R extends {
   patternParts: string[];
 }>(): RouteTrieCache<R>;
 /**
@@ -16,7 +16,7 @@ declare function createRouteTrieCache<R extends {
  * Generic over the route shape; both Pages `Route` and App `AppRoute`
  * satisfy `{ patternParts: string[] }`.
  */
-declare function matchRouteWithTrie<R extends {
+export declare function matchRouteWithTrie<R extends {
   patternParts: string[];
 }>(url: string, routes: R[], cache: RouteTrieCache<R>): {
   route: R;
@@ -29,11 +29,10 @@ declare function matchRouteWithTrie<R extends {
  * not select the filesystem route `/about`. Dynamic captures are still decoded
  * exactly once by `trieMatch`, matching `getRouteMatcher` upstream.
  */
-declare function matchRouteWithTrieRawPathname<R extends {
+export declare function matchRouteWithTrieRawPathname<R extends {
   patternParts: string[];
 }>(url: string, routes: R[], cache: RouteTrieCache<R>): {
   route: R;
   params: Record<string, string | string[]>;
 } | null;
-//#endregion
-export { createRouteTrieCache, matchRouteWithTrie, matchRouteWithTrieRawPathname };
+//#endregion

package/dist/routing/route-matching.js

@@ -36,7 +36,8 @@ function matchRouteWithTrie(url, routes, cache) {
 	let normalizedUrl = pathname === "/" ? "/" : pathname.replace(/\/$/, "");
 	normalizedUrl = normalizePathnameForRouteMatch(normalizedUrl);
 	const urlParts = normalizedUrl.split("/").filter(Boolean);
-	return trieMatch(getOrBuildTrie(cache, routes), urlParts);
+	const trie = getOrBuildTrie(cache, routes);
+	return trieMatch(trie, urlParts);
 }
 /**
 * Match a filesystem route against the request's raw encoded pathname.
@@ -48,7 +49,8 @@ function matchRouteWithTrie(url, routes, cache) {
 function matchRouteWithTrieRawPathname(url, routes, cache) {
 	const pathname = url.split("?")[0];
 	const urlParts = (pathname === "/" ? "/" : pathname.replace(/\/$/, "")).split("/").filter(Boolean);
-	return trieMatch(getOrBuildTrie(cache, routes), urlParts);
+	const trie = getOrBuildTrie(cache, routes);
+	return trieMatch(trie, urlParts);
 }
 //#endregion
 export { createRouteTrieCache, matchRouteWithTrie, matchRouteWithTrieRawPathname };