@tanstack/start-client-core 1.167.10 → 1.167.11

package/dist/esm/client/hydrateStart.js

@@ -1,7 +1,8 @@
 import { ServerFunctionSerializationAdapter } from "./ServerFunctionSerializationAdapter.js";
 import { hydrate } from "@tanstack/router-core/ssr/client";
-import { getRouter } from "#tanstack-router-entry";
 import { startInstance } from "#tanstack-start-entry";
+import { hasPluginAdapters, pluginSerializationAdapters } from "#tanstack-start-plugin-adapters";
+import { getRouter } from "#tanstack-router-entry";
 //#region src/client/hydrateStart.ts
 async function hydrateStart() {
 	const router = await getRouter();
@@ -16,6 +17,7 @@ async function hydrateStart() {
 		serializationAdapters = [];
 		window.__TSS_START_OPTIONS__ = { serializationAdapters };
 	}
+	if (hasPluginAdapters) serializationAdapters.push(...pluginSerializationAdapters);
 	serializationAdapters.push(ServerFunctionSerializationAdapter);
 	if (router.options.serializationAdapters) serializationAdapters.push(...router.options.serializationAdapters);
 	router.update({

package/dist/esm/client/hydrateStart.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydrateStart.js","names":[],"sources":["../../../src/client/hydrateStart.ts"],"sourcesContent":["import { hydrate } from '@tanstack/router-core/ssr/client'\n\nimport { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter'\nimport type { AnyStartInstanceOptions } from '../createStart'\nimport type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core'\n// eslint-disable-next-line import/no-duplicates,import/order\nimport { getRouter } from '#tanstack-router-entry'\n// eslint-disable-next-line import/no-duplicates,import/order\nimport { startInstance } from '#tanstack-start-entry'\n\nexport async function hydrateStart(): Promise<AnyRouter> {\n  const router = await getRouter()\n\n  let serializationAdapters: Array<AnySerializationAdapter>\n  if (startInstance) {\n    const startOptions = await startInstance.getOptions()\n    startOptions.serializationAdapters =\n      startOptions.serializationAdapters ?? []\n    window.__TSS_START_OPTIONS__ = startOptions as AnyStartInstanceOptions\n    serializationAdapters = startOptions.serializationAdapters\n    router.options.defaultSsr = startOptions.defaultSsr\n  } else {\n    serializationAdapters = []\n    window.__TSS_START_OPTIONS__ = {\n      serializationAdapters,\n    } as AnyStartInstanceOptions\n  }\n\n  serializationAdapters.push(ServerFunctionSerializationAdapter)\n  if (router.options.serializationAdapters) {\n    serializationAdapters.push(...router.options.serializationAdapters)\n  }\n\n  router.update({\n    basepath: process.env.TSS_ROUTER_BASEPATH,\n    ...{ serializationAdapters },\n  })\n  if (!router.stores.matchesId.state.length) {\n    await hydrate(router)\n  }\n\n  return router\n}\n"],"mappings":";;;;;AAUA,eAAsB,eAAmC;CACvD,MAAM,SAAS,MAAM,WAAW;CAEhC,IAAI;AACJ,KAAI,eAAe;EACjB,MAAM,eAAe,MAAM,cAAc,YAAY;AACrD,eAAa,wBACX,aAAa,yBAAyB,EAAE;AAC1C,SAAO,wBAAwB;AAC/B,0BAAwB,aAAa;AACrC,SAAO,QAAQ,aAAa,aAAa;QACpC;AACL,0BAAwB,EAAE;AAC1B,SAAO,wBAAwB,EAC7B,uBACD;;AAGH,uBAAsB,KAAK,mCAAmC;AAC9D,KAAI,OAAO,QAAQ,sBACjB,uBAAsB,KAAK,GAAG,OAAO,QAAQ,sBAAsB;AAGrE,QAAO,OAAO;EACZ,UAAU,QAAQ,IAAI;EACjB;EACN,CAAC;AACF,KAAI,CAAC,OAAO,OAAO,UAAU,MAAM,OACjC,OAAM,QAAQ,OAAO;AAGvB,QAAO"}
+{"version":3,"file":"hydrateStart.js","names":[],"sources":["../../../src/client/hydrateStart.ts"],"sourcesContent":["import { hydrate } from '@tanstack/router-core/ssr/client'\n\nimport { startInstance } from '#tanstack-start-entry'\nimport {\n  hasPluginAdapters,\n  pluginSerializationAdapters,\n} from '#tanstack-start-plugin-adapters'\nimport { getRouter } from '#tanstack-router-entry'\nimport { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter'\nimport type { AnyStartInstanceOptions } from '../createStart'\nimport type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core'\n\nexport async function hydrateStart(): Promise<AnyRouter> {\n  const router = await getRouter()\n\n  let serializationAdapters: Array<AnySerializationAdapter>\n  if (startInstance) {\n    const startOptions = await startInstance.getOptions()\n    startOptions.serializationAdapters =\n      startOptions.serializationAdapters ?? []\n    window.__TSS_START_OPTIONS__ = startOptions as AnyStartInstanceOptions\n    serializationAdapters = startOptions.serializationAdapters\n    router.options.defaultSsr = startOptions.defaultSsr\n  } else {\n    serializationAdapters = []\n    window.__TSS_START_OPTIONS__ = {\n      serializationAdapters,\n    } as AnyStartInstanceOptions\n  }\n\n  // Only spread plugin adapters if any are configured (this will tree-shake away otherwise)\n  if (hasPluginAdapters) {\n    serializationAdapters.push(...pluginSerializationAdapters)\n  }\n  serializationAdapters.push(ServerFunctionSerializationAdapter)\n  if (router.options.serializationAdapters) {\n    serializationAdapters.push(...router.options.serializationAdapters)\n  }\n\n  router.update({\n    basepath: process.env.TSS_ROUTER_BASEPATH,\n    ...{ serializationAdapters },\n  })\n  if (!router.stores.matchesId.state.length) {\n    await hydrate(router)\n  }\n\n  return router\n}\n"],"mappings":";;;;;;AAYA,eAAsB,eAAmC;CACvD,MAAM,SAAS,MAAM,WAAW;CAEhC,IAAI;AACJ,KAAI,eAAe;EACjB,MAAM,eAAe,MAAM,cAAc,YAAY;AACrD,eAAa,wBACX,aAAa,yBAAyB,EAAE;AAC1C,SAAO,wBAAwB;AAC/B,0BAAwB,aAAa;AACrC,SAAO,QAAQ,aAAa,aAAa;QACpC;AACL,0BAAwB,EAAE;AAC1B,SAAO,wBAAwB,EAC7B,uBACD;;AAIH,KAAI,kBACF,uBAAsB,KAAK,GAAG,4BAA4B;AAE5D,uBAAsB,KAAK,mCAAmC;AAC9D,KAAI,OAAO,QAAQ,sBACjB,uBAAsB,KAAK,GAAG,OAAO,QAAQ,sBAAsB;AAGrE,QAAO,OAAO;EACZ,UAAU,QAAQ,IAAI;EACjB;EACN,CAAC;AACF,KAAI,CAAC,OAAO,OAAO,UAAU,MAAM,OACjC,OAAM,QAAQ,OAAO;AAGvB,QAAO"}

package/dist/esm/client-rpc/serverFnFetcher.d.ts

@@ -1 +1,22 @@
+/**
+ * Set the current post-processing context for async deserialization work.
+ * Called before deserialization starts.
+ *
+ * @param ctx - Array to collect async work promises, or null to clear
+ */
+export declare function setPostProcessContext(ctx: Array<Promise<unknown>> | null): void;
+/**
+ * Get the current post-processing context.
+ * Returns null if no deserialization is in progress.
+ */
+export declare function getPostProcessContext(): Array<Promise<unknown>> | null;
+/**
+ * Track an async post-processing promise in the current deserialization context.
+ * Called by deserializers that need to perform async work after sync deserialization.
+ *
+ * If no context is active (e.g., on server), this is a no-op.
+ *
+ * @param promise - The async work promise to track
+ */
+export declare function trackPostProcessPromise(promise: Promise<unknown>): void;
 export declare function serverFnFetcher(url: string, args: Array<any>, handler: (url: string, requestInit: RequestInit) => Promise<Response>): Promise<any>;

package/dist/esm/client-rpc/serverFnFetcher.js

@@ -6,6 +6,50 @@ import { fromCrossJSON, toJSONAsync } from "seroval";
 //#region src/client-rpc/serverFnFetcher.ts
 var serovalPlugins = null;
 /**
+* Current async post-processing context for deserialization.
+*
+* Some deserializers need to perform async work after synchronous deserialization
+* (e.g., decoding RSC payloads, fetching remote data). This context allows them
+* to register promises that must complete before the deserialized value is used.
+*
+* This uses a synchronous execution context pattern:
+* - Each call to `fromCrossJSON` is synchronous
+* - Within that synchronous execution, all `fromSerializable` calls happen
+* - We set the context before `fromCrossJSON`, clear it after
+* - For streaming chunks, we set/clear context around each `onMessage` call
+*
+* Even with concurrent server function calls, each individual deserialization
+* is atomic (synchronous), so promises are correctly scoped to their call.
+*/
+var currentPostProcessContext = null;
+/**
+* Set the current post-processing context for async deserialization work.
+* Called before deserialization starts.
+*
+* @param ctx - Array to collect async work promises, or null to clear
+*/
+function setPostProcessContext(ctx) {
+	currentPostProcessContext = ctx;
+}
+/**
+* Track an async post-processing promise in the current deserialization context.
+* Called by deserializers that need to perform async work after sync deserialization.
+*
+* If no context is active (e.g., on server), this is a no-op.
+*
+* @param promise - The async work promise to track
+*/
+function trackPostProcessPromise(promise) {
+	if (currentPostProcessContext) currentPostProcessContext.push(promise);
+}
+/**
+* Helper to await all post-processing promises.
+* Uses Promise.allSettled to ensure all promises complete even if some reject.
+*/
+async function awaitPostProcessPromises(promises) {
+	if (promises.length > 0) await Promise.allSettled(promises);
+}
+/**
 * Checks if an object has at least one own enumerable property.
 * More efficient than Object.keys(obj).length > 0 as it short-circuits on first property.
 */
@@ -116,19 +160,17 @@ async function getResponse(fn) {
 					console.error(msg, error);
 				}
 			});
-		} else if (contentType.includes("application/x-ndjson")) {
-			const refs = /* @__PURE__ */ new Map();
-			result = await processServerFnResponse({
-				response,
-				onMessage: (msg) => fromCrossJSON(msg, {
-					refs,
-					plugins: serovalPlugins
-				}),
-				onError(msg, error) {
-					console.error(msg, error);
-				}
-			});
-		} else if (contentType.includes("application/json")) result = fromCrossJSON(await response.json(), { plugins: serovalPlugins });
+		} else if (contentType.includes("application/json")) {
+			const jsonPayload = await response.json();
+			const postProcessPromises = [];
+			setPostProcessContext(postProcessPromises);
+			try {
+				result = fromCrossJSON(jsonPayload, { plugins: serovalPlugins });
+			} finally {
+				setPostProcessContext(null);
+			}
+			await awaitPostProcessPromises(postProcessPromises);
+		}
 		if (!result) {
 			if (process.env.NODE_ENV !== "production") throw new Error("Invariant failed: expected result to be resolved");
 			invariant();
@@ -146,86 +188,67 @@ async function getResponse(fn) {
 	if (!response.ok) throw new Error(await response.text());
 	return response;
 }
-async function processServerFnResponse({ response, onMessage, onError }) {
-	if (!response.body) throw new Error("No response body");
-	const reader = response.body.pipeThrough(new TextDecoderStream()).getReader();
-	let buffer = "";
-	let firstRead = false;
-	let firstObject;
-	while (!firstRead) {
-		const { value, done } = await reader.read();
-		if (value) buffer += value;
-		if (buffer.length === 0 && done) throw new Error("Stream ended before first object");
-		if (buffer.endsWith("\n")) {
-			const lines = buffer.split("\n").filter(Boolean);
-			const firstLine = lines[0];
-			if (!firstLine) throw new Error("No JSON line in the first chunk");
-			firstObject = JSON.parse(firstLine);
-			firstRead = true;
-			buffer = lines.slice(1).join("\n");
-		} else {
-			const newlineIndex = buffer.indexOf("\n");
-			if (newlineIndex >= 0) {
-				const line = buffer.slice(0, newlineIndex).trim();
-				buffer = buffer.slice(newlineIndex + 1);
-				if (line.length > 0) {
-					firstObject = JSON.parse(line);
-					firstRead = true;
-				}
-			}
-		}
-	}
-	(async () => {
-		try {
-			while (true) {
-				const { value, done } = await reader.read();
-				if (value) buffer += value;
-				const lastNewline = buffer.lastIndexOf("\n");
-				if (lastNewline >= 0) {
-					const chunk = buffer.slice(0, lastNewline);
-					buffer = buffer.slice(lastNewline + 1);
-					const lines = chunk.split("\n").filter(Boolean);
-					for (const line of lines) try {
-						onMessage(JSON.parse(line));
-					} catch (e) {
-						onError?.(`Invalid JSON line: ${line}`, e);
-					}
-				}
-				if (done) break;
-			}
-		} catch (err) {
-			onError?.("Stream processing error:", err);
-		}
-	})();
-	return onMessage(firstObject);
-}
 /**
 * Processes a framed response where each JSON chunk is a complete JSON string
 * (already decoded by frame decoder).
+*
+* Uses per-chunk post-processing context to ensure async deserialization work
+* completes before the next chunk is processed. This prevents issues when
+* streaming values require async post-processing (e.g., RSC decoding).
 */
 async function processFramedResponse({ jsonStream, onMessage, onError }) {
 	const reader = jsonStream.getReader();
 	const { value: firstValue, done: firstDone } = await reader.read();
 	if (firstDone || !firstValue) throw new Error("Stream ended before first object");
 	const firstObject = JSON.parse(firstValue);
-	(async () => {
+	let drainCancelled = false;
+	const drain = (async () => {
 		try {
 			while (true) {
 				const { value, done } = await reader.read();
 				if (done) break;
 				if (value) try {
-					onMessage(JSON.parse(value));
+					const chunkPostProcessPromises = [];
+					setPostProcessContext(chunkPostProcessPromises);
+					try {
+						onMessage(JSON.parse(value));
+					} finally {
+						setPostProcessContext(null);
+					}
+					await awaitPostProcessPromises(chunkPostProcessPromises);
 				} catch (e) {
 					onError?.(`Invalid JSON: ${value}`, e);
 				}
 			}
 		} catch (err) {
-			onError?.("Stream processing error:", err);
+			if (!drainCancelled) onError?.("Stream processing error:", err);
 		}
 	})();
-	return onMessage(firstObject);
+	let result;
+	const initialPostProcessPromises = [];
+	setPostProcessContext(initialPostProcessPromises);
+	try {
+		result = onMessage(firstObject);
+	} catch (err) {
+		setPostProcessContext(null);
+		drainCancelled = true;
+		reader.cancel().catch(() => {});
+		throw err;
+	}
+	setPostProcessContext(null);
+	await awaitPostProcessPromises(initialPostProcessPromises);
+	Promise.resolve(result).catch(() => {
+		drainCancelled = true;
+		reader.cancel().catch(() => {});
+	});
+	drain.finally(() => {
+		try {
+			reader.releaseLock();
+		} catch {}
+	});
+	return result;
 }
 //#endregion
-export { serverFnFetcher };
+export { serverFnFetcher, trackPostProcessPromise };
 
 //# sourceMappingURL=serverFnFetcher.js.map

package/dist/esm/client-rpc/serverFnFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverFnFetcher.js","names":[],"sources":["../../../src/client-rpc/serverFnFetcher.ts"],"sourcesContent":["import {\n  createRawStreamDeserializePlugin,\n  encode,\n  invariant,\n  isNotFound,\n  parseRedirect,\n} from '@tanstack/router-core'\nimport { fromCrossJSON, toJSONAsync } from 'seroval'\nimport { getDefaultSerovalPlugins } from '../getDefaultSerovalPlugins'\nimport {\n  TSS_CONTENT_TYPE_FRAMED,\n  TSS_FORMDATA_CONTEXT,\n  X_TSS_RAW_RESPONSE,\n  X_TSS_SERIALIZED,\n  validateFramedProtocolVersion,\n} from '../constants'\nimport { createFrameDecoder } from './frame-decoder'\nimport type { FunctionMiddlewareClientFnOptions } from '../createMiddleware'\nimport type { Plugin as SerovalPlugin } from 'seroval'\n\nlet serovalPlugins: Array<SerovalPlugin<any, any>> | null = null\n\n/**\n * Checks if an object has at least one own enumerable property.\n * More efficient than Object.keys(obj).length > 0 as it short-circuits on first property.\n */\nconst hop = Object.prototype.hasOwnProperty\nfunction hasOwnProperties(obj: object): boolean {\n  for (const _ in obj) {\n    if (hop.call(obj, _)) {\n      return true\n    }\n  }\n  return false\n}\n// caller =>\n//   serverFnFetcher =>\n//     client =>\n//       server =>\n//         fn =>\n//       seroval =>\n//     client middleware =>\n//   serverFnFetcher =>\n// caller\n\nexport async function serverFnFetcher(\n  url: string,\n  args: Array<any>,\n  handler: (url: string, requestInit: RequestInit) => Promise<Response>,\n) {\n  if (!serovalPlugins) {\n    serovalPlugins = getDefaultSerovalPlugins()\n  }\n  const _first = args[0]\n\n  const first = _first as FunctionMiddlewareClientFnOptions<any, any, any> & {\n    headers?: HeadersInit\n  }\n\n  // Use custom fetch if provided, otherwise fall back to the passed handler (global fetch)\n  const fetchImpl = first.fetch ?? handler\n\n  const type = first.data instanceof FormData ? 'formData' : 'payload'\n\n  // Arrange the headers\n  const headers = first.headers ? new Headers(first.headers) : new Headers()\n  headers.set('x-tsr-serverFn', 'true')\n\n  if (type === 'payload') {\n    headers.set(\n      'accept',\n      `${TSS_CONTENT_TYPE_FRAMED}, application/x-ndjson, application/json`,\n    )\n  }\n\n  // If the method is GET, we need to move the payload to the query string\n  if (first.method === 'GET') {\n    if (type === 'formData') {\n      throw new Error('FormData is not supported with GET requests')\n    }\n    const serializedPayload = await serializePayload(first)\n    if (serializedPayload !== undefined) {\n      const encodedPayload = encode({\n        payload: serializedPayload,\n      })\n      if (url.includes('?')) {\n        url += `&${encodedPayload}`\n      } else {\n        url += `?${encodedPayload}`\n      }\n    }\n  }\n\n  let body = undefined\n  if (first.method === 'POST') {\n    const fetchBody = await getFetchBody(first)\n    if (fetchBody?.contentType) {\n      headers.set('content-type', fetchBody.contentType)\n    }\n    body = fetchBody?.body\n  }\n\n  return await getResponse(async () =>\n    fetchImpl(url, {\n      method: first.method,\n      headers,\n      signal: first.signal,\n      body,\n    }),\n  )\n}\n\nasync function serializePayload(\n  opts: FunctionMiddlewareClientFnOptions<any, any, any>,\n): Promise<string | undefined> {\n  let payloadAvailable = false\n  const payloadToSerialize: any = {}\n  if (opts.data !== undefined) {\n    payloadAvailable = true\n    payloadToSerialize['data'] = opts.data\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n  if (opts.context && hasOwnProperties(opts.context)) {\n    payloadAvailable = true\n    payloadToSerialize['context'] = opts.context\n  }\n\n  if (payloadAvailable) {\n    return serialize(payloadToSerialize)\n  }\n  return undefined\n}\n\nasync function serialize(data: any) {\n  return JSON.stringify(\n    await Promise.resolve(toJSONAsync(data, { plugins: serovalPlugins! })),\n  )\n}\n\nasync function getFetchBody(\n  opts: FunctionMiddlewareClientFnOptions<any, any, any>,\n): Promise<{ body: FormData | string; contentType?: string } | undefined> {\n  if (opts.data instanceof FormData) {\n    let serializedContext = undefined\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n    if (opts.context && hasOwnProperties(opts.context)) {\n      serializedContext = await serialize(opts.context)\n    }\n    if (serializedContext !== undefined) {\n      opts.data.set(TSS_FORMDATA_CONTEXT, serializedContext)\n    }\n    return { body: opts.data }\n  }\n  const serializedBody = await serializePayload(opts)\n  if (serializedBody) {\n    return { body: serializedBody, contentType: 'application/json' }\n  }\n  return undefined\n}\n\n/**\n * Retrieves a response from a given function and manages potential errors\n * and special response types including redirects and not found errors.\n *\n * @param fn - The function to execute for obtaining the response.\n * @returns The processed response from the function.\n * @throws If the response is invalid or an error occurs during processing.\n */\nasync function getResponse(fn: () => Promise<Response>) {\n  let response: Response\n  try {\n    response = await fn() // client => server => fn => server => client\n  } catch (error) {\n    if (error instanceof Response) {\n      response = error\n    } else {\n      console.log(error)\n      throw error\n    }\n  }\n\n  if (response.headers.get(X_TSS_RAW_RESPONSE) === 'true') {\n    return response\n  }\n\n  const contentType = response.headers.get('content-type')\n  if (!contentType) {\n    if (process.env.NODE_ENV !== 'production') {\n      throw new Error(\n        'Invariant failed: expected content-type header to be set',\n      )\n    }\n\n    invariant()\n  }\n  const serializedByStart = !!response.headers.get(X_TSS_SERIALIZED)\n\n  // If the response is serialized by the start server, we need to process it\n  // differently than a normal response.\n  if (serializedByStart) {\n    let result\n\n    // If it's a framed response (contains RawStream), use frame decoder\n    if (contentType.includes(TSS_CONTENT_TYPE_FRAMED)) {\n      // Validate protocol version compatibility\n      validateFramedProtocolVersion(contentType)\n\n      if (!response.body) {\n        throw new Error('No response body for framed response')\n      }\n\n      const { getOrCreateStream, jsonChunks } = createFrameDecoder(\n        response.body,\n      )\n\n      // Create deserialize plugin that wires up the raw streams\n      const rawStreamPlugin =\n        createRawStreamDeserializePlugin(getOrCreateStream)\n      const plugins = [rawStreamPlugin, ...(serovalPlugins || [])]\n\n      const refs = new Map()\n      result = await processFramedResponse({\n        jsonStream: jsonChunks,\n        onMessage: (msg: any) => fromCrossJSON(msg, { refs, plugins }),\n        onError(msg, error) {\n          console.error(msg, error)\n        },\n      })\n    }\n    // If it's a stream from the start serializer, process it as such\n    else if (contentType.includes('application/x-ndjson')) {\n      const refs = new Map()\n      result = await processServerFnResponse({\n        response,\n        onMessage: (msg) =>\n          fromCrossJSON(msg, { refs, plugins: serovalPlugins! }),\n        onError(msg, error) {\n          // TODO how could we notify consumer that an error occurred?\n          console.error(msg, error)\n        },\n      })\n    }\n    // If it's a JSON response, it can be simpler\n    else if (contentType.includes('application/json')) {\n      const jsonPayload = await response.json()\n      result = fromCrossJSON(jsonPayload, { plugins: serovalPlugins! })\n    }\n\n    if (!result) {\n      if (process.env.NODE_ENV !== 'production') {\n        throw new Error('Invariant failed: expected result to be resolved')\n      }\n\n      invariant()\n    }\n    if (result instanceof Error) {\n      throw result\n    }\n\n    return result\n  }\n\n  // If it wasn't processed by the start serializer, check\n  // if it's JSON\n  if (contentType.includes('application/json')) {\n    const jsonPayload = await response.json()\n    const redirect = parseRedirect(jsonPayload)\n    if (redirect) {\n      throw redirect\n    }\n    if (isNotFound(jsonPayload)) {\n      throw jsonPayload\n    }\n    return jsonPayload\n  }\n\n  // Otherwise, if it's not OK, throw the content\n  if (!response.ok) {\n    throw new Error(await response.text())\n  }\n\n  // Or return the response itself\n  return response\n}\n\nasync function processServerFnResponse({\n  response,\n  onMessage,\n  onError,\n}: {\n  response: Response\n  onMessage: (msg: any) => any\n  onError?: (msg: string, error?: any) => void\n}) {\n  if (!response.body) {\n    throw new Error('No response body')\n  }\n\n  const reader = response.body.pipeThrough(new TextDecoderStream()).getReader()\n\n  let buffer = ''\n  let firstRead = false\n  let firstObject\n\n  while (!firstRead) {\n    const { value, done } = await reader.read()\n    if (value) buffer += value\n\n    if (buffer.length === 0 && done) {\n      throw new Error('Stream ended before first object')\n    }\n\n    // common case: buffer ends with newline\n    if (buffer.endsWith('\\n')) {\n      const lines = buffer.split('\\n').filter(Boolean)\n      const firstLine = lines[0]\n      if (!firstLine) throw new Error('No JSON line in the first chunk')\n      firstObject = JSON.parse(firstLine)\n      firstRead = true\n      buffer = lines.slice(1).join('\\n')\n    } else {\n      // fallback: wait for a newline to parse first object safely\n      const newlineIndex = buffer.indexOf('\\n')\n      if (newlineIndex >= 0) {\n        const line = buffer.slice(0, newlineIndex).trim()\n        buffer = buffer.slice(newlineIndex + 1)\n        if (line.length > 0) {\n          firstObject = JSON.parse(line)\n          firstRead = true\n        }\n      }\n    }\n  }\n\n  // process rest of the stream asynchronously\n  ;(async () => {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      while (true) {\n        const { value, done } = await reader.read()\n        if (value) buffer += value\n\n        const lastNewline = buffer.lastIndexOf('\\n')\n        if (lastNewline >= 0) {\n          const chunk = buffer.slice(0, lastNewline)\n          buffer = buffer.slice(lastNewline + 1)\n          const lines = chunk.split('\\n').filter(Boolean)\n\n          for (const line of lines) {\n            try {\n              onMessage(JSON.parse(line))\n            } catch (e) {\n              onError?.(`Invalid JSON line: ${line}`, e)\n            }\n          }\n        }\n\n        if (done) {\n          break\n        }\n      }\n    } catch (err) {\n      onError?.('Stream processing error:', err)\n    }\n  })()\n\n  return onMessage(firstObject)\n}\n\n/**\n * Processes a framed response where each JSON chunk is a complete JSON string\n * (already decoded by frame decoder).\n */\nasync function processFramedResponse({\n  jsonStream,\n  onMessage,\n  onError,\n}: {\n  jsonStream: ReadableStream<string>\n  onMessage: (msg: any) => any\n  onError?: (msg: string, error?: any) => void\n}) {\n  const reader = jsonStream.getReader()\n\n  // Read first JSON frame - this is the main result\n  const { value: firstValue, done: firstDone } = await reader.read()\n  if (firstDone || !firstValue) {\n    throw new Error('Stream ended before first object')\n  }\n\n  // Each frame is a complete JSON string\n  const firstObject = JSON.parse(firstValue)\n\n  // Process remaining frames asynchronously (for streaming refs like RawStream)\n  ;(async () => {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      while (true) {\n        const { value, done } = await reader.read()\n        if (done) break\n        if (value) {\n          try {\n            onMessage(JSON.parse(value))\n          } catch (e) {\n            onError?.(`Invalid JSON: ${value}`, e)\n          }\n        }\n      }\n    } catch (err) {\n      onError?.('Stream processing error:', err)\n    }\n  })()\n\n  return onMessage(firstObject)\n}\n"],"mappings":"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"}
+{"version":3,"file":"serverFnFetcher.js","names":[],"sources":["../../../src/client-rpc/serverFnFetcher.ts"],"sourcesContent":["import {\n  createRawStreamDeserializePlugin,\n  encode,\n  invariant,\n  isNotFound,\n  parseRedirect,\n} from '@tanstack/router-core'\nimport { fromCrossJSON, toJSONAsync } from 'seroval'\nimport { getDefaultSerovalPlugins } from '../getDefaultSerovalPlugins'\nimport {\n  TSS_CONTENT_TYPE_FRAMED,\n  TSS_FORMDATA_CONTEXT,\n  X_TSS_RAW_RESPONSE,\n  X_TSS_SERIALIZED,\n  validateFramedProtocolVersion,\n} from '../constants'\nimport { createFrameDecoder } from './frame-decoder'\nimport type { FunctionMiddlewareClientFnOptions } from '../createMiddleware'\nimport type { Plugin as SerovalPlugin } from 'seroval'\n\nlet serovalPlugins: Array<SerovalPlugin<any, any>> | null = null\n\n/**\n * Current async post-processing context for deserialization.\n *\n * Some deserializers need to perform async work after synchronous deserialization\n * (e.g., decoding RSC payloads, fetching remote data). This context allows them\n * to register promises that must complete before the deserialized value is used.\n *\n * This uses a synchronous execution context pattern:\n * - Each call to `fromCrossJSON` is synchronous\n * - Within that synchronous execution, all `fromSerializable` calls happen\n * - We set the context before `fromCrossJSON`, clear it after\n * - For streaming chunks, we set/clear context around each `onMessage` call\n *\n * Even with concurrent server function calls, each individual deserialization\n * is atomic (synchronous), so promises are correctly scoped to their call.\n */\nlet currentPostProcessContext: Array<Promise<unknown>> | null = null\n\n/**\n * Set the current post-processing context for async deserialization work.\n * Called before deserialization starts.\n *\n * @param ctx - Array to collect async work promises, or null to clear\n */\nexport function setPostProcessContext(\n  ctx: Array<Promise<unknown>> | null,\n): void {\n  currentPostProcessContext = ctx\n}\n\n/**\n * Get the current post-processing context.\n * Returns null if no deserialization is in progress.\n */\nexport function getPostProcessContext(): Array<Promise<unknown>> | null {\n  return currentPostProcessContext\n}\n\n/**\n * Track an async post-processing promise in the current deserialization context.\n * Called by deserializers that need to perform async work after sync deserialization.\n *\n * If no context is active (e.g., on server), this is a no-op.\n *\n * @param promise - The async work promise to track\n */\nexport function trackPostProcessPromise(promise: Promise<unknown>): void {\n  if (currentPostProcessContext) {\n    currentPostProcessContext.push(promise)\n  }\n}\n\n/**\n * Helper to await all post-processing promises.\n * Uses Promise.allSettled to ensure all promises complete even if some reject.\n */\nasync function awaitPostProcessPromises(\n  promises: Array<Promise<unknown>>,\n): Promise<void> {\n  if (promises.length > 0) {\n    await Promise.allSettled(promises)\n  }\n}\n\n/**\n * Checks if an object has at least one own enumerable property.\n * More efficient than Object.keys(obj).length > 0 as it short-circuits on first property.\n */\nconst hop = Object.prototype.hasOwnProperty\nfunction hasOwnProperties(obj: object): boolean {\n  for (const _ in obj) {\n    if (hop.call(obj, _)) {\n      return true\n    }\n  }\n  return false\n}\n// caller =>\n//   serverFnFetcher =>\n//     client =>\n//       server =>\n//         fn =>\n//       seroval =>\n//     client middleware =>\n//   serverFnFetcher =>\n// caller\n\nexport async function serverFnFetcher(\n  url: string,\n  args: Array<any>,\n  handler: (url: string, requestInit: RequestInit) => Promise<Response>,\n) {\n  if (!serovalPlugins) {\n    serovalPlugins = getDefaultSerovalPlugins()\n  }\n  const _first = args[0]\n\n  const first = _first as FunctionMiddlewareClientFnOptions<any, any, any> & {\n    headers?: HeadersInit\n  }\n\n  // Use custom fetch if provided, otherwise fall back to the passed handler (global fetch)\n  const fetchImpl = first.fetch ?? handler\n\n  const type = first.data instanceof FormData ? 'formData' : 'payload'\n\n  // Arrange the headers\n  const headers = first.headers ? new Headers(first.headers) : new Headers()\n  headers.set('x-tsr-serverFn', 'true')\n\n  if (type === 'payload') {\n    headers.set(\n      'accept',\n      `${TSS_CONTENT_TYPE_FRAMED}, application/x-ndjson, application/json`,\n    )\n  }\n\n  // If the method is GET, we need to move the payload to the query string\n  if (first.method === 'GET') {\n    if (type === 'formData') {\n      throw new Error('FormData is not supported with GET requests')\n    }\n    const serializedPayload = await serializePayload(first)\n    if (serializedPayload !== undefined) {\n      const encodedPayload = encode({\n        payload: serializedPayload,\n      })\n      if (url.includes('?')) {\n        url += `&${encodedPayload}`\n      } else {\n        url += `?${encodedPayload}`\n      }\n    }\n  }\n\n  let body = undefined\n  if (first.method === 'POST') {\n    const fetchBody = await getFetchBody(first)\n    if (fetchBody?.contentType) {\n      headers.set('content-type', fetchBody.contentType)\n    }\n    body = fetchBody?.body\n  }\n\n  return await getResponse(async () =>\n    fetchImpl(url, {\n      method: first.method,\n      headers,\n      signal: first.signal,\n      body,\n    }),\n  )\n}\n\nasync function serializePayload(\n  opts: FunctionMiddlewareClientFnOptions<any, any, any>,\n): Promise<string | undefined> {\n  let payloadAvailable = false\n  const payloadToSerialize: any = {}\n  if (opts.data !== undefined) {\n    payloadAvailable = true\n    payloadToSerialize['data'] = opts.data\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n  if (opts.context && hasOwnProperties(opts.context)) {\n    payloadAvailable = true\n    payloadToSerialize['context'] = opts.context\n  }\n\n  if (payloadAvailable) {\n    return serialize(payloadToSerialize)\n  }\n  return undefined\n}\n\nasync function serialize(data: any) {\n  return JSON.stringify(\n    await Promise.resolve(toJSONAsync(data, { plugins: serovalPlugins! })),\n  )\n}\n\nasync function getFetchBody(\n  opts: FunctionMiddlewareClientFnOptions<any, any, any>,\n): Promise<{ body: FormData | string; contentType?: string } | undefined> {\n  if (opts.data instanceof FormData) {\n    let serializedContext = undefined\n    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n    if (opts.context && hasOwnProperties(opts.context)) {\n      serializedContext = await serialize(opts.context)\n    }\n    if (serializedContext !== undefined) {\n      opts.data.set(TSS_FORMDATA_CONTEXT, serializedContext)\n    }\n    return { body: opts.data }\n  }\n  const serializedBody = await serializePayload(opts)\n  if (serializedBody) {\n    return { body: serializedBody, contentType: 'application/json' }\n  }\n  return undefined\n}\n\n/**\n * Retrieves a response from a given function and manages potential errors\n * and special response types including redirects and not found errors.\n *\n * @param fn - The function to execute for obtaining the response.\n * @returns The processed response from the function.\n * @throws If the response is invalid or an error occurs during processing.\n */\nasync function getResponse(fn: () => Promise<Response>) {\n  let response: Response\n  try {\n    response = await fn() // client => server => fn => server => client\n  } catch (error) {\n    if (error instanceof Response) {\n      response = error\n    } else {\n      console.log(error)\n      throw error\n    }\n  }\n\n  if (response.headers.get(X_TSS_RAW_RESPONSE) === 'true') {\n    return response\n  }\n\n  const contentType = response.headers.get('content-type')\n  if (!contentType) {\n    if (process.env.NODE_ENV !== 'production') {\n      throw new Error(\n        'Invariant failed: expected content-type header to be set',\n      )\n    }\n\n    invariant()\n  }\n  const serializedByStart = !!response.headers.get(X_TSS_SERIALIZED)\n\n  // If the response is serialized by the start server, we need to process it\n  // differently than a normal response.\n  if (serializedByStart) {\n    let result\n\n    // If it's a framed response (contains RawStream), use frame decoder\n    if (contentType.includes(TSS_CONTENT_TYPE_FRAMED)) {\n      // Validate protocol version compatibility\n      validateFramedProtocolVersion(contentType)\n\n      if (!response.body) {\n        throw new Error('No response body for framed response')\n      }\n\n      const { getOrCreateStream, jsonChunks } = createFrameDecoder(\n        response.body,\n      )\n\n      // Create deserialize plugin that wires up the raw streams\n      const rawStreamPlugin =\n        createRawStreamDeserializePlugin(getOrCreateStream)\n      const plugins = [rawStreamPlugin, ...(serovalPlugins || [])]\n\n      const refs = new Map()\n      result = await processFramedResponse({\n        jsonStream: jsonChunks,\n        onMessage: (msg: any) => fromCrossJSON(msg, { refs, plugins }),\n        onError(msg, error) {\n          console.error(msg, error)\n        },\n      })\n    }\n    // If it's a JSON response, it can be simpler\n    else if (contentType.includes('application/json')) {\n      const jsonPayload = await response.json()\n      // Track async post-processing work for this deserialization\n      const postProcessPromises: Array<Promise<unknown>> = []\n      setPostProcessContext(postProcessPromises)\n      try {\n        result = fromCrossJSON(jsonPayload, { plugins: serovalPlugins! })\n      } finally {\n        setPostProcessContext(null)\n      }\n      // Await any async post-processing before returning\n      await awaitPostProcessPromises(postProcessPromises)\n    }\n\n    if (!result) {\n      if (process.env.NODE_ENV !== 'production') {\n        throw new Error('Invariant failed: expected result to be resolved')\n      }\n\n      invariant()\n    }\n    if (result instanceof Error) {\n      throw result\n    }\n\n    return result\n  }\n\n  // If it wasn't processed by the start serializer, check\n  // if it's JSON\n  if (contentType.includes('application/json')) {\n    const jsonPayload = await response.json()\n    const redirect = parseRedirect(jsonPayload)\n    if (redirect) {\n      throw redirect\n    }\n    if (isNotFound(jsonPayload)) {\n      throw jsonPayload\n    }\n    return jsonPayload\n  }\n\n  // Otherwise, if it's not OK, throw the content\n  if (!response.ok) {\n    throw new Error(await response.text())\n  }\n\n  // Or return the response itself\n  return response\n}\n\n/**\n * Processes a framed response where each JSON chunk is a complete JSON string\n * (already decoded by frame decoder).\n *\n * Uses per-chunk post-processing context to ensure async deserialization work\n * completes before the next chunk is processed. This prevents issues when\n * streaming values require async post-processing (e.g., RSC decoding).\n */\nasync function processFramedResponse({\n  jsonStream,\n  onMessage,\n  onError,\n}: {\n  jsonStream: ReadableStream<string>\n  onMessage: (msg: any) => any\n  onError?: (msg: string, error?: any) => void\n}) {\n  const reader = jsonStream.getReader()\n\n  // Read first JSON frame - this is the main result\n  const { value: firstValue, done: firstDone } = await reader.read()\n  if (firstDone || !firstValue) {\n    throw new Error('Stream ended before first object')\n  }\n\n  // Each frame is a complete JSON string\n  const firstObject = JSON.parse(firstValue)\n\n  // Process remaining frames for streaming refs like RawStream.\n  // Keep draining until the server closes the stream.\n  // Each chunk gets its own post-processing context to properly scope async work.\n  let drainCancelled = false as boolean\n  const drain = (async () => {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      while (true) {\n        const { value, done } = await reader.read()\n        if (done) break\n        if (value) {\n          try {\n            // Set up post-processing context for this chunk\n            const chunkPostProcessPromises: Array<Promise<unknown>> = []\n            setPostProcessContext(chunkPostProcessPromises)\n            try {\n              onMessage(JSON.parse(value))\n            } finally {\n              setPostProcessContext(null)\n            }\n            // Await any async post-processing from this chunk before processing next.\n            // This ensures values requiring async work are ready before their\n            // containing Promise/Stream resolves/emits to consumers.\n            await awaitPostProcessPromises(chunkPostProcessPromises)\n          } catch (e) {\n            onError?.(`Invalid JSON: ${value}`, e)\n          }\n        }\n      }\n    } catch (err) {\n      if (!drainCancelled) {\n        onError?.('Stream processing error:', err)\n      }\n    }\n  })()\n\n  // Process first object with its own post-processing context\n  let result: any\n  const initialPostProcessPromises: Array<Promise<unknown>> = []\n  setPostProcessContext(initialPostProcessPromises)\n  try {\n    result = onMessage(firstObject)\n  } catch (err) {\n    setPostProcessContext(null)\n    drainCancelled = true\n    reader.cancel().catch(() => {})\n    throw err\n  }\n  setPostProcessContext(null)\n\n  // Await initial post-processing promises before returning result\n  await awaitPostProcessPromises(initialPostProcessPromises)\n\n  // If the initial decode fails async, stop draining to avoid holding\n  // onto the response body and raw stream buffers unnecessarily.\n  Promise.resolve(result).catch(() => {\n    drainCancelled = true\n    reader.cancel().catch(() => {})\n  })\n\n  // Detach reader once draining completes.\n  drain.finally(() => {\n    try {\n      reader.releaseLock()\n    } catch {\n      // Ignore\n    }\n  })\n\n  return result\n}\n"],"mappings":"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"}

package/dist/esm/fake-entries/plugin-adapters.d.ts

@@ -0,0 +1,3 @@
+import { AnySerializationAdapter } from '@tanstack/router-core';
+export declare const pluginSerializationAdapters: Array<AnySerializationAdapter>;
+export declare const hasPluginAdapters = false;

package/dist/esm/fake-entries/plugin-adapters.js

@@ -0,0 +1,7 @@
+//#region src/fake-entries/plugin-adapters.ts
+var pluginSerializationAdapters = [];
+var hasPluginAdapters = false;
+//#endregion
+export { hasPluginAdapters, pluginSerializationAdapters };
+
+//# sourceMappingURL=plugin-adapters.js.map

package/dist/esm/fake-entries/plugin-adapters.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-adapters.js","names":[],"sources":["../../../src/fake-entries/plugin-adapters.ts"],"sourcesContent":["import type { AnySerializationAdapter } from '@tanstack/router-core'\n\nexport const pluginSerializationAdapters: Array<AnySerializationAdapter> = []\nexport const hasPluginAdapters = false\n"],"mappings":";AAEA,IAAa,8BAA8D,EAAE;AAC7E,IAAa,oBAAoB"}

package/dist/esm/fake-entries/router.d.ts

@@ -0,0 +1 @@
+export declare function getRouter(): void;

package/dist/esm/fake-entries/router.js

@@ -0,0 +1,6 @@
+//#region src/fake-entries/router.ts
+function getRouter() {}
+//#endregion
+export { getRouter };
+
+//# sourceMappingURL=router.js.map

package/dist/esm/fake-entries/router.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.js","names":[],"sources":["../../../src/fake-entries/router.ts"],"sourcesContent":["export function getRouter() {}\n"],"mappings":";AAAA,SAAgB,YAAY"}

package/dist/esm/{fake-start-entry.d.ts → fake-entries/start.d.ts}

@@ -1,2 +1 @@
 export declare const startInstance: undefined;
-export declare const getRouter: () => void;

package/dist/esm/fake-entries/start.js

@@ -0,0 +1,6 @@
+//#region src/fake-entries/start.ts
+var startInstance = void 0;
+//#endregion
+export { startInstance };
+
+//# sourceMappingURL=start.js.map

package/dist/esm/fake-entries/start.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"start.js","names":[],"sources":["../../../src/fake-entries/start.ts"],"sourcesContent":["export const startInstance = undefined\n"],"mappings":";AAAA,IAAa,gBAAgB,KAAA"}

package/dist/esm/getDefaultSerovalPlugins.d.ts

@@ -1 +1,2 @@
-export declare function getDefaultSerovalPlugins(): (import('seroval').Plugin<any, any> | import('seroval').Plugin<Error, any> | import('seroval').Plugin<ReadableStream<any>, any>)[];
+import { Plugin } from 'seroval';
+export declare function getDefaultSerovalPlugins(): Array<Plugin<any, any>>;

package/dist/esm/getDefaultSerovalPlugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"getDefaultSerovalPlugins.js","names":[],"sources":["../../src/getDefaultSerovalPlugins.ts"],"sourcesContent":["import {\n  makeSerovalPlugin,\n  defaultSerovalPlugins as routerDefaultSerovalPlugins,\n} from '@tanstack/router-core'\nimport { getStartOptions } from './getStartOptions'\nimport type { AnySerializationAdapter } from '@tanstack/router-core'\n\nexport function getDefaultSerovalPlugins() {\n  const start = getStartOptions()\n  const adapters = start?.serializationAdapters as\n    | Array<AnySerializationAdapter>\n    | undefined\n  return [\n    ...(adapters?.map(makeSerovalPlugin) ?? []),\n    ...routerDefaultSerovalPlugins,\n  ]\n}\n"],"mappings":";;;AAOA,SAAgB,2BAA2B;AAKzC,QAAO,CACL,IALY,iBAAiB,EACP,wBAIR,IAAI,kBAAkB,IAAI,EAAE,EAC1C,GAAG,sBACJ"}
+{"version":3,"file":"getDefaultSerovalPlugins.js","names":[],"sources":["../../src/getDefaultSerovalPlugins.ts"],"sourcesContent":["import {\n  makeSerovalPlugin,\n  defaultSerovalPlugins as routerDefaultSerovalPlugins,\n} from '@tanstack/router-core'\nimport { getStartOptions } from './getStartOptions'\nimport type { AnySerializationAdapter } from '@tanstack/router-core'\nimport type { Plugin } from 'seroval'\n\nexport function getDefaultSerovalPlugins(): Array<Plugin<any, any>> {\n  const start = getStartOptions()\n  const adapters = start?.serializationAdapters as\n    | Array<AnySerializationAdapter>\n    | undefined\n  return [\n    ...(adapters?.map(makeSerovalPlugin) ?? []),\n    ...routerDefaultSerovalPlugins,\n  ]\n}\n"],"mappings":";;;AAQA,SAAgB,2BAAoD;AAKlE,QAAO,CACL,IALY,iBAAiB,EACP,wBAIR,IAAI,kBAAkB,IAAI,EAAE,EAC1C,GAAG,sBACJ"}

package/dist/esm/index.d.ts

@@ -18,3 +18,4 @@ export { getRouterInstance } from './getRouterInstance.js';
 export { getDefaultSerovalPlugins } from './getDefaultSerovalPlugins.js';
 export { getGlobalStartContext } from './getGlobalStartContext.js';
 export { safeObjectMerge, createNullProtoObject } from './safeObjectMerge.js';
+export { trackPostProcessPromise } from './client-rpc/serverFnFetcher.js';

package/dist/esm/index.js

@@ -6,7 +6,8 @@ import { createStart } from "./createStart.js";
 import { getRouterInstance } from "./getRouterInstance.js";
 import { getDefaultSerovalPlugins } from "./getDefaultSerovalPlugins.js";
 import { getGlobalStartContext } from "./getGlobalStartContext.js";
+import { trackPostProcessPromise } from "./client-rpc/serverFnFetcher.js";
 import { hydrate, json, mergeHeaders } from "@tanstack/router-core/ssr/client";
 import { RawStream } from "@tanstack/router-core";
 import { createClientOnlyFn, createIsomorphicFn, createServerOnlyFn } from "@tanstack/start-fn-stubs";
-export { FRAME_HEADER_SIZE, FrameType, RawStream, TSS_CONTENT_TYPE_FRAMED, TSS_CONTENT_TYPE_FRAMED_VERSIONED, TSS_FORMDATA_CONTEXT, TSS_FRAMED_PROTOCOL_VERSION, TSS_SERVER_FUNCTION, X_TSS_CONTEXT, X_TSS_RAW_RESPONSE, X_TSS_SERIALIZED, createClientOnlyFn, createIsomorphicFn, createMiddleware, createNullProtoObject, createServerFn, createServerOnlyFn, createStart, execValidator, executeMiddleware, flattenMiddlewares, getDefaultSerovalPlugins, getGlobalStartContext, getRouterInstance, hydrate, json, mergeHeaders, safeObjectMerge, validateFramedProtocolVersion };
+export { FRAME_HEADER_SIZE, FrameType, RawStream, TSS_CONTENT_TYPE_FRAMED, TSS_CONTENT_TYPE_FRAMED_VERSIONED, TSS_FORMDATA_CONTEXT, TSS_FRAMED_PROTOCOL_VERSION, TSS_SERVER_FUNCTION, X_TSS_CONTEXT, X_TSS_RAW_RESPONSE, X_TSS_SERIALIZED, createClientOnlyFn, createIsomorphicFn, createMiddleware, createNullProtoObject, createServerFn, createServerOnlyFn, createStart, execValidator, executeMiddleware, flattenMiddlewares, getDefaultSerovalPlugins, getGlobalStartContext, getRouterInstance, hydrate, json, mergeHeaders, safeObjectMerge, trackPostProcessPromise, validateFramedProtocolVersion };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-client-core",
-  "version": "1.167.10",
+  "version": "1.167.11",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -48,10 +48,13 @@
   },
   "imports": {
     "#tanstack-start-entry": {
-      "default": "./dist/esm/fake-start-entry.js"
+      "default": "./dist/esm/fake-entries/start.js"
     },
     "#tanstack-router-entry": {
-      "default": "./dist/esm/fake-start-entry.js"
+      "default": "./dist/esm/fake-entries/router.js"
+    },
+    "#tanstack-start-plugin-adapters": {
+      "default": "./dist/esm/fake-entries/plugin-adapters.js"
     }
   },
   "sideEffects": false,
