@farbenmeer/router 0.5.0 → 0.6.1

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/path.d.ts

@@ -6,5 +6,8 @@ interface Options {
 }
 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

@@ -1 +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"}
+{"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

@@ -19,3 +19,42 @@ export function removeTrailingSlash(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>[^\\/]+)"); // :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>[^\\/]+)"); // :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,42 +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) {
-        if (parentPath === "/") {
-            return "/" + path;
-        }
-        return parentPath + "/" + path;
-    }
-    return parentPath;
-}

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farbenmeer/router",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "author": {
     "name": "Michel Smola",
     "email": "michel.smola@farbenmeer.de"
@@ -25,6 +25,7 @@
     "@vitest/browser-playwright": "^4.0.16",
     "react": "^19.1.1",
     "vitest": "^4.0.16",
+    "playwright": "^1.58.1",
     "vitest-browser-react": "^2.0.2"
   },
   "peerDependencies": {
@@ -34,6 +35,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "release": "pnpm run build && pnpm publish",
-    "test": "vitest"
+    "test": "vitest",
+    "ci-setup": "playwright install --with-deps"
   }
 }