@tanstack/start-client-core 1.121.0-alpha.27 → 1.121.0-alpha.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (73) hide show
  1. package/dist/esm/createIsomorphicFn.js +6 -1
  2. package/dist/esm/createIsomorphicFn.js.map +1 -1
  3. package/dist/esm/createMiddleware.d.ts +8 -7
  4. package/dist/esm/createMiddleware.js.map +1 -1
  5. package/dist/esm/createServerFn.d.ts +7 -32
  6. package/dist/esm/createServerFn.js +15 -147
  7. package/dist/esm/createServerFn.js.map +1 -1
  8. package/dist/esm/envOnly.js.map +1 -1
  9. package/dist/esm/index.d.ts +6 -6
  10. package/dist/esm/index.js +2 -5
  11. package/dist/esm/index.js.map +1 -1
  12. package/dist/esm/registerGlobalMiddleware.js.map +1 -1
  13. package/dist/esm/serializer.d.ts +22 -1
  14. package/dist/esm/serializer.js.map +1 -1
  15. package/package.json +3 -6
  16. package/src/createIsomorphicFn.ts +6 -1
  17. package/src/createMiddleware.ts +11 -10
  18. package/src/createServerFn.ts +28 -328
  19. package/src/index.tsx +19 -19
  20. package/src/serializer.ts +32 -3
  21. package/src/tests/createServerFn.test-d.ts +0 -6
  22. package/src/tests/{transformer.test.tsx → serializer.test.tsx} +36 -32
  23. package/dist/cjs/createIsomorphicFn.cjs +0 -7
  24. package/dist/cjs/createIsomorphicFn.cjs.map +0 -1
  25. package/dist/cjs/createIsomorphicFn.d.cts +0 -12
  26. package/dist/cjs/createMiddleware.cjs +0 -37
  27. package/dist/cjs/createMiddleware.cjs.map +0 -1
  28. package/dist/cjs/createMiddleware.d.cts +0 -175
  29. package/dist/cjs/createServerFn.cjs +0 -378
  30. package/dist/cjs/createServerFn.cjs.map +0 -1
  31. package/dist/cjs/createServerFn.d.cts +0 -159
  32. package/dist/cjs/envOnly.cjs +0 -7
  33. package/dist/cjs/envOnly.cjs.map +0 -1
  34. package/dist/cjs/envOnly.d.cts +0 -4
  35. package/dist/cjs/headers.cjs +0 -30
  36. package/dist/cjs/headers.cjs.map +0 -1
  37. package/dist/cjs/headers.d.cts +0 -5
  38. package/dist/cjs/index.cjs +0 -33
  39. package/dist/cjs/index.cjs.map +0 -1
  40. package/dist/cjs/index.d.cts +0 -11
  41. package/dist/cjs/json.cjs +0 -14
  42. package/dist/cjs/json.cjs.map +0 -1
  43. package/dist/cjs/json.d.cts +0 -2
  44. package/dist/cjs/registerGlobalMiddleware.cjs +0 -9
  45. package/dist/cjs/registerGlobalMiddleware.cjs.map +0 -1
  46. package/dist/cjs/registerGlobalMiddleware.d.cts +0 -5
  47. package/dist/cjs/serializer.cjs +0 -152
  48. package/dist/cjs/serializer.cjs.map +0 -1
  49. package/dist/cjs/serializer.d.cts +0 -2
  50. package/dist/cjs/ssr-client.cjs +0 -131
  51. package/dist/cjs/ssr-client.cjs.map +0 -1
  52. package/dist/cjs/ssr-client.d.cts +0 -65
  53. package/dist/cjs/tests/createServerFn.test-d.d.cts +0 -1
  54. package/dist/cjs/tests/createServerMiddleware.test-d.d.cts +0 -1
  55. package/dist/cjs/tests/envOnly.test-d.d.cts +0 -1
  56. package/dist/cjs/tests/json.test.d.cts +0 -1
  57. package/dist/cjs/tests/transformer.test.d.cts +0 -1
  58. package/dist/esm/headers.d.ts +0 -5
  59. package/dist/esm/headers.js +0 -30
  60. package/dist/esm/headers.js.map +0 -1
  61. package/dist/esm/json.d.ts +0 -2
  62. package/dist/esm/json.js +0 -14
  63. package/dist/esm/json.js.map +0 -1
  64. package/dist/esm/ssr-client.d.ts +0 -65
  65. package/dist/esm/ssr-client.js +0 -131
  66. package/dist/esm/ssr-client.js.map +0 -1
  67. package/dist/esm/tests/json.test.d.ts +0 -1
  68. package/dist/esm/tests/transformer.test.d.ts +0 -1
  69. package/src/headers.ts +0 -50
  70. package/src/json.ts +0 -15
  71. package/src/ssr-client.tsx +0 -249
  72. package/src/tests/json.test.ts +0 -37
  73. /package/dist/{cjs/tests/createIsomorphicFn.test-d.d.cts → esm/tests/serializer.test.d.ts} +0 -0
