vinext 0.0.50 → 0.0.51

package/dist/routing/route-pattern.js

@@ -87,7 +87,66 @@ function matchRoutePattern(urlParts, patternParts) {
 	decodeMatchedParams(params);
 	return params;
 }
+function matchRoutePatternPrefix(pathParts, patternParts) {
+	let pathIndex = 0;
+	for (let patternIndex = 0; patternIndex < patternParts.length; patternIndex++) {
+		const patternPart = patternParts[patternIndex];
+		const isTerminal = patternIndex === patternParts.length - 1;
+		if (patternPart.startsWith(":") && patternPart.endsWith("+")) return isTerminal && pathParts.length - pathIndex >= 1;
+		if (patternPart.startsWith(":") && patternPart.endsWith("*")) return isTerminal;
+		if (pathIndex >= pathParts.length) return false;
+		if (patternPart.startsWith(":")) {
+			pathIndex++;
+			continue;
+		}
+		if (pathParts[pathIndex] !== patternPart) return false;
+		pathIndex++;
+	}
+	return true;
+}
+/**
+* Strip query string and a single trailing slash from a pathname.
+*
+* Mirrors the Next.js `removeTrailingSlash` helper used in
+* `.nextjs-ref/packages/next/src/build/static-paths/pages.ts`. Kept here so
+* both the build-time prerender and the request-time matchers normalize the
+* same way.
+*/
+function normalizeStaticPathname(pathname) {
+	const noQuery = pathname.split("?")[0];
+	return noQuery === "/" ? "/" : noQuery.replace(/\/$/, "");
+}
+/**
+* Normalize a single `getStaticPaths` entry into a `{ params }` object.
+*
+* Handles both Next.js-supported shapes:
+*   - For a string entry, match it against `routePattern` to extract params,
+*     mirroring `_routeMatcher(cleanedEntry)` in
+*     `.nextjs-ref/packages/next/src/build/static-paths/pages.ts`. If the
+*     string does not match the pattern, Next.js throws; we return an
+*     `{ error }` result so the caller can record a per-route error instead
+*     of crashing the build.
+*   - For an object entry, require a `params` key (Next.js raises
+*     "A required parameter (X) was not provided..." otherwise).
+*
+* Note: this intentionally does NOT strip a locale prefix. The build pipeline
+* currently passes empty `locales` to `getStaticPaths`, so locale-prefixed
+* string entries are not produced. If/when i18n is wired through prerender,
+* locale handling should be added here, not duplicated at call sites.
+*/
+function normalizeStaticPathsEntry(entry, routePattern) {
+	if (entry === null || entry === void 0) return { error: `getStaticPaths returned a ${entry === null ? "null" : "undefined"} entry` };
+	if (typeof entry === "string") {
+		const matched = matchRoutePattern(normalizeStaticPathname(entry).split("/").filter(Boolean), routePattern.split("/").filter(Boolean));
+		if (!matched) return { error: `The provided path \`${entry}\` from getStaticPaths does not match the route pattern \`${routePattern}\`.` };
+		return { params: matched };
+	}
+	if (typeof entry !== "object") return { error: `getStaticPaths entry must be a string or an object, got ${typeof entry}` };
+	const { params } = entry;
+	if (params === void 0 || params === null) return { error: `getStaticPaths entry is missing the \`params\` key for pattern \`${routePattern}\`. Return either a string path or { params: { ... } }.` };
+	return { params };
+}
 //#endregion
-export { fillRoutePatternSegments, matchRoutePattern, routePattern, routePatternParts };
+export { fillRoutePatternSegments, matchRoutePattern, matchRoutePatternPrefix, normalizeStaticPathname, normalizeStaticPathsEntry, routePattern, routePatternParts };
 
 //# sourceMappingURL=route-pattern.js.map

