@tanstack/solid-router 1.110.0 → 1.111.4
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/Matches.cjs.map +1 -1
- package/dist/cjs/Matches.d.cts +1 -3
- package/dist/cjs/RouterProvider.cjs.map +1 -1
- package/dist/cjs/RouterProvider.d.cts +0 -25
- package/dist/cjs/fileRoute.cjs.map +1 -1
- package/dist/cjs/fileRoute.d.cts +2 -14
- package/dist/cjs/index.d.cts +6 -7
- package/dist/cjs/link.cjs.map +1 -1
- package/dist/cjs/link.d.cts +1 -73
- package/dist/cjs/not-found.cjs.map +1 -1
- package/dist/cjs/not-found.d.cts +1 -1
- package/dist/cjs/redirects.cjs.map +1 -1
- package/dist/cjs/redirects.d.cts +1 -3
- package/dist/cjs/route.cjs.map +1 -1
- package/dist/cjs/route.d.cts +10 -50
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/cjs/router.d.cts +2 -8
- package/dist/cjs/typePrimitives.d.cts +2 -3
- package/dist/cjs/useBlocker.cjs.map +1 -1
- package/dist/cjs/useBlocker.d.cts +1 -1
- package/dist/cjs/useLoaderData.cjs.map +1 -1
- package/dist/cjs/useLoaderData.d.cts +1 -2
- package/dist/cjs/useLoaderDeps.cjs.map +1 -1
- package/dist/cjs/useLoaderDeps.d.cts +1 -2
- package/dist/cjs/useNavigate.cjs.map +1 -1
- package/dist/cjs/useNavigate.d.cts +1 -1
- package/dist/cjs/useParams.cjs.map +1 -1
- package/dist/cjs/useParams.d.cts +1 -2
- package/dist/cjs/useRouteContext.cjs.map +1 -1
- package/dist/cjs/useRouteContext.d.cts +1 -2
- package/dist/cjs/useSearch.cjs.map +1 -1
- package/dist/cjs/useSearch.d.cts +1 -2
- package/dist/cjs/utils.cjs.map +1 -1
- package/dist/cjs/utils.d.cts +2 -3
- package/dist/esm/Matches.d.ts +1 -3
- package/dist/esm/Matches.js.map +1 -1
- package/dist/esm/RouterProvider.d.ts +0 -25
- package/dist/esm/RouterProvider.js.map +1 -1
- package/dist/esm/fileRoute.d.ts +2 -14
- package/dist/esm/fileRoute.js.map +1 -1
- package/dist/esm/index.d.ts +6 -7
- package/dist/esm/link.d.ts +1 -73
- package/dist/esm/link.js.map +1 -1
- package/dist/esm/not-found.d.ts +1 -1
- package/dist/esm/not-found.js.map +1 -1
- package/dist/esm/redirects.d.ts +1 -3
- package/dist/esm/redirects.js.map +1 -1
- package/dist/esm/route.d.ts +10 -50
- package/dist/esm/route.js.map +1 -1
- package/dist/esm/router.d.ts +2 -8
- package/dist/esm/router.js.map +1 -1
- package/dist/esm/typePrimitives.d.ts +2 -3
- package/dist/esm/useBlocker.d.ts +1 -1
- package/dist/esm/useBlocker.js.map +1 -1
- package/dist/esm/useLoaderData.d.ts +1 -2
- package/dist/esm/useLoaderData.js.map +1 -1
- package/dist/esm/useLoaderDeps.d.ts +1 -2
- package/dist/esm/useLoaderDeps.js.map +1 -1
- package/dist/esm/useNavigate.d.ts +1 -1
- package/dist/esm/useNavigate.js.map +1 -1
- package/dist/esm/useParams.d.ts +1 -2
- package/dist/esm/useParams.js.map +1 -1
- package/dist/esm/useRouteContext.d.ts +1 -2
- package/dist/esm/useRouteContext.js.map +1 -1
- package/dist/esm/useSearch.d.ts +1 -2
- package/dist/esm/useSearch.js.map +1 -1
- package/dist/esm/utils.d.ts +2 -3
- package/dist/esm/utils.js.map +1 -1
- package/dist/source/Asset.d.ts +2 -0
- package/dist/source/Asset.jsx +22 -0
- package/dist/source/Asset.jsx.map +1 -0
- package/dist/source/CatchBoundary.d.ts +11 -0
- package/dist/source/CatchBoundary.jsx +43 -0
- package/dist/source/CatchBoundary.jsx.map +1 -0
- package/dist/source/HeadContent.d.ts +8 -0
- package/dist/source/HeadContent.jsx +125 -0
- package/dist/source/HeadContent.jsx.map +1 -0
- package/dist/source/Match.d.ts +8 -0
- package/dist/source/Match.jsx +256 -0
- package/dist/source/Match.jsx.map +1 -0
- package/dist/source/Matches.d.ts +67 -0
- package/dist/source/Matches.jsx +103 -0
- package/dist/source/Matches.jsx.map +1 -0
- package/dist/source/RouterProvider.d.ts +10 -0
- package/dist/source/RouterProvider.jsx +27 -0
- package/dist/source/RouterProvider.jsx.map +1 -0
- package/dist/source/SafeFragment.d.ts +1 -0
- package/dist/source/SafeFragment.jsx +4 -0
- package/dist/source/SafeFragment.jsx.map +1 -0
- package/dist/source/ScriptOnce.d.ts +5 -0
- package/dist/source/ScriptOnce.jsx +17 -0
- package/dist/source/ScriptOnce.jsx.map +1 -0
- package/dist/source/Scripts.d.ts +1 -0
- package/dist/source/Scripts.jsx +49 -0
- package/dist/source/Scripts.jsx.map +1 -0
- package/dist/source/ScrollRestoration.d.ts +15 -0
- package/dist/source/ScrollRestoration.jsx +36 -0
- package/dist/source/ScrollRestoration.jsx.map +1 -0
- package/dist/source/Transitioner.d.ts +1 -0
- package/dist/source/Transitioner.jsx +112 -0
- package/dist/source/Transitioner.jsx.map +1 -0
- package/dist/source/awaited.d.ts +11 -0
- package/dist/source/awaited.jsx +24 -0
- package/dist/source/awaited.jsx.map +1 -0
- package/dist/source/fileRoute.d.ts +46 -0
- package/dist/source/fileRoute.js +85 -0
- package/dist/source/fileRoute.js.map +1 -0
- package/dist/source/history.d.ts +8 -0
- package/dist/source/history.js +2 -0
- package/dist/source/history.js.map +1 -0
- package/dist/source/index.d.ts +52 -0
- package/dist/source/index.jsx +41 -0
- package/dist/source/index.jsx.map +1 -0
- package/dist/source/lazyRouteComponent.d.ts +7 -0
- package/dist/source/lazyRouteComponent.jsx +82 -0
- package/dist/source/lazyRouteComponent.jsx.map +1 -0
- package/dist/source/link.d.ts +41 -0
- package/dist/source/link.jsx +339 -0
- package/dist/source/link.jsx.map +1 -0
- package/dist/source/matchContext.d.ts +3 -0
- package/dist/source/matchContext.jsx +5 -0
- package/dist/source/matchContext.jsx.map +1 -0
- package/dist/source/not-found.d.ts +27 -0
- package/dist/source/not-found.jsx +39 -0
- package/dist/source/not-found.jsx.map +1 -0
- package/dist/source/redirects.d.ts +19 -0
- package/dist/source/redirects.js +25 -0
- package/dist/source/redirects.js.map +1 -0
- package/dist/source/renderRouteNotFound.d.ts +3 -0
- package/dist/source/renderRouteNotFound.jsx +15 -0
- package/dist/source/renderRouteNotFound.jsx.map +1 -0
- package/dist/source/route.d.ts +257 -0
- package/dist/source/route.js +240 -0
- package/dist/source/route.js.map +1 -0
- package/dist/source/router.d.ts +550 -0
- package/dist/source/router.js +1802 -0
- package/dist/source/router.js.map +1 -0
- package/dist/source/routerContext.d.ts +8 -0
- package/dist/source/routerContext.jsx +13 -0
- package/dist/source/routerContext.jsx.map +1 -0
- package/dist/source/scroll-restoration.d.ts +29 -0
- package/dist/source/scroll-restoration.jsx +244 -0
- package/dist/source/scroll-restoration.jsx.map +1 -0
- package/dist/source/typePrimitives.d.ts +70 -0
- package/dist/source/typePrimitives.js +2 -0
- package/dist/source/typePrimitives.js.map +1 -0
- package/dist/source/useBlocker.d.ts +68 -0
- package/dist/source/useBlocker.jsx +136 -0
- package/dist/source/useBlocker.jsx.map +1 -0
- package/dist/source/useCanGoBack.d.ts +1 -0
- package/dist/source/useCanGoBack.js +5 -0
- package/dist/source/useCanGoBack.js.map +1 -0
- package/dist/source/useLoaderData.d.ts +12 -0
- package/dist/source/useLoaderData.jsx +11 -0
- package/dist/source/useLoaderData.jsx.map +1 -0
- package/dist/source/useLoaderDeps.d.ts +11 -0
- package/dist/source/useLoaderDeps.jsx +11 -0
- package/dist/source/useLoaderDeps.jsx.map +1 -0
- package/dist/source/useLocation.d.ts +7 -0
- package/dist/source/useLocation.jsx +7 -0
- package/dist/source/useLocation.jsx.map +1 -0
- package/dist/source/useMatch.d.ts +14 -0
- package/dist/source/useMatch.jsx +19 -0
- package/dist/source/useMatch.jsx.map +1 -0
- package/dist/source/useNavigate.d.ts +7 -0
- package/dist/source/useNavigate.jsx +32 -0
- package/dist/source/useNavigate.jsx.map +1 -0
- package/dist/source/useParams.d.ts +14 -0
- package/dist/source/useParams.jsx +12 -0
- package/dist/source/useParams.jsx.map +1 -0
- package/dist/source/useRouteContext.d.ts +12 -0
- package/dist/source/useRouteContext.js +8 -0
- package/dist/source/useRouteContext.js.map +1 -0
- package/dist/source/useRouter.d.ts +4 -0
- package/dist/source/useRouter.jsx +9 -0
- package/dist/source/useRouter.jsx.map +1 -0
- package/dist/source/useRouterState.d.ts +8 -0
- package/dist/source/useRouterState.jsx +14 -0
- package/dist/source/useRouterState.jsx.map +1 -0
- package/dist/source/useSearch.d.ts +14 -0
- package/dist/source/useSearch.jsx +12 -0
- package/dist/source/useSearch.jsx.map +1 -0
- package/dist/source/utils.d.ts +43 -0
- package/dist/source/utils.js +59 -0
- package/dist/source/utils.js.map +1 -0
- package/package.json +6 -2
- package/src/Matches.tsx +11 -15
- package/src/RouterProvider.tsx +0 -48
- package/src/fileRoute.ts +3 -31
- package/src/index.tsx +47 -54
- package/src/link.tsx +3 -427
- package/src/not-found.tsx +1 -1
- package/src/redirects.ts +5 -3
- package/src/route.ts +101 -154
- package/src/router.ts +11 -25
- package/src/typePrimitives.ts +9 -8
- package/src/useBlocker.tsx +1 -1
- package/src/useLoaderData.tsx +1 -2
- package/src/useLoaderDeps.tsx +1 -2
- package/src/useNavigate.tsx +1 -1
- package/src/useParams.tsx +6 -2
- package/src/useRouteContext.ts +2 -2
- package/src/useSearch.tsx +6 -2
- package/src/utils.ts +1 -2
- package/dist/cjs/routeInfo.d.cts +0 -53
- package/dist/esm/routeInfo.d.ts +0 -53
- package/src/routeInfo.ts +0 -239
package/src/route.ts
CHANGED
|
@@ -12,36 +12,43 @@ import type {
|
|
|
12
12
|
AnyPathParams,
|
|
13
13
|
AnySchema,
|
|
14
14
|
AnyValidator,
|
|
15
|
-
|
|
15
|
+
BeforeLoadContextParameter,
|
|
16
|
+
BuildLocationFn,
|
|
16
17
|
Constrain,
|
|
17
18
|
ConstrainLiteral,
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
RootRoute as CoreRootRoute,
|
|
20
|
+
Route as CoreRoute,
|
|
20
21
|
DefaultValidator,
|
|
21
22
|
ErrorComponentProps,
|
|
22
23
|
Expand,
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
InferFullSearchSchemaInput,
|
|
27
|
-
IntersectAssign,
|
|
24
|
+
FullSearchSchemaOption,
|
|
25
|
+
NavigateFn,
|
|
26
|
+
NavigateOptions,
|
|
28
27
|
NoInfer,
|
|
29
28
|
NotFoundRouteProps,
|
|
30
29
|
ParamsOptions,
|
|
31
30
|
ParsedLocation,
|
|
31
|
+
RemountDepsOptions,
|
|
32
|
+
ResolveAllContext,
|
|
33
|
+
ResolveAllParamsFromParent,
|
|
34
|
+
ResolveFullSearchSchema,
|
|
35
|
+
ResolveFullSearchSchemaInput,
|
|
32
36
|
ResolveId,
|
|
33
37
|
ResolveLoaderData,
|
|
34
38
|
ResolveParams,
|
|
35
|
-
ResolveRouteContext,
|
|
36
|
-
ResolveSearchValidatorInput,
|
|
37
|
-
ResolveValidatorOutput,
|
|
38
39
|
RootRouteId,
|
|
40
|
+
RouteById,
|
|
39
41
|
RouteContext,
|
|
42
|
+
RouteContextParameter,
|
|
43
|
+
RouteIds,
|
|
40
44
|
RoutePathOptions,
|
|
41
45
|
RoutePathOptionsIntersection,
|
|
46
|
+
RoutePaths,
|
|
42
47
|
RoutePrefix,
|
|
48
|
+
RouteTypes,
|
|
43
49
|
SearchFilter,
|
|
44
50
|
SearchMiddleware,
|
|
51
|
+
ToMaskOptions,
|
|
45
52
|
TrimPathRight,
|
|
46
53
|
UpdatableStaticRouteOption,
|
|
47
54
|
} from '@tanstack/router-core'
|
|
@@ -58,10 +65,7 @@ import type {
|
|
|
58
65
|
MakeRouteMatchUnion,
|
|
59
66
|
RouteMatch,
|
|
60
67
|
} from './Matches'
|
|
61
|
-
import type { NavigateOptions, ToMaskOptions } from './link'
|
|
62
|
-
import type { ParseRoute, RouteById, RouteIds, RoutePaths } from './routeInfo'
|
|
63
68
|
import type { AnyRouter, RegisteredRouter, Router } from './router'
|
|
64
|
-
import type { BuildLocationFn, NavigateFn } from './RouterProvider'
|
|
65
69
|
import type { NotFoundError } from './not-found'
|
|
66
70
|
import type { LazyRoute } from './fileRoute'
|
|
67
71
|
|
|
@@ -106,13 +110,6 @@ export type RouteOptions<
|
|
|
106
110
|
NoInfer<TBeforeLoadFn>
|
|
107
111
|
>
|
|
108
112
|
|
|
109
|
-
export interface FullSearchSchemaOption<
|
|
110
|
-
in out TParentRoute extends AnyRoute,
|
|
111
|
-
in out TSearchValidator,
|
|
112
|
-
> {
|
|
113
|
-
search: Expand<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>
|
|
114
|
-
}
|
|
115
|
-
|
|
116
113
|
export type RouteContextFn<
|
|
117
114
|
in out TParentRoute extends AnyRoute,
|
|
118
115
|
in out TSearchValidator,
|
|
@@ -288,30 +285,6 @@ export interface RouteContextOptions<
|
|
|
288
285
|
context: Expand<RouteContextParameter<TParentRoute, TRouterContext>>
|
|
289
286
|
}
|
|
290
287
|
|
|
291
|
-
export interface RemountDepsOptions<
|
|
292
|
-
in out TRouteId,
|
|
293
|
-
in out TFullSearchSchema,
|
|
294
|
-
in out TAllParams,
|
|
295
|
-
in out TLoaderDeps,
|
|
296
|
-
> {
|
|
297
|
-
routeId: TRouteId
|
|
298
|
-
search: TFullSearchSchema
|
|
299
|
-
params: TAllParams
|
|
300
|
-
loaderDeps: TLoaderDeps
|
|
301
|
-
}
|
|
302
|
-
|
|
303
|
-
export type MakeRemountDepsOptionsUnion<
|
|
304
|
-
TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
|
|
305
|
-
TRoute extends AnyRoute = ParseRoute<TRouteTree>,
|
|
306
|
-
> = TRoute extends any
|
|
307
|
-
? RemountDepsOptions<
|
|
308
|
-
TRoute['id'],
|
|
309
|
-
TRoute['types']['fullSearchSchema'],
|
|
310
|
-
TRoute['types']['allParams'],
|
|
311
|
-
TRoute['types']['loaderDeps']
|
|
312
|
-
>
|
|
313
|
-
: never
|
|
314
|
-
|
|
315
288
|
export interface BeforeLoadContextOptions<
|
|
316
289
|
in out TParentRoute extends AnyRoute,
|
|
317
290
|
in out TSearchValidator,
|
|
@@ -571,50 +544,6 @@ export interface LoaderFnContext<
|
|
|
571
544
|
route: Route
|
|
572
545
|
}
|
|
573
546
|
|
|
574
|
-
export type ResolveFullSearchSchema<
|
|
575
|
-
TParentRoute extends AnyRoute,
|
|
576
|
-
TSearchValidator,
|
|
577
|
-
> = unknown extends TParentRoute
|
|
578
|
-
? ResolveValidatorOutput<TSearchValidator>
|
|
579
|
-
: IntersectAssign<
|
|
580
|
-
InferFullSearchSchema<TParentRoute>,
|
|
581
|
-
ResolveValidatorOutput<TSearchValidator>
|
|
582
|
-
>
|
|
583
|
-
|
|
584
|
-
export type ResolveFullSearchSchemaInput<
|
|
585
|
-
TParentRoute extends AnyRoute,
|
|
586
|
-
TSearchValidator,
|
|
587
|
-
> = IntersectAssign<
|
|
588
|
-
InferFullSearchSchemaInput<TParentRoute>,
|
|
589
|
-
ResolveSearchValidatorInput<TSearchValidator>
|
|
590
|
-
>
|
|
591
|
-
|
|
592
|
-
export type RouteContextParameter<
|
|
593
|
-
TParentRoute extends AnyRoute,
|
|
594
|
-
TRouterContext,
|
|
595
|
-
> = unknown extends TParentRoute
|
|
596
|
-
? TRouterContext
|
|
597
|
-
: Assign<TRouterContext, InferAllContext<TParentRoute>>
|
|
598
|
-
|
|
599
|
-
export type BeforeLoadContextParameter<
|
|
600
|
-
TParentRoute extends AnyRoute,
|
|
601
|
-
TRouterContext,
|
|
602
|
-
TRouteContextFn,
|
|
603
|
-
> = Assign<
|
|
604
|
-
RouteContextParameter<TParentRoute, TRouterContext>,
|
|
605
|
-
ContextReturnType<TRouteContextFn>
|
|
606
|
-
>
|
|
607
|
-
|
|
608
|
-
export type ResolveAllContext<
|
|
609
|
-
TParentRoute extends AnyRoute,
|
|
610
|
-
TRouterContext,
|
|
611
|
-
TRouteContextFn,
|
|
612
|
-
TBeforeLoadFn,
|
|
613
|
-
> = Assign<
|
|
614
|
-
BeforeLoadContextParameter<TParentRoute, TRouterContext, TRouteContextFn>,
|
|
615
|
-
ContextAsyncReturnType<TBeforeLoadFn>
|
|
616
|
-
>
|
|
617
|
-
|
|
618
547
|
export interface AnyRoute
|
|
619
548
|
extends Route<
|
|
620
549
|
any,
|
|
@@ -629,6 +558,7 @@ export interface AnyRoute
|
|
|
629
558
|
any,
|
|
630
559
|
any,
|
|
631
560
|
any,
|
|
561
|
+
any,
|
|
632
562
|
any
|
|
633
563
|
> {}
|
|
634
564
|
|
|
@@ -636,11 +566,6 @@ export type AnyRouteWithContext<TContext> = AnyRoute & {
|
|
|
636
566
|
types: { allContext: TContext }
|
|
637
567
|
}
|
|
638
568
|
|
|
639
|
-
export type ResolveAllParamsFromParent<
|
|
640
|
-
TParentRoute extends AnyRoute,
|
|
641
|
-
TParams,
|
|
642
|
-
> = Assign<InferAllParams<TParentRoute>, TParams>
|
|
643
|
-
|
|
644
569
|
export type RouteConstraints = {
|
|
645
570
|
TParentRoute: AnyRoute
|
|
646
571
|
TPath: string
|
|
@@ -749,7 +674,25 @@ export class Route<
|
|
|
749
674
|
in out TLoaderDeps extends Record<string, any> = {},
|
|
750
675
|
in out TLoaderFn = undefined,
|
|
751
676
|
in out TChildren = unknown,
|
|
752
|
-
|
|
677
|
+
in out TFileRouteTypes = unknown,
|
|
678
|
+
> implements
|
|
679
|
+
CoreRoute<
|
|
680
|
+
TParentRoute,
|
|
681
|
+
TPath,
|
|
682
|
+
TFullPath,
|
|
683
|
+
TCustomId,
|
|
684
|
+
TId,
|
|
685
|
+
TSearchValidator,
|
|
686
|
+
TParams,
|
|
687
|
+
TRouterContext,
|
|
688
|
+
TRouteContextFn,
|
|
689
|
+
TBeforeLoadFn,
|
|
690
|
+
TLoaderDeps,
|
|
691
|
+
TLoaderFn,
|
|
692
|
+
TChildren,
|
|
693
|
+
TFileRouteTypes
|
|
694
|
+
>
|
|
695
|
+
{
|
|
753
696
|
isRoot: TParentRoute extends Route<any> ? true : false
|
|
754
697
|
options: RouteOptions<
|
|
755
698
|
TParentRoute,
|
|
@@ -847,37 +790,22 @@ export class Route<
|
|
|
847
790
|
)
|
|
848
791
|
}
|
|
849
792
|
|
|
850
|
-
types!:
|
|
851
|
-
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
|
|
862
|
-
|
|
863
|
-
|
|
864
|
-
|
|
865
|
-
|
|
866
|
-
allParams: ResolveAllParamsFromParent<TParentRoute, TParams>
|
|
867
|
-
routerContext: TRouterContext
|
|
868
|
-
routeContext: ResolveRouteContext<TRouteContextFn, TBeforeLoadFn>
|
|
869
|
-
routeContextFn: TRouteContextFn
|
|
870
|
-
beforeLoadFn: TBeforeLoadFn
|
|
871
|
-
allContext: ResolveAllContext<
|
|
872
|
-
TParentRoute,
|
|
873
|
-
TRouterContext,
|
|
874
|
-
TRouteContextFn,
|
|
875
|
-
TBeforeLoadFn
|
|
876
|
-
>
|
|
877
|
-
children: TChildren
|
|
878
|
-
loaderData: ResolveLoaderData<TLoaderFn>
|
|
879
|
-
loaderDeps: TLoaderDeps
|
|
880
|
-
}
|
|
793
|
+
types!: RouteTypes<
|
|
794
|
+
TParentRoute,
|
|
795
|
+
TPath,
|
|
796
|
+
TFullPath,
|
|
797
|
+
TCustomId,
|
|
798
|
+
TId,
|
|
799
|
+
TSearchValidator,
|
|
800
|
+
TParams,
|
|
801
|
+
TRouterContext,
|
|
802
|
+
TRouteContextFn,
|
|
803
|
+
TBeforeLoadFn,
|
|
804
|
+
TLoaderDeps,
|
|
805
|
+
TLoaderFn,
|
|
806
|
+
TChildren,
|
|
807
|
+
TFileRouteTypes
|
|
808
|
+
>
|
|
881
809
|
|
|
882
810
|
init = (opts: { originalIndex: number; defaultSsr?: boolean }): void => {
|
|
883
811
|
this.originalIndex = opts.originalIndex
|
|
@@ -967,7 +895,8 @@ export class Route<
|
|
|
967
895
|
TBeforeLoadFn,
|
|
968
896
|
TLoaderDeps,
|
|
969
897
|
TLoaderFn,
|
|
970
|
-
TNewChildren
|
|
898
|
+
TNewChildren,
|
|
899
|
+
TFileRouteTypes
|
|
971
900
|
> {
|
|
972
901
|
return this._addFileChildren(children) as Route<
|
|
973
902
|
TParentRoute,
|
|
@@ -982,7 +911,8 @@ export class Route<
|
|
|
982
911
|
TBeforeLoadFn,
|
|
983
912
|
TLoaderDeps,
|
|
984
913
|
TLoaderFn,
|
|
985
|
-
TNewChildren
|
|
914
|
+
TNewChildren,
|
|
915
|
+
TFileRouteTypes
|
|
986
916
|
>
|
|
987
917
|
}
|
|
988
918
|
|
|
@@ -1001,7 +931,8 @@ export class Route<
|
|
|
1001
931
|
TBeforeLoadFn,
|
|
1002
932
|
TLoaderDeps,
|
|
1003
933
|
TLoaderFn,
|
|
1004
|
-
TNewChildren
|
|
934
|
+
TNewChildren,
|
|
935
|
+
TFileRouteTypes
|
|
1005
936
|
> {
|
|
1006
937
|
if (Array.isArray(children)) {
|
|
1007
938
|
this.children = children as TChildren
|
|
@@ -1024,7 +955,8 @@ export class Route<
|
|
|
1024
955
|
TBeforeLoadFn,
|
|
1025
956
|
TLoaderDeps,
|
|
1026
957
|
TLoaderFn,
|
|
1027
|
-
TNewChildren
|
|
958
|
+
TNewChildren,
|
|
959
|
+
TFileRouteTypes
|
|
1028
960
|
>
|
|
1029
961
|
}
|
|
1030
962
|
|
|
@@ -1056,7 +988,8 @@ export class Route<
|
|
|
1056
988
|
TBeforeLoadFn,
|
|
1057
989
|
TLoaderDeps,
|
|
1058
990
|
TNewLoaderFn,
|
|
1059
|
-
TChildren
|
|
991
|
+
TChildren,
|
|
992
|
+
TFileRouteTypes
|
|
1060
993
|
>
|
|
1061
994
|
}
|
|
1062
995
|
|
|
@@ -1245,29 +1178,43 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
|
|
|
1245
1178
|
export const rootRouteWithContext = createRootRouteWithContext
|
|
1246
1179
|
|
|
1247
1180
|
export class RootRoute<
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1254
|
-
|
|
1255
|
-
|
|
1256
|
-
>
|
|
1257
|
-
|
|
1258
|
-
|
|
1259
|
-
|
|
1260
|
-
|
|
1261
|
-
|
|
1262
|
-
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
|
|
1268
|
-
|
|
1269
|
-
|
|
1270
|
-
|
|
1181
|
+
in out TSearchValidator = undefined,
|
|
1182
|
+
in out TRouterContext = {},
|
|
1183
|
+
in out TRouteContextFn = AnyContext,
|
|
1184
|
+
in out TBeforeLoadFn = AnyContext,
|
|
1185
|
+
in out TLoaderDeps extends Record<string, any> = {},
|
|
1186
|
+
in out TLoaderFn = undefined,
|
|
1187
|
+
in out TChildren = unknown,
|
|
1188
|
+
in out TFileRouteTypes = unknown,
|
|
1189
|
+
>
|
|
1190
|
+
extends Route<
|
|
1191
|
+
any, // TParentRoute
|
|
1192
|
+
'/', // TPath
|
|
1193
|
+
'/', // TFullPath
|
|
1194
|
+
string, // TCustomId
|
|
1195
|
+
RootRouteId, // TId
|
|
1196
|
+
TSearchValidator, // TSearchValidator
|
|
1197
|
+
{}, // TParams
|
|
1198
|
+
TRouterContext,
|
|
1199
|
+
TRouteContextFn,
|
|
1200
|
+
TBeforeLoadFn,
|
|
1201
|
+
TLoaderDeps,
|
|
1202
|
+
TLoaderFn,
|
|
1203
|
+
TChildren, // TChildren
|
|
1204
|
+
TFileRouteTypes
|
|
1205
|
+
>
|
|
1206
|
+
implements
|
|
1207
|
+
CoreRootRoute<
|
|
1208
|
+
TSearchValidator,
|
|
1209
|
+
TRouterContext,
|
|
1210
|
+
TRouteContextFn,
|
|
1211
|
+
TBeforeLoadFn,
|
|
1212
|
+
TLoaderDeps,
|
|
1213
|
+
TLoaderFn,
|
|
1214
|
+
TChildren,
|
|
1215
|
+
TFileRouteTypes
|
|
1216
|
+
>
|
|
1217
|
+
{
|
|
1271
1218
|
/**
|
|
1272
1219
|
* @deprecated `RootRoute` is now an internal implementation detail. Use `createRootRoute()` instead.
|
|
1273
1220
|
*/
|
package/src/router.ts
CHANGED
|
@@ -42,42 +42,43 @@ import type {
|
|
|
42
42
|
AnyContext,
|
|
43
43
|
AnySchema,
|
|
44
44
|
AnyValidator,
|
|
45
|
+
BuildLocationFn,
|
|
45
46
|
CommitLocationOptions,
|
|
46
47
|
ControlledPromise,
|
|
48
|
+
FullSearchSchema,
|
|
49
|
+
MakeRemountDepsOptionsUnion,
|
|
47
50
|
Manifest,
|
|
51
|
+
NavigateFn,
|
|
52
|
+
NavigateOptions,
|
|
48
53
|
NonNullableUpdater,
|
|
49
54
|
ParsedLocation,
|
|
50
55
|
PickAsRequired,
|
|
56
|
+
Register,
|
|
51
57
|
ResolveRelativePath,
|
|
58
|
+
RouteById,
|
|
59
|
+
RoutePaths,
|
|
60
|
+
RoutesById,
|
|
61
|
+
RoutesByPath,
|
|
52
62
|
SearchMiddleware,
|
|
53
63
|
SearchParser,
|
|
54
64
|
SearchSerializer,
|
|
55
65
|
StartSerializer,
|
|
66
|
+
ToOptions,
|
|
56
67
|
TrailingSlashOption,
|
|
57
68
|
Updater,
|
|
58
69
|
ViewTransitionOptions,
|
|
59
70
|
} from '@tanstack/router-core'
|
|
60
71
|
import type {
|
|
61
72
|
AnyRoute,
|
|
62
|
-
AnyRouteWithContext,
|
|
63
73
|
BeforeLoadContextOptions,
|
|
64
74
|
ErrorRouteComponent,
|
|
65
75
|
LoaderFnContext,
|
|
66
|
-
MakeRemountDepsOptionsUnion,
|
|
67
76
|
NotFoundRouteComponent,
|
|
68
77
|
RootRoute,
|
|
69
78
|
RouteComponent,
|
|
70
79
|
RouteContextOptions,
|
|
71
80
|
RouteMask,
|
|
72
81
|
} from './route'
|
|
73
|
-
|
|
74
|
-
import type {
|
|
75
|
-
FullSearchSchema,
|
|
76
|
-
RouteById,
|
|
77
|
-
RoutePaths,
|
|
78
|
-
RoutesById,
|
|
79
|
-
RoutesByPath,
|
|
80
|
-
} from './routeInfo'
|
|
81
82
|
import type {
|
|
82
83
|
AnyRouteMatch,
|
|
83
84
|
MakeRouteMatch,
|
|
@@ -85,11 +86,8 @@ import type {
|
|
|
85
86
|
MatchRouteOptions,
|
|
86
87
|
} from './Matches'
|
|
87
88
|
|
|
88
|
-
import type { BuildLocationFn, NavigateFn } from './RouterProvider'
|
|
89
|
-
|
|
90
89
|
import type { AnyRedirect, ResolvedRedirect } from './redirects'
|
|
91
90
|
import type { NotFoundError } from './not-found'
|
|
92
|
-
import type { NavigateOptions, ToOptions } from './link'
|
|
93
91
|
|
|
94
92
|
declare global {
|
|
95
93
|
interface Window {
|
|
@@ -97,20 +95,8 @@ declare global {
|
|
|
97
95
|
}
|
|
98
96
|
}
|
|
99
97
|
|
|
100
|
-
export interface Register {
|
|
101
|
-
// router: Router
|
|
102
|
-
}
|
|
103
|
-
|
|
104
98
|
export type AnyRouter = Router<any, any, any, any, any>
|
|
105
99
|
|
|
106
|
-
export type AnyRouterWithContext<TContext> = Router<
|
|
107
|
-
AnyRouteWithContext<TContext>,
|
|
108
|
-
any,
|
|
109
|
-
any,
|
|
110
|
-
any,
|
|
111
|
-
any
|
|
112
|
-
>
|
|
113
|
-
|
|
114
100
|
export type RegisteredRouter = Register extends {
|
|
115
101
|
router: infer TRouter extends AnyRouter
|
|
116
102
|
}
|
package/src/typePrimitives.ts
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
|
+
import type { LinkComponentProps } from './link'
|
|
2
|
+
import type { Redirect } from './redirects'
|
|
3
|
+
import type { AnyRouter, RegisteredRouter } from './router'
|
|
4
|
+
import type { UseParamsOptions, UseParamsResult } from './useParams'
|
|
5
|
+
import type { UseSearchOptions, UseSearchResult } from './useSearch'
|
|
1
6
|
import type {
|
|
7
|
+
Constrain,
|
|
8
|
+
ConstrainLiteral,
|
|
2
9
|
FromPathOption,
|
|
3
|
-
LinkComponentProps,
|
|
4
10
|
NavigateOptions,
|
|
5
11
|
PathParamOptions,
|
|
12
|
+
RouteIds,
|
|
6
13
|
SearchParamOptions,
|
|
7
14
|
ToPathOption,
|
|
8
|
-
} from '
|
|
9
|
-
import type { Redirect } from './redirects'
|
|
10
|
-
import type { RouteIds } from './routeInfo'
|
|
11
|
-
import type { AnyRouter, RegisteredRouter } from './router'
|
|
12
|
-
import type { UseParamsOptions, UseParamsResult } from './useParams'
|
|
13
|
-
import type { UseSearchOptions, UseSearchResult } from './useSearch'
|
|
14
|
-
import type { Constrain, ConstrainLiteral } from '@tanstack/router-core'
|
|
15
|
+
} from '@tanstack/router-core'
|
|
15
16
|
|
|
16
17
|
export type ValidateFromPath<
|
|
17
18
|
TRouter extends AnyRouter = RegisteredRouter,
|
package/src/useBlocker.tsx
CHANGED
|
@@ -6,7 +6,7 @@ import type {
|
|
|
6
6
|
HistoryLocation,
|
|
7
7
|
} from '@tanstack/history'
|
|
8
8
|
import type { AnyRoute, SolidNode } from './route'
|
|
9
|
-
import type { ParseRoute } from '
|
|
9
|
+
import type { ParseRoute } from '@tanstack/router-core'
|
|
10
10
|
import type { AnyRouter, RegisteredRouter } from './router'
|
|
11
11
|
|
|
12
12
|
interface ShouldBlockFnLocation<
|
package/src/useLoaderData.tsx
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { useMatch } from './useMatch'
|
|
2
2
|
import type { Accessor } from 'solid-js'
|
|
3
3
|
import type { AnyRouter, RegisteredRouter } from './router'
|
|
4
|
-
import type { AllLoaderData, RouteById } from './routeInfo'
|
|
5
4
|
import type { StrictOrFrom } from './utils'
|
|
6
|
-
import type { Expand } from '@tanstack/router-core'
|
|
5
|
+
import type { AllLoaderData, Expand, RouteById } from '@tanstack/router-core'
|
|
7
6
|
|
|
8
7
|
export interface UseLoaderDataBaseOptions<
|
|
9
8
|
TRouter extends AnyRouter,
|
package/src/useLoaderDeps.tsx
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { useMatch } from './useMatch'
|
|
2
2
|
import type { AnyRouter, RegisteredRouter } from './router'
|
|
3
|
-
import type { RouteById } from './routeInfo'
|
|
4
3
|
import type { StrictOrFrom } from './utils'
|
|
5
|
-
import type { Expand } from '@tanstack/router-core'
|
|
4
|
+
import type { Expand, RouteById } from '@tanstack/router-core'
|
|
6
5
|
|
|
7
6
|
export interface UseLoaderDepsBaseOptions<
|
|
8
7
|
TRouter extends AnyRouter,
|
package/src/useNavigate.tsx
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as Solid from 'solid-js'
|
|
2
2
|
import { useRouter } from './useRouter'
|
|
3
|
-
import type { FromPathOption, NavigateOptions } from '
|
|
3
|
+
import type { FromPathOption, NavigateOptions } from '@tanstack/router-core'
|
|
4
4
|
import type { AnyRouter, RegisteredRouter } from './router'
|
|
5
5
|
|
|
6
6
|
export type UseNavigateResult<TDefaultFrom extends string> = <
|
package/src/useParams.tsx
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import { useMatch } from './useMatch'
|
|
2
2
|
import type { ThrowConstraint } from './useMatch'
|
|
3
3
|
import type { Accessor } from 'solid-js'
|
|
4
|
-
import type { AllParams, RouteById } from './routeInfo'
|
|
5
4
|
import type { AnyRouter, RegisteredRouter } from './router'
|
|
6
5
|
import type { StrictOrFrom } from './utils'
|
|
7
|
-
import type {
|
|
6
|
+
import type {
|
|
7
|
+
AllParams,
|
|
8
|
+
Expand,
|
|
9
|
+
RouteById,
|
|
10
|
+
ThrowOrOptional,
|
|
11
|
+
} from '@tanstack/router-core'
|
|
8
12
|
|
|
9
13
|
export interface UseParamsBaseOptions<
|
|
10
14
|
TRouter extends AnyRouter,
|
package/src/useRouteContext.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { useMatch } from './useMatch'
|
|
2
2
|
import type { Accessor } from 'solid-js'
|
|
3
|
-
|
|
3
|
+
|
|
4
4
|
import type { AnyRouter, RegisteredRouter } from './router'
|
|
5
5
|
import type { StrictOrFrom } from './utils'
|
|
6
|
-
import type { Expand } from '@tanstack/router-core'
|
|
6
|
+
import type { AllContext, Expand, RouteById } from '@tanstack/router-core'
|
|
7
7
|
|
|
8
8
|
export interface UseRouteContextBaseOptions<
|
|
9
9
|
TRouter extends AnyRouter,
|
package/src/useSearch.tsx
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
import { useMatch } from './useMatch'
|
|
2
2
|
import type { ThrowConstraint } from './useMatch'
|
|
3
3
|
import type { Accessor } from 'solid-js'
|
|
4
|
-
import type { FullSearchSchema, RouteById } from './routeInfo'
|
|
5
4
|
import type { AnyRouter, RegisteredRouter } from './router'
|
|
6
5
|
import type { StrictOrFrom } from './utils'
|
|
7
|
-
import type {
|
|
6
|
+
import type {
|
|
7
|
+
Expand,
|
|
8
|
+
FullSearchSchema,
|
|
9
|
+
RouteById,
|
|
10
|
+
ThrowOrOptional,
|
|
11
|
+
} from '@tanstack/router-core'
|
|
8
12
|
|
|
9
13
|
export interface UseSearchBaseOptions<
|
|
10
14
|
TRouter extends AnyRouter,
|
package/src/utils.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import * as Solid from 'solid-js'
|
|
2
|
-
import type { RouteIds } from './routeInfo'
|
|
3
2
|
import type { AnyRouter } from './router'
|
|
4
|
-
import type { ConstrainLiteral } from '@tanstack/router-core'
|
|
3
|
+
import type { ConstrainLiteral, RouteIds } from '@tanstack/router-core'
|
|
5
4
|
|
|
6
5
|
export type StrictOrFrom<
|
|
7
6
|
TRouter extends AnyRouter,
|
package/dist/cjs/routeInfo.d.cts
DELETED
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
import { InferFileRouteTypes } from './fileRoute.cjs';
|
|
2
|
-
import { AddTrailingSlash, PartialMergeAll, RemoveTrailingSlashes, TrailingSlashOption } from '@tanstack/router-core';
|
|
3
|
-
import { AnyRoute } from './route.cjs';
|
|
4
|
-
import { AnyRouter } from './router.cjs';
|
|
5
|
-
export type ParseRoute<TRouteTree, TAcc = TRouteTree> = TRouteTree extends {
|
|
6
|
-
types: {
|
|
7
|
-
children: infer TChildren;
|
|
8
|
-
};
|
|
9
|
-
} ? unknown extends TChildren ? TAcc : TChildren extends ReadonlyArray<any> ? ParseRoute<TChildren[number], TAcc | TChildren[number]> : ParseRoute<TChildren[keyof TChildren], TAcc | TChildren[keyof TChildren]> : TAcc;
|
|
10
|
-
export type ParseRouteWithoutBranches<TRouteTree> = ParseRoute<TRouteTree> extends infer TRoute extends AnyRoute ? TRoute extends any ? unknown extends TRoute['types']['children'] ? TRoute : TRoute['types']['children'] extends ReadonlyArray<any> ? '/' extends TRoute['types']['children'][number]['path'] ? never : TRoute : '/' extends TRoute['types']['children'][keyof TRoute['types']['children']]['path'] ? never : TRoute : never : never;
|
|
11
|
-
export type CodeRoutesById<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? {
|
|
12
|
-
[K in TRoutes as K['id']]: K;
|
|
13
|
-
} : never;
|
|
14
|
-
export type RoutesById<TRouteTree extends AnyRoute> = InferFileRouteTypes<TRouteTree> extends never ? CodeRoutesById<TRouteTree> : InferFileRouteTypes<TRouteTree>['fileRoutesById'];
|
|
15
|
-
export type RouteById<TRouteTree extends AnyRoute, TId> = Extract<RoutesById<TRouteTree>[TId & keyof RoutesById<TRouteTree>], AnyRoute>;
|
|
16
|
-
export type CodeRouteIds<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? TRoutes['id'] : never;
|
|
17
|
-
export type RouteIds<TRouteTree extends AnyRoute> = InferFileRouteTypes<TRouteTree> extends never ? CodeRouteIds<TRouteTree> : InferFileRouteTypes<TRouteTree>['id'];
|
|
18
|
-
export type ParentPath<TRouter extends AnyRouter> = TrailingSlashOptionByRouter<TRouter> extends 'always' ? '../' : TrailingSlashOptionByRouter<TRouter> extends 'never' ? '..' : '../' | '..';
|
|
19
|
-
export type CurrentPath<TRouter extends AnyRouter> = TrailingSlashOptionByRouter<TRouter> extends 'always' ? './' : TrailingSlashOptionByRouter<TRouter> extends 'never' ? '.' : './' | '.';
|
|
20
|
-
export type ToPath<TRouter extends AnyRouter, TTo extends string> = TrailingSlashOptionByRouter<TRouter> extends 'always' ? AddTrailingSlash<TTo> : TrailingSlashOptionByRouter<TRouter> extends 'never' ? RemoveTrailingSlashes<TTo> : AddTrailingSlash<TTo> | RemoveTrailingSlashes<TTo>;
|
|
21
|
-
export type CatchAllPaths<TRouter extends AnyRouter> = CurrentPath<TRouter> | ParentPath<TRouter>;
|
|
22
|
-
export type CodeRoutesByPath<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? {
|
|
23
|
-
[K in TRoutes as K['fullPath']]: K;
|
|
24
|
-
} : never;
|
|
25
|
-
export type RoutesByPath<TRouteTree extends AnyRoute> = InferFileRouteTypes<TRouteTree> extends never ? CodeRoutesByPath<TRouteTree> : InferFileRouteTypes<TRouteTree>['fileRoutesByFullPath'];
|
|
26
|
-
export type RouteByPath<TRouteTree extends AnyRoute, TPath> = Extract<RoutesByPath<TRouteTree>[TPath & keyof RoutesByPath<TRouteTree>], AnyRoute>;
|
|
27
|
-
export type CodeRoutePaths<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? TRoutes['fullPath'] : never;
|
|
28
|
-
export type RoutePaths<TRouteTree extends AnyRoute> = unknown extends TRouteTree ? string : (InferFileRouteTypes<TRouteTree> extends never ? CodeRoutePaths<TRouteTree> : InferFileRouteTypes<TRouteTree>['fullPaths']) | '/';
|
|
29
|
-
export type RouteToPathAlwaysTrailingSlash<TRoute extends AnyRoute> = TRoute['path'] extends '/' ? TRoute['fullPath'] : TRoute['fullPath'] extends '/' ? TRoute['fullPath'] : `${TRoute['fullPath']}/`;
|
|
30
|
-
export type RouteToPathNeverTrailingSlash<TRoute extends AnyRoute> = TRoute['path'] extends '/' ? TRoute['fullPath'] extends '/' ? TRoute['fullPath'] : RemoveTrailingSlashes<TRoute['fullPath']> : TRoute['fullPath'];
|
|
31
|
-
export type RouteToPathPreserveTrailingSlash<TRoute extends AnyRoute> = RouteToPathNeverTrailingSlash<TRoute> | RouteToPathAlwaysTrailingSlash<TRoute>;
|
|
32
|
-
export type RouteToPathByTrailingSlashOption<TRoute extends AnyRoute> = {
|
|
33
|
-
always: RouteToPathAlwaysTrailingSlash<TRoute>;
|
|
34
|
-
preserve: RouteToPathPreserveTrailingSlash<TRoute>;
|
|
35
|
-
never: RouteToPathNeverTrailingSlash<TRoute>;
|
|
36
|
-
};
|
|
37
|
-
export type TrailingSlashOptionByRouter<TRouter extends AnyRouter> = TrailingSlashOption extends TRouter['options']['trailingSlash'] ? 'never' : NonNullable<TRouter['options']['trailingSlash']>;
|
|
38
|
-
export type RouteToByRouter<TRouter extends AnyRouter, TRoute extends AnyRoute> = RouteToPathByTrailingSlashOption<TRoute>[TrailingSlashOptionByRouter<TRouter>];
|
|
39
|
-
export type CodeRouteToPath<TRouter extends AnyRouter> = ParseRouteWithoutBranches<TRouter['routeTree']> extends infer TRoute extends AnyRoute ? TRoute extends any ? RouteToByRouter<TRouter, TRoute> : never : never;
|
|
40
|
-
export type FileRouteToPath<TRouter extends AnyRouter, TTo = InferFileRouteTypes<TRouter['routeTree']>['to'], TTrailingSlashOption = TrailingSlashOptionByRouter<TRouter>> = 'never' extends TTrailingSlashOption ? TTo : 'always' extends TTrailingSlashOption ? AddTrailingSlash<TTo> : TTo | AddTrailingSlash<TTo>;
|
|
41
|
-
export type RouteToPath<TRouter extends AnyRouter> = unknown extends TRouter ? string : InferFileRouteTypes<TRouter['routeTree']> extends never ? CodeRouteToPath<TRouter> : FileRouteToPath<TRouter>;
|
|
42
|
-
export type CodeRoutesByToPath<TRouter extends AnyRouter> = ParseRouteWithoutBranches<TRouter['routeTree']> extends infer TRoutes extends AnyRoute ? {
|
|
43
|
-
[TRoute in TRoutes as RouteToByRouter<TRouter, TRoute>]: TRoute;
|
|
44
|
-
} : never;
|
|
45
|
-
export type RoutesByToPath<TRouter extends AnyRouter> = InferFileRouteTypes<TRouter['routeTree']> extends never ? CodeRoutesByToPath<TRouter> : InferFileRouteTypes<TRouter['routeTree']>['fileRoutesByTo'];
|
|
46
|
-
export type CodeRouteByToPath<TRouter extends AnyRouter, TTo> = Extract<RoutesByToPath<TRouter>[TTo & keyof RoutesByToPath<TRouter>], AnyRoute>;
|
|
47
|
-
export type FileRouteByToPath<TRouter extends AnyRouter, TTo> = 'never' extends TrailingSlashOptionByRouter<TRouter> ? CodeRouteByToPath<TRouter, TTo> : 'always' extends TrailingSlashOptionByRouter<TRouter> ? TTo extends '/' ? CodeRouteByToPath<TRouter, TTo> : TTo extends `${infer TPath}/` ? CodeRouteByToPath<TRouter, TPath> : never : CodeRouteByToPath<TRouter, TTo extends '/' ? TTo : RemoveTrailingSlashes<TTo>>;
|
|
48
|
-
export type RouteByToPath<TRouter extends AnyRouter, TTo> = InferFileRouteTypes<TRouter['routeTree']> extends never ? CodeRouteByToPath<TRouter, TTo> : FileRouteByToPath<TRouter, TTo>;
|
|
49
|
-
export type FullSearchSchema<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? PartialMergeAll<TRoutes['types']['fullSearchSchema']> : never;
|
|
50
|
-
export type FullSearchSchemaInput<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? PartialMergeAll<TRoutes['types']['fullSearchSchemaInput']> : never;
|
|
51
|
-
export type AllParams<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? PartialMergeAll<TRoutes['types']['allParams']> : never;
|
|
52
|
-
export type AllContext<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? PartialMergeAll<TRoutes['types']['allContext']> : never;
|
|
53
|
-
export type AllLoaderData<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree> extends infer TRoutes extends AnyRoute ? PartialMergeAll<TRoutes['types']['loaderData']> : never;
|