@tanstack/router-core 0.0.1-alpha.9 → 0.0.1-beta.10
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 -1
- package/build/cjs/packages/router-core/src/qss.js +1 -0
- package/build/cjs/packages/router-core/src/qss.js.map +1 -1
- package/build/cjs/packages/router-core/src/route.js +44 -23
- package/build/cjs/packages/router-core/src/route.js.map +1 -1
- package/build/cjs/packages/router-core/src/routeConfig.js.map +1 -1
- package/build/cjs/packages/router-core/src/routeMatch.js +50 -48
- package/build/cjs/packages/router-core/src/routeMatch.js.map +1 -1
- package/build/cjs/packages/router-core/src/router.js +280 -257
- 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 +379 -324
- package/build/esm/index.js.map +1 -1
- package/build/stats-html.html +1 -1
- package/build/stats-react.json +138 -144
- package/build/types/index.d.ts +140 -96
- package/build/umd/index.development.js +379 -324
- 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/frameworks.ts +0 -1
- package/src/link.ts +45 -17
- package/src/qss.ts +1 -0
- package/src/route.ts +74 -28
- package/src/routeConfig.ts +27 -55
- package/src/routeMatch.ts +70 -61
- package/src/router.ts +435 -331
- package/src/utils.ts +7 -0
|
@@ -41,7 +41,6 @@ exports.trimPathLeft = path.trimPathLeft;
|
|
|
41
41
|
exports.trimPathRight = path.trimPathRight;
|
|
42
42
|
exports.decode = qss.decode;
|
|
43
43
|
exports.encode = qss.encode;
|
|
44
|
-
exports.cascadeLoaderData = route.cascadeLoaderData;
|
|
45
44
|
exports.createRoute = route.createRoute;
|
|
46
45
|
exports.createRouteConfig = routeConfig.createRouteConfig;
|
|
47
46
|
exports.rootRouteId = routeConfig.rootRouteId;
|
|
@@ -53,6 +52,7 @@ exports.parseSearchWith = searchParams.parseSearchWith;
|
|
|
53
52
|
exports.stringifySearchWith = searchParams.stringifySearchWith;
|
|
54
53
|
exports.functionalUpdate = utils.functionalUpdate;
|
|
55
54
|
exports.last = utils.last;
|
|
55
|
+
exports.pick = utils.pick;
|
|
56
56
|
exports.replaceEqualDeep = utils.replaceEqualDeep;
|
|
57
57
|
exports.warning = utils.warning;
|
|
58
58
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qss.js","sources":["../../../../../src/qss.ts"],"sourcesContent":["// @ts-nocheck\n\n// qss has been slightly modified and inlined here for our use cases (and compression's sake). We've included it as a hard dependency for MIT license attribution.\n\nexport function encode(obj, pfx?: string) {\n var k,\n i,\n tmp,\n str = ''\n\n for (k in obj) {\n if ((tmp = obj[k]) !== void 0) {\n if (Array.isArray(tmp)) {\n for (i = 0; i < tmp.length; i++) {\n str && (str += '&')\n str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp[i])\n }\n } else {\n str && (str += '&')\n str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp)\n }\n }\n }\n\n return (pfx || '') + str\n}\n\nfunction toValue(mix) {\n if (!mix) return ''\n var str = decodeURIComponent(mix)\n if (str === 'false') return false\n if (str === 'true') return true\n return +str * 0 === 0 ? +str : str\n}\n\nexport function decode(str) {\n var tmp,\n k,\n out = {},\n arr = str.split('&')\n\n while ((tmp = arr.shift())) {\n tmp = tmp.split('=')\n k = tmp.shift()\n if (out[k] !== void 0) {\n out[k] = [].concat(out[k], toValue(tmp.shift()))\n } else {\n out[k] = toValue(tmp.shift())\n }\n }\n\n return out\n}\n"],"names":["encode","obj","pfx","k","i","tmp","str","Array","isArray","length","encodeURIComponent","toValue","mix","decodeURIComponent","decode","out","arr","split","shift","concat"],"mappings":";;;;;;;;;;;;;;AAAA;AAEA;AAEO,SAASA,MAAT,CAAgBC,GAAhB,EAAqBC,GAArB,EAAmC;AACxC,EAAA,IAAIC,CAAJ;AAAA,MACEC,CADF;AAAA,MAEEC,GAFF;MAGEC,GAAG,GAAG,EAHR,CAAA;;EAKA,KAAKH,CAAL,IAAUF,GAAV,EAAe;IACb,IAAI,CAACI,GAAG,GAAGJ,GAAG,CAACE,CAAD,CAAV,MAAmB,KAAK,CAA5B,EAA+B;AAC7B,MAAA,IAAII,KAAK,CAACC,OAAN,CAAcH,GAAd,CAAJ,EAAwB;AACtB,QAAA,KAAKD,CAAC,GAAG,CAAT,EAAYA,CAAC,GAAGC,GAAG,CAACI,MAApB,EAA4BL,CAAC,EAA7B,EAAiC;AAC/BE,UAAAA,GAAG,KAAKA,GAAG,IAAI,GAAZ,CAAH,CAAA;AACAA,UAAAA,GAAG,IAAII,kBAAkB,CAACP,CAAD,CAAlB,GAAwB,GAAxB,GAA8BO,kBAAkB,CAACL,GAAG,CAACD,CAAD,CAAJ,CAAvD,CAAA;AACD,SAAA;AACF,OALD,MAKO;AACLE,QAAAA,GAAG,KAAKA,GAAG,IAAI,GAAZ,CAAH,CAAA;QACAA,GAAG,IAAII,kBAAkB,CAACP,CAAD,CAAlB,GAAwB,GAAxB,GAA8BO,kBAAkB,CAACL,GAAD,CAAvD,CAAA;AACD,OAAA;AACF,KAAA;AACF,GAAA;;AAED,EAAA,OAAO,CAACH,GAAG,IAAI,EAAR,IAAcI,GAArB,CAAA;AACD,CAAA;;AAED,SAASK,OAAT,CAAiBC,GAAjB,EAAsB;AACpB,EAAA,IAAI,CAACA,GAAL,EAAU,OAAO,EAAP,CAAA;AACV,EAAA,IAAIN,GAAG,GAAGO,kBAAkB,CAACD,GAAD,CAA5B,CAAA;AACA,EAAA,IAAIN,GAAG,KAAK,OAAZ,EAAqB,OAAO,KAAP,CAAA;AACrB,EAAA,IAAIA,GAAG,KAAK,MAAZ,EAAoB,OAAO,IAAP,CAAA;EACpB,OAAO,CAACA,GAAD,GAAO,CAAP,KAAa,CAAb,GAAiB,CAACA,GAAlB,GAAwBA,GAA/B,CAAA;AACD,CAAA;;AAEM,
|
|
1
|
+
{"version":3,"file":"qss.js","sources":["../../../../../src/qss.ts"],"sourcesContent":["// @ts-nocheck\n\n// qss has been slightly modified and inlined here for our use cases (and compression's sake). We've included it as a hard dependency for MIT license attribution.\n\nexport function encode(obj, pfx?: string) {\n var k,\n i,\n tmp,\n str = ''\n\n for (k in obj) {\n if ((tmp = obj[k]) !== void 0) {\n if (Array.isArray(tmp)) {\n for (i = 0; i < tmp.length; i++) {\n str && (str += '&')\n str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp[i])\n }\n } else {\n str && (str += '&')\n str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp)\n }\n }\n }\n\n return (pfx || '') + str\n}\n\nfunction toValue(mix) {\n if (!mix) return ''\n var str = decodeURIComponent(mix)\n if (str === 'false') return false\n if (str === 'true') return true\n if (str.charAt(0) === '0') return str\n return +str * 0 === 0 ? +str : str\n}\n\nexport function decode(str) {\n var tmp,\n k,\n out = {},\n arr = str.split('&')\n\n while ((tmp = arr.shift())) {\n tmp = tmp.split('=')\n k = tmp.shift()\n if (out[k] !== void 0) {\n out[k] = [].concat(out[k], toValue(tmp.shift()))\n } else {\n out[k] = toValue(tmp.shift())\n }\n }\n\n return out\n}\n"],"names":["encode","obj","pfx","k","i","tmp","str","Array","isArray","length","encodeURIComponent","toValue","mix","decodeURIComponent","charAt","decode","out","arr","split","shift","concat"],"mappings":";;;;;;;;;;;;;;AAAA;AAEA;AAEO,SAASA,MAAT,CAAgBC,GAAhB,EAAqBC,GAArB,EAAmC;AACxC,EAAA,IAAIC,CAAJ;AAAA,MACEC,CADF;AAAA,MAEEC,GAFF;MAGEC,GAAG,GAAG,EAHR,CAAA;;EAKA,KAAKH,CAAL,IAAUF,GAAV,EAAe;IACb,IAAI,CAACI,GAAG,GAAGJ,GAAG,CAACE,CAAD,CAAV,MAAmB,KAAK,CAA5B,EAA+B;AAC7B,MAAA,IAAII,KAAK,CAACC,OAAN,CAAcH,GAAd,CAAJ,EAAwB;AACtB,QAAA,KAAKD,CAAC,GAAG,CAAT,EAAYA,CAAC,GAAGC,GAAG,CAACI,MAApB,EAA4BL,CAAC,EAA7B,EAAiC;AAC/BE,UAAAA,GAAG,KAAKA,GAAG,IAAI,GAAZ,CAAH,CAAA;AACAA,UAAAA,GAAG,IAAII,kBAAkB,CAACP,CAAD,CAAlB,GAAwB,GAAxB,GAA8BO,kBAAkB,CAACL,GAAG,CAACD,CAAD,CAAJ,CAAvD,CAAA;AACD,SAAA;AACF,OALD,MAKO;AACLE,QAAAA,GAAG,KAAKA,GAAG,IAAI,GAAZ,CAAH,CAAA;QACAA,GAAG,IAAII,kBAAkB,CAACP,CAAD,CAAlB,GAAwB,GAAxB,GAA8BO,kBAAkB,CAACL,GAAD,CAAvD,CAAA;AACD,OAAA;AACF,KAAA;AACF,GAAA;;AAED,EAAA,OAAO,CAACH,GAAG,IAAI,EAAR,IAAcI,GAArB,CAAA;AACD,CAAA;;AAED,SAASK,OAAT,CAAiBC,GAAjB,EAAsB;AACpB,EAAA,IAAI,CAACA,GAAL,EAAU,OAAO,EAAP,CAAA;AACV,EAAA,IAAIN,GAAG,GAAGO,kBAAkB,CAACD,GAAD,CAA5B,CAAA;AACA,EAAA,IAAIN,GAAG,KAAK,OAAZ,EAAqB,OAAO,KAAP,CAAA;AACrB,EAAA,IAAIA,GAAG,KAAK,MAAZ,EAAoB,OAAO,IAAP,CAAA;EACpB,IAAIA,GAAG,CAACQ,MAAJ,CAAW,CAAX,CAAkB,KAAA,GAAtB,EAA2B,OAAOR,GAAP,CAAA;EAC3B,OAAO,CAACA,GAAD,GAAO,CAAP,KAAa,CAAb,GAAiB,CAACA,GAAlB,GAAwBA,GAA/B,CAAA;AACD,CAAA;;AAEM,SAASS,MAAT,CAAgBT,GAAhB,EAAqB;AAC1B,EAAA,IAAID,GAAJ;AAAA,MACEF,CADF;MAEEa,GAAG,GAAG,EAFR;AAAA,MAGEC,GAAG,GAAGX,GAAG,CAACY,KAAJ,CAAU,GAAV,CAHR,CAAA;;AAKA,EAAA,OAAQb,GAAG,GAAGY,GAAG,CAACE,KAAJ,EAAd,EAA4B;AAC1Bd,IAAAA,GAAG,GAAGA,GAAG,CAACa,KAAJ,CAAU,GAAV,CAAN,CAAA;AACAf,IAAAA,CAAC,GAAGE,GAAG,CAACc,KAAJ,EAAJ,CAAA;;AACA,IAAA,IAAIH,GAAG,CAACb,CAAD,CAAH,KAAW,KAAK,CAApB,EAAuB;AACrBa,MAAAA,GAAG,CAACb,CAAD,CAAH,GAAS,EAAGiB,CAAAA,MAAH,CAAUJ,GAAG,CAACb,CAAD,CAAb,EAAkBQ,OAAO,CAACN,GAAG,CAACc,KAAJ,EAAD,CAAzB,CAAT,CAAA;AACD,KAFD,MAEO;MACLH,GAAG,CAACb,CAAD,CAAH,GAASQ,OAAO,CAACN,GAAG,CAACc,KAAJ,EAAD,CAAhB,CAAA;AACD,KAAA;AACF,GAAA;;AAED,EAAA,OAAOH,GAAP,CAAA;AACD;;;;;"}
|
|
@@ -13,7 +13,6 @@
|
|
|
13
13
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
14
14
|
|
|
15
15
|
var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
|
|
16
|
-
var utils = require('./utils.js');
|
|
17
16
|
|
|
18
17
|
function createRoute(routeConfig, options, parent, router) {
|
|
19
18
|
const {
|
|
@@ -25,7 +24,7 @@ function createRoute(routeConfig, options, parent, router) {
|
|
|
25
24
|
|
|
26
25
|
const action = router.state.actions[id] || (() => {
|
|
27
26
|
router.state.actions[id] = {
|
|
28
|
-
|
|
27
|
+
submissions: [],
|
|
29
28
|
submit: async (submission, actionOpts) => {
|
|
30
29
|
var _actionOpts$invalidat;
|
|
31
30
|
|
|
@@ -34,18 +33,20 @@ function createRoute(routeConfig, options, parent, router) {
|
|
|
34
33
|
}
|
|
35
34
|
|
|
36
35
|
const invalidate = (_actionOpts$invalidat = actionOpts == null ? void 0 : actionOpts.invalidate) != null ? _actionOpts$invalidat : true;
|
|
36
|
+
|
|
37
|
+
if (!(actionOpts != null && actionOpts.multi)) {
|
|
38
|
+
action.submissions = action.submissions.filter(d => d.isMulti);
|
|
39
|
+
}
|
|
40
|
+
|
|
37
41
|
const actionState = {
|
|
38
42
|
submittedAt: Date.now(),
|
|
39
43
|
status: 'pending',
|
|
40
|
-
submission
|
|
44
|
+
submission,
|
|
45
|
+
isMulti: !!(actionOpts != null && actionOpts.multi)
|
|
41
46
|
};
|
|
42
47
|
action.current = actionState;
|
|
43
48
|
action.latest = actionState;
|
|
44
|
-
action.
|
|
45
|
-
router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
|
|
46
|
-
currentAction: actionState,
|
|
47
|
-
latestAction: actionState
|
|
48
|
-
});
|
|
49
|
+
action.submissions.push(actionState);
|
|
49
50
|
router.notify();
|
|
50
51
|
|
|
51
52
|
try {
|
|
@@ -67,11 +68,6 @@ function createRoute(routeConfig, options, parent, router) {
|
|
|
67
68
|
actionState.error = err;
|
|
68
69
|
actionState.status = 'error';
|
|
69
70
|
} finally {
|
|
70
|
-
action.pending = action.pending.filter(d => d !== actionState);
|
|
71
|
-
router.removeActionQueue.push({
|
|
72
|
-
action,
|
|
73
|
-
actionState
|
|
74
|
-
});
|
|
75
71
|
router.notify();
|
|
76
72
|
}
|
|
77
73
|
}
|
|
@@ -79,6 +75,40 @@ function createRoute(routeConfig, options, parent, router) {
|
|
|
79
75
|
return router.state.actions[id];
|
|
80
76
|
})();
|
|
81
77
|
|
|
78
|
+
const loader = router.state.loaders[id] || (() => {
|
|
79
|
+
router.state.loaders[id] = {
|
|
80
|
+
pending: [],
|
|
81
|
+
fetch: async loaderContext => {
|
|
82
|
+
if (!route) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const loaderState = {
|
|
87
|
+
loadedAt: Date.now(),
|
|
88
|
+
loaderContext
|
|
89
|
+
};
|
|
90
|
+
loader.current = loaderState;
|
|
91
|
+
loader.latest = loaderState;
|
|
92
|
+
loader.pending.push(loaderState); // router.state = {
|
|
93
|
+
// ...router.state,
|
|
94
|
+
// currentAction: loaderState,
|
|
95
|
+
// latestAction: loaderState,
|
|
96
|
+
// }
|
|
97
|
+
|
|
98
|
+
router.notify();
|
|
99
|
+
|
|
100
|
+
try {
|
|
101
|
+
return await (route.options.loader == null ? void 0 : route.options.loader(loaderContext));
|
|
102
|
+
} finally {
|
|
103
|
+
loader.pending = loader.pending.filter(d => d !== loaderState); // router.removeActionQueue.push({ loader, loaderState })
|
|
104
|
+
|
|
105
|
+
router.notify();
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
return router.state.loaders[id];
|
|
110
|
+
})();
|
|
111
|
+
|
|
82
112
|
let route = {
|
|
83
113
|
routeId: id,
|
|
84
114
|
routeRouteId: routeId,
|
|
@@ -89,6 +119,7 @@ function createRoute(routeConfig, options, parent, router) {
|
|
|
89
119
|
childRoutes: undefined,
|
|
90
120
|
parentRoute: parent,
|
|
91
121
|
action,
|
|
122
|
+
loader: loader,
|
|
92
123
|
buildLink: options => {
|
|
93
124
|
return router.buildLink(_rollupPluginBabelHelpers["extends"]({}, options, {
|
|
94
125
|
from: fullPath
|
|
@@ -111,16 +142,6 @@ function createRoute(routeConfig, options, parent, router) {
|
|
|
111
142
|
});
|
|
112
143
|
return route;
|
|
113
144
|
}
|
|
114
|
-
function cascadeLoaderData(matches) {
|
|
115
|
-
matches.forEach((match, index) => {
|
|
116
|
-
const parent = matches[index - 1];
|
|
117
|
-
|
|
118
|
-
if (parent) {
|
|
119
|
-
match.loaderData = utils.replaceEqualDeep(match.loaderData, _rollupPluginBabelHelpers["extends"]({}, parent.loaderData, match.routeLoaderData));
|
|
120
|
-
}
|
|
121
|
-
});
|
|
122
|
-
}
|
|
123
145
|
|
|
124
|
-
exports.cascadeLoaderData = cascadeLoaderData;
|
|
125
146
|
exports.createRoute = createRoute;
|
|
126
147
|
//# sourceMappingURL=route.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sources":["../../../../../src/route.ts"],"sourcesContent":["import {\n CheckRelativePath,\n LinkInfo,\n LinkOptions,\n ResolveRelativePath,\n ToOptions,\n} from './link'\nimport { RouteConfig, RouteOptions } from './routeConfig'\nimport {\n AnyAllRouteInfo,\n AnyRouteInfo,\n DefaultAllRouteInfo,\n RouteInfo,\n RouteInfoByPath,\n} from './routeInfo'\nimport { RouteMatch } from './routeMatch'\nimport { Action, ActionState, MatchRouteOptions, Router } from './router'\nimport { NoInfer, replaceEqualDeep } from './utils'\n\nexport interface AnyRoute extends Route<any, any> {}\n\nexport interface Route<\n TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n TRouteInfo extends AnyRouteInfo = RouteInfo,\n> {\n routeId: TRouteInfo['id']\n routeRouteId: TRouteInfo['routeId']\n routePath: TRouteInfo['path']\n fullPath: TRouteInfo['fullPath']\n parentRoute?: AnyRoute\n childRoutes?: AnyRoute[]\n options: RouteOptions\n router: Router<TAllRouteInfo['routeConfig'], TAllRouteInfo>\n buildLink: <TTo extends string = '.'>(\n options: Omit<\n LinkOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo>,\n 'from'\n >,\n ) => LinkInfo\n matchRoute: <\n TTo extends string = '.',\n TResolved extends string = ResolveRelativePath<TRouteInfo['id'], TTo>,\n >(\n matchLocation: CheckRelativePath<\n TAllRouteInfo,\n TRouteInfo['fullPath'],\n NoInfer<TTo>\n > &\n Omit<ToOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo>, 'from'>,\n opts?: MatchRouteOptions,\n ) => RouteInfoByPath<TAllRouteInfo, TResolved>['allParams']\n navigate: <TTo extends string = '.'>(\n options: Omit<LinkOptions<TAllRouteInfo, TRouteInfo['id'], TTo>, 'from'>,\n ) => Promise<void>\n action: unknown extends TRouteInfo['actionResponse']\n ?\n | Action<TRouteInfo['actionPayload'], TRouteInfo['actionResponse']>\n | undefined\n : Action<TRouteInfo['actionPayload'], TRouteInfo['actionResponse']>\n}\n\nexport function createRoute<\n TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n TRouteInfo extends AnyRouteInfo = RouteInfo,\n>(\n routeConfig: RouteConfig,\n options: TRouteInfo['options'],\n parent: undefined | Route<TAllRouteInfo, any>,\n router: Router<TAllRouteInfo['routeConfig'], TAllRouteInfo>,\n): Route<TAllRouteInfo, TRouteInfo> {\n const { id, routeId, path: routePath, fullPath } = routeConfig\n\n const action =\n router.state.actions[id] ||\n (() => {\n router.state.actions[id] = {\n pending: [],\n submit: async <T, U>(\n submission: T,\n actionOpts?: { invalidate?: boolean },\n ) => {\n if (!route) {\n return\n }\n\n const invalidate = actionOpts?.invalidate ?? true\n\n const actionState: ActionState<T, U> = {\n submittedAt: Date.now(),\n status: 'pending',\n submission,\n }\n\n action.current = actionState\n action.latest = actionState\n action.pending.push(actionState)\n\n router.state = {\n ...router.state,\n currentAction: actionState,\n latestAction: actionState,\n }\n\n router.notify()\n\n try {\n const res = await route.options.action?.(submission)\n actionState.data = res as U\n if (invalidate) {\n router.invalidateRoute({ to: '.', fromCurrent: true })\n await router.reload()\n }\n actionState.status = 'success'\n return res\n } catch (err) {\n console.error(err)\n actionState.error = err\n actionState.status = 'error'\n } finally {\n action.pending = action.pending.filter((d) => d !== actionState)\n router.removeActionQueue.push({ action, actionState })\n router.notify()\n }\n },\n }\n return router.state.actions[id]!\n })()\n\n let route: Route<TAllRouteInfo, TRouteInfo> = {\n routeId: id,\n routeRouteId: routeId,\n routePath,\n fullPath,\n options,\n router,\n childRoutes: undefined!,\n parentRoute: parent,\n action,\n\n buildLink: (options) => {\n return router.buildLink({\n ...options,\n from: fullPath,\n } as any) as any\n },\n\n navigate: (options) => {\n return router.navigate({\n ...options,\n from: fullPath,\n } as any) as any\n },\n\n matchRoute: (matchLocation, opts) => {\n return router.matchRoute(\n {\n ...matchLocation,\n from: fullPath,\n } as any,\n opts,\n )\n },\n }\n\n router.options.createRoute?.({ router, route })\n\n return route\n}\n\nexport function cascadeLoaderData(matches: RouteMatch<any, any>[]) {\n matches.forEach((match, index) => {\n const parent = matches[index - 1]\n\n if (parent) {\n match.loaderData = replaceEqualDeep(match.loaderData, {\n ...parent.loaderData,\n ...match.routeLoaderData,\n })\n }\n })\n}\n"],"names":["createRoute","routeConfig","options","parent","router","id","routeId","path","routePath","fullPath","action","state","actions","pending","submit","submission","actionOpts","route","invalidate","actionState","submittedAt","Date","now","status","current","latest","push","currentAction","latestAction","notify","res","data","invalidateRoute","to","fromCurrent","reload","err","console","error","filter","d","removeActionQueue","routeRouteId","childRoutes","undefined","parentRoute","buildLink","_extends","from","navigate","matchRoute","matchLocation","opts","cascadeLoaderData","matches","forEach","match","index","loaderData","replaceEqualDeep","routeLoaderData"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"route.js","sources":["../../../../../src/route.ts"],"sourcesContent":["import {\n CheckRelativePath,\n LinkInfo,\n LinkOptions,\n ResolveRelativePath,\n ToOptions,\n} from './link'\nimport { LoaderContext, RouteConfig, RouteOptions } from './routeConfig'\nimport {\n AnyAllRouteInfo,\n AnyRouteInfo,\n DefaultAllRouteInfo,\n RouteInfo,\n RouteInfoByPath,\n} from './routeInfo'\nimport {\n Action,\n ActionState,\n Loader,\n LoaderState,\n MatchRouteOptions,\n Router,\n} from './router'\nimport { NoInfer } from './utils'\n\nexport interface AnyRoute extends Route<any, any> {}\n\nexport interface Route<\n TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n TRouteInfo extends AnyRouteInfo = RouteInfo,\n> {\n routeId: TRouteInfo['id']\n routeRouteId: TRouteInfo['routeId']\n routePath: TRouteInfo['path']\n fullPath: TRouteInfo['fullPath']\n parentRoute?: AnyRoute\n childRoutes?: AnyRoute[]\n options: RouteOptions\n router: Router<TAllRouteInfo['routeConfig'], TAllRouteInfo>\n buildLink: <TTo extends string = '.'>(\n options: Omit<\n LinkOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo>,\n 'from'\n >,\n ) => LinkInfo\n matchRoute: <\n TTo extends string = '.',\n TResolved extends string = ResolveRelativePath<TRouteInfo['id'], TTo>,\n >(\n matchLocation: CheckRelativePath<\n TAllRouteInfo,\n TRouteInfo['fullPath'],\n NoInfer<TTo>\n > &\n Omit<ToOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo>, 'from'>,\n opts?: MatchRouteOptions,\n ) => RouteInfoByPath<TAllRouteInfo, TResolved>['allParams']\n navigate: <TTo extends string = '.'>(\n options: Omit<LinkOptions<TAllRouteInfo, TRouteInfo['id'], TTo>, 'from'>,\n ) => Promise<void>\n action: unknown extends TRouteInfo['actionResponse']\n ?\n | Action<TRouteInfo['actionPayload'], TRouteInfo['actionResponse']>\n | undefined\n : Action<TRouteInfo['actionPayload'], TRouteInfo['actionResponse']>\n loader: unknown extends TRouteInfo['routeLoaderData']\n ?\n | Action<\n LoaderContext<\n TRouteInfo['fullSearchSchema'],\n TRouteInfo['allParams']\n >,\n TRouteInfo['routeLoaderData']\n >\n | undefined\n : Loader<\n TRouteInfo['fullSearchSchema'],\n TRouteInfo['allParams'],\n TRouteInfo['routeLoaderData']\n >\n}\n\nexport function createRoute<\n TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n TRouteInfo extends AnyRouteInfo = RouteInfo,\n>(\n routeConfig: RouteConfig,\n options: TRouteInfo['options'],\n parent: undefined | Route<TAllRouteInfo, any>,\n router: Router<TAllRouteInfo['routeConfig'], TAllRouteInfo>,\n): Route<TAllRouteInfo, TRouteInfo> {\n const { id, routeId, path: routePath, fullPath } = routeConfig\n\n const action =\n router.state.actions[id] ||\n (() => {\n router.state.actions[id] = {\n submissions: [],\n submit: async <T, U>(\n submission: T,\n actionOpts?: { invalidate?: boolean; multi?: boolean },\n ) => {\n if (!route) {\n return\n }\n\n const invalidate = actionOpts?.invalidate ?? true\n\n if (!actionOpts?.multi) {\n action.submissions = action.submissions.filter((d) => d.isMulti)\n }\n\n const actionState: ActionState<T, U> = {\n submittedAt: Date.now(),\n status: 'pending',\n submission,\n isMulti: !!actionOpts?.multi,\n }\n\n action.current = actionState\n action.latest = actionState\n action.submissions.push(actionState)\n\n router.notify()\n\n try {\n const res = await route.options.action?.(submission)\n actionState.data = res as U\n\n if (invalidate) {\n router.invalidateRoute({ to: '.', fromCurrent: true })\n await router.reload()\n }\n actionState.status = 'success'\n return res\n } catch (err) {\n console.error(err)\n actionState.error = err\n actionState.status = 'error'\n } finally {\n router.notify()\n }\n },\n }\n return router.state.actions[id]!\n })()\n\n const loader =\n router.state.loaders[id] ||\n (() => {\n router.state.loaders[id] = {\n pending: [],\n fetch: (async (loaderContext: LoaderContext<any, any>) => {\n if (!route) {\n return\n }\n\n const loaderState: LoaderState<any, any> = {\n loadedAt: Date.now(),\n loaderContext,\n }\n\n loader.current = loaderState\n loader.latest = loaderState\n loader.pending.push(loaderState)\n\n // router.state = {\n // ...router.state,\n // currentAction: loaderState,\n // latestAction: loaderState,\n // }\n\n router.notify()\n\n try {\n return await route.options.loader?.(loaderContext)\n } finally {\n loader.pending = loader.pending.filter((d) => d !== loaderState)\n // router.removeActionQueue.push({ loader, loaderState })\n router.notify()\n }\n }) as any,\n }\n return router.state.loaders[id]!\n })()\n\n let route: Route<TAllRouteInfo, TRouteInfo> = {\n routeId: id,\n routeRouteId: routeId,\n routePath,\n fullPath,\n options,\n router,\n childRoutes: undefined!,\n parentRoute: parent,\n action,\n loader: loader as any,\n\n buildLink: (options) => {\n return router.buildLink({\n ...options,\n from: fullPath,\n } as any) as any\n },\n\n navigate: (options) => {\n return router.navigate({\n ...options,\n from: fullPath,\n } as any) as any\n },\n\n matchRoute: (matchLocation, opts) => {\n return router.matchRoute(\n {\n ...matchLocation,\n from: fullPath,\n } as any,\n opts,\n )\n },\n }\n\n router.options.createRoute?.({ router, route })\n\n return route\n}\n"],"names":["createRoute","routeConfig","options","parent","router","id","routeId","path","routePath","fullPath","action","state","actions","submissions","submit","submission","actionOpts","route","invalidate","multi","filter","d","isMulti","actionState","submittedAt","Date","now","status","current","latest","push","notify","res","data","invalidateRoute","to","fromCurrent","reload","err","console","error","loader","loaders","pending","fetch","loaderContext","loaderState","loadedAt","routeRouteId","childRoutes","undefined","parentRoute","buildLink","_extends","from","navigate","matchRoute","matchLocation","opts"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routeConfig.js","sources":["../../../../../src/routeConfig.ts"],"sourcesContent":["import { GetFrameworkGeneric } from './frameworks'\nimport { ParsePathParams } from './link'\nimport { joinPaths, trimPath, trimPathRight } from './path'\nimport { RouteInfo } from './routeInfo'\nimport { RouteMatch } from './routeMatch'\nimport {\n DeepAwaited,\n Expand,\n IsAny,\n NoInfer,\n PickUnsafe,\n Values,\n} from './utils'\n\nexport const rootRouteId = '__root__' as const\nexport type RootRouteId = typeof rootRouteId\n\nexport type AnyLoaderData = {}\nexport type AnyPathParams = {}\nexport type AnySearchSchema = {}\nexport interface RouteMeta {}\n\n// The parse type here allows a zod schema to be passed directly to the validator\nexport type SearchSchemaValidator<TReturn, TParentSchema> =\n | SearchSchemaValidatorObj<TReturn, TParentSchema>\n | SearchSchemaValidatorFn<TReturn, TParentSchema>\n\nexport type SearchSchemaValidatorObj<TReturn, TParentSchema> = {\n parse?: SearchSchemaValidatorFn<TReturn, TParentSchema>\n}\n\nexport type SearchSchemaValidatorFn<TReturn, TParentSchema> = (\n searchObj: Record<string, unknown>,\n) => {} extends TParentSchema\n ? TReturn\n : keyof TReturn extends keyof TParentSchema\n ? {\n error: 'Top level search params cannot be redefined by child routes!'\n keys: keyof TReturn & keyof TParentSchema\n }\n : TReturn\n\nexport type DefinedPathParamWarning =\n 'Path params cannot be redefined by child routes!'\n\nexport type ParentParams<TParentParams> = AnyPathParams extends TParentParams\n ? {}\n : {\n [Key in keyof TParentParams]?: DefinedPathParamWarning\n }\n\nexport type LoaderFn<\n TRouteLoaderData extends AnyLoaderData,\n TFullSearchSchema extends AnySearchSchema = {},\n TAllParams extends AnyPathParams = {},\n> = (loaderContext: {\n params: TAllParams\n search: TFullSearchSchema\n signal?: AbortSignal\n}) => Promise<TRouteLoaderData>\n\nexport type ActionFn<TActionPayload = unknown, TActionResponse = unknown> = (\n submission: TActionPayload,\n) => TActionResponse | Promise<TActionResponse>\n\nexport type UnloaderFn<TPath extends string> = (\n routeMatch: RouteMatch<any, RouteInfo<string, TPath>>,\n) => void\n\nexport type RouteOptions<\n TRouteId extends string = string,\n TPath extends string = string,\n TRouteLoaderData extends AnyLoaderData = {},\n TLoaderData extends AnyLoaderData = {},\n TActionPayload = unknown,\n TActionResponse = unknown,\n TParentSearchSchema extends {} = {},\n TSearchSchema extends AnySearchSchema = {},\n TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n TParentParams extends AnyPathParams = {},\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams = {},\n> = (\n | {\n // The path to match (relative to the nearest parent `Route` component or root basepath)\n path: TPath\n }\n | {\n id: TRouteId\n }\n) & {\n // If true, this route will be matched as case-sensitive\n caseSensitive?: boolean\n validateSearch?: SearchSchemaValidator<TSearchSchema, TParentSearchSchema>\n // Filter functions that can manipulate search params *before* they are passed to links and navigate\n // calls that match this route.\n preSearchFilters?: SearchFilter<TFullSearchSchema>[]\n // Filter functions that can manipulate search params *after* they are passed to links and navigate\n // calls that match this route.\n postSearchFilters?: SearchFilter<TFullSearchSchema>[]\n // The duration to wait during `loader` execution before showing the `pendingElement`\n pendingMs?: number\n // _If the `pendingElement` is shown_, the minimum duration for which it will be visible.\n pendingMinMs?: number\n // // An array of child routes\n // children?: Route<any, any, any, any>[]\n} & (\n | {\n parseParams?: never\n stringifyParams?: never\n }\n | {\n // Parse params optionally receives path params as strings and returns them in a parsed format (like a number or boolean)\n parseParams: (\n rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>,\n ) => TParams\n stringifyParams: (\n params: TParams,\n ) => Record<ParsePathParams<TPath>, string>\n }\n ) &\n RouteLoaders<\n // Route Loaders (see below) can be inline on the route, or resolved async\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TFullSearchSchema,\n TAllParams\n > & {\n // If `import` is defined, this route can resolve its elements and loaders in a single asynchronous call\n // This is particularly useful for code-splitting or module federation\n import?: (opts: {\n params: AnyPathParams\n }) => Promise<\n RouteLoaders<\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TFullSearchSchema,\n TAllParams\n >\n >\n } & (PickUnsafe<TParentParams, ParsePathParams<TPath>> extends never // Detect if an existing path param is being redefined\n ? {}\n : 'Cannot redefined path params in child routes!')\n\nexport interface RouteLoaders<\n TRouteLoaderData extends AnyLoaderData = {},\n TLoaderData extends AnyLoaderData = {},\n TActionPayload = unknown,\n TActionResponse = unknown,\n TFullSearchSchema extends AnySearchSchema = {},\n TAllParams extends AnyPathParams = {},\n> {\n // The content to be rendered when the route is matched. If no element is provided, defaults to `<Outlet />`\n element?: GetFrameworkGeneric<'SyncOrAsyncElement'> // , NoInfer<TLoaderData>>\n // The content to be rendered when `loader` encounters an error\n errorElement?: GetFrameworkGeneric<'SyncOrAsyncElement'> // , NoInfer<TLoaderData>>\n // The content to be rendered when rendering encounters an error\n catchElement?: GetFrameworkGeneric<'SyncOrAsyncElement'> // , NoInfer<TLoaderData>>\n // The content to be rendered when the duration of `loader` execution surpasses the `pendingMs` duration\n pendingElement?: GetFrameworkGeneric<'SyncOrAsyncElement'> //, NoInfer<TLoaderData>>\n // An asynchronous function responsible for preparing or fetching data for the route before it is rendered\n loader?: LoaderFn<TRouteLoaderData, TFullSearchSchema, TAllParams>\n // The max age to consider loader data fresh (not-stale) for this route in milliseconds from the time of fetch\n // Defaults to 0. Only stale loader data is refetched.\n loaderMaxAge?: number\n // The max age to cache the loader data for this route in milliseconds from the time of route inactivity\n // before it is garbage collected.\n loaderGcMaxAge?: number\n // An asynchronous function made available to the route for performing asynchronous or mutative actions that\n // might invalidate the route's data.\n action?: ActionFn<TActionPayload, TActionResponse>\n // Set this to true to rethrow errors up the component tree to either the nearest error boundary or\n // route with error element, whichever comes first.\n useErrorBoundary?: boolean\n // This function is called\n // when moving from an inactive state to an active one. Likewise, when moving from\n // an active to an inactive state, the return function (if provided) is called.\n onMatch?: (matchContext: {\n params: TAllParams\n search: TFullSearchSchema\n }) =>\n | void\n | undefined\n | ((match: { params: TAllParams; search: TFullSearchSchema }) => void)\n // This function is called when the route remains active from one transition to the next.\n onTransition?: (match: {\n params: TAllParams\n search: TFullSearchSchema\n }) => void\n // An object of whatever you want! This object is accessible anywhere matches are.\n meta?: RouteMeta // TODO: Make this nested and mergeable\n}\n\nexport type SearchFilter<T, U = T> = (prev: T) => U\n\nexport interface RouteConfig<\n TId extends string = string,\n TRouteId extends string = string,\n TPath extends string = string,\n TFullPath extends string = string,\n TRouteLoaderData extends AnyLoaderData = AnyLoaderData,\n TLoaderData extends AnyLoaderData = AnyLoaderData,\n TActionPayload = unknown,\n TActionResponse = unknown,\n TParentSearchSchema extends {} = {},\n TSearchSchema extends AnySearchSchema = {},\n TFullSearchSchema extends AnySearchSchema = {},\n TParentParams extends AnyPathParams = {},\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams = {},\n TKnownChildren = unknown,\n> {\n id: TId\n routeId: TRouteId\n path: NoInfer<TPath>\n fullPath: TFullPath\n options: RouteOptions<\n TRouteId,\n TPath,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams\n >\n children?: TKnownChildren\n addChildren: IsAny<\n TId,\n any,\n <TNewChildren extends any>(\n children: TNewChildren extends AnyRouteConfig[]\n ? TNewChildren\n : { error: 'Invalid route detected'; route: TNewChildren },\n ) => RouteConfig<\n TId,\n TRouteId,\n TPath,\n TFullPath,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams,\n TNewChildren\n >\n >\n createChildren: IsAny<\n TId,\n any,\n <TNewChildren extends any>(\n cb: (\n createChildRoute: CreateRouteConfigFn<\n false,\n TId,\n TFullPath,\n TLoaderData,\n TFullSearchSchema,\n TAllParams\n >,\n ) => TNewChildren extends AnyRouteConfig[]\n ? TNewChildren\n : { error: 'Invalid route detected'; route: TNewChildren },\n ) => RouteConfig<\n TId,\n TRouteId,\n TPath,\n TFullPath,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams,\n TNewChildren\n >\n >\n createRoute: CreateRouteConfigFn<\n false,\n TId,\n TFullPath,\n TLoaderData,\n TFullSearchSchema,\n TAllParams\n >\n}\n\ntype CreateRouteConfigFn<\n TIsRoot extends boolean = false,\n TParentId extends string = string,\n TParentPath extends string = string,\n TParentAllLoaderData extends AnyLoaderData = {},\n TParentSearchSchema extends AnySearchSchema = {},\n TParentParams extends AnyPathParams = {},\n> = <\n TRouteId extends string,\n TPath extends string,\n TRouteLoaderData extends AnyLoaderData,\n TActionPayload,\n TActionResponse,\n TSearchSchema extends AnySearchSchema = AnySearchSchema,\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams extends TParams\n ? Record<ParsePathParams<TPath>, string>\n : NoInfer<TParams> = AnyPathParams extends TParams\n ? Record<ParsePathParams<TPath>, string>\n : NoInfer<TParams>,\n TKnownChildren extends RouteConfig[] = RouteConfig[],\n TResolvedId extends string = string extends TRouteId\n ? string extends TPath\n ? string\n : TPath\n : TRouteId,\n>(\n options?: TIsRoot extends true\n ? Omit<\n RouteOptions<\n TRouteId,\n TPath,\n TRouteLoaderData,\n Expand<TParentAllLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>\n >,\n 'path'\n > & { path?: never }\n : RouteOptions<\n TRouteId,\n TPath,\n TRouteLoaderData,\n Expand<TParentAllLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>\n >,\n children?: TKnownChildren,\n isRoot?: boolean,\n parentId?: string,\n parentPath?: string,\n) => RouteConfig<\n RoutePrefix<TParentId, TResolvedId>,\n TResolvedId,\n TPath,\n string extends TPath ? '' : RoutePath<RoutePrefix<TParentPath, TPath>>,\n TRouteLoaderData,\n Expand<TParentAllLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>,\n TKnownChildren\n>\n\ntype RoutePath<T extends string> = T extends RootRouteId\n ? '/'\n : TrimPathRight<`${T}`>\n\ntype RoutePrefix<\n TPrefix extends string,\n TId extends string,\n> = string extends TId\n ? RootRouteId\n : TId extends string\n ? `${TPrefix}/${TId}` extends '/'\n ? '/'\n : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TId>}`>}`\n : never\n\nexport interface AnyRouteConfig\n extends RouteConfig<\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any\n > {}\n\nexport interface AnyRouteConfigWithChildren<TChildren>\n extends RouteConfig<\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n TChildren\n > {}\n\ntype TrimPath<T extends string> = '' extends T\n ? ''\n : TrimPathRight<TrimPathLeft<T>>\n\ntype TrimPathLeft<T extends string> = T extends `${RootRouteId}/${infer U}`\n ? TrimPathLeft<U>\n : T extends `/${infer U}`\n ? TrimPathLeft<U>\n : T\ntype TrimPathRight<T extends string> = T extends '/'\n ? '/'\n : T extends `${infer U}/`\n ? TrimPathRight<U>\n : T\n\nexport const createRouteConfig: CreateRouteConfigFn<true> = (\n options = {} as any,\n children,\n isRoot = true,\n parentId,\n parentPath,\n) => {\n if (isRoot) {\n ;(options as any).path = rootRouteId\n }\n\n // Strip the root from parentIds\n if (parentId === rootRouteId) {\n parentId = ''\n }\n\n let path: undefined | string = isRoot ? rootRouteId : options.path\n\n // If the path is anything other than an index path, trim it up\n if (path && path !== '/') {\n path = trimPath(path)\n }\n\n const routeId = path || (options as { id?: string }).id\n\n let id = joinPaths([parentId, routeId])\n\n if (path === rootRouteId) {\n path = '/'\n }\n\n if (id !== rootRouteId) {\n id = joinPaths(['/', id])\n }\n\n const fullPath =\n id === rootRouteId ? '/' : trimPathRight(joinPaths([parentPath, path]))\n\n return {\n id: id as any,\n routeId: routeId as any,\n path: path as any,\n fullPath: fullPath as any,\n options: options as any,\n children,\n createChildren: (cb: any) =>\n createRouteConfig(\n options,\n cb((childOptions: any) =>\n createRouteConfig(childOptions, undefined, false, id, fullPath),\n ),\n false,\n parentId,\n parentPath,\n ),\n addChildren: (children: any) =>\n createRouteConfig(options, children, false, parentId, parentPath),\n createRoute: (childOptions: any) =>\n createRouteConfig(childOptions, undefined, false, id, fullPath) as any,\n }\n}\n"],"names":["rootRouteId","createRouteConfig","options","children","isRoot","parentId","parentPath","path","trimPath","routeId","id","joinPaths","fullPath","trimPathRight","createChildren","cb","childOptions","undefined","addChildren","createRoute"],"mappings":";;;;;;;;;;;;;;;;AAcO,MAAMA,WAAW,GAAG,WAApB;AAgcMC,MAAAA,iBAA4C,GAAG,SAA/CA,iBAA+C,CAC1DC,OAD0D,EAE1DC,QAF0D,EAG1DC,MAH0D,EAI1DC,QAJ0D,EAK1DC,UAL0D,EAMvD;AAAA,EAAA,IALHJ,OAKG,KAAA,KAAA,CAAA,EAAA;AALHA,IAAAA,OAKG,GALO,EAKP,CAAA;AAAA,GAAA;;AAAA,EAAA,IAHHE,MAGG,KAAA,KAAA,CAAA,EAAA;AAHHA,IAAAA,MAGG,GAHM,IAGN,CAAA;AAAA,GAAA;;AACH,EAAA,IAAIA,MAAJ,EAAY;IACRF,OAAD,CAAiBK,IAAjB,GAAwBP,WAAxB,CAAA;AACF,GAHE;;;EAMH,IAAIK,QAAQ,KAAKL,WAAjB,EAA8B;AAC5BK,IAAAA,QAAQ,GAAG,EAAX,CAAA;AACD,GAAA;;EAED,IAAIE,MAAwB,GAAGH,MAAM,GAAGJ,WAAH,GAAiBE,OAAO,CAACK,IAA9D,CAVG;;AAaH,EAAA,IAAIA,MAAI,IAAIA,MAAI,KAAK,GAArB,EAA0B;AACxBA,IAAAA,MAAI,GAAGC,aAAQ,CAACD,MAAD,CAAf,CAAA;AACD,GAAA;;AAED,EAAA,MAAME,OAAO,GAAGF,MAAI,IAAKL,OAAD,CAA6BQ,EAArD,CAAA;EAEA,IAAIA,EAAE,GAAGC,cAAS,CAAC,CAACN,QAAD,EAAWI,OAAX,CAAD,CAAlB,CAAA;;EAEA,IAAIF,MAAI,KAAKP,WAAb,EAA0B;AACxBO,IAAAA,MAAI,GAAG,GAAP,CAAA;AACD,GAAA;;EAED,IAAIG,EAAE,KAAKV,WAAX,EAAwB;IACtBU,EAAE,GAAGC,cAAS,CAAC,CAAC,GAAD,EAAMD,EAAN,CAAD,CAAd,CAAA;AACD,GAAA;;AAED,EAAA,MAAME,QAAQ,GACZF,EAAE,KAAKV,WAAP,GAAqB,GAArB,GAA2Ba,kBAAa,CAACF,cAAS,CAAC,CAACL,UAAD,EAAaC,MAAb,CAAD,CAAV,CAD1C,CAAA;EAGA,OAAO;AACLG,IAAAA,EAAE,EAAEA,EADC;AAELD,IAAAA,OAAO,EAAEA,OAFJ;AAGLF,IAAAA,IAAI,EAAEA,MAHD;AAILK,IAAAA,QAAQ,EAAEA,QAJL;AAKLV,IAAAA,OAAO,EAAEA,OALJ;IAMLC,QANK;AAOLW,IAAAA,cAAc,EAAGC,EAAD,IACdd,iBAAiB,CACfC,OADe,EAEfa,EAAE,CAAEC,YAAD,IACDf,iBAAiB,CAACe,YAAD,EAAeC,SAAf,EAA0B,KAA1B,EAAiCP,EAAjC,EAAqCE,QAArC,CADjB,CAFa,EAKf,KALe,EAMfP,QANe,EAOfC,UAPe,CARd;AAiBLY,IAAAA,WAAW,EAAGf,QAAD,IACXF,iBAAiB,CAACC,OAAD,EAAUC,QAAV,EAAoB,KAApB,EAA2BE,QAA3B,EAAqCC,UAArC,CAlBd;AAmBLa,IAAAA,WAAW,EAAGH,YAAD,IACXf,iBAAiB,CAACe,YAAD,EAAeC,SAAf,EAA0B,KAA1B,EAAiCP,EAAjC,EAAqCE,QAArC,CAAA;GApBrB,CAAA;AAsBD;;;;;"}
|
|
1
|
+
{"version":3,"file":"routeConfig.js","sources":["../../../../../src/routeConfig.ts"],"sourcesContent":["import { GetFrameworkGeneric } from './frameworks'\nimport { ParsePathParams } from './link'\nimport { joinPaths, trimPath, trimPathRight } from './path'\nimport { RouteInfo } from './routeInfo'\nimport { RouteMatch } from './routeMatch'\nimport {\n DeepAwaited,\n Expand,\n IsAny,\n NoInfer,\n PickUnsafe,\n Values,\n} from './utils'\n\nexport const rootRouteId = '__root__' as const\nexport type RootRouteId = typeof rootRouteId\n\nexport type AnyLoaderData = {}\nexport type AnyPathParams = {}\nexport type AnySearchSchema = {}\nexport interface RouteMeta {}\n\n// The parse type here allows a zod schema to be passed directly to the validator\nexport type SearchSchemaValidator<TReturn, TParentSchema> =\n | SearchSchemaValidatorObj<TReturn, TParentSchema>\n | SearchSchemaValidatorFn<TReturn, TParentSchema>\n\nexport type SearchSchemaValidatorObj<TReturn, TParentSchema> = {\n parse?: SearchSchemaValidatorFn<TReturn, TParentSchema>\n}\n\nexport type SearchSchemaValidatorFn<TReturn, TParentSchema> = (\n searchObj: Record<string, unknown>,\n) => {} extends TParentSchema\n ? TReturn\n : keyof TReturn extends keyof TParentSchema\n ? {\n error: 'Top level search params cannot be redefined by child routes!'\n keys: keyof TReturn & keyof TParentSchema\n }\n : TReturn\n\nexport type DefinedPathParamWarning =\n 'Path params cannot be redefined by child routes!'\n\nexport type ParentParams<TParentParams> = AnyPathParams extends TParentParams\n ? {}\n : {\n [Key in keyof TParentParams]?: DefinedPathParamWarning\n }\n\nexport type LoaderFn<\n TRouteLoaderData extends AnyLoaderData,\n TFullSearchSchema extends AnySearchSchema = {},\n TAllParams extends AnyPathParams = {},\n> = (\n loaderContext: LoaderContext<TFullSearchSchema, TAllParams>,\n) => Promise<TRouteLoaderData>\n\nexport interface LoaderContext<\n TFullSearchSchema extends AnySearchSchema = {},\n TAllParams extends AnyPathParams = {},\n> {\n params: TAllParams\n search: TFullSearchSchema\n signal?: AbortSignal\n}\n\nexport type ActionFn<TActionPayload = unknown, TActionResponse = unknown> = (\n submission: TActionPayload,\n) => TActionResponse | Promise<TActionResponse>\n\nexport type UnloaderFn<TPath extends string> = (\n routeMatch: RouteMatch<any, RouteInfo<string, TPath>>,\n) => void\n\nexport type RouteOptions<\n TRouteId extends string = string,\n TPath extends string = string,\n TRouteLoaderData extends AnyLoaderData = {},\n TLoaderData extends AnyLoaderData = {},\n TActionPayload = unknown,\n TActionResponse = unknown,\n TParentSearchSchema extends {} = {},\n TSearchSchema extends AnySearchSchema = {},\n TFullSearchSchema extends AnySearchSchema = TSearchSchema,\n TParentParams extends AnyPathParams = {},\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams = {},\n> = (\n | {\n // The path to match (relative to the nearest parent `Route` component or root basepath)\n path: TPath\n }\n | {\n id: TRouteId\n }\n) & {\n // If true, this route will be matched as case-sensitive\n caseSensitive?: boolean\n validateSearch?: SearchSchemaValidator<TSearchSchema, TParentSearchSchema>\n // Filter functions that can manipulate search params *before* they are passed to links and navigate\n // calls that match this route.\n preSearchFilters?: SearchFilter<TFullSearchSchema>[]\n // Filter functions that can manipulate search params *after* they are passed to links and navigate\n // calls that match this route.\n postSearchFilters?: SearchFilter<TFullSearchSchema>[]\n // The duration to wait during `loader` execution before showing the `pendingElement`\n pendingMs?: number\n // _If the `pendingElement` is shown_, the minimum duration for which it will be visible.\n pendingMinMs?: number\n // The content to be rendered when the route is matched. If no element is provided, defaults to `<Outlet />`\n element?: GetFrameworkGeneric<'SyncOrAsyncElement'> // , NoInfer<TLoaderData>>\n // The content to be rendered when `loader` encounters an error\n errorElement?: GetFrameworkGeneric<'SyncOrAsyncElement'> // , NoInfer<TLoaderData>>\n // The content to be rendered when rendering encounters an error\n catchElement?: GetFrameworkGeneric<'SyncOrAsyncElement'> // , NoInfer<TLoaderData>>\n // The content to be rendered when the duration of `loader` execution surpasses the `pendingMs` duration\n pendingElement?: GetFrameworkGeneric<'SyncOrAsyncElement'> //, NoInfer<TLoaderData>>\n // An asynchronous function responsible for preparing or fetching data for the route before it is rendered\n loader?: LoaderFn<TRouteLoaderData, TFullSearchSchema, TAllParams>\n // The max age to consider loader data fresh (not-stale) for this route in milliseconds from the time of fetch\n // Defaults to 0. Only stale loader data is refetched.\n loaderMaxAge?: number\n // The max age to cache the loader data for this route in milliseconds from the time of route inactivity\n // before it is garbage collected.\n loaderGcMaxAge?: number\n // An asynchronous function made available to the route for performing asynchronous or mutative actions that\n // might invalidate the route's data.\n action?: ActionFn<TActionPayload, TActionResponse>\n // Set this to true to rethrow errors up the component tree to either the nearest error boundary or\n // route with error element, whichever comes first.\n useErrorBoundary?: boolean\n // This function is called\n // when moving from an inactive state to an active one. Likewise, when moving from\n // an active to an inactive state, the return function (if provided) is called.\n onMatch?: (matchContext: {\n params: TAllParams\n search: TFullSearchSchema\n }) =>\n | void\n | undefined\n | ((match: { params: TAllParams; search: TFullSearchSchema }) => void)\n // This function is called when the route remains active from one transition to the next.\n onTransition?: (match: {\n params: TAllParams\n search: TFullSearchSchema\n }) => void\n // An object of whatever you want! This object is accessible anywhere matches are.\n meta?: RouteMeta // TODO: Make this nested and mergeable\n} & (\n | {\n parseParams?: never\n stringifyParams?: never\n }\n | {\n // Parse params optionally receives path params as strings and returns them in a parsed format (like a number or boolean)\n parseParams: (\n rawParams: IsAny<TPath, any, Record<ParsePathParams<TPath>, string>>,\n ) => TParams\n stringifyParams: (\n params: TParams,\n ) => Record<ParsePathParams<TPath>, string>\n }\n ) &\n (PickUnsafe<TParentParams, ParsePathParams<TPath>> extends never // Detect if an existing path param is being redefined\n ? {}\n : 'Cannot redefined path params in child routes!')\n\nexport type SearchFilter<T, U = T> = (prev: T) => U\n\nexport interface RouteConfig<\n TId extends string = string,\n TRouteId extends string = string,\n TPath extends string = string,\n TFullPath extends string = string,\n TRouteLoaderData extends AnyLoaderData = AnyLoaderData,\n TLoaderData extends AnyLoaderData = AnyLoaderData,\n TActionPayload = unknown,\n TActionResponse = unknown,\n TParentSearchSchema extends {} = {},\n TSearchSchema extends AnySearchSchema = {},\n TFullSearchSchema extends AnySearchSchema = {},\n TParentParams extends AnyPathParams = {},\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams = {},\n TKnownChildren = unknown,\n> {\n id: TId\n routeId: TRouteId\n path: NoInfer<TPath>\n fullPath: TFullPath\n options: RouteOptions<\n TRouteId,\n TPath,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams\n >\n children?: TKnownChildren\n addChildren: IsAny<\n TId,\n any,\n <TNewChildren extends any>(\n children: TNewChildren extends AnyRouteConfig[]\n ? TNewChildren\n : { error: 'Invalid route detected'; route: TNewChildren },\n ) => RouteConfig<\n TId,\n TRouteId,\n TPath,\n TFullPath,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams,\n TNewChildren\n >\n >\n createChildren: IsAny<\n TId,\n any,\n <TNewChildren extends any>(\n cb: (\n createChildRoute: CreateRouteConfigFn<\n false,\n TId,\n TFullPath,\n TLoaderData,\n TFullSearchSchema,\n TAllParams\n >,\n ) => TNewChildren extends AnyRouteConfig[]\n ? TNewChildren\n : { error: 'Invalid route detected'; route: TNewChildren },\n ) => RouteConfig<\n TId,\n TRouteId,\n TPath,\n TFullPath,\n TRouteLoaderData,\n TLoaderData,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n TFullSearchSchema,\n TParentParams,\n TParams,\n TAllParams,\n TNewChildren\n >\n >\n createRoute: CreateRouteConfigFn<\n false,\n TId,\n TFullPath,\n TLoaderData,\n TFullSearchSchema,\n TAllParams\n >\n}\n\ntype CreateRouteConfigFn<\n TIsRoot extends boolean = false,\n TParentId extends string = string,\n TParentPath extends string = string,\n TParentAllLoaderData extends AnyLoaderData = {},\n TParentSearchSchema extends AnySearchSchema = {},\n TParentParams extends AnyPathParams = {},\n> = <\n TRouteId extends string,\n TPath extends string,\n TRouteLoaderData extends AnyLoaderData,\n TActionPayload,\n TActionResponse,\n TSearchSchema extends AnySearchSchema = AnySearchSchema,\n TParams extends Record<ParsePathParams<TPath>, unknown> = Record<\n ParsePathParams<TPath>,\n string\n >,\n TAllParams extends AnyPathParams extends TParams\n ? Record<ParsePathParams<TPath>, string>\n : NoInfer<TParams> = AnyPathParams extends TParams\n ? Record<ParsePathParams<TPath>, string>\n : NoInfer<TParams>,\n TKnownChildren extends RouteConfig[] = RouteConfig[],\n TResolvedId extends string = string extends TRouteId\n ? string extends TPath\n ? string\n : TPath\n : TRouteId,\n>(\n options?: TIsRoot extends true\n ? Omit<\n RouteOptions<\n TRouteId,\n TPath,\n TRouteLoaderData,\n Expand<TParentAllLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>\n >,\n 'path'\n > & { path?: never }\n : RouteOptions<\n TRouteId,\n TPath,\n TRouteLoaderData,\n Expand<TParentAllLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>\n >,\n children?: TKnownChildren,\n isRoot?: boolean,\n parentId?: string,\n parentPath?: string,\n) => RouteConfig<\n RoutePrefix<TParentId, TResolvedId>,\n TResolvedId,\n TPath,\n string extends TPath ? '' : RoutePath<RoutePrefix<TParentPath, TPath>>,\n TRouteLoaderData,\n Expand<TParentAllLoaderData & DeepAwaited<NoInfer<TRouteLoaderData>>>,\n TActionPayload,\n TActionResponse,\n TParentSearchSchema,\n TSearchSchema,\n Expand<TParentSearchSchema & TSearchSchema>,\n TParentParams,\n TParams,\n Expand<TParentParams & TAllParams>,\n TKnownChildren\n>\n\ntype RoutePath<T extends string> = T extends RootRouteId\n ? '/'\n : TrimPathRight<`${T}`>\n\ntype RoutePrefix<\n TPrefix extends string,\n TId extends string,\n> = string extends TId\n ? RootRouteId\n : TId extends string\n ? `${TPrefix}/${TId}` extends '/'\n ? '/'\n : `/${TrimPathLeft<`${TrimPathRight<TPrefix>}/${TrimPath<TId>}`>}`\n : never\n\nexport interface AnyRouteConfig\n extends RouteConfig<\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any\n > {}\n\nexport interface AnyRouteConfigWithChildren<TChildren>\n extends RouteConfig<\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n any,\n TChildren\n > {}\n\ntype TrimPath<T extends string> = '' extends T\n ? ''\n : TrimPathRight<TrimPathLeft<T>>\n\ntype TrimPathLeft<T extends string> = T extends `${RootRouteId}/${infer U}`\n ? TrimPathLeft<U>\n : T extends `/${infer U}`\n ? TrimPathLeft<U>\n : T\ntype TrimPathRight<T extends string> = T extends '/'\n ? '/'\n : T extends `${infer U}/`\n ? TrimPathRight<U>\n : T\n\nexport const createRouteConfig: CreateRouteConfigFn<true> = (\n options = {} as any,\n children,\n isRoot = true,\n parentId,\n parentPath,\n) => {\n if (isRoot) {\n ;(options as any).path = rootRouteId\n }\n\n // Strip the root from parentIds\n if (parentId === rootRouteId) {\n parentId = ''\n }\n\n let path: undefined | string = isRoot ? rootRouteId : options.path\n\n // If the path is anything other than an index path, trim it up\n if (path && path !== '/') {\n path = trimPath(path)\n }\n\n const routeId = path || (options as { id?: string }).id\n\n let id = joinPaths([parentId, routeId])\n\n if (path === rootRouteId) {\n path = '/'\n }\n\n if (id !== rootRouteId) {\n id = joinPaths(['/', id])\n }\n\n const fullPath =\n id === rootRouteId ? '/' : trimPathRight(joinPaths([parentPath, path]))\n\n return {\n id: id as any,\n routeId: routeId as any,\n path: path as any,\n fullPath: fullPath as any,\n options: options as any,\n children,\n createChildren: (cb: any) =>\n createRouteConfig(\n options,\n cb((childOptions: any) =>\n createRouteConfig(childOptions, undefined, false, id, fullPath),\n ),\n false,\n parentId,\n parentPath,\n ),\n addChildren: (children: any) =>\n createRouteConfig(options, children, false, parentId, parentPath),\n createRoute: (childOptions: any) =>\n createRouteConfig(childOptions, undefined, false, id, fullPath) as any,\n }\n}\n"],"names":["rootRouteId","createRouteConfig","options","children","isRoot","parentId","parentPath","path","trimPath","routeId","id","joinPaths","fullPath","trimPathRight","createChildren","cb","childOptions","undefined","addChildren","createRoute"],"mappings":";;;;;;;;;;;;;;;;AAcO,MAAMA,WAAW,GAAG,WAApB;AAoaMC,MAAAA,iBAA4C,GAAG,SAA/CA,iBAA+C,CAC1DC,OAD0D,EAE1DC,QAF0D,EAG1DC,MAH0D,EAI1DC,QAJ0D,EAK1DC,UAL0D,EAMvD;AAAA,EAAA,IALHJ,OAKG,KAAA,KAAA,CAAA,EAAA;AALHA,IAAAA,OAKG,GALO,EAKP,CAAA;AAAA,GAAA;;AAAA,EAAA,IAHHE,MAGG,KAAA,KAAA,CAAA,EAAA;AAHHA,IAAAA,MAGG,GAHM,IAGN,CAAA;AAAA,GAAA;;AACH,EAAA,IAAIA,MAAJ,EAAY;IACRF,OAAD,CAAiBK,IAAjB,GAAwBP,WAAxB,CAAA;AACF,GAHE;;;EAMH,IAAIK,QAAQ,KAAKL,WAAjB,EAA8B;AAC5BK,IAAAA,QAAQ,GAAG,EAAX,CAAA;AACD,GAAA;;EAED,IAAIE,MAAwB,GAAGH,MAAM,GAAGJ,WAAH,GAAiBE,OAAO,CAACK,IAA9D,CAVG;;AAaH,EAAA,IAAIA,MAAI,IAAIA,MAAI,KAAK,GAArB,EAA0B;AACxBA,IAAAA,MAAI,GAAGC,aAAQ,CAACD,MAAD,CAAf,CAAA;AACD,GAAA;;AAED,EAAA,MAAME,OAAO,GAAGF,MAAI,IAAKL,OAAD,CAA6BQ,EAArD,CAAA;EAEA,IAAIA,EAAE,GAAGC,cAAS,CAAC,CAACN,QAAD,EAAWI,OAAX,CAAD,CAAlB,CAAA;;EAEA,IAAIF,MAAI,KAAKP,WAAb,EAA0B;AACxBO,IAAAA,MAAI,GAAG,GAAP,CAAA;AACD,GAAA;;EAED,IAAIG,EAAE,KAAKV,WAAX,EAAwB;IACtBU,EAAE,GAAGC,cAAS,CAAC,CAAC,GAAD,EAAMD,EAAN,CAAD,CAAd,CAAA;AACD,GAAA;;AAED,EAAA,MAAME,QAAQ,GACZF,EAAE,KAAKV,WAAP,GAAqB,GAArB,GAA2Ba,kBAAa,CAACF,cAAS,CAAC,CAACL,UAAD,EAAaC,MAAb,CAAD,CAAV,CAD1C,CAAA;EAGA,OAAO;AACLG,IAAAA,EAAE,EAAEA,EADC;AAELD,IAAAA,OAAO,EAAEA,OAFJ;AAGLF,IAAAA,IAAI,EAAEA,MAHD;AAILK,IAAAA,QAAQ,EAAEA,QAJL;AAKLV,IAAAA,OAAO,EAAEA,OALJ;IAMLC,QANK;AAOLW,IAAAA,cAAc,EAAGC,EAAD,IACdd,iBAAiB,CACfC,OADe,EAEfa,EAAE,CAAEC,YAAD,IACDf,iBAAiB,CAACe,YAAD,EAAeC,SAAf,EAA0B,KAA1B,EAAiCP,EAAjC,EAAqCE,QAArC,CADjB,CAFa,EAKf,KALe,EAMfP,QANe,EAOfC,UAPe,CARd;AAiBLY,IAAAA,WAAW,EAAGf,QAAD,IACXF,iBAAiB,CAACC,OAAD,EAAUC,QAAV,EAAoB,KAApB,EAA2BE,QAA3B,EAAqCC,UAArC,CAlBd;AAmBLa,IAAAA,WAAW,EAAGH,YAAD,IACXf,iBAAiB,CAACe,YAAD,EAAeC,SAAf,EAA0B,KAA1B,EAAiCP,EAAjC,EAAqCE,QAArC,CAAA;GApBrB,CAAA;AAsBD;;;;;"}
|
|
@@ -29,6 +29,7 @@ function createRouteMatch(router, route, opts) {
|
|
|
29
29
|
isFetching: false,
|
|
30
30
|
isInvalid: false,
|
|
31
31
|
invalidAt: Infinity,
|
|
32
|
+
// pendingActions: [],
|
|
32
33
|
getIsInvalid: () => {
|
|
33
34
|
const now = Date.now();
|
|
34
35
|
return routeMatch.isInvalid || routeMatch.invalidAt < now;
|
|
@@ -68,17 +69,6 @@ function createRouteMatch(router, route, opts) {
|
|
|
68
69
|
clearTimeout(routeMatch.__.pendingMinTimeout);
|
|
69
70
|
delete routeMatch.__.pendingMinPromise;
|
|
70
71
|
},
|
|
71
|
-
// setParentMatch: (parentMatch?: RouteMatch) => {
|
|
72
|
-
// routeMatch.parentMatch = parentMatch
|
|
73
|
-
// },
|
|
74
|
-
// addChildMatch: (childMatch: RouteMatch) => {
|
|
75
|
-
// if (
|
|
76
|
-
// routeMatch.childMatches.find((d) => d.matchId === childMatch.matchId)
|
|
77
|
-
// ) {
|
|
78
|
-
// return
|
|
79
|
-
// }
|
|
80
|
-
// routeMatch.childMatches.push(childMatch)
|
|
81
|
-
// },
|
|
82
72
|
validate: () => {
|
|
83
73
|
var _routeMatch$parentMat, _routeMatch$parentMat2;
|
|
84
74
|
|
|
@@ -86,9 +76,11 @@ function createRouteMatch(router, route, opts) {
|
|
|
86
76
|
const parentSearch = (_routeMatch$parentMat = (_routeMatch$parentMat2 = routeMatch.parentMatch) == null ? void 0 : _routeMatch$parentMat2.search) != null ? _routeMatch$parentMat : router.location.search;
|
|
87
77
|
|
|
88
78
|
try {
|
|
79
|
+
var _validator;
|
|
80
|
+
|
|
89
81
|
const prevSearch = routeMatch.routeSearch;
|
|
90
82
|
const validator = typeof routeMatch.options.validateSearch === 'object' ? routeMatch.options.validateSearch.parse : routeMatch.options.validateSearch;
|
|
91
|
-
let nextSearch = utils.replaceEqualDeep(prevSearch, validator == null ? void 0 : validator(parentSearch)); // Invalidate route matches when search param stability changes
|
|
83
|
+
let nextSearch = utils.replaceEqualDeep(prevSearch, (_validator = validator == null ? void 0 : validator(parentSearch)) != null ? _validator : {}); // Invalidate route matches when search param stability changes
|
|
92
84
|
|
|
93
85
|
if (prevSearch !== nextSearch) {
|
|
94
86
|
routeMatch.isInvalid = true;
|
|
@@ -96,6 +88,13 @@ function createRouteMatch(router, route, opts) {
|
|
|
96
88
|
|
|
97
89
|
routeMatch.routeSearch = nextSearch;
|
|
98
90
|
routeMatch.search = utils.replaceEqualDeep(parentSearch, _rollupPluginBabelHelpers["extends"]({}, parentSearch, nextSearch));
|
|
91
|
+
elementTypes.map(async type => {
|
|
92
|
+
const routeElement = routeMatch.options[type];
|
|
93
|
+
|
|
94
|
+
if (typeof routeMatch.__[type] !== 'function') {
|
|
95
|
+
routeMatch.__[type] = routeElement;
|
|
96
|
+
}
|
|
97
|
+
});
|
|
99
98
|
} catch (err) {
|
|
100
99
|
console.error(err);
|
|
101
100
|
const error = new Error('Invalid search params found', {
|
|
@@ -120,9 +119,33 @@ function createRouteMatch(router, route, opts) {
|
|
|
120
119
|
routeMatch.isInvalid = true;
|
|
121
120
|
},
|
|
122
121
|
hasLoaders: () => {
|
|
123
|
-
return !!(route.options.loader ||
|
|
122
|
+
return !!(route.options.loader || elementTypes.some(d => typeof route.options[d] === 'function'));
|
|
123
|
+
},
|
|
124
|
+
load: async loaderOpts => {
|
|
125
|
+
const now = Date.now();
|
|
126
|
+
const minMaxAge = loaderOpts != null && loaderOpts.preload ? Math.max(loaderOpts == null ? void 0 : loaderOpts.maxAge, loaderOpts == null ? void 0 : loaderOpts.gcMaxAge) : 0; // If this is a preload, add it to the preload cache
|
|
127
|
+
|
|
128
|
+
if (loaderOpts != null && loaderOpts.preload && minMaxAge > 0) {
|
|
129
|
+
// If the match is currently active, don't preload it
|
|
130
|
+
if (router.state.matches.find(d => d.matchId === routeMatch.matchId)) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
router.matchCache[routeMatch.matchId] = {
|
|
135
|
+
gc: now + loaderOpts.gcMaxAge,
|
|
136
|
+
match: routeMatch
|
|
137
|
+
};
|
|
138
|
+
} // If the match is invalid, errored or idle, trigger it to load
|
|
139
|
+
|
|
140
|
+
|
|
141
|
+
if (routeMatch.status === 'success' && routeMatch.getIsInvalid() || routeMatch.status === 'error' || routeMatch.status === 'idle') {
|
|
142
|
+
const maxAge = loaderOpts != null && loaderOpts.preload ? loaderOpts == null ? void 0 : loaderOpts.maxAge : undefined;
|
|
143
|
+
await routeMatch.fetch({
|
|
144
|
+
maxAge
|
|
145
|
+
});
|
|
146
|
+
}
|
|
124
147
|
},
|
|
125
|
-
|
|
148
|
+
fetch: async opts => {
|
|
126
149
|
const id = '' + Date.now() + Math.random();
|
|
127
150
|
routeMatch.__.latestId = id; // If the match was in an error state, set it
|
|
128
151
|
// to a loading state again. Otherwise, keep it
|
|
@@ -140,37 +163,16 @@ function createRouteMatch(router, route, opts) {
|
|
|
140
163
|
routeMatch.isFetching = true;
|
|
141
164
|
routeMatch.__.resolve = resolve;
|
|
142
165
|
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
if (importer) {
|
|
147
|
-
routeMatch.__.importPromise = importer({
|
|
148
|
-
params: routeMatch.params // search: routeMatch.search,
|
|
149
|
-
|
|
150
|
-
}).then(imported => {
|
|
151
|
-
routeMatch.__ = _rollupPluginBabelHelpers["extends"]({}, routeMatch.__, imported);
|
|
152
|
-
});
|
|
153
|
-
} // Wait for the importer to finish before
|
|
154
|
-
// attempting to load elements and data
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
await routeMatch.__.importPromise; // Next, load the elements and data in parallel
|
|
158
|
-
|
|
166
|
+
routeMatch.__.loaderDataPromise = (async () => {
|
|
167
|
+
// Load the elements and data in parallel
|
|
159
168
|
routeMatch.__.elementsPromise = (async () => {
|
|
160
169
|
// then run all element and data loaders in parallel
|
|
161
170
|
// For each element type, potentially load it asynchronously
|
|
162
171
|
await Promise.all(elementTypes.map(async type => {
|
|
163
172
|
const routeElement = routeMatch.options[type];
|
|
164
173
|
|
|
165
|
-
if (routeMatch.__[type]) {
|
|
166
|
-
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
if (typeof routeElement === 'function') {
|
|
170
|
-
const res = await routeElement(routeMatch);
|
|
171
|
-
routeMatch.__[type] = res;
|
|
172
|
-
} else {
|
|
173
|
-
routeMatch.__[type] = routeMatch.options[type];
|
|
174
|
+
if (typeof routeMatch.__[type] === 'function') {
|
|
175
|
+
routeMatch.__[type] = await router.options.createElement(routeElement);
|
|
174
176
|
}
|
|
175
177
|
}));
|
|
176
178
|
})();
|
|
@@ -187,7 +189,7 @@ function createRouteMatch(router, route, opts) {
|
|
|
187
189
|
});
|
|
188
190
|
|
|
189
191
|
if (id !== routeMatch.__.latestId) {
|
|
190
|
-
return routeMatch.__.
|
|
192
|
+
return routeMatch.__.loadPromise;
|
|
191
193
|
}
|
|
192
194
|
|
|
193
195
|
routeMatch.routeLoaderData = utils.replaceEqualDeep(routeMatch.routeLoaderData, data);
|
|
@@ -199,7 +201,7 @@ function createRouteMatch(router, route, opts) {
|
|
|
199
201
|
routeMatch.invalidAt = routeMatch.updatedAt + ((_ref = (_ref2 = (_opts$maxAge = opts == null ? void 0 : opts.maxAge) != null ? _opts$maxAge : routeMatch.options.loaderMaxAge) != null ? _ref2 : router.options.defaultLoaderMaxAge) != null ? _ref : 0);
|
|
200
202
|
} catch (err) {
|
|
201
203
|
if (id !== routeMatch.__.latestId) {
|
|
202
|
-
return routeMatch.__.
|
|
204
|
+
return routeMatch.__.loadPromise;
|
|
203
205
|
}
|
|
204
206
|
|
|
205
207
|
if (process.env.NODE_ENV !== 'production') {
|
|
@@ -216,7 +218,7 @@ function createRouteMatch(router, route, opts) {
|
|
|
216
218
|
await Promise.all([routeMatch.__.elementsPromise, routeMatch.__.dataPromise]);
|
|
217
219
|
|
|
218
220
|
if (id !== routeMatch.__.latestId) {
|
|
219
|
-
return routeMatch.__.
|
|
221
|
+
return routeMatch.__.loadPromise;
|
|
220
222
|
}
|
|
221
223
|
|
|
222
224
|
if (routeMatch.__.pendingMinPromise) {
|
|
@@ -225,7 +227,7 @@ function createRouteMatch(router, route, opts) {
|
|
|
225
227
|
}
|
|
226
228
|
} finally {
|
|
227
229
|
if (id !== routeMatch.__.latestId) {
|
|
228
|
-
return routeMatch.__.
|
|
230
|
+
return routeMatch.__.loadPromise;
|
|
229
231
|
}
|
|
230
232
|
|
|
231
233
|
routeMatch.__.cancelPending();
|
|
@@ -237,16 +239,16 @@ function createRouteMatch(router, route, opts) {
|
|
|
237
239
|
}
|
|
238
240
|
})();
|
|
239
241
|
|
|
240
|
-
routeMatch.__.
|
|
241
|
-
await loaderPromise;
|
|
242
|
+
await routeMatch.__.loaderDataPromise;
|
|
242
243
|
|
|
243
244
|
if (id !== routeMatch.__.latestId) {
|
|
244
|
-
return routeMatch.__.
|
|
245
|
+
return routeMatch.__.loadPromise;
|
|
245
246
|
}
|
|
246
247
|
|
|
247
|
-
delete routeMatch.__.
|
|
248
|
+
delete routeMatch.__.loaderDataPromise;
|
|
248
249
|
});
|
|
249
|
-
|
|
250
|
+
await routeMatch.__.loadPromise;
|
|
251
|
+
delete routeMatch.__.loadPromise;
|
|
250
252
|
}
|
|
251
253
|
});
|
|
252
254
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routeMatch.js","sources":["../../../../../src/routeMatch.ts"],"sourcesContent":["import { GetFrameworkGeneric } from './frameworks'\nimport { Route } from './route'\nimport { AnyPathParams } from './routeConfig'\nimport {\n AnyAllRouteInfo,\n AnyRouteInfo,\n DefaultAllRouteInfo,\n RouteInfo,\n} from './routeInfo'\nimport { Router } from './router'\nimport { replaceEqualDeep, Timeout } from './utils'\n\nexport interface RouteMatch<\n TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n TRouteInfo extends AnyRouteInfo = RouteInfo,\n> extends Route<TAllRouteInfo, TRouteInfo> {\n matchId: string\n pathname: string\n params: AnyPathParams\n parentMatch?: RouteMatch\n childMatches: RouteMatch[]\n routeSearch: TRouteInfo['searchSchema']\n search: TRouteInfo['fullSearchSchema']\n status: 'idle' | 'loading' | 'success' | 'error'\n updatedAt?: number\n error?: unknown\n isInvalid: boolean\n getIsInvalid: () => boolean\n loaderData: TRouteInfo['loaderData']\n routeLoaderData: TRouteInfo['routeLoaderData']\n isFetching: boolean\n isPending: boolean\n invalidAt: number\n __: {\n element?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n errorElement?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n catchElement?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n pendingElement?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n loadPromise?: Promise<void>\n loaderPromise?: Promise<void>\n importPromise?: Promise<void>\n elementsPromise?: Promise<void>\n dataPromise?: Promise<void>\n pendingTimeout?: Timeout\n pendingMinTimeout?: Timeout\n pendingMinPromise?: Promise<void>\n onExit?:\n | void\n | ((matchContext: {\n params: TRouteInfo['allParams']\n search: TRouteInfo['fullSearchSchema']\n }) => void)\n abortController: AbortController\n latestId: string\n // setParentMatch: (parentMatch: RouteMatch) => void\n // addChildMatch: (childMatch: RouteMatch) => void\n validate: () => void\n startPending: () => void\n cancelPending: () => void\n notify: () => void\n resolve: () => void\n }\n cancel: () => void\n load: (opts?: { maxAge?: number }) => Promise<void>\n invalidate: () => void\n hasLoaders: () => boolean\n}\n\nconst elementTypes = [\n 'element',\n 'errorElement',\n 'catchElement',\n 'pendingElement',\n] as const\n\nexport function createRouteMatch<\n TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n TRouteInfo extends AnyRouteInfo = RouteInfo,\n>(\n router: Router<any, any>,\n route: Route<TAllRouteInfo, TRouteInfo>,\n opts: {\n matchId: string\n params: TRouteInfo['allParams']\n pathname: string\n },\n): RouteMatch<TAllRouteInfo, TRouteInfo> {\n const routeMatch: RouteMatch<TAllRouteInfo, TRouteInfo> = {\n ...route,\n ...opts,\n router,\n routeSearch: {},\n search: {},\n childMatches: [],\n status: 'idle',\n routeLoaderData: {} as TRouteInfo['routeLoaderData'],\n loaderData: {} as TRouteInfo['loaderData'],\n isPending: false,\n isFetching: false,\n isInvalid: false,\n invalidAt: Infinity,\n getIsInvalid: () => {\n const now = Date.now()\n return routeMatch.isInvalid || routeMatch.invalidAt < now\n },\n __: {\n abortController: new AbortController(),\n latestId: '',\n resolve: () => {},\n notify: () => {\n routeMatch.__.resolve()\n routeMatch.router.notify()\n },\n startPending: () => {\n const pendingMs =\n routeMatch.options.pendingMs ?? router.options.defaultPendingMs\n const pendingMinMs =\n routeMatch.options.pendingMinMs ?? router.options.defaultPendingMinMs\n\n if (\n routeMatch.__.pendingTimeout ||\n routeMatch.status !== 'loading' ||\n typeof pendingMs === 'undefined'\n ) {\n return\n }\n\n routeMatch.__.pendingTimeout = setTimeout(() => {\n routeMatch.isPending = true\n routeMatch.__.resolve()\n if (typeof pendingMinMs !== 'undefined') {\n routeMatch.__.pendingMinPromise = new Promise(\n (r) =>\n (routeMatch.__.pendingMinTimeout = setTimeout(r, pendingMinMs)),\n )\n }\n }, pendingMs)\n },\n cancelPending: () => {\n routeMatch.isPending = false\n clearTimeout(routeMatch.__.pendingTimeout)\n clearTimeout(routeMatch.__.pendingMinTimeout)\n delete routeMatch.__.pendingMinPromise\n },\n // setParentMatch: (parentMatch?: RouteMatch) => {\n // routeMatch.parentMatch = parentMatch\n // },\n // addChildMatch: (childMatch: RouteMatch) => {\n // if (\n // routeMatch.childMatches.find((d) => d.matchId === childMatch.matchId)\n // ) {\n // return\n // }\n\n // routeMatch.childMatches.push(childMatch)\n // },\n validate: () => {\n // Validate the search params and stabilize them\n const parentSearch =\n routeMatch.parentMatch?.search ?? router.location.search\n\n try {\n const prevSearch = routeMatch.routeSearch\n\n const validator =\n typeof routeMatch.options.validateSearch === 'object'\n ? routeMatch.options.validateSearch.parse\n : routeMatch.options.validateSearch\n\n let nextSearch = replaceEqualDeep(\n prevSearch,\n validator?.(parentSearch),\n )\n\n // Invalidate route matches when search param stability changes\n if (prevSearch !== nextSearch) {\n routeMatch.isInvalid = true\n }\n\n routeMatch.routeSearch = nextSearch\n\n routeMatch.search = replaceEqualDeep(parentSearch, {\n ...parentSearch,\n ...nextSearch,\n })\n } catch (err: any) {\n console.error(err)\n const error = new (Error as any)('Invalid search params found', {\n cause: err,\n })\n error.code = 'INVALID_SEARCH_PARAMS'\n routeMatch.status = 'error'\n routeMatch.error = error\n // Do not proceed with loading the route\n return\n }\n },\n },\n cancel: () => {\n routeMatch.__.abortController?.abort()\n routeMatch.__.cancelPending()\n },\n invalidate: () => {\n routeMatch.isInvalid = true\n },\n hasLoaders: () => {\n return !!(\n route.options.loader ||\n route.options.import ||\n elementTypes.some((d) => typeof route.options[d] === 'function')\n )\n },\n load: async (opts) => {\n const id = '' + Date.now() + Math.random()\n routeMatch.__.latestId = id\n\n // If the match was in an error state, set it\n // to a loading state again. Otherwise, keep it\n // as loading or resolved\n if (routeMatch.status === 'idle') {\n routeMatch.status = 'loading'\n }\n\n // We started loading the route, so it's no longer invalid\n routeMatch.isInvalid = false\n\n routeMatch.__.loadPromise = new Promise(async (resolve) => {\n // We are now fetching, even if it's in the background of a\n // resolved state\n routeMatch.isFetching = true\n routeMatch.__.resolve = resolve as () => void\n\n const loaderPromise = (async () => {\n const importer = routeMatch.options.import\n\n // First, run any importers\n if (importer) {\n routeMatch.__.importPromise = importer({\n params: routeMatch.params,\n // search: routeMatch.search,\n }).then((imported) => {\n routeMatch.__ = {\n ...routeMatch.__,\n ...imported,\n }\n })\n }\n\n // Wait for the importer to finish before\n // attempting to load elements and data\n await routeMatch.__.importPromise\n\n // Next, load the elements and data in parallel\n\n routeMatch.__.elementsPromise = (async () => {\n // then run all element and data loaders in parallel\n // For each element type, potentially load it asynchronously\n\n await Promise.all(\n elementTypes.map(async (type) => {\n const routeElement = routeMatch.options[type]\n\n if (routeMatch.__[type]) {\n return\n }\n\n if (typeof routeElement === 'function') {\n const res = await (routeElement as any)(routeMatch)\n\n routeMatch.__[type] = res\n } else {\n routeMatch.__[type] = routeMatch.options[type] as any\n }\n }),\n )\n })()\n\n routeMatch.__.dataPromise = Promise.resolve().then(async () => {\n try {\n if (routeMatch.options.loader) {\n const data = await routeMatch.options.loader({\n params: routeMatch.params,\n search: routeMatch.routeSearch,\n signal: routeMatch.__.abortController.signal,\n })\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loaderPromise\n }\n\n routeMatch.routeLoaderData = replaceEqualDeep(\n routeMatch.routeLoaderData,\n data,\n )\n }\n\n routeMatch.error = undefined\n routeMatch.status = 'success'\n routeMatch.updatedAt = Date.now()\n routeMatch.invalidAt =\n routeMatch.updatedAt +\n (opts?.maxAge ??\n routeMatch.options.loaderMaxAge ??\n router.options.defaultLoaderMaxAge ??\n 0)\n } catch (err) {\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loaderPromise\n }\n\n if (process.env.NODE_ENV !== 'production') {\n console.error(err)\n }\n routeMatch.error = err\n routeMatch.status = 'error'\n routeMatch.updatedAt = Date.now()\n }\n })\n\n try {\n await Promise.all([\n routeMatch.__.elementsPromise,\n routeMatch.__.dataPromise,\n ])\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loaderPromise\n }\n\n if (routeMatch.__.pendingMinPromise) {\n await routeMatch.__.pendingMinPromise\n delete routeMatch.__.pendingMinPromise\n }\n } finally {\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loaderPromise\n }\n routeMatch.__.cancelPending()\n routeMatch.isPending = false\n routeMatch.isFetching = false\n routeMatch.__.notify()\n }\n })()\n\n routeMatch.__.loaderPromise = loaderPromise\n await loaderPromise\n\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loaderPromise\n }\n delete routeMatch.__.loaderPromise\n })\n\n return await routeMatch.__.loadPromise\n },\n }\n\n if (!routeMatch.hasLoaders()) {\n routeMatch.status = 'success'\n }\n\n return routeMatch\n}\n"],"names":["elementTypes","createRouteMatch","router","route","opts","routeMatch","_extends","routeSearch","search","childMatches","status","routeLoaderData","loaderData","isPending","isFetching","isInvalid","invalidAt","Infinity","getIsInvalid","now","Date","__","abortController","AbortController","latestId","resolve","notify","startPending","pendingMs","options","defaultPendingMs","pendingMinMs","defaultPendingMinMs","pendingTimeout","setTimeout","pendingMinPromise","Promise","r","pendingMinTimeout","cancelPending","clearTimeout","validate","parentSearch","parentMatch","location","prevSearch","validator","validateSearch","parse","nextSearch","replaceEqualDeep","err","console","error","Error","cause","code","cancel","abort","invalidate","hasLoaders","loader","import","some","d","load","id","Math","random","loadPromise","loaderPromise","importer","importPromise","params","then","imported","elementsPromise","all","map","type","routeElement","res","dataPromise","data","signal","undefined","updatedAt","maxAge","loaderMaxAge","defaultLoaderMaxAge","process","env","NODE_ENV"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"routeMatch.js","sources":["../../../../../src/routeMatch.ts"],"sourcesContent":["import { GetFrameworkGeneric } from './frameworks'\nimport { Route } from './route'\nimport {\n AnyAllRouteInfo,\n AnyRouteInfo,\n DefaultAllRouteInfo,\n RouteInfo,\n} from './routeInfo'\nimport { ActionState, Router } from './router'\nimport { replaceEqualDeep, Timeout } from './utils'\n\nexport interface RouteMatch<\n TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n TRouteInfo extends AnyRouteInfo = RouteInfo,\n> extends Route<TAllRouteInfo, TRouteInfo> {\n matchId: string\n pathname: string\n params: TRouteInfo['params']\n parentMatch?: RouteMatch\n childMatches: RouteMatch[]\n routeSearch: TRouteInfo['searchSchema']\n search: TRouteInfo['fullSearchSchema']\n status: 'idle' | 'loading' | 'success' | 'error'\n updatedAt?: number\n error?: unknown\n isInvalid: boolean\n getIsInvalid: () => boolean\n loaderData: TRouteInfo['loaderData']\n routeLoaderData: TRouteInfo['routeLoaderData']\n isFetching: boolean\n isPending: boolean\n invalidAt: number\n __: {\n element?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n errorElement?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n catchElement?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n pendingElement?: GetFrameworkGeneric<'Element'> // , TRouteInfo['loaderData']>\n loadPromise?: Promise<void>\n loaderDataPromise?: Promise<void>\n elementsPromise?: Promise<void>\n dataPromise?: Promise<void>\n pendingTimeout?: Timeout\n pendingMinTimeout?: Timeout\n pendingMinPromise?: Promise<void>\n onExit?:\n | void\n | ((matchContext: {\n params: TRouteInfo['allParams']\n search: TRouteInfo['fullSearchSchema']\n }) => void)\n abortController: AbortController\n latestId: string\n // setParentMatch: (parentMatch: RouteMatch) => void\n // addChildMatch: (childMatch: RouteMatch) => void\n validate: () => void\n startPending: () => void\n cancelPending: () => void\n notify: () => void\n resolve: () => void\n }\n cancel: () => void\n load: (\n loaderOpts?: { withPending?: boolean } & (\n | { preload: true; maxAge: number; gcMaxAge: number }\n | { preload?: false; maxAge?: never; gcMaxAge?: never }\n ),\n ) => Promise<TRouteInfo['routeLoaderData']>\n fetch: (opts?: { maxAge?: number }) => Promise<TRouteInfo['routeLoaderData']>\n invalidate: () => void\n hasLoaders: () => boolean\n}\n\nconst elementTypes = [\n 'element',\n 'errorElement',\n 'catchElement',\n 'pendingElement',\n] as const\n\nexport function createRouteMatch<\n TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,\n TRouteInfo extends AnyRouteInfo = RouteInfo,\n>(\n router: Router<any, any>,\n route: Route<TAllRouteInfo, TRouteInfo>,\n opts: {\n matchId: string\n params: TRouteInfo['allParams']\n pathname: string\n },\n): RouteMatch<TAllRouteInfo, TRouteInfo> {\n const routeMatch: RouteMatch<TAllRouteInfo, TRouteInfo> = {\n ...route,\n ...opts,\n router,\n routeSearch: {},\n search: {},\n childMatches: [],\n status: 'idle',\n routeLoaderData: {} as TRouteInfo['routeLoaderData'],\n loaderData: {} as TRouteInfo['loaderData'],\n isPending: false,\n isFetching: false,\n isInvalid: false,\n invalidAt: Infinity,\n // pendingActions: [],\n getIsInvalid: () => {\n const now = Date.now()\n return routeMatch.isInvalid || routeMatch.invalidAt < now\n },\n __: {\n abortController: new AbortController(),\n latestId: '',\n resolve: () => {},\n notify: () => {\n routeMatch.__.resolve()\n routeMatch.router.notify()\n },\n startPending: () => {\n const pendingMs =\n routeMatch.options.pendingMs ?? router.options.defaultPendingMs\n const pendingMinMs =\n routeMatch.options.pendingMinMs ?? router.options.defaultPendingMinMs\n\n if (\n routeMatch.__.pendingTimeout ||\n routeMatch.status !== 'loading' ||\n typeof pendingMs === 'undefined'\n ) {\n return\n }\n\n routeMatch.__.pendingTimeout = setTimeout(() => {\n routeMatch.isPending = true\n routeMatch.__.resolve()\n if (typeof pendingMinMs !== 'undefined') {\n routeMatch.__.pendingMinPromise = new Promise(\n (r) =>\n (routeMatch.__.pendingMinTimeout = setTimeout(r, pendingMinMs)),\n )\n }\n }, pendingMs)\n },\n cancelPending: () => {\n routeMatch.isPending = false\n clearTimeout(routeMatch.__.pendingTimeout)\n clearTimeout(routeMatch.__.pendingMinTimeout)\n delete routeMatch.__.pendingMinPromise\n },\n validate: () => {\n // Validate the search params and stabilize them\n const parentSearch =\n routeMatch.parentMatch?.search ?? router.location.search\n\n try {\n const prevSearch = routeMatch.routeSearch\n\n const validator =\n typeof routeMatch.options.validateSearch === 'object'\n ? routeMatch.options.validateSearch.parse\n : routeMatch.options.validateSearch\n\n let nextSearch = replaceEqualDeep(\n prevSearch,\n validator?.(parentSearch) ?? {},\n )\n\n // Invalidate route matches when search param stability changes\n if (prevSearch !== nextSearch) {\n routeMatch.isInvalid = true\n }\n\n routeMatch.routeSearch = nextSearch\n\n routeMatch.search = replaceEqualDeep(parentSearch, {\n ...parentSearch,\n ...nextSearch,\n })\n\n elementTypes.map(async (type) => {\n const routeElement = routeMatch.options[type]\n\n if (typeof routeMatch.__[type] !== 'function') {\n routeMatch.__[type] = routeElement\n }\n })\n } catch (err: any) {\n console.error(err)\n const error = new (Error as any)('Invalid search params found', {\n cause: err,\n })\n error.code = 'INVALID_SEARCH_PARAMS'\n routeMatch.status = 'error'\n routeMatch.error = error\n // Do not proceed with loading the route\n return\n }\n },\n },\n cancel: () => {\n routeMatch.__.abortController?.abort()\n routeMatch.__.cancelPending()\n },\n invalidate: () => {\n routeMatch.isInvalid = true\n },\n hasLoaders: () => {\n return !!(\n route.options.loader ||\n elementTypes.some((d) => typeof route.options[d] === 'function')\n )\n },\n load: async (loaderOpts) => {\n const now = Date.now()\n const minMaxAge = loaderOpts?.preload\n ? Math.max(loaderOpts?.maxAge, loaderOpts?.gcMaxAge)\n : 0\n\n // If this is a preload, add it to the preload cache\n if (loaderOpts?.preload && minMaxAge > 0) {\n // If the match is currently active, don't preload it\n if (\n router.state.matches.find((d) => d.matchId === routeMatch.matchId)\n ) {\n return\n }\n\n router.matchCache[routeMatch.matchId] = {\n gc: now + loaderOpts.gcMaxAge,\n match: routeMatch as RouteMatch<any, any>,\n }\n }\n\n // If the match is invalid, errored or idle, trigger it to load\n if (\n (routeMatch.status === 'success' && routeMatch.getIsInvalid()) ||\n routeMatch.status === 'error' ||\n routeMatch.status === 'idle'\n ) {\n const maxAge = loaderOpts?.preload ? loaderOpts?.maxAge : undefined\n\n await routeMatch.fetch({ maxAge })\n }\n },\n fetch: async (opts) => {\n const id = '' + Date.now() + Math.random()\n routeMatch.__.latestId = id\n\n // If the match was in an error state, set it\n // to a loading state again. Otherwise, keep it\n // as loading or resolved\n if (routeMatch.status === 'idle') {\n routeMatch.status = 'loading'\n }\n\n // We started loading the route, so it's no longer invalid\n routeMatch.isInvalid = false\n\n routeMatch.__.loadPromise = new Promise(async (resolve) => {\n // We are now fetching, even if it's in the background of a\n // resolved state\n routeMatch.isFetching = true\n routeMatch.__.resolve = resolve as () => void\n\n routeMatch.__.loaderDataPromise = (async () => {\n // Load the elements and data in parallel\n\n routeMatch.__.elementsPromise = (async () => {\n // then run all element and data loaders in parallel\n // For each element type, potentially load it asynchronously\n\n await Promise.all(\n elementTypes.map(async (type) => {\n const routeElement = routeMatch.options[type]\n\n if (typeof routeMatch.__[type] === 'function') {\n routeMatch.__[type] = await router.options.createElement!(\n routeElement,\n )\n }\n }),\n )\n })()\n\n routeMatch.__.dataPromise = Promise.resolve().then(async () => {\n try {\n if (routeMatch.options.loader) {\n const data = await routeMatch.options.loader({\n params: routeMatch.params,\n search: routeMatch.routeSearch,\n signal: routeMatch.__.abortController.signal,\n })\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loadPromise\n }\n\n routeMatch.routeLoaderData = replaceEqualDeep(\n routeMatch.routeLoaderData,\n data,\n )\n }\n\n routeMatch.error = undefined\n routeMatch.status = 'success'\n routeMatch.updatedAt = Date.now()\n routeMatch.invalidAt =\n routeMatch.updatedAt +\n (opts?.maxAge ??\n routeMatch.options.loaderMaxAge ??\n router.options.defaultLoaderMaxAge ??\n 0)\n } catch (err) {\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loadPromise\n }\n\n if (process.env.NODE_ENV !== 'production') {\n console.error(err)\n }\n routeMatch.error = err\n routeMatch.status = 'error'\n routeMatch.updatedAt = Date.now()\n }\n })\n\n try {\n await Promise.all([\n routeMatch.__.elementsPromise,\n routeMatch.__.dataPromise,\n ])\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loadPromise\n }\n\n if (routeMatch.__.pendingMinPromise) {\n await routeMatch.__.pendingMinPromise\n delete routeMatch.__.pendingMinPromise\n }\n } finally {\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loadPromise\n }\n routeMatch.__.cancelPending()\n routeMatch.isPending = false\n routeMatch.isFetching = false\n routeMatch.__.notify()\n }\n })()\n\n await routeMatch.__.loaderDataPromise\n\n if (id !== routeMatch.__.latestId) {\n return routeMatch.__.loadPromise\n }\n\n delete routeMatch.__.loaderDataPromise\n })\n\n await routeMatch.__.loadPromise\n\n delete routeMatch.__.loadPromise\n },\n }\n\n if (!routeMatch.hasLoaders()) {\n routeMatch.status = 'success'\n }\n\n return routeMatch\n}\n"],"names":["elementTypes","createRouteMatch","router","route","opts","routeMatch","_extends","routeSearch","search","childMatches","status","routeLoaderData","loaderData","isPending","isFetching","isInvalid","invalidAt","Infinity","getIsInvalid","now","Date","__","abortController","AbortController","latestId","resolve","notify","startPending","pendingMs","options","defaultPendingMs","pendingMinMs","defaultPendingMinMs","pendingTimeout","setTimeout","pendingMinPromise","Promise","r","pendingMinTimeout","cancelPending","clearTimeout","validate","parentSearch","parentMatch","location","prevSearch","validator","validateSearch","parse","nextSearch","replaceEqualDeep","map","type","routeElement","err","console","error","Error","cause","code","cancel","abort","invalidate","hasLoaders","loader","some","d","load","loaderOpts","minMaxAge","preload","Math","max","maxAge","gcMaxAge","state","matches","find","matchId","matchCache","gc","match","undefined","fetch","id","random","loadPromise","loaderDataPromise","elementsPromise","all","createElement","dataPromise","then","data","params","signal","updatedAt","loaderMaxAge","defaultLoaderMaxAge","process","env","NODE_ENV"],"mappings":"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"}
|