router-kit 0.2.1 → 0.2.3

package/dist/context/RouterProvider.js

@@ -6,26 +6,35 @@ import RouterContext from "./RouterContext";
 const RouterProvider = ({ routes }) => {
     const [path, setPath] = useState(window.location.pathname);
     let fullPathWithParams = "";
+    let page404 = _jsx(Page404, {});
     const pathValidation = (routeFullPath, currentPath) => {
-        const routeParts = routeFullPath.split("/").filter(Boolean);
-        const pathParts = currentPath.split("/").filter(Boolean);
-        if (routeParts.length !== pathParts.length)
-            return false;
-        for (let i = 0; i < routeParts.length; i++) {
-            const r = routeParts[i];
-            const p = pathParts[i];
-            if (r.startsWith(":"))
+        const routePaths = routeFullPath.split("|");
+        for (const routePath of routePaths) {
+            const routeParts = routePath.split("/").filter(Boolean);
+            const pathParts = currentPath.split("/").filter(Boolean);
+            if (routeParts.length !== pathParts.length)
                 continue;
-            if (r !== p)
-                return false;
+            let isMatch = true;
+            for (let i = 0; i < routeParts.length; i++) {
+                const r = routeParts[i];
+                const p = pathParts[i];
+                if (r.startsWith(":"))
+                    continue;
+                if (r !== p) {
+                    isMatch = false;
+                    break;
+                }
+            }
+            if (isMatch)
+                return true;
         }
-        return true;
+        return false;
     };
     const getComponent = (routesList, currentPath, parentPath = "/") => {
         for (const route of routesList) {
             const is404 = route.path === "404" || route.path === "/404";
             if (is404 && route.component) {
-                // don't return here; keep as fallback at top-level
+                page404 = route.component;
             }
             const fullPath = join(parentPath, `/${route.path}`);
             if (pathValidation(fullPath, currentPath)) {
@@ -42,7 +51,7 @@ const RouterProvider = ({ routes }) => {
     };
     fullPathWithParams = "";
     const matchedComponent = getComponent(routes, path);
-    const component = matchedComponent !== null && matchedComponent !== void 0 ? matchedComponent : _jsx(Page404, {});
+    const component = matchedComponent !== null && matchedComponent !== void 0 ? matchedComponent : page404;
     const navigate = (to, options) => {
         if (options && options.replace) {
             window.history.replaceState({}, "", to);

package/dist/core/createRouter.js

@@ -1,9 +1,9 @@
 function normalizeRoutes(inputRoutes) {
     return inputRoutes.map((route) => {
-        var _a, _b;
-        const normalizedPath = ((_a = route.path) === null || _a === void 0 ? void 0 : _a.startsWith("/"))
-            ? route.path.replace(/^\/+/, "")
-            : (_b = route.path) !== null && _b !== void 0 ? _b : "";
+        const pathArray = Array.isArray(route.path) ? route.path : [route.path];
+        const normalizedPath = pathArray
+            .map((path) => (path === null || path === void 0 ? void 0 : path.startsWith("/")) ? path.replace(/^\/+/, "") : path !== null && path !== void 0 ? path : "")
+            .join("|");
         const normalized = {
             ...route,
             path: normalizedPath,

package/package.json

@@ -5,7 +5,7 @@
     "email": "mohammed.bencheikh.dev@gmail.com",
     "url": "https://mohammedbencheikh.com/"
   },
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "A small React routing provider library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",