@tanstack/router-core 1.121.34 → 1.121.40

package/dist/cjs/ssr/ssr-client.d.cts

@@ -0,0 +1,68 @@
+import { DeferredPromiseState } from '../defer.cjs';
+import { MakeRouteMatch } from '../Matches.cjs';
+import { AnyRouter, ControllablePromise } from '../router.cjs';
+import { Manifest } from '../manifest.cjs';
+declare global {
+    interface Window {
+        __TSR_SSR__?: TsrSsrGlobal;
+    }
+}
+export interface TsrSsrGlobal {
+    matches: Array<SsrMatch>;
+    streamedValues: Record<string, {
+        value: any;
+        parsed: any;
+    }>;
+    cleanScripts: () => void;
+    dehydrated?: any;
+    initMatch: (match: SsrMatch) => void;
+    resolvePromise: (opts: {
+        matchId: string;
+        id: number;
+        promiseState: DeferredPromiseState<any>;
+    }) => void;
+    injectChunk: (opts: {
+        matchId: string;
+        id: number;
+        chunk: string;
+    }) => void;
+    closeStream: (opts: {
+        matchId: string;
+        id: number;
+    }) => void;
+}
+export interface SsrMatch {
+    id: string;
+    __beforeLoadContext: string;
+    loaderData?: string;
+    error?: string;
+    extracted?: Array<ClientExtractedEntry>;
+    updatedAt: MakeRouteMatch['updatedAt'];
+    status: MakeRouteMatch['status'];
+}
+export type ClientExtractedEntry = ClientExtractedStream | ClientExtractedPromise;
+export interface ClientExtractedPromise extends ClientExtractedBaseEntry {
+    type: 'promise';
+    value?: ControllablePromise<any>;
+}
+export interface ClientExtractedStream extends ClientExtractedBaseEntry {
+    type: 'stream';
+    value?: ReadableStream & {
+        controller?: ReadableStreamDefaultController;
+    };
+}
+export interface ClientExtractedBaseEntry {
+    type: string;
+    path: Array<string>;
+}
+export interface ResolvePromiseState {
+    matchId: string;
+    id: number;
+    promiseState: DeferredPromiseState<any>;
+}
+export interface DehydratedRouter {
+    manifest: Manifest | undefined;
+    dehydratedData: any;
+    lastMatchId: string;
+}
+export declare function hydrate(router: AnyRouter): Promise<any>;

package/dist/cjs/ssr/ssr-server.cjs

