@farbenmeer/router 0.3.0 → 0.5.0

package/dist/immutable-search-params.d.ts

@@ -2,5 +2,6 @@ export declare class ImmutableSearchParams extends URLSearchParams {
     set(key: string, value: string): ImmutableSearchParams;
     append(name: string, value: string): ImmutableSearchParams;
     delete(key: string): ImmutableSearchParams;
+    get search(): string;
 }
 //# sourceMappingURL=immutable-search-params.d.ts.map

package/dist/immutable-search-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"immutable-search-params.d.ts","sourceRoot":"","sources":["../src/immutable-search-params.ts"],"names":[],"mappings":"AAAA,qBAAa,qBAAsB,SAAQ,eAAe;IAC/C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAM9B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAMlC,MAAM,CAAC,GAAG,EAAE,MAAM;CAK5B"}
+{"version":3,"file":"immutable-search-params.d.ts","sourceRoot":"","sources":["../src/immutable-search-params.ts"],"names":[],"mappings":"AAAA,qBAAa,qBAAsB,SAAQ,eAAe;IAC/C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAM9B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAMlC,MAAM,CAAC,GAAG,EAAE,MAAM;IAM3B,IAAI,MAAM,IAAI,MAAM,CAEnB;CACF"}

package/dist/immutable-search-params.js

@@ -14,4 +14,7 @@ export class ImmutableSearchParams extends URLSearchParams {
         newSearchParams.delete(key);
         return new ImmutableSearchParams(newSearchParams);
     }
+    get search() {
+        return this.size === 0 ? "" : "?" + this.toString();
+    }
 }

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,10 @@
+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 {};
+//# 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"}

package/dist/path.js

@@ -0,0 +1,21 @@
+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;
+}

package/dist/route.js

@@ -48,6 +48,9 @@ function buildFullPath(parentPath, path) {
         return path;
     }
     if (path) {
+        if (parentPath === "/") {
+            return "/" + 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/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.3.0",
+  "version": "0.5.0",
   "author": {
     "name": "Michel Smola",
     "email": "michel.smola@farbenmeer.de"
@@ -18,14 +18,14 @@
     "dist"
   ],
   "devDependencies": {
-    "@happy-dom/global-registrator": "^20.0.0",
     "@testing-library/dom": "^10.4.1",
-    "@testing-library/jest-dom": "^6.8.0",
-    "@testing-library/react": "^16.3.0",
     "@types/node": "^25.0.3",
     "@types/react": "^19.2.7",
+    "@vitejs/plugin-react": "^5.1.2",
+    "@vitest/browser-playwright": "^4.0.16",
     "react": "^19.1.1",
-    "vitest": "^4.0.16"
+    "vitest": "^4.0.16",
+    "vitest-browser-react": "^2.0.2"
   },
   "peerDependencies": {
     "react": "^19.1.1",