package/dist/routing/route-pattern.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-pattern.js","names":[],"sources":["../../src/routing/route-pattern.ts"],"sourcesContent":["import { decodeMatchedParams } from \"./utils\";\n\nexport type RoutePatternParams = Record<string, string | string[]>;\n\nfunction routePatternPart(segment: string): string {\n  if (segment.startsWith(\"[[...\") && segment.endsWith(\"]]\")) {\n    return `:${segment.slice(5, -2)}*`;\n  }\n  if (segment.startsWith(\"[...\") && segment.endsWith(\"]\")) {\n    return `:${segment.slice(4, -1)}+`;\n  }\n  if (segment.startsWith(\"[\") && segment.endsWith(\"]\")) {\n    return `:${segment.slice(1, -1)}`;\n  }\n  return segment;\n}\n\nexport function routePatternParts(pathname: string): string[] {\n  return pathname.split(\"/\").filter(Boolean).map(routePatternPart);\n}\n\nexport function routePattern(pathname: string): string {\n  const parts = routePatternParts(pathname);\n  return parts.length > 0 ? `/${parts.join(\"/\")}` : \"\";\n}\n\nfunction appendParamValue(target: string[], value: string | string[]): void {\n  if (Array.isArray(value)) {\n    for (const entry of value) {\n      target.push(entry);\n    }\n    return;\n  }\n\n  target.push(value);\n}\n\nexport function fillRoutePatternSegments(\n  pathname: string,\n  params: RoutePatternParams,\n): string | null {\n  const segments = pathname.split(\"/\").filter(Boolean);\n  const resolvedSegments: string[] = [];\n\n  for (const segment of segments) {\n    if (segment.startsWith(\"[[...\") && segment.endsWith(\"]]\")) {\n      const paramName = segment.slice(5, -2);\n      const value = params[paramName];\n      if (value !== undefined && value !== \"\") {\n        if (Array.isArray(value) && value.length === 0) {\n          continue;\n        }\n        appendParamValue(resolvedSegments, value);\n      }\n      continue;\n    }\n\n    if (segment.startsWith(\"[...\") && segment.endsWith(\"]\")) {\n      const paramName = segment.slice(4, -1);\n      const value = params[paramName];\n      if (value === undefined || (Array.isArray(value) ? value.length === 0 : value === \"\")) {\n        return null;\n      }\n      appendParamValue(resolvedSegments, value);\n      continue;\n    }\n\n    if (segment.startsWith(\"[\") && segment.endsWith(\"]\")) {\n      const paramName = segment.slice(1, -1);\n      const value = params[paramName];\n      if (typeof value === \"string\") {\n        resolvedSegments.push(value);\n        continue;\n      }\n      if (Array.isArray(value) && value.length > 0) {\n        if (value.length > 1) {\n          return null;\n        }\n        resolvedSegments.push(value[0]);\n        continue;\n      }\n      return null;\n    }\n\n    resolvedSegments.push(segment);\n  }\n\n  return resolvedSegments.length > 0 ? `/${resolvedSegments.join(\"/\")}` : \"/\";\n}\n\nexport function matchRoutePattern(\n  urlParts: readonly string[],\n  patternParts: readonly string[],\n): RoutePatternParams | null {\n  const params: RoutePatternParams = Object.create(null);\n\n  function matchFrom(urlIndex: number, patternIndex: number): boolean {\n    if (patternIndex === patternParts.length) {\n      return urlIndex === urlParts.length;\n    }\n\n    const patternPart = patternParts[patternIndex];\n    if (patternPart.startsWith(\":\") && (patternPart.endsWith(\"+\") || patternPart.endsWith(\"*\"))) {\n      const paramName = patternPart.slice(1, -1);\n      const minLength = patternPart.endsWith(\"+\") ? 1 : 0;\n      for (let endIndex = urlIndex + minLength; endIndex <= urlParts.length; endIndex++) {\n        const value = urlParts.slice(urlIndex, endIndex);\n        if (value.length > 0) {\n          params[paramName] = value;\n        } else {\n          delete params[paramName];\n        }\n        if (matchFrom(endIndex, patternIndex + 1)) {\n          return true;\n        }\n      }\n      delete params[paramName];\n      return false;\n    }\n\n    if (patternPart.startsWith(\":\")) {\n      if (urlIndex >= urlParts.length) {\n        return false;\n      }\n      const paramName = patternPart.slice(1);\n      params[paramName] = urlParts[urlIndex];\n      if (matchFrom(urlIndex + 1, patternIndex + 1)) {\n        return true;\n      }\n      delete params[paramName];\n      return false;\n    }\n\n    if (urlIndex >= urlParts.length || urlParts[urlIndex] !== patternPart) {\n      return false;\n    }\n    return matchFrom(urlIndex + 1, patternIndex + 1);\n  }\n\n  if (!matchFrom(0, 0)) return null;\n  decodeMatchedParams(params);\n  return params;\n}\n"],"mappings":"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"}
+{"version":3,"file":"route-pattern.js","names":[],"sources":["../../src/routing/route-pattern.ts"],"sourcesContent":["import { decodeMatchedParams } from \"./utils\";\n\nexport type RoutePatternParams = Record<string, string | string[]>;\n\nfunction routePatternPart(segment: string): string {\n  if (segment.startsWith(\"[[...\") && segment.endsWith(\"]]\")) {\n    return `:${segment.slice(5, -2)}*`;\n  }\n  if (segment.startsWith(\"[...\") && segment.endsWith(\"]\")) {\n    return `:${segment.slice(4, -1)}+`;\n  }\n  if (segment.startsWith(\"[\") && segment.endsWith(\"]\")) {\n    return `:${segment.slice(1, -1)}`;\n  }\n  return segment;\n}\n\nexport function routePatternParts(pathname: string): string[] {\n  return pathname.split(\"/\").filter(Boolean).map(routePatternPart);\n}\n\nexport function routePattern(pathname: string): string {\n  const parts = routePatternParts(pathname);\n  return parts.length > 0 ? `/${parts.join(\"/\")}` : \"\";\n}\n\nfunction appendParamValue(target: string[], value: string | string[]): void {\n  if (Array.isArray(value)) {\n    for (const entry of value) {\n      target.push(entry);\n    }\n    return;\n  }\n\n  target.push(value);\n}\n\nexport function fillRoutePatternSegments(\n  pathname: string,\n  params: RoutePatternParams,\n): string | null {\n  const segments = pathname.split(\"/\").filter(Boolean);\n  const resolvedSegments: string[] = [];\n\n  for (const segment of segments) {\n    if (segment.startsWith(\"[[...\") && segment.endsWith(\"]]\")) {\n      const paramName = segment.slice(5, -2);\n      const value = params[paramName];\n      if (value !== undefined && value !== \"\") {\n        if (Array.isArray(value) && value.length === 0) {\n          continue;\n        }\n        appendParamValue(resolvedSegments, value);\n      }\n      continue;\n    }\n\n    if (segment.startsWith(\"[...\") && segment.endsWith(\"]\")) {\n      const paramName = segment.slice(4, -1);\n      const value = params[paramName];\n      if (value === undefined || (Array.isArray(value) ? value.length === 0 : value === \"\")) {\n        return null;\n      }\n      appendParamValue(resolvedSegments, value);\n      continue;\n    }\n\n    if (segment.startsWith(\"[\") && segment.endsWith(\"]\")) {\n      const paramName = segment.slice(1, -1);\n      const value = params[paramName];\n      if (typeof value === \"string\") {\n        resolvedSegments.push(value);\n        continue;\n      }\n      if (Array.isArray(value) && value.length > 0) {\n        if (value.length > 1) {\n          return null;\n        }\n        resolvedSegments.push(value[0]);\n        continue;\n      }\n      return null;\n    }\n\n    resolvedSegments.push(segment);\n  }\n\n  return resolvedSegments.length > 0 ? `/${resolvedSegments.join(\"/\")}` : \"/\";\n}\n\nexport function matchRoutePattern(\n  urlParts: readonly string[],\n  patternParts: readonly string[],\n): RoutePatternParams | null {\n  const params: RoutePatternParams = Object.create(null);\n\n  function matchFrom(urlIndex: number, patternIndex: number): boolean {\n    if (patternIndex === patternParts.length) {\n      return urlIndex === urlParts.length;\n    }\n\n    const patternPart = patternParts[patternIndex];\n    if (patternPart.startsWith(\":\") && (patternPart.endsWith(\"+\") || patternPart.endsWith(\"*\"))) {\n      const paramName = patternPart.slice(1, -1);\n      const minLength = patternPart.endsWith(\"+\") ? 1 : 0;\n      for (let endIndex = urlIndex + minLength; endIndex <= urlParts.length; endIndex++) {\n        const value = urlParts.slice(urlIndex, endIndex);\n        if (value.length > 0) {\n          params[paramName] = value;\n        } else {\n          delete params[paramName];\n        }\n        if (matchFrom(endIndex, patternIndex + 1)) {\n          return true;\n        }\n      }\n      delete params[paramName];\n      return false;\n    }\n\n    if (patternPart.startsWith(\":\")) {\n      if (urlIndex >= urlParts.length) {\n        return false;\n      }\n      const paramName = patternPart.slice(1);\n      params[paramName] = urlParts[urlIndex];\n      if (matchFrom(urlIndex + 1, patternIndex + 1)) {\n        return true;\n      }\n      delete params[paramName];\n      return false;\n    }\n\n    if (urlIndex >= urlParts.length || urlParts[urlIndex] !== patternPart) {\n      return false;\n    }\n    return matchFrom(urlIndex + 1, patternIndex + 1);\n  }\n\n  if (!matchFrom(0, 0)) return null;\n  decodeMatchedParams(params);\n  return params;\n}\n\nexport function matchRoutePatternPrefix(\n  pathParts: readonly string[],\n  patternParts: readonly string[],\n): boolean {\n  let pathIndex = 0;\n  for (let patternIndex = 0; patternIndex < patternParts.length; patternIndex++) {\n    const patternPart = patternParts[patternIndex];\n    const isTerminal = patternIndex === patternParts.length - 1;\n\n    if (patternPart.startsWith(\":\") && patternPart.endsWith(\"+\")) {\n      return isTerminal && pathParts.length - pathIndex >= 1;\n    }\n    if (patternPart.startsWith(\":\") && patternPart.endsWith(\"*\")) {\n      return isTerminal;\n    }\n    if (pathIndex >= pathParts.length) return false;\n    if (patternPart.startsWith(\":\")) {\n      pathIndex++;\n      continue;\n    }\n    if (pathParts[pathIndex] !== patternPart) return false;\n    pathIndex++;\n  }\n\n  return true;\n}\n\n/**\n * A single entry from `getStaticPaths().paths`.\n *\n * Next.js allows both shapes:\n *   - a raw string path, e.g. `\"/blog/hello\"`\n *   - an object `{ params, locale? }`\n *\n * See:\n *   https://nextjs.org/docs/pages/api-reference/functions/get-static-paths\n *   .nextjs-ref/packages/next/src/build/static-paths/pages.ts (the\n *     `typeof entry === 'string'` branch around line 89, and the object\n *     branch around line 132)\n */\nexport type StaticPathsEntry =\n  | string\n  | { params?: RoutePatternParams; locale?: string }\n  | null\n  | undefined;\n\n/**\n * Result of {@link normalizeStaticPathsEntry}: either a params object, or a\n * descriptive error string the caller can surface as a per-route error result.\n */\ntype NormalizedStaticPathsEntry = { params: RoutePatternParams } | { error: string };\n\n/**\n * Strip query string and a single trailing slash from a pathname.\n *\n * Mirrors the Next.js `removeTrailingSlash` helper used in\n * `.nextjs-ref/packages/next/src/build/static-paths/pages.ts`. Kept here so\n * both the build-time prerender and the request-time matchers normalize the\n * same way.\n */\nexport function normalizeStaticPathname(pathname: string): string {\n  const noQuery = pathname.split(\"?\")[0];\n  return noQuery === \"/\" ? \"/\" : noQuery.replace(/\\/$/, \"\");\n}\n\n/**\n * Normalize a single `getStaticPaths` entry into a `{ params }` object.\n *\n * Handles both Next.js-supported shapes:\n *   - For a string entry, match it against `routePattern` to extract params,\n *     mirroring `_routeMatcher(cleanedEntry)` in\n *     `.nextjs-ref/packages/next/src/build/static-paths/pages.ts`. If the\n *     string does not match the pattern, Next.js throws; we return an\n *     `{ error }` result so the caller can record a per-route error instead\n *     of crashing the build.\n *   - For an object entry, require a `params` key (Next.js raises\n *     \"A required parameter (X) was not provided...\" otherwise).\n *\n * Note: this intentionally does NOT strip a locale prefix. The build pipeline\n * currently passes empty `locales` to `getStaticPaths`, so locale-prefixed\n * string entries are not produced. If/when i18n is wired through prerender,\n * locale handling should be added here, not duplicated at call sites.\n */\nexport function normalizeStaticPathsEntry(\n  entry: StaticPathsEntry,\n  routePattern: string,\n): NormalizedStaticPathsEntry {\n  if (entry === null || entry === undefined) {\n    return {\n      error: `getStaticPaths returned a ${entry === null ? \"null\" : \"undefined\"} entry`,\n    };\n  }\n\n  if (typeof entry === \"string\") {\n    const trimmed = normalizeStaticPathname(entry);\n    const urlParts = trimmed.split(\"/\").filter(Boolean);\n    const patternParts = routePattern.split(\"/\").filter(Boolean);\n    const matched = matchRoutePattern(urlParts, patternParts);\n    if (!matched) {\n      return {\n        error: `The provided path \\`${entry}\\` from getStaticPaths does not match the route pattern \\`${routePattern}\\`.`,\n      };\n    }\n    return { params: matched };\n  }\n\n  if (typeof entry !== \"object\") {\n    return {\n      error: `getStaticPaths entry must be a string or an object, got ${typeof entry}`,\n    };\n  }\n\n  const { params } = entry;\n  if (params === undefined || params === null) {\n    return {\n      error:\n        `getStaticPaths entry is missing the \\`params\\` key for pattern \\`${routePattern}\\`. ` +\n        `Return either a string path or { params: { ... } }.`,\n    };\n  }\n\n  return { params };\n}\n"],"mappings":"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"}

