@ereo/router 0.2.36 → 0.2.37

package/dist/index.js

@@ -237,21 +237,33 @@ function matchWithLayouts(pathname, routes) {
     return null;
   }
   const layouts = [];
-  const collectLayouts = (routeList, currentPath) => {
+  const isLayoutInMatchedScope = (layoutId, matchedRouteId) => {
+    if (layoutId === "/_layout") {
+      return true;
+    }
+    const layoutScope = layoutId.replace(/\/_layout$/, "");
+    if (!layoutScope || layoutScope === "/") {
+      return true;
+    }
+    return matchedRouteId === layoutScope || matchedRouteId.startsWith(layoutScope + "/");
+  };
+  const collectLayouts = (routeList) => {
     for (const route of routeList) {
       if (route.layout) {
         const layoutPath = route.path === "/" ? "" : route.path;
         const matchPath = match.pathname === "/" ? "" : match.pathname;
-        if (matchPath === layoutPath || matchPath.startsWith(layoutPath + "/") || layoutPath === "") {
+        const pathMatches = matchPath === layoutPath || matchPath.startsWith(layoutPath + "/") || layoutPath === "";
+        const scopeMatches = isLayoutInMatchedScope(route.id, match.route.id);
+        if (pathMatches && scopeMatches) {
           layouts.push(route);
         }
       }
       if (route.children) {
-        collectLayouts(route.children, currentPath + route.path);
+        collectLayouts(route.children);
       }
     }
   };
-  collectLayouts(routes, "");
+  collectLayouts(routes);
   layouts.sort((a, b) => a.path.length - b.path.length);
   return {
     ...match,

package/dist/matcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../src/matcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAe,UAAU,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAQzD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,EAAE,CA8C9D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,CAyBpE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,CA4B/D;AASD;;GAEG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EAAE,GACvB,UAAU,GAAG,IAAI,CA8BnB;AAED;;;GAGG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAKN;gBAEI,MAAM,EAAE,KAAK,EAAE;IAI3B;;OAEG;IACH,OAAO,CAAC,aAAa;IAgBrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAiBrB;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IA0C1C;;OAEG;IACH,SAAS,IAAI,KAAK,EAAE;IAIpB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAkB5B;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAQtC;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,YAAY,CAE3D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,KAAK,EAAE,GACd,WAAW,GAAG,IAAI,CAyCpB"}
+{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../src/matcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAe,UAAU,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAQzD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,EAAE,CA8C9D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,CAyBpE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,CA4B/D;AASD;;GAEG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EAAE,GACvB,UAAU,GAAG,IAAI,CA8BnB;AAED;;;GAGG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAKN;gBAEI,MAAM,EAAE,KAAK,EAAE;IAI3B;;OAEG;IACH,OAAO,CAAC,aAAa;IAgBrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAiBrB;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IA0C1C;;OAEG;IACH,SAAS,IAAI,KAAK,EAAE;IAIpB;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAkB5B;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAQtC;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,YAAY,CAE3D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,KAAK,EAAE,GACd,WAAW,GAAG,IAAI,CA2DpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ereo/router",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "license": "MIT",
   "author": "Enoch Kujem Abassey",
   "homepage": "https://ereojs.github.io/ereoJS",
@@ -32,7 +32,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ereo/core": "^0.2.36"
+    "@ereo/core": "^0.2.37"
   },
   "devDependencies": {
     "@types/bun": "^1.1.0",