@@ -66,7 +69,7 @@
     "node": ">=22.12.0"
   },
   "dependencies": {
-    "seroval": "^1.4.2",
+    "seroval": "^1.5.0",
     "@tanstack/router-core": "1.168.9",
     "@tanstack/start-fn-stubs": "1.161.6",
     "@tanstack/start-storage-context": "1.166.23"

package/src/client/hydrateStart.ts

@@ -1,12 +1,14 @@
 import { hydrate } from '@tanstack/router-core/ssr/client'
 
+import { startInstance } from '#tanstack-start-entry'
+import {
+  hasPluginAdapters,
+  pluginSerializationAdapters,
+} from '#tanstack-start-plugin-adapters'
+import { getRouter } from '#tanstack-router-entry'
 import { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter'
 import type { AnyStartInstanceOptions } from '../createStart'
 import type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core'
-// eslint-disable-next-line import/no-duplicates,import/order
-import { getRouter } from '#tanstack-router-entry'
-// eslint-disable-next-line import/no-duplicates,import/order
-import { startInstance } from '#tanstack-start-entry'
 
 export async function hydrateStart(): Promise<AnyRouter> {
   const router = await getRouter()
@@ -26,6 +28,10 @@ export async function hydrateStart(): Promise<AnyRouter> {
     } as AnyStartInstanceOptions
   }
 
+  // Only spread plugin adapters if any are configured (this will tree-shake away otherwise)
+  if (hasPluginAdapters) {
+    serializationAdapters.push(...pluginSerializationAdapters)
+  }
   serializationAdapters.push(ServerFunctionSerializationAdapter)
   if (router.options.serializationAdapters) {
     serializationAdapters.push(...router.options.serializationAdapters)

package/src/client-rpc/serverFnFetcher.ts

@@ -20,6 +20,70 @@ import type { Plugin as SerovalPlugin } from 'seroval'
 
 let serovalPlugins: Array<SerovalPlugin<any, any>> | null = null
 
+/**
+ * Current async post-processing context for deserialization.
+ *
+ * Some deserializers need to perform async work after synchronous deserialization
+ * (e.g., decoding RSC payloads, fetching remote data). This context allows them
+ * to register promises that must complete before the deserialized value is used.
+ *
+ * This uses a synchronous execution context pattern:
+ * - Each call to `fromCrossJSON` is synchronous
+ * - Within that synchronous execution, all `fromSerializable` calls happen
+ * - We set the context before `fromCrossJSON`, clear it after
+ * - For streaming chunks, we set/clear context around each `onMessage` call
+ *
+ * Even with concurrent server function calls, each individual deserialization
+ * is atomic (synchronous), so promises are correctly scoped to their call.
+ */
+let currentPostProcessContext: Array<Promise<unknown>> | null = null
+
+/**
+ * Set the current post-processing context for async deserialization work.
+ * Called before deserialization starts.
+ *
+ * @param ctx - Array to collect async work promises, or null to clear
+ */
+export function setPostProcessContext(
+  ctx: Array<Promise<unknown>> | null,
+): void {
+  currentPostProcessContext = ctx
+}
+
+/**
+ * Get the current post-processing context.
+ * Returns null if no deserialization is in progress.
+ */
+export function getPostProcessContext(): Array<Promise<unknown>> | null {
+  return currentPostProcessContext
+}
+
+/**
+ * Track an async post-processing promise in the current deserialization context.
+ * Called by deserializers that need to perform async work after sync deserialization.
+ *
+ * If no context is active (e.g., on server), this is a no-op.
+ *
+ * @param promise - The async work promise to track
+ */
+export function trackPostProcessPromise(promise: Promise<unknown>): void {
+  if (currentPostProcessContext) {
+    currentPostProcessContext.push(promise)
+  }
+}
+
+/**
+ * Helper to await all post-processing promises.
+ * Uses Promise.allSettled to ensure all promises complete even if some reject.
+ */
+async function awaitPostProcessPromises(
+  promises: Array<Promise<unknown>>,
+): Promise<void> {
+  if (promises.length > 0) {
+    await Promise.allSettled(promises)
+  }
+}
+
 /**
  * Checks if an object has at least one own enumerable property.
  * More efficient than Object.keys(obj).length > 0 as it short-circuits on first property.
@@ -228,23 +292,19 @@ async function getResponse(fn: () => Promise<Response>) {
         },
       })
     }
-    // If it's a stream from the start serializer, process it as such
-    else if (contentType.includes('application/x-ndjson')) {
-      const refs = new Map()
-      result = await processServerFnResponse({
-        response,
-        onMessage: (msg) =>
-          fromCrossJSON(msg, { refs, plugins: serovalPlugins! }),
-        onError(msg, error) {
-          // TODO how could we notify consumer that an error occurred?
-          console.error(msg, error)
-        },
-      })
-    }
     // If it's a JSON response, it can be simpler
     else if (contentType.includes('application/json')) {
       const jsonPayload = await response.json()
-      result = fromCrossJSON(jsonPayload, { plugins: serovalPlugins! })
+      // Track async post-processing work for this deserialization
+      const postProcessPromises: Array<Promise<unknown>> = []
+      setPostProcessContext(postProcessPromises)
+      try {
+        result = fromCrossJSON(jsonPayload, { plugins: serovalPlugins! })
+      } finally {
+        setPostProcessContext(null)
+      }
+      // Await any async post-processing before returning
+      await awaitPostProcessPromises(postProcessPromises)
     }
 
     if (!result) {
@@ -284,93 +344,13 @@ async function getResponse(fn: () => Promise<Response>) {
   return response
 }
 
-async function processServerFnResponse({
-  response,
-  onMessage,
-  onError,
-}: {
-  response: Response
-  onMessage: (msg: any) => any
-  onError?: (msg: string, error?: any) => void
-}) {
-  if (!response.body) {
-    throw new Error('No response body')
-  }
-
-  const reader = response.body.pipeThrough(new TextDecoderStream()).getReader()
-
-  let buffer = ''
-  let firstRead = false
-  let firstObject
-
-  while (!firstRead) {
-    const { value, done } = await reader.read()
-    if (value) buffer += value
-
-    if (buffer.length === 0 && done) {
-      throw new Error('Stream ended before first object')
-    }
-
-    // common case: buffer ends with newline
-    if (buffer.endsWith('\n')) {
-      const lines = buffer.split('\n').filter(Boolean)
-      const firstLine = lines[0]
-      if (!firstLine) throw new Error('No JSON line in the first chunk')
-      firstObject = JSON.parse(firstLine)
-      firstRead = true
-      buffer = lines.slice(1).join('\n')
-    } else {
-      // fallback: wait for a newline to parse first object safely
-      const newlineIndex = buffer.indexOf('\n')
-      if (newlineIndex >= 0) {
-        const line = buffer.slice(0, newlineIndex).trim()
-        buffer = buffer.slice(newlineIndex + 1)
-        if (line.length > 0) {
-          firstObject = JSON.parse(line)
-          firstRead = true
-        }
-      }
-    }
-  }
-
-  // process rest of the stream asynchronously
-  ;(async () => {
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      while (true) {
-        const { value, done } = await reader.read()
-        if (value) buffer += value
-
-        const lastNewline = buffer.lastIndexOf('\n')
-        if (lastNewline >= 0) {
-          const chunk = buffer.slice(0, lastNewline)
-          buffer = buffer.slice(lastNewline + 1)
-          const lines = chunk.split('\n').filter(Boolean)
-
-          for (const line of lines) {
-            try {
-              onMessage(JSON.parse(line))
-            } catch (e) {
-              onError?.(`Invalid JSON line: ${line}`, e)
-            }
-          }
-        }
-
-        if (done) {
-          break
-        }
-      }
-    } catch (err) {
-      onError?.('Stream processing error:', err)
-    }
-  })()
-
-  return onMessage(firstObject)
-}
-
 /**
  * Processes a framed response where each JSON chunk is a complete JSON string
  * (already decoded by frame decoder).
+ *
+ * Uses per-chunk post-processing context to ensure async deserialization work
+ * completes before the next chunk is processed. This prevents issues when
+ * streaming values require async post-processing (e.g., RSC decoding).
  */
 async function processFramedResponse({
   jsonStream,
@@ -392,8 +372,11 @@ async function processFramedResponse({
   // Each frame is a complete JSON string
   const firstObject = JSON.parse(firstValue)
 
-  // Process remaining frames asynchronously (for streaming refs like RawStream)
-  ;(async () => {
+  // Process remaining frames for streaming refs like RawStream.
+  // Keep draining until the server closes the stream.
+  // Each chunk gets its own post-processing context to properly scope async work.
+  let drainCancelled = false as boolean
+  const drain = (async () => {
     try {
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
       while (true) {
@@ -401,16 +384,62 @@ async function processFramedResponse({
         if (done) break
         if (value) {
           try {
-            onMessage(JSON.parse(value))
+            // Set up post-processing context for this chunk
+            const chunkPostProcessPromises: Array<Promise<unknown>> = []
+            setPostProcessContext(chunkPostProcessPromises)
+            try {
+              onMessage(JSON.parse(value))
+            } finally {
+              setPostProcessContext(null)
+            }
+            // Await any async post-processing from this chunk before processing next.
+            // This ensures values requiring async work are ready before their
+            // containing Promise/Stream resolves/emits to consumers.
+            await awaitPostProcessPromises(chunkPostProcessPromises)
           } catch (e) {
             onError?.(`Invalid JSON: ${value}`, e)
           }
         }
       }
     } catch (err) {
-      onError?.('Stream processing error:', err)
+      if (!drainCancelled) {
+        onError?.('Stream processing error:', err)
+      }
     }
   })()
 
-  return onMessage(firstObject)
+  // Process first object with its own post-processing context
+  let result: any
+  const initialPostProcessPromises: Array<Promise<unknown>> = []
+  setPostProcessContext(initialPostProcessPromises)
+  try {
+    result = onMessage(firstObject)
+  } catch (err) {
+    setPostProcessContext(null)
+    drainCancelled = true
+    reader.cancel().catch(() => {})
+    throw err
+  }
+  setPostProcessContext(null)
+
+  // Await initial post-processing promises before returning result
+  await awaitPostProcessPromises(initialPostProcessPromises)
+
+  // If the initial decode fails async, stop draining to avoid holding
+  // onto the response body and raw stream buffers unnecessarily.
+  Promise.resolve(result).catch(() => {
+    drainCancelled = true
+    reader.cancel().catch(() => {})
+  })
+
+  // Detach reader once draining completes.
+  drain.finally(() => {
+    try {
+      reader.releaseLock()
+    } catch {
+      // Ignore
+    }
+  })
+
+  return result
 }

package/src/fake-entries/plugin-adapters.ts

@@ -0,0 +1,4 @@
+import type { AnySerializationAdapter } from '@tanstack/router-core'
+
+export const pluginSerializationAdapters: Array<AnySerializationAdapter> = []
+export const hasPluginAdapters = false

package/src/fake-entries/router.ts

@@ -0,0 +1 @@
+export function getRouter() {}

package/src/{fake-start-entry.ts → fake-entries/start.ts}

@@ -1,2 +1 @@
 export const startInstance = undefined
-export const getRouter = () => {}

package/src/getDefaultSerovalPlugins.ts

@@ -4,8 +4,9 @@ import {
 } from '@tanstack/router-core'
 import { getStartOptions } from './getStartOptions'
 import type { AnySerializationAdapter } from '@tanstack/router-core'
+import type { Plugin } from 'seroval'
 
-export function getDefaultSerovalPlugins() {
+export function getDefaultSerovalPlugins(): Array<Plugin<any, any>> {
   const start = getStartOptions()
   const adapters = start?.serializationAdapters as
     | Array<AnySerializationAdapter>

package/src/index.tsx

@@ -117,3 +117,4 @@ export { getRouterInstance } from './getRouterInstance'
 export { getDefaultSerovalPlugins } from './getDefaultSerovalPlugins'
 export { getGlobalStartContext } from './getGlobalStartContext'
 export { safeObjectMerge, createNullProtoObject } from './safeObjectMerge'
+export { trackPostProcessPromise } from './client-rpc/serverFnFetcher'

package/src/start-entry.d.ts

@@ -9,3 +9,10 @@ declare module '#tanstack-router-entry' {
 
   export const getRouter: RouterEntry['getRouter']
 }
+
+declare module '#tanstack-start-plugin-adapters' {
+  import type { AnySerializationAdapter } from '@tanstack/router-core'
+
+  export const pluginSerializationAdapters: Array<AnySerializationAdapter>
+  export const hasPluginAdapters: boolean
+}

package/src/tests/createServerFn.test-d.ts

@@ -6,6 +6,7 @@ import type { ServerFnMeta } from '../constants'
 import type {
   Constrain,
   Register,
+  SerializationError,
   TsrSerializable,
   ValidateSerializableInput,
   Validator,
@@ -512,7 +513,9 @@ test('createServerFn returns undefined', () => {
 test('createServerFn cannot return function', () => {
   expectTypeOf(createServerFn().handler<{ func: () => 'func' }>)
     .parameter(0)
-    .returns.toEqualTypeOf<{ func: 'Function is not serializable' }>()
+    .returns.toEqualTypeOf<{
+      func: SerializationError<'Function may not be serializable'>
+    }>()
 })
 
 test('createServerFn cannot validate function', () => {
@@ -525,7 +528,10 @@ test('createServerFn cannot validate function', () => {
     .toEqualTypeOf<
       Constrain<
         (input: { func: () => 'string' }) => { output: 'string' },
-        Validator<{ func: 'Function is not serializable' }, any>
+        Validator<
+          { func: SerializationError<'Function may not be serializable'> },
+          any
+        >
       >
     >()
 })

package/src/tests/createServerMiddleware.test-d.ts

@@ -2,7 +2,7 @@ import { expectTypeOf, test } from 'vitest'
 import { createMiddleware } from '../createMiddleware'
 import type { RequestServerNextFn } from '../createMiddleware'
 import type { ConstrainValidator, CustomFetch } from '../createServerFn'
-import type { Register } from '@tanstack/router-core'
+import type { Register, SerializationError } from '@tanstack/router-core'
 import type { ServerFnMeta } from '../constants'
 
 test('createServeMiddleware removes middleware after middleware,', () => {
@@ -573,7 +573,10 @@ test('createMiddleware sendContext cannot send a function', () => {
         .parameter(0)
         .exclude<undefined>()
         .toHaveProperty('sendContext')
-        .toEqualTypeOf<{ func: 'Function is not serializable' } | undefined>()
+        .toEqualTypeOf<
+          | { func: SerializationError<'Function may not be serializable'> }
+          | undefined
+        >()
 
       return next()
     })
@@ -582,7 +585,10 @@ test('createMiddleware sendContext cannot send a function', () => {
         .parameter(0)
         .exclude<undefined>()
         .toHaveProperty('sendContext')
-        .toEqualTypeOf<{ func: 'Function is not serializable' } | undefined>()
+        .toEqualTypeOf<
+          | { func: SerializationError<'Function may not be serializable'> }
+          | undefined
+        >()
 
       return next()
     })

package/dist/esm/fake-start-entry.js

@@ -1,7 +0,0 @@
-//#region src/fake-start-entry.ts
-var startInstance = void 0;
-var getRouter = () => {};
-//#endregion
-export { getRouter, startInstance };
-
-//# sourceMappingURL=fake-start-entry.js.map

package/dist/esm/fake-start-entry.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fake-start-entry.js","names":[],"sources":["../../src/fake-start-entry.ts"],"sourcesContent":["export const startInstance = undefined\nexport const getRouter = () => {}\n"],"mappings":";AAAA,IAAa,gBAAgB,KAAA;AAC7B,IAAa,kBAAkB"}