vinext 0.0.49 → 0.0.51

package/dist/server/middleware-request-headers.d.ts

@@ -1,8 +1,11 @@
 //#region src/server/middleware-request-headers.d.ts
 type MiddlewareHeaderValue = string | string[];
 type MiddlewareHeaderSource = Headers | Record<string, MiddlewareHeaderValue>;
+type BuildRequestHeadersOptions = {
+  preserveCredentialHeaders?: boolean;
+};
 declare function encodeMiddlewareRequestHeaders(targetHeaders: Headers, requestHeaders: Headers): void;
-declare function buildRequestHeadersFromMiddlewareResponse(baseHeaders: Headers, middlewareHeaders: MiddlewareHeaderSource): Headers | null;
+declare function buildRequestHeadersFromMiddlewareResponse(baseHeaders: Headers, middlewareHeaders: MiddlewareHeaderSource, options?: BuildRequestHeadersOptions): Headers | null;
 declare function shouldKeepMiddlewareHeader(key: string): boolean;
 //#endregion
 export { buildRequestHeadersFromMiddlewareResponse, encodeMiddlewareRequestHeaders, shouldKeepMiddlewareHeader };

package/dist/server/middleware-request-headers.js

@@ -1,7 +1,6 @@
+import { MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX } from "./headers.js";
 //#region src/server/middleware-request-headers.ts
