@tanstack/router-core 0.0.1-beta.5 → 0.0.1-beta.7
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/build/cjs/packages/router-core/src/index.js +1 -0
- package/build/cjs/packages/router-core/src/index.js.map +1 -1
- package/build/cjs/packages/router-core/src/router.js +20 -5
- package/build/cjs/packages/router-core/src/router.js.map +1 -1
- package/build/cjs/packages/router-core/src/utils.js +7 -0
- package/build/cjs/packages/router-core/src/utils.js.map +1 -1
- package/build/esm/index.js +27 -6
- package/build/esm/index.js.map +1 -1
- package/build/stats-html.html +1 -1
- package/build/stats-react.json +134 -134
- package/build/types/index.d.ts +9 -1
- package/build/umd/index.development.js +27 -5
- package/build/umd/index.development.js.map +1 -1
- package/build/umd/index.production.js +1 -1
- package/build/umd/index.production.js.map +1 -1
- package/package.json +1 -1
- package/src/router.ts +58 -6
- package/src/utils.ts +7 -0
package/package.json
CHANGED
package/src/router.ts
CHANGED
|
@@ -45,6 +45,7 @@ import { defaultParseSearch, defaultStringifySearch } from './searchParams'
|
|
|
45
45
|
import {
|
|
46
46
|
functionalUpdate,
|
|
47
47
|
last,
|
|
48
|
+
pick,
|
|
48
49
|
PickAsRequired,
|
|
49
50
|
PickRequired,
|
|
50
51
|
replaceEqualDeep,
|
|
@@ -224,6 +225,22 @@ type LinkCurrentTargetElement = {
|
|
|
224
225
|
preloadTimeout?: null | ReturnType<typeof setTimeout>
|
|
225
226
|
}
|
|
226
227
|
|
|
228
|
+
interface DehydratedRouterState
|
|
229
|
+
extends Pick<RouterState, 'status' | 'location' | 'lastUpdated'> {
|
|
230
|
+
matches: DehydratedRouteMatch[]
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
interface DehydratedRouteMatch
|
|
234
|
+
extends Pick<
|
|
235
|
+
RouteMatch<any, any>,
|
|
236
|
+
| 'matchId'
|
|
237
|
+
| 'status'
|
|
238
|
+
| 'routeLoaderData'
|
|
239
|
+
| 'loaderData'
|
|
240
|
+
| 'isInvalid'
|
|
241
|
+
| 'invalidAt'
|
|
242
|
+
> {}
|
|
243
|
+
|
|
227
244
|
export interface Router<
|
|
228
245
|
TRouteConfig extends AnyRouteConfig = RouteConfig,
|
|
229
246
|
TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>,
|
|
@@ -302,6 +319,8 @@ export interface Router<
|
|
|
302
319
|
>(
|
|
303
320
|
opts: LinkOptions<TAllRouteInfo, TFrom, TTo>,
|
|
304
321
|
) => LinkInfo
|
|
322
|
+
dehydrateState: () => DehydratedRouterState
|
|
323
|
+
hydrateState: (state: DehydratedRouterState) => void
|
|
305
324
|
__: {
|
|
306
325
|
buildRouteTree: (
|
|
307
326
|
routeConfig: RouteConfig,
|
|
@@ -396,6 +415,45 @@ export function createRouter<
|
|
|
396
415
|
router.listeners.forEach((listener) => listener(router))
|
|
397
416
|
},
|
|
398
417
|
|
|
418
|
+
dehydrateState: () => {
|
|
419
|
+
return {
|
|
420
|
+
...pick(router.state, ['status', 'location', 'lastUpdated']),
|
|
421
|
+
matches: router.state.matches.map((match) =>
|
|
422
|
+
pick(match, [
|
|
423
|
+
'matchId',
|
|
424
|
+
'status',
|
|
425
|
+
'routeLoaderData',
|
|
426
|
+
'loaderData',
|
|
427
|
+
'isInvalid',
|
|
428
|
+
'invalidAt',
|
|
429
|
+
]),
|
|
430
|
+
),
|
|
431
|
+
}
|
|
432
|
+
},
|
|
433
|
+
|
|
434
|
+
hydrateState: (dehydratedState) => {
|
|
435
|
+
// Match the routes
|
|
436
|
+
const matches = router.matchRoutes(router.location.pathname, {
|
|
437
|
+
strictParseParams: true,
|
|
438
|
+
})
|
|
439
|
+
|
|
440
|
+
router.state = {
|
|
441
|
+
...router.state,
|
|
442
|
+
...dehydratedState,
|
|
443
|
+
matches: matches.map((match) => {
|
|
444
|
+
const dehydratedMatch = dehydratedState.matches.find(
|
|
445
|
+
(d: any) => d.matchId === match.matchId,
|
|
446
|
+
)
|
|
447
|
+
invariant(
|
|
448
|
+
dehydratedMatch,
|
|
449
|
+
'Oh no! Dehydrated route matches did not match the active state of the router 😬',
|
|
450
|
+
)
|
|
451
|
+
Object.assign(match, dehydratedMatch)
|
|
452
|
+
return match
|
|
453
|
+
}),
|
|
454
|
+
}
|
|
455
|
+
},
|
|
456
|
+
|
|
399
457
|
mount: () => {
|
|
400
458
|
const next = router.__.buildLocation({
|
|
401
459
|
to: '.',
|
|
@@ -1019,12 +1077,6 @@ export function createRouter<
|
|
|
1019
1077
|
return routeConfigs.map((routeConfig) => {
|
|
1020
1078
|
const routeOptions = routeConfig.options
|
|
1021
1079
|
const route = createRoute(routeConfig, routeOptions, parent, router)
|
|
1022
|
-
|
|
1023
|
-
// {
|
|
1024
|
-
// pendingMs: routeOptions.pendingMs ?? router.defaultPendingMs,
|
|
1025
|
-
// pendingMinMs: routeOptions.pendingMinMs ?? router.defaultPendingMinMs,
|
|
1026
|
-
// }
|
|
1027
|
-
|
|
1028
1080
|
const existingRoute = (router.routesById as any)[route.routeId]
|
|
1029
1081
|
|
|
1030
1082
|
if (existingRoute) {
|
package/src/utils.ts
CHANGED
|
@@ -155,3 +155,10 @@ export function functionalUpdate<TResult>(
|
|
|
155
155
|
|
|
156
156
|
return updater
|
|
157
157
|
}
|
|
158
|
+
|
|
159
|
+
export function pick<T, K extends keyof T>(parent: T, keys: K[]): Pick<T, K> {
|
|
160
|
+
return keys.reduce((obj: any, key: K) => {
|
|
161
|
+
obj[key] = parent[key]
|
|
162
|
+
return obj
|
|
163
|
+
}, {} as any)
|
|
164
|
+
}
|