@tanstack/router-core 1.132.0-alpha.1 → 1.132.0-alpha.15
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 +9 -11
- package/dist/cjs/config.cjs +10 -0
- package/dist/cjs/config.cjs.map +1 -0
- package/dist/cjs/config.d.cts +17 -0
- package/dist/cjs/fileRoute.d.cts +3 -2
- package/dist/cjs/index.cjs +15 -3
- package/dist/cjs/index.cjs.map +1 -1
- package/dist/cjs/index.d.cts +11 -4
- package/dist/cjs/load-matches.cjs +636 -0
- package/dist/cjs/load-matches.cjs.map +1 -0
- package/dist/cjs/load-matches.d.cts +16 -0
- package/dist/cjs/location.d.cts +38 -0
- package/dist/cjs/path.cjs +6 -49
- package/dist/cjs/path.cjs.map +1 -1
- package/dist/cjs/path.d.cts +3 -6
- package/dist/cjs/qss.cjs +19 -19
- package/dist/cjs/qss.cjs.map +1 -1
- package/dist/cjs/qss.d.cts +6 -4
- package/dist/cjs/redirect.cjs +3 -3
- package/dist/cjs/redirect.cjs.map +1 -1
- package/dist/cjs/rewrite.cjs +63 -0
- package/dist/cjs/rewrite.cjs.map +1 -0
- package/dist/cjs/rewrite.d.cts +22 -0
- package/dist/cjs/route.cjs.map +1 -1
- package/dist/cjs/route.d.cts +42 -41
- package/dist/cjs/router.cjs +134 -681
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/cjs/router.d.cts +68 -25
- package/dist/cjs/scroll-restoration.cjs +32 -29
- package/dist/cjs/scroll-restoration.cjs.map +1 -1
- package/dist/cjs/scroll-restoration.d.cts +1 -10
- package/dist/cjs/searchParams.cjs +7 -15
- package/dist/cjs/searchParams.cjs.map +1 -1
- package/dist/cjs/ssr/constants.cjs +5 -0
- package/dist/cjs/ssr/constants.cjs.map +1 -0
- package/dist/cjs/ssr/constants.d.cts +1 -0
- package/dist/cjs/ssr/{seroval-plugins.cjs → serializer/ShallowErrorPlugin.cjs} +2 -2
- package/dist/cjs/ssr/serializer/ShallowErrorPlugin.cjs.map +1 -0
- package/dist/cjs/ssr/{seroval-plugins.d.cts → serializer/ShallowErrorPlugin.d.cts} +1 -2
- package/dist/cjs/ssr/serializer/seroval-plugins.cjs +11 -0
- package/dist/cjs/ssr/serializer/seroval-plugins.cjs.map +1 -0
- package/dist/cjs/ssr/serializer/seroval-plugins.d.cts +2 -0
- package/dist/cjs/ssr/serializer/transformer.cjs +52 -0
- package/dist/cjs/ssr/serializer/transformer.cjs.map +1 -0
- package/dist/cjs/ssr/serializer/transformer.d.cts +56 -0
- package/dist/cjs/ssr/server.d.cts +5 -0
- package/dist/cjs/ssr/ssr-client.cjs +53 -40
- package/dist/cjs/ssr/ssr-client.cjs.map +1 -1
- package/dist/cjs/ssr/ssr-client.d.cts +5 -1
- package/dist/cjs/ssr/ssr-server.cjs +12 -10
- package/dist/cjs/ssr/ssr-server.cjs.map +1 -1
- package/dist/cjs/ssr/ssr-server.d.cts +0 -1
- package/dist/cjs/ssr/tsrScript.cjs +1 -1
- package/dist/cjs/ssr/tsrScript.cjs.map +1 -1
- package/dist/cjs/typePrimitives.d.cts +6 -6
- package/dist/cjs/utils.cjs +14 -7
- package/dist/cjs/utils.cjs.map +1 -1
- package/dist/cjs/utils.d.cts +2 -1
- package/dist/esm/Matches.d.ts +9 -11
- package/dist/esm/Matches.js.map +1 -1
- package/dist/esm/config.d.ts +17 -0
- package/dist/esm/config.js +10 -0
- package/dist/esm/config.js.map +1 -0
- package/dist/esm/fileRoute.d.ts +3 -2
- package/dist/esm/index.d.ts +11 -4
- package/dist/esm/index.js +17 -5
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/load-matches.d.ts +16 -0
- package/dist/esm/load-matches.js +636 -0
- package/dist/esm/load-matches.js.map +1 -0
- package/dist/esm/location.d.ts +38 -0
- package/dist/esm/path.d.ts +3 -6
- package/dist/esm/path.js +6 -49
- package/dist/esm/path.js.map +1 -1
- package/dist/esm/qss.d.ts +6 -4
- package/dist/esm/qss.js +19 -19
- package/dist/esm/qss.js.map +1 -1
- package/dist/esm/redirect.js +3 -3
- package/dist/esm/redirect.js.map +1 -1
- package/dist/esm/rewrite.d.ts +22 -0
- package/dist/esm/rewrite.js +63 -0
- package/dist/esm/rewrite.js.map +1 -0
- package/dist/esm/route.d.ts +42 -41
- package/dist/esm/route.js.map +1 -1
- package/dist/esm/router.d.ts +68 -25
- package/dist/esm/router.js +136 -683
- package/dist/esm/router.js.map +1 -1
- package/dist/esm/scroll-restoration.d.ts +1 -10
- package/dist/esm/scroll-restoration.js +32 -29
- package/dist/esm/scroll-restoration.js.map +1 -1
- package/dist/esm/searchParams.js +7 -15
- package/dist/esm/searchParams.js.map +1 -1
- package/dist/esm/ssr/constants.d.ts +1 -0
- package/dist/esm/ssr/constants.js +5 -0
- package/dist/esm/ssr/constants.js.map +1 -0
- package/dist/esm/ssr/{seroval-plugins.d.ts → serializer/ShallowErrorPlugin.d.ts} +1 -2
- package/dist/esm/ssr/{seroval-plugins.js → serializer/ShallowErrorPlugin.js} +2 -2
- package/dist/esm/ssr/serializer/ShallowErrorPlugin.js.map +1 -0
- package/dist/esm/ssr/serializer/seroval-plugins.d.ts +2 -0
- package/dist/esm/ssr/serializer/seroval-plugins.js +11 -0
- package/dist/esm/ssr/serializer/seroval-plugins.js.map +1 -0
- package/dist/esm/ssr/serializer/transformer.d.ts +56 -0
- package/dist/esm/ssr/serializer/transformer.js +52 -0
- package/dist/esm/ssr/serializer/transformer.js.map +1 -0
- package/dist/esm/ssr/server.d.ts +5 -0
- package/dist/esm/ssr/ssr-client.d.ts +5 -1
- package/dist/esm/ssr/ssr-client.js +53 -40
- package/dist/esm/ssr/ssr-client.js.map +1 -1
- package/dist/esm/ssr/ssr-server.d.ts +0 -1
- package/dist/esm/ssr/ssr-server.js +12 -10
- package/dist/esm/ssr/ssr-server.js.map +1 -1
- package/dist/esm/ssr/tsrScript.js +1 -1
- package/dist/esm/ssr/tsrScript.js.map +1 -1
- package/dist/esm/typePrimitives.d.ts +6 -6
- package/dist/esm/utils.d.ts +2 -1
- package/dist/esm/utils.js +14 -7
- package/dist/esm/utils.js.map +1 -1
- package/package.json +1 -1
- package/src/Matches.ts +18 -10
- package/src/config.ts +42 -0
- package/src/fileRoute.ts +15 -3
- package/src/index.ts +32 -3
- package/src/load-matches.ts +955 -0
- package/src/location.ts +38 -0
- package/src/path.ts +5 -66
- package/src/qss.ts +27 -24
- package/src/redirect.ts +3 -3
- package/src/rewrite.ts +70 -0
- package/src/route.ts +146 -35
- package/src/router.ts +263 -972
- package/src/scroll-restoration.ts +42 -37
- package/src/searchParams.ts +8 -19
- package/src/ssr/constants.ts +1 -0
- package/src/ssr/{seroval-plugins.ts → serializer/ShallowErrorPlugin.ts} +2 -2
- package/src/ssr/serializer/seroval-plugins.ts +9 -0
- package/src/ssr/serializer/transformer.ts +215 -0
- package/src/ssr/server.ts +6 -0
- package/src/ssr/ssr-client.ts +72 -44
- package/src/ssr/ssr-server.ts +18 -10
- package/src/ssr/tsrScript.ts +5 -1
- package/src/typePrimitives.ts +6 -6
- package/src/utils.ts +21 -10
- package/dist/cjs/ssr/seroval-plugins.cjs.map +0 -1
- package/dist/esm/ssr/seroval-plugins.js.map +0 -1
|
@@ -0,0 +1,636 @@
|
|
|
1
|
+
import { batch } from "@tanstack/store";
|
|
2
|
+
import invariant from "tiny-invariant";
|
|
3
|
+
import { isPromise, createControlledPromise } from "./utils.js";
|
|
4
|
+
import { isNotFound } from "./not-found.js";
|
|
5
|
+
import { rootRouteId } from "./root.js";
|
|
6
|
+
import { isRedirect } from "./redirect.js";
|
|
7
|
+
const triggerOnReady = (inner) => {
|
|
8
|
+
if (!inner.rendered) {
|
|
9
|
+
inner.rendered = true;
|
|
10
|
+
return inner.onReady?.();
|
|
11
|
+
}
|
|
12
|
+
};
|
|
13
|
+
const resolvePreload = (inner, matchId) => {
|
|
14
|
+
return !!(inner.preload && !inner.router.state.matches.some((d) => d.id === matchId));
|
|
15
|
+
};
|
|
16
|
+
const _handleNotFound = (inner, err) => {
|
|
17
|
+
const routeCursor = inner.router.routesById[err.routeId ?? ""] ?? inner.router.routeTree;
|
|
18
|
+
if (!routeCursor.options.notFoundComponent && inner.router.options?.defaultNotFoundComponent) {
|
|
19
|
+
routeCursor.options.notFoundComponent = inner.router.options.defaultNotFoundComponent;
|
|
20
|
+
}
|
|
21
|
+
invariant(
|
|
22
|
+
routeCursor.options.notFoundComponent,
|
|
23
|
+
"No notFoundComponent found. Please set a notFoundComponent on your route or provide a defaultNotFoundComponent to the router."
|
|
24
|
+
);
|
|
25
|
+
const matchForRoute = inner.matches.find((m) => m.routeId === routeCursor.id);
|
|
26
|
+
invariant(matchForRoute, "Could not find match for route: " + routeCursor.id);
|
|
27
|
+
inner.updateMatch(matchForRoute.id, (prev) => ({
|
|
28
|
+
...prev,
|
|
29
|
+
status: "notFound",
|
|
30
|
+
error: err,
|
|
31
|
+
isFetching: false
|
|
32
|
+
}));
|
|
33
|
+
if (err.routerCode === "BEFORE_LOAD" && routeCursor.parentRoute) {
|
|
34
|
+
err.routeId = routeCursor.parentRoute.id;
|
|
35
|
+
_handleNotFound(inner, err);
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
const handleRedirectAndNotFound = (inner, match, err) => {
|
|
39
|
+
if (!isRedirect(err) && !isNotFound(err)) return;
|
|
40
|
+
if (isRedirect(err) && err.redirectHandled && !err.options.reloadDocument) {
|
|
41
|
+
throw err;
|
|
42
|
+
}
|
|
43
|
+
if (match) {
|
|
44
|
+
match._nonReactive.beforeLoadPromise?.resolve();
|
|
45
|
+
match._nonReactive.loaderPromise?.resolve();
|
|
46
|
+
match._nonReactive.beforeLoadPromise = void 0;
|
|
47
|
+
match._nonReactive.loaderPromise = void 0;
|
|
48
|
+
const status = isRedirect(err) ? "redirected" : "notFound";
|
|
49
|
+
inner.updateMatch(match.id, (prev) => ({
|
|
50
|
+
...prev,
|
|
51
|
+
status,
|
|
52
|
+
isFetching: false,
|
|
53
|
+
error: err
|
|
54
|
+
}));
|
|
55
|
+
if (isNotFound(err) && !err.routeId) {
|
|
56
|
+
err.routeId = match.routeId;
|
|
57
|
+
}
|
|
58
|
+
match._nonReactive.loadPromise?.resolve();
|
|
59
|
+
}
|
|
60
|
+
if (isRedirect(err)) {
|
|
61
|
+
inner.rendered = true;
|
|
62
|
+
err.options._fromLocation = inner.location;
|
|
63
|
+
err.redirectHandled = true;
|
|
64
|
+
err = inner.router.resolveRedirect(err);
|
|
65
|
+
throw err;
|
|
66
|
+
} else {
|
|
67
|
+
_handleNotFound(inner, err);
|
|
68
|
+
throw err;
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
const shouldSkipLoader = (inner, matchId) => {
|
|
72
|
+
const match = inner.router.getMatch(matchId);
|
|
73
|
+
if (!inner.router.isServer && match._nonReactive.dehydrated) {
|
|
74
|
+
return true;
|
|
75
|
+
}
|
|
76
|
+
if (inner.router.isServer && match.ssr === false) {
|
|
77
|
+
return true;
|
|
78
|
+
}
|
|
79
|
+
return false;
|
|
80
|
+
};
|
|
81
|
+
const handleSerialError = (inner, index, err, routerCode) => {
|
|
82
|
+
const { id: matchId, routeId } = inner.matches[index];
|
|
83
|
+
const route = inner.router.looseRoutesById[routeId];
|
|
84
|
+
if (err instanceof Promise) {
|
|
85
|
+
throw err;
|
|
86
|
+
}
|
|
87
|
+
err.routerCode = routerCode;
|
|
88
|
+
inner.firstBadMatchIndex ??= index;
|
|
89
|
+
handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), err);
|
|
90
|
+
try {
|
|
91
|
+
route.options.onError?.(err);
|
|
92
|
+
} catch (errorHandlerErr) {
|
|
93
|
+
err = errorHandlerErr;
|
|
94
|
+
handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), err);
|
|
95
|
+
}
|
|
96
|
+
inner.updateMatch(matchId, (prev) => {
|
|
97
|
+
prev._nonReactive.beforeLoadPromise?.resolve();
|
|
98
|
+
prev._nonReactive.beforeLoadPromise = void 0;
|
|
99
|
+
prev._nonReactive.loadPromise?.resolve();
|
|
100
|
+
return {
|
|
101
|
+
...prev,
|
|
102
|
+
error: err,
|
|
103
|
+
status: "error",
|
|
104
|
+
isFetching: false,
|
|
105
|
+
updatedAt: Date.now(),
|
|
106
|
+
abortController: new AbortController()
|
|
107
|
+
};
|
|
108
|
+
});
|
|
109
|
+
};
|
|
110
|
+
const isBeforeLoadSsr = (inner, matchId, index, route) => {
|
|
111
|
+
const existingMatch = inner.router.getMatch(matchId);
|
|
112
|
+
const parentMatchId = inner.matches[index - 1]?.id;
|
|
113
|
+
const parentMatch = parentMatchId ? inner.router.getMatch(parentMatchId) : void 0;
|
|
114
|
+
if (inner.router.isShell()) {
|
|
115
|
+
existingMatch.ssr = matchId === rootRouteId;
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
if (parentMatch?.ssr === false) {
|
|
119
|
+
existingMatch.ssr = false;
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
const parentOverride = (tempSsr2) => {
|
|
123
|
+
if (tempSsr2 === true && parentMatch?.ssr === "data-only") {
|
|
124
|
+
return "data-only";
|
|
125
|
+
}
|
|
126
|
+
return tempSsr2;
|
|
127
|
+
};
|
|
128
|
+
const defaultSsr = inner.router.options.defaultSsr ?? true;
|
|
129
|
+
if (route.options.ssr === void 0) {
|
|
130
|
+
existingMatch.ssr = parentOverride(defaultSsr);
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
if (typeof route.options.ssr !== "function") {
|
|
134
|
+
existingMatch.ssr = parentOverride(route.options.ssr);
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
const { search, params } = existingMatch;
|
|
138
|
+
const ssrFnContext = {
|
|
139
|
+
search: makeMaybe(search, existingMatch.searchError),
|
|
140
|
+
params: makeMaybe(params, existingMatch.paramsError),
|
|
141
|
+
location: inner.location,
|
|
142
|
+
matches: inner.matches.map((match) => ({
|
|
143
|
+
index: match.index,
|
|
144
|
+
pathname: match.pathname,
|
|
145
|
+
fullPath: match.fullPath,
|
|
146
|
+
staticData: match.staticData,
|
|
147
|
+
id: match.id,
|
|
148
|
+
routeId: match.routeId,
|
|
149
|
+
search: makeMaybe(match.search, match.searchError),
|
|
150
|
+
params: makeMaybe(match.params, match.paramsError),
|
|
151
|
+
ssr: match.ssr
|
|
152
|
+
}))
|
|
153
|
+
};
|
|
154
|
+
const tempSsr = route.options.ssr(ssrFnContext);
|
|
155
|
+
if (isPromise(tempSsr)) {
|
|
156
|
+
return tempSsr.then((ssr) => {
|
|
157
|
+
existingMatch.ssr = parentOverride(ssr ?? defaultSsr);
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
existingMatch.ssr = parentOverride(tempSsr ?? defaultSsr);
|
|
161
|
+
return;
|
|
162
|
+
};
|
|
163
|
+
const setupPendingTimeout = (inner, matchId, route, match) => {
|
|
164
|
+
if (match._nonReactive.pendingTimeout !== void 0) return;
|
|
165
|
+
const pendingMs = route.options.pendingMs ?? inner.router.options.defaultPendingMs;
|
|
166
|
+
const shouldPending = !!(inner.onReady && !inner.router.isServer && !resolvePreload(inner, matchId) && (route.options.loader || route.options.beforeLoad || routeNeedsPreload(route)) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? inner.router.options?.defaultPendingComponent));
|
|
167
|
+
if (shouldPending) {
|
|
168
|
+
const pendingTimeout = setTimeout(() => {
|
|
169
|
+
triggerOnReady(inner);
|
|
170
|
+
}, pendingMs);
|
|
171
|
+
match._nonReactive.pendingTimeout = pendingTimeout;
|
|
172
|
+
}
|
|
173
|
+
};
|
|
174
|
+
const preBeforeLoadSetup = (inner, matchId, route) => {
|
|
175
|
+
const existingMatch = inner.router.getMatch(matchId);
|
|
176
|
+
if (!existingMatch._nonReactive.beforeLoadPromise && !existingMatch._nonReactive.loaderPromise)
|
|
177
|
+
return;
|
|
178
|
+
setupPendingTimeout(inner, matchId, route, existingMatch);
|
|
179
|
+
const then = () => {
|
|
180
|
+
const match = inner.router.getMatch(matchId);
|
|
181
|
+
if (match.preload && (match.status === "redirected" || match.status === "notFound")) {
|
|
182
|
+
handleRedirectAndNotFound(inner, match, match.error);
|
|
183
|
+
}
|
|
184
|
+
};
|
|
185
|
+
return existingMatch._nonReactive.beforeLoadPromise ? existingMatch._nonReactive.beforeLoadPromise.then(then) : then();
|
|
186
|
+
};
|
|
187
|
+
const executeBeforeLoad = (inner, matchId, index, route) => {
|
|
188
|
+
const match = inner.router.getMatch(matchId);
|
|
189
|
+
const prevLoadPromise = match._nonReactive.loadPromise;
|
|
190
|
+
match._nonReactive.loadPromise = createControlledPromise(() => {
|
|
191
|
+
prevLoadPromise?.resolve();
|
|
192
|
+
});
|
|
193
|
+
const { paramsError, searchError } = match;
|
|
194
|
+
if (paramsError) {
|
|
195
|
+
handleSerialError(inner, index, paramsError, "PARSE_PARAMS");
|
|
196
|
+
}
|
|
197
|
+
if (searchError) {
|
|
198
|
+
handleSerialError(inner, index, searchError, "VALIDATE_SEARCH");
|
|
199
|
+
}
|
|
200
|
+
setupPendingTimeout(inner, matchId, route, match);
|
|
201
|
+
const abortController = new AbortController();
|
|
202
|
+
const parentMatchId = inner.matches[index - 1]?.id;
|
|
203
|
+
const parentMatch = parentMatchId ? inner.router.getMatch(parentMatchId) : void 0;
|
|
204
|
+
const parentMatchContext = parentMatch?.context ?? inner.router.options.context ?? void 0;
|
|
205
|
+
const context = { ...parentMatchContext, ...match.__routeContext };
|
|
206
|
+
let isPending = false;
|
|
207
|
+
const pending = () => {
|
|
208
|
+
if (isPending) return;
|
|
209
|
+
isPending = true;
|
|
210
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
211
|
+
...prev,
|
|
212
|
+
isFetching: "beforeLoad",
|
|
213
|
+
fetchCount: prev.fetchCount + 1,
|
|
214
|
+
abortController,
|
|
215
|
+
context
|
|
216
|
+
}));
|
|
217
|
+
};
|
|
218
|
+
const resolve = () => {
|
|
219
|
+
match._nonReactive.beforeLoadPromise?.resolve();
|
|
220
|
+
match._nonReactive.beforeLoadPromise = void 0;
|
|
221
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
222
|
+
...prev,
|
|
223
|
+
isFetching: false
|
|
224
|
+
}));
|
|
225
|
+
};
|
|
226
|
+
if (!route.options.beforeLoad) {
|
|
227
|
+
batch(() => {
|
|
228
|
+
pending();
|
|
229
|
+
resolve();
|
|
230
|
+
});
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
match._nonReactive.beforeLoadPromise = createControlledPromise();
|
|
234
|
+
const { search, params, cause } = match;
|
|
235
|
+
const preload = resolvePreload(inner, matchId);
|
|
236
|
+
const beforeLoadFnContext = {
|
|
237
|
+
search,
|
|
238
|
+
abortController,
|
|
239
|
+
params,
|
|
240
|
+
preload,
|
|
241
|
+
context,
|
|
242
|
+
location: inner.location,
|
|
243
|
+
navigate: (opts) => inner.router.navigate({
|
|
244
|
+
...opts,
|
|
245
|
+
_fromLocation: inner.location
|
|
246
|
+
}),
|
|
247
|
+
buildLocation: inner.router.buildLocation,
|
|
248
|
+
cause: preload ? "preload" : cause,
|
|
249
|
+
matches: inner.matches
|
|
250
|
+
};
|
|
251
|
+
const updateContext = (beforeLoadContext2) => {
|
|
252
|
+
if (beforeLoadContext2 === void 0) {
|
|
253
|
+
batch(() => {
|
|
254
|
+
pending();
|
|
255
|
+
resolve();
|
|
256
|
+
});
|
|
257
|
+
return;
|
|
258
|
+
}
|
|
259
|
+
if (isRedirect(beforeLoadContext2) || isNotFound(beforeLoadContext2)) {
|
|
260
|
+
pending();
|
|
261
|
+
handleSerialError(inner, index, beforeLoadContext2, "BEFORE_LOAD");
|
|
262
|
+
}
|
|
263
|
+
batch(() => {
|
|
264
|
+
pending();
|
|
265
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
266
|
+
...prev,
|
|
267
|
+
__beforeLoadContext: beforeLoadContext2,
|
|
268
|
+
context: {
|
|
269
|
+
...prev.context,
|
|
270
|
+
...beforeLoadContext2
|
|
271
|
+
}
|
|
272
|
+
}));
|
|
273
|
+
resolve();
|
|
274
|
+
});
|
|
275
|
+
};
|
|
276
|
+
let beforeLoadContext;
|
|
277
|
+
try {
|
|
278
|
+
beforeLoadContext = route.options.beforeLoad(beforeLoadFnContext);
|
|
279
|
+
if (isPromise(beforeLoadContext)) {
|
|
280
|
+
pending();
|
|
281
|
+
return beforeLoadContext.catch((err) => {
|
|
282
|
+
handleSerialError(inner, index, err, "BEFORE_LOAD");
|
|
283
|
+
}).then(updateContext);
|
|
284
|
+
}
|
|
285
|
+
} catch (err) {
|
|
286
|
+
pending();
|
|
287
|
+
handleSerialError(inner, index, err, "BEFORE_LOAD");
|
|
288
|
+
}
|
|
289
|
+
updateContext(beforeLoadContext);
|
|
290
|
+
return;
|
|
291
|
+
};
|
|
292
|
+
const handleBeforeLoad = (inner, index) => {
|
|
293
|
+
const { id: matchId, routeId } = inner.matches[index];
|
|
294
|
+
const route = inner.router.looseRoutesById[routeId];
|
|
295
|
+
const serverSsr = () => {
|
|
296
|
+
if (inner.router.isServer) {
|
|
297
|
+
const maybePromise = isBeforeLoadSsr(inner, matchId, index, route);
|
|
298
|
+
if (isPromise(maybePromise)) return maybePromise.then(queueExecution);
|
|
299
|
+
}
|
|
300
|
+
return queueExecution();
|
|
301
|
+
};
|
|
302
|
+
const queueExecution = () => {
|
|
303
|
+
if (shouldSkipLoader(inner, matchId)) return;
|
|
304
|
+
const result = preBeforeLoadSetup(inner, matchId, route);
|
|
305
|
+
return isPromise(result) ? result.then(execute) : execute();
|
|
306
|
+
};
|
|
307
|
+
const execute = () => executeBeforeLoad(inner, matchId, index, route);
|
|
308
|
+
return serverSsr();
|
|
309
|
+
};
|
|
310
|
+
const executeHead = (inner, matchId, route) => {
|
|
311
|
+
const match = inner.router.getMatch(matchId);
|
|
312
|
+
if (!match) {
|
|
313
|
+
return;
|
|
314
|
+
}
|
|
315
|
+
if (!route.options.head && !route.options.scripts && !route.options.headers) {
|
|
316
|
+
return;
|
|
317
|
+
}
|
|
318
|
+
const assetContext = {
|
|
319
|
+
matches: inner.matches,
|
|
320
|
+
match,
|
|
321
|
+
params: match.params,
|
|
322
|
+
loaderData: match.loaderData
|
|
323
|
+
};
|
|
324
|
+
return Promise.all([
|
|
325
|
+
route.options.head?.(assetContext),
|
|
326
|
+
route.options.scripts?.(assetContext),
|
|
327
|
+
route.options.headers?.(assetContext)
|
|
328
|
+
]).then(([headFnContent, scripts, headers]) => {
|
|
329
|
+
const meta = headFnContent?.meta;
|
|
330
|
+
const links = headFnContent?.links;
|
|
331
|
+
const headScripts = headFnContent?.scripts;
|
|
332
|
+
const styles = headFnContent?.styles;
|
|
333
|
+
return {
|
|
334
|
+
meta,
|
|
335
|
+
links,
|
|
336
|
+
headScripts,
|
|
337
|
+
headers,
|
|
338
|
+
scripts,
|
|
339
|
+
styles
|
|
340
|
+
};
|
|
341
|
+
});
|
|
342
|
+
};
|
|
343
|
+
const getLoaderContext = (inner, matchId, index, route) => {
|
|
344
|
+
const parentMatchPromise = inner.matchPromises[index - 1];
|
|
345
|
+
const { params, loaderDeps, abortController, context, cause } = inner.router.getMatch(matchId);
|
|
346
|
+
const preload = resolvePreload(inner, matchId);
|
|
347
|
+
return {
|
|
348
|
+
params,
|
|
349
|
+
deps: loaderDeps,
|
|
350
|
+
preload: !!preload,
|
|
351
|
+
parentMatchPromise,
|
|
352
|
+
abortController,
|
|
353
|
+
context,
|
|
354
|
+
location: inner.location,
|
|
355
|
+
navigate: (opts) => inner.router.navigate({
|
|
356
|
+
...opts,
|
|
357
|
+
_fromLocation: inner.location
|
|
358
|
+
}),
|
|
359
|
+
cause: preload ? "preload" : cause,
|
|
360
|
+
route
|
|
361
|
+
};
|
|
362
|
+
};
|
|
363
|
+
const runLoader = async (inner, matchId, index, route) => {
|
|
364
|
+
try {
|
|
365
|
+
const match = inner.router.getMatch(matchId);
|
|
366
|
+
try {
|
|
367
|
+
if (!inner.router.isServer || match.ssr === true) {
|
|
368
|
+
loadRouteChunk(route);
|
|
369
|
+
}
|
|
370
|
+
const loaderResult = route.options.loader?.(
|
|
371
|
+
getLoaderContext(inner, matchId, index, route)
|
|
372
|
+
);
|
|
373
|
+
const loaderResultIsPromise = route.options.loader && isPromise(loaderResult);
|
|
374
|
+
const willLoadSomething = !!(loaderResultIsPromise || route._lazyPromise || route._componentsPromise || route.options.head || route.options.scripts || route.options.headers || match._nonReactive.minPendingPromise);
|
|
375
|
+
if (willLoadSomething) {
|
|
376
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
377
|
+
...prev,
|
|
378
|
+
isFetching: "loader"
|
|
379
|
+
}));
|
|
380
|
+
}
|
|
381
|
+
if (route.options.loader) {
|
|
382
|
+
const loaderData = loaderResultIsPromise ? await loaderResult : loaderResult;
|
|
383
|
+
handleRedirectAndNotFound(
|
|
384
|
+
inner,
|
|
385
|
+
inner.router.getMatch(matchId),
|
|
386
|
+
loaderData
|
|
387
|
+
);
|
|
388
|
+
if (loaderData !== void 0) {
|
|
389
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
390
|
+
...prev,
|
|
391
|
+
loaderData
|
|
392
|
+
}));
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
if (route._lazyPromise) await route._lazyPromise;
|
|
396
|
+
const headResult = executeHead(inner, matchId, route);
|
|
397
|
+
const head = headResult ? await headResult : void 0;
|
|
398
|
+
const pendingPromise = match._nonReactive.minPendingPromise;
|
|
399
|
+
if (pendingPromise) await pendingPromise;
|
|
400
|
+
if (route._componentsPromise) await route._componentsPromise;
|
|
401
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
402
|
+
...prev,
|
|
403
|
+
error: void 0,
|
|
404
|
+
status: "success",
|
|
405
|
+
isFetching: false,
|
|
406
|
+
updatedAt: Date.now(),
|
|
407
|
+
...head
|
|
408
|
+
}));
|
|
409
|
+
} catch (e) {
|
|
410
|
+
let error = e;
|
|
411
|
+
const pendingPromise = match._nonReactive.minPendingPromise;
|
|
412
|
+
if (pendingPromise) await pendingPromise;
|
|
413
|
+
handleRedirectAndNotFound(inner, inner.router.getMatch(matchId), e);
|
|
414
|
+
try {
|
|
415
|
+
route.options.onError?.(e);
|
|
416
|
+
} catch (onErrorError) {
|
|
417
|
+
error = onErrorError;
|
|
418
|
+
handleRedirectAndNotFound(
|
|
419
|
+
inner,
|
|
420
|
+
inner.router.getMatch(matchId),
|
|
421
|
+
onErrorError
|
|
422
|
+
);
|
|
423
|
+
}
|
|
424
|
+
const headResult = executeHead(inner, matchId, route);
|
|
425
|
+
const head = headResult ? await headResult : void 0;
|
|
426
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
427
|
+
...prev,
|
|
428
|
+
error,
|
|
429
|
+
status: "error",
|
|
430
|
+
isFetching: false,
|
|
431
|
+
...head
|
|
432
|
+
}));
|
|
433
|
+
}
|
|
434
|
+
} catch (err) {
|
|
435
|
+
const match = inner.router.getMatch(matchId);
|
|
436
|
+
if (match) {
|
|
437
|
+
const headResult = executeHead(inner, matchId, route);
|
|
438
|
+
if (headResult) {
|
|
439
|
+
const head = await headResult;
|
|
440
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
441
|
+
...prev,
|
|
442
|
+
...head
|
|
443
|
+
}));
|
|
444
|
+
}
|
|
445
|
+
match._nonReactive.loaderPromise = void 0;
|
|
446
|
+
}
|
|
447
|
+
handleRedirectAndNotFound(inner, match, err);
|
|
448
|
+
}
|
|
449
|
+
};
|
|
450
|
+
const loadRouteMatch = async (inner, index) => {
|
|
451
|
+
const { id: matchId, routeId } = inner.matches[index];
|
|
452
|
+
let loaderShouldRunAsync = false;
|
|
453
|
+
let loaderIsRunningAsync = false;
|
|
454
|
+
const route = inner.router.looseRoutesById[routeId];
|
|
455
|
+
if (shouldSkipLoader(inner, matchId)) {
|
|
456
|
+
if (inner.router.isServer) {
|
|
457
|
+
const headResult = executeHead(inner, matchId, route);
|
|
458
|
+
if (headResult) {
|
|
459
|
+
const head = await headResult;
|
|
460
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
461
|
+
...prev,
|
|
462
|
+
...head
|
|
463
|
+
}));
|
|
464
|
+
}
|
|
465
|
+
return inner.router.getMatch(matchId);
|
|
466
|
+
}
|
|
467
|
+
} else {
|
|
468
|
+
const prevMatch = inner.router.getMatch(matchId);
|
|
469
|
+
if (prevMatch._nonReactive.loaderPromise) {
|
|
470
|
+
if (prevMatch.status === "success" && !inner.sync && !prevMatch.preload) {
|
|
471
|
+
return prevMatch;
|
|
472
|
+
}
|
|
473
|
+
await prevMatch._nonReactive.loaderPromise;
|
|
474
|
+
const match2 = inner.router.getMatch(matchId);
|
|
475
|
+
if (match2.error) {
|
|
476
|
+
handleRedirectAndNotFound(inner, match2, match2.error);
|
|
477
|
+
}
|
|
478
|
+
} else {
|
|
479
|
+
const age = Date.now() - prevMatch.updatedAt;
|
|
480
|
+
const preload = resolvePreload(inner, matchId);
|
|
481
|
+
const staleAge = preload ? route.options.preloadStaleTime ?? inner.router.options.defaultPreloadStaleTime ?? 3e4 : route.options.staleTime ?? inner.router.options.defaultStaleTime ?? 0;
|
|
482
|
+
const shouldReloadOption = route.options.shouldReload;
|
|
483
|
+
const shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(getLoaderContext(inner, matchId, index, route)) : shouldReloadOption;
|
|
484
|
+
const nextPreload = !!preload && !inner.router.state.matches.some((d) => d.id === matchId);
|
|
485
|
+
const match2 = inner.router.getMatch(matchId);
|
|
486
|
+
match2._nonReactive.loaderPromise = createControlledPromise();
|
|
487
|
+
if (nextPreload !== match2.preload) {
|
|
488
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
489
|
+
...prev,
|
|
490
|
+
preload: nextPreload
|
|
491
|
+
}));
|
|
492
|
+
}
|
|
493
|
+
const { status, invalid } = match2;
|
|
494
|
+
loaderShouldRunAsync = status === "success" && (invalid || (shouldReload ?? age > staleAge));
|
|
495
|
+
if (preload && route.options.preload === false) ;
|
|
496
|
+
else if (loaderShouldRunAsync && !inner.sync) {
|
|
497
|
+
loaderIsRunningAsync = true;
|
|
498
|
+
(async () => {
|
|
499
|
+
try {
|
|
500
|
+
await runLoader(inner, matchId, index, route);
|
|
501
|
+
const match3 = inner.router.getMatch(matchId);
|
|
502
|
+
match3._nonReactive.loaderPromise?.resolve();
|
|
503
|
+
match3._nonReactive.loadPromise?.resolve();
|
|
504
|
+
match3._nonReactive.loaderPromise = void 0;
|
|
505
|
+
} catch (err) {
|
|
506
|
+
if (isRedirect(err)) {
|
|
507
|
+
await inner.router.navigate(err.options);
|
|
508
|
+
}
|
|
509
|
+
}
|
|
510
|
+
})();
|
|
511
|
+
} else if (status !== "success" || loaderShouldRunAsync && inner.sync) {
|
|
512
|
+
await runLoader(inner, matchId, index, route);
|
|
513
|
+
} else {
|
|
514
|
+
const headResult = executeHead(inner, matchId, route);
|
|
515
|
+
if (headResult) {
|
|
516
|
+
const head = await headResult;
|
|
517
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
518
|
+
...prev,
|
|
519
|
+
...head
|
|
520
|
+
}));
|
|
521
|
+
}
|
|
522
|
+
}
|
|
523
|
+
}
|
|
524
|
+
}
|
|
525
|
+
const match = inner.router.getMatch(matchId);
|
|
526
|
+
if (!loaderIsRunningAsync) {
|
|
527
|
+
match._nonReactive.loaderPromise?.resolve();
|
|
528
|
+
match._nonReactive.loadPromise?.resolve();
|
|
529
|
+
}
|
|
530
|
+
clearTimeout(match._nonReactive.pendingTimeout);
|
|
531
|
+
match._nonReactive.pendingTimeout = void 0;
|
|
532
|
+
if (!loaderIsRunningAsync) match._nonReactive.loaderPromise = void 0;
|
|
533
|
+
match._nonReactive.dehydrated = void 0;
|
|
534
|
+
const nextIsFetching = loaderIsRunningAsync ? match.isFetching : false;
|
|
535
|
+
if (nextIsFetching !== match.isFetching || match.invalid !== false) {
|
|
536
|
+
inner.updateMatch(matchId, (prev) => ({
|
|
537
|
+
...prev,
|
|
538
|
+
isFetching: nextIsFetching,
|
|
539
|
+
invalid: false
|
|
540
|
+
}));
|
|
541
|
+
return inner.router.getMatch(matchId);
|
|
542
|
+
} else {
|
|
543
|
+
return match;
|
|
544
|
+
}
|
|
545
|
+
};
|
|
546
|
+
async function loadMatches(arg) {
|
|
547
|
+
const inner = Object.assign(arg, {
|
|
548
|
+
matchPromises: []
|
|
549
|
+
});
|
|
550
|
+
if (!inner.router.isServer && inner.router.state.matches.some((d) => d._forcePending)) {
|
|
551
|
+
triggerOnReady(inner);
|
|
552
|
+
}
|
|
553
|
+
try {
|
|
554
|
+
for (let i = 0; i < inner.matches.length; i++) {
|
|
555
|
+
const beforeLoad = handleBeforeLoad(inner, i);
|
|
556
|
+
if (isPromise(beforeLoad)) await beforeLoad;
|
|
557
|
+
}
|
|
558
|
+
const max = inner.firstBadMatchIndex ?? inner.matches.length;
|
|
559
|
+
for (let i = 0; i < max; i++) {
|
|
560
|
+
inner.matchPromises.push(loadRouteMatch(inner, i));
|
|
561
|
+
}
|
|
562
|
+
await Promise.all(inner.matchPromises);
|
|
563
|
+
const readyPromise = triggerOnReady(inner);
|
|
564
|
+
if (isPromise(readyPromise)) await readyPromise;
|
|
565
|
+
} catch (err) {
|
|
566
|
+
if (isNotFound(err) && !inner.preload) {
|
|
567
|
+
const readyPromise = triggerOnReady(inner);
|
|
568
|
+
if (isPromise(readyPromise)) await readyPromise;
|
|
569
|
+
throw err;
|
|
570
|
+
}
|
|
571
|
+
if (isRedirect(err)) {
|
|
572
|
+
throw err;
|
|
573
|
+
}
|
|
574
|
+
}
|
|
575
|
+
return inner.matches;
|
|
576
|
+
}
|
|
577
|
+
async function loadRouteChunk(route) {
|
|
578
|
+
if (!route._lazyLoaded && route._lazyPromise === void 0) {
|
|
579
|
+
if (route.lazyFn) {
|
|
580
|
+
route._lazyPromise = route.lazyFn().then((lazyRoute) => {
|
|
581
|
+
const { id: _id, ...options } = lazyRoute.options;
|
|
582
|
+
Object.assign(route.options, options);
|
|
583
|
+
route._lazyLoaded = true;
|
|
584
|
+
route._lazyPromise = void 0;
|
|
585
|
+
});
|
|
586
|
+
} else {
|
|
587
|
+
route._lazyLoaded = true;
|
|
588
|
+
}
|
|
589
|
+
}
|
|
590
|
+
if (!route._componentsLoaded && route._componentsPromise === void 0) {
|
|
591
|
+
const loadComponents = () => {
|
|
592
|
+
const preloads = [];
|
|
593
|
+
for (const type of componentTypes) {
|
|
594
|
+
const preload = route.options[type]?.preload;
|
|
595
|
+
if (preload) preloads.push(preload());
|
|
596
|
+
}
|
|
597
|
+
if (preloads.length)
|
|
598
|
+
return Promise.all(preloads).then(() => {
|
|
599
|
+
route._componentsLoaded = true;
|
|
600
|
+
route._componentsPromise = void 0;
|
|
601
|
+
});
|
|
602
|
+
route._componentsLoaded = true;
|
|
603
|
+
route._componentsPromise = void 0;
|
|
604
|
+
return;
|
|
605
|
+
};
|
|
606
|
+
route._componentsPromise = route._lazyPromise ? route._lazyPromise.then(loadComponents) : loadComponents();
|
|
607
|
+
}
|
|
608
|
+
return route._componentsPromise;
|
|
609
|
+
}
|
|
610
|
+
function makeMaybe(value, error) {
|
|
611
|
+
if (error) {
|
|
612
|
+
return { status: "error", error };
|
|
613
|
+
}
|
|
614
|
+
return { status: "success", value };
|
|
615
|
+
}
|
|
616
|
+
function routeNeedsPreload(route) {
|
|
617
|
+
for (const componentType of componentTypes) {
|
|
618
|
+
if (route.options[componentType]?.preload) {
|
|
619
|
+
return true;
|
|
620
|
+
}
|
|
621
|
+
}
|
|
622
|
+
return false;
|
|
623
|
+
}
|
|
624
|
+
const componentTypes = [
|
|
625
|
+
"component",
|
|
626
|
+
"errorComponent",
|
|
627
|
+
"pendingComponent",
|
|
628
|
+
"notFoundComponent"
|
|
629
|
+
];
|
|
630
|
+
export {
|
|
631
|
+
componentTypes,
|
|
632
|
+
loadMatches,
|
|
633
|
+
loadRouteChunk,
|
|
634
|
+
routeNeedsPreload
|
|
635
|
+
};
|
|
636
|
+
//# sourceMappingURL=load-matches.js.map
|