@farbenmeer/router 0.4.0 → 0.6.0

package/dist/context.d.ts

@@ -6,9 +6,10 @@ export declare const RouterContext: import("react").Context<{
     push: (href: string) => void;
     replace: (href: string) => void;
 }>;
-export declare const RouteContext: import("react").Context<{
+export interface RouteContextValue {
     path: string;
     params: Record<string, string | string[]>;
     matchedPathname: string;
-}>;
+}
+export declare const RouteContext: import("react").Context<RouteContextValue>;
 //# sourceMappingURL=context.d.ts.map

package/dist/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,eAAO,MAAM,eAAe,iCAA6B,CAAC;AAE1D,eAAO,MAAM,mBAAmB,gDAE/B,CAAC;AAEF,eAAO,MAAM,WAAW,iCAA4B,CAAC;AAErD,eAAO,MAAM,aAAa;UAClB,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI;aACnB,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI;EAI/B,CAAC;AAEH,eAAO,MAAM,YAAY;UACjB,MAAM;YACJ,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;qBACxB,MAAM;EAKvB,CAAC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,eAAO,MAAM,eAAe,iCAA6B,CAAC;AAE1D,eAAO,MAAM,mBAAmB,gDAE/B,CAAC;AAEF,eAAO,MAAM,WAAW,iCAA4B,CAAC;AAErD,eAAO,MAAM,aAAa;UAClB,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI;aACnB,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI;EAI/B,CAAC;AAEH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAC1C,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,YAAY,4CAIvB,CAAC"}

package/dist/link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../src/link.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,SAAS,EAAkB,MAAM,OAAO,CAAC;AAQrE,UAAU,KAAM,SAAQ,SAAS,CAAC,iBAAiB,CAAC;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,EAAE,KAAK,2CA4C5E"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../src/link.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,SAAS,EAAkB,MAAM,OAAO,CAAC;AASrE,UAAU,KAAM,SAAQ,SAAS,CAAC,iBAAiB,CAAC;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,EAAE,KAAK,2CA6B5E"}

package/dist/link.js

@@ -1,28 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { use, useMemo } from "react";
 import { PathnameContext, RouteContext, RouterContext, SearchParamsContext, } from "./context";
