vinext 1.0.0-beta.9 → 1.0.0

package/dist/plugins/typeof-window.js

@@ -1,7 +1,7 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { stripViteModuleQuery } from "../utils/path.js";
+import { booleanLiteralValue, collectBindingNames, forEachAstChild, isIdentifierNamed, stringLiteralValue } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
-import { booleanLiteralValue, collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, nodeArray, stringLiteralValue } from "./ast-utils.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 import { collectDirectScopeBindings, collectLoopScopeBindings, collectSwitchScopeBindings, collectVarScopeBindings, createAstScope, hasAstBinding, isFunctionNode } from "./ast-scope.js";
 import { parseAst } from "vite";
 import MagicString from "magic-string";
@@ -22,15 +22,14 @@ function getTypeofWindowReplacement(environment) {
 	return environment.config.consumer === "client" ? "object" : "undefined";
 }
 function evaluateTypeofWindowComparison(node, replacement, scope) {
-	if (!isAstRecord(node) || node.type !== "BinaryExpression") return null;
+	if (node.type !== "BinaryExpression") return null;
 	if (![
 		"==",
 		"===",
 		"!=",
 		"!=="
 	].includes(String(node.operator))) return null;
-	const left = isAstRecord(node.left) ? node.left : null;
-	const right = isAstRecord(node.right) ? node.right : null;
+	const { left, right } = node;
 	const leftIsTypeofWindow = left?.type === "UnaryExpression" && left.operator === "typeof" && isIdentifierNamed(left.argument, "window") && !hasAstBinding(scope, "window");
 	const rightIsTypeofWindow = right?.type === "UnaryExpression" && right.operator === "typeof" && isIdentifierNamed(right.argument, "window") && !hasAstBinding(scope, "window");
 	const comparedValue = leftIsTypeofWindow ? stringLiteralValue(right) : rightIsTypeofWindow ? stringLiteralValue(left) : null;
@@ -39,17 +38,17 @@ function evaluateTypeofWindowComparison(node, replacement, scope) {
 	return node.operator === "==" || node.operator === "===" ? equal : !equal;
 }
 function isProcessBrowserMember(node, scope) {
-	const candidate = isAstRecord(node) && node.type === "ChainExpression" && isAstRecord(node.expression) ? node.expression : node;
-	if (!isAstRecord(candidate) || candidate.type !== "MemberExpression") return false;
+	const candidate = node.type === "ChainExpression" ? node.expression : node;
+	if (candidate.type !== "MemberExpression") return false;
 	return isIdentifierNamed(candidate.object, "process") && (candidate.computed ? stringLiteralValue(candidate.property) === "browser" : isIdentifierNamed(candidate.property, "browser")) && !hasAstBinding(scope, "process");
 }
 function evaluateProcessBrowserCondition(node, replacement, scope) {
 	if (isProcessBrowserMember(node, scope)) return replacement;
-	if (isAstRecord(node) && node.type === "UnaryExpression" && node.operator === "!") {
+	if (node.type === "UnaryExpression" && node.operator === "!") {
 		const value = evaluateProcessBrowserCondition(node.argument, replacement, scope);
 		return value === null ? null : !value;
 	}
-	if (!isAstRecord(node) || node.type !== "BinaryExpression") return null;
+	if (node.type !== "BinaryExpression") return null;
 	if (![
 		"==",
 		"===",
@@ -64,7 +63,7 @@ function evaluateProcessBrowserCondition(node, replacement, scope) {
 	return node.operator === "==" || node.operator === "===" ? equal : !equal;
 }
 function evaluateConsumerCondition(node, replacements, scope) {
-	if (isAstRecord(node) && node.type === "LogicalExpression") {
+	if (node.type === "LogicalExpression") {
 		const left = evaluateConsumerCondition(node.left, replacements, scope);
 		if (node.operator === "&&") {
 			if (left?.value === false) return left;
@@ -76,7 +75,7 @@ function evaluateConsumerCondition(node, replacements, scope) {
 				} : null;
 			}
 			const right = evaluateConsumerCondition(node.right, replacements, scope);
-			if (replacements.pruneUnreachableImports && right?.value === false && right.effects.length === 0 && isAstRecord(node.left)) return {
+			if (replacements.pruneUnreachableImports && right?.value === false && right.effects.length === 0) return {
 				value: false,
 				effects: [node.left]
 			};
@@ -90,7 +89,7 @@ function evaluateConsumerCondition(node, replacements, scope) {
 				} : null;
 			}
 			const right = evaluateConsumerCondition(node.right, replacements, scope);
-			if (replacements.pruneUnreachableImports && right?.value === true && right.effects.length === 0 && isAstRecord(node.left)) return {
+			if (replacements.pruneUnreachableImports && right?.value === true && right.effects.length === 0) return {
 				value: true,
 				effects: [node.left]
 			};
@@ -128,7 +127,6 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 	}
 	const output = new MagicString(code);
 	let changed = false;
-	if (!isAstRecord(ast)) return null;
 	function overwriteGap(start, end, content) {
 		if (start === end) output.appendLeft(start, content);
 		else output.overwrite(start, end, content);
@@ -140,11 +138,12 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 		if (isFunctionNode(node)) {
 			const parameterScope = createAstScope(parentScope);
 			collectBindingNames(node.id, parameterScope.bindings);
-			for (const parameter of nodeArray(node.params)) {
+			for (const parameter of node.params) {
 				collectBindingNames(parameter, parameterScope.bindings);
-				if (isAstRecord(parameter)) visit(parameter, parameterScope);
+				visit(parameter, parameterScope);
 			}
-			if (isAstRecord(node.body)) if (node.body.type === "BlockStatement") {
+			if (!node.body) return;
+			if (node.body.type === "BlockStatement") {
 				const bodyScope = createAstScope(parameterScope);
 				collectDirectScopeBindings(node.body, bodyScope);
 				collectVarScopeBindings(node.body, bodyScope);
@@ -153,29 +152,29 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 			return;
 		}
 		if (node.type === "SwitchStatement") {
-			if (isAstRecord(node.discriminant)) visit(node.discriminant, parentScope);
+			visit(node.discriminant, parentScope);
 			const switchScope = createAstScope(parentScope);
 			collectSwitchScopeBindings(node, switchScope);
-			for (const switchCase of nodeArray(node.cases)) if (isAstRecord(switchCase)) visit(switchCase, switchScope);
+			for (const switchCase of node.cases) visit(switchCase, switchScope);
 			return;
 		}
 		const scope = createChildScope(node, parentScope) ?? parentScope;
-		if (node.type === "IfStatement" && hasRange(node)) {
+		if (node.type === "IfStatement") {
 			const result = evaluateConsumerCondition(node.test, replacements, scope);
 			if (result !== null) {
 				const selected = result.value ? node.consequent : node.alternate;
 				if (result.effects.length > 0) {
-					const effects = result.effects.filter(hasRange);
+					const effects = result.effects;
 					for (const effect of effects) visit(effect, scope);
-					if (isAstRecord(selected) && hasRange(selected)) visit(selected, scope);
+					if (selected) visit(selected, scope);
 					overwriteGap(node.start, effects[0].start, "{ (");
 					for (let index = 1; index < effects.length; index++) overwriteGap(effects[index - 1].end, effects[index].start, "); (");
 					const lastEffect = effects.at(-1);
-					if (isAstRecord(selected) && hasRange(selected)) {
+					if (selected) {
 						overwriteGap(lastEffect.end, selected.start, "); ");
 						overwriteGap(selected.end, node.end, " }");
 					} else overwriteGap(lastEffect.end, node.end, "); }");
-				} else if (isAstRecord(selected) && hasRange(selected)) {
+				} else if (selected) {
 					output.remove(node.start, selected.start);
 					output.remove(selected.end, node.end);
 					visit(selected, scope);
@@ -184,12 +183,12 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 				return;
 			}
 		}
-		if (node.type === "ConditionalExpression" && hasRange(node)) {
+		if (node.type === "ConditionalExpression") {
 			const result = evaluateConsumerCondition(node.test, replacements, scope);
 			const selected = result?.value ? node.consequent : node.alternate;
-			if (result !== null && isAstRecord(selected) && hasRange(selected)) {
+			if (result !== null) {
 				if (result.effects.length > 0) {
-					const effects = result.effects.filter(hasRange);
+					const effects = result.effects;
 					for (const effect of effects) visit(effect, scope);
 					visit(selected, scope);
 					overwriteGap(node.start, effects[0].start, "((");
@@ -206,10 +205,10 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 				return;
 			}
 		}
-		if (node.type === "LogicalExpression" && hasRange(node)) {
+		if (node.type === "LogicalExpression") {
 			const result = evaluateConsumerCondition(node, replacements, scope);
 			if (result !== null) {
-				const effects = result.effects.filter(hasRange);
+				const effects = result.effects;
 				if (effects.length > 0) {
 					for (const effect of effects) visit(effect, scope);
 					overwriteGap(node.start, effects[0].start, "((");
@@ -220,19 +219,19 @@ function replaceConsumerEnvironmentConditions(code, replacements, id = "file.js"
 				return;
 			}
 		}
-		if (node.type === "UnaryExpression" && node.operator === "typeof" && isIdentifierNamed(node.argument, "window") && replacements.typeofWindow !== void 0 && !hasAstBinding(scope, "window") && hasRange(node)) {
+		if (node.type === "UnaryExpression" && node.operator === "typeof" && isIdentifierNamed(node.argument, "window") && replacements.typeofWindow !== void 0 && !hasAstBinding(scope, "window")) {
 			output.overwrite(node.start, node.end, JSON.stringify(replacements.typeofWindow));
 			changed = true;
 			return;
 		}
-		if (replacements.processBrowser !== void 0 && isProcessBrowserMember(node, scope) && hasRange(node)) {
+		if (replacements.processBrowser !== void 0 && isProcessBrowserMember(node, scope)) {
 			output.overwrite(node.start, node.end, String(replacements.processBrowser));
 			changed = true;
 			return;
 		}
 		forEachAstChild(node, (child) => visit(child, scope));
 	}
-	for (const node of ast.body) if (isAstRecord(node)) visit(node, rootScope);
+	for (const node of ast.body) visit(node, rootScope);
 	if (!changed) return null;
 	return magicStringTransformResult(output);
 }

package/dist/plugins/use-cache-callable.d.ts

@@ -3,10 +3,7 @@ import { Plugin } from "vite";
 type Options = {
   projectRoot: string;
   cacheRuntime: string;
-  getAppDir: () => string | undefined;
-  matchesPageExtension: (fileName: string) => boolean;
   allowMissingRsc?: boolean;
 };
-declare function createUseCacheCallablePlugin(options: Options): Promise<Plugin>;
-//#endregion
-export { createUseCacheCallablePlugin };
+export declare function createUseCacheCallablePlugin(options: Options): Promise<Plugin>;
+//#endregion

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,20 @@ 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;
+export 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 +392,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 +421,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,6 +1,6 @@
 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 fs from "node:fs";
@@ -401,7 +401,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,

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 };