-const MIDDLEWARE_REQUEST_HEADER_PREFIX = "x-middleware-request-";
-const MIDDLEWARE_OVERRIDE_HEADERS = "x-middleware-override-headers";
-const MIDDLEWARE_SET_COOKIE_HEADER = "x-middleware-set-cookie";
+const CREDENTIAL_REQUEST_HEADERS = ["authorization", "cookie"];
 function getMiddlewareHeaderValue(source, key) {
 	if (source instanceof Headers) return source.get(key);
 	const value = source[key];
@@ -16,13 +15,13 @@ function getOverrideHeaderNames(source) {
 function getForwardedRequestHeaders(source) {
 	const forwardedHeaders = /* @__PURE__ */ new Map();
 	if (source instanceof Headers) {
-		for (const [key, value] of source.entries()) if (key.startsWith(MIDDLEWARE_REQUEST_HEADER_PREFIX)) forwardedHeaders.set(key.slice(21), value);
+		for (const [key, value] of source.entries()) if (key.startsWith("x-middleware-request-")) forwardedHeaders.set(key.slice(MIDDLEWARE_REQUEST_HEADER_PREFIX.length), value);
 		return forwardedHeaders;
 	}
 	for (const [key, value] of Object.entries(source)) {
-		if (!key.startsWith(MIDDLEWARE_REQUEST_HEADER_PREFIX)) continue;
+		if (!key.startsWith("x-middleware-request-")) continue;
 		const normalizedValue = Array.isArray(value) ? value[0] ?? "" : value;
-		forwardedHeaders.set(key.slice(21), normalizedValue);
+		forwardedHeaders.set(key.slice(MIDDLEWARE_REQUEST_HEADER_PREFIX.length), normalizedValue);
 	}
 	return forwardedHeaders;
 }
@@ -36,7 +35,7 @@ function encodeMiddlewareRequestHeaders(targetHeaders, requestHeaders) {
 	targetHeaders.set(MIDDLEWARE_OVERRIDE_HEADERS, overrideHeaderNames.join(","));
 	for (const [key, value] of requestHeaders.entries()) targetHeaders.set(`${MIDDLEWARE_REQUEST_HEADER_PREFIX}${key}`, value);
 }
-function buildRequestHeadersFromMiddlewareResponse(baseHeaders, middlewareHeaders) {
+function buildRequestHeadersFromMiddlewareResponse(baseHeaders, middlewareHeaders, options = {}) {
 	const overrideHeaderNames = getOverrideHeaderNames(middlewareHeaders);
 	const forwardedHeaders = getForwardedRequestHeaders(middlewareHeaders);
 	if (overrideHeaderNames === null && forwardedHeaders.size === 0) return null;
@@ -45,6 +44,14 @@ function buildRequestHeadersFromMiddlewareResponse(baseHeaders, middlewareHeader
 		for (const [key, value] of forwardedHeaders) nextHeaders.set(key, value);
 		return nextHeaders;
 	}
+	if (options.preserveCredentialHeaders) {
+		const overrideHeaderNameSet = new Set(overrideHeaderNames);
+		for (const key of CREDENTIAL_REQUEST_HEADERS) {
+			if (overrideHeaderNameSet.has(key)) continue;
+			const value = baseHeaders.get(key);
+			if (value !== null) nextHeaders.set(key, value);
+		}
+	}
 	for (const key of overrideHeaderNames) {
 		const value = forwardedHeaders.get(key);
 		if (value !== void 0) nextHeaders.set(key, value);
@@ -52,7 +59,7 @@ function buildRequestHeadersFromMiddlewareResponse(baseHeaders, middlewareHeader
 	return nextHeaders;
 }
 function shouldKeepMiddlewareHeader(key) {
-	return key === MIDDLEWARE_OVERRIDE_HEADERS || key === MIDDLEWARE_SET_COOKIE_HEADER || key.startsWith(MIDDLEWARE_REQUEST_HEADER_PREFIX);
+	return key === "x-middleware-override-headers" || key === "x-middleware-set-cookie" || key.startsWith("x-middleware-request-");
 }
 //#endregion
 export { buildRequestHeadersFromMiddlewareResponse, encodeMiddlewareRequestHeaders, shouldKeepMiddlewareHeader };

package/dist/server/middleware-request-headers.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-request-headers.js","names":[],"sources":["../../src/server/middleware-request-headers.ts"],"sourcesContent":["const MIDDLEWARE_REQUEST_HEADER_PREFIX = \"x-middleware-request-\";\nconst MIDDLEWARE_OVERRIDE_HEADERS = \"x-middleware-override-headers\";\nconst MIDDLEWARE_SET_COOKIE_HEADER = \"x-middleware-set-cookie\";\n\ntype MiddlewareHeaderValue = string | string[];\ntype MiddlewareHeaderSource = Headers | Record<string, MiddlewareHeaderValue>;\n\nfunction getMiddlewareHeaderValue(source: MiddlewareHeaderSource, key: string): string | null {\n  if (source instanceof Headers) {\n    return source.get(key);\n  }\n\n  const value = source[key];\n  if (value === undefined) return null;\n  return Array.isArray(value) ? (value[0] ?? null) : value;\n}\n\nfunction getOverrideHeaderNames(source: MiddlewareHeaderSource): string[] | null {\n  const rawValue = getMiddlewareHeaderValue(source, MIDDLEWARE_OVERRIDE_HEADERS);\n  if (rawValue === null) return null;\n  return rawValue\n    .split(\",\")\n    .map((key) => key.trim())\n    .filter(Boolean);\n}\n\nfunction getForwardedRequestHeaders(source: MiddlewareHeaderSource): Map<string, string> {\n  const forwardedHeaders = new Map<string, string>();\n\n  if (source instanceof Headers) {\n    for (const [key, value] of source.entries()) {\n      if (key.startsWith(MIDDLEWARE_REQUEST_HEADER_PREFIX)) {\n        forwardedHeaders.set(key.slice(MIDDLEWARE_REQUEST_HEADER_PREFIX.length), value);\n      }\n    }\n    return forwardedHeaders;\n  }\n\n  for (const [key, value] of Object.entries(source)) {\n    if (!key.startsWith(MIDDLEWARE_REQUEST_HEADER_PREFIX)) continue;\n    const normalizedValue = Array.isArray(value) ? (value[0] ?? \"\") : value;\n    forwardedHeaders.set(key.slice(MIDDLEWARE_REQUEST_HEADER_PREFIX.length), normalizedValue);\n  }\n\n  return forwardedHeaders;\n}\n\nfunction cloneHeaders(source: Headers): Headers {\n  const cloned = new Headers();\n  for (const [key, value] of source.entries()) {\n    cloned.append(key, value);\n  }\n  return cloned;\n}\n\nexport function encodeMiddlewareRequestHeaders(\n  targetHeaders: Headers,\n  requestHeaders: Headers,\n): void {\n  const overrideHeaderNames = [...requestHeaders.keys()];\n  targetHeaders.set(MIDDLEWARE_OVERRIDE_HEADERS, overrideHeaderNames.join(\",\"));\n\n  for (const [key, value] of requestHeaders.entries()) {\n    targetHeaders.set(`${MIDDLEWARE_REQUEST_HEADER_PREFIX}${key}`, value);\n  }\n}\n\nexport function buildRequestHeadersFromMiddlewareResponse(\n  baseHeaders: Headers,\n  middlewareHeaders: MiddlewareHeaderSource,\n): Headers | null {\n  const overrideHeaderNames = getOverrideHeaderNames(middlewareHeaders);\n  const forwardedHeaders = getForwardedRequestHeaders(middlewareHeaders);\n\n  if (overrideHeaderNames === null && forwardedHeaders.size === 0) {\n    return null;\n  }\n\n  const nextHeaders = overrideHeaderNames === null ? cloneHeaders(baseHeaders) : new Headers();\n\n  if (overrideHeaderNames === null) {\n    for (const [key, value] of forwardedHeaders) {\n      nextHeaders.set(key, value);\n    }\n    return nextHeaders;\n  }\n\n  for (const key of overrideHeaderNames) {\n    const value = forwardedHeaders.get(key);\n    if (value !== undefined) {\n      nextHeaders.set(key, value);\n    }\n  }\n\n  return nextHeaders;\n}\n\nexport function shouldKeepMiddlewareHeader(key: string): boolean {\n  return (\n    key === MIDDLEWARE_OVERRIDE_HEADERS ||\n    key === MIDDLEWARE_SET_COOKIE_HEADER ||\n    key.startsWith(MIDDLEWARE_REQUEST_HEADER_PREFIX)\n  );\n}\n"],"mappings":";AAAA,MAAM,mCAAmC;AACzC,MAAM,8BAA8B;AACpC,MAAM,+BAA+B;AAKrC,SAAS,yBAAyB,QAAgC,KAA4B;AAC5F,KAAI,kBAAkB,QACpB,QAAO,OAAO,IAAI,IAAI;CAGxB,MAAM,QAAQ,OAAO;AACrB,KAAI,UAAU,KAAA,EAAW,QAAO;AAChC,QAAO,MAAM,QAAQ,MAAM,GAAI,MAAM,MAAM,OAAQ;;AAGrD,SAAS,uBAAuB,QAAiD;CAC/E,MAAM,WAAW,yBAAyB,QAAQ,4BAA4B;AAC9E,KAAI,aAAa,KAAM,QAAO;AAC9B,QAAO,SACJ,MAAM,IAAI,CACV,KAAK,QAAQ,IAAI,MAAM,CAAC,CACxB,OAAO,QAAQ;;AAGpB,SAAS,2BAA2B,QAAqD;CACvF,MAAM,mCAAmB,IAAI,KAAqB;AAElD,KAAI,kBAAkB,SAAS;AAC7B,OAAK,MAAM,CAAC,KAAK,UAAU,OAAO,SAAS,CACzC,KAAI,IAAI,WAAW,iCAAiC,CAClD,kBAAiB,IAAI,IAAI,MAAM,GAAwC,EAAE,MAAM;AAGnF,SAAO;;AAGT,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,EAAE;AACjD,MAAI,CAAC,IAAI,WAAW,iCAAiC,CAAE;EACvD,MAAM,kBAAkB,MAAM,QAAQ,MAAM,GAAI,MAAM,MAAM,KAAM;AAClE,mBAAiB,IAAI,IAAI,MAAM,GAAwC,EAAE,gBAAgB;;AAG3F,QAAO;;AAGT,SAAS,aAAa,QAA0B;CAC9C,MAAM,SAAS,IAAI,SAAS;AAC5B,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,SAAS,CACzC,QAAO,OAAO,KAAK,MAAM;AAE3B,QAAO;;AAGT,SAAgB,+BACd,eACA,gBACM;CACN,MAAM,sBAAsB,CAAC,GAAG,eAAe,MAAM,CAAC;AACtD,eAAc,IAAI,6BAA6B,oBAAoB,KAAK,IAAI,CAAC;AAE7E,MAAK,MAAM,CAAC,KAAK,UAAU,eAAe,SAAS,CACjD,eAAc,IAAI,GAAG,mCAAmC,OAAO,MAAM;;AAIzE,SAAgB,0CACd,aACA,mBACgB;CAChB,MAAM,sBAAsB,uBAAuB,kBAAkB;CACrE,MAAM,mBAAmB,2BAA2B,kBAAkB;AAEtE,KAAI,wBAAwB,QAAQ,iBAAiB,SAAS,EAC5D,QAAO;CAGT,MAAM,cAAc,wBAAwB,OAAO,aAAa,YAAY,GAAG,IAAI,SAAS;AAE5F,KAAI,wBAAwB,MAAM;AAChC,OAAK,MAAM,CAAC,KAAK,UAAU,iBACzB,aAAY,IAAI,KAAK,MAAM;AAE7B,SAAO;;AAGT,MAAK,MAAM,OAAO,qBAAqB;EACrC,MAAM,QAAQ,iBAAiB,IAAI,IAAI;AACvC,MAAI,UAAU,KAAA,EACZ,aAAY,IAAI,KAAK,MAAM;;AAI/B,QAAO;;AAGT,SAAgB,2BAA2B,KAAsB;AAC/D,QACE,QAAQ,+BACR,QAAQ,gCACR,IAAI,WAAW,iCAAiC"}
+{"version":3,"file":"middleware-request-headers.js","names":[],"sources":["../../src/server/middleware-request-headers.ts"],"sourcesContent":["import {\n  MIDDLEWARE_OVERRIDE_HEADERS,\n  MIDDLEWARE_REQUEST_HEADER_PREFIX,\n  MIDDLEWARE_SET_COOKIE_HEADER,\n} from \"./headers.js\";\nconst CREDENTIAL_REQUEST_HEADERS = [\"authorization\", \"cookie\"] as const;\n\ntype MiddlewareHeaderValue = string | string[];\ntype MiddlewareHeaderSource = Headers | Record<string, MiddlewareHeaderValue>;\ntype BuildRequestHeadersOptions = {\n  preserveCredentialHeaders?: boolean;\n};\n\nfunction getMiddlewareHeaderValue(source: MiddlewareHeaderSource, key: string): string | null {\n  if (source instanceof Headers) {\n    return source.get(key);\n  }\n\n  const value = source[key];\n  if (value === undefined) return null;\n  return Array.isArray(value) ? (value[0] ?? null) : value;\n}\n\nfunction getOverrideHeaderNames(source: MiddlewareHeaderSource): string[] | null {\n  const rawValue = getMiddlewareHeaderValue(source, MIDDLEWARE_OVERRIDE_HEADERS);\n  if (rawValue === null) return null;\n  return rawValue\n    .split(\",\")\n    .map((key) => key.trim())\n    .filter(Boolean);\n}\n\nfunction getForwardedRequestHeaders(source: MiddlewareHeaderSource): Map<string, string> {\n  const forwardedHeaders = new Map<string, string>();\n\n  if (source instanceof Headers) {\n    for (const [key, value] of source.entries()) {\n      if (key.startsWith(MIDDLEWARE_REQUEST_HEADER_PREFIX)) {\n        forwardedHeaders.set(key.slice(MIDDLEWARE_REQUEST_HEADER_PREFIX.length), value);\n      }\n    }\n    return forwardedHeaders;\n  }\n\n  for (const [key, value] of Object.entries(source)) {\n    if (!key.startsWith(MIDDLEWARE_REQUEST_HEADER_PREFIX)) continue;\n    const normalizedValue = Array.isArray(value) ? (value[0] ?? \"\") : value;\n    forwardedHeaders.set(key.slice(MIDDLEWARE_REQUEST_HEADER_PREFIX.length), normalizedValue);\n  }\n\n  return forwardedHeaders;\n}\n\nfunction cloneHeaders(source: Headers): Headers {\n  const cloned = new Headers();\n  for (const [key, value] of source.entries()) {\n    cloned.append(key, value);\n  }\n  return cloned;\n}\n\nexport function encodeMiddlewareRequestHeaders(\n  targetHeaders: Headers,\n  requestHeaders: Headers,\n): void {\n  const overrideHeaderNames = [...requestHeaders.keys()];\n  targetHeaders.set(MIDDLEWARE_OVERRIDE_HEADERS, overrideHeaderNames.join(\",\"));\n\n  for (const [key, value] of requestHeaders.entries()) {\n    targetHeaders.set(`${MIDDLEWARE_REQUEST_HEADER_PREFIX}${key}`, value);\n  }\n}\n\nexport function buildRequestHeadersFromMiddlewareResponse(\n  baseHeaders: Headers,\n  middlewareHeaders: MiddlewareHeaderSource,\n  options: BuildRequestHeadersOptions = {},\n): Headers | null {\n  const overrideHeaderNames = getOverrideHeaderNames(middlewareHeaders);\n  const forwardedHeaders = getForwardedRequestHeaders(middlewareHeaders);\n\n  if (overrideHeaderNames === null && forwardedHeaders.size === 0) {\n    return null;\n  }\n\n  const nextHeaders = overrideHeaderNames === null ? cloneHeaders(baseHeaders) : new Headers();\n\n  if (overrideHeaderNames === null) {\n    for (const [key, value] of forwardedHeaders) {\n      nextHeaders.set(key, value);\n    }\n    return nextHeaders;\n  }\n\n  if (options.preserveCredentialHeaders) {\n    const overrideHeaderNameSet = new Set(overrideHeaderNames);\n    for (const key of CREDENTIAL_REQUEST_HEADERS) {\n      if (overrideHeaderNameSet.has(key)) continue;\n\n      const value = baseHeaders.get(key);\n      if (value !== null) {\n        nextHeaders.set(key, value);\n      }\n    }\n  }\n\n  for (const key of overrideHeaderNames) {\n    const value = forwardedHeaders.get(key);\n    if (value !== undefined) {\n      nextHeaders.set(key, value);\n    }\n  }\n\n  return nextHeaders;\n}\n\nexport function shouldKeepMiddlewareHeader(key: string): boolean {\n  return (\n    key === MIDDLEWARE_OVERRIDE_HEADERS ||\n    key === MIDDLEWARE_SET_COOKIE_HEADER ||\n    key.startsWith(MIDDLEWARE_REQUEST_HEADER_PREFIX)\n  );\n}\n"],"mappings":";;AAKA,MAAM,6BAA6B,CAAC,iBAAiB,SAAS;AAQ9D,SAAS,yBAAyB,QAAgC,KAA4B;CAC5F,IAAI,kBAAkB,SACpB,OAAO,OAAO,IAAI,IAAI;CAGxB,MAAM,QAAQ,OAAO;CACrB,IAAI,UAAU,KAAA,GAAW,OAAO;CAChC,OAAO,MAAM,QAAQ,MAAM,GAAI,MAAM,MAAM,OAAQ;;AAGrD,SAAS,uBAAuB,QAAiD;CAC/E,MAAM,WAAW,yBAAyB,QAAQ,4BAA4B;CAC9E,IAAI,aAAa,MAAM,OAAO;CAC9B,OAAO,SACJ,MAAM,IAAI,CACV,KAAK,QAAQ,IAAI,MAAM,CAAC,CACxB,OAAO,QAAQ;;AAGpB,SAAS,2BAA2B,QAAqD;CACvF,MAAM,mCAAmB,IAAI,KAAqB;CAElD,IAAI,kBAAkB,SAAS;EAC7B,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,SAAS,EACzC,IAAI,IAAI,WAAA,wBAA4C,EAClD,iBAAiB,IAAI,IAAI,MAAM,iCAAiC,OAAO,EAAE,MAAM;EAGnF,OAAO;;CAGT,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,EAAE;EACjD,IAAI,CAAC,IAAI,WAAA,wBAA4C,EAAE;EACvD,MAAM,kBAAkB,MAAM,QAAQ,MAAM,GAAI,MAAM,MAAM,KAAM;EAClE,iBAAiB,IAAI,IAAI,MAAM,iCAAiC,OAAO,EAAE,gBAAgB;;CAG3F,OAAO;;AAGT,SAAS,aAAa,QAA0B;CAC9C,MAAM,SAAS,IAAI,SAAS;CAC5B,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,SAAS,EACzC,OAAO,OAAO,KAAK,MAAM;CAE3B,OAAO;;AAGT,SAAgB,+BACd,eACA,gBACM;CACN,MAAM,sBAAsB,CAAC,GAAG,eAAe,MAAM,CAAC;CACtD,cAAc,IAAI,6BAA6B,oBAAoB,KAAK,IAAI,CAAC;CAE7E,KAAK,MAAM,CAAC,KAAK,UAAU,eAAe,SAAS,EACjD,cAAc,IAAI,GAAG,mCAAmC,OAAO,MAAM;;AAIzE,SAAgB,0CACd,aACA,mBACA,UAAsC,EAAE,EACxB;CAChB,MAAM,sBAAsB,uBAAuB,kBAAkB;CACrE,MAAM,mBAAmB,2BAA2B,kBAAkB;CAEtE,IAAI,wBAAwB,QAAQ,iBAAiB,SAAS,GAC5D,OAAO;CAGT,MAAM,cAAc,wBAAwB,OAAO,aAAa,YAAY,GAAG,IAAI,SAAS;CAE5F,IAAI,wBAAwB,MAAM;EAChC,KAAK,MAAM,CAAC,KAAK,UAAU,kBACzB,YAAY,IAAI,KAAK,MAAM;EAE7B,OAAO;;CAGT,IAAI,QAAQ,2BAA2B;EACrC,MAAM,wBAAwB,IAAI,IAAI,oBAAoB;EAC1D,KAAK,MAAM,OAAO,4BAA4B;GAC5C,IAAI,sBAAsB,IAAI,IAAI,EAAE;GAEpC,MAAM,QAAQ,YAAY,IAAI,IAAI;GAClC,IAAI,UAAU,MACZ,YAAY,IAAI,KAAK,MAAM;;;CAKjC,KAAK,MAAM,OAAO,qBAAqB;EACrC,MAAM,QAAQ,iBAAiB,IAAI,IAAI;EACvC,IAAI,UAAU,KAAA,GACZ,YAAY,IAAI,KAAK,MAAM;;CAI/B,OAAO;;AAGT,SAAgB,2BAA2B,KAAsB;CAC/D,OACE,QAAA,mCACA,QAAA,6BACA,IAAI,WAAA,wBAA4C"}

package/dist/server/middleware-response-headers.d.ts

@@ -1,4 +1,5 @@
 //#region src/server/middleware-response-headers.d.ts
+declare function mergeVaryHeader(target: Headers, value: string): void;
 /**
  * Merge middleware response headers into a target Headers object.
  *
@@ -8,5 +9,5 @@
  */
 declare function mergeMiddlewareResponseHeaders(target: Headers, middlewareHeaders: Headers | null): void;
 //#endregion
-export { mergeMiddlewareResponseHeaders };
+export { mergeMiddlewareResponseHeaders, mergeVaryHeader };
 //# sourceMappingURL=middleware-response-headers.d.ts.map

package/dist/server/middleware-response-headers.js

@@ -39,6 +39,6 @@ function mergeMiddlewareResponseHeaders(target, middlewareHeaders) {
 	}
 }
 //#endregion
-export { mergeMiddlewareResponseHeaders };
+export { mergeMiddlewareResponseHeaders, mergeVaryHeader };
 
 //# sourceMappingURL=middleware-response-headers.js.map

package/dist/server/middleware-response-headers.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-response-headers.js","names":[],"sources":["../../src/server/middleware-response-headers.ts"],"sourcesContent":["const ADDITIVE_RESPONSE_HEADER_NAMES = new Set([\"set-cookie\", \"vary\"]);\n\nfunction mergeVaryHeader(target: Headers, value: string): void {\n  const existing = target.get(\"Vary\");\n  const tokens = (existing ? `${existing}, ${value}` : value)\n    .split(\",\")\n    .map((token) => token.trim())\n    .filter((token) => token.length > 0);\n\n  // Per RFC 9110, `Vary: *` means the response varies on all request fields.\n  // Combining `*` with field names changes semantics and may be treated\n  // inconsistently by caches. Collapse to `*` if any token is `*`.\n  if (tokens.some((token) => token === \"*\")) {\n    target.set(\"Vary\", \"*\");\n    return;\n  }\n\n  const seen = new Set<string>();\n  const merged: string[] = [];\n  for (const token of tokens) {\n    const normalized = token.toLowerCase();\n    if (seen.has(normalized)) continue;\n\n    seen.add(normalized);\n    merged.push(token);\n  }\n\n  target.set(\"Vary\", merged.join(\", \"));\n}\n\n/**\n * Merge middleware response headers into a target Headers object.\n *\n * Set-Cookie and Vary are accumulated (append) since multiple sources can\n * contribute values. All other headers use set() so middleware owns singular\n * response headers like Cache-Control.\n */\nexport function mergeMiddlewareResponseHeaders(\n  target: Headers,\n  middlewareHeaders: Headers | null,\n): void {\n  if (!middlewareHeaders) {\n    return;\n  }\n\n  for (const [key, value] of middlewareHeaders) {\n    if (key.toLowerCase() === \"vary\") {\n      mergeVaryHeader(target, value);\n      continue;\n    }\n\n    if (ADDITIVE_RESPONSE_HEADER_NAMES.has(key.toLowerCase())) {\n      target.append(key, value);\n      continue;\n    }\n\n    target.set(key, value);\n  }\n}\n"],"mappings":";AAAA,MAAM,iCAAiC,IAAI,IAAI,CAAC,cAAc,OAAO,CAAC;AAEtE,SAAS,gBAAgB,QAAiB,OAAqB;CAC7D,MAAM,WAAW,OAAO,IAAI,OAAO;CACnC,MAAM,UAAU,WAAW,GAAG,SAAS,IAAI,UAAU,OAClD,MAAM,IAAI,CACV,KAAK,UAAU,MAAM,MAAM,CAAC,CAC5B,QAAQ,UAAU,MAAM,SAAS,EAAE;AAKtC,KAAI,OAAO,MAAM,UAAU,UAAU,IAAI,EAAE;AACzC,SAAO,IAAI,QAAQ,IAAI;AACvB;;CAGF,MAAM,uBAAO,IAAI,KAAa;CAC9B,MAAM,SAAmB,EAAE;AAC3B,MAAK,MAAM,SAAS,QAAQ;EAC1B,MAAM,aAAa,MAAM,aAAa;AACtC,MAAI,KAAK,IAAI,WAAW,CAAE;AAE1B,OAAK,IAAI,WAAW;AACpB,SAAO,KAAK,MAAM;;AAGpB,QAAO,IAAI,QAAQ,OAAO,KAAK,KAAK,CAAC;;;;;;;;;AAUvC,SAAgB,+BACd,QACA,mBACM;AACN,KAAI,CAAC,kBACH;AAGF,MAAK,MAAM,CAAC,KAAK,UAAU,mBAAmB;AAC5C,MAAI,IAAI,aAAa,KAAK,QAAQ;AAChC,mBAAgB,QAAQ,MAAM;AAC9B;;AAGF,MAAI,+BAA+B,IAAI,IAAI,aAAa,CAAC,EAAE;AACzD,UAAO,OAAO,KAAK,MAAM;AACzB;;AAGF,SAAO,IAAI,KAAK,MAAM"}
+{"version":3,"file":"middleware-response-headers.js","names":[],"sources":["../../src/server/middleware-response-headers.ts"],"sourcesContent":["const ADDITIVE_RESPONSE_HEADER_NAMES = new Set([\"set-cookie\", \"vary\"]);\n\nexport function mergeVaryHeader(target: Headers, value: string): void {\n  const existing = target.get(\"Vary\");\n  const tokens = (existing ? `${existing}, ${value}` : value)\n    .split(\",\")\n    .map((token) => token.trim())\n    .filter((token) => token.length > 0);\n\n  // Per RFC 9110, `Vary: *` means the response varies on all request fields.\n  // Combining `*` with field names changes semantics and may be treated\n  // inconsistently by caches. Collapse to `*` if any token is `*`.\n  if (tokens.some((token) => token === \"*\")) {\n    target.set(\"Vary\", \"*\");\n    return;\n  }\n\n  const seen = new Set<string>();\n  const merged: string[] = [];\n  for (const token of tokens) {\n    const normalized = token.toLowerCase();\n    if (seen.has(normalized)) continue;\n\n    seen.add(normalized);\n    merged.push(token);\n  }\n\n  target.set(\"Vary\", merged.join(\", \"));\n}\n\n/**\n * Merge middleware response headers into a target Headers object.\n *\n * Set-Cookie and Vary are accumulated (append) since multiple sources can\n * contribute values. All other headers use set() so middleware owns singular\n * response headers like Cache-Control.\n */\nexport function mergeMiddlewareResponseHeaders(\n  target: Headers,\n  middlewareHeaders: Headers | null,\n): void {\n  if (!middlewareHeaders) {\n    return;\n  }\n\n  for (const [key, value] of middlewareHeaders) {\n    if (key.toLowerCase() === \"vary\") {\n      mergeVaryHeader(target, value);\n      continue;\n    }\n\n    if (ADDITIVE_RESPONSE_HEADER_NAMES.has(key.toLowerCase())) {\n      target.append(key, value);\n      continue;\n    }\n\n    target.set(key, value);\n  }\n}\n"],"mappings":";AAAA,MAAM,iCAAiC,IAAI,IAAI,CAAC,cAAc,OAAO,CAAC;AAEtE,SAAgB,gBAAgB,QAAiB,OAAqB;CACpE,MAAM,WAAW,OAAO,IAAI,OAAO;CACnC,MAAM,UAAU,WAAW,GAAG,SAAS,IAAI,UAAU,OAClD,MAAM,IAAI,CACV,KAAK,UAAU,MAAM,MAAM,CAAC,CAC5B,QAAQ,UAAU,MAAM,SAAS,EAAE;CAKtC,IAAI,OAAO,MAAM,UAAU,UAAU,IAAI,EAAE;EACzC,OAAO,IAAI,QAAQ,IAAI;EACvB;;CAGF,MAAM,uBAAO,IAAI,KAAa;CAC9B,MAAM,SAAmB,EAAE;CAC3B,KAAK,MAAM,SAAS,QAAQ;EAC1B,MAAM,aAAa,MAAM,aAAa;EACtC,IAAI,KAAK,IAAI,WAAW,EAAE;EAE1B,KAAK,IAAI,WAAW;EACpB,OAAO,KAAK,MAAM;;CAGpB,OAAO,IAAI,QAAQ,OAAO,KAAK,KAAK,CAAC;;;;;;;;;AAUvC,SAAgB,+BACd,QACA,mBACM;CACN,IAAI,CAAC,mBACH;CAGF,KAAK,MAAM,CAAC,KAAK,UAAU,mBAAmB;EAC5C,IAAI,IAAI,aAAa,KAAK,QAAQ;GAChC,gBAAgB,QAAQ,MAAM;GAC9B;;EAGF,IAAI,+BAA+B,IAAI,IAAI,aAAa,CAAC,EAAE;GACzD,OAAO,OAAO,KAAK,MAAM;GACzB;;EAGF,OAAO,IAAI,KAAK,MAAM"}

package/dist/server/middleware-runtime.d.ts

@@ -10,6 +10,7 @@ type MiddlewareResult = {
   redirectStatus?: number;
   rewriteUrl?: string;
   rewriteStatus?: number;
+  status?: number;
   responseHeaders?: Headers;
   response?: Response;
   waitUntilPromises?: Promise<unknown>[];

package/dist/server/middleware-runtime.js

@@ -1,5 +1,7 @@
 import { normalizePathnameForRouteMatchStrict } from "../routing/utils.js";
+import "./server-globals.js";
 import { getRequestExecutionContext, runWithExecutionContext } from "../shims/request-context.js";
+import { MIDDLEWARE_REWRITE_HEADER } from "./headers.js";
 import { shouldKeepMiddlewareHeader } from "./middleware-request-headers.js";
 import { NextFetchEvent, NextRequest } from "../shims/server.js";
 import { normalizePath } from "./normalize-path.js";
@@ -63,11 +65,11 @@ function resolveMiddlewarePathname(request) {
 }
 function createNextRequest(request, normalizedPathname, i18nConfig, basePath) {
 	const url = new URL(request.url);
-	let mwRequest = request;
+	let mwRequest = request.body && !request.bodyUsed ? request.clone() : request;
 	if (normalizedPathname !== url.pathname) {
 		const mwUrl = new URL(url);
 		mwUrl.pathname = normalizedPathname;
-		mwRequest = new Request(mwUrl, request);
+		mwRequest = new Request(mwUrl, mwRequest);
 	}
 	const nextConfig = basePath || i18nConfig ? {
 		basePath: basePath ?? "",
@@ -108,6 +110,7 @@ async function executeMiddleware(options) {
 	if (response.headers.get("x-middleware-next") === "1") return {
 		continue: true,
 		responseHeaders: collectMiddlewareHeaders(response),
+		status: response.status !== 200 ? response.status : void 0,
 		waitUntilPromises
 	};
 	if (response.status >= 300 && response.status < 400) {
@@ -125,7 +128,7 @@ async function executeMiddleware(options) {
 			};
 		}
 	}
-	const rewriteUrl = response.headers.get("x-middleware-rewrite");
+	const rewriteUrl = response.headers.get(MIDDLEWARE_REWRITE_HEADER);
 	if (rewriteUrl) {
 		let rewritePath;
 		try {
@@ -140,6 +143,7 @@ async function executeMiddleware(options) {
 			rewriteUrl: rewritePath,
 			rewriteStatus: response.status !== 200 ? response.status : void 0,
 			responseHeaders: collectMiddlewareHeaders(response),
+			status: response.status !== 200 ? response.status : void 0,
 			waitUntilPromises
 		};
 	}

package/dist/server/middleware-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-runtime.js","names":[],"sources":["../../src/server/middleware-runtime.ts"],"sourcesContent":["import type { NextI18nConfig } from \"../config/next-config.js\";\nimport { normalizePathnameForRouteMatchStrict } from \"../routing/utils.js\";\nimport {\n  getRequestExecutionContext,\n  runWithExecutionContext,\n  type ExecutionContextLike,\n} from \"vinext/shims/request-context\";\nimport { NextFetchEvent, NextRequest } from \"vinext/shims/server\";\nimport { normalizePath } from \"./normalize-path.js\";\nimport { MatcherConfig, matchesMiddleware } from \"./middleware-matcher.js\";\nimport { shouldKeepMiddlewareHeader } from \"./middleware-request-headers.js\";\nimport { processMiddlewareHeaders } from \"./request-pipeline.js\";\nimport { badRequestResponse, internalServerErrorResponse } from \"./http-error-responses.js\";\n\nexport type MiddlewareModule = Record<string, unknown>;\n\nexport type MiddlewareResult = {\n  continue: boolean;\n  redirectUrl?: string;\n  redirectStatus?: number;\n  rewriteUrl?: string;\n  rewriteStatus?: number;\n  responseHeaders?: Headers;\n  response?: Response;\n  waitUntilPromises?: Promise<unknown>[];\n};\n\ntype MiddlewareHandler = (\n  request: NextRequest,\n  event: NextFetchEvent,\n) => Response | undefined | void | Promise<Response | undefined | void>;\n\ntype MiddlewareConfigExport = {\n  matcher?: MatcherConfig;\n};\n\ntype ExecuteMiddlewareOptions = {\n  basePath?: string;\n  filePath?: string;\n  i18nConfig?: NextI18nConfig | null;\n  includeErrorDetails?: boolean;\n  isProxy: boolean;\n  module: MiddlewareModule;\n  normalizedPathname?: string;\n  request: Request;\n};\n\ntype RunGeneratedMiddlewareOptions = ExecuteMiddlewareOptions & {\n  ctx?: ExecutionContextLike;\n};\n\nfunction isMiddlewareHandler(value: unknown): value is MiddlewareHandler {\n  return typeof value === \"function\";\n}\n\nfunction isMiddlewareConfigExport(value: unknown): value is MiddlewareConfigExport {\n  return !!value && typeof value === \"object\";\n}\n\nfunction middlewareFileLabel(isProxy: boolean): string {\n  return isProxy ? \"Proxy\" : \"Middleware\";\n}\n\nfunction middlewareExpectedExport(isProxy: boolean): string {\n  return isProxy ? \"proxy\" : \"middleware\";\n}\n\nexport function resolveMiddlewareModuleHandler(\n  mod: MiddlewareModule,\n  options: { filePath?: string; isProxy: boolean },\n): MiddlewareHandler {\n  const handler = options.isProxy ? (mod.proxy ?? mod.default) : (mod.middleware ?? mod.default);\n  if (isMiddlewareHandler(handler)) return handler;\n\n  const fileLabel = middlewareFileLabel(options.isProxy);\n  const expectedExport = middlewareExpectedExport(options.isProxy);\n  const fileSuffix = options.filePath ? ` \"${options.filePath}\"` : \"\";\n  throw new Error(\n    `The ${fileLabel} file${fileSuffix} must export a function named \\`${expectedExport}\\` or a \\`default\\` function.`,\n  );\n}\n\nfunction middlewareMatcher(mod: MiddlewareModule): MatcherConfig | undefined {\n  const config = mod.config;\n  if (!isMiddlewareConfigExport(config)) return undefined;\n  return config.matcher;\n}\n\nfunction stripMiddlewareHeadersFromResponse(response: Response): Response {\n  const headers = new Headers(response.headers);\n  processMiddlewareHeaders(headers);\n  return new Response(response.body, {\n    status: response.status,\n    statusText: response.statusText,\n    headers,\n  });\n}\n\nfunction collectMiddlewareHeaders(response: Response): Headers {\n  const responseHeaders = new Headers();\n  for (const [key, value] of response.headers) {\n    if (!key.startsWith(\"x-middleware-\") || shouldKeepMiddlewareHeader(key)) {\n      responseHeaders.append(key, value);\n    }\n  }\n  return responseHeaders;\n}\n\nfunction drainFetchEvent(fetchEvent: NextFetchEvent): Promise<unknown>[] {\n  const waitUntilPromises = fetchEvent.waitUntilPromises;\n  const drained = fetchEvent.drainWaitUntil();\n  const executionContext = getRequestExecutionContext();\n  if (executionContext) {\n    executionContext.waitUntil(drained);\n  } else {\n    void drained;\n  }\n  return waitUntilPromises;\n}\n\nfunction resolveMiddlewarePathname(request: Request): string | Response {\n  const url = new URL(request.url);\n  try {\n    return normalizePath(normalizePathnameForRouteMatchStrict(url.pathname));\n  } catch {\n    return badRequestResponse();\n  }\n}\n\nfunction createNextRequest(\n  request: Request,\n  normalizedPathname: string,\n  i18nConfig?: NextI18nConfig | null,\n  basePath?: string,\n): NextRequest {\n  const url = new URL(request.url);\n  let mwRequest = request;\n  if (normalizedPathname !== url.pathname) {\n    const mwUrl = new URL(url);\n    mwUrl.pathname = normalizedPathname;\n    mwRequest = new Request(mwUrl, request);\n  }\n\n  const nextConfig =\n    basePath || i18nConfig\n      ? { basePath: basePath ?? \"\", i18n: i18nConfig ?? undefined }\n      : undefined;\n\n  return mwRequest instanceof NextRequest\n    ? mwRequest\n    : new NextRequest(mwRequest, nextConfig ? { nextConfig } : undefined);\n}\n\nexport async function executeMiddleware(\n  options: ExecuteMiddlewareOptions,\n): Promise<MiddlewareResult> {\n  const middlewareFn = resolveMiddlewareModuleHandler(options.module, {\n    filePath: options.filePath,\n    isProxy: options.isProxy,\n  });\n  const normalizedPathname =\n    options.normalizedPathname ?? resolveMiddlewarePathname(options.request);\n  if (normalizedPathname instanceof Response) {\n    return { continue: false, response: normalizedPathname };\n  }\n\n  if (\n    !matchesMiddleware(\n      normalizedPathname,\n      middlewareMatcher(options.module),\n      options.request,\n      options.i18nConfig,\n    )\n  ) {\n    return { continue: true };\n  }\n\n  const nextRequest = createNextRequest(\n    options.request,\n    normalizedPathname,\n    options.i18nConfig,\n    options.basePath,\n  );\n  const fetchEvent = new NextFetchEvent({ page: normalizedPathname });\n\n  let response: Response | undefined | void;\n  try {\n    response = await middlewareFn(nextRequest, fetchEvent);\n  } catch (e) {\n    console.error(\"[vinext] Middleware error:\", e);\n    const waitUntilPromises = drainFetchEvent(fetchEvent);\n    const message = options.includeErrorDetails\n      ? \"Middleware Error: \" + (e instanceof Error ? e.message : String(e))\n      : \"Internal Server Error\";\n    return {\n      continue: false,\n      response: internalServerErrorResponse(message),\n      waitUntilPromises,\n    };\n  }\n\n  const waitUntilPromises = drainFetchEvent(fetchEvent);\n\n  if (!response) {\n    return { continue: true, waitUntilPromises };\n  }\n\n  if (response.headers.get(\"x-middleware-next\") === \"1\") {\n    return {\n      continue: true,\n      responseHeaders: collectMiddlewareHeaders(response),\n      waitUntilPromises,\n    };\n  }\n\n  if (response.status >= 300 && response.status < 400) {\n    const location = response.headers.get(\"Location\") ?? response.headers.get(\"location\");\n    if (location) {\n      const responseHeaders = new Headers();\n      for (const [key, value] of response.headers) {\n        if (!key.startsWith(\"x-middleware-\") && key.toLowerCase() !== \"location\") {\n          responseHeaders.append(key, value);\n        }\n      }\n      return {\n        continue: false,\n        redirectUrl: location,\n        redirectStatus: response.status,\n        response: stripMiddlewareHeadersFromResponse(response),\n        responseHeaders,\n        waitUntilPromises,\n      };\n    }\n  }\n\n  const rewriteUrl = response.headers.get(\"x-middleware-rewrite\");\n  if (rewriteUrl) {\n    let rewritePath: string;\n    try {\n      const rewriteParsed = new URL(rewriteUrl, options.request.url);\n      const requestOrigin = new URL(options.request.url).origin;\n      rewritePath =\n        rewriteParsed.origin === requestOrigin\n          ? rewriteParsed.pathname + rewriteParsed.search\n          : rewriteParsed.href;\n    } catch {\n      rewritePath = rewriteUrl;\n    }\n    return {\n      continue: true,\n      rewriteUrl: rewritePath,\n      rewriteStatus: response.status !== 200 ? response.status : undefined,\n      responseHeaders: collectMiddlewareHeaders(response),\n      waitUntilPromises,\n    };\n  }\n\n  return {\n    continue: false,\n    response: stripMiddlewareHeadersFromResponse(response),\n    waitUntilPromises,\n  };\n}\n\nexport async function runGeneratedMiddleware(\n  options: RunGeneratedMiddlewareOptions,\n): Promise<MiddlewareResult> {\n  const run = () => executeMiddleware(options);\n  return options.ctx ? runWithExecutionContext(options.ctx, run) : run();\n}\n"],"mappings":"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"}
+{"version":3,"file":"middleware-runtime.js","names":[],"sources":["../../src/server/middleware-runtime.ts"],"sourcesContent":["import \"./server-globals.js\";\nimport type { NextI18nConfig } from \"../config/next-config.js\";\nimport { normalizePathnameForRouteMatchStrict } from \"../routing/utils.js\";\nimport {\n  getRequestExecutionContext,\n  runWithExecutionContext,\n  type ExecutionContextLike,\n} from \"vinext/shims/request-context\";\nimport { NextFetchEvent, NextRequest } from \"vinext/shims/server\";\nimport { normalizePath } from \"./normalize-path.js\";\nimport {\n  MIDDLEWARE_HEADER_PREFIX,\n  MIDDLEWARE_NEXT_HEADER,\n  MIDDLEWARE_REWRITE_HEADER,\n} from \"./headers.js\";\nimport { MatcherConfig, matchesMiddleware } from \"./middleware-matcher.js\";\nimport { shouldKeepMiddlewareHeader } from \"./middleware-request-headers.js\";\nimport { processMiddlewareHeaders } from \"./request-pipeline.js\";\nimport { badRequestResponse, internalServerErrorResponse } from \"./http-error-responses.js\";\n\nexport type MiddlewareModule = Record<string, unknown>;\n\nexport type MiddlewareResult = {\n  continue: boolean;\n  redirectUrl?: string;\n  redirectStatus?: number;\n  rewriteUrl?: string;\n  rewriteStatus?: number;\n  status?: number;\n  responseHeaders?: Headers;\n  response?: Response;\n  waitUntilPromises?: Promise<unknown>[];\n};\n\ntype MiddlewareHandler = (\n  request: NextRequest,\n  event: NextFetchEvent,\n) => Response | undefined | void | Promise<Response | undefined | void>;\n\ntype MiddlewareConfigExport = {\n  matcher?: MatcherConfig;\n};\n\ntype ExecuteMiddlewareOptions = {\n  basePath?: string;\n  filePath?: string;\n  i18nConfig?: NextI18nConfig | null;\n  includeErrorDetails?: boolean;\n  isProxy: boolean;\n  module: MiddlewareModule;\n  normalizedPathname?: string;\n  request: Request;\n};\n\ntype RunGeneratedMiddlewareOptions = ExecuteMiddlewareOptions & {\n  ctx?: ExecutionContextLike;\n};\n\nfunction isMiddlewareHandler(value: unknown): value is MiddlewareHandler {\n  return typeof value === \"function\";\n}\n\nfunction isMiddlewareConfigExport(value: unknown): value is MiddlewareConfigExport {\n  return !!value && typeof value === \"object\";\n}\n\nfunction middlewareFileLabel(isProxy: boolean): string {\n  return isProxy ? \"Proxy\" : \"Middleware\";\n}\n\nfunction middlewareExpectedExport(isProxy: boolean): string {\n  return isProxy ? \"proxy\" : \"middleware\";\n}\n\nexport function resolveMiddlewareModuleHandler(\n  mod: MiddlewareModule,\n  options: { filePath?: string; isProxy: boolean },\n): MiddlewareHandler {\n  const handler = options.isProxy ? (mod.proxy ?? mod.default) : (mod.middleware ?? mod.default);\n  if (isMiddlewareHandler(handler)) return handler;\n\n  const fileLabel = middlewareFileLabel(options.isProxy);\n  const expectedExport = middlewareExpectedExport(options.isProxy);\n  const fileSuffix = options.filePath ? ` \"${options.filePath}\"` : \"\";\n  throw new Error(\n    `The ${fileLabel} file${fileSuffix} must export a function named \\`${expectedExport}\\` or a \\`default\\` function.`,\n  );\n}\n\nfunction middlewareMatcher(mod: MiddlewareModule): MatcherConfig | undefined {\n  const config = mod.config;\n  if (!isMiddlewareConfigExport(config)) return undefined;\n  return config.matcher;\n}\n\nfunction stripMiddlewareHeadersFromResponse(response: Response): Response {\n  const headers = new Headers(response.headers);\n  processMiddlewareHeaders(headers);\n  return new Response(response.body, {\n    status: response.status,\n    statusText: response.statusText,\n    headers,\n  });\n}\n\nfunction collectMiddlewareHeaders(response: Response): Headers {\n  const responseHeaders = new Headers();\n  for (const [key, value] of response.headers) {\n    if (!key.startsWith(MIDDLEWARE_HEADER_PREFIX) || shouldKeepMiddlewareHeader(key)) {\n      responseHeaders.append(key, value);\n    }\n  }\n  return responseHeaders;\n}\n\nfunction drainFetchEvent(fetchEvent: NextFetchEvent): Promise<unknown>[] {\n  const waitUntilPromises = fetchEvent.waitUntilPromises;\n  const drained = fetchEvent.drainWaitUntil();\n  const executionContext = getRequestExecutionContext();\n  if (executionContext) {\n    executionContext.waitUntil(drained);\n  } else {\n    void drained;\n  }\n  return waitUntilPromises;\n}\n\nfunction resolveMiddlewarePathname(request: Request): string | Response {\n  const url = new URL(request.url);\n  try {\n    return normalizePath(normalizePathnameForRouteMatchStrict(url.pathname));\n  } catch {\n    return badRequestResponse();\n  }\n}\n\nfunction createNextRequest(\n  request: Request,\n  normalizedPathname: string,\n  i18nConfig?: NextI18nConfig | null,\n  basePath?: string,\n): NextRequest {\n  const url = new URL(request.url);\n  // Middleware gets an isolated body branch; downstream routing keeps owning\n  // the original request body.\n  let mwRequest = request.body && !request.bodyUsed ? request.clone() : request;\n  if (normalizedPathname !== url.pathname) {\n    const mwUrl = new URL(url);\n    mwUrl.pathname = normalizedPathname;\n    mwRequest = new Request(mwUrl, mwRequest);\n  }\n\n  const nextConfig =\n    basePath || i18nConfig\n      ? { basePath: basePath ?? \"\", i18n: i18nConfig ?? undefined }\n      : undefined;\n\n  return mwRequest instanceof NextRequest\n    ? mwRequest\n    : new NextRequest(mwRequest, nextConfig ? { nextConfig } : undefined);\n}\n\nexport async function executeMiddleware(\n  options: ExecuteMiddlewareOptions,\n): Promise<MiddlewareResult> {\n  const middlewareFn = resolveMiddlewareModuleHandler(options.module, {\n    filePath: options.filePath,\n    isProxy: options.isProxy,\n  });\n  const normalizedPathname =\n    options.normalizedPathname ?? resolveMiddlewarePathname(options.request);\n  if (normalizedPathname instanceof Response) {\n    return { continue: false, response: normalizedPathname };\n  }\n\n  if (\n    !matchesMiddleware(\n      normalizedPathname,\n      middlewareMatcher(options.module),\n      options.request,\n      options.i18nConfig,\n    )\n  ) {\n    return { continue: true };\n  }\n\n  const nextRequest = createNextRequest(\n    options.request,\n    normalizedPathname,\n    options.i18nConfig,\n    options.basePath,\n  );\n  const fetchEvent = new NextFetchEvent({ page: normalizedPathname });\n\n  let response: Response | undefined | void;\n  try {\n    response = await middlewareFn(nextRequest, fetchEvent);\n  } catch (e) {\n    console.error(\"[vinext] Middleware error:\", e);\n    const waitUntilPromises = drainFetchEvent(fetchEvent);\n    const message = options.includeErrorDetails\n      ? \"Middleware Error: \" + (e instanceof Error ? e.message : String(e))\n      : \"Internal Server Error\";\n    return {\n      continue: false,\n      response: internalServerErrorResponse(message),\n      waitUntilPromises,\n    };\n  }\n\n  const waitUntilPromises = drainFetchEvent(fetchEvent);\n\n  if (!response) {\n    return { continue: true, waitUntilPromises };\n  }\n\n  if (response.headers.get(MIDDLEWARE_NEXT_HEADER) === \"1\") {\n    return {\n      continue: true,\n      responseHeaders: collectMiddlewareHeaders(response),\n      status: response.status !== 200 ? response.status : undefined,\n      waitUntilPromises,\n    };\n  }\n\n  if (response.status >= 300 && response.status < 400) {\n    const location = response.headers.get(\"Location\") ?? response.headers.get(\"location\");\n    if (location) {\n      const responseHeaders = new Headers();\n      for (const [key, value] of response.headers) {\n        if (!key.startsWith(MIDDLEWARE_HEADER_PREFIX) && key.toLowerCase() !== \"location\") {\n          responseHeaders.append(key, value);\n        }\n      }\n      return {\n        continue: false,\n        redirectUrl: location,\n        redirectStatus: response.status,\n        response: stripMiddlewareHeadersFromResponse(response),\n        responseHeaders,\n        waitUntilPromises,\n      };\n    }\n  }\n\n  const rewriteUrl = response.headers.get(MIDDLEWARE_REWRITE_HEADER);\n  if (rewriteUrl) {\n    let rewritePath: string;\n    try {\n      const rewriteParsed = new URL(rewriteUrl, options.request.url);\n      const requestOrigin = new URL(options.request.url).origin;\n      rewritePath =\n        rewriteParsed.origin === requestOrigin\n          ? rewriteParsed.pathname + rewriteParsed.search\n          : rewriteParsed.href;\n    } catch {\n      rewritePath = rewriteUrl;\n    }\n    return {\n      continue: true,\n      rewriteUrl: rewritePath,\n      rewriteStatus: response.status !== 200 ? response.status : undefined,\n      responseHeaders: collectMiddlewareHeaders(response),\n      status: response.status !== 200 ? response.status : undefined,\n      waitUntilPromises,\n    };\n  }\n\n  return {\n    continue: false,\n    response: stripMiddlewareHeadersFromResponse(response),\n    waitUntilPromises,\n  };\n}\n\nexport async function runGeneratedMiddleware(\n  options: RunGeneratedMiddlewareOptions,\n): Promise<MiddlewareResult> {\n  const run = () => executeMiddleware(options);\n  return options.ctx ? runWithExecutionContext(options.ctx, run) : run();\n}\n"],"mappings":"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"}

package/dist/server/middleware.d.ts

@@ -31,6 +31,18 @@ declare function resolveMiddlewareHandler(mod: MiddlewareModule, filePath: strin
  * Find the proxy or middleware file in the project root.
  * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.
  * If middleware.ts is found, logs a deprecation warning.
+ *
+ * Note on log noise: this function is called from Vite's `config` hook, which
+ * fires once per build environment (RSC, SSR, client, …). That means a project
+ * still using `middleware.ts` will see this warning emitted 2–3 times per
+ * build. The warning is benign — it does not abort the build. Next.js itself
+ * emits the same message via `Log.warnOnce`; matching that parity would
+ * require either a per-root deduplication map or hoisting the warning out of
+ * this function (e.g. into the plugin's `configResolved` hook). Tracked as a
+ * follow-up; see the deploy-suite investigation in run 25870737355.
+ *
+ * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/index.ts
+ *   (search for "MIDDLEWARE_FILENAME" + "file convention is deprecated")
  */
 declare function findMiddlewareFile(root: string, fileMatcher: ValidFileMatcher): string | null;
 /**

package/dist/server/middleware.js

@@ -37,6 +37,18 @@ const MIDDLEWARE_LOCATIONS = ["", "src/"];
 * Find the proxy or middleware file in the project root.
 * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.
 * If middleware.ts is found, logs a deprecation warning.
+*
+* Note on log noise: this function is called from Vite's `config` hook, which
+* fires once per build environment (RSC, SSR, client, …). That means a project
+* still using `middleware.ts` will see this warning emitted 2–3 times per
+* build. The warning is benign — it does not abort the build. Next.js itself
+* emits the same message via `Log.warnOnce`; matching that parity would
+* require either a per-root deduplication map or hoisting the warning out of
+* this function (e.g. into the plugin's `configResolved` hook). Tracked as a
+* follow-up; see the deploy-suite investigation in run 25870737355.
+*
+* @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/index.ts
+*   (search for "MIDDLEWARE_FILENAME" + "file convention is deprecated")
 */
 function findMiddlewareFile(root, fileMatcher) {
 	for (const dir of MIDDLEWARE_LOCATIONS) for (const ext of fileMatcher.dottedExtensions) {

package/dist/server/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","names":[],"sources":["../../src/server/middleware.ts"],"sourcesContent":["/**\n * proxy.ts / middleware.ts runner\n *\n * Loads and executes the user's proxy.ts (Next.js 16) or middleware.ts file\n * before routing. Runs in Node (not Edge Runtime), per the vinext design.\n *\n * In Next.js 16, proxy.ts replaces middleware.ts:\n * - proxy.ts: default export OR named `proxy` function, runs on Node.js runtime\n * - middleware.ts: deprecated but still supported for Edge runtime use cases\n *\n * The proxy/middleware receives a NextRequest and can:\n * - Return NextResponse.next() to continue to the route\n * - Return NextResponse.redirect() to redirect\n * - Return NextResponse.rewrite() to rewrite the URL\n * - Set/modify headers and cookies\n * - Return a Response directly (e.g., for auth guards)\n *\n * Supports the `config.matcher` export for path filtering.\n */\n\nimport type { ModuleRunner } from \"vite/module-runner\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport type { NextI18nConfig } from \"../config/next-config.js\";\nimport { ValidFileMatcher } from \"../routing/file-matcher.js\";\nimport {\n  resolveMiddlewareModuleHandler,\n  runGeneratedMiddleware,\n  type MiddlewareModule,\n  type MiddlewareResult,\n} from \"./middleware-runtime.js\";\n\nexport { matchPattern, matchesMiddleware } from \"./middleware-matcher.js\";\n\n/**\n * Determine whether a middleware/proxy file path refers to a proxy file.\n * proxy.ts files accept `proxy` or `default` exports.\n * middleware.ts files accept `middleware` or `default` exports.\n *\n * Matches Next.js behavior where each file type only accepts its own\n * named export or a default export:\n * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts\n */\nexport function isProxyFile(filePath: string): boolean {\n  const base = path.basename(filePath).replace(/\\.\\w+$/, \"\");\n  return base === \"proxy\";\n}\n\n/**\n * Resolve the middleware/proxy handler function from a module's exports.\n * Matches Next.js behavior: for proxy files, check `proxy` then `default`;\n * for middleware files, check `middleware` then `default`.\n *\n * Throws if the file exists but doesn't export a valid function, matching\n * Next.js's ProxyMissingExportError behavior.\n *\n * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts\n * @see https://github.com/vercel/next.js/blob/canary/test/e2e/app-dir/proxy-missing-export/proxy-missing-export.test.ts\n */\nexport function resolveMiddlewareHandler(mod: MiddlewareModule, filePath: string) {\n  return resolveMiddlewareModuleHandler(mod, {\n    filePath,\n    isProxy: isProxyFile(filePath),\n  });\n}\n\nconst MIDDLEWARE_LOCATIONS = [\"\", \"src/\"];\n\n/**\n * Find the proxy or middleware file in the project root.\n * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.\n * If middleware.ts is found, logs a deprecation warning.\n */\nexport function findMiddlewareFile(root: string, fileMatcher: ValidFileMatcher): string | null {\n  // Check proxy.ts first (Next.js 16 replacement for middleware.ts)\n  for (const dir of MIDDLEWARE_LOCATIONS) {\n    for (const ext of fileMatcher.dottedExtensions) {\n      const fullPath = path.join(root, dir, `proxy${ext}`);\n      if (fs.existsSync(fullPath)) {\n        return fullPath;\n      }\n    }\n  }\n\n  // Fall back to middleware.ts (deprecated in Next.js 16)\n  for (const dir of MIDDLEWARE_LOCATIONS) {\n    for (const ext of fileMatcher.dottedExtensions) {\n      const fullPath = path.join(root, dir, `middleware${ext}`);\n      if (fs.existsSync(fullPath)) {\n        console.warn(\n          \"[vinext] middleware.ts is deprecated in Next.js 16. \" +\n            \"Rename to proxy.ts and export a default or named proxy function.\",\n        );\n        return fullPath;\n      }\n    }\n  }\n  return null;\n}\n\nfunction isMiddlewareModule(value: unknown): value is MiddlewareModule {\n  return !!value && typeof value === \"object\";\n}\n\n/**\n * Load and execute middleware for a given request.\n *\n * @param runner - A ModuleRunner used to load the middleware module.\n *   Must be a long-lived instance created once (e.g. in configureServer) via\n *   createDirectRunner() — NOT recreated per request. Using server.ssrLoadModule\n *   directly crashes with `outsideEmitter` when @cloudflare/vite-plugin is\n *   present because SSRCompatModuleRunner reads environment.hot.api synchronously.\n * @param middlewarePath - Absolute path to the middleware file\n * @param request - The incoming Request object\n * @returns Middleware result describing what action to take\n */\nexport async function runMiddleware(\n  runner: ModuleRunner,\n  middlewarePath: string,\n  request: Request,\n  i18nConfig?: NextI18nConfig | null,\n  basePath?: string,\n): Promise<MiddlewareResult> {\n  // Load the middleware module via the direct-call ModuleRunner.\n  // This bypasses the hot channel entirely and is safe with all Vite plugin\n  // combinations, including @cloudflare/vite-plugin.\n  const mod = await runner.import(middlewarePath);\n  if (!isMiddlewareModule(mod)) {\n    throw new Error(`Middleware module \"${middlewarePath}\" did not evaluate to an object.`);\n  }\n\n  return runGeneratedMiddleware({\n    basePath,\n    filePath: middlewarePath,\n    i18nConfig,\n    includeErrorDetails: process.env.NODE_ENV !== \"production\",\n    isProxy: isProxyFile(middlewarePath),\n    module: mod,\n    request,\n  });\n}\n"],"mappings":";;;;;;;;;;;;;;AA2CA,SAAgB,YAAY,UAA2B;AAErD,QADa,KAAK,SAAS,SAAS,CAAC,QAAQ,UAAU,GAAG,KAC1C;;;;;;;;;;;;;AAclB,SAAgB,yBAAyB,KAAuB,UAAkB;AAChF,QAAO,+BAA+B,KAAK;EACzC;EACA,SAAS,YAAY,SAAS;EAC/B,CAAC;;AAGJ,MAAM,uBAAuB,CAAC,IAAI,OAAO;;;;;;AAOzC,SAAgB,mBAAmB,MAAc,aAA8C;AAE7F,MAAK,MAAM,OAAO,qBAChB,MAAK,MAAM,OAAO,YAAY,kBAAkB;EAC9C,MAAM,WAAW,KAAK,KAAK,MAAM,KAAK,QAAQ,MAAM;AACpD,MAAI,GAAG,WAAW,SAAS,CACzB,QAAO;;AAMb,MAAK,MAAM,OAAO,qBAChB,MAAK,MAAM,OAAO,YAAY,kBAAkB;EAC9C,MAAM,WAAW,KAAK,KAAK,MAAM,KAAK,aAAa,MAAM;AACzD,MAAI,GAAG,WAAW,SAAS,EAAE;AAC3B,WAAQ,KACN,uHAED;AACD,UAAO;;;AAIb,QAAO;;AAGT,SAAS,mBAAmB,OAA2C;AACrE,QAAO,CAAC,CAAC,SAAS,OAAO,UAAU;;;;;;;;;;;;;;AAerC,eAAsB,cACpB,QACA,gBACA,SACA,YACA,UAC2B;CAI3B,MAAM,MAAM,MAAM,OAAO,OAAO,eAAe;AAC/C,KAAI,CAAC,mBAAmB,IAAI,CAC1B,OAAM,IAAI,MAAM,sBAAsB,eAAe,kCAAkC;AAGzF,QAAO,uBAAuB;EAC5B;EACA,UAAU;EACV;EACA,qBAAqB,QAAQ,IAAI,aAAa;EAC9C,SAAS,YAAY,eAAe;EACpC,QAAQ;EACR;EACD,CAAC"}
+{"version":3,"file":"middleware.js","names":[],"sources":["../../src/server/middleware.ts"],"sourcesContent":["/**\n * proxy.ts / middleware.ts runner\n *\n * Loads and executes the user's proxy.ts (Next.js 16) or middleware.ts file\n * before routing. Runs in Node (not Edge Runtime), per the vinext design.\n *\n * In Next.js 16, proxy.ts replaces middleware.ts:\n * - proxy.ts: default export OR named `proxy` function, runs on Node.js runtime\n * - middleware.ts: deprecated but still supported for Edge runtime use cases\n *\n * The proxy/middleware receives a NextRequest and can:\n * - Return NextResponse.next() to continue to the route\n * - Return NextResponse.redirect() to redirect\n * - Return NextResponse.rewrite() to rewrite the URL\n * - Set/modify headers and cookies\n * - Return a Response directly (e.g., for auth guards)\n *\n * Supports the `config.matcher` export for path filtering.\n */\n\nimport type { ModuleRunner } from \"vite/module-runner\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport type { NextI18nConfig } from \"../config/next-config.js\";\nimport { ValidFileMatcher } from \"../routing/file-matcher.js\";\nimport {\n  resolveMiddlewareModuleHandler,\n  runGeneratedMiddleware,\n  type MiddlewareModule,\n  type MiddlewareResult,\n} from \"./middleware-runtime.js\";\n\nexport { matchPattern, matchesMiddleware } from \"./middleware-matcher.js\";\n\n/**\n * Determine whether a middleware/proxy file path refers to a proxy file.\n * proxy.ts files accept `proxy` or `default` exports.\n * middleware.ts files accept `middleware` or `default` exports.\n *\n * Matches Next.js behavior where each file type only accepts its own\n * named export or a default export:\n * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts\n */\nexport function isProxyFile(filePath: string): boolean {\n  const base = path.basename(filePath).replace(/\\.\\w+$/, \"\");\n  return base === \"proxy\";\n}\n\n/**\n * Resolve the middleware/proxy handler function from a module's exports.\n * Matches Next.js behavior: for proxy files, check `proxy` then `default`;\n * for middleware files, check `middleware` then `default`.\n *\n * Throws if the file exists but doesn't export a valid function, matching\n * Next.js's ProxyMissingExportError behavior.\n *\n * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/templates/middleware.ts\n * @see https://github.com/vercel/next.js/blob/canary/test/e2e/app-dir/proxy-missing-export/proxy-missing-export.test.ts\n */\nexport function resolveMiddlewareHandler(mod: MiddlewareModule, filePath: string) {\n  return resolveMiddlewareModuleHandler(mod, {\n    filePath,\n    isProxy: isProxyFile(filePath),\n  });\n}\n\nconst MIDDLEWARE_LOCATIONS = [\"\", \"src/\"];\n\n/**\n * Find the proxy or middleware file in the project root.\n * Checks for proxy.ts (Next.js 16) first, then falls back to middleware.ts.\n * If middleware.ts is found, logs a deprecation warning.\n *\n * Note on log noise: this function is called from Vite's `config` hook, which\n * fires once per build environment (RSC, SSR, client, …). That means a project\n * still using `middleware.ts` will see this warning emitted 2–3 times per\n * build. The warning is benign — it does not abort the build. Next.js itself\n * emits the same message via `Log.warnOnce`; matching that parity would\n * require either a per-root deduplication map or hoisting the warning out of\n * this function (e.g. into the plugin's `configResolved` hook). Tracked as a\n * follow-up; see the deploy-suite investigation in run 25870737355.\n *\n * @see https://github.com/vercel/next.js/blob/canary/packages/next/src/build/index.ts\n *   (search for \"MIDDLEWARE_FILENAME\" + \"file convention is deprecated\")\n */\nexport function findMiddlewareFile(root: string, fileMatcher: ValidFileMatcher): string | null {\n  // Check proxy.ts first (Next.js 16 replacement for middleware.ts)\n  for (const dir of MIDDLEWARE_LOCATIONS) {\n    for (const ext of fileMatcher.dottedExtensions) {\n      const fullPath = path.join(root, dir, `proxy${ext}`);\n      if (fs.existsSync(fullPath)) {\n        return fullPath;\n      }\n    }\n  }\n\n  // Fall back to middleware.ts (deprecated in Next.js 16).\n  // This is a warning, not an error: middleware.ts is still fully supported\n  // by both Next.js 16 and vinext. Do not change to `throw` or `process.exit`.\n  for (const dir of MIDDLEWARE_LOCATIONS) {\n    for (const ext of fileMatcher.dottedExtensions) {\n      const fullPath = path.join(root, dir, `middleware${ext}`);\n      if (fs.existsSync(fullPath)) {\n        console.warn(\n          \"[vinext] middleware.ts is deprecated in Next.js 16. \" +\n            \"Rename to proxy.ts and export a default or named proxy function.\",\n        );\n        return fullPath;\n      }\n    }\n  }\n  return null;\n}\n\nfunction isMiddlewareModule(value: unknown): value is MiddlewareModule {\n  return !!value && typeof value === \"object\";\n}\n\n/**\n * Load and execute middleware for a given request.\n *\n * @param runner - A ModuleRunner used to load the middleware module.\n *   Must be a long-lived instance created once (e.g. in configureServer) via\n *   createDirectRunner() — NOT recreated per request. Using server.ssrLoadModule\n *   directly crashes with `outsideEmitter` when @cloudflare/vite-plugin is\n *   present because SSRCompatModuleRunner reads environment.hot.api synchronously.\n * @param middlewarePath - Absolute path to the middleware file\n * @param request - The incoming Request object\n * @returns Middleware result describing what action to take\n */\nexport async function runMiddleware(\n  runner: ModuleRunner,\n  middlewarePath: string,\n  request: Request,\n  i18nConfig?: NextI18nConfig | null,\n  basePath?: string,\n): Promise<MiddlewareResult> {\n  // Load the middleware module via the direct-call ModuleRunner.\n  // This bypasses the hot channel entirely and is safe with all Vite plugin\n  // combinations, including @cloudflare/vite-plugin.\n  const mod = await runner.import(middlewarePath);\n  if (!isMiddlewareModule(mod)) {\n    throw new Error(`Middleware module \"${middlewarePath}\" did not evaluate to an object.`);\n  }\n\n  return runGeneratedMiddleware({\n    basePath,\n    filePath: middlewarePath,\n    i18nConfig,\n    includeErrorDetails: process.env.NODE_ENV !== \"production\",\n    isProxy: isProxyFile(middlewarePath),\n    module: mod,\n    request,\n  });\n}\n"],"mappings":";;;;;;;;;;;;;;AA2CA,SAAgB,YAAY,UAA2B;CAErD,OADa,KAAK,SAAS,SAAS,CAAC,QAAQ,UAAU,GAC5C,KAAK;;;;;;;;;;;;;AAclB,SAAgB,yBAAyB,KAAuB,UAAkB;CAChF,OAAO,+BAA+B,KAAK;EACzC;EACA,SAAS,YAAY,SAAS;EAC/B,CAAC;;AAGJ,MAAM,uBAAuB,CAAC,IAAI,OAAO;;;;;;;;;;;;;;;;;;AAmBzC,SAAgB,mBAAmB,MAAc,aAA8C;CAE7F,KAAK,MAAM,OAAO,sBAChB,KAAK,MAAM,OAAO,YAAY,kBAAkB;EAC9C,MAAM,WAAW,KAAK,KAAK,MAAM,KAAK,QAAQ,MAAM;EACpD,IAAI,GAAG,WAAW,SAAS,EACzB,OAAO;;CAQb,KAAK,MAAM,OAAO,sBAChB,KAAK,MAAM,OAAO,YAAY,kBAAkB;EAC9C,MAAM,WAAW,KAAK,KAAK,MAAM,KAAK,aAAa,MAAM;EACzD,IAAI,GAAG,WAAW,SAAS,EAAE;GAC3B,QAAQ,KACN,uHAED;GACD,OAAO;;;CAIb,OAAO;;AAGT,SAAS,mBAAmB,OAA2C;CACrE,OAAO,CAAC,CAAC,SAAS,OAAO,UAAU;;;;;;;;;;;;;;AAerC,eAAsB,cACpB,QACA,gBACA,SACA,YACA,UAC2B;CAI3B,MAAM,MAAM,MAAM,OAAO,OAAO,eAAe;CAC/C,IAAI,CAAC,mBAAmB,IAAI,EAC1B,MAAM,IAAI,MAAM,sBAAsB,eAAe,kCAAkC;CAGzF,OAAO,uBAAuB;EAC5B;EACA,UAAU;EACV;EACA,qBAAqB,QAAQ,IAAI,aAAa;EAC9C,SAAS,YAAY,eAAe;EACpC,QAAQ;EACR;EACD,CAAC"}

package/dist/server/navigation-planner.d.ts

@@ -0,0 +1,133 @@
+import { RouteManifest } from "../routing/app-route-graph.js";
+import { AppElementsSlotBinding } from "./app-elements-wire.js";
+import { NavigationTrace, NavigationTraceFields } from "./navigation-trace.js";
+
+//#region src/server/navigation-planner.d.ts
+type OperationLane = "hmr" | "navigation" | "prefetch" | "refresh" | "server-action" | "traverse";
+type OperationToken = {
+  operationId: number;
+  lane: OperationLane;
+  baseVisibleCommitVersion: number;
+  graphVersion: string | null;
+  deploymentVersion: string | null;
+  targetSnapshotFingerprint: string;
+  cacheVariantFingerprint?: string;
+};
+type RouteSnapshotV0 = {
+  interception: InterceptionSnapshotV0 | null;
+  interceptionContext: string | null;
+  routeId: string;
+  layoutIds: readonly string[];
+  mountedParallelSlots: readonly MountedParallelSlotSnapshotV0[];
+  rootBoundaryId: string | null;
+  displayUrl: string;
+  matchedUrl: string;
+  slotBindings: readonly ParallelSlotBindingSnapshotV0[];
+};
+type InterceptionSnapshotV0 = {
+  sourceMatchedUrl: string;
+  sourceRouteId: string;
+  slotId: string;
+  targetMatchedUrl: string;
+  targetRouteId: string;
+};
+type MountedParallelSlotSnapshotV0 = {
+  slotId: string;
+  ownerLayoutId: string | null;
+};
+type ParallelSlotBindingSnapshotV0 = AppElementsSlotBinding;
+type NavigationPlannerStateV0 = {
+  nextOperationToken: OperationToken;
+  traceFields?: NavigationTraceFields;
+  visibleCommitVersion: number;
+  visibleSnapshot: RouteSnapshotV0;
+};
+type RefreshScope = "visible";
+type TraverseDirection = "back" | "forward" | "unknown";
+type NavigationEvent = {
+  kind: "navigate";
+  href: string;
+  mode: "push" | "replace";
+} | {
+  kind: "refresh";
+  scope: RefreshScope;
+} | {
+  kind: "traverse";
+  direction: TraverseDirection;
+  historyState: unknown;
+} | {
+  kind: "prefetch";
+  href: string;
+} | {
+  kind: "flightResponseArrived";
+  token: OperationToken;
+  result: FlightResultV0;
+};
+type RequestedWork = {
+  kind: "flight";
+  href: string;
+  mode: "push" | "replace" | "refresh";
+} | {
+  direction: TraverseDirection;
+  historyState: unknown;
+  kind: "traverseFlight";
+} | {
+  kind: "prefetch";
+  href: string;
+};
+type CommitProposal = {
+  preserveAbsentSlots: boolean;
+  preserveElementIds: readonly string[];
+  preservePreviousSlotIds: readonly string[];
+  reason: "currentRootBoundary" | "interceptedCurrentRootBoundary" | "rootBoundaryUnknownFallback";
+  targetSnapshot: RouteSnapshotV0;
+};
+type NoCommitReason = "prefetchOnly";
+type HardNavigationReason = "interceptionProofRejected" | "rootBoundaryChanged";
+type RootBoundaryTransition = "currentRootBoundary" | "rootBoundaryChanged" | "rootBoundaryUnknownFallback";
+type NavigationDecisionV0 = {
+  kind: "requestWork";
+  token: OperationToken;
+  work: RequestedWork;
+  trace: NavigationTrace;
+} | {
+  kind: "proposeCommit";
+  token: OperationToken;
+  proposal: CommitProposal;
+  trace: NavigationTrace;
+} | {
+  kind: "noCommit";
+  token: OperationToken;
+  reason: NoCommitReason;
+  trace: NavigationTrace;
+} | {
+  kind: "hardNavigate";
+  token: OperationToken;
+  url: string;
+  reason: HardNavigationReason;
+  trace: NavigationTrace;
+};
+type FlightResultV0 = {
+  href: string;
+  targetSnapshot: RouteSnapshotV0;
+};
+type NavigationPlannerInput = {
+  routeManifest: RouteManifest | null;
+  state: NavigationPlannerStateV0;
+  event: NavigationEvent;
+};
+declare function classifyRootBoundaryTransition(currentRootBoundaryId: string | null, nextRootBoundaryId: string | null): RootBoundaryTransition;
+declare function resolveSameLayoutAncestorPersistence(currentSnapshot: RouteSnapshotV0, targetSnapshot: RouteSnapshotV0): readonly string[];
+declare function resolveMountedParallelSlotPersistence(currentSnapshot: RouteSnapshotV0, targetSnapshot: RouteSnapshotV0): readonly string[];
+declare function resolveCurrentRootBoundaryElementPersistence(currentSnapshot: RouteSnapshotV0, targetSnapshot: RouteSnapshotV0): readonly string[];
+declare function planNavigation(input: NavigationPlannerInput): NavigationDecisionV0;
+declare const navigationPlanner: {
+  classifyRootBoundaryTransition: typeof classifyRootBoundaryTransition;
+  plan: typeof planNavigation;
+  resolveCurrentRootBoundaryElementPersistence: typeof resolveCurrentRootBoundaryElementPersistence;
+  resolveMountedParallelSlotPersistence: typeof resolveMountedParallelSlotPersistence;
+  resolveSameLayoutAncestorPersistence: typeof resolveSameLayoutAncestorPersistence;
+};
+//#endregion
+export { CommitProposal, FlightResultV0, HardNavigationReason, InterceptionSnapshotV0, MountedParallelSlotSnapshotV0, NavigationDecisionV0, NavigationEvent, NavigationPlannerInput, NavigationPlannerStateV0, NoCommitReason, OperationLane, OperationToken, ParallelSlotBindingSnapshotV0, RefreshScope, RequestedWork, RootBoundaryTransition, RouteSnapshotV0, TraverseDirection, navigationPlanner };
+//# sourceMappingURL=navigation-planner.d.ts.map