+import { resolve } from "./path";
 export function Link({ href, replace, children, onClick, ...rawProps }) {
     const { matchedPathname: parentPathname } = use(RouteContext);
     const router = use(RouterContext);
     const pathname = use(PathnameContext);
     const searchParams = use(SearchParamsContext);
-    const target = useMemo(() => {
-        if (href.startsWith("/")) {
-            return href;
-        }
-        if (href.startsWith("?")) {
-            return pathname + href;
-        }
-        if (href.startsWith("#")) {
-            return (pathname +
-                (searchParams.size > 0 ? "?" + searchParams.toString() : "") +
-                href);
-        }
-        if (!href) {
-            return parentPathname;
-        }
-        return parentPathname + "/" + href;
-    }, [href, parentPathname, pathname]);
+    const target = useMemo(() => resolve(href, { pathname, parentPathname, searchParams }), [href, parentPathname, pathname]);
     return (_jsx("a", { href: target, onClick: (event) => {
             onClick?.(event);
             if (event.defaultPrevented)

package/dist/mock-history.d.ts

@@ -0,0 +1,8 @@
+export declare function mockHistory(pathname?: string): {
+    location: URL;
+    history: {
+        pushState: import("vitest").Mock<(_state: any, _unused: string, url: string) => void>;
+        replaceState: import("vitest").Mock<(_state: any, _unused: string, url: string) => void>;
+    };
+};
+//# sourceMappingURL=mock-history.d.ts.map

package/dist/mock-history.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-history.d.ts","sourceRoot":"","sources":["../src/mock-history.ts"],"names":[],"mappings":"AAEA,wBAAgB,WAAW,CAAC,QAAQ,SAAM;;;kDAMV,GAAG,WAAW,MAAM,OAAO,MAAM;qDAG9B,GAAG,WAAW,MAAM,OAAO,MAAM;;EAKnE"}

package/dist/mock-history.js

@@ -0,0 +1,15 @@
+import { vi } from "vitest";
+export function mockHistory(pathname = "/") {
+    const location = new URL(pathname, "http://localhost:3000");
+    return {
+        location,
+        history: {
+            pushState: vi.fn((_state, _unused, url) => {
+                location.href = new URL(url, location.href).href;
+            }),
+            replaceState: vi.fn((_state, _unused, url) => {
+                location.href = new URL(url, location.href).href;
+            }),
+        },
+    };
+}

package/dist/path.d.ts

@@ -0,0 +1,13 @@
+import { ImmutableSearchParams } from "./immutable-search-params";
+interface Options {
+    pathname: string;
+    parentPathname: string;
+    searchParams: ImmutableSearchParams;
+}
+export declare function resolve(path: string, { pathname, parentPathname, searchParams }: Options): string;
+export declare function removeTrailingSlash(path: string): string;
+export declare function compilePathRegex(path: string): RegExp;
+export declare function compileExactPathRegex(path: string): RegExp;
+export declare function buildFullPath(parentPath: string, path?: string): string;
+export {};
+//# sourceMappingURL=path.d.ts.map

package/dist/path.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../src/path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,UAAU,OAAO;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,OAAO,UAepD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGxD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAiBrD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU1D;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,UAa9D"}

package/dist/path.js

@@ -0,0 +1,60 @@
+import { ImmutableSearchParams } from "./immutable-search-params";
+export function resolve(path, { pathname, parentPathname, searchParams }) {
+    if (path.startsWith("/")) {
+        return path;
+    }
+    if (path.startsWith("?")) {
+        return pathname + path;
+    }
+    if (path.startsWith("#")) {
+        return pathname + searchParams.search + path;
+    }
+    if (!path) {
+        return parentPathname;
+    }
+    return parentPathname === "/" ? `/${path}` : `${parentPathname}/${path}`;
+}
+export function removeTrailingSlash(path) {
+    if (path === "/")
+        return path;
+    return path.endsWith("/") ? path.slice(0, -1) : path;
+}
+export function compilePathRegex(path) {
+    if (path === "/") {
+        return /^\//;
+    }
+    // Handle wildcards: *name captures as named group, * catches all without capturing
+    const pattern = path
+        .replaceAll(/\*(\w+)/g, "(?<$1>.+)") // *name -> named capture group
+        .replaceAll(/\*/g, ".+") // * -> match everything including /
+        .replaceAll(/:(\w+)/g, "(?<$1>[\\w-]+)"); // :param -> named capture group
+    // If pattern contains a wildcard, it already matches everything - use exact match
+    if (path.includes("*")) {
+        return new RegExp(`^(${pattern})$`);
+    }
+    // For non-wildcard paths, allow optional trailing paths
+    return new RegExp(`^(${pattern})(/.*)?$`);
+}
+export function compileExactPathRegex(path) {
+    if (path === "/") {
+        return /^\/$/;
+    }
+    // Handle wildcards: *name captures as named group, * catches all without capturing
+    const pattern = path
+        .replaceAll(/\*(\w+)/g, "(?<$1>.+)") // *name -> named capture group
+        .replaceAll(/\*/g, ".+") // * -> match everything including /
+        .replaceAll(/:(\w+)/g, "(?<$1>[\\w-]+)"); // :param -> named capture group
+    return new RegExp(`^(${pattern})$`);
+}
+export function buildFullPath(parentPath, path) {
+    if (path?.startsWith("/")) {
+        return path;
+    }
+    if (path) {
+        if (parentPath === "/") {
+            return "/" + path;
+        }
+        return parentPath + "/" + path;
+    }
+    return parentPath;
+}

package/dist/route.d.ts

@@ -1,8 +1,7 @@
-interface Props {
+export interface RouteProps {
     path?: string;
     exact?: boolean;
     children: React.ReactNode;
 }
-export declare function Route({ path, exact, children }: Props): import("react/jsx-runtime").JSX.Element | null;
-export {};
+export declare function Route({ path, exact, children }: RouteProps): import("react/jsx-runtime").JSX.Element | null;
 //# sourceMappingURL=route.d.ts.map

package/dist/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../src/route.tsx"],"names":[],"mappings":"AAGA,UAAU,KAAK;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,KAAK,kDA0BrD"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../src/route.tsx"],"names":[],"mappings":"AAIA,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,UAAU,kDA0B1D"}

package/dist/route.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { use, useMemo } from "react";
 import { PathnameContext, RouteContext } from "./context";
+import { buildFullPath, compileExactPathRegex, compilePathRegex } from "./path";
 export function Route({ path, exact, children }) {
     const parentRoute = use(RouteContext);
     const pathname = use(PathnameContext);
@@ -16,39 +17,3 @@ export function Route({ path, exact, children }) {
         return null;
     return _jsx(RouteContext, { value: routeContextValue, children: children });
 }
-function compilePathRegex(path) {
-    if (path === "/") {
-        return /^\//;
-    }
-    // Handle wildcards: *name captures as named group, * catches all without capturing
-    const pattern = path
-        .replaceAll(/\*(\w+)/g, "(?<$1>.+)") // *name -> named capture group
-        .replaceAll(/\*/g, ".+") // * -> match everything including /
-        .replaceAll(/:(\w+)/g, "(?<$1>[\\w-]+)"); // :param -> named capture group
-    // If pattern contains a wildcard, it already matches everything - use exact match
-    if (path.includes("*")) {
-        return new RegExp(`^(${pattern})$`);
-    }
-    // For non-wildcard paths, allow optional trailing paths
-    return new RegExp(`^(${pattern})(/.*)?$`);
-}
-function compileExactPathRegex(path) {
-    if (path === "/") {
-        return /^\/$/;
-    }
-    // Handle wildcards: *name captures as named group, * catches all without capturing
-    const pattern = path
-        .replaceAll(/\*(\w+)/g, "(?<$1>.+)") // *name -> named capture group
-        .replaceAll(/\*/g, ".+") // * -> match everything including /
-        .replaceAll(/:(\w+)/g, "(?<$1>[\\w-]+)"); // :param -> named capture group
-    return new RegExp(`^(${pattern})$`);
-}
-function buildFullPath(parentPath, path) {
-    if (path?.startsWith("/")) {
-        return path;
-    }
-    if (path) {
-        return parentPath + "/" + path;
-    }
-    return parentPath;
-}

package/dist/router.d.ts

@@ -11,6 +11,6 @@ interface Props {
         replaceState: (state: any, title: string, url: string) => void;
     };
 }
-export declare function Router(props: Props): import("react/jsx-runtime").JSX.Element;
+export declare function Router({ history, location, children, }: Props): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=router.d.ts.map

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAS3E,UAAU,KAAK;IACb,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,OAAO,CAAC,EAAE;QACR,SAAS,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAC5D,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;KAChE,CAAC;CACH;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,KAAK,2CAwDlC"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAU3E,UAAU,KAAK;IACb,QAAQ,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,OAAO,CAAC,EAAE;QACR,SAAS,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAC5D,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;KAChE,CAAC;CACH;AAED,wBAAgB,MAAM,CAAC,EACrB,OAAwB,EACxB,QAA0B,EAC1B,QAAQ,GACT,EAAE,KAAK,2CAwCP"}

package/dist/router.js

@@ -2,39 +2,28 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { startTransition, useMemo, useState } from "react";
 import { HashContext, PathnameContext, RouterContext, SearchParamsContext, } from "./context";
 import { ImmutableSearchParams } from "./immutable-search-params";
-export function Router(props) {
-    const [pathname, setPathname] = useState(removeTrailingSlash(props.location?.pathname ?? window.location.pathname));
-    const [search, setSearch] = useState(props.location?.search ?? window.location.search);
-    const [hash, setHash] = useState(props.location?.hash ?? window.location.hash);
-    const searchParams = useMemo(() => new ImmutableSearchParams(props.location?.search ?? search), [props.location?.search, search]);
+import { removeTrailingSlash } from "./path";
+export function Router({ history = window.history, location = window.location, children, }) {
+    const [pathname, setPathname] = useState(removeTrailingSlash(location.pathname));
+    const [searchParams, setSearchParams] = useState(new ImmutableSearchParams(location.search));
+    const [hash, setHash] = useState(location.hash);
     const routerContextValue = useMemo(() => ({
         push: (url) => {
-            (props.history ?? window.history).pushState(null, "", url);
-            if (!props.location) {
-                startTransition(() => {
-                    setPathname(removeTrailingSlash(window.location.pathname));
-                    setSearch(window.location.search);
-                    setHash(window.location.hash);
-                });
-            }
+            history.pushState(null, "", url);
+            startTransition(() => {
+                setPathname(removeTrailingSlash(location.pathname));
+                setSearchParams(new ImmutableSearchParams(location.search));
+                setHash(location.hash);
+            });
         },
         replace: (url) => {
-            (props.history ?? window.history).replaceState(null, "", url);
-            if (!props.location) {
-                startTransition(() => {
-                    setPathname(removeTrailingSlash(window.location.pathname));
-                    setSearch(window.location.search);
-                    setHash(window.location.hash);
-                });
-            }
+            history.replaceState(null, "", url);
+            startTransition(() => {
+                setPathname(removeTrailingSlash(location.pathname));
+                setSearchParams(new ImmutableSearchParams(location.search));
+                setHash(location.hash);
+            });
         },
-    }), []);
-    return (_jsx(RouterContext, { value: routerContextValue, children: _jsx(PathnameContext, { value: props.location?.pathname
-                ? removeTrailingSlash(props.location.pathname)
-                : pathname, children: _jsx(SearchParamsContext, { value: searchParams, children: _jsx(HashContext, { value: hash, children: props.children }) }) }) }));
-}
-function removeTrailingSlash(path) {
-    if (path === "/")
-        return path;
-    return path.endsWith("/") ? path.slice(0, -1) : path;
+    }), [location, history]);
+    return (_jsx(RouterContext, { value: routerContextValue, children: _jsx(PathnameContext, { value: pathname, children: _jsx(SearchParamsContext, { value: searchParams, children: _jsx(HashContext, { value: hash, children: children }) }) }) }));
 }

package/dist/switch.d.ts

@@ -0,0 +1,8 @@
+import { type ReactElement } from "react";
+import type { Route, RouteProps } from "./route";
+interface Props {
+    children: ReactElement<RouteProps, typeof Route> | ReactElement<RouteProps, typeof Route>[];
+}
+export declare function Switch({ children }: Props): import("react/jsx-runtime").JSX.Element | null;
+export {};
+//# sourceMappingURL=switch.d.ts.map

package/dist/switch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"switch.d.ts","sourceRoot":"","sources":["../src/switch.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,YAAY,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAQjD,UAAU,KAAK;IACb,QAAQ,EACJ,YAAY,CAAC,UAAU,EAAE,OAAO,KAAK,CAAC,GACtC,YAAY,CAAC,UAAU,EAAE,OAAO,KAAK,CAAC,EAAE,CAAC;CAC9C;AAED,wBAAgB,MAAM,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,kDAmDzC"}

package/dist/switch.js

@@ -0,0 +1,43 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Children, use, useMemo } from "react";
+import { PathnameContext, RouteContext, } from "./context";
+import { buildFullPath, compileExactPathRegex, compilePathRegex } from "./path";
+export function Switch({ children }) {
+    const parentRoute = use(RouteContext);
+    const pathname = use(PathnameContext);
+    const props = Children.map(children, (route) => route.props);
+    const routeMeta = useMemo(() => props.map((route) => {
+        const path = route.path ?? "";
+        const fullPath = buildFullPath(parentRoute.path, path);
+        return {
+            path,
+            fullPath,
+            pathRegex: route.exact
+                ? compileExactPathRegex(fullPath)
+                : compilePathRegex(fullPath),
+        };
+    }), [
+        parentRoute.path,
+        props.map((route) => (route.exact ? "e" : "l" + route.path)).join(" "),
+    ]);
+    const match = useMemo(() => {
+        for (const meta of routeMeta) {
+            const match = pathname.match(meta.pathRegex);
+            if (match)
+                return [
+                    meta.path,
+                    {
+                        path: meta.fullPath,
+                        params: match?.groups ?? {},
+                        matchedPathname: match?.[1] ?? "",
+                    },
+                ];
+        }
+        return null;
+    }, [routeMeta]);
+    if (!match) {
+        return null;
+    }
+    const [path, context] = match;
+    return (_jsx(RouteContext, { value: context, children: props.find((route) => route.path === path)?.children }));
+}