package/dist/server/app-browser-action-result.d.ts

@@ -6,6 +6,13 @@ type AppBrowserServerActionResult<TRoot> = {
     data: unknown;
   };
 };
+type ServerActionRevalidationKind = "dynamicOnly" | "none" | "staticAndDynamic";
+type ServerActionInitiationSnapshot<TRouterState> = {
+  href: string;
+  navigationId: number;
+  path: string;
+  routerState: TRouterState;
+};
 /**
  * Structural discriminator: matches on `"returnValue"` or `"root"` keys.
  * This is safe because {@link AppWireElements} keys are prefixed (`route:`,
@@ -13,7 +20,25 @@ type AppBrowserServerActionResult<TRoot> = {
  * If the wire format ever adds a `"root"` key, this guard must be updated.
  */
 declare function isServerActionResult<TRoot>(value: unknown): value is AppBrowserServerActionResult<TRoot>;
-declare function shouldClearClientNavigationCachesForServerActionResult<TRoot>(result: AppBrowserServerActionResult<TRoot> | TRoot): boolean;
+declare function shouldClearClientNavigationCachesForServerActionResult<TRoot>(result: AppBrowserServerActionResult<TRoot> | TRoot, revalidation?: ServerActionRevalidationKind): boolean;
+declare function parseServerActionRevalidationHeader(headers: Pick<Headers, "get">): ServerActionRevalidationKind;
+declare function shouldScheduleRefreshForDiscardedServerAction(revalidation: ServerActionRevalidationKind): boolean;
+declare function createServerActionInitiationSnapshot<TRouterState>(options: {
+  href: string;
+  navigationId: number;
+  origin?: string;
+  routerState: TRouterState;
+}): ServerActionInitiationSnapshot<TRouterState>;
+type DiscardedServerActionRefreshScheduler = {
+  markNavigationSettled(): void;
+  markNavigationStart(): void;
+  schedule(): void;
+};
+type DiscardedServerActionRefreshSchedulerOptions = {
+  queueTask?: (callback: () => void) => void;
+  runRefresh: () => void;
+};
+declare function createDiscardedServerActionRefreshScheduler(options: DiscardedServerActionRefreshSchedulerOptions): DiscardedServerActionRefreshScheduler;
 //#endregion
