@tanstack/router-core 1.171.5 → 1.171.7

package/dist/esm/ssr/ssr-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-client.js","names":[],"sources":["../../../src/ssr/ssr-client.ts"],"sourcesContent":["import { invariant } from '../invariant'\nimport { isNotFound } from '../not-found'\nimport { createControlledPromise } from '../utils'\nimport { hydrateSsrMatchId } from './ssr-match-id'\nimport type { GLOBAL_SEROVAL, GLOBAL_TSR } from './constants'\nimport type { DehydratedMatch, TsrSsrGlobal } from './types'\nimport type { AnyRouteMatch } from '../Matches'\nimport type { AnyRouter } from '../router'\nimport type { RouteContextOptions } from '../route'\nimport type { AnySerializationAdapter } from './serializer/transformer'\n\ndeclare global {\n  interface Window {\n    [GLOBAL_TSR]?: TsrSsrGlobal\n    [GLOBAL_SEROVAL]?: any\n  }\n}\n\nfunction hydrateMatch(\n  match: AnyRouteMatch,\n  deyhydratedMatch: DehydratedMatch,\n): void {\n  match.id = deyhydratedMatch.i\n  match.__beforeLoadContext = deyhydratedMatch.b\n  match.loaderData = deyhydratedMatch.l\n  match.status = deyhydratedMatch.s\n  match.ssr = deyhydratedMatch.ssr\n  match.updatedAt = deyhydratedMatch.u\n  match.error = deyhydratedMatch.e\n  // Only hydrate global-not-found when a defined value is present in the\n  // dehydrated payload. If omitted, preserve the value computed from the\n  // current client location (important for SPA fallback HTML served at unknown\n  // URLs, where dehydrated matches may come from `/` but client matching marks\n  // root as globalNotFound).\n  if (deyhydratedMatch.g !== undefined) {\n    match.globalNotFound = deyhydratedMatch.g\n  }\n}\n\nexport async function hydrate(router: AnyRouter): Promise<any> {\n  if (!window.$_TSR) {\n    if (process.env.NODE_ENV !== 'production') {\n      throw new Error(\n        'Invariant failed: Expected to find bootstrap data on window.$_TSR, but we did not. Please file an issue!',\n      )\n    }\n\n    invariant()\n  }\n\n  const serializationAdapters = router.options.serializationAdapters as\n    | Array<AnySerializationAdapter>\n    | undefined\n\n  if (serializationAdapters?.length) {\n    const fromSerializableMap = new Map()\n    serializationAdapters.forEach((adapter) => {\n      fromSerializableMap.set(adapter.key, adapter.fromSerializable)\n    })\n    window.$_TSR.t = fromSerializableMap\n    window.$_TSR.buffer.forEach((script) => script())\n  }\n  window.$_TSR.initialized = true\n\n  if (!window.$_TSR.router) {\n    if (process.env.NODE_ENV !== 'production') {\n      throw new Error(\n        'Invariant failed: Expected to find a dehydrated data on window.$_TSR.router, but we did not. Please file an issue!',\n      )\n    }\n\n    invariant()\n  }\n\n  const dehydratedRouter = window.$_TSR.router\n  dehydratedRouter.matches.forEach((dehydratedMatch) => {\n    dehydratedMatch.i = hydrateSsrMatchId(dehydratedMatch.i)\n  })\n  if (dehydratedRouter.lastMatchId) {\n    dehydratedRouter.lastMatchId = hydrateSsrMatchId(\n      dehydratedRouter.lastMatchId,\n    )\n  }\n  const { manifest, dehydratedData, lastMatchId } = dehydratedRouter\n\n  router.ssr = {\n    manifest,\n  }\n  const meta = document.querySelector('meta[property=\"csp-nonce\"]') as\n    | HTMLMetaElement\n    | undefined\n  const nonce = meta?.content\n  router.options.ssr = {\n    nonce,\n  }\n\n  // Allow the user to handle custom hydration data before matching routes.\n  // This lets hydration install router config that affects matching, e.g. rewrites.\n  await router.options.hydrate?.(dehydratedData)\n\n  // Hydrate the router state\n  const matches = router.matchRoutes(router.stores.location.get())\n\n  // kick off loading the route chunks\n  const routeChunkPromise = Promise.all(\n    matches.map((match) =>\n      router.loadRouteChunk(router.looseRoutesById[match.routeId]!),\n    ),\n  )\n\n  function setMatchForcePending(match: AnyRouteMatch) {\n    // usually the minPendingPromise is created in the Match component if a pending match is rendered\n    // however, this might be too late if the match synchronously resolves\n    const route = router.looseRoutesById[match.routeId]!\n    const pendingMinMs =\n      route.options.pendingMinMs ?? router.options.defaultPendingMinMs\n    if (pendingMinMs) {\n      const minPendingPromise = createControlledPromise<void>()\n      match._nonReactive.minPendingPromise = minPendingPromise\n      match._forcePending = true\n\n      setTimeout(() => {\n        minPendingPromise.resolve()\n        // We've handled the minPendingPromise, so we can delete it\n        router.updateMatch(match.id, (prev) => {\n          prev._nonReactive.minPendingPromise = undefined\n          return {\n            ...prev,\n            _forcePending: undefined,\n          }\n        })\n      }, pendingMinMs)\n    }\n  }\n\n  function setRouteSsr(match: AnyRouteMatch) {\n    const route = router.looseRoutesById[match.routeId]\n    if (route) {\n      route.options.ssr = match.ssr\n    }\n  }\n  // Right after hydration and before the first render, we need to rehydrate each match\n  // First step is to reyhdrate loaderData and __beforeLoadContext\n  let firstNonSsrMatchIndex: number | undefined = undefined\n  matches.forEach((match) => {\n    const dehydratedMatch = dehydratedRouter.matches.find(\n      (d) => d.i === match.id,\n    )\n    if (!dehydratedMatch) {\n      match._nonReactive.dehydrated = false\n      match.ssr = false\n      setRouteSsr(match)\n      return\n    }\n\n    hydrateMatch(match, dehydratedMatch)\n    setRouteSsr(match)\n\n    match._nonReactive.dehydrated = match.ssr !== false\n\n    if (match.ssr === 'data-only' || match.ssr === false) {\n      if (firstNonSsrMatchIndex === undefined) {\n        firstNonSsrMatchIndex = match.index\n        setMatchForcePending(match)\n      }\n    }\n  })\n\n  router.stores.setMatches(matches)\n\n  // now that all necessary data is hydrated:\n  // 1) fully reconstruct the route context\n  // 2) execute `head()` and `scripts()` for each match\n  const activeMatches = router.stores.matches.get()\n  const location = router.stores.location.get()\n  await Promise.all(\n    activeMatches.map(async (match) => {\n      try {\n        const route = router.looseRoutesById[match.routeId]!\n\n        const parentMatch = activeMatches[match.index - 1]\n        const parentContext = parentMatch?.context ?? router.options.context\n\n        // `context()` was already executed by `matchRoutes`, however route context was not yet fully reconstructed\n        // so run it again and merge route context\n        if (route.options.context) {\n          const contextFnContext: RouteContextOptions<any, any, any, any, any> =\n            {\n              deps: match.loaderDeps,\n              params: match.params,\n              context: parentContext ?? {},\n              location,\n              navigate: (opts: any) =>\n                router.navigate({\n                  ...opts,\n                  _fromLocation: location,\n                }),\n              buildLocation: router.buildLocation,\n              cause: match.cause,\n              abortController: match.abortController,\n              preload: false,\n              matches,\n              routeId: route.id,\n            }\n          match.__routeContext =\n            route.options.context(contextFnContext) ?? undefined\n        }\n\n        match.context = {\n          ...parentContext,\n          ...match.__routeContext,\n          ...match.__beforeLoadContext,\n        }\n\n        const assetContext = {\n          ssr: router.options.ssr,\n          matches: activeMatches,\n          match,\n          params: match.params,\n          loaderData: match.loaderData,\n        }\n        const headFnContent = await route.options.head?.(assetContext)\n\n        const scripts = await route.options.scripts?.(assetContext)\n\n        match.meta = headFnContent?.meta\n        match.links = headFnContent?.links\n        match.headScripts = headFnContent?.scripts\n        match.styles = headFnContent?.styles\n        match.scripts = scripts\n      } catch (err) {\n        if (isNotFound(err)) {\n          match.error = { isNotFound: true }\n          console.error(\n            `NotFound error during hydration for routeId: ${match.routeId}`,\n            err,\n          )\n        } else {\n          match.error = err as any\n          console.error(\n            `Error during hydration for route ${match.routeId}:`,\n            err,\n          )\n          throw err\n        }\n      }\n    }),\n  )\n\n  const isSpaMode = matches[matches.length - 1]!.id !== lastMatchId\n  const hasSsrFalseMatches = matches.some((m) => m.ssr === false)\n  // all matches have data from the server and we are not in SPA mode so we don't need to kick of router.load()\n  if (!hasSsrFalseMatches && !isSpaMode) {\n    matches.forEach((match) => {\n      // remove the dehydrated flag since we won't run router.load() which would remove it\n      match._nonReactive.dehydrated = undefined\n    })\n    // Mark the current location as resolved so that later load cycles\n    // (e.g. preloads, invalidations) don't mistakenly detect a href change\n    // (resolvedLocation defaults to undefined and router.load() is skipped\n    // in the normal SSR hydration path).\n    router.stores.resolvedLocation.set(router.stores.location.get())\n    return routeChunkPromise\n  }\n\n  // schedule router.load() to run after the next tick so we can store the promise in the match before loading starts\n  const loadPromise = Promise.resolve()\n    .then(() => router.load())\n    .catch((err) => {\n      console.error('Error during router hydration:', err)\n    })\n\n  // in SPA mode we need to keep the first match below the root route pending until router.load() is finished\n  // this will prevent that other pending components are rendered but hydration is not blocked\n  if (isSpaMode) {\n    const match = matches[1]\n    if (!match) {\n      if (process.env.NODE_ENV !== 'production') {\n        throw new Error(\n          'Invariant failed: Expected to find a match below the root match in SPA mode.',\n        )\n      }\n\n      invariant()\n    }\n    setMatchForcePending(match)\n\n    match._displayPending = true\n    match._nonReactive.displayPendingPromise = loadPromise\n\n    loadPromise.then(() => {\n      router.batch(() => {\n        // ensure router is not in status 'pending' anymore\n        // this usually happens in Transitioner but if loading synchronously resolves,\n        // Transitioner won't be rendered while loading so it cannot track the change from loading:true to loading:false\n        if (router.stores.status.get() === 'pending') {\n          router.stores.status.set('idle')\n          router.stores.resolvedLocation.set(router.stores.location.get())\n        }\n        // hide the pending component once the load is finished\n        router.updateMatch(match.id, (prev) => ({\n          ...prev,\n          _displayPending: undefined,\n          displayPendingPromise: undefined,\n        }))\n      })\n    })\n  }\n  return routeChunkPromise\n}\n"],"mappings":"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"}
+{"version":3,"file":"ssr-client.js","names":[],"sources":["../../../src/ssr/ssr-client.ts"],"sourcesContent":["import { invariant } from '../invariant'\nimport { isNotFound } from '../not-found'\nimport { createControlledPromise } from '../utils'\nimport { hydrateSsrMatchId } from './ssr-match-id'\nimport type { GLOBAL_SEROVAL, GLOBAL_TSR } from './constants'\nimport type { DehydratedMatch, TsrSsrGlobal } from './types'\nimport type { AnyRouteMatch } from '../Matches'\nimport type { AnyRouter } from '../router'\nimport type { RouteContextOptions } from '../route'\nimport type { AnySerializationAdapter } from './serializer/transformer'\n\ndeclare global {\n  interface Window {\n    [GLOBAL_TSR]?: TsrSsrGlobal\n    [GLOBAL_SEROVAL]?: any\n  }\n}\n\nfunction hydrateMatch(\n  match: AnyRouteMatch,\n  deyhydratedMatch: DehydratedMatch,\n): void {\n  match.id = deyhydratedMatch.i\n  match.__beforeLoadContext = deyhydratedMatch.b\n  match.loaderData = deyhydratedMatch.l\n  match.status = deyhydratedMatch.s\n  match.ssr = deyhydratedMatch.ssr\n  match.updatedAt = deyhydratedMatch.u\n  match.error = deyhydratedMatch.e\n  // Only hydrate global-not-found when a defined value is present in the\n  // dehydrated payload. If omitted, preserve the value computed from the\n  // current client location (important for SPA fallback HTML served at unknown\n  // URLs, where dehydrated matches may come from `/` but client matching marks\n  // root as globalNotFound).\n  if (deyhydratedMatch.g !== undefined) {\n    match.globalNotFound = deyhydratedMatch.g\n  }\n}\n\nexport async function hydrate(router: AnyRouter): Promise<any> {\n  if (!window.$_TSR) {\n    if (process.env.NODE_ENV !== 'production') {\n      throw new Error(\n        'Invariant failed: Expected to find bootstrap data on window.$_TSR, but we did not. Please file an issue!',\n      )\n    }\n\n    invariant()\n  }\n\n  const serializationAdapters = router.options.serializationAdapters as\n    | Array<AnySerializationAdapter>\n    | undefined\n\n  if (serializationAdapters?.length) {\n    const fromSerializableMap = new Map()\n    serializationAdapters.forEach((adapter) => {\n      fromSerializableMap.set(adapter.key, adapter.fromSerializable)\n    })\n    window.$_TSR.t = fromSerializableMap\n    window.$_TSR.buffer.forEach((script) => script())\n  }\n  window.$_TSR.initialized = true\n\n  if (!window.$_TSR.router) {\n    if (process.env.NODE_ENV !== 'production') {\n      throw new Error(\n        'Invariant failed: Expected to find a dehydrated data on window.$_TSR.router, but we did not. Please file an issue!',\n      )\n    }\n\n    invariant()\n  }\n\n  const dehydratedRouter = window.$_TSR.router\n  dehydratedRouter.matches.forEach((dehydratedMatch) => {\n    dehydratedMatch.i = hydrateSsrMatchId(dehydratedMatch.i)\n  })\n  if (dehydratedRouter.lastMatchId) {\n    dehydratedRouter.lastMatchId = hydrateSsrMatchId(\n      dehydratedRouter.lastMatchId,\n    )\n  }\n  const { manifest, dehydratedData, lastMatchId } = dehydratedRouter\n\n  router.ssr = {\n    manifest,\n  }\n  const meta = document.querySelector('meta[property=\"csp-nonce\"]') as\n    | HTMLMetaElement\n    | undefined\n  const nonce = meta?.content\n  router.options.ssr = {\n    nonce,\n  }\n\n  // Allow the user to handle custom hydration data before matching routes.\n  // This lets hydration install router config that affects matching, e.g. rewrites.\n  await router.options.hydrate?.(dehydratedData)\n\n  // Hydrate the router state\n  const matches = router.matchRoutes(router.stores.location.get())\n\n  // kick off loading the route chunks\n  const routeChunkPromise = Promise.all(\n    matches.map((match) =>\n      router.loadRouteChunk(router.looseRoutesById[match.routeId]!),\n    ),\n  )\n\n  function setMatchForcePending(match: AnyRouteMatch) {\n    // usually the minPendingPromise is created in the Match component if a pending match is rendered\n    // however, this might be too late if the match synchronously resolves\n    const route = router.looseRoutesById[match.routeId]!\n    const pendingMinMs =\n      route.options.pendingMinMs ?? router.options.defaultPendingMinMs\n    if (pendingMinMs) {\n      const minPendingPromise = createControlledPromise<void>()\n      match._nonReactive.minPendingPromise = minPendingPromise\n      match._forcePending = true\n\n      setTimeout(() => {\n        minPendingPromise.resolve()\n        // We've handled the minPendingPromise, so we can delete it\n        router.updateMatch(match.id, (prev) => {\n          prev._nonReactive.minPendingPromise = undefined\n          return {\n            ...prev,\n            _forcePending: undefined,\n          }\n        })\n      }, pendingMinMs)\n    }\n  }\n\n  function setRouteSsr(match: AnyRouteMatch) {\n    const route = router.looseRoutesById[match.routeId]\n    if (route) {\n      route.options.ssr = match.ssr\n    }\n  }\n  // Right after hydration and before the first render, we need to rehydrate each match\n  // First step is to reyhdrate loaderData and __beforeLoadContext\n  let firstNonSsrMatchIndex: number | undefined = undefined\n  matches.forEach((match) => {\n    const dehydratedMatch = dehydratedRouter.matches.find(\n      (d) => d.i === match.id,\n    )\n    if (!dehydratedMatch) {\n      match._nonReactive.dehydrated = false\n      match.ssr = false\n      setRouteSsr(match)\n      return\n    }\n\n    hydrateMatch(match, dehydratedMatch)\n    setRouteSsr(match)\n\n    match._nonReactive.dehydrated = match.ssr !== false\n\n    if (match.ssr === 'data-only' || match.ssr === false) {\n      if (firstNonSsrMatchIndex === undefined) {\n        firstNonSsrMatchIndex = match.index\n        setMatchForcePending(match)\n      }\n    }\n  })\n\n  router.stores.setMatches(matches)\n\n  // now that all necessary data is hydrated:\n  // 1) fully reconstruct the route context\n  // 2) execute `head()` and `scripts()` for each match\n  const activeMatches = router.stores.matches.get()\n  const location = router.stores.location.get()\n  await Promise.all(\n    activeMatches.map(async (match) => {\n      try {\n        const route = router.looseRoutesById[match.routeId]!\n\n        const parentMatch = activeMatches[match.index - 1]\n        const parentContext = parentMatch?.context ?? router.options.context\n\n        // `context()` was already executed by `matchRoutes`, however route context was not yet fully reconstructed\n        // so run it again and merge route context\n        if (route.options.context) {\n          const contextFnContext: RouteContextOptions<any, any, any, any, any> =\n            {\n              deps: match.loaderDeps,\n              params: match.params,\n              context: parentContext ?? {},\n              location,\n              navigate: (opts: any) =>\n                router.navigate({\n                  ...opts,\n                  _fromLocation: location,\n                }),\n              buildLocation: router.buildLocation,\n              cause: match.cause,\n              abortController: match.abortController,\n              preload: false,\n              matches,\n              routeId: route.id,\n            }\n          match.__routeContext =\n            route.options.context(contextFnContext) ?? undefined\n        }\n\n        match.context = {\n          ...parentContext,\n          ...match.__routeContext,\n          ...match.__beforeLoadContext,\n        }\n\n        const assetContext = {\n          ssr: router.options.ssr,\n          matches: activeMatches,\n          match,\n          params: match.params,\n          loaderData: match.loaderData,\n        }\n        const headFnContent = await route.options.head?.(assetContext)\n\n        const scripts = await route.options.scripts?.(assetContext)\n\n        match.meta = headFnContent?.meta\n        match.links = headFnContent?.links\n        match.headScripts = headFnContent?.scripts\n        match.styles = headFnContent?.styles\n        match.scripts = scripts\n      } catch (err) {\n        if (isNotFound(err)) {\n          match.error = { isNotFound: true }\n          console.error(\n            `NotFound error during hydration for routeId: ${match.routeId}`,\n            err,\n          )\n        } else {\n          match.error = err as any\n          console.error(\n            `Error during hydration for route ${match.routeId}:`,\n            err,\n          )\n          throw err\n        }\n      }\n    }),\n  )\n\n  const isSpaMode = matches[matches.length - 1]!.id !== lastMatchId\n  const hasSsrFalseMatches = matches.some((m) => m.ssr === false)\n  // all matches have data from the server and we are not in SPA mode so we don't need to kick of router.load()\n  if (!hasSsrFalseMatches && !isSpaMode) {\n    matches.forEach((match) => {\n      // remove the dehydrated flag since we won't run router.load() which would remove it\n      match._nonReactive.dehydrated = undefined\n    })\n    // Mark the current location as resolved so that later load cycles\n    // (e.g. preloads, invalidations) don't mistakenly detect a href change\n    // (resolvedLocation defaults to undefined and router.load() is skipped\n    // in the normal SSR hydration path).\n    router.stores.resolvedLocation.set(router.stores.location.get())\n    return routeChunkPromise\n  }\n\n  // schedule router.load() to run after the next tick so we can store the promise in the match before loading starts\n  const loadPromise = Promise.resolve()\n    .then(() => router.load())\n    .catch((err) => {\n      console.error('Error during router hydration:', err)\n    })\n\n  // in SPA mode we need to keep the first match below the root route pending until router.load() is finished\n  // this will prevent that other pending components are rendered but hydration is not blocked\n  if (isSpaMode) {\n    const match = matches[1]\n    if (!match) {\n      if (process.env.NODE_ENV !== 'production') {\n        throw new Error(\n          'Invariant failed: Expected to find a match below the root match in SPA mode.',\n        )\n      }\n\n      invariant()\n    }\n    setMatchForcePending(match)\n\n    match._displayPending = true\n    match._nonReactive.displayPendingPromise = loadPromise\n\n    loadPromise.then(() => {\n      router.batch(() => {\n        // ensure router is not in status 'pending' anymore\n        // this usually happens in Transitioner but if loading synchronously resolves,\n        // Transitioner won't be rendered while loading so it cannot track the change from loading:true to loading:false\n        if (router.stores.status.get() === 'pending') {\n          router.stores.status.set('idle')\n          router.stores.resolvedLocation.set(router.stores.location.get())\n        }\n        // hide the pending component once the load is finished\n        router.updateMatch(match.id, (prev) => ({\n          ...prev,\n          _displayPending: undefined,\n          displayPendingPromise: undefined,\n        }))\n      })\n    })\n  }\n  return routeChunkPromise\n}\n"],"mappings":"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"}

package/dist/esm/ssr/ssr-match-id.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-match-id.js","names":[],"sources":["../../../src/ssr/ssr-match-id.ts"],"sourcesContent":["export function dehydrateSsrMatchId(id: string): string {\n  return id.replaceAll('/', '\\0')\n}\n\nexport function hydrateSsrMatchId(id: string): string {\n  return id.replaceAll('\\0', '/').replaceAll('\\uFFFD', '/')\n}\n"],"mappings":";AAAA,SAAgB,oBAAoB,IAAoB;AACtD,QAAO,GAAG,WAAW,KAAK,KAAK;;AAGjC,SAAgB,kBAAkB,IAAoB;AACpD,QAAO,GAAG,WAAW,MAAM,IAAI,CAAC,WAAW,KAAU,IAAI"}
+{"version":3,"file":"ssr-match-id.js","names":[],"sources":["../../../src/ssr/ssr-match-id.ts"],"sourcesContent":["export function dehydrateSsrMatchId(id: string): string {\n  return id.replaceAll('/', '\\0')\n}\n\nexport function hydrateSsrMatchId(id: string): string {\n  return id.replaceAll('\\0', '/').replaceAll('\\uFFFD', '/')\n}\n"],"mappings":";AAAA,SAAgB,oBAAoB,IAAoB;CACtD,OAAO,GAAG,WAAW,KAAK,IAAI;AAChC;AAEA,SAAgB,kBAAkB,IAAoB;CACpD,OAAO,GAAG,WAAW,MAAM,GAAG,EAAE,WAAW,KAAU,GAAG;AAC1D"}

package/dist/esm/ssr/ssr-server.d.ts

@@ -1,27 +1,12 @@
 import { DehydratedMatch } from './types.js';
 import { AnyRouter } from '../router.js';
 import { AnyRouteMatch } from '../Matches.js';
-import { Manifest, RouterManagedTag } from '../manifest.js';
-declare module '../router' {
-    interface ServerSsr {
-        setRenderFinished: () => void;
-        cleanup: () => void;
-    }
-    interface RouterEvents {
-        onInjectedHtml: {
-            type: 'onInjectedHtml';
-        };
-        onSerializationFinished: {
-            type: 'onSerializationFinished';
-        };
-    }
-}
+import { ManifestRouteAssets, ServerManifest } from '../manifest.js';
 export declare function dehydrateMatch(match: AnyRouteMatch): DehydratedMatch;
-export declare function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includeUnmatchedRouteAssets, }: {
+export declare function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, }: {
     router: AnyRouter;
-    manifest: Manifest | undefined;
-    getRequestAssets?: () => Array<RouterManagedTag> | undefined;
-    includeUnmatchedRouteAssets?: boolean;
+    manifest: ServerManifest | undefined;
+    getRequestAssets?: () => ManifestRouteAssets | undefined;
 }): void;
 /**
  * Get the origin for the request.

package/dist/esm/ssr/ssr-server.js

@@ -2,7 +2,7 @@ import { decodePath } from "../utils.js";
 import { invariant } from "../invariant.js";
 import { createLRUCache } from "../lru-cache.js";
 import { rootRouteId } from "../root.js";
-import { createInlineCssPlaceholderAsset, createInlineCssStyleAsset, getStylesheetHref, isInlinableStylesheet } from "../manifest.js";
+import { createInlineCssPlaceholderAsset, createInlineCssStyleAsset, getStylesheetHref } from "../manifest.js";
 import { GLOBAL_TSR, TSR_SCRIPT_BARRIER_ID } from "./constants.js";
 import { makeSsrSerovalPlugin } from "./serializer/transformer.js";
 import { defaultSerovalPlugins } from "./serializer/seroval-plugins.js";
@@ -31,38 +31,42 @@ function dehydrateMatch(match) {
 }
 const INITIAL_SCRIPTS = [getCrossReferenceHeader(SCOPE_ID), tsrScript_default];
 var ScriptBuffer = class {
-	constructor(router) {
+	constructor(injectScript) {
 		this._scriptBarrierLifted = false;
 		this._cleanedUp = false;
-		this._pendingMicrotask = false;
-		this.router = router;
+		this._microtaskVersion = 0;
+		this._pendingMicrotaskVersion = 0;
+		this.injectScript = injectScript;
 		this._queue = INITIAL_SCRIPTS.slice();
 	}
 	enqueue(script) {
 		if (this._cleanedUp) return;
 		this._queue.push(script);
-		if (this._scriptBarrierLifted && !this._pendingMicrotask) {
-			this._pendingMicrotask = true;
-			queueMicrotask(() => {
-				this._pendingMicrotask = false;
-				this.injectBufferedScripts();
-			});
-		}
+		if (this._scriptBarrierLifted) this.scheduleInjectBufferedScripts();
 	}
 	liftBarrier() {
 		if (this._scriptBarrierLifted || this._cleanedUp) return;
 		this._scriptBarrierLifted = true;
-		if (this._queue.length > 0 && !this._pendingMicrotask) {
-			this._pendingMicrotask = true;
-			queueMicrotask(() => {
-				this._pendingMicrotask = false;
-				this.injectBufferedScripts();
-			});
-		}
+		if (this._queue.length > 0) this.scheduleInjectBufferedScripts();
+	}
+	scheduleInjectBufferedScripts() {
+		if (this._pendingMicrotaskVersion !== 0) return;
+		const pendingVersion = ++this._microtaskVersion;
+		this._pendingMicrotaskVersion = pendingVersion;
+		queueMicrotask(() => {
+			if (this._pendingMicrotaskVersion !== pendingVersion) return;
+			this._pendingMicrotaskVersion = 0;
+			this.injectBufferedScripts();
+		});
+	}
+	clearPendingMicrotask() {
+		if (this._pendingMicrotaskVersion === 0) return;
+		this._pendingMicrotaskVersion = 0;
+		this._microtaskVersion++;
 	}
 	/**
 	* Flushes any pending scripts synchronously.
-	* Call this before emitting onSerializationFinished to ensure all scripts are injected.
+	* Call this before signaling serialization finished to ensure all scripts are injected.
 	*
 	* IMPORTANT: Only injects if the barrier has been lifted. Before the barrier is lifted,
 	* scripts should remain in the queue so takeBufferedScripts() can retrieve them
@@ -70,33 +74,38 @@ var ScriptBuffer = class {
 	flush() {
 		if (!this._scriptBarrierLifted) return;
 		if (this._cleanedUp) return;
-		this._pendingMicrotask = false;
-		const scriptsToInject = this.takeAll();
-		if (scriptsToInject && this.router?.serverSsr) this.router.serverSsr.injectScript(scriptsToInject);
+		this.clearPendingMicrotask();
+		this.injectBufferedScripts();
 	}
 	takeAll() {
-		const bufferedScripts = this._queue;
-		this._queue = [];
+		return this.takeScripts(this._queue.length);
+	}
+	takeScripts(count) {
+		if (count <= 0) return void 0;
+		const bufferedScripts = this._queue.splice(0, count);
 		if (bufferedScripts.length === 0) return;
 		if (bufferedScripts.length === 1) return bufferedScripts[0] + ";document.currentScript.remove()";
 		return bufferedScripts.join(";") + ";document.currentScript.remove()";
 	}
+	hasPending() {
+		return this._queue.length > 0;
+	}
 	injectBufferedScripts() {
 		if (this._cleanedUp) return;
 		if (this._queue.length === 0) return;
 		const scriptsToInject = this.takeAll();
-		if (scriptsToInject && this.router?.serverSsr) this.router.serverSsr.injectScript(scriptsToInject);
+		if (scriptsToInject) this.injectScript?.(scriptsToInject);
 	}
 	cleanup() {
 		this._cleanedUp = true;
+		this.clearPendingMicrotask();
 		this._queue = [];
-		this.router = void 0;
+		this.injectScript = void 0;
 	}
 };
 const isProd = process.env.NODE_ENV === "production";
 const MANIFEST_CACHE_SIZE = 100;
 const manifestCaches = /* @__PURE__ */ new WeakMap();
