reactive-route 0.0.1-alpha.3 → 0.0.1-alpha.31
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/adapters/kr-observable-preact.cjs +39 -0
- package/adapters/kr-observable-preact.d.ts +3 -0
- package/adapters/kr-observable-preact.d.ts.map +1 -0
- package/adapters/kr-observable-preact.mjs +18 -0
- package/adapters/kr-observable-react.cjs +39 -0
- package/adapters/kr-observable-react.d.ts +3 -0
- package/adapters/kr-observable-react.d.ts.map +1 -0
- package/adapters/kr-observable-react.mjs +18 -0
- package/adapters/kr-observable-solid.cjs +37 -0
- package/adapters/kr-observable-solid.d.ts +3 -0
- package/adapters/kr-observable-solid.d.ts.map +1 -0
- package/adapters/kr-observable-solid.mjs +16 -0
- package/adapters/mobx-preact.cjs +43 -0
- package/adapters/mobx-preact.d.ts +3 -0
- package/adapters/mobx-preact.d.ts.map +1 -0
- package/adapters/mobx-preact.mjs +22 -0
- package/adapters/mobx-react.cjs +43 -0
- package/adapters/mobx-react.d.ts +3 -0
- package/adapters/mobx-react.d.ts.map +1 -0
- package/adapters/mobx-react.mjs +22 -0
- package/adapters/mobx-solid.cjs +42 -0
- package/adapters/mobx-solid.d.ts +3 -0
- package/adapters/mobx-solid.d.ts.map +1 -0
- package/adapters/mobx-solid.mjs +21 -0
- package/adapters/solid.cjs +45 -0
- package/adapters/solid.d.ts +3 -0
- package/adapters/solid.d.ts.map +1 -0
- package/adapters/solid.mjs +24 -0
- package/adapters/vue.cjs +40 -0
- package/adapters/vue.d.ts +3 -0
- package/adapters/vue.d.ts.map +1 -0
- package/adapters/vue.mjs +19 -0
- package/core/createRouter.d.ts +9 -0
- package/core/createRouter.d.ts.map +1 -0
- package/{dist/types/core/createRouterConfig.d.ts → core/createRoutes.d.ts} +4 -4
- package/core/createRoutes.d.ts.map +1 -0
- package/core/index.d.ts +14 -0
- package/core/index.d.ts.map +1 -0
- package/core/types/TypeAdapters.d.ts +9 -0
- package/core/types/TypeAdapters.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypeCurrentRoute.d.ts +1 -1
- package/core/types/TypeCurrentRoute.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypeLifecycleConfig.d.ts +2 -0
- package/core/types/TypeLifecycleConfig.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypePropsRouter.d.ts +2 -3
- package/core/types/TypePropsRouter.d.ts.map +1 -0
- package/{dist/types/core/types/TypeRedirectToParams.d.ts → core/types/TypeRedirectParams.d.ts} +6 -10
- package/core/types/TypeRedirectParams.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypeRoute.d.ts +0 -1
- package/core/types/TypeRoute.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypeRouteRaw.d.ts +1 -0
- package/core/types/TypeRouteRaw.d.ts.map +1 -0
- package/core/types/TypeRouter.d.ts +22 -0
- package/core/types/TypeRouter.d.ts.map +1 -0
- package/core/types/TypeValidator.d.ts.map +1 -0
- package/core/utils/PreventError.d.ts +4 -0
- package/core/utils/PreventError.d.ts.map +1 -0
- package/core/utils/RedirectError.d.ts +4 -0
- package/core/utils/RedirectError.d.ts.map +1 -0
- package/core/utils/addNames.d.ts.map +1 -0
- package/{dist/types/core → core}/utils/constants.d.ts +0 -2
- package/core/utils/constants.d.ts.map +1 -0
- package/core/utils/dynamic.d.ts.map +1 -0
- package/core/utils/findRouteByPathname.d.ts.map +1 -0
- package/core/utils/getDynamicValues.d.ts.map +1 -0
- package/core/utils/getInitialRoute.d.ts +7 -0
- package/core/utils/getInitialRoute.d.ts.map +1 -0
- package/core/utils/getQueryValues.d.ts.map +1 -0
- package/core/utils/getTypedEntries.d.ts.map +1 -0
- package/core/utils/history.d.ts.map +1 -0
- package/core/utils/loadComponentToConfig.d.ts.map +1 -0
- package/core/utils/queryString.d.ts +8 -0
- package/core/utils/queryString.d.ts.map +1 -0
- package/{dist/types/core → core}/utils/replaceDynamicValues.d.ts +1 -2
- package/core/utils/replaceDynamicValues.d.ts.map +1 -0
- package/core/utils/routerSetLoadedComponent.d.ts +7 -0
- package/core/utils/routerSetLoadedComponent.d.ts.map +1 -0
- package/index.cjs +406 -0
- package/index.mjs +383 -0
- package/package.json +67 -57
- package/preact/Router.d.ts +3 -0
- package/preact/Router.d.ts.map +1 -0
- package/preact/index.cjs +80 -0
- package/preact/index.d.ts.map +1 -0
- package/preact/index.mjs +57 -0
- package/react/Router.d.ts +5 -0
- package/react/Router.d.ts.map +1 -0
- package/react/index.cjs +79 -0
- package/react/index.d.ts.map +1 -0
- package/react/index.mjs +56 -0
- package/solid/Router.d.ts.map +1 -0
- package/solid/index.cjs +80 -0
- package/solid/index.d.ts +2 -0
- package/solid/index.d.ts.map +1 -0
- package/solid/index.mjs +57 -0
- package/vue/index.cjs +0 -0
- package/vue/index.d.ts +2 -0
- package/vue/index.d.ts.map +1 -0
- package/vue/index.mjs +0 -0
- package/LICENSE +0 -21
- package/README.md +0 -10
- package/dist/cjs/index.js +0 -381
- package/dist/cjs/package.json +0 -1
- package/dist/cjs/react/index.js +0 -149
- package/dist/cjs/react/package.json +0 -1
- package/dist/cjs/solid/index.js +0 -130
- package/dist/cjs/solid/package.json +0 -1
- package/dist/esm/index.js +0 -348
- package/dist/esm/package.json +0 -1
- package/dist/esm/react/index.js +0 -126
- package/dist/esm/react/package.json +0 -1
- package/dist/esm/solid/index.js +0 -107
- package/dist/esm/solid/package.json +0 -1
- package/dist/types/core/createRouterConfig.d.ts.map +0 -1
- package/dist/types/core/createRouterStore.d.ts +0 -4
- package/dist/types/core/createRouterStore.d.ts.map +0 -1
- package/dist/types/core/index.d.ts +0 -14
- package/dist/types/core/index.d.ts.map +0 -1
- package/dist/types/core/types/InterfaceRouterStore.d.ts +0 -24
- package/dist/types/core/types/InterfaceRouterStore.d.ts.map +0 -1
- package/dist/types/core/types/TypeCurrentRoute.d.ts.map +0 -1
- package/dist/types/core/types/TypeLifecycleConfig.d.ts.map +0 -1
- package/dist/types/core/types/TypePropsRouter.d.ts.map +0 -1
- package/dist/types/core/types/TypeRedirectToParams.d.ts.map +0 -1
- package/dist/types/core/types/TypeRoute.d.ts.map +0 -1
- package/dist/types/core/types/TypeRouteRaw.d.ts.map +0 -1
- package/dist/types/core/types/TypeRouteWithParams.d.ts +0 -6
- package/dist/types/core/types/TypeRouteWithParams.d.ts.map +0 -1
- package/dist/types/core/types/TypeValidator.d.ts.map +0 -1
- package/dist/types/core/utils/addNames.d.ts.map +0 -1
- package/dist/types/core/utils/constants.d.ts.map +0 -1
- package/dist/types/core/utils/dynamic.d.ts.map +0 -1
- package/dist/types/core/utils/findRouteByPathname.d.ts.map +0 -1
- package/dist/types/core/utils/getDynamicValues.d.ts.map +0 -1
- package/dist/types/core/utils/getInitialRoute.d.ts +0 -8
- package/dist/types/core/utils/getInitialRoute.d.ts.map +0 -1
- package/dist/types/core/utils/getQueryValues.d.ts.map +0 -1
- package/dist/types/core/utils/getTypedEntries.d.ts.map +0 -1
- package/dist/types/core/utils/history.d.ts.map +0 -1
- package/dist/types/core/utils/loadComponentToConfig.d.ts.map +0 -1
- package/dist/types/core/utils/replaceDynamicValues.d.ts.map +0 -1
- package/dist/types/react/Router.d.ts +0 -5
- package/dist/types/react/Router.d.ts.map +0 -1
- package/dist/types/react/index.d.ts.map +0 -1
- package/dist/types/react/useStore.d.ts +0 -8
- package/dist/types/react/useStore.d.ts.map +0 -1
- package/dist/types/solid/Router.d.ts.map +0 -1
- package/dist/types/solid/index.d.ts.map +0 -1
- package/dist/types/solid/useStore.d.ts +0 -7
- package/dist/types/solid/useStore.d.ts.map +0 -1
- package/dist/types/tsconfig.types.tsbuildinfo +0 -1
- /package/{dist/types/core → core}/types/TypeValidator.d.ts +0 -0
- /package/{dist/types/core → core}/utils/addNames.d.ts +0 -0
- /package/{dist/types/core → core}/utils/dynamic.d.ts +0 -0
- /package/{dist/types/core → core}/utils/findRouteByPathname.d.ts +0 -0
- /package/{dist/types/core → core}/utils/getDynamicValues.d.ts +0 -0
- /package/{dist/types/core → core}/utils/getQueryValues.d.ts +0 -0
- /package/{dist/types/core → core}/utils/getTypedEntries.d.ts +0 -0
- /package/{dist/types/core → core}/utils/history.d.ts +0 -0
- /package/{dist/types/core → core}/utils/loadComponentToConfig.d.ts +0 -0
- /package/{dist/types/react → preact}/index.d.ts +0 -0
- /package/{dist/types/solid → react}/index.d.ts +0 -0
- /package/{dist/types/solid → solid}/Router.d.ts +0 -0
package/index.cjs
ADDED
|
@@ -0,0 +1,406 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
|
|
20
|
+
// packages/core/index.ts
|
|
21
|
+
var core_exports = {};
|
|
22
|
+
__export(core_exports, {
|
|
23
|
+
RedirectError: () => RedirectError,
|
|
24
|
+
createRouter: () => createRouter,
|
|
25
|
+
createRoutes: () => createRoutes,
|
|
26
|
+
history: () => history,
|
|
27
|
+
loadComponentToConfig: () => loadComponentToConfig,
|
|
28
|
+
replaceDynamicValues: () => replaceDynamicValues,
|
|
29
|
+
routerSetLoadedComponent: () => routerSetLoadedComponent
|
|
30
|
+
});
|
|
31
|
+
module.exports = __toCommonJS(core_exports);
|
|
32
|
+
|
|
33
|
+
// packages/core/utils/constants.ts
|
|
34
|
+
var constants = {
|
|
35
|
+
dynamicSeparator: ":",
|
|
36
|
+
pathPartSeparator: "/",
|
|
37
|
+
isClient: typeof window !== "undefined"
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
// packages/core/utils/dynamic.ts
|
|
41
|
+
function isDynamic(param) {
|
|
42
|
+
return param[0] === constants.dynamicSeparator;
|
|
43
|
+
}
|
|
44
|
+
function clearDynamic(param) {
|
|
45
|
+
return param.replace(new RegExp(`^${constants.dynamicSeparator}`), "");
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
// packages/core/utils/getDynamicValues.ts
|
|
49
|
+
function getDynamicValues(params) {
|
|
50
|
+
const { route, pathname } = params;
|
|
51
|
+
const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean).map((str) => decodeURIComponent(str));
|
|
52
|
+
const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
|
|
53
|
+
const dynamicParams = {};
|
|
54
|
+
for (let i = 0; i < routePathnameArray.length; i++) {
|
|
55
|
+
const paramName = routePathnameArray[i];
|
|
56
|
+
if (isDynamic(paramName)) dynamicParams[clearDynamic(paramName)] = pathnameArray[i];
|
|
57
|
+
}
|
|
58
|
+
return dynamicParams;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
// packages/core/utils/findRouteByPathname.ts
|
|
62
|
+
function completeStaticMatch(pathname, path) {
|
|
63
|
+
return !path.includes(constants.dynamicSeparator) && (pathname === path || pathname === `${path}${constants.pathPartSeparator}`);
|
|
64
|
+
}
|
|
65
|
+
function findRouteByPathname({
|
|
66
|
+
pathname,
|
|
67
|
+
routes
|
|
68
|
+
}) {
|
|
69
|
+
let dynamicRouteMatch;
|
|
70
|
+
const pathnameArray = pathname.replace(/\?.+$/, "").split(constants.pathPartSeparator).filter(Boolean);
|
|
71
|
+
for (const routeName in routes) {
|
|
72
|
+
if (!Object.hasOwn(routes, routeName)) continue;
|
|
73
|
+
const route = routes[routeName];
|
|
74
|
+
if (completeStaticMatch(pathname, route.path)) return route;
|
|
75
|
+
if (dynamicRouteMatch) continue;
|
|
76
|
+
const routePathnameArray = route.path.split(constants.pathPartSeparator).filter(Boolean);
|
|
77
|
+
if (routePathnameArray.length !== pathnameArray.length) continue;
|
|
78
|
+
const someParamInvalid = routePathnameArray.some((paramName, i) => {
|
|
79
|
+
const paramFromUrl = pathnameArray[i];
|
|
80
|
+
if (!isDynamic(paramName)) return paramName !== paramFromUrl;
|
|
81
|
+
const validator = route.params?.[clearDynamic(paramName)];
|
|
82
|
+
if (typeof validator !== "function") {
|
|
83
|
+
throw new Error(`findRoute: missing validator for param "${paramName}"`);
|
|
84
|
+
}
|
|
85
|
+
return !validator(paramFromUrl);
|
|
86
|
+
});
|
|
87
|
+
if (!someParamInvalid) dynamicRouteMatch = route;
|
|
88
|
+
}
|
|
89
|
+
return dynamicRouteMatch;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
// packages/core/utils/getTypedEntries.ts
|
|
93
|
+
var getTypedEntries = Object.entries;
|
|
94
|
+
|
|
95
|
+
// packages/core/utils/queryString.ts
|
|
96
|
+
function removeHash(input) {
|
|
97
|
+
const hashStart = input.indexOf("#");
|
|
98
|
+
return hashStart === -1 ? input : input.slice(0, hashStart);
|
|
99
|
+
}
|
|
100
|
+
var queryString = {
|
|
101
|
+
extract(input) {
|
|
102
|
+
const inputNoHash = removeHash(input);
|
|
103
|
+
const queryStart = inputNoHash.indexOf("?");
|
|
104
|
+
return queryStart === -1 ? "" : inputNoHash.slice(queryStart + 1);
|
|
105
|
+
},
|
|
106
|
+
parse(input) {
|
|
107
|
+
return Object.fromEntries(new URLSearchParams(input));
|
|
108
|
+
},
|
|
109
|
+
stringify(obj) {
|
|
110
|
+
return new URLSearchParams(obj).toString();
|
|
111
|
+
}
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
// packages/core/utils/getQueryValues.ts
|
|
115
|
+
function getQueryValues(params) {
|
|
116
|
+
const { route, pathname } = params;
|
|
117
|
+
const qs = queryString.extract(pathname);
|
|
118
|
+
if (!qs || !route.query) return {};
|
|
119
|
+
const query = queryString.parse(qs);
|
|
120
|
+
getTypedEntries(query).forEach(([key, value]) => {
|
|
121
|
+
const validator = route.query[key];
|
|
122
|
+
if (typeof validator !== "function" || !validator(value)) {
|
|
123
|
+
delete query[key];
|
|
124
|
+
}
|
|
125
|
+
});
|
|
126
|
+
return query;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
// packages/core/utils/getInitialRoute.ts
|
|
130
|
+
function getInitialRoute(params) {
|
|
131
|
+
const route = findRouteByPathname({ pathname: params.pathname, routes: params.routes }) || params.routes.notFound;
|
|
132
|
+
return {
|
|
133
|
+
route: route.name,
|
|
134
|
+
query: getQueryValues({ route, pathname: params.pathname }),
|
|
135
|
+
params: getDynamicValues({ route, pathname: params.pathname })
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
// packages/core/utils/history.ts
|
|
140
|
+
var import_history = require("history");
|
|
141
|
+
var history = constants.isClient ? (0, import_history.createBrowserHistory)() : null;
|
|
142
|
+
|
|
143
|
+
// packages/core/utils/loadComponentToConfig.ts
|
|
144
|
+
function loadComponentToConfig(params) {
|
|
145
|
+
const { route } = params;
|
|
146
|
+
if (!route.component) {
|
|
147
|
+
return route.loader().then((module2) => {
|
|
148
|
+
const { default: component, ...rest } = module2;
|
|
149
|
+
route.component = component;
|
|
150
|
+
route.otherExports = rest;
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
return Promise.resolve();
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
// packages/core/utils/PreventError.ts
|
|
157
|
+
var PreventError = class extends Error {
|
|
158
|
+
constructor(message) {
|
|
159
|
+
super(message);
|
|
160
|
+
this.name = "PreventError";
|
|
161
|
+
}
|
|
162
|
+
};
|
|
163
|
+
|
|
164
|
+
// packages/core/utils/RedirectError.ts
|
|
165
|
+
var RedirectError = class extends Error {
|
|
166
|
+
constructor(message) {
|
|
167
|
+
super(message);
|
|
168
|
+
this.name = "RedirectError";
|
|
169
|
+
}
|
|
170
|
+
};
|
|
171
|
+
|
|
172
|
+
// packages/core/utils/replaceDynamicValues.ts
|
|
173
|
+
var re = new RegExp(`[^${constants.pathPartSeparator}]+`, "g");
|
|
174
|
+
function replaceDynamicValues({
|
|
175
|
+
route,
|
|
176
|
+
params = {}
|
|
177
|
+
}) {
|
|
178
|
+
return route.path.replace(re, (paramName) => {
|
|
179
|
+
if (!isDynamic(paramName)) return paramName;
|
|
180
|
+
const value = params[clearDynamic(paramName)];
|
|
181
|
+
if (!value) {
|
|
182
|
+
throw new Error(
|
|
183
|
+
`replaceDynamicValues: no param "${paramName}" passed for route ${route.name}`
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
return encodeURIComponent(value);
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
// packages/core/createRouter.ts
|
|
191
|
+
function createRouter(config) {
|
|
192
|
+
const router = config.adapters.makeObservable({
|
|
193
|
+
routesHistory: [],
|
|
194
|
+
currentRoute: {},
|
|
195
|
+
isRedirecting: false,
|
|
196
|
+
redirect: void 0,
|
|
197
|
+
restoreFromURL: void 0,
|
|
198
|
+
restoreFromServer: void 0,
|
|
199
|
+
get adapters() {
|
|
200
|
+
return config.adapters;
|
|
201
|
+
},
|
|
202
|
+
get routes() {
|
|
203
|
+
return config.routes;
|
|
204
|
+
},
|
|
205
|
+
get lifecycleParams() {
|
|
206
|
+
return config.lifecycleParams;
|
|
207
|
+
}
|
|
208
|
+
});
|
|
209
|
+
router.restoreFromServer = function restoreFromServer(obj) {
|
|
210
|
+
router.adapters.batch(() => {
|
|
211
|
+
router.routesHistory.push(...obj.routesHistory || []);
|
|
212
|
+
Object.assign(router.currentRoute, obj.currentRoute);
|
|
213
|
+
});
|
|
214
|
+
const preloadedRouteName = Object.keys(router.routes).find(
|
|
215
|
+
(routeName) => router.currentRoute.name === routeName
|
|
216
|
+
);
|
|
217
|
+
return loadComponentToConfig({ route: router.routes[preloadedRouteName] });
|
|
218
|
+
};
|
|
219
|
+
router.restoreFromURL = function restoreFromURL(params) {
|
|
220
|
+
return router.redirect(getInitialRoute({ routes: router.routes, ...params }));
|
|
221
|
+
};
|
|
222
|
+
router.redirect = async function redirect(config2) {
|
|
223
|
+
const { route: routeName, replace } = config2;
|
|
224
|
+
let currentRoute;
|
|
225
|
+
let currentPathname;
|
|
226
|
+
let currentUrl;
|
|
227
|
+
let currentSearch;
|
|
228
|
+
let currentQuery;
|
|
229
|
+
if (router.currentRoute?.name) {
|
|
230
|
+
currentRoute = router.routes[router.currentRoute.name];
|
|
231
|
+
currentPathname = replaceDynamicValues({
|
|
232
|
+
route: currentRoute,
|
|
233
|
+
params: router.currentRoute.params
|
|
234
|
+
});
|
|
235
|
+
currentQuery = router.currentRoute.query;
|
|
236
|
+
currentSearch = queryString.stringify(router.currentRoute.query);
|
|
237
|
+
currentUrl = `${currentPathname}${currentSearch ? `?${currentSearch}` : ""}`;
|
|
238
|
+
}
|
|
239
|
+
const nextRoute = router.routes[routeName];
|
|
240
|
+
const nextPathname = replaceDynamicValues({
|
|
241
|
+
route: nextRoute,
|
|
242
|
+
params: "params" in config2 ? config2.params : void 0
|
|
243
|
+
});
|
|
244
|
+
let nextQuery;
|
|
245
|
+
let nextUrl = nextPathname;
|
|
246
|
+
let nextSearch;
|
|
247
|
+
if ("query" in config2 && config2.query) {
|
|
248
|
+
const clearedQuery = getQueryValues({
|
|
249
|
+
route: nextRoute,
|
|
250
|
+
pathname: `${nextPathname}?${queryString.stringify(config2.query)}`
|
|
251
|
+
});
|
|
252
|
+
if (Object.keys(clearedQuery).length > 0) {
|
|
253
|
+
nextQuery = clearedQuery;
|
|
254
|
+
nextSearch = queryString.stringify(clearedQuery);
|
|
255
|
+
nextUrl = `${nextPathname}?${nextSearch}`;
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
if (currentUrl === nextUrl) return Promise.resolve();
|
|
259
|
+
if (currentPathname === nextPathname) {
|
|
260
|
+
if (currentSearch !== nextSearch) {
|
|
261
|
+
router.adapters.batch(() => {
|
|
262
|
+
router.adapters.replaceObject(router.currentRoute, {
|
|
263
|
+
...router.currentRoute,
|
|
264
|
+
query: nextQuery || {}
|
|
265
|
+
});
|
|
266
|
+
router.routesHistory.push(nextUrl);
|
|
267
|
+
});
|
|
268
|
+
if (history && !replace) {
|
|
269
|
+
history.push({
|
|
270
|
+
hash: history.location.hash,
|
|
271
|
+
search: nextSearch,
|
|
272
|
+
pathname: nextPathname
|
|
273
|
+
});
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
return Promise.resolve();
|
|
277
|
+
}
|
|
278
|
+
router.adapters.batch(() => {
|
|
279
|
+
router.isRedirecting = true;
|
|
280
|
+
});
|
|
281
|
+
try {
|
|
282
|
+
const config3 = {
|
|
283
|
+
nextUrl,
|
|
284
|
+
nextRoute,
|
|
285
|
+
nextQuery,
|
|
286
|
+
nextSearch,
|
|
287
|
+
nextPathname,
|
|
288
|
+
currentUrl,
|
|
289
|
+
currentQuery,
|
|
290
|
+
currentRoute,
|
|
291
|
+
currentSearch,
|
|
292
|
+
currentPathname,
|
|
293
|
+
redirect: (redirectConfig2) => {
|
|
294
|
+
if (constants.isClient) return redirectConfig2;
|
|
295
|
+
const redirectRoute = router.routes[redirectConfig2.route];
|
|
296
|
+
const redirectParams = "params" in redirectConfig2 && redirectConfig2.params ? redirectConfig2.params : void 0;
|
|
297
|
+
let redirectUrl = replaceDynamicValues({
|
|
298
|
+
params: redirectParams,
|
|
299
|
+
route: redirectRoute
|
|
300
|
+
});
|
|
301
|
+
if ("query" in redirectConfig2 && redirectConfig2.query) {
|
|
302
|
+
const clearedQuery = getQueryValues({
|
|
303
|
+
route: nextRoute,
|
|
304
|
+
pathname: `${nextPathname}?${queryString.stringify(redirectConfig2.query)}`
|
|
305
|
+
});
|
|
306
|
+
if (Object.keys(clearedQuery).length > 0) {
|
|
307
|
+
redirectUrl = `${redirectUrl}?${queryString.stringify(clearedQuery)}`;
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
throw new RedirectError(redirectUrl);
|
|
311
|
+
},
|
|
312
|
+
preventRedirect: () => {
|
|
313
|
+
throw new PreventError(`Redirect to ${nextUrl} was prevented`);
|
|
314
|
+
}
|
|
315
|
+
};
|
|
316
|
+
await currentRoute?.beforeLeave?.(config3, ...router.lifecycleParams || []);
|
|
317
|
+
const redirectConfig = await nextRoute.beforeEnter?.(config3, ...router.lifecycleParams || []);
|
|
318
|
+
if (redirectConfig) return redirect(redirectConfig);
|
|
319
|
+
await loadComponentToConfig({ route: router.routes[nextRoute.name] });
|
|
320
|
+
} catch (error) {
|
|
321
|
+
if (error instanceof PreventError) {
|
|
322
|
+
return Promise.resolve();
|
|
323
|
+
}
|
|
324
|
+
if (error instanceof RedirectError) {
|
|
325
|
+
throw error;
|
|
326
|
+
}
|
|
327
|
+
console.error(error);
|
|
328
|
+
await loadComponentToConfig({ route: router.routes.internalError });
|
|
329
|
+
router.adapters.batch(() => {
|
|
330
|
+
router.adapters.replaceObject(router.currentRoute, {
|
|
331
|
+
name: router.routes.internalError.name,
|
|
332
|
+
path: router.routes.internalError.path,
|
|
333
|
+
props: router.routes[router.routes.internalError.name].props,
|
|
334
|
+
query: router.adapters.makeObservable({}),
|
|
335
|
+
params: router.adapters.makeObservable({}),
|
|
336
|
+
pageId: router.routes[router.routes.internalError.name].pageId
|
|
337
|
+
});
|
|
338
|
+
router.isRedirecting = false;
|
|
339
|
+
});
|
|
340
|
+
return Promise.resolve();
|
|
341
|
+
}
|
|
342
|
+
router.adapters.batch(() => {
|
|
343
|
+
router.adapters.replaceObject(router.currentRoute, {
|
|
344
|
+
name: nextRoute.name,
|
|
345
|
+
path: nextRoute.path,
|
|
346
|
+
props: router.routes[nextRoute.name].props,
|
|
347
|
+
query: getQueryValues({ route: nextRoute, pathname: nextUrl }),
|
|
348
|
+
params: getDynamicValues({ route: nextRoute, pathname: nextUrl }),
|
|
349
|
+
pageId: router.routes[nextRoute.name].pageId
|
|
350
|
+
});
|
|
351
|
+
const lastUrl = router.routesHistory[router.routesHistory.length - 1];
|
|
352
|
+
if (lastUrl !== nextUrl) {
|
|
353
|
+
router.routesHistory.push(nextUrl);
|
|
354
|
+
}
|
|
355
|
+
if (history && !replace) {
|
|
356
|
+
history.push({
|
|
357
|
+
hash: history.location.hash,
|
|
358
|
+
search: "query" in config2 ? `?${queryString.stringify(config2.query)}` : "",
|
|
359
|
+
pathname: nextPathname
|
|
360
|
+
});
|
|
361
|
+
}
|
|
362
|
+
router.isRedirecting = false;
|
|
363
|
+
});
|
|
364
|
+
return Promise.resolve();
|
|
365
|
+
};
|
|
366
|
+
return router;
|
|
367
|
+
}
|
|
368
|
+
|
|
369
|
+
// packages/core/utils/addNames.ts
|
|
370
|
+
function addNames(obj) {
|
|
371
|
+
Object.entries(obj).forEach(([key, value]) => {
|
|
372
|
+
value.name = key;
|
|
373
|
+
});
|
|
374
|
+
return obj;
|
|
375
|
+
}
|
|
376
|
+
|
|
377
|
+
// packages/core/createRoutes.ts
|
|
378
|
+
function createRoutes(config) {
|
|
379
|
+
return addNames(config);
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
// packages/core/utils/routerSetLoadedComponent.ts
|
|
383
|
+
function routerSetLoadedComponent(props, config) {
|
|
384
|
+
const currentRouteName = props.router.currentRoute.name;
|
|
385
|
+
const currentRoutePage = props.router.currentRoute.pageId;
|
|
386
|
+
const componentConfig = props.router.routes[currentRouteName];
|
|
387
|
+
let preventRedirect = false;
|
|
388
|
+
if (props.router.isRedirecting) preventRedirect = true;
|
|
389
|
+
else if (config.loadedComponentName === currentRouteName) preventRedirect = true;
|
|
390
|
+
else if (config.loadedComponentPage != null && currentRouteName != null) {
|
|
391
|
+
if (config.loadedComponentPage === currentRoutePage) {
|
|
392
|
+
props.router.adapters.batch(() => {
|
|
393
|
+
config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
|
|
394
|
+
});
|
|
395
|
+
preventRedirect = true;
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
if (preventRedirect) return;
|
|
399
|
+
props.router.adapters.batch(() => {
|
|
400
|
+
if (config.loadedComponentName) props.beforeUpdatePageComponent?.();
|
|
401
|
+
props.beforeSetPageComponent?.(componentConfig);
|
|
402
|
+
config.currentProps = "props" in componentConfig ? componentConfig.props : {};
|
|
403
|
+
config.loadedComponentName = currentRouteName;
|
|
404
|
+
config.loadedComponentPage = componentConfig.pageId;
|
|
405
|
+
});
|
|
406
|
+
}
|