router-kit 0.1.5 → 0.1.6

package/dist/context/RouterProvider.js

@@ -1,48 +1,49 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import join from "url-join";
+import { routes } from "../core/createRouter";
 import Page404 from "../pages/404";
 import RouterContext from "./RouterContext";
-import { router } from "../core/createRouter";
 const RouterProvider = () => {
     const [path, setPath] = useState(window.location.pathname);
     let fullPathWithParams = "";
-    const pathValidation = (fullPath, path) => {
-        const fakePathArr = path.split("/");
-        let fakePath = "/";
-        fullPath.split("/").forEach((e, index) => {
-            if (e.startsWith(":")) {
-                fakePathArr[index] = e;
-            }
-        });
-        fakePathArr.forEach((e) => {
-            fakePath = join(fakePath, `/${e}`);
-        });
-        if (fullPath === fakePath) {
-            fakePath = "";
-            return true;
+    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(":"))
+                continue;
+            if (r !== p)
+                return false;
         }
-        fakePath = "";
-        return false;
+        return true;
     };
-    const getComponent = (routes, currentPath, parentPath = "/") => {
-        let component = _jsx(Page404, {});
-        for (const route of routes) {
-            if (route.path === "/404" && route.component)
-                component = route.component;
+    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
+            }
             const fullPath = join(parentPath, `/${route.path}`);
             if (pathValidation(fullPath, currentPath)) {
                 fullPathWithParams = fullPath;
-                component = route.component;
-                break;
+                return route.component;
             }
             if (route.children) {
-                component = getComponent(route.children, currentPath, fullPath);
+                const childMatch = getComponent(route.children, currentPath, fullPath);
+                if (childMatch)
+                    return childMatch;
             }
         }
-        return component;
+        return null;
     };
-    const component = getComponent(router, path);
+    fullPathWithParams = "";
+    const matchedComponent = getComponent(routes, path);
+    const component = matchedComponent !== null && matchedComponent !== void 0 ? matchedComponent : _jsx(Page404, {});
     const navigate = (to, options) => {
         if (options && options.replace) {
             window.history.replaceState({}, "", to);

package/dist/core/createRouter.d.ts

@@ -1,4 +1,4 @@
 import type { Route } from "../types";
-export declare let router: Route[];
-declare function createRouter(routes: Route[]): void;
+export declare let routes: Route[];
+declare function createRouter(inputRoutes: Route[]): Route[];
 export default createRouter;

package/dist/core/createRouter.js

@@ -1,6 +1,6 @@
-export let router = [];
-function normalizeRoutes(routes) {
-    const normalizedRoutes = routes.map((route) => {
+export let routes = [];
+function normalizeRoutes(inputRoutes) {
+    const normalizedRoutes = inputRoutes.map((route) => {
         var _a, _b;
         const normalizedPath = ((_a = route.path) === null || _a === void 0 ? void 0 : _a.startsWith("/"))
             ? route.path.replace(/^\/+/, "")
@@ -14,10 +14,10 @@ function normalizeRoutes(routes) {
         }
         return normalized;
     });
-    router = normalizedRoutes;
+    routes = normalizedRoutes;
     return normalizedRoutes;
 }
-function createRouter(routes) {
-    normalizeRoutes(routes);
+function createRouter(inputRoutes) {
+    return (routes = normalizeRoutes(inputRoutes));
 }
 export default createRouter;

package/package.json

@@ -5,7 +5,7 @@
     "email": "mohammed.bencheikh.dev@gmail.com",
     "url": "https://mohammedbencheikh.com/"
   },
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "A small React routing provider library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -42,5 +42,13 @@
     "route-provider",
     "route-kit"
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Mohammed-Ben-Cheikh/router-kit.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Mohammed-Ben-Cheikh/router-kit/issues"
+  },
+  "homepage": "https://github.com/Mohammed-Ben-Cheikh/router-kit#readme",
   "license": "MIT"
 }