Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

expose unstable enhancers from router #1307

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

expose unstable enhancers from router #1307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions packages/waku/src/router/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,12 @@ const InnerRouter = ({
);
};

type Elements = Record<string, unknown>;
type EnhanceFetch = (fetchFn: typeof fetch) => typeof fetch;
type EnhanceCreateData = (
createData: (responsePromise: Promise<Response>) => Promise<Elements>,
) => (responsePromise: Promise<Response>) => Promise<Elements>;

// Note: The router data must be a stable mutable object (array).
type RouterData = [
locationListeners?: Set<(path: string, query: string) => void>,
Expand All @@ -576,12 +582,19 @@ const DEFAULT_ROUTER_DATA: RouterData = [];
export function Router({
routerData = DEFAULT_ROUTER_DATA,
initialRoute = parseRouteFromLocation(),
unstable_enhanceFetch,
unstable_enhanceCreateData,
}: {
routerData?: RouterData;
initialRoute?: RouteProps;
unstable_enhanceFetch?: EnhanceFetch;
unstable_enhanceCreateData?: EnhanceCreateData;
}) {
const initialRscPath = encodeRoutePath(initialRoute.path);
const locationListeners = (routerData[0] ||= new Set());
const staticPathSet = (routerData[1] ||= new Set());
const cachedIdSet = (routerData[2] ||= new Set());
const unstable_enhanceFetch =
const enhanceFetch =
(fetchFn: typeof fetch) =>
(input: RequestInfo | URL, init: RequestInit = {}) => {
const skipStr = JSON.stringify(Array.from(cachedIdSet));
Expand All @@ -593,7 +606,7 @@ export function Router({
}
return fetchFn(input, init);
};
const unstable_enhanceCreateData =
const enhanceCreateData =
(
createData: (
responsePromise: Promise<Response>,
Expand Down Expand Up @@ -641,8 +654,12 @@ export function Router({
{
initialRscPath,
initialRscParams,
unstable_enhanceFetch,
unstable_enhanceCreateData,
unstable_enhanceFetch: unstable_enhanceFetch
? (fn) => unstable_enhanceFetch(enhanceFetch(fn))
: enhanceFetch,
unstable_enhanceCreateData: unstable_enhanceCreateData
? (fn) => unstable_enhanceCreateData(enhanceCreateData(fn))
: enhanceCreateData,
},
createElement(InnerRouter, {
routerData: routerData as Required<RouterData>,
Expand Down
Loading