@tanstack/router-core 1.121.34 → 1.121.40
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.
- package/dist/cjs/index.d.cts +1 -1
- package/dist/cjs/router.cjs +4 -2
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/cjs/router.d.cts +2 -2
- package/dist/cjs/serializer.cjs +146 -0
- package/dist/cjs/serializer.cjs.map +1 -0
- package/dist/cjs/serializer.d.cts +7 -1
- package/dist/cjs/ssr/client.cjs +12 -0
- package/dist/cjs/ssr/client.cjs.map +1 -0
- package/dist/cjs/ssr/client.d.cts +6 -0
- package/dist/cjs/ssr/createRequestHandler.cjs +50 -0
- package/dist/cjs/ssr/createRequestHandler.cjs.map +1 -0
- package/dist/cjs/ssr/createRequestHandler.d.cts +9 -0
- package/dist/cjs/ssr/handlerCallback.cjs +7 -0
- package/dist/cjs/ssr/handlerCallback.cjs.map +1 -0
- package/dist/cjs/ssr/handlerCallback.d.cts +9 -0
- package/dist/cjs/ssr/headers.cjs +39 -0
- package/dist/cjs/ssr/headers.cjs.map +1 -0
- package/dist/cjs/ssr/headers.d.cts +5 -0
- package/dist/cjs/ssr/json.cjs +14 -0
- package/dist/cjs/ssr/json.cjs.map +1 -0
- package/dist/cjs/ssr/json.d.cts +4 -0
- package/dist/cjs/ssr/server.cjs +17 -0
- package/dist/cjs/ssr/server.cjs.map +1 -0
- package/dist/cjs/ssr/server.d.cts +8 -0
- package/dist/cjs/ssr/ssr-client.cjs +131 -0
- package/dist/cjs/ssr/ssr-client.cjs.map +1 -0
- package/dist/cjs/ssr/ssr-client.d.cts +68 -0
- package/dist/cjs/ssr/ssr-server.cjs +248 -0
- package/dist/cjs/ssr/ssr-server.cjs.map +1 -0
- package/dist/cjs/ssr/ssr-server.d.cts +32 -0
- package/dist/cjs/ssr/transformStreamWithRouter.cjs +183 -0
- package/dist/cjs/ssr/transformStreamWithRouter.cjs.map +1 -0
- package/dist/cjs/ssr/transformStreamWithRouter.d.cts +6 -0
- package/dist/cjs/ssr/tsrScript.cjs +4 -0
- package/dist/cjs/ssr/tsrScript.cjs.map +1 -0
- package/dist/cjs/ssr/tsrScript.d.cts +1 -0
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/router.d.ts +2 -2
- package/dist/esm/router.js +4 -2
- package/dist/esm/router.js.map +1 -1
- package/dist/esm/serializer.d.ts +7 -1
- package/dist/esm/serializer.js +146 -0
- package/dist/esm/serializer.js.map +1 -0
- package/dist/esm/ssr/client.d.ts +6 -0
- package/dist/esm/ssr/client.js +12 -0
- package/dist/esm/ssr/client.js.map +1 -0
- package/dist/esm/ssr/createRequestHandler.d.ts +9 -0
- package/dist/esm/ssr/createRequestHandler.js +50 -0
- package/dist/esm/ssr/createRequestHandler.js.map +1 -0
- package/dist/esm/ssr/handlerCallback.d.ts +9 -0
- package/dist/esm/ssr/handlerCallback.js +7 -0
- package/dist/esm/ssr/handlerCallback.js.map +1 -0
- package/dist/esm/ssr/headers.d.ts +5 -0
- package/dist/esm/ssr/headers.js +39 -0
- package/dist/esm/ssr/headers.js.map +1 -0
- package/dist/esm/ssr/json.d.ts +4 -0
- package/dist/esm/ssr/json.js +14 -0
- package/dist/esm/ssr/json.js.map +1 -0
- package/dist/esm/ssr/server.d.ts +8 -0
- package/dist/esm/ssr/server.js +17 -0
- package/dist/esm/ssr/server.js.map +1 -0
- package/dist/esm/ssr/ssr-client.d.ts +68 -0
- package/dist/esm/ssr/ssr-client.js +131 -0
- package/dist/esm/ssr/ssr-client.js.map +1 -0
- package/dist/esm/ssr/ssr-server.d.ts +32 -0
- package/dist/esm/ssr/ssr-server.js +248 -0
- package/dist/esm/ssr/ssr-server.js.map +1 -0
- package/dist/esm/ssr/transformStreamWithRouter.d.ts +6 -0
- package/dist/esm/ssr/transformStreamWithRouter.js +183 -0
- package/dist/esm/ssr/transformStreamWithRouter.js.map +1 -0
- package/dist/esm/ssr/tsrScript.d.ts +1 -0
- package/dist/esm/ssr/tsrScript.js +5 -0
- package/dist/esm/ssr/tsrScript.js.map +1 -0
- package/package.json +28 -1
- package/src/index.ts +1 -0
- package/src/router.ts +11 -4
- package/src/serializer.ts +174 -1
- package/src/ssr/client.ts +15 -0
- package/src/ssr/createRequestHandler.ts +74 -0
- package/src/ssr/handlerCallback.ts +15 -0
- package/src/ssr/headers.ts +51 -0
- package/src/ssr/json.ts +18 -0
- package/src/ssr/server.ts +23 -0
- package/src/ssr/ssr-client.ts +244 -0
- package/src/ssr/ssr-server.ts +345 -0
- package/src/ssr/transformStreamWithRouter.ts +258 -0
- package/src/ssr/tsrScript.ts +91 -0
- package/src/vite-env.d.ts +4 -0
package/src/serializer.ts
CHANGED
|
@@ -1,10 +1,17 @@
|
|
|
1
|
-
|
|
1
|
+
import { isPlainObject } from './utils'
|
|
2
|
+
|
|
3
|
+
export interface TsrSerializer {
|
|
2
4
|
stringify: (obj: unknown) => string
|
|
3
5
|
parse: (str: string) => unknown
|
|
4
6
|
encode: <T>(value: T) => T
|
|
5
7
|
decode: <T>(value: T) => T
|
|
6
8
|
}
|
|
7
9
|
|
|
10
|
+
/**
|
|
11
|
+
* @deprecated This is re-export of TsrSerializer which is the generic Router serializer interface. Going forward StartSerializer will be used specifically as a Tanstack Start serializer interface.
|
|
12
|
+
*/
|
|
13
|
+
export interface StartSerializer extends TsrSerializer {}
|
|
14
|
+
|
|
8
15
|
export type SerializerStringifyBy<T, TSerializable> = T extends TSerializable
|
|
9
16
|
? T
|
|
10
17
|
: T extends (...args: Array<any>) => any
|
|
@@ -30,3 +37,169 @@ export type Serializable = Date | undefined | Error | FormData | bigint
|
|
|
30
37
|
export type SerializerStringify<T> = SerializerStringifyBy<T, Serializable>
|
|
31
38
|
|
|
32
39
|
export type SerializerParse<T> = SerializerParseBy<T, Serializable>
|
|
40
|
+
export const tsrSerializer: TsrSerializer = {
|
|
41
|
+
stringify: (value: any) =>
|
|
42
|
+
JSON.stringify(value, function replacer(key, val) {
|
|
43
|
+
const ogVal = this[key]
|
|
44
|
+
const serializer = serializers.find((t) => t.stringifyCondition(ogVal))
|
|
45
|
+
|
|
46
|
+
if (serializer) {
|
|
47
|
+
return serializer.stringify(ogVal)
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
return val
|
|
51
|
+
}),
|
|
52
|
+
parse: (value: string) =>
|
|
53
|
+
JSON.parse(value, function parser(key, val) {
|
|
54
|
+
const ogVal = this[key]
|
|
55
|
+
if (isPlainObject(ogVal)) {
|
|
56
|
+
const serializer = serializers.find((t) => t.parseCondition(ogVal))
|
|
57
|
+
|
|
58
|
+
if (serializer) {
|
|
59
|
+
return serializer.parse(ogVal)
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
return val
|
|
64
|
+
}),
|
|
65
|
+
encode: (value: any) => {
|
|
66
|
+
// When encoding, dive first
|
|
67
|
+
if (Array.isArray(value)) {
|
|
68
|
+
return value.map((v) => tsrSerializer.encode(v))
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
if (isPlainObject(value)) {
|
|
72
|
+
return Object.fromEntries(
|
|
73
|
+
Object.entries(value).map(([key, v]) => [key, tsrSerializer.encode(v)]),
|
|
74
|
+
)
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
const serializer = serializers.find((t) => t.stringifyCondition(value))
|
|
78
|
+
if (serializer) {
|
|
79
|
+
return serializer.stringify(value)
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
return value
|
|
83
|
+
},
|
|
84
|
+
decode: (value: any) => {
|
|
85
|
+
// Attempt transform first
|
|
86
|
+
if (isPlainObject(value)) {
|
|
87
|
+
const serializer = serializers.find((t) => t.parseCondition(value))
|
|
88
|
+
if (serializer) {
|
|
89
|
+
return serializer.parse(value)
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
if (Array.isArray(value)) {
|
|
94
|
+
return value.map((v) => tsrSerializer.decode(v))
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
if (isPlainObject(value)) {
|
|
98
|
+
return Object.fromEntries(
|
|
99
|
+
Object.entries(value).map(([key, v]) => [key, tsrSerializer.decode(v)]),
|
|
100
|
+
)
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
return value
|
|
104
|
+
},
|
|
105
|
+
}
|
|
106
|
+
const createSerializer = <TKey extends string, TInput, TSerialized>(
|
|
107
|
+
key: TKey,
|
|
108
|
+
check: (value: any) => value is TInput,
|
|
109
|
+
toValue: (value: TInput) => TSerialized,
|
|
110
|
+
fromValue: (value: TSerialized) => TInput,
|
|
111
|
+
) => ({
|
|
112
|
+
key,
|
|
113
|
+
stringifyCondition: check,
|
|
114
|
+
stringify: (value: any) => ({ [`$${key}`]: toValue(value) }),
|
|
115
|
+
parseCondition: (value: any) => Object.hasOwn(value, `$${key}`),
|
|
116
|
+
parse: (value: any) => fromValue(value[`$${key}`]),
|
|
117
|
+
})
|
|
118
|
+
// Keep these ordered by predicted frequency
|
|
119
|
+
// Make sure to keep DefaultSerializable in sync with these serializers
|
|
120
|
+
// Also, make sure that they are unit tested in serializer.test.tsx
|
|
121
|
+
const serializers = [
|
|
122
|
+
createSerializer(
|
|
123
|
+
// Key
|
|
124
|
+
'undefined',
|
|
125
|
+
// Check
|
|
126
|
+
(v): v is undefined => v === undefined,
|
|
127
|
+
// To
|
|
128
|
+
() => 0,
|
|
129
|
+
// From
|
|
130
|
+
() => undefined,
|
|
131
|
+
),
|
|
132
|
+
createSerializer(
|
|
133
|
+
// Key
|
|
134
|
+
'date',
|
|
135
|
+
// Check
|
|
136
|
+
(v): v is Date => v instanceof Date,
|
|
137
|
+
// To
|
|
138
|
+
(v) => v.toISOString(),
|
|
139
|
+
// From
|
|
140
|
+
(v) => new Date(v),
|
|
141
|
+
),
|
|
142
|
+
createSerializer(
|
|
143
|
+
// Key
|
|
144
|
+
'error',
|
|
145
|
+
// Check
|
|
146
|
+
(v): v is Error => v instanceof Error,
|
|
147
|
+
// To
|
|
148
|
+
(v) => ({
|
|
149
|
+
...v,
|
|
150
|
+
message: v.message,
|
|
151
|
+
stack: process.env.NODE_ENV === 'development' ? v.stack : undefined,
|
|
152
|
+
cause: v.cause,
|
|
153
|
+
}),
|
|
154
|
+
// From
|
|
155
|
+
(v) => Object.assign(new Error(v.message), v),
|
|
156
|
+
),
|
|
157
|
+
createSerializer(
|
|
158
|
+
// Key
|
|
159
|
+
'formData',
|
|
160
|
+
// Check
|
|
161
|
+
(v): v is FormData => v instanceof FormData,
|
|
162
|
+
// To
|
|
163
|
+
(v) => {
|
|
164
|
+
const entries: Record<
|
|
165
|
+
string,
|
|
166
|
+
Array<FormDataEntryValue> | FormDataEntryValue
|
|
167
|
+
> = {}
|
|
168
|
+
v.forEach((value, key) => {
|
|
169
|
+
const entry = entries[key]
|
|
170
|
+
if (entry !== undefined) {
|
|
171
|
+
if (Array.isArray(entry)) {
|
|
172
|
+
entry.push(value)
|
|
173
|
+
} else {
|
|
174
|
+
entries[key] = [entry, value]
|
|
175
|
+
}
|
|
176
|
+
} else {
|
|
177
|
+
entries[key] = value
|
|
178
|
+
}
|
|
179
|
+
})
|
|
180
|
+
return entries
|
|
181
|
+
},
|
|
182
|
+
// From
|
|
183
|
+
(v) => {
|
|
184
|
+
const formData = new FormData()
|
|
185
|
+
Object.entries(v).forEach(([key, value]) => {
|
|
186
|
+
if (Array.isArray(value)) {
|
|
187
|
+
value.forEach((val) => formData.append(key, val))
|
|
188
|
+
} else {
|
|
189
|
+
formData.append(key, value)
|
|
190
|
+
}
|
|
191
|
+
})
|
|
192
|
+
return formData
|
|
193
|
+
},
|
|
194
|
+
),
|
|
195
|
+
createSerializer(
|
|
196
|
+
// Key
|
|
197
|
+
'bigint',
|
|
198
|
+
// Check
|
|
199
|
+
(v): v is bigint => typeof v === 'bigint',
|
|
200
|
+
// To
|
|
201
|
+
(v) => v.toString(),
|
|
202
|
+
// From
|
|
203
|
+
(v) => BigInt(v),
|
|
204
|
+
),
|
|
205
|
+
] as const
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export { mergeHeaders, headersInitToObject } from './headers'
|
|
2
|
+
export { json } from './json'
|
|
3
|
+
export type { JsonResponse } from './json'
|
|
4
|
+
export { hydrate } from './ssr-client'
|
|
5
|
+
export type {
|
|
6
|
+
DehydratedRouter,
|
|
7
|
+
ClientExtractedBaseEntry,
|
|
8
|
+
TsrSsrGlobal,
|
|
9
|
+
ClientExtractedEntry,
|
|
10
|
+
SsrMatch,
|
|
11
|
+
ClientExtractedPromise,
|
|
12
|
+
ClientExtractedStream,
|
|
13
|
+
ResolvePromiseState,
|
|
14
|
+
} from './ssr-client'
|
|
15
|
+
export { tsrSerializer } from '../serializer'
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { createMemoryHistory } from '@tanstack/history'
|
|
2
|
+
import { mergeHeaders } from './headers'
|
|
3
|
+
import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'
|
|
4
|
+
import type { HandlerCallback } from './handlerCallback'
|
|
5
|
+
import type { AnyRouter } from '../router'
|
|
6
|
+
import type { Manifest } from '../manifest'
|
|
7
|
+
|
|
8
|
+
export type RequestHandler<TRouter extends AnyRouter> = (
|
|
9
|
+
cb: HandlerCallback<TRouter>,
|
|
10
|
+
) => Promise<Response>
|
|
11
|
+
|
|
12
|
+
export function createRequestHandler<TRouter extends AnyRouter>({
|
|
13
|
+
createRouter,
|
|
14
|
+
request,
|
|
15
|
+
getRouterManifest,
|
|
16
|
+
}: {
|
|
17
|
+
createRouter: () => TRouter
|
|
18
|
+
request: Request
|
|
19
|
+
getRouterManifest?: () => Manifest | Promise<Manifest>
|
|
20
|
+
}): RequestHandler<TRouter> {
|
|
21
|
+
return async (cb) => {
|
|
22
|
+
const router = createRouter()
|
|
23
|
+
|
|
24
|
+
attachRouterServerSsrUtils(router, await getRouterManifest?.())
|
|
25
|
+
|
|
26
|
+
const url = new URL(request.url, 'http://localhost')
|
|
27
|
+
|
|
28
|
+
const href = url.href.replace(url.origin, '')
|
|
29
|
+
|
|
30
|
+
// Create a history for the router
|
|
31
|
+
const history = createMemoryHistory({
|
|
32
|
+
initialEntries: [href],
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
// Update the router with the history and context
|
|
36
|
+
router.update({
|
|
37
|
+
history,
|
|
38
|
+
})
|
|
39
|
+
|
|
40
|
+
await router.load()
|
|
41
|
+
|
|
42
|
+
dehydrateRouter(router)
|
|
43
|
+
|
|
44
|
+
const responseHeaders = getRequestHeaders({
|
|
45
|
+
router,
|
|
46
|
+
})
|
|
47
|
+
|
|
48
|
+
return cb({
|
|
49
|
+
request,
|
|
50
|
+
router,
|
|
51
|
+
responseHeaders,
|
|
52
|
+
} as any)
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
function getRequestHeaders(opts: { router: AnyRouter }): Headers {
|
|
57
|
+
let headers = mergeHeaders(
|
|
58
|
+
{
|
|
59
|
+
'Content-Type': 'text/html; charset=UTF-8',
|
|
60
|
+
},
|
|
61
|
+
...opts.router.state.matches.map((match) => {
|
|
62
|
+
return match.headers
|
|
63
|
+
}),
|
|
64
|
+
)
|
|
65
|
+
|
|
66
|
+
// Handle Redirects
|
|
67
|
+
const { redirect } = opts.router.state
|
|
68
|
+
|
|
69
|
+
if (redirect) {
|
|
70
|
+
headers = mergeHeaders(headers, redirect.headers)
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
return headers
|
|
74
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { AnyRouter } from '../router'
|
|
2
|
+
|
|
3
|
+
export interface HandlerCallback<TRouter extends AnyRouter> {
|
|
4
|
+
(ctx: {
|
|
5
|
+
request: Request
|
|
6
|
+
router: TRouter
|
|
7
|
+
responseHeaders: Headers
|
|
8
|
+
}): Response | Promise<Response>
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export function defineHandlerCallback<TRouter extends AnyRouter>(
|
|
12
|
+
handler: HandlerCallback<TRouter>,
|
|
13
|
+
): HandlerCallback<TRouter> {
|
|
14
|
+
return handler
|
|
15
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { splitSetCookieString } from 'cookie-es'
|
|
2
|
+
import type { OutgoingHttpHeaders } from 'node:http2'
|
|
3
|
+
|
|
4
|
+
// A utility function to turn HeadersInit into an object
|
|
5
|
+
export function headersInitToObject(
|
|
6
|
+
headers: HeadersInit,
|
|
7
|
+
): Record<keyof OutgoingHttpHeaders, string> {
|
|
8
|
+
const obj: Record<keyof OutgoingHttpHeaders, string> = {}
|
|
9
|
+
const headersInstance = new Headers(headers)
|
|
10
|
+
for (const [key, value] of headersInstance.entries()) {
|
|
11
|
+
obj[key] = value
|
|
12
|
+
}
|
|
13
|
+
return obj
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
type AnyHeaders =
|
|
17
|
+
| Headers
|
|
18
|
+
| HeadersInit
|
|
19
|
+
| Record<string, string>
|
|
20
|
+
| Array<[string, string]>
|
|
21
|
+
| OutgoingHttpHeaders
|
|
22
|
+
| undefined
|
|
23
|
+
|
|
24
|
+
// Helper function to convert various HeaderInit types to a Headers instance
|
|
25
|
+
function toHeadersInstance(init: AnyHeaders) {
|
|
26
|
+
if (init instanceof Headers) {
|
|
27
|
+
return new Headers(init)
|
|
28
|
+
} else if (Array.isArray(init)) {
|
|
29
|
+
return new Headers(init)
|
|
30
|
+
} else if (typeof init === 'object') {
|
|
31
|
+
return new Headers(init as HeadersInit)
|
|
32
|
+
} else {
|
|
33
|
+
return new Headers()
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// Function to merge headers with proper overrides
|
|
38
|
+
export function mergeHeaders(...headers: Array<AnyHeaders>) {
|
|
39
|
+
return headers.reduce((acc: Headers, header) => {
|
|
40
|
+
const headersInstance = toHeadersInstance(header)
|
|
41
|
+
for (const [key, value] of headersInstance.entries()) {
|
|
42
|
+
if (key === 'set-cookie') {
|
|
43
|
+
const splitCookies = splitSetCookieString(value)
|
|
44
|
+
splitCookies.forEach((cookie) => acc.append('set-cookie', cookie))
|
|
45
|
+
} else {
|
|
46
|
+
acc.set(key, value)
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return acc
|
|
50
|
+
}, new Headers())
|
|
51
|
+
}
|
package/src/ssr/json.ts
ADDED
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { mergeHeaders } from './headers'
|
|
2
|
+
|
|
3
|
+
export interface JsonResponse<TData> extends Response {
|
|
4
|
+
json: () => Promise<TData>
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
export function json<TData>(
|
|
8
|
+
payload: TData,
|
|
9
|
+
init?: ResponseInit,
|
|
10
|
+
): JsonResponse<TData> {
|
|
11
|
+
return new Response(JSON.stringify(payload), {
|
|
12
|
+
...init,
|
|
13
|
+
headers: mergeHeaders(
|
|
14
|
+
{ 'content-type': 'application/json' },
|
|
15
|
+
init?.headers,
|
|
16
|
+
),
|
|
17
|
+
})
|
|
18
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
export { createRequestHandler } from './createRequestHandler'
|
|
2
|
+
export type { RequestHandler } from './createRequestHandler'
|
|
3
|
+
export { defineHandlerCallback } from './handlerCallback'
|
|
4
|
+
export type { HandlerCallback } from './handlerCallback'
|
|
5
|
+
export {
|
|
6
|
+
transformPipeableStreamWithRouter,
|
|
7
|
+
transformStreamWithRouter,
|
|
8
|
+
transformReadableStreamWithRouter,
|
|
9
|
+
} from './transformStreamWithRouter'
|
|
10
|
+
export {
|
|
11
|
+
attachRouterServerSsrUtils,
|
|
12
|
+
dehydrateRouter,
|
|
13
|
+
extractAsyncLoaderData,
|
|
14
|
+
onMatchSettled,
|
|
15
|
+
replaceBy,
|
|
16
|
+
} from './ssr-server'
|
|
17
|
+
export type {
|
|
18
|
+
ServerExtractedBaseEntry,
|
|
19
|
+
ServerExtractedEntry,
|
|
20
|
+
ServerExtractedPromise,
|
|
21
|
+
ServerExtractedStream,
|
|
22
|
+
} from './ssr-server'
|
|
23
|
+
export * from './tsrScript'
|
|
@@ -0,0 +1,244 @@
|
|
|
1
|
+
import invariant from 'tiny-invariant'
|
|
2
|
+
import { isPlainObject } from '../utils'
|
|
3
|
+
import { tsrSerializer } from '../serializer'
|
|
4
|
+
import type { DeferredPromiseState } from '../defer'
|
|
5
|
+
import type { MakeRouteMatch } from '../Matches'
|
|
6
|
+
import type { AnyRouter, ControllablePromise } from '../router'
|
|
7
|
+
import type { Manifest } from '../manifest'
|
|
8
|
+
import type { RouteContextOptions } from '../route'
|
|
9
|
+
|
|
10
|
+
declare global {
|
|
11
|
+
interface Window {
|
|
12
|
+
__TSR_SSR__?: TsrSsrGlobal
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export interface TsrSsrGlobal {
|
|
17
|
+
matches: Array<SsrMatch>
|
|
18
|
+
streamedValues: Record<
|
|
19
|
+
string,
|
|
20
|
+
{
|
|
21
|
+
value: any
|
|
22
|
+
parsed: any
|
|
23
|
+
}
|
|
24
|
+
>
|
|
25
|
+
cleanScripts: () => void
|
|
26
|
+
dehydrated?: any
|
|
27
|
+
initMatch: (match: SsrMatch) => void
|
|
28
|
+
resolvePromise: (opts: {
|
|
29
|
+
matchId: string
|
|
30
|
+
id: number
|
|
31
|
+
promiseState: DeferredPromiseState<any>
|
|
32
|
+
}) => void
|
|
33
|
+
injectChunk: (opts: { matchId: string; id: number; chunk: string }) => void
|
|
34
|
+
closeStream: (opts: { matchId: string; id: number }) => void
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export interface SsrMatch {
|
|
38
|
+
id: string
|
|
39
|
+
__beforeLoadContext: string
|
|
40
|
+
loaderData?: string
|
|
41
|
+
error?: string
|
|
42
|
+
extracted?: Array<ClientExtractedEntry>
|
|
43
|
+
updatedAt: MakeRouteMatch['updatedAt']
|
|
44
|
+
status: MakeRouteMatch['status']
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export type ClientExtractedEntry =
|
|
48
|
+
| ClientExtractedStream
|
|
49
|
+
| ClientExtractedPromise
|
|
50
|
+
|
|
51
|
+
export interface ClientExtractedPromise extends ClientExtractedBaseEntry {
|
|
52
|
+
type: 'promise'
|
|
53
|
+
value?: ControllablePromise<any>
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
export interface ClientExtractedStream extends ClientExtractedBaseEntry {
|
|
57
|
+
type: 'stream'
|
|
58
|
+
value?: ReadableStream & { controller?: ReadableStreamDefaultController }
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export interface ClientExtractedBaseEntry {
|
|
62
|
+
type: string
|
|
63
|
+
path: Array<string>
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
export interface ResolvePromiseState {
|
|
67
|
+
matchId: string
|
|
68
|
+
id: number
|
|
69
|
+
promiseState: DeferredPromiseState<any>
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
export interface DehydratedRouter {
|
|
73
|
+
manifest: Manifest | undefined
|
|
74
|
+
dehydratedData: any
|
|
75
|
+
lastMatchId: string
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
export async function hydrate(router: AnyRouter): Promise<any> {
|
|
79
|
+
invariant(
|
|
80
|
+
window.__TSR_SSR__?.dehydrated,
|
|
81
|
+
'Expected to find a dehydrated data on window.__TSR_SSR__.dehydrated... but we did not. Please file an issue!',
|
|
82
|
+
)
|
|
83
|
+
|
|
84
|
+
const { manifest, dehydratedData, lastMatchId } = tsrSerializer.parse(
|
|
85
|
+
window.__TSR_SSR__.dehydrated,
|
|
86
|
+
) as DehydratedRouter
|
|
87
|
+
|
|
88
|
+
router.ssr = {
|
|
89
|
+
manifest,
|
|
90
|
+
serializer: tsrSerializer,
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
router.clientSsr = {
|
|
94
|
+
getStreamedValue: <T>(key: string): T | undefined => {
|
|
95
|
+
if (router.isServer) {
|
|
96
|
+
return undefined
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
const streamedValue = window.__TSR_SSR__?.streamedValues[key]
|
|
100
|
+
|
|
101
|
+
if (!streamedValue) {
|
|
102
|
+
return
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
if (!streamedValue.parsed) {
|
|
106
|
+
streamedValue.parsed = router.ssr!.serializer.parse(streamedValue.value)
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
return streamedValue.parsed
|
|
110
|
+
},
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
// Hydrate the router state
|
|
114
|
+
const matches = router.matchRoutes(router.state.location)
|
|
115
|
+
|
|
116
|
+
// kick off loading the route chunks
|
|
117
|
+
const routeChunkPromise = Promise.all(
|
|
118
|
+
matches.map((match) => {
|
|
119
|
+
const route = router.looseRoutesById[match.routeId]!
|
|
120
|
+
return router.loadRouteChunk(route)
|
|
121
|
+
}),
|
|
122
|
+
)
|
|
123
|
+
|
|
124
|
+
// Right after hydration and before the first render, we need to rehydrate each match
|
|
125
|
+
// First step is to reyhdrate loaderData and __beforeLoadContext
|
|
126
|
+
matches.forEach((match) => {
|
|
127
|
+
const dehydratedMatch = window.__TSR_SSR__!.matches.find(
|
|
128
|
+
(d) => d.id === match.id,
|
|
129
|
+
)
|
|
130
|
+
|
|
131
|
+
if (!dehydratedMatch) {
|
|
132
|
+
return
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
Object.assign(match, dehydratedMatch)
|
|
136
|
+
|
|
137
|
+
// Handle beforeLoadContext
|
|
138
|
+
if (dehydratedMatch.__beforeLoadContext) {
|
|
139
|
+
match.__beforeLoadContext = router.ssr!.serializer.parse(
|
|
140
|
+
dehydratedMatch.__beforeLoadContext,
|
|
141
|
+
) as any
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
// Handle loaderData
|
|
145
|
+
if (dehydratedMatch.loaderData) {
|
|
146
|
+
match.loaderData = router.ssr!.serializer.parse(
|
|
147
|
+
dehydratedMatch.loaderData,
|
|
148
|
+
)
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
// Handle error
|
|
152
|
+
if (dehydratedMatch.error) {
|
|
153
|
+
match.error = router.ssr!.serializer.parse(dehydratedMatch.error)
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
// Handle extracted
|
|
157
|
+
;(match as unknown as SsrMatch).extracted?.forEach((ex) => {
|
|
158
|
+
deepMutableSetByPath(match, ['loaderData', ...ex.path], ex.value)
|
|
159
|
+
})
|
|
160
|
+
|
|
161
|
+
return match
|
|
162
|
+
})
|
|
163
|
+
|
|
164
|
+
router.__store.setState((s) => {
|
|
165
|
+
return {
|
|
166
|
+
...s,
|
|
167
|
+
matches,
|
|
168
|
+
}
|
|
169
|
+
})
|
|
170
|
+
|
|
171
|
+
// Allow the user to handle custom hydration data
|
|
172
|
+
await router.options.hydrate?.(dehydratedData)
|
|
173
|
+
|
|
174
|
+
// now that all necessary data is hydrated:
|
|
175
|
+
// 1) fully reconstruct the route context
|
|
176
|
+
// 2) execute `head()` and `scripts()` for each match
|
|
177
|
+
await Promise.all(
|
|
178
|
+
router.state.matches.map(async (match) => {
|
|
179
|
+
const route = router.looseRoutesById[match.routeId]!
|
|
180
|
+
|
|
181
|
+
const parentMatch = router.state.matches[match.index - 1]
|
|
182
|
+
const parentContext = parentMatch?.context ?? router.options.context ?? {}
|
|
183
|
+
|
|
184
|
+
// `context()` was already executed by `matchRoutes`, however route context was not yet fully reconstructed
|
|
185
|
+
// so run it again and merge route context
|
|
186
|
+
const contextFnContext: RouteContextOptions<any, any, any, any> = {
|
|
187
|
+
deps: match.loaderDeps,
|
|
188
|
+
params: match.params,
|
|
189
|
+
context: parentContext,
|
|
190
|
+
location: router.state.location,
|
|
191
|
+
navigate: (opts: any) =>
|
|
192
|
+
router.navigate({ ...opts, _fromLocation: router.state.location }),
|
|
193
|
+
buildLocation: router.buildLocation,
|
|
194
|
+
cause: match.cause,
|
|
195
|
+
abortController: match.abortController,
|
|
196
|
+
preload: false,
|
|
197
|
+
matches,
|
|
198
|
+
}
|
|
199
|
+
match.__routeContext = route.options.context?.(contextFnContext) ?? {}
|
|
200
|
+
|
|
201
|
+
match.context = {
|
|
202
|
+
...parentContext,
|
|
203
|
+
...match.__routeContext,
|
|
204
|
+
...match.__beforeLoadContext,
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
const assetContext = {
|
|
208
|
+
matches: router.state.matches,
|
|
209
|
+
match,
|
|
210
|
+
params: match.params,
|
|
211
|
+
loaderData: match.loaderData,
|
|
212
|
+
}
|
|
213
|
+
const headFnContent = await route.options.head?.(assetContext)
|
|
214
|
+
|
|
215
|
+
const scripts = await route.options.scripts?.(assetContext)
|
|
216
|
+
|
|
217
|
+
match.meta = headFnContent?.meta
|
|
218
|
+
match.links = headFnContent?.links
|
|
219
|
+
match.headScripts = headFnContent?.scripts
|
|
220
|
+
match.scripts = scripts
|
|
221
|
+
}),
|
|
222
|
+
)
|
|
223
|
+
|
|
224
|
+
if (matches[matches.length - 1]!.id !== lastMatchId) {
|
|
225
|
+
return await Promise.all([routeChunkPromise, router.load()])
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
return routeChunkPromise
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
function deepMutableSetByPath<T>(obj: T, path: Array<string>, value: any) {
|
|
232
|
+
// mutable set by path retaining array and object references
|
|
233
|
+
if (path.length === 1) {
|
|
234
|
+
;(obj as any)[path[0]!] = value
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
const [key, ...rest] = path
|
|
238
|
+
|
|
239
|
+
if (Array.isArray(obj)) {
|
|
240
|
+
deepMutableSetByPath(obj[Number(key)], rest, value)
|
|
241
|
+
} else if (isPlainObject(obj)) {
|
|
242
|
+
deepMutableSetByPath((obj as any)[key!], rest, value)
|
|
243
|
+
}
|
|
244
|
+
}
|