@molecule/app-routing-react-router 1.2.5 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/provider.js CHANGED
@@ -1,16 +1,62 @@
1
1
  /**
2
2
  * React Router (v7/v8) provider implementation.
3
3
  *
4
+ * `createReactRouter` is `@molecule/app-routing`'s `createHistoryRouter` over the config
5
+ * snapshot: navigation, guards, query/hash helpers, named routes and matching all come
6
+ * from the shared core, so this bond behaves like every other routing bond.
7
+ *
4
8
  * @module
5
9
  */
6
- import { I18nError } from '@molecule/app-i18n';
7
- import { generatePath, matchPath, parseSearchParams, stringifyQuery } from './utilities.js';
10
+ import { I18nError, t } from '@molecule/app-i18n';
11
+ import { createHistoryRouter } from '@molecule/app-routing';
12
+ import { createReactRouterSnapshotHistory } from './history.js';
13
+ /**
14
+ * The message the core's named routes throw with for a missing name, as this exact
15
+ * `t()` call renders it. Comparing against the same call the core makes keeps the
16
+ * detection exact in every locale.
17
+ *
18
+ * @param name - The route name that was looked up.
19
+ * @returns The interpolated route-not-found message.
20
+ */
21
+ const routeNotFoundMessage = (name) => t('routing.error.routeNotFound', { name }, { defaultValue: 'Route "{{name}}" not found' });
22
+ /**
23
+ * Rethrows the core's route-not-found `Error` as the bond's `I18nError`, so the key and
24
+ * values travel with the error for re-translation. The core owns the named-route logic;
25
+ * only the error type is this bond's contract.
26
+ *
27
+ * @param router - The router `createHistoryRouter` built.
28
+ * @returns The same router with the named-route methods rethrowing `I18nError`.
29
+ */
30
+ const withI18nRouteErrors = (router) => {
31
+ const generatePath = router.generatePath.bind(router);
32
+ const navigateTo = router.navigateTo.bind(router);
33
+ const rethrowNamedRouteError = (name, action) => {
34
+ try {
35
+ return action();
36
+ }
37
+ catch (error) {
38
+ if (error instanceof Error && error.message === routeNotFoundMessage(name)) {
39
+ throw new I18nError('routing.error.routeNotFound', { name }, 'Route "{{name}}" not found', error);
40
+ }
41
+ throw error;
42
+ }
43
+ };
44
+ router.generatePath = (name, routeParams, query) => rethrowNamedRouteError(name, () => generatePath(name, routeParams, query));
45
+ router.navigateTo = (name, routeParams, query, options) => rethrowNamedRouteError(name, () => navigateTo(name, routeParams, query, options));
46
+ return router;
47
+ };
8
48
  /**
9
- * Creates a React Router adapter that implements the molecule Router interface.
49
+ * Creates a React Router adapter that implements the molecule Router interface over a
50
+ * config snapshot: the `navigate` function, `location` and `params` of one render. The
51
+ * snapshot never changes, so every read answers for that render — the hooks
52
+ * (`MoleculeRouterProvider`, `useMoleculeRouter`) build the live router instead, one
53
+ * that follows React Router for its whole life. Navigation runs React Router's
54
+ * `navigate`, falling back to a full-page `window.location` navigation when no
55
+ * `navigate` was given (the hook-less `provider`).
10
56
  *
11
57
  * @example
12
58
  * ```tsx
13
- * import { useNavigate, useLocation, useParams, useSearchParams } from 'react-router'
59
+ * import { useNavigate, useLocation, useParams } from 'react-router'
14
60
  * import { createReactRouter, setRouter } from '@molecule/app-routing-react-router'
15
61
  * import { useEffect, useMemo } from 'react'
16
62
  *
@@ -18,7 +64,6 @@ import { generatePath, matchPath, parseSearchParams, stringifyQuery } from './ut
18
64
  * const navigate = useNavigate()
19
65
  * const location = useLocation()
20
66
  * const params = useParams()
21
- * const [searchParams] = useSearchParams()
22
67
  *
23
68
  * const router = useMemo(() => createReactRouter({
24
69
  * navigate,
@@ -36,232 +81,7 @@ import { generatePath, matchPath, parseSearchParams, stringifyQuery } from './ut
36
81
  * @param config - Configuration with React Router's `navigate` function, `location`, `params`, and optional `routes`.
37
82
  * @returns A molecule `Router` with navigation, guards, query/hash management, and route matching.
38
83
  */
