@buzola/router 0.0.5 → 0.0.7
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/define/create-page.d.ts +7 -6
- package/dist/define/create-page.d.ts.map +1 -1
- package/dist/define/create-page.js +33 -120
- package/dist/define/create-page.js.map +1 -1
- package/dist/engine/loader-state.d.ts +68 -0
- package/dist/engine/loader-state.d.ts.map +1 -0
- package/dist/engine/loader-state.js +135 -0
- package/dist/engine/loader-state.js.map +1 -0
- package/dist/engine/route-tree.d.ts +1 -0
- package/dist/engine/route-tree.d.ts.map +1 -1
- package/dist/engine/route-tree.js +3 -1
- package/dist/engine/route-tree.js.map +1 -1
- package/dist/engine/router.d.ts +6 -0
- package/dist/engine/router.d.ts.map +1 -1
- package/dist/engine/router.js +19 -1
- package/dist/engine/router.js.map +1 -1
- package/dist/engine/types.d.ts +6 -0
- package/dist/engine/types.d.ts.map +1 -1
- package/dist/react/hooks.d.ts +2 -0
- package/dist/react/hooks.d.ts.map +1 -1
- package/dist/react/hooks.js +5 -1
- package/dist/react/hooks.js.map +1 -1
- package/dist/react/link.d.ts +7 -0
- package/dist/react/link.d.ts.map +1 -1
- package/dist/react/link.js +33 -6
- package/dist/react/link.js.map +1 -1
- package/package.json +1 -1
- package/src/__tests__/loader-state.test.ts +339 -0
- package/src/__tests__/router.test.ts +58 -0
- package/src/__tests__/type-safety.test.tsx +24 -0
- package/src/define/create-page.tsx +49 -140
- package/src/engine/loader-state.ts +178 -0
- package/src/engine/route-tree.ts +4 -0
- package/src/engine/router.ts +19 -1
- package/src/engine/types.ts +6 -0
- package/src/react/hooks.ts +5 -1
- package/src/react/link.tsx +49 -5
package/dist/engine/router.js
CHANGED
|
@@ -110,10 +110,11 @@ export class Router {
|
|
|
110
110
|
throw new NavigationAbortedError();
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
|
-
// Set pending state
|
|
113
|
+
// Set pending state with target location
|
|
114
114
|
this.setState({
|
|
115
115
|
...this.state,
|
|
116
116
|
isPending: true,
|
|
117
|
+
pendingLocation: url,
|
|
117
118
|
});
|
|
118
119
|
// A newer navigation has started — abandon this one
|
|
119
120
|
if (this.navigationId !== currentNavId)
|
|
@@ -124,6 +125,7 @@ export class Router {
|
|
|
124
125
|
location: url,
|
|
125
126
|
matches,
|
|
126
127
|
isPending: false,
|
|
128
|
+
pendingLocation: undefined,
|
|
127
129
|
navigationState: this.adapter.getState(),
|
|
128
130
|
});
|
|
129
131
|
};
|
|
@@ -174,6 +176,22 @@ export class Router {
|
|
|
174
176
|
const resolved = this.resolveParams(pattern, params);
|
|
175
177
|
return this.buildPath(pattern, resolved);
|
|
176
178
|
}
|
|
179
|
+
/**
|
|
180
|
+
* Preload a page by its page ID.
|
|
181
|
+
* Triggers lazy component imports for all matching route nodes,
|
|
182
|
+
* so the code is ready when the user navigates.
|
|
183
|
+
*/
|
|
184
|
+
preload(pageId, params) {
|
|
185
|
+
const path = this.buildPagePath(pageId, params);
|
|
186
|
+
const url = new URL(path, 'http://localhost');
|
|
187
|
+
const matchUrl = this.createMatchUrl(url);
|
|
188
|
+
const matches = matchRoutes(this.routes, matchUrl);
|
|
189
|
+
if (!matches)
|
|
190
|
+
return;
|
|
191
|
+
for (const match of matches) {
|
|
192
|
+
match.node.preload?.();
|
|
193
|
+
}
|
|
194
|
+
}
|
|
177
195
|
/**
|
|
178
196
|
* Go back in history.
|
|
179
197
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/engine/router.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/engine/router.ts"],"names":[],"mappings":"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"}
|
package/dist/engine/types.d.ts
CHANGED
|
@@ -55,6 +55,8 @@ export interface RouteConfig {
|
|
|
55
55
|
component?: RouteComponent;
|
|
56
56
|
/** Schema for validating search params (Standard Schema compatible). */
|
|
57
57
|
searchSchema?: StandardSchema;
|
|
58
|
+
/** Preload function — triggers lazy component import ahead of navigation. */
|
|
59
|
+
preload?: () => void;
|
|
58
60
|
/** Child routes. */
|
|
59
61
|
children?: RouteConfig[];
|
|
60
62
|
/** Whether this is a layout route (has outlet but no own path segment). */
|
|
@@ -89,6 +91,8 @@ export interface RouteNode {
|
|
|
89
91
|
component?: RouteComponent;
|
|
90
92
|
/** Search params schema. */
|
|
91
93
|
searchSchema?: StandardSchema;
|
|
94
|
+
/** Preload function — triggers lazy component import ahead of navigation. */
|
|
95
|
+
preload?: () => void;
|
|
92
96
|
/** Child nodes. */
|
|
93
97
|
children: RouteNode[];
|
|
94
98
|
/** Parent node reference. */
|
|
@@ -106,6 +110,8 @@ export interface RouterState {
|
|
|
106
110
|
matches: RouteMatch[];
|
|
107
111
|
/** Whether a navigation is in progress. */
|
|
108
112
|
isPending: boolean;
|
|
113
|
+
/** The target URL during a pending navigation. Undefined when not navigating. */
|
|
114
|
+
pendingLocation?: URL;
|
|
109
115
|
/** Navigation state from Navigation API. */
|
|
110
116
|
navigationState?: unknown;
|
|
111
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/engine/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/engine/types.ts"],"names":[],"mappings":"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"}
|
package/dist/react/hooks.d.ts
CHANGED
|
@@ -41,6 +41,8 @@ export declare function useRoute(): {
|
|
|
41
41
|
depth: number;
|
|
42
42
|
/** Whether a navigation is pending. */
|
|
43
43
|
isPending: boolean;
|
|
44
|
+
/** The target URL during a pending navigation (with base path stripped). Undefined when not navigating. */
|
|
45
|
+
pendingLocation: string | undefined;
|
|
44
46
|
/** Current pathname (with base path stripped). */
|
|
45
47
|
pathname: string;
|
|
46
48
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/react/hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAG3H;;GAEG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAMlC;AAaD;;;;GAIG;AACH,KAAK,UAAU,GAAG,CAAC,CAAC,SAAS,cAAc,EAC1C,EAAE,EAAE,CAAC,EACL,GAAG,IAAI,EAAE,CAAC,MAAM,mBAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,GAElF,EAAE,SAAS,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC,GACrG,CAAC,OAAO,EAAE,eAAe,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC,KAC9D,IAAI,CAAA;AAET;;;GAGG;AACH,wBAAgB,WAAW,IAAI,UAAU,CASxC;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAGxF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzD,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GACxB,CAAC,CA2BH;AAED;;GAEG;AACH,wBAAgB,QAAQ;IAMtB,8BAA8B;;IAE9B,2CAA2C;;IAE3C,2BAA2B;;IAE3B,uCAAuC;;IAEvC,kDAAkD;;EAGnD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,GAAG,OAAO,KAAK,CAAC,GAAG,SAAS,CAG/D;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,WAAW,CAG5C;AAED;;;GAGG;AACH,wBAAgB,aAAa,IAAI,MAAM,IAAI,CAG1C;AAID,MAAM,WAAW,YAAY;IAC5B,iDAAiD;IACjD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,+CAA+C;IAC/C,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,kEAAkE;IAClE,KAAK,EAAE,MAAM,IAAI,CAAA;CACjB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,CAsCtD"}
|
|
1
|
+
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/react/hooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAG3H;;GAEG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAMlC;AAaD;;;;GAIG;AACH,KAAK,UAAU,GAAG,CAAC,CAAC,SAAS,cAAc,EAC1C,EAAE,EAAE,CAAC,EACL,GAAG,IAAI,EAAE,CAAC,MAAM,mBAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,GAElF,EAAE,SAAS,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC,GACrG,CAAC,OAAO,EAAE,eAAe,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC,KAC9D,IAAI,CAAA;AAET;;;GAGG;AACH,wBAAgB,WAAW,IAAI,UAAU,CASxC;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAGxF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzD,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GACxB,CAAC,CA2BH;AAED;;GAEG;AACH,wBAAgB,QAAQ;IAMtB,8BAA8B;;IAE9B,2CAA2C;;IAE3C,2BAA2B;;IAE3B,uCAAuC;;IAEvC,2GAA2G;;IAI3G,kDAAkD;;EAGnD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,GAAG,OAAO,KAAK,CAAC,GAAG,SAAS,CAG/D;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,WAAW,CAG5C;AAED;;;GAGG;AACH,wBAAgB,aAAa,IAAI,MAAM,IAAI,CAG1C;AAID,MAAM,WAAW,YAAY;IAC5B,iDAAiD;IACjD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,+CAA+C;IAC/C,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,kEAAkE;IAClE,KAAK,EAAE,MAAM,IAAI,CAAA;CACjB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,CAsCtD"}
|
package/dist/react/hooks.js
CHANGED
|
@@ -84,9 +84,13 @@ export function useRoute() {
|
|
|
84
84
|
depth,
|
|
85
85
|
/** Whether a navigation is pending. */
|
|
86
86
|
isPending: state.isPending,
|
|
87
|
+
/** The target URL during a pending navigation (with base path stripped). Undefined when not navigating. */
|
|
88
|
+
pendingLocation: state.pendingLocation
|
|
89
|
+
? router.stripBasePath(state.pendingLocation.pathname)
|
|
90
|
+
: undefined,
|
|
87
91
|
/** Current pathname (with base path stripped). */
|
|
88
92
|
pathname: router.stripBasePath(state.location.pathname),
|
|
89
|
-
}), [params, matches, depth, state.isPending, state.location.pathname, router]);
|
|
93
|
+
}), [params, matches, depth, state.isPending, state.pendingLocation, state.location.pathname, router]);
|
|
90
94
|
}
|
|
91
95
|
/**
|
|
92
96
|
* Hook to get the Navigation API state for the current entry.
|
package/dist/react/hooks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/react/hooks.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/react/hooks.ts"],"names":[],"mappings":"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"}
|
package/dist/react/link.d.ts
CHANGED
|
@@ -23,6 +23,13 @@ type LinkPropsBase = Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'href'>
|
|
|
23
23
|
* When `true`, clones the single child element and merges `href`, `onClick`, and `data-active` props into it.
|
|
24
24
|
*/
|
|
25
25
|
asChild?: boolean;
|
|
26
|
+
/**
|
|
27
|
+
* Prefetch strategy for lazy-loaded route code.
|
|
28
|
+
* - `'intent'` — preload on mouseEnter/focus (default)
|
|
29
|
+
* - `'render'` — preload as soon as the Link renders
|
|
30
|
+
* - `'none'` — disable prefetching
|
|
31
|
+
*/
|
|
32
|
+
prefetch?: 'intent' | 'render' | 'none';
|
|
26
33
|
};
|
|
27
34
|
export type LinkProps<P extends RegisteredPage = RegisteredPage> = [keyof EffectivePageParams<P>] extends [never] ? LinkPropsBase & {
|
|
28
35
|
to: P;
|
package/dist/react/link.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../src/react/link.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../src/react/link.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAA;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAmB,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAK9F,KAAK,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,GAAG;IAClF,4DAA4D;IAC5D,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,oDAAoD;IACpD,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,IAAI,CAAC,MAAM,mBAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAC9G,aAAa,GAAG;IAAE,EAAE,EAAE,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,GAEzC,EAAE,SAAS,mBAAmB,CAAC,CAAC,CAAC,GAAG,aAAa,GAAG;IAAE,EAAE,EAAE,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;CAAE,GAC9F,aAAa,GAAG;IAAE,EAAE,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;CAAE,CAAA;AAE5D;;;;;;;GAOG;AACH,wBAAgB,IAAI,CAAC,CAAC,SAAS,cAAc,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,YAAY,CAoGtF"}
|
package/dist/react/link.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import React, { useCallback } from 'react';
|
|
2
|
+
import React, { useCallback, useEffect, useRef } from 'react';
|
|
3
3
|
import { useRouter, useRouterState } from './hooks.js';
|
|
4
4
|
/**
|
|
5
5
|
* Type-safe link component.
|
|
@@ -10,9 +10,10 @@ import { useRouter, useRouterState } from './hooks.js';
|
|
|
10
10
|
* Sets `data-active` attribute when the link target matches the current URL.
|
|
11
11
|
*/
|
|
12
12
|
export function Link(props) {
|
|
13
|
-
const { to, params, replace, state, viewTransition, resetScroll, activeExact = true, asChild, onClick, children, ...rest } = props;
|
|
13
|
+
const { to, params, replace, state, viewTransition, resetScroll, activeExact = true, asChild, prefetch = 'intent', onClick, onMouseEnter, onFocus, children, ...rest } = props;
|
|
14
14
|
const router = useRouter();
|
|
15
15
|
const routerState = useRouterState();
|
|
16
|
+
const preloadedRef = useRef(false);
|
|
16
17
|
const href = router.buildPagePath(to, params);
|
|
17
18
|
const needsProgrammaticNav = state !== undefined || replace || viewTransition || resetScroll === false;
|
|
18
19
|
// Active detection: compare route paths (without basePath)
|
|
@@ -21,6 +22,27 @@ export function Link(props) {
|
|
|
21
22
|
const isExact = currentPath === targetPath;
|
|
22
23
|
const isPrefix = targetPath !== '/' && currentPath.startsWith(targetPath + '/');
|
|
23
24
|
const isActive = isExact || (!activeExact && isPrefix);
|
|
25
|
+
const doPreload = useCallback(() => {
|
|
26
|
+
if (preloadedRef.current)
|
|
27
|
+
return;
|
|
28
|
+
preloadedRef.current = true;
|
|
29
|
+
router.preload(to, params);
|
|
30
|
+
}, [router, to, params]);
|
|
31
|
+
// Prefetch on render
|
|
32
|
+
useEffect(() => {
|
|
33
|
+
if (prefetch === 'render')
|
|
34
|
+
doPreload();
|
|
35
|
+
}, [prefetch, doPreload]);
|
|
36
|
+
const handleMouseEnter = useCallback((e) => {
|
|
37
|
+
onMouseEnter?.(e);
|
|
38
|
+
if (prefetch === 'intent')
|
|
39
|
+
doPreload();
|
|
40
|
+
}, [onMouseEnter, prefetch, doPreload]);
|
|
41
|
+
const handleFocus = useCallback((e) => {
|
|
42
|
+
onFocus?.(e);
|
|
43
|
+
if (prefetch === 'intent')
|
|
44
|
+
doPreload();
|
|
45
|
+
}, [onFocus, prefetch, doPreload]);
|
|
24
46
|
const handleClick = useCallback((e) => {
|
|
25
47
|
onClick?.(e);
|
|
26
48
|
if (e.defaultPrevented)
|
|
@@ -33,15 +55,20 @@ export function Link(props) {
|
|
|
33
55
|
router.navigateToPage(to, params, { replace, state, viewTransition, resetScroll });
|
|
34
56
|
}
|
|
35
57
|
}, [onClick, needsProgrammaticNav, router, to, params, replace, state, viewTransition, resetScroll]);
|
|
58
|
+
const commonProps = {
|
|
59
|
+
href,
|
|
60
|
+
onClick: handleClick,
|
|
61
|
+
onMouseEnter: handleMouseEnter,
|
|
62
|
+
onFocus: handleFocus,
|
|
63
|
+
'data-active': isActive ? '' : undefined,
|
|
64
|
+
};
|
|
36
65
|
if (asChild) {
|
|
37
66
|
const child = React.Children.only(children);
|
|
38
67
|
return React.cloneElement(child, {
|
|
39
|
-
|
|
40
|
-
onClick: handleClick,
|
|
41
|
-
'data-active': isActive ? '' : undefined,
|
|
68
|
+
...commonProps,
|
|
42
69
|
...rest,
|
|
43
70
|
});
|
|
44
71
|
}
|
|
45
|
-
return (_jsx("a", {
|
|
72
|
+
return (_jsx("a", { ...commonProps, ...rest, children: children }));
|
|
46
73
|
}
|
|
47
74
|
//# sourceMappingURL=link.js.map
|
package/dist/react/link.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.js","sourceRoot":"","sources":["../../src/react/link.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"link.js","sourceRoot":"","sources":["../../src/react/link.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,339 @@
|
|
|
1
|
+
import { describe, expect, it, mock } from 'bun:test'
|
|
2
|
+
import { LoaderCache } from '../engine/loader-cache.js'
|
|
3
|
+
import { PageLoaderState } from '../engine/loader-state.js'
|
|
4
|
+
|
|
5
|
+
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
|
6
|
+
|
|
7
|
+
function createState() {
|
|
8
|
+
return new PageLoaderState()
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
function resolveCtx(
|
|
12
|
+
state: PageLoaderState,
|
|
13
|
+
overrides: {
|
|
14
|
+
url?: string
|
|
15
|
+
cacheKey?: string
|
|
16
|
+
load?: () => Promise<unknown>
|
|
17
|
+
loaderCache?: LoaderCache
|
|
18
|
+
onBackgroundSettled?: (outcome: { ok: true; result: unknown } | { ok: false }) => void
|
|
19
|
+
} = {},
|
|
20
|
+
) {
|
|
21
|
+
return state.resolve({
|
|
22
|
+
currentUrlHref: overrides.url ?? 'http://localhost/',
|
|
23
|
+
cacheKey: overrides.cacheKey ?? 'http://localhost/:0',
|
|
24
|
+
load: overrides.load ?? (() => Promise.resolve({ value: 1 })),
|
|
25
|
+
loaderCache: overrides.loaderCache,
|
|
26
|
+
onBackgroundSettled: overrides.onBackgroundSettled ?? (() => {}),
|
|
27
|
+
})
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
// ─── Tests ───────────────────────────────────────────────────────────────────
|
|
31
|
+
|
|
32
|
+
describe('PageLoaderState', () => {
|
|
33
|
+
describe('first load', () => {
|
|
34
|
+
it('returns suspend instruction with promise', () => {
|
|
35
|
+
const state = createState()
|
|
36
|
+
const promise = Promise.resolve({ name: 'Alice' })
|
|
37
|
+
const instruction = resolveCtx(state, { load: () => promise })
|
|
38
|
+
|
|
39
|
+
expect(instruction.action).toBe('suspend')
|
|
40
|
+
if (instruction.action === 'suspend') {
|
|
41
|
+
expect(instruction.promise).toBe(promise)
|
|
42
|
+
}
|
|
43
|
+
})
|
|
44
|
+
|
|
45
|
+
it('subsequent resolve with same cacheKey returns same promise (no re-creation)', () => {
|
|
46
|
+
const state = createState()
|
|
47
|
+
let callCount = 0
|
|
48
|
+
const load = () => {
|
|
49
|
+
callCount++
|
|
50
|
+
return Promise.resolve({ n: callCount })
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
const first = resolveCtx(state, { load })
|
|
54
|
+
const second = resolveCtx(state, { load })
|
|
55
|
+
|
|
56
|
+
expect(callCount).toBe(1)
|
|
57
|
+
expect(first.action).toBe('suspend')
|
|
58
|
+
expect(second.action).toBe('suspend')
|
|
59
|
+
if (first.action === 'suspend' && second.action === 'suspend') {
|
|
60
|
+
expect(first.promise).toBe(second.promise)
|
|
61
|
+
}
|
|
62
|
+
})
|
|
63
|
+
})
|
|
64
|
+
|
|
65
|
+
describe('after commit', () => {
|
|
66
|
+
it('returns render instruction with data after commitResult', () => {
|
|
67
|
+
const state = createState()
|
|
68
|
+
resolveCtx(state, { load: () => Promise.resolve('data') })
|
|
69
|
+
state.commitResult('resolved-data')
|
|
70
|
+
|
|
71
|
+
const instruction = resolveCtx(state)
|
|
72
|
+
expect(instruction).toEqual({ action: 'render', data: 'resolved-data', isLoading: false })
|
|
73
|
+
})
|
|
74
|
+
})
|
|
75
|
+
|
|
76
|
+
describe('invalidation (cache key change)', () => {
|
|
77
|
+
it('with stale data — returns stale data with isLoading and starts background fetch', () => {
|
|
78
|
+
const state = createState()
|
|
79
|
+
resolveCtx(state, { cacheKey: 'k:0' })
|
|
80
|
+
state.commitResult('stale-data')
|
|
81
|
+
|
|
82
|
+
let bgLoad: (() => Promise<unknown>) | undefined
|
|
83
|
+
const instruction = resolveCtx(state, {
|
|
84
|
+
cacheKey: 'k:1',
|
|
85
|
+
load: () => {
|
|
86
|
+
const p = Promise.resolve('fresh-data')
|
|
87
|
+
bgLoad = () => p
|
|
88
|
+
return p
|
|
89
|
+
},
|
|
90
|
+
})
|
|
91
|
+
|
|
92
|
+
expect(instruction).toEqual({ action: 'render', data: 'stale-data', isLoading: true })
|
|
93
|
+
expect(bgLoad).toBeDefined()
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
it('without stale data — returns suspend instruction', () => {
|
|
97
|
+
const state = createState()
|
|
98
|
+
const promise = Promise.resolve('data')
|
|
99
|
+
const instruction = resolveCtx(state, { cacheKey: 'k:0', load: () => promise })
|
|
100
|
+
|
|
101
|
+
// No commitResult called — no stale data
|
|
102
|
+
const second = resolveCtx(state, { cacheKey: 'k:1', load: () => Promise.resolve('new') })
|
|
103
|
+
expect(second.action).toBe('suspend')
|
|
104
|
+
})
|
|
105
|
+
})
|
|
106
|
+
|
|
107
|
+
describe('SWR background callbacks', () => {
|
|
108
|
+
it('calls onBackgroundSettled with ok:true on success', async () => {
|
|
109
|
+
const state = createState()
|
|
110
|
+
resolveCtx(state, { cacheKey: 'k:0' })
|
|
111
|
+
state.commitResult('stale')
|
|
112
|
+
|
|
113
|
+
const settled = mock(() => {})
|
|
114
|
+
resolveCtx(state, {
|
|
115
|
+
cacheKey: 'k:1',
|
|
116
|
+
load: () => Promise.resolve('fresh'),
|
|
117
|
+
onBackgroundSettled: settled,
|
|
118
|
+
})
|
|
119
|
+
|
|
120
|
+
await Promise.resolve() // flush microtask
|
|
121
|
+
expect(settled).toHaveBeenCalledWith({ ok: true, result: 'fresh' })
|
|
122
|
+
})
|
|
123
|
+
|
|
124
|
+
it('calls onBackgroundSettled with ok:false on error', async () => {
|
|
125
|
+
const state = createState()
|
|
126
|
+
resolveCtx(state, { cacheKey: 'k:0' })
|
|
127
|
+
state.commitResult('stale')
|
|
128
|
+
|
|
129
|
+
const settled = mock(() => {})
|
|
130
|
+
resolveCtx(state, {
|
|
131
|
+
cacheKey: 'k:1',
|
|
132
|
+
load: () => Promise.reject(new Error('fail')),
|
|
133
|
+
onBackgroundSettled: settled,
|
|
134
|
+
})
|
|
135
|
+
|
|
136
|
+
await Promise.resolve() // flush microtask
|
|
137
|
+
expect(settled).toHaveBeenCalledWith({ ok: false })
|
|
138
|
+
})
|
|
139
|
+
|
|
140
|
+
it('does not call onBackgroundSettled if cacheKey changed (stale callback)', async () => {
|
|
141
|
+
const state = createState()
|
|
142
|
+
resolveCtx(state, { cacheKey: 'k:0' })
|
|
143
|
+
state.commitResult('stale')
|
|
144
|
+
|
|
145
|
+
const settled1 = mock(() => {})
|
|
146
|
+
resolveCtx(state, {
|
|
147
|
+
cacheKey: 'k:1',
|
|
148
|
+
load: () => new Promise(r => setTimeout(() => r('slow'), 50)),
|
|
149
|
+
onBackgroundSettled: settled1,
|
|
150
|
+
})
|
|
151
|
+
|
|
152
|
+
// Immediately invalidate again — supersedes the first background fetch
|
|
153
|
+
state.commitBackgroundResult('stale') // commit so hasResolved stays true
|
|
154
|
+
const settled2 = mock(() => {})
|
|
155
|
+
resolveCtx(state, {
|
|
156
|
+
cacheKey: 'k:2',
|
|
157
|
+
load: () => Promise.resolve('fast'),
|
|
158
|
+
onBackgroundSettled: settled2,
|
|
159
|
+
})
|
|
160
|
+
|
|
161
|
+
await new Promise(r => setTimeout(r, 100))
|
|
162
|
+
expect(settled1).not.toHaveBeenCalled() // superseded
|
|
163
|
+
expect(settled2).toHaveBeenCalledWith({ ok: true, result: 'fast' })
|
|
164
|
+
})
|
|
165
|
+
|
|
166
|
+
it('after commitBackgroundResult, returns fresh data without isLoading', () => {
|
|
167
|
+
const state = createState()
|
|
168
|
+
resolveCtx(state, { cacheKey: 'k:0' })
|
|
169
|
+
state.commitResult('stale')
|
|
170
|
+
|
|
171
|
+
resolveCtx(state, { cacheKey: 'k:1' })
|
|
172
|
+
state.commitBackgroundResult('fresh')
|
|
173
|
+
|
|
174
|
+
const instruction = resolveCtx(state, { cacheKey: 'k:1' })
|
|
175
|
+
expect(instruction).toEqual({ action: 'render', data: 'fresh', isLoading: false })
|
|
176
|
+
})
|
|
177
|
+
|
|
178
|
+
it('after commitBackgroundError, returns suspend with rejected promise', async () => {
|
|
179
|
+
const state = createState()
|
|
180
|
+
resolveCtx(state, { cacheKey: 'k:0' })
|
|
181
|
+
state.commitResult('stale')
|
|
182
|
+
|
|
183
|
+
const error = new Error('load failed')
|
|
184
|
+
const rejectedPromise = Promise.reject(error)
|
|
185
|
+
rejectedPromise.catch(() => {}) // prevent unhandled rejection
|
|
186
|
+
|
|
187
|
+
resolveCtx(state, { cacheKey: 'k:1', load: () => rejectedPromise })
|
|
188
|
+
state.commitBackgroundError()
|
|
189
|
+
|
|
190
|
+
const instruction = resolveCtx(state, { cacheKey: 'k:1' })
|
|
191
|
+
expect(instruction.action).toBe('suspend')
|
|
192
|
+
})
|
|
193
|
+
})
|
|
194
|
+
|
|
195
|
+
describe('URL change with stale cache', () => {
|
|
196
|
+
it('saves data to stale cache on URL change', () => {
|
|
197
|
+
const cache = new LoaderCache(10)
|
|
198
|
+
const state = createState()
|
|
199
|
+
|
|
200
|
+
resolveCtx(state, { url: 'http://localhost/a', cacheKey: 'a:0', loaderCache: cache })
|
|
201
|
+
state.commitResult('data-a')
|
|
202
|
+
|
|
203
|
+
// Navigate to B — should save A's data to cache
|
|
204
|
+
resolveCtx(state, { url: 'http://localhost/b', cacheKey: 'b:0', loaderCache: cache })
|
|
205
|
+
|
|
206
|
+
expect(cache.size).toBe(1)
|
|
207
|
+
})
|
|
208
|
+
|
|
209
|
+
it('restores from stale cache on URL change', () => {
|
|
210
|
+
const cache = new LoaderCache(10)
|
|
211
|
+
const state = createState()
|
|
212
|
+
|
|
213
|
+
// Load A
|
|
214
|
+
resolveCtx(state, { url: 'http://localhost/a', cacheKey: 'a:0', loaderCache: cache })
|
|
215
|
+
state.commitResult('data-a')
|
|
216
|
+
|
|
217
|
+
// Navigate to B (saves A to cache)
|
|
218
|
+
resolveCtx(state, { url: 'http://localhost/b', cacheKey: 'b:0', loaderCache: cache })
|
|
219
|
+
state.commitResult('data-b')
|
|
220
|
+
|
|
221
|
+
// Navigate back to A — should restore from cache
|
|
222
|
+
const instruction = resolveCtx(state, {
|
|
223
|
+
url: 'http://localhost/a',
|
|
224
|
+
cacheKey: 'a:0',
|
|
225
|
+
loaderCache: cache,
|
|
226
|
+
})
|
|
227
|
+
|
|
228
|
+
// Has stale data from cache, new cacheKey triggers SWR
|
|
229
|
+
expect(instruction.action).toBe('render')
|
|
230
|
+
if (instruction.action === 'render') {
|
|
231
|
+
expect(instruction.data).toBe('data-a')
|
|
232
|
+
expect(instruction.isLoading).toBe(true) // SWR — stale data + background reload
|
|
233
|
+
}
|
|
234
|
+
})
|
|
235
|
+
|
|
236
|
+
it('returns suspend when no stale cache available on URL change', () => {
|
|
237
|
+
const cache = new LoaderCache(10)
|
|
238
|
+
const state = createState()
|
|
239
|
+
|
|
240
|
+
// Load A without committing (no stale data to cache)
|
|
241
|
+
resolveCtx(state, { url: 'http://localhost/a', cacheKey: 'a:0', loaderCache: cache })
|
|
242
|
+
|
|
243
|
+
// Navigate to B — no cache for B
|
|
244
|
+
const instruction = resolveCtx(state, {
|
|
245
|
+
url: 'http://localhost/b',
|
|
246
|
+
cacheKey: 'b:0',
|
|
247
|
+
loaderCache: cache,
|
|
248
|
+
})
|
|
249
|
+
|
|
250
|
+
expect(instruction.action).toBe('suspend')
|
|
251
|
+
})
|
|
252
|
+
})
|
|
253
|
+
|
|
254
|
+
describe('remount with stale cache', () => {
|
|
255
|
+
it('restores from stale cache on remount', () => {
|
|
256
|
+
const cache = new LoaderCache(10)
|
|
257
|
+
const state1 = createState()
|
|
258
|
+
|
|
259
|
+
// First mount — load and dispose
|
|
260
|
+
resolveCtx(state1, { url: 'http://localhost/a', cacheKey: 'a:0', loaderCache: cache })
|
|
261
|
+
state1.commitResult('cached-data')
|
|
262
|
+
state1.dispose(cache) // saves to cache
|
|
263
|
+
|
|
264
|
+
// New state (simulating remount)
|
|
265
|
+
// Note: new state has different ID, so cache key won't match.
|
|
266
|
+
// In practice, same page instance reuses the same PageLoaderState.
|
|
267
|
+
// But we can simulate by using the same state after dispose.
|
|
268
|
+
const state2 = state1 // reuse same instance for same cache namespace
|
|
269
|
+
const instruction = resolveCtx(state2, {
|
|
270
|
+
url: 'http://localhost/a',
|
|
271
|
+
cacheKey: 'a:0',
|
|
272
|
+
loaderCache: cache,
|
|
273
|
+
})
|
|
274
|
+
|
|
275
|
+
// Restored from cache → has stale data → SWR
|
|
276
|
+
expect(instruction.action).toBe('render')
|
|
277
|
+
if (instruction.action === 'render') {
|
|
278
|
+
expect(instruction.data).toBe('cached-data')
|
|
279
|
+
expect(instruction.isLoading).toBe(true)
|
|
280
|
+
}
|
|
281
|
+
})
|
|
282
|
+
})
|
|
283
|
+
|
|
284
|
+
describe('dispose', () => {
|
|
285
|
+
it('saves resolved data to stale cache', () => {
|
|
286
|
+
const cache = new LoaderCache(10)
|
|
287
|
+
const state = createState()
|
|
288
|
+
|
|
289
|
+
resolveCtx(state, { url: 'http://localhost/a', cacheKey: 'a:0', loaderCache: cache })
|
|
290
|
+
state.commitResult('save-me')
|
|
291
|
+
state.dispose(cache)
|
|
292
|
+
|
|
293
|
+
expect(cache.size).toBe(1)
|
|
294
|
+
})
|
|
295
|
+
|
|
296
|
+
it('resets all internal state', () => {
|
|
297
|
+
const state = createState()
|
|
298
|
+
resolveCtx(state, { cacheKey: 'k:0' })
|
|
299
|
+
state.commitResult('data')
|
|
300
|
+
state.dispose(undefined)
|
|
301
|
+
|
|
302
|
+
// After dispose, first resolve should be a fresh suspend
|
|
303
|
+
const instruction = resolveCtx(state, { cacheKey: 'k:0' })
|
|
304
|
+
expect(instruction.action).toBe('suspend')
|
|
305
|
+
})
|
|
306
|
+
|
|
307
|
+
it('does not save to cache if no data was resolved', () => {
|
|
308
|
+
const cache = new LoaderCache(10)
|
|
309
|
+
const state = createState()
|
|
310
|
+
|
|
311
|
+
resolveCtx(state, { url: 'http://localhost/a', cacheKey: 'a:0', loaderCache: cache })
|
|
312
|
+
// No commitResult
|
|
313
|
+
state.dispose(cache)
|
|
314
|
+
|
|
315
|
+
expect(cache.size).toBe(0)
|
|
316
|
+
})
|
|
317
|
+
|
|
318
|
+
it('does not save to cache if loaderCache is undefined', () => {
|
|
319
|
+
const state = createState()
|
|
320
|
+
resolveCtx(state, { cacheKey: 'k:0' })
|
|
321
|
+
state.commitResult('data')
|
|
322
|
+
// Should not throw
|
|
323
|
+
state.dispose(undefined)
|
|
324
|
+
})
|
|
325
|
+
})
|
|
326
|
+
|
|
327
|
+
describe('no loader cache', () => {
|
|
328
|
+
it('works without loaderCache — no stale caching', () => {
|
|
329
|
+
const state = createState()
|
|
330
|
+
|
|
331
|
+
resolveCtx(state, { url: 'http://localhost/a', cacheKey: 'a:0' })
|
|
332
|
+
state.commitResult('data-a')
|
|
333
|
+
|
|
334
|
+
// URL change without cache — no restore
|
|
335
|
+
const instruction = resolveCtx(state, { url: 'http://localhost/b', cacheKey: 'b:0' })
|
|
336
|
+
expect(instruction.action).toBe('suspend')
|
|
337
|
+
})
|
|
338
|
+
})
|
|
339
|
+
})
|