-const inlineCssCaches = /* @__PURE__ */ new WeakMap();
 function getManifestCache(manifest) {
 	const cache = manifestCaches.get(manifest);
 	if (cache) return cache;
@@ -104,102 +113,178 @@ function getManifestCache(manifest) {
 	manifestCaches.set(manifest, newCache);
 	return newCache;
 }
-function getInlineCssCache(manifest) {
-	const cache = inlineCssCaches.get(manifest);
-	if (cache) return cache;
-	const newCache = createLRUCache(MANIFEST_CACHE_SIZE);
-	inlineCssCaches.set(manifest, newCache);
-	return newCache;
+function getInlineCssForPreparedRoutes(manifest, preparedRoutes) {
+	if (preparedRoutes.inlineCss !== void 0) return preparedRoutes.inlineCss;
+	const styles = manifest.inlineCss?.styles;
+	const hrefs = preparedRoutes.inlineCssHrefs;
+	if (!styles || !hrefs?.length) return void 0;
+	let css = "";
+	for (const href of hrefs) css += styles[href];
+	preparedRoutes.inlineCss = css;
+	return css;
 }
-function getInlineCssHrefsForMatches(manifest, matches) {
-	const styles = manifest?.inlineCss?.styles;
-	if (!styles) return [];
-	const seen = /* @__PURE__ */ new Set();
-	const hrefs = [];
-	for (const match of matches) {
-		const assets = manifest?.routes[match.routeId]?.assets ?? [];
-		for (const asset of assets) {
-			const href = getStylesheetHref(asset);
-			if (!href || seen.has(href) || styles[href] === void 0) continue;
-			seen.add(href);
-			hrefs.push(href);
-		}
-	}
-	return hrefs;
+function getInlineCssAssetForPreparedRoutes(manifest, preparedRoutes) {
+	const css = getInlineCssForPreparedRoutes(manifest, preparedRoutes);
+	return css === void 0 ? void 0 : createInlineCssStyleAsset(css);
 }
-function getInlineCssForHrefs(manifest, hrefs) {
-	const styles = manifest.inlineCss?.styles;
-	if (!styles || hrefs.length === 0) return void 0;
-	const cacheKey = hrefs.join("\0");
+function getMatchedRoutesCacheKey(matches) {
+	let cacheKey = "";
+	for (let i = 0; i < matches.length; i++) cacheKey += (i === 0 ? "" : "\0") + matches[i].routeId;
+	return cacheKey;
+}
+function getPreparedMatchedManifestRoutes(manifest, matches, cacheKey) {
 	if (isProd) {
-		const cached = getInlineCssCache(manifest).get(cacheKey);
-		if (cached !== void 0) return cached;
+		const cached = getManifestCache(manifest).get(cacheKey);
+		if (cached) return cached;
 	}
-	const css = hrefs.map((href) => styles[href]).join("");
-	if (isProd) getInlineCssCache(manifest).set(cacheKey, css);
-	return css;
+	const preparedRoutes = prepareMatchedManifestRoutes(manifest, matches);
+	if (isProd) getManifestCache(manifest).set(cacheKey, preparedRoutes);
+	return preparedRoutes;
 }
-function getInlineCssAssetForMatches(manifest, matches) {
-	if (!manifest?.inlineCss) return void 0;
-	const css = getInlineCssForHrefs(manifest, getInlineCssHrefsForMatches(manifest, matches));
-	return css === void 0 ? void 0 : createInlineCssStyleAsset(css);
+function prepareMatchedManifestRoutes(manifest, matches) {
+	const inlineStyles = manifest.inlineCss?.styles;
+	const routes = {};
+	if (!inlineStyles) {
+		for (const match of matches) {
+			const route = manifest.routes[match.routeId];
+			if (route) routes[match.routeId] = route;
+		}
+		return {
+			routes,
+			hasStrippedRoutes: false
+		};
+	}
+	const inlineCssHrefs = [];
+	const seenInlineCssHrefs = /* @__PURE__ */ new Set();
+	let hasStrippedRoutes = false;
+	for (const match of matches) {
+		const routeId = match.routeId;
+		const route = manifest.routes[routeId];
+		if (!route) continue;
+		const nextRoute = stripInlinedStylesheetAssetsFromRoute(inlineStyles, route, inlineCssHrefs, seenInlineCssHrefs);
+		if (nextRoute !== route) hasStrippedRoutes = true;
+		routes[routeId] = nextRoute;
+	}
+	return {
+		routes,
+		hasStrippedRoutes,
+		...inlineCssHrefs.length ? { inlineCssHrefs } : {}
+	};
 }
-function stripInlinedStylesheetAssets(manifest, routes, matches) {
-	if (!manifest.inlineCss) return routes;
-	const nextRoutes = {};
-	for (const [routeId, route] of Object.entries(routes)) {
-		const assets = route.assets?.filter((asset) => !isInlinableStylesheet(manifest, asset));
+function stripInlinedStylesheetAssetsFromRoute(inlineStyles, route, inlineCssHrefs, seenInlineCssHrefs) {
+	const css = route.css;
+	if (!css) return route;
+	if (css.length === 0) {
 		const nextRoute = { ...route };
-		if (assets) if (assets.length > 0) nextRoute.assets = assets;
-		else delete nextRoute.assets;
-		nextRoutes[routeId] = nextRoute;
+		delete nextRoute.css;
+		return nextRoute;
 	}
-	if (getInlineCssAssetForMatches(manifest, matches)) {
-		const rootRoute = nextRoutes["__root__"] ?? {};
-		nextRoutes[rootRouteId] = {
-			...rootRoute,
-			assets: [createInlineCssPlaceholderAsset(), ...rootRoute.assets ?? []]
-		};
+	let cssLinks;
+	for (let i = 0; i < css.length; i++) {
+		const link = css[i];
+		const href = getStylesheetHref(link);
+		if (inlineStyles[href] === void 0) {
+			if (cssLinks) cssLinks.push(link);
+			continue;
+		}
+		if (!seenInlineCssHrefs.has(href)) {
+			seenInlineCssHrefs.add(href);
+			inlineCssHrefs.push(href);
+		}
+		if (!cssLinks) cssLinks = css.slice(0, i);
 	}
-	return nextRoutes;
+	if (!cssLinks) return route;
+	if (cssLinks.length > 0) return {
+		...route,
+		css: cssLinks
+	};
+	const nextRoute = { ...route };
+	delete nextRoute.css;
+	return nextRoute;
 }
-function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includeUnmatchedRouteAssets = true }) {
+function hasRouteAssets(route) {
+	return !!route.scripts?.length || !!route.css?.length;
+}
+function hasRequestAssets(assets) {
+	return !!assets && (!!assets.preloads?.length || hasRouteAssets(assets));
+}
+function mergeRequestAssetsIntoRootRoute(rootRoute, requestAssets) {
+	const preloads = requestAssets?.preloads?.length ? [...requestAssets.preloads, ...rootRoute?.preloads ?? []] : rootRoute?.preloads;
+	const scripts = requestAssets?.scripts?.length ? [...requestAssets.scripts, ...rootRoute?.scripts ?? []] : rootRoute?.scripts;
+	const cssLinks = requestAssets?.css?.length ? [...requestAssets.css, ...rootRoute?.css ?? []] : rootRoute?.css;
+	return {
+		...rootRoute ?? {},
+		...preloads?.length ? { preloads } : {},
+		...scripts?.length ? { scripts } : {},
+		...cssLinks?.length ? { css: cssLinks } : {}
+	};
+}
+function attachRouterServerSsrUtils({ router, manifest, getRequestAssets }) {
 	router.ssr = { get manifest() {
 		if (!manifest) return manifest;
 		const requestAssets = getRequestAssets?.();
-		const inlineCssAsset = getInlineCssAssetForMatches(manifest, router.stores.matches.get());
-		if (!requestAssets?.length && !inlineCssAsset) return manifest;
+		const matches = router.stores.matches.get();
+		const hasAssets = hasRequestAssets(requestAssets);
+		if (!hasAssets && !manifest.inlineCss) return manifest;
+		let inlineCssAsset;
+		let routes = manifest.routes;
+		if (manifest.inlineCss) {
+			const preparedManifest = getPreparedMatchedManifestRoutes(manifest, matches, getMatchedRoutesCacheKey(matches));
+			inlineCssAsset = getInlineCssAssetForPreparedRoutes(manifest, preparedManifest);
+			if (preparedManifest.hasStrippedRoutes) routes = {
+				...manifest.routes,
+				...preparedManifest.routes
+			};
+		}
+		if (!hasAssets) return {
+			...manifest.scriptFormat ? { scriptFormat: manifest.scriptFormat } : {},
+			...inlineCssAsset ? { inlineStyle: inlineCssAsset } : {},
+			routes
+		};
+		const rootRoute = routes[rootRouteId];
 		return {
-			...manifest,
+			...manifest.scriptFormat ? { scriptFormat: manifest.scriptFormat } : {},
+			...inlineCssAsset ? { inlineStyle: inlineCssAsset } : {},
 			routes: {
-				...manifest.routes,
-				[rootRouteId]: {
-					...manifest.routes[rootRouteId],
-					assets: [
-						...requestAssets ?? [],
-						...inlineCssAsset ? [inlineCssAsset] : [],
-						...manifest.routes["__root__"]?.assets ?? []
-					]
-				}
+				...routes,
+				[rootRouteId]: mergeRequestAssetsIntoRootRoute(rootRoute, requestAssets)
 			}
 		};
 	} };
 	let _dehydrated = false;
 	let _serializationFinished = false;
+	let streamFastPathReserved = false;
 	const renderFinishedListeners = [];
+	const injectedHtmlListeners = [];
 	const serializationFinishedListeners = [];
-	const scriptBuffer = new ScriptBuffer(router);
+	const cleanupListeners = [];
+	let cleanupStarted = false;
 	let injectedHtmlBuffer = "";
-	router.serverSsr = {
+	const callListeners = (listeners, errorPrefix) => {
+		const snapshot = listeners.slice();
+		for (const l of snapshot) try {
+			l();
+		} catch (err) {
+			console.error(`${errorPrefix}:`, err);
+		}
+	};
+	const removeListener = (listeners, listener) => {
+		const index = listeners.indexOf(listener);
+		if (index >= 0) listeners.splice(index, 1);
+	};
+	const scriptBuffer = new ScriptBuffer((script) => {
+		serverSsr.injectScript(script);
+	});
+	const serverSsr = {
 		injectHtml: (html) => {
-			if (!html) return;
+			if (!html || cleanupStarted) return;
 			injectedHtmlBuffer += html;
-			router.emit({ type: "onInjectedHtml" });
+			callListeners(injectedHtmlListeners, "SSR injected HTML listener error");
 		},
 		injectScript: (script) => {
-			if (!script) return;
+			if (!script || cleanupStarted) return;
 			const html = `<script${router.options.ssr?.nonce ? ` nonce='${router.options.ssr.nonce}'` : ""}>${script}<\/script>`;
-			router.serverSsr.injectHtml(html);
+			serverSsr.injectHtml(html);
 		},
 		dehydrate: async (opts) => {
 			if (_dehydrated) {
@@ -211,27 +296,19 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 			const matches = matchesToDehydrate.map(dehydrateMatch);
 			let manifestToDehydrate = void 0;
 			if (manifest) {
-				const currentRouteIdsList = matchesToDehydrate.map((m) => m.routeId);
-				const manifestCacheKey = `${currentRouteIdsList.join("\0")}\0includeUnmatchedRouteAssets=${includeUnmatchedRouteAssets}`;
-				let filteredRoutes;
-				if (isProd) filteredRoutes = getManifestCache(manifest).get(manifestCacheKey);
-				if (!filteredRoutes) {
-					const currentRouteIds = new Set(currentRouteIdsList);
-					const nextFilteredRoutes = {};
-					for (const routeId in manifest.routes) {
-						const routeManifest = manifest.routes[routeId];
-						if (currentRouteIds.has(routeId)) nextFilteredRoutes[routeId] = routeManifest;
-						else if (includeUnmatchedRouteAssets && routeManifest.assets && routeManifest.assets.length > 0) nextFilteredRoutes[routeId] = { assets: routeManifest.assets };
-					}
-					filteredRoutes = stripInlinedStylesheetAssets(manifest, nextFilteredRoutes, matchesToDehydrate);
-					if (isProd) getManifestCache(manifest).set(manifestCacheKey, filteredRoutes);
-				}
-				manifestToDehydrate = { routes: { ...filteredRoutes } };
-				if (opts?.requestAssets?.length) {
+				const cacheKey = getMatchedRoutesCacheKey(matchesToDehydrate);
+				const preparedManifest = getPreparedMatchedManifestRoutes(manifest, matchesToDehydrate, cacheKey);
+				manifestToDehydrate = {
+					...manifest.scriptFormat ? { scriptFormat: manifest.scriptFormat } : {},
+					...preparedManifest.inlineCssHrefs ? { inlineStyle: createInlineCssPlaceholderAsset() } : {},
+					routes: preparedManifest.routes
+				};
+				const requestAssets = opts?.requestAssets;
+				if (hasRequestAssets(requestAssets)) {
 					const existingRoot = manifestToDehydrate.routes[rootRouteId];
-					manifestToDehydrate.routes[rootRouteId] = {
-						...existingRoot,
-						assets: [...opts.requestAssets, ...existingRoot?.assets ?? []]
+					manifestToDehydrate.routes = {
+						...manifestToDehydrate.routes,
+						[rootRouteId]: mergeRequestAssetsIntoRootRoute(existingRoot, requestAssets)
 					};
 				}
 			}
@@ -247,18 +324,25 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 			const trackPlugins = { didRun: false };
 			const serializationAdapters = router.options.serializationAdapters;
 			const plugins = serializationAdapters ? serializationAdapters.map((t) => /* @__PURE__ */ makeSsrSerovalPlugin(t, trackPlugins)).concat(defaultSerovalPlugins) : defaultSerovalPlugins;
+			let serializationCompleteSignaled = false;
 			const signalSerializationComplete = () => {
+				if (serializationCompleteSignaled || cleanupStarted) return;
+				serializationCompleteSignaled = true;
 				_serializationFinished = true;
-				try {
-					serializationFinishedListeners.forEach((l) => l());
-					router.emit({ type: "onSerializationFinished" });
+				const listeners = serializationFinishedListeners.slice();
+				serializationFinishedListeners.length = 0;
+				for (const l of listeners) try {
+					l();
 				} catch (err) {
 					console.error("Serialization listener error:", err);
-				} finally {
-					serializationFinishedListeners.length = 0;
-					renderFinishedListeners.length = 0;
 				}
 			};
+			const finishScriptSerialization = () => {
+				if (serializationCompleteSignaled || cleanupStarted) return;
+				scriptBuffer.enqueue(GLOBAL_TSR + ".e()");
+				scriptBuffer.flush();
+				signalSerializationComplete();
+			};
 			crossSerializeStream(dehydratedRouter, {
 				refs: /* @__PURE__ */ new Map(),
 				plugins,
@@ -270,13 +354,11 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 				onError: (err) => {
 					console.error("Serialization error:", err);
 					if (err && err.stack) console.error(err.stack);
-					signalSerializationComplete();
+					finishScriptSerialization();
 				},
 				scopeId: SCOPE_ID,
 				onDone: () => {
-					scriptBuffer.enqueue(GLOBAL_TSR + ".e()");
-					scriptBuffer.flush();
-					signalSerializationComplete();
+					finishScriptSerialization();
 				}
 			});
 		},
@@ -286,20 +368,54 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 		isSerializationFinished() {
 			return _serializationFinished;
 		},
-		onRenderFinished: (listener) => renderFinishedListeners.push(listener),
-		onSerializationFinished: (listener) => serializationFinishedListeners.push(listener),
+		reserveStreamFastPath() {
+			if (!cleanupStarted && _serializationFinished && !streamFastPathReserved && renderFinishedListeners.length === 0 && !injectedHtmlBuffer && !scriptBuffer.hasPending()) {
+				streamFastPathReserved = true;
+				return true;
+			}
+			return false;
+		},
+		onInjectedHtml: (listener) => {
+			if (cleanupStarted) return () => {};
+			injectedHtmlListeners.push(listener);
+			return () => removeListener(injectedHtmlListeners, listener);
+		},
+		onRenderFinished: (listener) => {
+			if (cleanupStarted || streamFastPathReserved) return;
+			renderFinishedListeners.push(listener);
+		},
+		onSerializationFinished: (listener) => {
+			if (cleanupStarted) return () => {};
+			if (_serializationFinished && !cleanupStarted) {
+				try {
+					listener();
+				} catch (err) {
+					console.error("Serialization listener error:", err);
+				}
+				return () => {};
+			}
+			serializationFinishedListeners.push(listener);
+			return () => removeListener(serializationFinishedListeners, listener);
+		},
+		onCleanup: (listener) => {
+			if (cleanupStarted) return;
+			cleanupListeners.push(listener);
+		},
 		setRenderFinished: () => {
-			try {
-				renderFinishedListeners.forEach((l) => l());
+			if (cleanupStarted) return;
+			scriptBuffer.liftBarrier();
+			const listeners = renderFinishedListeners.slice();
+			renderFinishedListeners.length = 0;
+			for (const l of listeners) try {
+				l();
 			} catch (err) {
 				console.error("Error in render finished listener:", err);
-			} finally {
-				renderFinishedListeners.length = 0;
 			}
-			scriptBuffer.liftBarrier();
+			if (_serializationFinished) scriptBuffer.flush();
 		},
 		takeBufferedScripts() {
 			const scripts = scriptBuffer.takeAll();
+			if (!scripts) return void 0;
 			return {
 				tag: "script",
 				attrs: {
@@ -320,14 +436,29 @@ function attachRouterServerSsrUtils({ router, manifest, getRequestAssets, includ
 			return buffered;
 		},
 		cleanup() {
-			if (!router.serverSsr) return;
+			if (cleanupStarted) return;
+			cleanupStarted = true;
+			const listeners = cleanupListeners.slice();
+			cleanupListeners.length = 0;
+			for (const l of listeners) try {
+				l();
+			} catch (err) {
+				console.error("Error in SSR cleanup listener:", err);
+			}
 			renderFinishedListeners.length = 0;
+			injectedHtmlListeners.length = 0;
 			serializationFinishedListeners.length = 0;
 			injectedHtmlBuffer = "";
 			scriptBuffer.cleanup();
 			router.serverSsr = void 0;
 		}
 	};
+	router.serverSsr = serverSsr;
+	for (const listener of router.serverSsrLifecycle?.onServerSsrAttach ?? []) try {
+		listener(serverSsr);
+	} catch (err) {
+		console.error("SSR attach listener error:", err);
+	}
 }
 /**
 * Get the origin for the request.