39
- export const createReactRouter = (config = {}) => {
40
- const { navigate: navigateFn, location: locationObj, params = {}, routes = [] } = config;
41
- let registeredRoutes = [...routes];
42
- const listeners = new Set();
43
- const guards = [];
44
- const namedRoutes = new Map();
45
- // Index named routes
46
- const indexRoutes = (routeList, prefix = '') => {
47
- for (const route of routeList) {
48
- const fullPath = prefix + route.path;
49
- if (route.name) {
50
- namedRoutes.set(route.name, { ...route, path: fullPath });
51
- }
52
- if (route.children) {
53
- indexRoutes(route.children, fullPath);
54
- }
55
- }
56
- };
57
- indexRoutes(routes);
58
- // Build current location
59
- const getCurrentLocation = () => {
60
- if (locationObj) {
61
- return {
62
- pathname: locationObj.pathname,
63
- search: locationObj.search,
64
- hash: locationObj.hash,
65
- state: locationObj.state,
66
- key: locationObj.key,
67
- };
68
- }
69
- if (typeof window !== 'undefined') {
70
- return {
71
- pathname: window.location.pathname,
72
- search: window.location.search,
73
- hash: window.location.hash,
74
- key: Math.random().toString(36).slice(2),
75
- };
76
- }
77
- return {
78
- pathname: '/',
79
- search: '',
80
- hash: '',
81
- key: Math.random().toString(36).slice(2),
82
- };
83
- };
84
- const normalizeParams = (p) => {
85
- const result = {};
86
- for (const [key, value] of Object.entries(p)) {
87
- if (value !== undefined) {
88
- result[key] = value;
89
- }
90
- }
91
- return result;
92
- };
93
- const runGuards = async (to, from) => {
94
- for (const guard of guards) {
95
- const result = await guard(to, from);
96
- if (result !== undefined && result !== true) {
97
- return result;
98
- }
99
- }
100
- return true;
101
- };
102
- const notify = (action) => {
103
- const location = getCurrentLocation();
104
- listeners.forEach((listener) => listener(location, action));
105
- };
106
- const doNavigate = async (path, options = {}) => {
107
- const { replace = false, preserveQuery, preserveHash, state } = options;
108
- const currentLocation = getCurrentLocation();
109
- let fullPath = path;
110
- if (preserveQuery && currentLocation.search) {
111
- fullPath += currentLocation.search;
112
- }
113
- if (preserveHash && currentLocation.hash) {
114
- fullPath += currentLocation.hash;
115
- }
116
- const newLocation = {
117
- pathname: fullPath.split('?')[0].split('#')[0],
118
- search: fullPath.includes('?') ? `?${fullPath.split('?')[1].split('#')[0]}` : '',
119
- hash: fullPath.includes('#') ? `#${fullPath.split('#')[1]}` : '',
120
- state,
121
- key: Math.random().toString(36).slice(2),
122
- };
123
- const guardResult = await runGuards(newLocation, currentLocation);
124
- if (guardResult === false)
125
- return;
126
- if (typeof guardResult === 'string') {
127
- doNavigate(guardResult, { replace: true });
128
- return;
129
- }
130
- if (typeof guardResult === 'object' && 'path' in guardResult) {
131
- doNavigate(guardResult.path, { replace: guardResult.replace });
132
- return;
133
- }
134
- if (navigateFn) {
135
- navigateFn(fullPath, { replace, state });
136
- }
137
- else if (typeof window !== 'undefined') {
138
- // Fallback to window.location
139
- if (replace) {
140
- window.location.replace(fullPath);
141
- }
142
- else {
143
- window.location.href = fullPath;
144
- }
145
- }
146
- notify(replace ? 'replace' : 'push');
147
- };
148
- const router = {
149
- getLocation: getCurrentLocation,
150
- getParams() {
151
- return normalizeParams(params);
152
- },
153
- getQuery: () => {
154
- const location = getCurrentLocation();
155
- const searchParams = new URLSearchParams(location.search);
156
- return parseSearchParams(searchParams);
157
- },
158
- getQueryParam: (key) => {
159
- const location = getCurrentLocation();
160
- const searchParams = new URLSearchParams(location.search);
161
- return searchParams.get(key) ?? undefined;
162
- },
163
- getHash: () => getCurrentLocation().hash,
164
- navigate: doNavigate,
165
- navigateTo(name, routeParams, query, options) {
166
- const route = namedRoutes.get(name);
167
- if (!route) {
168
- throw new I18nError('routing.error.routeNotFound', { name }, `Route "${name}" not found`);
169
- }
170
- let path = generatePath(route.path, routeParams);
171
- if (query) {
172
- path += stringifyQuery(query);
173
- }
174
- doNavigate(path, options);
175
- },
176
- back() {
177
- if (navigateFn) {
178
- navigateFn(-1);
179
- }
180
- else if (typeof window !== 'undefined') {
181
- window.history.back();
182
- }
183
- },
184
- forward() {
185
- if (navigateFn) {
186
- navigateFn(1);
187
- }
188
- else if (typeof window !== 'undefined') {
189
- window.history.forward();
190
- }
191
- },
192
- go(delta) {
193
- if (navigateFn) {
194
- navigateFn(delta);
195
- }
196
- else if (typeof window !== 'undefined') {
197
- window.history.go(delta);
198
- }
199
- },
200
- setQuery(query, options) {
201
- const location = getCurrentLocation();
202
- const path = location.pathname + stringifyQuery(query) + location.hash;
203
- doNavigate(path, options);
204
- },
205
- setQueryParam(key, value, options) {
206
- const query = this.getQuery();
207
- if (value === undefined) {
208
- delete query[key];
209
- }
210
- else {
211
- query[key] = value;
212
- }
213
- this.setQuery(query, options);
214
- },
215
- setHash(hash, options) {
216
- const location = getCurrentLocation();
217
- const normalizedHash = hash.startsWith('#') ? hash : `#${hash}`;
218
- const path = location.pathname + location.search + normalizedHash;
219
- doNavigate(path, options);
220
- },
221
- isActive(path, exact) {
222
- const location = getCurrentLocation();
223
- const match = matchPath(path, location.pathname, exact);
224
- return match !== null;
225
- },
226
- matchPath(pattern, pathToMatch) {
227
- return matchPath(pattern, pathToMatch);
228
- },
229
- generatePath(name, routeParams, query) {
230
- const route = namedRoutes.get(name);
231
- if (!route) {
232
- throw new I18nError('routing.error.routeNotFound', { name }, `Route "${name}" not found`);
233
- }
234
- let path = generatePath(route.path, routeParams);
235
- if (query) {
236
- path += stringifyQuery(query);
237
- }
238
- return path;
239
- },
240
- subscribe(listener) {
241
- listeners.add(listener);
242
- return () => listeners.delete(listener);
243
- },
244
- addGuard(guard) {
245
- guards.push(guard);
246
- return () => {
247
- const index = guards.indexOf(guard);
248
- if (index !== -1) {
249
- guards.splice(index, 1);
250
- }
251
- };
252
- },
253
- registerRoutes(newRoutes) {
254
- registeredRoutes = [...registeredRoutes, ...newRoutes];
255
- indexRoutes(newRoutes);
256
- },
257
- getRoutes: () => registeredRoutes,
258
- destroy() {
259
- listeners.clear();
260
- guards.length = 0;
261
- },
262
- };
263
- return router;
264
- };
84
+ export const createReactRouter = (config = {}) => withI18nRouteErrors(createHistoryRouter(createReactRouterSnapshotHistory(config), { routes: config.routes }));
265
85
  /**
266
86
  * Default React Router provider (basic, no hooks). For full functionality, use
267
87
  * `createReactRouter` with `useNavigate`/`useLocation`/`useParams`.
@@ -1 +1 @@
1
- {"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,gCAAgC,EAAE,MAAM,cAAc,CAAA;AAG/D;;;;;;;GAOG;AACH,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAU,EAAE,CACpD,CAAC,CAAC,6BAA6B,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,YAAY,EAAE,4BAA4B,EAAE,CAAC,CAAA;AAE5F;;;;;;;GAOG;AACH,MAAM,mBAAmB,GAAG,CAAC,MAAc,EAAU,EAAE;IACrD,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEjD,MAAM,sBAAsB,GAAG,CAAI,IAAY,EAAE,MAAe,EAAK,EAAE;QACrE,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,CAAA;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3E,MAAM,IAAI,SAAS,CACjB,6BAA6B,EAC7B,EAAE,IAAI,EAAE,EACR,4BAA4B,EAC5B,KAAK,CACN,CAAA;YACH,CAAC;YACD,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC,CAAA;IAED,MAAM,CAAC,YAAY,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,CACjD,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAA;IAE5E,MAAM,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CACxD,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAA;IAEnF,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,SAA4B,EAAE,EAAU,EAAE,CAC1E,mBAAmB,CACjB,mBAAmB,CAAC,gCAAgC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CACzF,CAAA;AAEH;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,iBAAiB,EAAE,CAAA"}
@@ -1,3 +1,9 @@
1
+ /**
2
+ * `useListRoute` over React Router: the list rules come from `@molecule/app-routing`'s
3
+ * `resolveListRoute`, which every framework's `useListRoute` shares.
4
+ *
5
+ * @module
6
+ */
1
7
  import type { ListRouteOptions, ListRouteResult } from './list-types.js';