package/dist/use-params.d.ts

@@ -1,2 +1,2 @@
-export declare function useParams<T extends Record<string, string[]> = Record<string, string[]>>(): T;
+export declare function useParams<T extends Record<string, string | string[]> = Record<string, string | string[]>>(): T;
 //# sourceMappingURL=use-params.d.ts.map

package/dist/use-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-params.d.ts","sourceRoot":"","sources":["../src/use-params.ts"],"names":[],"mappings":"AAGA,wBAAgB,SAAS,CACvB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAI5C,CAAC,CACnB"}
+{"version":3,"file":"use-params.d.ts","sourceRoot":"","sources":["../src/use-params.ts"],"names":[],"mappings":"AAGA,wBAAgB,SAAS,CACvB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,MAAM,CAClD,MAAM,EACN,MAAM,GAAG,MAAM,EAAE,CAClB,KAIgB,CAAC,CACnB"}

package/dist/use-router.d.ts

@@ -1,5 +1,4 @@
-export declare function useRouter(): {
-    push: (href: string) => void;
-    replace: (href: string) => void;
-};
+import { type ContextType } from "react";
+import { RouterContext } from "./context";
+export declare function useRouter(): ContextType<typeof RouterContext>;
 //# sourceMappingURL=use-router.d.ts.map