-export { AppBrowserServerActionResult, isServerActionResult, shouldClearClientNavigationCachesForServerActionResult };
+export { AppBrowserServerActionResult, ServerActionRevalidationKind, createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, isServerActionResult, parseServerActionRevalidationHeader, shouldClearClientNavigationCachesForServerActionResult, shouldScheduleRefreshForDiscardedServerAction };
 //# sourceMappingURL=app-browser-action-result.d.ts.map

package/dist/server/app-browser-action-result.js

@@ -1,4 +1,7 @@
+import { ACTION_REVALIDATED_HEADER } from "./headers.js";
 //#region src/server/app-browser-action-result.ts
+const ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC = 1;
+const ACTION_DID_REVALIDATE_DYNAMIC_ONLY = 2;
 /**
 * Structural discriminator: matches on `"returnValue"` or `"root"` keys.
 * This is safe because {@link AppWireElements} keys are prefixed (`route:`,
@@ -8,11 +11,69 @@
 function isServerActionResult(value) {
 	return !!value && typeof value === "object" && ("returnValue" in value || "root" in value);
 }
-function shouldClearClientNavigationCachesForServerActionResult(result) {
+function shouldClearClientNavigationCachesForServerActionResult(result, revalidation = "none") {
+	if (revalidation !== "none") return true;
 	if (!isServerActionResult(result)) return true;
 	return result.root !== void 0;
 }
+function parseServerActionRevalidationHeader(headers) {
+	const value = headers.get(ACTION_REVALIDATED_HEADER);
+	if (!value) return "none";
+	let parsed;
+	try {
+		parsed = JSON.parse(value);
+	} catch {
+		return "none";
+	}
+	switch (parsed) {
+		case ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC: return "staticAndDynamic";
+		case ACTION_DID_REVALIDATE_DYNAMIC_ONLY: return "dynamicOnly";
+		default: return "none";
+	}
+}
+function shouldScheduleRefreshForDiscardedServerAction(revalidation) {
+	return revalidation !== "none";
+}
+function createServerActionInitiationSnapshot(options) {
+	const url = options.origin === void 0 ? new URL(options.href) : new URL(options.href, options.origin);
+	return {
+		href: url.href,
+		navigationId: options.navigationId,
+		path: url.pathname + url.search,
+		routerState: options.routerState
+	};
+}
+function createDiscardedServerActionRefreshScheduler(options) {
+	const queueTask = options.queueTask ?? queueMicrotask;
+	let activeNavigationCount = 0;
+	let flushQueued = false;
+	let refreshPending = false;
+	function flush() {
+		flushQueued = false;
+		if (!refreshPending || activeNavigationCount > 0) return;
+		refreshPending = false;
+		options.runRefresh();
+	}
+	function queueFlush() {
+		if (flushQueued) return;
+		flushQueued = true;
+		queueTask(flush);
+	}
+	return {
+		markNavigationSettled() {
+			if (activeNavigationCount > 0) activeNavigationCount -= 1;
+			queueFlush();
+		},
+		markNavigationStart() {
+			activeNavigationCount += 1;
+		},
+		schedule() {
+			refreshPending = true;
+			queueFlush();
+		}
+	};
+}
 //#endregion
-export { isServerActionResult, shouldClearClientNavigationCachesForServerActionResult };
+export { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, isServerActionResult, parseServerActionRevalidationHeader, shouldClearClientNavigationCachesForServerActionResult, shouldScheduleRefreshForDiscardedServerAction };
 
 //# sourceMappingURL=app-browser-action-result.js.map

package/dist/server/app-browser-action-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-browser-action-result.js","names":[],"sources":["../../src/server/app-browser-action-result.ts"],"sourcesContent":["export type AppBrowserServerActionResult<TRoot> = {\n  root?: TRoot;\n  returnValue?: {\n    ok: boolean;\n    data: unknown;\n  };\n};\n\n/**\n * Structural discriminator: matches on `\"returnValue\"` or `\"root\"` keys.\n * This is safe because {@link AppWireElements} keys are prefixed (`route:`,\n * `slot:`, `__route`, etc.) and will never collide with these property names.\n * If the wire format ever adds a `\"root\"` key, this guard must be updated.\n */\nexport function isServerActionResult<TRoot>(\n  value: unknown,\n): value is AppBrowserServerActionResult<TRoot> {\n  return !!value && typeof value === \"object\" && (\"returnValue\" in value || \"root\" in value);\n}\n\nexport function shouldClearClientNavigationCachesForServerActionResult<TRoot>(\n  result: AppBrowserServerActionResult<TRoot> | TRoot,\n): boolean {\n  if (!isServerActionResult<TRoot>(result)) {\n    return true;\n  }\n\n  return result.root !== undefined;\n}\n"],"mappings":";;;;;;;AAcA,SAAgB,qBACd,OAC8C;CAC9C,OAAO,CAAC,CAAC,SAAS,OAAO,UAAU,aAAa,iBAAiB,SAAS,UAAU;;AAGtF,SAAgB,uDACd,QACS;CACT,IAAI,CAAC,qBAA4B,OAAO,EACtC,OAAO;CAGT,OAAO,OAAO,SAAS,KAAA"}
+{"version":3,"file":"app-browser-action-result.js","names":[],"sources":["../../src/server/app-browser-action-result.ts"],"sourcesContent":["import { ACTION_REVALIDATED_HEADER } from \"./headers.js\";\n\nexport type AppBrowserServerActionResult<TRoot> = {\n  root?: TRoot;\n  returnValue?: {\n    ok: boolean;\n    data: unknown;\n  };\n};\n\nexport type ServerActionRevalidationKind = \"dynamicOnly\" | \"none\" | \"staticAndDynamic\";\n\nconst ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC = 1;\nconst ACTION_DID_REVALIDATE_DYNAMIC_ONLY = 2;\n\ntype ServerActionInitiationSnapshot<TRouterState> = {\n  href: string;\n  navigationId: number;\n  path: string;\n  routerState: TRouterState;\n};\n\n/**\n * Structural discriminator: matches on `\"returnValue\"` or `\"root\"` keys.\n * This is safe because {@link AppWireElements} keys are prefixed (`route:`,\n * `slot:`, `__route`, etc.) and will never collide with these property names.\n * If the wire format ever adds a `\"root\"` key, this guard must be updated.\n */\nexport function isServerActionResult<TRoot>(\n  value: unknown,\n): value is AppBrowserServerActionResult<TRoot> {\n  return !!value && typeof value === \"object\" && (\"returnValue\" in value || \"root\" in value);\n}\n\nexport function shouldClearClientNavigationCachesForServerActionResult<TRoot>(\n  result: AppBrowserServerActionResult<TRoot> | TRoot,\n  revalidation: ServerActionRevalidationKind = \"none\",\n): boolean {\n  if (revalidation !== \"none\") {\n    return true;\n  }\n\n  if (!isServerActionResult<TRoot>(result)) {\n    return true;\n  }\n\n  return result.root !== undefined;\n}\n\nexport function parseServerActionRevalidationHeader(\n  headers: Pick<Headers, \"get\">,\n): ServerActionRevalidationKind {\n  const value = headers.get(ACTION_REVALIDATED_HEADER);\n  if (!value) return \"none\";\n\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(value);\n  } catch {\n    return \"none\";\n  }\n\n  switch (parsed) {\n    case ACTION_DID_REVALIDATE_STATIC_AND_DYNAMIC:\n      return \"staticAndDynamic\";\n    case ACTION_DID_REVALIDATE_DYNAMIC_ONLY:\n      return \"dynamicOnly\";\n    default:\n      return \"none\";\n  }\n}\n\nexport function shouldScheduleRefreshForDiscardedServerAction(\n  revalidation: ServerActionRevalidationKind,\n): boolean {\n  return revalidation !== \"none\";\n}\n\nexport function createServerActionInitiationSnapshot<TRouterState>(options: {\n  href: string;\n  navigationId: number;\n  origin?: string;\n  routerState: TRouterState;\n}): ServerActionInitiationSnapshot<TRouterState> {\n  const url =\n    options.origin === undefined ? new URL(options.href) : new URL(options.href, options.origin);\n  return {\n    href: url.href,\n    navigationId: options.navigationId,\n    path: url.pathname + url.search,\n    routerState: options.routerState,\n  };\n}\n\ntype DiscardedServerActionRefreshScheduler = {\n  markNavigationSettled(): void;\n  markNavigationStart(): void;\n  schedule(): void;\n};\n\ntype DiscardedServerActionRefreshSchedulerOptions = {\n  queueTask?: (callback: () => void) => void;\n  runRefresh: () => void;\n};\n\nexport function createDiscardedServerActionRefreshScheduler(\n  options: DiscardedServerActionRefreshSchedulerOptions,\n): DiscardedServerActionRefreshScheduler {\n  const queueTask = options.queueTask ?? queueMicrotask;\n  let activeNavigationCount = 0;\n  let flushQueued = false;\n  let refreshPending = false;\n\n  function flush(): void {\n    flushQueued = false;\n    if (!refreshPending || activeNavigationCount > 0) return;\n\n    refreshPending = false;\n    options.runRefresh();\n  }\n\n  function queueFlush(): void {\n    if (flushQueued) return;\n    flushQueued = true;\n    queueTask(flush);\n  }\n\n  return {\n    markNavigationSettled() {\n      if (activeNavigationCount > 0) {\n        activeNavigationCount -= 1;\n      }\n      queueFlush();\n    },\n    markNavigationStart() {\n      activeNavigationCount += 1;\n    },\n    schedule() {\n      refreshPending = true;\n      queueFlush();\n    },\n  };\n}\n"],"mappings":";;AAYA,MAAM,2CAA2C;AACjD,MAAM,qCAAqC;;;;;;;AAe3C,SAAgB,qBACd,OAC8C;CAC9C,OAAO,CAAC,CAAC,SAAS,OAAO,UAAU,aAAa,iBAAiB,SAAS,UAAU;;AAGtF,SAAgB,uDACd,QACA,eAA6C,QACpC;CACT,IAAI,iBAAiB,QACnB,OAAO;CAGT,IAAI,CAAC,qBAA4B,OAAO,EACtC,OAAO;CAGT,OAAO,OAAO,SAAS,KAAA;;AAGzB,SAAgB,oCACd,SAC8B;CAC9B,MAAM,QAAQ,QAAQ,IAAI,0BAA0B;CACpD,IAAI,CAAC,OAAO,OAAO;CAEnB,IAAI;CACJ,IAAI;EACF,SAAS,KAAK,MAAM,MAAM;SACpB;EACN,OAAO;;CAGT,QAAQ,QAAR;EACE,KAAK,0CACH,OAAO;EACT,KAAK,oCACH,OAAO;EACT,SACE,OAAO;;;AAIb,SAAgB,8CACd,cACS;CACT,OAAO,iBAAiB;;AAG1B,SAAgB,qCAAmD,SAKlB;CAC/C,MAAM,MACJ,QAAQ,WAAW,KAAA,IAAY,IAAI,IAAI,QAAQ,KAAK,GAAG,IAAI,IAAI,QAAQ,MAAM,QAAQ,OAAO;CAC9F,OAAO;EACL,MAAM,IAAI;EACV,cAAc,QAAQ;EACtB,MAAM,IAAI,WAAW,IAAI;EACzB,aAAa,QAAQ;EACtB;;AAcH,SAAgB,4CACd,SACuC;CACvC,MAAM,YAAY,QAAQ,aAAa;CACvC,IAAI,wBAAwB;CAC5B,IAAI,cAAc;CAClB,IAAI,iBAAiB;CAErB,SAAS,QAAc;EACrB,cAAc;EACd,IAAI,CAAC,kBAAkB,wBAAwB,GAAG;EAElD,iBAAiB;EACjB,QAAQ,YAAY;;CAGtB,SAAS,aAAmB;EAC1B,IAAI,aAAa;EACjB,cAAc;EACd,UAAU,MAAM;;CAGlB,OAAO;EACL,wBAAwB;GACtB,IAAI,wBAAwB,GAC1B,yBAAyB;GAE3B,YAAY;;EAEd,sBAAsB;GACpB,yBAAyB;;EAE3B,WAAW;GACT,iBAAiB;GACjB,YAAY;;EAEf"}