2
8
  /**
3
9
  * Own URL-backed pagination, filters and selected views without mirrored state or navigation effects.
@@ -1 +1 @@
1
- {"version":3,"file":"useListRoute.d.ts","sourceRoot":"","sources":["../src/useListRoute.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAmB,gBAAgB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAuCzF;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EAC5F,OAAO,GAAE,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAM,GAChD,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,CAgJpC"}
1
+ {"version":3,"file":"useListRoute.d.ts","sourceRoot":"","sources":["../src/useListRoute.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAExE;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EAC5F,OAAO,GAAE,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAM,GAChD,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,CAiBpC"}
@@ -1,41 +1,12 @@
1
+ /**
2
+ * `useListRoute` over React Router: the list rules come from `@molecule/app-routing`'s
3
+ * `resolveListRoute`, which every framework's `useListRoute` shares.
4
+ *
5
+ * @module
6
+ */
1
7
  import { useEffect } from 'react';
2
- import { matchPath as matchReactPath, useLocation, useNavigate, useParams } from 'react-router';
3
- import { generatePath } from './utilities.js';
4
- /** Parse a positive safe integer without treating `2oops`, `1.5` or an overflow as a page. */
5
- function readPage(value, pageSize) {
6
- if (!value || !/^[1-9]\d*$/.test(value))
7
- return 1;
8
- const page = Number(value);
9
- return Number.isSafeInteger(page) && Number.isSafeInteger((page - 1) * pageSize) ? page : 1;
10
- }
11
- /** Apply only the explicitly owned query keys, leaving unrelated and repeated values intact. */
12
- function patchQuery(search, patch) {
13
- for (const [key, value] of Object.entries(patch)) {
14
- search.delete(key);
15
- if (Array.isArray(value))
16
- value.forEach((entry) => search.append(key, entry));
17
- else if (value !== undefined)
18
- search.set(key, value);
19
- }
20
- }
21
- /** Match a selection's query constraints, including explicit absence and repeated values. */
22
- function matchesQuery(search, query = {}) {
23
- return Object.entries(query).every(([key, value]) => {
24
- const expected = value === undefined ? [] : Array.isArray(value) ? value : [value];
25
- const actual = search.getAll(key);
26
- return actual.length === expected.length && actual.every((entry, i) => entry === expected[i]);
27
- });
28
- }
29
- /** Match-pattern params are still URL encoded; tolerate malformed escapes just as React Router does. */
30
- function decodeParam(value) {
31
- try {
32
- return decodeURIComponent(value);
33
- }
34
- catch (_error) {
35
- // A malformed incoming URL is still a usable literal filter; do not crash the page.
36
- return value;
37
- }
38
- }
8
+ import { useLocation, useNavigate, useParams } from 'react-router';
9
+ import { listRouteRedirect, resolveListRoute } from '@molecule/app-routing';
39
10
  /**
40
11
  * Own URL-backed pagination, filters and selected views without mirrored state or navigation effects.
41
12
  * Works inside `BrowserRouter`, `MemoryRouter` and data routers; no data-router-only
@@ -51,132 +22,15 @@ export function useListRoute(options = {}) {
51
22
  const location = useLocation();
52
23
  const navigate = useNavigate();
53
24
  const routeParams = useParams();
54
- const { pageSize = 20, pageParam = 'page', auth } = options;
55
- if (!Number.isSafeInteger(pageSize) || pageSize < 1) {
56
- throw new Error('useListRoute: pageSize must be a positive safe integer');
57
- }
58
- const search = new URLSearchParams(location.search);
59
- const selections = Object.entries(options.selections ?? {});
60
- const candidates = selections
61
- .map(([name, config]) => ({
62
- name,
63
- config,
64
- match: matchReactPath({ path: config.path, end: true }, location.pathname),
65
- }))
66
- .filter(({ config, match }) => match && matchesQuery(search, config.query))
67
- .sort((a, b) => Object.keys(b.config.query ?? {}).length - Object.keys(a.config.query ?? {}).length ||
68
- Number(b.name === options.defaultSelection) - Number(a.name === options.defaultSelection));
69
- const selected = candidates[0];
70
- const selection = selected?.name ?? options.defaultSelection;
71
- const currentSelection = options.selections?.[selection];
72
- const pattern = selected?.config.path ?? options.path;
73
- const matchedParams = selected?.match?.params ??
74
- (pattern ? matchReactPath({ path: pattern, end: true }, location.pathname)?.params : undefined);
75
- const params = {};
76
- for (const [key, value] of Object.entries(matchedParams ?? {})) {
77
- if (value !== undefined)
78
- params[key] = decodeParam(value);
79
- }
80
- // React Router's route context already decodes params; it wins over pattern matches.
81
- for (const [key, value] of Object.entries(routeParams)) {
82
- if (value !== undefined)
83
- params[key] = value;
84
- }
85
- const filterEntries = Object.entries(options.filters ?? {});
86
- const filters = Object.fromEntries(filterEntries.map(([name, source]) => {
87
- const pathValue = source.param ? params[source.param] : undefined;
88
- const queryValue = source.query || !source.param ? search.get(source.query ?? name) : null;
89
- return [name, pathValue ?? queryValue ?? source.defaultValue];
90
- }));
91
- const page = readPage(search.get(pageParam), pageSize);
92
- const requiresAuth = currentSelection?.requiresAuth === true;
93
- if (requiresAuth && !auth) {
94
- throw new Error('useListRoute: protected selections require auth.status and auth.redirectTo');
95
- }
96
- const status = requiresAuth && auth?.status !== 'authenticated' ? auth.status : 'ready';
97
- const redirectTo = status === 'unauthenticated' ? auth?.redirectTo : undefined;
98
- const returnTo = location.pathname + location.search + location.hash;
25
+ const list = resolveListRoute({ location, routeParams }, options, (path, navOptions) => navigate(path, { replace: navOptions.replace, state: navOptions.state }));
26
+ const redirect = listRouteRedirect(list, location);
27
+ const redirectTo = redirect?.to;
28
+ const returnTo = redirect?.options.state.returnTo;
99
29
  useEffect(() => {
100
- if (redirectTo && redirectTo !== returnTo) {
101
- void navigate(redirectTo, { replace: true, state: { returnTo } });
102
- }
30
+ if (redirectTo === undefined || returnTo === undefined)
31
+ return;
32
+ void navigate(redirectTo, { replace: true, state: { returnTo } });
103
33
  }, [navigate, redirectTo, returnTo]);
104
- const href = (change = {}) => {
105
- const nextQuery = new URLSearchParams(location.search);
106
- const nextParams = { ...params, ...change.params };
107
- let pathname = location.pathname;
108
- let nextPattern = pattern;
109
- if (change.selection !== undefined) {
110
- const target = options.selections?.[change.selection];
111
- if (!target)
112
- throw new Error(`useListRoute: unknown selection "${change.selection}"`);
113
- // A selection owns only the union of the configured selection query keys.
114
- for (const [, config] of selections) {
115
- for (const key of Object.keys(config.query ?? {}))
116
- nextQuery.delete(key);
117
- }
118
- patchQuery(nextQuery, target.query ?? {});
119
- nextPattern = target.path;
120
- }
121
- let pathChanged = change.selection !== undefined || change.params !== undefined;
122
- let filterChanged = false;
123
- for (const [name, value] of Object.entries(change.filters ?? {})) {
124
- const source = options.filters?.[name];
125
- if (!source)
126
- throw new Error(`useListRoute: unknown filter "${name}"`);
127
- if (source.param && !source.query && params[source.param] === undefined) {
128
- throw new Error(`useListRoute: path filter "${name}" requires param "${source.param}"`);
129
- }
130
- filterChanged ||= value !== filters[name];
131
- if (source.param && params[source.param] !== undefined) {
132
- if (value === undefined) {
133
- throw new Error(`useListRoute: path filter "${name}" cannot be removed`);
134
- }
135
- nextParams[source.param] = value;
136
- pathChanged = true;
137
- if (source.query)
138
- nextQuery.delete(source.query);
139
- }
140
- else {
141
- patchQuery(nextQuery, {
142
- [source.query ?? name]: value === source.defaultValue ? undefined : value,
143
- });
144
- }
145
- }
146
- if (pathChanged) {
147
- if (!nextPattern)
148
- throw new Error('useListRoute: changing path parameters requires a path pattern');
149
- pathname = generatePath(nextPattern, nextParams);
150
- }
151
- const nextPage = change.page ??
152
- (filterChanged || change.selection !== undefined || change.params !== undefined ? 1 : page);
153
- if (!Number.isSafeInteger(nextPage) ||
154
- nextPage < 1 ||
155
- !Number.isSafeInteger((nextPage - 1) * pageSize)) {
156
- throw new Error('useListRoute: page must be a positive safe integer');
157
- }
158
- patchQuery(nextQuery, { [pageParam]: nextPage === 1 ? undefined : String(nextPage) });
159
- const query = nextQuery.toString();
160
- return pathname + (query ? `?${query}` : '') + location.hash;
161
- };
162
- const go = (change, navOptions) => {
163
- void navigate(href(change), { state: location.state, ...navOptions });
164
- };
165
- return {
166
- page,
167
- pageSize,
168
- offset: (page - 1) * pageSize,
169
- filters,
170
- selection,
171
- params,
172
- canLoad: status === 'ready',
173
- status,
174
- redirectTo,
175
- href,
176
- navigate: go,
177
- setPage: (next, navOptions) => go({ page: next }, navOptions),
178
- setFilters: (next, navOptions) => go({ filters: next }, navOptions),
179
- select: (next, navOptions) => go({ selection: next }, navOptions),
180
- };
34
+ return list;
181
35
  }
182
36
  //# sourceMappingURL=useListRoute.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useListRoute.js","sourceRoot":"","sources":["../src/useListRoute.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useListRoute.js","sourceRoot":"","sources":["../src/useListRoute.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAElE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAI3E;;;;;;;;;;GAUG;AACH,MAAM,UAAU,YAAY,CAC1B,UAA+C,EAAE;IAEjD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;IAC9B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;IAC9B,MAAM,WAAW,GAAG,SAAS,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,gBAAgB,CAC3B,EAAE,QAAQ,EAAE,WAAW,EAAE,EACzB,OAAO,EACP,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC,CAC/F,CAAA;IACD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IAClD,MAAM,UAAU,GAAG,QAAQ,EAAE,EAAE,CAAA;IAC/B,MAAM,QAAQ,GAAG,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAA;IACjD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,UAAU,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAM;QAC9D,KAAK,QAAQ,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;IACnE,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;IACpC,OAAO,IAAI,CAAA;AACb,CAAC"}
package/dist/utilities.js CHANGED
@@ -91,7 +91,7 @@ export function generatePath(pattern, params) {
91
91
  return pattern.replace(/:([^/]+)/g, (_, name) => {
92
92
  const value = params[name];
93
93
  if (value === undefined) {
94
- throw new I18nError('routing.error.missingParam', { name, pattern }, `Missing required param "${name}" for path "${pattern}"`);
94
+ throw new I18nError('routing.error.missingParam', { name, pattern }, 'Missing param "{{name}}" for path "{{pattern}}"');
95
95
  }
96
96
  return encodeURIComponent(value);
97
97
  });
@@ -1 +1 @@
1
- {"version":3,"file":"utilities.js","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utilities.js","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@molecule/app-routing-react-router",
3
- "version": "1.2.5",
3
+ "version": "1.3.0",
4
4
  "description": "React Router v7 provider for @molecule/app-routing",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -41,7 +41,7 @@
41
41
  },
42
42
  "peerDependencies": {
43
43
  "@molecule/app-i18n": "^1.0.1",
44
- "@molecule/app-routing": "^1.0.1",
44
+ "@molecule/app-routing": "^1.1.0",
45
45
  "react": "^18.0.0 || ^19.0.0",
46
46
  "react-dom": "^18.0.0 || ^19.0.0",
47
47
  "react-router": "^7.0.0 || ^8.0.0"
@@ -52,9 +52,16 @@
52
52
  }
53
53
  },
54
54
  "devDependencies": {
55
- "@molecule/app-i18n": "1.1.2",
55
+ "@molecule/app-framework-conformance": "0.0.0",
56
+ "@molecule/app-i18n": "1.2.0",
57
+ "@molecule/app-query": "1.1.3",
58
+ "@molecule/app-query-memory": "1.0.5",
59
+ "@molecule/app-query-react": "1.6.0",
60
+ "@testing-library/react": "16.3.3",
56
61
  "@types/node": "26.6.5",
57
62
  "@types/react": "19.3.0",
63
+ "expect-type": "1.4.0",
64
+ "jsdom": "30.1.3",
58
65
  "react": "19.3.1",
59
66
  "react-dom": "19.3.1",
60
67
  "react-router": "8.5.0",