package/dist/use-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-router.d.ts","sourceRoot":"","sources":["../src/use-router.ts"],"names":[],"mappings":"AAGA,wBAAgB,SAAS;;;EAExB"}
+{"version":3,"file":"use-router.d.ts","sourceRoot":"","sources":["../src/use-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAgB,MAAM,OAAO,CAAC;AACvD,OAAO,EAGL,aAAa,EAEd,MAAM,WAAW,CAAC;AAGnB,wBAAgB,SAAS,IAAI,WAAW,CAAC,OAAO,aAAa,CAAC,CA6B7D"}

package/dist/use-router.js

@@ -1,5 +1,25 @@
-import { use } from "react";
-import { RouterContext } from "./context";
+import { use, useMemo } from "react";
+import { PathnameContext, RouteContext, RouterContext, SearchParamsContext, } from "./context";
+import { resolve } from "./path";
 export function useRouter() {
-    return use(RouterContext);
+    const { push, replace } = use(RouterContext);
+    const { matchedPathname: parentPathname } = use(RouteContext);
+    const pathname = use(PathnameContext);
+    const searchParams = use(SearchParamsContext);
+    return useMemo(() => ({
+        push(href) {
+            push(resolve(href, {
+                pathname,
+                searchParams,
+                parentPathname,
+            }));
+        },
+        replace(href) {
+            replace(resolve(href, {
+                pathname,
+                searchParams,
+                parentPathname,
+            }));
+        },
+    }), [pathname, searchParams, parentPathname]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farbenmeer/router",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "author": {
     "name": "Michel Smola",
     "email": "michel.smola@farbenmeer.de"