@@ -1,65 +0,0 @@
1
- import { AnyRouter, ControllablePromise, DeferredPromiseState, MakeRouteMatch, Manifest } from '@tanstack/router-core';
2
- declare global {
3
- interface Window {
4
- __TSR_SSR__?: StartSsrGlobal;
5
- }
6
- }
7
- export interface StartSsrGlobal {
8
- matches: Array<SsrMatch>;
9
- streamedValues: Record<string, {
10
- value: any;
11
- parsed: any;
12
- }>;
13
- cleanScripts: () => void;
14
- dehydrated?: any;
15
- initMatch: (match: SsrMatch) => void;
16
- resolvePromise: (opts: {
17
- matchId: string;
18
- id: number;
19
- promiseState: DeferredPromiseState<any>;
20
- }) => void;
21
- injectChunk: (opts: {
22
- matchId: string;
23
- id: number;
24
- chunk: string;
25
- }) => void;
26
- closeStream: (opts: {
27
- matchId: string;
28
- id: number;
29
- }) => void;
30
- }
31
- export interface SsrMatch {
32
- id: string;
33
- __beforeLoadContext: string;
34
- loaderData?: string;
35
- error?: string;
36
- extracted?: Array<ClientExtractedEntry>;
37
- updatedAt: MakeRouteMatch['updatedAt'];
38
- status: MakeRouteMatch['status'];
39
- }
40
- export type ClientExtractedEntry = ClientExtractedStream | ClientExtractedPromise;
41
- export interface ClientExtractedPromise extends ClientExtractedBaseEntry {
42
- type: 'promise';
43
- value?: ControllablePromise<any>;
44
- }
45
- export interface ClientExtractedStream extends ClientExtractedBaseEntry {
46
- type: 'stream';
47
- value?: ReadableStream & {
48
- controller?: ReadableStreamDefaultController;
49
- };
50
- }
51
- export interface ClientExtractedBaseEntry {
52
- type: string;
53
- path: Array<string>;
54
- }
55
- export interface ResolvePromiseState {
56
- matchId: string;
57
- id: number;
58
- promiseState: DeferredPromiseState<any>;
59
- }
60
- export interface DehydratedRouter {
61
- manifest: Manifest | undefined;
62
- dehydratedData: any;
63
- lastMatchId: string;
64
- }
65
- export declare function hydrate(router: AnyRouter): Promise<any>;
@@ -1,131 +0,0 @@
1
- import { isPlainObject } from "@tanstack/router-core";
2
- import invariant from "tiny-invariant";
3
- import { startSerializer } from "./serializer.js";
4
- async function hydrate(router) {
5
- var _a, _b, _c;
6
- invariant(
7
- (_a = window.__TSR_SSR__) == null ? void 0 : _a.dehydrated,
8
- "Expected to find a dehydrated data on window.__TSR_SSR__.dehydrated... but we did not. Please file an issue!"
9
- );
10
- const { manifest, dehydratedData, lastMatchId } = startSerializer.parse(
11
- window.__TSR_SSR__.dehydrated
12
- );
13
- router.ssr = {
14
- manifest,
15
- serializer: startSerializer
16
- };
17
- router.clientSsr = {
18
- getStreamedValue: (key) => {
19
- var _a2;
20
- if (router.isServer) {
21
- return void 0;
22
- }
23
- const streamedValue = (_a2 = window.__TSR_SSR__) == null ? void 0 : _a2.streamedValues[key];
24
- if (!streamedValue) {
25
- return;
26
- }
27
- if (!streamedValue.parsed) {
28
- streamedValue.parsed = router.ssr.serializer.parse(streamedValue.value);
29
- }
30
- return streamedValue.parsed;
31
- }
32
- };
33
- const matches = router.matchRoutes(router.state.location);
34
- const routeChunkPromise = Promise.all(
35
- matches.map((match) => {
36
- const route = router.looseRoutesById[match.routeId];
37
- return router.loadRouteChunk(route);
38
- })
39
- );
40
- matches.forEach((match) => {
41
- var _a2;
42
- const dehydratedMatch = window.__TSR_SSR__.matches.find(
43
- (d) => d.id === match.id
44
- );
45
- if (!dehydratedMatch) {
46
- return;
47
- }
48
- Object.assign(match, dehydratedMatch);
49
- if (dehydratedMatch.__beforeLoadContext) {
50
- match.__beforeLoadContext = router.ssr.serializer.parse(
51
- dehydratedMatch.__beforeLoadContext
52
- );
53
- }
54
- if (dehydratedMatch.loaderData) {
55
- match.loaderData = router.ssr.serializer.parse(
56
- dehydratedMatch.loaderData
57
- );
58
- }
59
- if (dehydratedMatch.error) {
60
- match.error = router.ssr.serializer.parse(dehydratedMatch.error);
61
- }
62
- (_a2 = match.extracted) == null ? void 0 : _a2.forEach((ex) => {
63
- deepMutableSetByPath(match, ["loaderData", ...ex.path], ex.value);
64
- });
65
- return match;
66
- });
67
- router.__store.setState((s) => {
68
- return {
69
- ...s,
70
- matches
71
- };
72
- });
73
- (_c = (_b = router.options).hydrate) == null ? void 0 : _c.call(_b, dehydratedData);
74
- await Promise.all(
75
- router.state.matches.map(async (match) => {
76
- var _a2, _b2, _c2, _d, _e, _f;
77
- const route = router.looseRoutesById[match.routeId];
78
- const parentMatch = router.state.matches[match.index - 1];
79
- const parentContext = (parentMatch == null ? void 0 : parentMatch.context) ?? router.options.context ?? {};
80
- const contextFnContext = {
81
- deps: match.loaderDeps,
82
- params: match.params,
83
- context: parentContext,
84
- location: router.state.location,
85
- navigate: (opts) => router.navigate({ ...opts, _fromLocation: router.state.location }),
86
- buildLocation: router.buildLocation,
87
- cause: match.cause,
88
- abortController: match.abortController,
89
- preload: false,
90
- matches
91
- };
92
- match.__routeContext = ((_b2 = (_a2 = route.options).context) == null ? void 0 : _b2.call(_a2, contextFnContext)) ?? {};
93
- match.context = {
94
- ...parentContext,
95
- ...match.__routeContext,
96
- ...match.__beforeLoadContext
97
- };
98
- const assetContext = {
99
- matches: router.state.matches,
100
- match,
101
- params: match.params,
102
- loaderData: match.loaderData
103
- };
104
- const headFnContent = await ((_d = (_c2 = route.options).head) == null ? void 0 : _d.call(_c2, assetContext));
105
- const scripts = await ((_f = (_e = route.options).scripts) == null ? void 0 : _f.call(_e, assetContext));
106
- match.meta = headFnContent == null ? void 0 : headFnContent.meta;
107
- match.links = headFnContent == null ? void 0 : headFnContent.links;
108
- match.headScripts = headFnContent == null ? void 0 : headFnContent.scripts;
109
- match.scripts = scripts;
110
- })
111
- );
112
- if (matches[matches.length - 1].id !== lastMatchId) {
113
- return await Promise.all([routeChunkPromise, router.load()]);
114
- }
115
- return routeChunkPromise;
116
- }
117
- function deepMutableSetByPath(obj, path, value) {
118
- if (path.length === 1) {
119
- obj[path[0]] = value;
120
- }
121
- const [key, ...rest] = path;
122
- if (Array.isArray(obj)) {
123
- deepMutableSetByPath(obj[Number(key)], rest, value);
124
- } else if (isPlainObject(obj)) {
125
- deepMutableSetByPath(obj[key], rest, value);
126
- }
127
- }
128
- export {
129
- hydrate
130
- };
131
- //# sourceMappingURL=ssr-client.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"ssr-client.js","sources":["../../src/ssr-client.tsx"],"sourcesContent":["import { isPlainObject } from '@tanstack/router-core'\n\nimport invariant from 'tiny-invariant'\n\nimport { startSerializer } from './serializer'\nimport type {\n AnyRouter,\n ControllablePromise,\n DeferredPromiseState,\n MakeRouteMatch,\n Manifest,\n RouteContextOptions,\n} from '@tanstack/router-core'\n\ndeclare global {\n interface Window {\n __TSR_SSR__?: StartSsrGlobal\n }\n}\n\nexport interface StartSsrGlobal {\n matches: Array<SsrMatch>\n streamedValues: Record<\n string,\n {\n value: any\n parsed: any\n }\n >\n cleanScripts: () => void\n dehydrated?: any\n initMatch: (match: SsrMatch) => void\n resolvePromise: (opts: {\n matchId: string\n id: number\n promiseState: DeferredPromiseState<any>\n }) => void\n injectChunk: (opts: { matchId: string; id: number; chunk: string }) => void\n closeStream: (opts: { matchId: string; id: number }) => void\n}\n\nexport interface SsrMatch {\n id: string\n __beforeLoadContext: string\n loaderData?: string\n error?: string\n extracted?: Array<ClientExtractedEntry>\n updatedAt: MakeRouteMatch['updatedAt']\n status: MakeRouteMatch['status']\n}\n\nexport type ClientExtractedEntry =\n | ClientExtractedStream\n | ClientExtractedPromise\n\nexport interface ClientExtractedPromise extends ClientExtractedBaseEntry {\n type: 'promise'\n value?: ControllablePromise<any>\n}\n\nexport interface ClientExtractedStream extends ClientExtractedBaseEntry {\n type: 'stream'\n value?: ReadableStream & { controller?: ReadableStreamDefaultController }\n}\n\nexport interface ClientExtractedBaseEntry {\n type: string\n path: Array<string>\n}\n\nexport interface ResolvePromiseState {\n matchId: string\n id: number\n promiseState: DeferredPromiseState<any>\n}\n\nexport interface DehydratedRouter {\n manifest: Manifest | undefined\n dehydratedData: any\n lastMatchId: string\n}\n\nexport async function hydrate(router: AnyRouter): Promise<any> {\n invariant(\n window.__TSR_SSR__?.dehydrated,\n 'Expected to find a dehydrated data on window.__TSR_SSR__.dehydrated... but we did not. Please file an issue!',\n )\n\n const { manifest, dehydratedData, lastMatchId } = startSerializer.parse(\n window.__TSR_SSR__.dehydrated,\n ) as DehydratedRouter\n\n router.ssr = {\n manifest,\n serializer: startSerializer,\n }\n\n router.clientSsr = {\n getStreamedValue: <T,>(key: string): T | undefined => {\n if (router.isServer) {\n return undefined\n }\n\n const streamedValue = window.__TSR_SSR__?.streamedValues[key]\n\n if (!streamedValue) {\n return\n }\n\n if (!streamedValue.parsed) {\n streamedValue.parsed = router.ssr!.serializer.parse(streamedValue.value)\n }\n\n return streamedValue.parsed\n },\n }\n\n // Hydrate the router state\n const matches = router.matchRoutes(router.state.location)\n\n // kick off loading the route chunks\n const routeChunkPromise = Promise.all(\n matches.map((match) => {\n const route = router.looseRoutesById[match.routeId]!\n return router.loadRouteChunk(route)\n }),\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 matches.forEach((match) => {\n const dehydratedMatch = window.__TSR_SSR__!.matches.find(\n (d) => d.id === match.id,\n )\n\n if (!dehydratedMatch) {\n return\n }\n\n Object.assign(match, dehydratedMatch)\n\n // Handle beforeLoadContext\n if (dehydratedMatch.__beforeLoadContext) {\n match.__beforeLoadContext = router.ssr!.serializer.parse(\n dehydratedMatch.__beforeLoadContext,\n ) as any\n }\n\n // Handle loaderData\n if (dehydratedMatch.loaderData) {\n match.loaderData = router.ssr!.serializer.parse(\n dehydratedMatch.loaderData,\n )\n }\n\n // Handle error\n if (dehydratedMatch.error) {\n match.error = router.ssr!.serializer.parse(dehydratedMatch.error)\n }\n\n // Handle extracted\n ;(match as unknown as SsrMatch).extracted?.forEach((ex) => {\n deepMutableSetByPath(match, ['loaderData', ...ex.path], ex.value)\n })\n\n return match\n })\n\n router.__store.setState((s) => {\n return {\n ...s,\n matches,\n }\n })\n\n // Allow the user to handle custom hydration data\n router.options.hydrate?.(dehydratedData)\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 await Promise.all(\n router.state.matches.map(async (match) => {\n const route = router.looseRoutesById[match.routeId]!\n\n const parentMatch = router.state.matches[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 const contextFnContext: RouteContextOptions<any, any, any, any> = {\n deps: match.loaderDeps,\n params: match.params,\n context: parentContext,\n location: router.state.location,\n navigate: (opts: any) =>\n router.navigate({ ...opts, _fromLocation: router.state.location }),\n buildLocation: router.buildLocation,\n cause: match.cause,\n abortController: match.abortController,\n preload: false,\n matches,\n }\n match.__routeContext = route.options.context?.(contextFnContext) ?? {}\n\n match.context = {\n ...parentContext,\n ...match.__routeContext,\n ...match.__beforeLoadContext,\n }\n\n const assetContext = {\n matches: router.state.matches,\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.scripts = scripts\n }),\n )\n\n if (matches[matches.length - 1]!.id !== lastMatchId) {\n return await Promise.all([routeChunkPromise, router.load()])\n }\n\n return routeChunkPromise\n}\n\nfunction deepMutableSetByPath<T>(obj: T, path: Array<string>, value: any) {\n // mutable set by path retaining array and object references\n if (path.length === 1) {\n ;(obj as any)[path[0]!] = value\n }\n\n const [key, ...rest] = path\n\n if (Array.isArray(obj)) {\n deepMutableSetByPath(obj[Number(key)], rest, value)\n } else if (isPlainObject(obj)) {\n deepMutableSetByPath((obj as any)[key!], rest, value)\n }\n}\n"],"names":["_a","_b","_c"],"mappings":"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"}
@@ -1 +0,0 @@
1
- export {};
@@ -1 +0,0 @@
1
- export {};
package/src/headers.ts DELETED
@@ -1,50 +0,0 @@
1
- import { splitSetCookieString } from 'cookie-es'
2
- import type { OutgoingHttpHeaders } from 'node:http2'
3
- // A utility function to turn HeadersInit into an object
4
- export function headersInitToObject(
5
- headers: HeadersInit,
6
- ): Record<keyof OutgoingHttpHeaders, string> {
7
- const obj: Record<keyof OutgoingHttpHeaders, string> = {}
8
- const headersInstance = new Headers(headers)
9
- for (const [key, value] of headersInstance.entries()) {
10
- obj[key] = value
11
- }
12
- return obj
13
- }
14
-
15
- type AnyHeaders =
16
- | Headers
17
- | HeadersInit
18
- | Record<string, string>
19
- | Array<[string, string]>
20
- | OutgoingHttpHeaders
21
- | undefined
22
-
23
- // Helper function to convert various HeaderInit types to a Headers instance
24
- function toHeadersInstance(init: AnyHeaders) {
25
- if (init instanceof Headers) {
26
- return new Headers(init)
27
- } else if (Array.isArray(init)) {
28
- return new Headers(init)
29
- } else if (typeof init === 'object') {
30
- return new Headers(init as HeadersInit)
31
- } else {
32
- return new Headers()
33
- }
34
- }
35
-
36
- // Function to merge headers with proper overrides
37
- export function mergeHeaders(...headers: Array<AnyHeaders>) {
38
- return headers.reduce((acc: Headers, header) => {
39
- const headersInstance = toHeadersInstance(header)
40
- for (const [key, value] of headersInstance.entries()) {
41
- if (key === 'set-cookie') {
42
- const splitCookies = splitSetCookieString(value)
43
- splitCookies.forEach((cookie) => acc.append('set-cookie', cookie))
44
- } else {
45
- acc.set(key, value)
46
- }
47
- }
48
- return acc
49
- }, new Headers())
50
- }
package/src/json.ts DELETED
@@ -1,15 +0,0 @@
1
- import { mergeHeaders } from './headers'
2
- import type { JsonResponse } from './createServerFn'
3
-
4
- export function json<TData>(
5
- payload: TData,
6
- init?: ResponseInit,
7
- ): JsonResponse<TData> {
8
- return new Response(JSON.stringify(payload), {
9
- ...init,
10
- headers: mergeHeaders(
11
- { 'content-type': 'application/json' },
12
- init?.headers,
13
- ),
14
- })
15
- }
@@ -1,249 +0,0 @@
1
- import { isPlainObject } from '@tanstack/router-core'
2
-
3
- import invariant from 'tiny-invariant'
4
-
5
- import { startSerializer } from './serializer'
6
- import type {
7
- AnyRouter,
8
- ControllablePromise,
9
- DeferredPromiseState,
10
- MakeRouteMatch,
11
- Manifest,
12
- RouteContextOptions,
13
- } from '@tanstack/router-core'
14
-
15
- declare global {
16
- interface Window {
17
- __TSR_SSR__?: StartSsrGlobal
18
- }
19
- }
20
-
21
- export interface StartSsrGlobal {
22
- matches: Array<SsrMatch>
23
- streamedValues: Record<
24
- string,
25
- {
26
- value: any
27
- parsed: any
28
- }
29
- >
30
- cleanScripts: () => void
31
- dehydrated?: any
32
- initMatch: (match: SsrMatch) => void
33
- resolvePromise: (opts: {
34
- matchId: string
35
- id: number
36
- promiseState: DeferredPromiseState<any>
37
- }) => void
38
- injectChunk: (opts: { matchId: string; id: number; chunk: string }) => void
39
- closeStream: (opts: { matchId: string; id: number }) => void
40
- }
41
-
42
- export interface SsrMatch {
43
- id: string
44
- __beforeLoadContext: string
45
- loaderData?: string
46
- error?: string
47
- extracted?: Array<ClientExtractedEntry>
48
- updatedAt: MakeRouteMatch['updatedAt']
49
- status: MakeRouteMatch['status']
50
- }
51
-
52
- export type ClientExtractedEntry =
53
- | ClientExtractedStream
54
- | ClientExtractedPromise
55
-
56
- export interface ClientExtractedPromise extends ClientExtractedBaseEntry {
57
- type: 'promise'
58
- value?: ControllablePromise<any>
59
- }
60
-
61
- export interface ClientExtractedStream extends ClientExtractedBaseEntry {
62
- type: 'stream'
63
- value?: ReadableStream & { controller?: ReadableStreamDefaultController }
64
- }
65
-
66
- export interface ClientExtractedBaseEntry {
67
- type: string
68
- path: Array<string>
69
- }
70
-
71
- export interface ResolvePromiseState {
72
- matchId: string
73
- id: number
74
- promiseState: DeferredPromiseState<any>
75
- }
76
-
77
- export interface DehydratedRouter {
78
- manifest: Manifest | undefined
79
- dehydratedData: any
80
- lastMatchId: string
81
- }
82
-
83
- export async function hydrate(router: AnyRouter): Promise<any> {
84
- invariant(
85
- window.__TSR_SSR__?.dehydrated,
86
- 'Expected to find a dehydrated data on window.__TSR_SSR__.dehydrated... but we did not. Please file an issue!',
87
- )
88
-
89
- const { manifest, dehydratedData, lastMatchId } = startSerializer.parse(
90
- window.__TSR_SSR__.dehydrated,
91
- ) as DehydratedRouter
92
-
93
- router.ssr = {
94
- manifest,
95
- serializer: startSerializer,
96
- }
97
-
98
- router.clientSsr = {
99
- getStreamedValue: <T,>(key: string): T | undefined => {
100
- if (router.isServer) {
101
- return undefined
102
- }
103
-
104
- const streamedValue = window.__TSR_SSR__?.streamedValues[key]
105
-
106
- if (!streamedValue) {
107
- return
108
- }
109
-
110
- if (!streamedValue.parsed) {
111
- streamedValue.parsed = router.ssr!.serializer.parse(streamedValue.value)
112
- }
113
-
114
- return streamedValue.parsed
115
- },
116
- }
117
-
118
- // Hydrate the router state
119
- const matches = router.matchRoutes(router.state.location)
120
-
121
- // kick off loading the route chunks
122
- const routeChunkPromise = Promise.all(
123
- matches.map((match) => {
124
- const route = router.looseRoutesById[match.routeId]!
125
- return router.loadRouteChunk(route)
126
- }),
127
- )
128
-
129
- // Right after hydration and before the first render, we need to rehydrate each match
130
- // First step is to reyhdrate loaderData and __beforeLoadContext
131
- matches.forEach((match) => {
132
- const dehydratedMatch = window.__TSR_SSR__!.matches.find(
133
- (d) => d.id === match.id,
134
- )
135
-
136
- if (!dehydratedMatch) {
137
- return
138
- }
139
-
140
- Object.assign(match, dehydratedMatch)
141
-
142
- // Handle beforeLoadContext
143
- if (dehydratedMatch.__beforeLoadContext) {
144
- match.__beforeLoadContext = router.ssr!.serializer.parse(
145
- dehydratedMatch.__beforeLoadContext,
146
- ) as any
147
- }
148
-
149
- // Handle loaderData
150
- if (dehydratedMatch.loaderData) {
151
- match.loaderData = router.ssr!.serializer.parse(
152
- dehydratedMatch.loaderData,
153
- )
154
- }
155
-
156
- // Handle error
157
- if (dehydratedMatch.error) {
158
- match.error = router.ssr!.serializer.parse(dehydratedMatch.error)
159
- }
160
-
161
- // Handle extracted
162
- ;(match as unknown as SsrMatch).extracted?.forEach((ex) => {
163
- deepMutableSetByPath(match, ['loaderData', ...ex.path], ex.value)
164
- })
165
-
166
- return match
167
- })
168
-
169
- router.__store.setState((s) => {
170
- return {
171
- ...s,
172
- matches,
173
- }
174
- })
175
-
176
- // Allow the user to handle custom hydration data
177
- router.options.hydrate?.(dehydratedData)
178
-
179
- // now that all necessary data is hydrated:
180
- // 1) fully reconstruct the route context
181
- // 2) execute `head()` and `scripts()` for each match
182
- await Promise.all(
183
- router.state.matches.map(async (match) => {
184
- const route = router.looseRoutesById[match.routeId]!
185
-
186
- const parentMatch = router.state.matches[match.index - 1]
187
- const parentContext = parentMatch?.context ?? router.options.context ?? {}
188
-
189
- // `context()` was already executed by `matchRoutes`, however route context was not yet fully reconstructed
190
- // so run it again and merge route context
191
- const contextFnContext: RouteContextOptions<any, any, any, any> = {
192
- deps: match.loaderDeps,
193
- params: match.params,
194
- context: parentContext,
195
- location: router.state.location,
196
- navigate: (opts: any) =>
197
- router.navigate({ ...opts, _fromLocation: router.state.location }),
198
- buildLocation: router.buildLocation,
199
- cause: match.cause,
200
- abortController: match.abortController,
201
- preload: false,
202
- matches,
203
- }
204
- match.__routeContext = route.options.context?.(contextFnContext) ?? {}
205
-
206
- match.context = {
207
- ...parentContext,
208
- ...match.__routeContext,
209
- ...match.__beforeLoadContext,
210
- }
211
-
212
- const assetContext = {
213
- matches: router.state.matches,
214
- match,
215
- params: match.params,
216
- loaderData: match.loaderData,
217
- }
218
- const headFnContent = await route.options.head?.(assetContext)
219
-
220
- const scripts = await route.options.scripts?.(assetContext)
221
-
222
- match.meta = headFnContent?.meta
223
- match.links = headFnContent?.links
224
- match.headScripts = headFnContent?.scripts
225
- match.scripts = scripts
226
- }),
227
- )
228
-
229
- if (matches[matches.length - 1]!.id !== lastMatchId) {
230
- return await Promise.all([routeChunkPromise, router.load()])
231
- }
232
-
233
- return routeChunkPromise
234
- }
235
-
236
- function deepMutableSetByPath<T>(obj: T, path: Array<string>, value: any) {
237
- // mutable set by path retaining array and object references
238
- if (path.length === 1) {
239
- ;(obj as any)[path[0]!] = value
240
- }
241
-
242
- const [key, ...rest] = path
243
-
244
- if (Array.isArray(obj)) {
245
- deepMutableSetByPath(obj[Number(key)], rest, value)
246
- } else if (isPlainObject(obj)) {
247
- deepMutableSetByPath((obj as any)[key!], rest, value)
248
- }
249
- }
@@ -1,37 +0,0 @@
1
- import { describe, expect, it } from 'vitest'
2
- import { json } from '../json'
3
-
4
- describe('json', () => {
5
- it('sets the content type to application/json and stringifies the data', async () => {
6
- const data = { foo: 'bar' }
7
- const response = json(data)
8
-
9
- expect(response.headers.get('Content-Type')).toBe('application/json')
10
-
11
- const responseClone = response.clone()
12
- await expect(responseClone.text()).resolves.toEqual(JSON.stringify(data))
13
-
14
- await expect(response.json()).resolves.toEqual(data)
15
- })
16
- it("doesn't override the content type if it's already set", () => {
17
- const response = json(null, { headers: { 'Content-Type': 'text/plain' } })
18
-
19
- expect(response.headers.get('Content-Type')).toBe('text/plain')
20
- })
21
- it('reflects passed status and statusText', () => {
22
- const response = json(null, { status: 404, statusText: 'Not Found' })
23
-
24
- expect(response.status).toBe(404)
25
- expect(response.statusText).toBe('Not Found')
26
- })
27
- it.each<[string, HeadersInit]>([
28
- ['plain object', { 'X-TYPE': 'example' }],
29
- ['array', [['X-TYPE', 'example']]],
30
- ['Headers', new Headers({ 'X-TYPE': 'example' })],
31
- ])('merges headers from %s', (_, headers) => {
32
- const response = json(null, { headers })
33
-
34
- expect(response.headers.get('X-TYPE')).toBe('example')
35
- expect(response.headers.get('Content-Type')).toBe('application/json')
36
- })
37
- })