@@ -0,0 +1,248 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const warning = require("tiny-warning");
+const jsesc = require("jsesc");
+const defer = require("../defer.cjs");
+const utils = require("../utils.cjs");
+const serializer = require("../serializer.cjs");
+const tsrScript = require("./tsrScript.cjs");
+function attachRouterServerSsrUtils(router, manifest) {
+  router.ssr = {
+    manifest,
+    serializer: serializer.tsrSerializer
+  };
+  router.serverSsr = {
+    injectedHtml: [],
+    streamedKeys: /* @__PURE__ */ new Set(),
+    injectHtml: (getHtml) => {
+      const promise = Promise.resolve().then(getHtml);
+      router.serverSsr.injectedHtml.push(promise);
+      router.emit({
+        type: "onInjectedHtml",
+        promise
+      });
+      return promise.then(() => {
+      });
+    },
+    injectScript: (getScript, opts) => {
+      return router.serverSsr.injectHtml(async () => {
+        const script = await getScript();
+        return `<script class='tsr-once'>${script}${process.env.NODE_ENV === "development" && ((opts == null ? void 0 : opts.logScript) ?? true) ? `; console.info(\`Injected From Server:
+${jsesc(script, { quotes: "backtick" })}\`)` : ""}; if (typeof __TSR_SSR__ !== 'undefined') __TSR_SSR__.cleanScripts()<\/script>`;
+      });
+    },
+    streamValue: (key, value) => {
+      warning(
+        !router.serverSsr.streamedKeys.has(key),
+        "Key has already been streamed: " + key
+      );
+      router.serverSsr.streamedKeys.add(key);
+      router.serverSsr.injectScript(
+        () => `__TSR_SSR__.streamedValues['${key}'] = { value: ${jsesc(
+          router.ssr.serializer.stringify(value),
+          {
+            isScriptContext: true,
+            wrap: true,
+            json: true
+          }
+        )}}`
+      );
+    },
+    onMatchSettled
+  };
+  router.serverSsr.injectScript(() => tsrScript, {
+    logScript: false
+  });
+}
+function dehydrateRouter(router) {
+  var _a, _b, _c;
+  const dehydratedRouter = {
+    manifest: router.ssr.manifest,
+    dehydratedData: (_b = (_a = router.options).dehydrate) == null ? void 0 : _b.call(_a),
+    lastMatchId: ((_c = router.state.matches[router.state.matches.length - 1]) == null ? void 0 : _c.id) || ""
+  };
+  router.serverSsr.injectScript(
+    () => `__TSR_SSR__.dehydrated = ${jsesc(
+      router.ssr.serializer.stringify(dehydratedRouter),
+      {
+        isScriptContext: true,
+        wrap: true,
+        json: true
+      }
+    )}`
+  );
+}
+function extractAsyncLoaderData(loaderData, ctx) {
+  const extracted = [];
+  const replaced = replaceBy(loaderData, (value, path) => {
+    if (value instanceof ReadableStream) {
+      const [copy1, copy2] = value.tee();
+      const entry = {
+        type: "stream",
+        path,
+        id: extracted.length,
+        matchIndex: ctx.match.index,
+        stream: copy2
+      };
+      extracted.push(entry);
+      return copy1;
+    } else if (value instanceof Promise) {
+      const deferredPromise = defer.defer(value);
+      const entry = {
+        type: "promise",
+        path,
+        id: extracted.length,
+        matchIndex: ctx.match.index,
+        promise: deferredPromise
+      };
+      extracted.push(entry);
+    }
+    return value;
+  });
+  return { replaced, extracted };
+}
+function onMatchSettled(opts) {
+  const { router, match } = opts;
+  let extracted = void 0;
+  let serializedLoaderData = void 0;
+  if (match.loaderData !== void 0) {
+    const result = extractAsyncLoaderData(match.loaderData, {
+      match
+    });
+    match.loaderData = result.replaced;
+    extracted = result.extracted;
+    serializedLoaderData = extracted.reduce(
+      (acc, entry) => {
+        return deepImmutableSetByPath(acc, ["temp", ...entry.path], void 0);
+      },
+      { temp: result.replaced }
+    ).temp;
+  }
+  const initCode = `__TSR_SSR__.initMatch(${jsesc(
+    {
+      id: match.id,
+      __beforeLoadContext: router.ssr.serializer.stringify(
+        match.__beforeLoadContext
+      ),
+      loaderData: router.ssr.serializer.stringify(serializedLoaderData),
+      error: router.ssr.serializer.stringify(match.error),
+      extracted: extracted == null ? void 0 : extracted.map((entry) => utils.pick(entry, ["type", "path"])),
+      updatedAt: match.updatedAt,
+      status: match.status
+    },
+    {
+      isScriptContext: true,
+      wrap: true,
+      json: true
+    }
+  )})`;
+  router.serverSsr.injectScript(() => initCode);
+  if (extracted) {
+    extracted.forEach((entry) => {
+      if (entry.type === "promise") return injectPromise(entry);
+      return injectStream(entry);
+    });
+  }
+  function injectPromise(entry) {
+    router.serverSsr.injectScript(async () => {
+      await entry.promise;
+      return `__TSR_SSR__.resolvePromise(${jsesc(
+        {
+          matchId: match.id,
+          id: entry.id,
+          promiseState: entry.promise[defer.TSR_DEFERRED_PROMISE]
+        },
+        {
+          isScriptContext: true,
+          wrap: true,
+          json: true
+        }
+      )})`;
+    });
+  }
+  function injectStream(entry) {
+    router.serverSsr.injectHtml(async () => {
+      try {
+        const reader = entry.stream.getReader();
+        let chunk = null;
+        while (!(chunk = await reader.read()).done) {
+          if (chunk.value) {
+            const code = `__TSR_SSR__.injectChunk(${jsesc(
+              {
+                matchId: match.id,
+                id: entry.id,
+                chunk: chunk.value
+              },
+              {
+                isScriptContext: true,
+                wrap: true,
+                json: true
+              }
+            )})`;
+            router.serverSsr.injectScript(() => code);
+          }
+        }
+        router.serverSsr.injectScript(
+          () => `__TSR_SSR__.closeStream(${jsesc(
+            {
+              matchId: match.id,
+              id: entry.id
+            },
+            {
+              isScriptContext: true,
+              wrap: true,
+              json: true
+            }
+          )})`
+        );
+      } catch (err) {
+        console.error("stream read error", err);
+      }
+      return "";
+    });
+  }
+}
+function deepImmutableSetByPath(obj, path, value) {
+  if (path.length === 0) {
+    return value;
+  }
+  const [key, ...rest] = path;
+  if (Array.isArray(obj)) {
+    return obj.map((item, i) => {
+      if (i === Number(key)) {
+        return deepImmutableSetByPath(item, rest, value);
+      }
+      return item;
+    });
+  }
+  if (utils.isPlainObject(obj)) {
+    return {
+      ...obj,
+      [key]: deepImmutableSetByPath(obj[key], rest, value)
+    };
+  }
+  return obj;
+}
+function replaceBy(obj, cb, path = []) {
+  if (utils.isPlainArray(obj)) {
+    return obj.map((value, i) => replaceBy(value, cb, [...path, `${i}`]));
+  }
+  if (utils.isPlainObject(obj)) {
+    const newObj2 = {};
+    for (const key in obj) {
+      newObj2[key] = replaceBy(obj[key], cb, [...path, key]);
+    }
+    return newObj2;
+  }
+  const newObj = cb(obj, path);
+  if (newObj !== obj) {
+    return newObj;
+  }
+  return obj;
+}
+exports.attachRouterServerSsrUtils = attachRouterServerSsrUtils;
+exports.dehydrateRouter = dehydrateRouter;
+exports.extractAsyncLoaderData = extractAsyncLoaderData;
+exports.onMatchSettled = onMatchSettled;
+exports.replaceBy = replaceBy;
+//# sourceMappingURL=ssr-server.cjs.map

package/dist/cjs/ssr/ssr-server.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"ssr-server.cjs","sources":["../../../src/ssr/ssr-server.ts"],"sourcesContent":["import { default as warning } from 'tiny-warning'\nimport jsesc from 'jsesc'\nimport { TSR_DEFERRED_PROMISE, defer } from '../defer'\nimport { isPlainArray, isPlainObject, pick } from '../utils'\nimport { tsrSerializer } from '../serializer'\nimport minifiedTsrBootStrapScript from './tsrScript?script-string'\nimport type { DeferredPromise } from '../defer'\nimport type {\n  ClientExtractedBaseEntry,\n  DehydratedRouter,\n  ResolvePromiseState,\n  SsrMatch,\n} from './ssr-client'\nimport type { AnyRouter } from '../router'\nimport type { Manifest } from '../manifest'\nimport type { AnyRouteMatch } from '../Matches'\n\nexport type ServerExtractedEntry =\n  | ServerExtractedStream\n  | ServerExtractedPromise\n\nexport interface ServerExtractedBaseEntry extends ClientExtractedBaseEntry {\n  id: number\n  matchIndex: number\n}\n\nexport interface ServerExtractedStream extends ServerExtractedBaseEntry {\n  type: 'stream'\n  stream: ReadableStream\n}\n\nexport interface ServerExtractedPromise extends ServerExtractedBaseEntry {\n  type: 'promise'\n  promise: DeferredPromise<any>\n}\n\nexport function attachRouterServerSsrUtils(\n  router: AnyRouter,\n  manifest: Manifest | undefined,\n) {\n  router.ssr = {\n    manifest,\n    serializer: tsrSerializer,\n  }\n\n  router.serverSsr = {\n    injectedHtml: [],\n    streamedKeys: new Set(),\n    injectHtml: (getHtml) => {\n      const promise = Promise.resolve().then(getHtml)\n      router.serverSsr!.injectedHtml.push(promise)\n      router.emit({\n        type: 'onInjectedHtml',\n        promise,\n      })\n\n      return promise.then(() => {})\n    },\n    injectScript: (getScript, opts) => {\n      return router.serverSsr!.injectHtml(async () => {\n        const script = await getScript()\n        return `<script class='tsr-once'>${script}${\n          process.env.NODE_ENV === 'development' && (opts?.logScript ?? true)\n            ? `; console.info(\\`Injected From Server:\n${jsesc(script, { quotes: 'backtick' })}\\`)`\n            : ''\n        }; if (typeof __TSR_SSR__ !== 'undefined') __TSR_SSR__.cleanScripts()</script>`\n      })\n    },\n    streamValue: (key, value) => {\n      warning(\n        !router.serverSsr!.streamedKeys.has(key),\n        'Key has already been streamed: ' + key,\n      )\n\n      router.serverSsr!.streamedKeys.add(key)\n      router.serverSsr!.injectScript(\n        () =>\n          `__TSR_SSR__.streamedValues['${key}'] = { value: ${jsesc(\n            router.ssr!.serializer.stringify(value),\n            {\n              isScriptContext: true,\n              wrap: true,\n              json: true,\n            },\n          )}}`,\n      )\n    },\n    onMatchSettled,\n  }\n\n  router.serverSsr.injectScript(() => minifiedTsrBootStrapScript, {\n    logScript: false,\n  })\n}\n\nexport function dehydrateRouter(router: AnyRouter) {\n  const dehydratedRouter: DehydratedRouter = {\n    manifest: router.ssr!.manifest,\n    dehydratedData: router.options.dehydrate?.(),\n    lastMatchId:\n      router.state.matches[router.state.matches.length - 1]?.id || '',\n  }\n\n  router.serverSsr!.injectScript(\n    () =>\n      `__TSR_SSR__.dehydrated = ${jsesc(\n        router.ssr!.serializer.stringify(dehydratedRouter),\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )}`,\n  )\n}\n\nexport function extractAsyncLoaderData(\n  loaderData: any,\n  ctx: {\n    match: AnyRouteMatch\n    router: AnyRouter\n  },\n) {\n  const extracted: Array<ServerExtractedEntry> = []\n\n  const replaced = replaceBy(loaderData, (value, path) => {\n    // If it's a stream, we need to tee it so we can read it multiple times\n    if (value instanceof ReadableStream) {\n      const [copy1, copy2] = value.tee()\n      const entry: ServerExtractedStream = {\n        type: 'stream',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        stream: copy2,\n      }\n\n      extracted.push(entry)\n      return copy1\n    } else if (value instanceof Promise) {\n      const deferredPromise = defer(value)\n      const entry: ServerExtractedPromise = {\n        type: 'promise',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        promise: deferredPromise,\n      }\n      extracted.push(entry)\n    }\n\n    return value\n  })\n\n  return { replaced, extracted }\n}\n\nexport function onMatchSettled(opts: {\n  router: AnyRouter\n  match: AnyRouteMatch\n}) {\n  const { router, match } = opts\n\n  let extracted: Array<ServerExtractedEntry> | undefined = undefined\n  let serializedLoaderData: any = undefined\n  if (match.loaderData !== undefined) {\n    const result = extractAsyncLoaderData(match.loaderData, {\n      router,\n      match,\n    })\n    match.loaderData = result.replaced\n    extracted = result.extracted\n    serializedLoaderData = extracted.reduce(\n      (acc: any, entry: ServerExtractedEntry) => {\n        return deepImmutableSetByPath(acc, ['temp', ...entry.path], undefined)\n      },\n      { temp: result.replaced },\n    ).temp\n  }\n\n  const initCode = `__TSR_SSR__.initMatch(${jsesc(\n    {\n      id: match.id,\n      __beforeLoadContext: router.ssr!.serializer.stringify(\n        match.__beforeLoadContext,\n      ),\n      loaderData: router.ssr!.serializer.stringify(serializedLoaderData),\n      error: router.ssr!.serializer.stringify(match.error),\n      extracted: extracted?.map((entry) => pick(entry, ['type', 'path'])),\n      updatedAt: match.updatedAt,\n      status: match.status,\n    } satisfies SsrMatch,\n    {\n      isScriptContext: true,\n      wrap: true,\n      json: true,\n    },\n  )})`\n\n  router.serverSsr!.injectScript(() => initCode)\n\n  if (extracted) {\n    extracted.forEach((entry) => {\n      if (entry.type === 'promise') return injectPromise(entry)\n      return injectStream(entry)\n    })\n  }\n\n  function injectPromise(entry: ServerExtractedPromise) {\n    router.serverSsr!.injectScript(async () => {\n      await entry.promise\n\n      return `__TSR_SSR__.resolvePromise(${jsesc(\n        {\n          matchId: match.id,\n          id: entry.id,\n          promiseState: entry.promise[TSR_DEFERRED_PROMISE],\n        } satisfies ResolvePromiseState,\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )})`\n    })\n  }\n\n  function injectStream(entry: ServerExtractedStream) {\n    // Inject a promise that resolves when the stream is done\n    // We do this to keep the stream open until we're done\n    router.serverSsr!.injectHtml(async () => {\n      //\n      try {\n        const reader = entry.stream.getReader()\n        let chunk: ReadableStreamReadResult<any> | null = null\n        while (!(chunk = await reader.read()).done) {\n          if (chunk.value) {\n            const code = `__TSR_SSR__.injectChunk(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n                chunk: chunk.value,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`\n\n            router.serverSsr!.injectScript(() => code)\n          }\n        }\n\n        router.serverSsr!.injectScript(\n          () =>\n            `__TSR_SSR__.closeStream(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`,\n        )\n      } catch (err) {\n        console.error('stream read error', err)\n      }\n\n      return ''\n    })\n  }\n}\n\nfunction deepImmutableSetByPath<T>(obj: T, path: Array<string>, value: any): T {\n  // immutable set by path retaining array and object references\n  if (path.length === 0) {\n    return value\n  }\n\n  const [key, ...rest] = path\n\n  if (Array.isArray(obj)) {\n    return obj.map((item, i) => {\n      if (i === Number(key)) {\n        return deepImmutableSetByPath(item, rest, value)\n      }\n      return item\n    }) as T\n  }\n\n  if (isPlainObject(obj)) {\n    return {\n      ...obj,\n      [key!]: deepImmutableSetByPath((obj as any)[key!], rest, value),\n    }\n  }\n\n  return obj\n}\n\nexport function replaceBy<T>(\n  obj: T,\n  cb: (value: any, path: Array<string>) => any,\n  path: Array<string> = [],\n): T {\n  if (isPlainArray(obj)) {\n    return obj.map((value, i) => replaceBy(value, cb, [...path, `${i}`])) as any\n  }\n\n  if (isPlainObject(obj)) {\n    // Do not allow objects with illegal\n    const newObj: any = {}\n\n    for (const key in obj) {\n      newObj[key] = replaceBy(obj[key], cb, [...path, key])\n    }\n\n    return newObj\n  }\n\n  // // Detect classes, functions, and other non-serializable objects\n  // // and return undefined. Exclude some known types that are serializable\n  // if (\n  //   typeof obj === 'function' ||\n  //   (typeof obj === 'object' &&\n  //     ![Object, Promise, ReadableStream].includes((obj as any)?.constructor))\n  // ) {\n  //   console.info(obj)\n  //   warning(false, `Non-serializable value ☝️ found at ${path.join('.')}`)\n  //   return undefined as any\n  // }\n\n  const newObj = cb(obj, path)\n\n  if (newObj !== obj) {\n    return newObj\n  }\n\n  return obj\n}\n"],"names":["tsrSerializer","minifiedTsrBootStrapScript","defer","pick","TSR_DEFERRED_PROMISE","isPlainObject","isPlainArray","newObj"],"mappings":"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"}

package/dist/cjs/ssr/ssr-server.d.cts

@@ -0,0 +1,32 @@
+import { DeferredPromise } from '../defer.cjs';
+import { ClientExtractedBaseEntry } from './ssr-client.cjs';
+import { AnyRouter } from '../router.cjs';
+import { Manifest } from '../manifest.cjs';
+import { AnyRouteMatch } from '../Matches.cjs';
+export type ServerExtractedEntry = ServerExtractedStream | ServerExtractedPromise;
+export interface ServerExtractedBaseEntry extends ClientExtractedBaseEntry {
+    id: number;
+    matchIndex: number;
+}
+export interface ServerExtractedStream extends ServerExtractedBaseEntry {
+    type: 'stream';
+    stream: ReadableStream;
+}
+export interface ServerExtractedPromise extends ServerExtractedBaseEntry {
+    type: 'promise';
+    promise: DeferredPromise<any>;
+}
+export declare function attachRouterServerSsrUtils(router: AnyRouter, manifest: Manifest | undefined): void;
+export declare function dehydrateRouter(router: AnyRouter): void;
+export declare function extractAsyncLoaderData(loaderData: any, ctx: {
+    match: AnyRouteMatch;
+    router: AnyRouter;
+}): {
+    replaced: any;
+    extracted: ServerExtractedEntry[];
+};
+export declare function onMatchSettled(opts: {
+    router: AnyRouter;
+    match: AnyRouteMatch;
+}): void;
+export declare function replaceBy<T>(obj: T, cb: (value: any, path: Array<string>) => any, path?: Array<string>): T;

package/dist/cjs/ssr/transformStreamWithRouter.cjs

@@ -0,0 +1,183 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const web = require("node:stream/web");
+const node_stream = require("node:stream");
+const utils = require("../utils.cjs");
+function transformReadableStreamWithRouter(router, routerStream) {
+  return transformStreamWithRouter(router, routerStream);
+}
+function transformPipeableStreamWithRouter(router, routerStream) {
+  return node_stream.Readable.fromWeb(
+    transformStreamWithRouter(router, node_stream.Readable.toWeb(routerStream))
+  );
+}
+const patternBodyStart = /(<body)/;
+const patternBodyEnd = /(<\/body>)/;
+const patternHtmlEnd = /(<\/html>)/;
+const patternHeadStart = /(<head.*?>)/;
+const patternClosingTag = /(<\/[a-zA-Z][\w:.-]*?>)/g;
+const textDecoder = new TextDecoder();
+function createPassthrough() {
+  let controller;
+  const encoder = new TextEncoder();
+  const stream = new web.ReadableStream({
+    start(c) {
+      controller = c;
+    }
+  });
+  const res = {
+    stream,
+    write: (chunk) => {
+      controller.enqueue(encoder.encode(chunk));
+    },
+    end: (chunk) => {
+      if (chunk) {
+        controller.enqueue(encoder.encode(chunk));
+      }
+      controller.close();
+      res.destroyed = true;
+    },
+    destroy: (error) => {
+      controller.error(error);
+    },
+    destroyed: false
+  };
+  return res;
+}
+async function readStream(stream, opts) {
+  var _a, _b, _c;
+  try {
+    const reader = stream.getReader();
+    let chunk;
+    while (!(chunk = await reader.read()).done) {
+      (_a = opts.onData) == null ? void 0 : _a.call(opts, chunk);
+    }
+    (_b = opts.onEnd) == null ? void 0 : _b.call(opts);
+  } catch (error) {
+    (_c = opts.onError) == null ? void 0 : _c.call(opts, error);
+  }
+}
+function transformStreamWithRouter(router, appStream) {
+  const finalPassThrough = createPassthrough();
+  let isAppRendering = true;
+  let routerStreamBuffer = "";
+  let pendingClosingTags = "";
+  let bodyStarted = false;
+  let headStarted = false;
+  let leftover = "";
+  let leftoverHtml = "";
+  function getBufferedRouterStream() {
+    const html = routerStreamBuffer;
+    routerStreamBuffer = "";
+    return html;
+  }
+  function decodeChunk(chunk) {
+    if (chunk instanceof Uint8Array) {
+      return textDecoder.decode(chunk);
+    }
+    return String(chunk);
+  }
+  const injectedHtmlDonePromise = utils.createControlledPromise();
+  let processingCount = 0;
+  router.serverSsr.injectedHtml.forEach((promise) => {
+    handleInjectedHtml(promise);
+  });
+  const stopListeningToInjectedHtml = router.subscribe(
+    "onInjectedHtml",
+    (e) => {
+      handleInjectedHtml(e.promise);
+    }
+  );
+  function handleInjectedHtml(promise) {
+    processingCount++;
+    promise.then((html) => {
+      if (!bodyStarted) {
+        routerStreamBuffer += html;
+      } else {
+        finalPassThrough.write(html);
+      }
+    }).catch(injectedHtmlDonePromise.reject).finally(() => {
+      processingCount--;
+      if (!isAppRendering && processingCount === 0) {
+        stopListeningToInjectedHtml();
+        injectedHtmlDonePromise.resolve();
+      }
+    });
+  }
+  injectedHtmlDonePromise.then(() => {
+    const finalHtml = leftoverHtml + getBufferedRouterStream() + pendingClosingTags;
+    finalPassThrough.end(finalHtml);
+  }).catch((err) => {
+    console.error("Error reading routerStream:", err);
+    finalPassThrough.destroy(err);
+  });
+  readStream(appStream, {
+    onData: (chunk) => {
+      const text = decodeChunk(chunk.value);
+      let chunkString = leftover + text;
+      const bodyEndMatch = chunkString.match(patternBodyEnd);
+      const htmlEndMatch = chunkString.match(patternHtmlEnd);
+      if (!bodyStarted) {
+        const bodyStartMatch = chunkString.match(patternBodyStart);
+        if (bodyStartMatch) {
+          bodyStarted = true;
+        }
+      }
+      if (!headStarted) {
+        const headStartMatch = chunkString.match(patternHeadStart);
+        if (headStartMatch) {
+          headStarted = true;
+          const index = headStartMatch.index;
+          const headTag = headStartMatch[0];
+          const remaining = chunkString.slice(index + headTag.length);
+          finalPassThrough.write(
+            chunkString.slice(0, index) + headTag + getBufferedRouterStream()
+          );
+          chunkString = remaining;
+        }
+      }
+      if (!bodyStarted) {
+        finalPassThrough.write(chunkString);
+        leftover = "";
+        return;
+      }
+      if (bodyEndMatch && htmlEndMatch && bodyEndMatch.index < htmlEndMatch.index) {
+        const bodyEndIndex = bodyEndMatch.index;
+        pendingClosingTags = chunkString.slice(bodyEndIndex);
+        finalPassThrough.write(
+          chunkString.slice(0, bodyEndIndex) + getBufferedRouterStream()
+        );
+        leftover = "";
+        return;
+      }
+      let result;
+      let lastIndex = 0;
+      while ((result = patternClosingTag.exec(chunkString)) !== null) {
+        lastIndex = result.index + result[0].length;
+      }
+      if (lastIndex > 0) {
+        const processed = chunkString.slice(0, lastIndex) + getBufferedRouterStream() + leftoverHtml;
+        finalPassThrough.write(processed);
+        leftover = chunkString.slice(lastIndex);
+      } else {
+        leftover = chunkString;
+        leftoverHtml += getBufferedRouterStream();
+      }
+    },
+    onEnd: () => {
+      isAppRendering = false;
+      if (processingCount === 0) {
+        injectedHtmlDonePromise.resolve();
+      }
+    },
+    onError: (error) => {
+      console.error("Error reading appStream:", error);
+      finalPassThrough.destroy(error);
+    }
+  });
+  return finalPassThrough.stream;
+}
+exports.transformPipeableStreamWithRouter = transformPipeableStreamWithRouter;
+exports.transformReadableStreamWithRouter = transformReadableStreamWithRouter;
+exports.transformStreamWithRouter = transformStreamWithRouter;
+//# sourceMappingURL=transformStreamWithRouter.cjs.map

package/dist/cjs/ssr/transformStreamWithRouter.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"transformStreamWithRouter.cjs","sources":["../../../src/ssr/transformStreamWithRouter.ts"],"sourcesContent":["import { ReadableStream } from 'node:stream/web'\nimport { Readable } from 'node:stream'\nimport { createControlledPromise } from '../utils'\nimport type { AnyRouter } from '../router'\n\nexport function transformReadableStreamWithRouter(\n  router: AnyRouter,\n  routerStream: ReadableStream,\n) {\n  return transformStreamWithRouter(router, routerStream)\n}\n\nexport function transformPipeableStreamWithRouter(\n  router: AnyRouter,\n  routerStream: Readable,\n) {\n  return Readable.fromWeb(\n    transformStreamWithRouter(router, Readable.toWeb(routerStream)),\n  )\n}\n\n// regex pattern for matching closing body and html tags\nconst patternBodyStart = /(<body)/\nconst patternBodyEnd = /(<\\/body>)/\nconst patternHtmlEnd = /(<\\/html>)/\nconst patternHeadStart = /(<head.*?>)/\n// regex pattern for matching closing tags\nconst patternClosingTag = /(<\\/[a-zA-Z][\\w:.-]*?>)/g\n\nconst textDecoder = new TextDecoder()\n\ntype ReadablePassthrough = {\n  stream: ReadableStream\n  write: (chunk: string) => void\n  end: (chunk?: string) => void\n  destroy: (error: unknown) => void\n  destroyed: boolean\n}\n\nfunction createPassthrough() {\n  let controller: ReadableStreamDefaultController<any>\n  const encoder = new TextEncoder()\n  const stream = new ReadableStream({\n    start(c) {\n      controller = c\n    },\n  })\n\n  const res: ReadablePassthrough = {\n    stream,\n    write: (chunk) => {\n      controller.enqueue(encoder.encode(chunk))\n    },\n    end: (chunk) => {\n      if (chunk) {\n        controller.enqueue(encoder.encode(chunk))\n      }\n      controller.close()\n      res.destroyed = true\n    },\n    destroy: (error) => {\n      controller.error(error)\n    },\n    destroyed: false,\n  }\n\n  return res\n}\n\nasync function readStream(\n  stream: ReadableStream,\n  opts: {\n    onData?: (chunk: ReadableStreamReadValueResult<any>) => void\n    onEnd?: () => void\n    onError?: (error: unknown) => void\n  },\n) {\n  try {\n    const reader = stream.getReader()\n    let chunk\n    while (!(chunk = await reader.read()).done) {\n      opts.onData?.(chunk)\n    }\n    opts.onEnd?.()\n  } catch (error) {\n    opts.onError?.(error)\n  }\n}\n\nexport function transformStreamWithRouter(\n  router: AnyRouter,\n  appStream: ReadableStream,\n) {\n  const finalPassThrough = createPassthrough()\n\n  let isAppRendering = true as boolean\n  let routerStreamBuffer = ''\n  let pendingClosingTags = ''\n  let bodyStarted = false as boolean\n  let headStarted = false as boolean\n  let leftover = ''\n  let leftoverHtml = ''\n\n  function getBufferedRouterStream() {\n    const html = routerStreamBuffer\n    routerStreamBuffer = ''\n    return html\n  }\n\n  function decodeChunk(chunk: unknown): string {\n    if (chunk instanceof Uint8Array) {\n      return textDecoder.decode(chunk)\n    }\n    return String(chunk)\n  }\n\n  const injectedHtmlDonePromise = createControlledPromise<void>()\n\n  let processingCount = 0\n\n  // Process any already-injected HTML\n  router.serverSsr!.injectedHtml.forEach((promise) => {\n    handleInjectedHtml(promise)\n  })\n\n  // Listen for any new injected HTML\n  const stopListeningToInjectedHtml = router.subscribe(\n    'onInjectedHtml',\n    (e) => {\n      handleInjectedHtml(e.promise)\n    },\n  )\n\n  function handleInjectedHtml(promise: Promise<string>) {\n    processingCount++\n\n    promise\n      .then((html) => {\n        if (!bodyStarted) {\n          routerStreamBuffer += html\n        } else {\n          finalPassThrough.write(html)\n        }\n      })\n      .catch(injectedHtmlDonePromise.reject)\n      .finally(() => {\n        processingCount--\n\n        if (!isAppRendering && processingCount === 0) {\n          stopListeningToInjectedHtml()\n          injectedHtmlDonePromise.resolve()\n        }\n      })\n  }\n\n  injectedHtmlDonePromise\n    .then(() => {\n      const finalHtml =\n        leftoverHtml + getBufferedRouterStream() + pendingClosingTags\n\n      finalPassThrough.end(finalHtml)\n    })\n    .catch((err) => {\n      console.error('Error reading routerStream:', err)\n      finalPassThrough.destroy(err)\n    })\n\n  // Transform the appStream\n  readStream(appStream, {\n    onData: (chunk) => {\n      const text = decodeChunk(chunk.value)\n\n      let chunkString = leftover + text\n      const bodyEndMatch = chunkString.match(patternBodyEnd)\n      const htmlEndMatch = chunkString.match(patternHtmlEnd)\n\n      if (!bodyStarted) {\n        const bodyStartMatch = chunkString.match(patternBodyStart)\n        if (bodyStartMatch) {\n          bodyStarted = true\n        }\n      }\n\n      if (!headStarted) {\n        const headStartMatch = chunkString.match(patternHeadStart)\n        if (headStartMatch) {\n          headStarted = true\n          const index = headStartMatch.index!\n          const headTag = headStartMatch[0]\n          const remaining = chunkString.slice(index + headTag.length)\n          finalPassThrough.write(\n            chunkString.slice(0, index) + headTag + getBufferedRouterStream(),\n          )\n          // make sure to only write `remaining` until the next closing tag\n          chunkString = remaining\n        }\n      }\n\n      if (!bodyStarted) {\n        finalPassThrough.write(chunkString)\n        leftover = ''\n        return\n      }\n\n      // If either the body end or html end is in the chunk,\n      // We need to get all of our data in asap\n      if (\n        bodyEndMatch &&\n        htmlEndMatch &&\n        bodyEndMatch.index! < htmlEndMatch.index!\n      ) {\n        const bodyEndIndex = bodyEndMatch.index!\n        pendingClosingTags = chunkString.slice(bodyEndIndex)\n\n        finalPassThrough.write(\n          chunkString.slice(0, bodyEndIndex) + getBufferedRouterStream(),\n        )\n\n        leftover = ''\n        return\n      }\n\n      let result: RegExpExecArray | null\n      let lastIndex = 0\n      while ((result = patternClosingTag.exec(chunkString)) !== null) {\n        lastIndex = result.index + result[0].length\n      }\n\n      if (lastIndex > 0) {\n        const processed =\n          chunkString.slice(0, lastIndex) +\n          getBufferedRouterStream() +\n          leftoverHtml\n\n        finalPassThrough.write(processed)\n        leftover = chunkString.slice(lastIndex)\n      } else {\n        leftover = chunkString\n        leftoverHtml += getBufferedRouterStream()\n      }\n    },\n    onEnd: () => {\n      // Mark the app as done rendering\n      isAppRendering = false\n\n      // If there are no pending promises, resolve the injectedHtmlDonePromise\n      if (processingCount === 0) {\n        injectedHtmlDonePromise.resolve()\n      }\n    },\n    onError: (error) => {\n      console.error('Error reading appStream:', error)\n      finalPassThrough.destroy(error)\n    },\n  })\n\n  return finalPassThrough.stream\n}\n"],"names":["Readable","ReadableStream","createControlledPromise"],"mappings":"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"}

package/dist/cjs/ssr/transformStreamWithRouter.d.cts

@@ -0,0 +1,6 @@
+import { ReadableStream } from 'node:stream/web';
+import { Readable } from 'node:stream';
+import { AnyRouter } from '../router.cjs';
+export declare function transformReadableStreamWithRouter(router: AnyRouter, routerStream: ReadableStream): ReadableStream<any>;
+export declare function transformPipeableStreamWithRouter(router: AnyRouter, routerStream: Readable): Readable;
+export declare function transformStreamWithRouter(router: AnyRouter, appStream: ReadableStream): ReadableStream<any>;

package/dist/cjs/ssr/tsrScript.cjs

@@ -0,0 +1,4 @@
+"use strict";
+const minifiedTsrBootStrapScript = 'const __TSR_SSR__={matches:[],streamedValues:{},initMatch:o=>(__TSR_SSR__.matches.push(o),o.extracted?.forEach(l=>{if(l.type==="stream"){let r;l.value=new ReadableStream({start(e){r={enqueue:t=>{try{e.enqueue(t)}catch{}},close:()=>{try{e.close()}catch{}}}}}),l.value.controller=r}else{let r,e;l.value=new Promise((t,n)=>{e=n,r=t}),l.value.reject=e,l.value.resolve=r}}),!0),resolvePromise:({matchId:o,id:l,promiseState:r})=>{const e=__TSR_SSR__.matches.find(t=>t.id===o);if(e){const t=e.extracted?.[l];if(t&&t.type==="promise"&&t.value&&r.status==="success")return t.value.resolve(r.data),!0}return!1},injectChunk:({matchId:o,id:l,chunk:r})=>{const e=__TSR_SSR__.matches.find(t=>t.id===o);if(e){const t=e.extracted?.[l];if(t&&t.type==="stream"&&t.value?.controller)return t.value.controller.enqueue(new TextEncoder().encode(r.toString())),!0}return!1},closeStream:({matchId:o,id:l})=>{const r=__TSR_SSR__.matches.find(e=>e.id===o);if(r){const e=r.extracted?.[l];if(e&&e.type==="stream"&&e.value?.controller)return e.value.controller.close(),!0}return!1},cleanScripts:()=>{document.querySelectorAll(".tsr-once").forEach(o=>{o.remove()})}};window.__TSR_SSR__=__TSR_SSR__;\n';
+module.exports = minifiedTsrBootStrapScript;
+//# sourceMappingURL=tsrScript.cjs.map

package/dist/cjs/ssr/tsrScript.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"tsrScript.cjs","sources":["../../../src/ssr/tsrScript.ts?script-string"],"sourcesContent":["import type { ControllablePromise } from '../router'\nimport type { TsrSsrGlobal } from './ssr-client'\n\nconst __TSR_SSR__: TsrSsrGlobal = {\n  matches: [],\n  streamedValues: {},\n  initMatch: (match) => {\n    __TSR_SSR__.matches.push(match)\n\n    match.extracted?.forEach((ex) => {\n      if (ex.type === 'stream') {\n        let controller\n        ex.value = new ReadableStream({\n          start(c) {\n            controller = {\n              enqueue: (chunk: unknown) => {\n                try {\n                  c.enqueue(chunk)\n                } catch {}\n              },\n              close: () => {\n                try {\n                  c.close()\n                } catch {}\n              },\n            }\n          },\n        })\n        ex.value.controller = controller\n      } else {\n        let resolve: ControllablePromise['reject'] | undefined\n        let reject: ControllablePromise['reject'] | undefined\n\n        ex.value = new Promise((_resolve, _reject) => {\n          reject = _reject\n          resolve = _resolve\n        }) as ControllablePromise\n        ex.value.reject = reject!\n        ex.value.resolve = resolve!\n      }\n    })\n\n    return true\n  },\n  resolvePromise: ({ matchId, id, promiseState }) => {\n    const match = __TSR_SSR__.matches.find((m) => m.id === matchId)\n    if (match) {\n      const ex = match.extracted?.[id]\n      if (\n        ex &&\n        ex.type === 'promise' &&\n        ex.value &&\n        promiseState.status === 'success'\n      ) {\n        ex.value.resolve(promiseState.data)\n        return true\n      }\n    }\n    return false\n  },\n  injectChunk: ({ matchId, id, chunk }) => {\n    const match = __TSR_SSR__.matches.find((m) => m.id === matchId)\n\n    if (match) {\n      const ex = match.extracted?.[id]\n      if (ex && ex.type === 'stream' && ex.value?.controller) {\n        ex.value.controller.enqueue(new TextEncoder().encode(chunk.toString()))\n        return true\n      }\n    }\n    return false\n  },\n  closeStream: ({ matchId, id }) => {\n    const match = __TSR_SSR__.matches.find((m) => m.id === matchId)\n    if (match) {\n      const ex = match.extracted?.[id]\n      if (ex && ex.type === 'stream' && ex.value?.controller) {\n        ex.value.controller.close()\n        return true\n      }\n    }\n    return false\n  },\n  cleanScripts: () => {\n    document.querySelectorAll('.tsr-once').forEach((el) => {\n      el.remove()\n    })\n  },\n}\n\nwindow.__TSR_SSR__ = __TSR_SSR__\n"],"names":[],"mappings":";AAAA,MAAA,6BAAe;;"}

package/dist/cjs/ssr/tsrScript.d.cts

@@ -0,0 +1 @@
+export {};

package/dist/esm/index.d.ts

@@ -4,7 +4,7 @@ export { preloadWarning } from './link.js';
 export type { IsRequiredParams, AddTrailingSlash, RemoveTrailingSlashes, AddLeadingSlash, RemoveLeadingSlashes, ActiveOptions, LinkOptionsProps, ResolveCurrentPath, ResolveParentPath, ResolveRelativePath, LinkCurrentTargetElement, FindDescendantToPaths, InferDescendantToPaths, RelativeToPath, RelativeToParentPath, RelativeToCurrentPath, AbsoluteToPath, RelativeToPathAutoComplete, NavigateOptions, ToOptions, ToMaskOptions, ToSubOptions, ResolveRoute, SearchParamOptions, PathParamOptions, ToPathOption, LinkOptions, MakeOptionalPathParams, FromPathOption, MakeOptionalSearchParams, MaskOptions, ToSubOptionsProps, RequiredToOptions, } from './link.js';
 export type { RouteToPath, TrailingSlashOptionByRouter, ParseRoute, CodeRouteToPath, RouteIds, FullSearchSchema, FullSearchSchemaInput, AllParams, RouteById, AllContext, RoutePaths, RoutesById, RoutesByPath, AllLoaderData, RouteByPath, } from './routeInfo.js';
 export type { InferFileRouteTypes, FileRouteTypes, FileRoutesByPath, CreateFileRoute, LazyRoute, LazyRouteOptions, CreateLazyFileRoute, } from './fileRoute.js';
-export type { StartSerializer, Serializable, SerializerParse, SerializerParseBy, SerializerStringify, SerializerStringifyBy, SerializerExtensions, } from './serializer.js';
+export type { TsrSerializer, StartSerializer, Serializable, SerializerParse, SerializerParseBy, SerializerStringify, SerializerStringifyBy, SerializerExtensions, } from './serializer.js';
 export type { ParsedLocation } from './location.js';
 export type { Manifest, RouterManagedTag } from './manifest.js';
 export { isMatch } from './Matches.js';

package/dist/esm/router.d.ts

@@ -10,7 +10,7 @@ import { FullSearchSchema, RouteById, RoutePaths, RoutesById, RoutesByPath } fro
 import { AnyRouteMatch, MakeRouteMatch, MakeRouteMatchUnion, MatchRouteOptions } from './Matches.js';
 import { BuildLocationFn, CommitLocationOptions, NavigateFn } from './RouterProvider.js';
 import { Manifest } from './manifest.js';
-import { StartSerializer } from './serializer.js';
+import { TsrSerializer } from './serializer.js';
 import { AnySchema } from './validators.js';
 import { NavigateOptions, ResolveRelativePath, ToOptions } from './link.js';
 import { NotFoundError } from './not-found.js';
@@ -560,7 +560,7 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     matchRoute: MatchRouteFn<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>;
     ssr?: {
         manifest: Manifest | undefined;
-        serializer: StartSerializer;
+        serializer: TsrSerializer;
     };
     serverSsr?: {
         injectedHtml: Array<InjectedHtmlEntry>;

package/dist/esm/router.js

@@ -503,8 +503,10 @@ class RouterCore {
         location: this.latestLocation,
         pendingMatches,
         // If a cached moved to pendingMatches, remove it from cachedMatches
-        cachedMatches: s.cachedMatches.filter((d) => {
-          return !pendingMatches.find((e) => e.id === d.id);
+        cachedMatches: s.cachedMatches.filter((cachedMatch) => {
+          const pendingMatch = pendingMatches.find((e) => e.id === cachedMatch.id);
+          if (!pendingMatch) return true;
+          return cachedMatch.status === "success" && (cachedMatch.isFetching || cachedMatch.loaderData !== void 0);
         })
       }));
     };