@esmx/router 3.0.0-rc.48 → 3.0.0-rc.50

package/dist/options.mjs

@@ -29,10 +29,22 @@ function getBaseUrl(options) {
   base.search = base.hash = "";
   return base;
 }
+function filterRoutesByLayer(routes, layerMode) {
+  return routes.filter((route) => {
+    if (layerMode && route.layer !== true) return false;
+    if (!layerMode && route.layer === true) return false;
+    if (route.children)
+      route.children = filterRoutesByLayer(route.children, layerMode);
+    return true;
+  });
+}
 export function parsedOptions(options = {}) {
   var _a, _b, _c, _d, _e, _f;
   const base = getBaseUrl(options);
-  const routes = Array.from((_a = options.routes) != null ? _a : []);
+  const routes = filterRoutesByLayer(
+    (_a = options.routes) != null ? _a : [],
+    options.layer || false
+  );
   return Object.freeze({
     rootStyle: options.rootStyle || false,
     root: options.root || "",

package/dist/route.mjs

@@ -88,6 +88,10 @@ export class Route {
     const isSameOrigin = to.origin === base.origin;
     const isSameBase = to.pathname.startsWith(base.pathname);
     const match = isSameOrigin && isSameBase ? options.matcher(to, base) : null;
+    if (match) {
+      applyRouteParams(match, toInput, base, to);
+      Object.assign(this.params, match.params);
+    }
     this.url = to;
     this.path = match ? to.pathname.substring(base.pathname.length - 1) : to.pathname;
     this.fullPath = (match ? this.path : to.pathname) + to.search + to.hash;
@@ -107,10 +111,6 @@ export class Route {
       this.queryArray[key] = to.searchParams.getAll(key);
     }
     this.hash = to.hash;
-    if (match) {
-      applyRouteParams(match, toInput, base, to);
-      Object.assign(this.params, match.params);
-    }
     if (typeof toInput.statusCode === "number") {
       this.statusCode = toInput.statusCode;
     }

package/dist/types.d.ts

@@ -61,6 +61,8 @@ export interface RouteConfig {
     beforeEnter?: RouteConfirmHook;
     beforeUpdate?: RouteConfirmHook;
     beforeLeave?: RouteConfirmHook;
+    /** Mark this route as only effective in layer mode */
+    layer?: boolean;
     /**
      * Route override function for hybrid app development
      *

package/package.json

@@ -32,7 +32,7 @@
     },
     "devDependencies": {
         "@biomejs/biome": "1.9.4",
-        "@esmx/lint": "3.0.0-rc.48",
+        "@esmx/lint": "3.0.0-rc.50",
         "@types/node": "^24.0.0",
         "@vitest/coverage-v8": "3.2.4",
         "happy-dom": "^18.0.1",
@@ -41,7 +41,7 @@
         "unbuild": "3.5.0",
         "vitest": "3.2.4"
     },
-    "version": "3.0.0-rc.48",
+    "version": "3.0.0-rc.50",
     "type": "module",
     "private": false,
     "exports": {
@@ -60,5 +60,5 @@
         "template",
         "public"
     ],
-    "gitHead": "162ec15d59c5f38c477e78101efa689844d593e2"
+    "gitHead": "7ec8747f78f4626941cb4da548b6df47df4df825"
 }

package/src/options.ts

@@ -1,7 +1,12 @@
 import { createMatcher } from './matcher';
 import type { Router } from './router';
 import { RouterMode } from './types';
-import type { Route, RouterOptions, RouterParsedOptions } from './types';
+import type {
+    Route,
+    RouteConfig,
+    RouterOptions,
+    RouterParsedOptions
+} from './types';
 import { isBrowser } from './util';
 
 /**
@@ -56,11 +61,27 @@ function getBaseUrl(options: RouterOptions): URL {
     return base;
 }
 
+function filterRoutesByLayer(
+    routes: RouteConfig[],
+    layerMode: boolean
+): RouteConfig[] {
+    return routes.filter((route) => {
+        if (layerMode && route.layer !== true) return false;
+        if (!layerMode && route.layer === true) return false;
+        if (route.children)
+            route.children = filterRoutesByLayer(route.children, layerMode);
+        return true;
+    });
+}
+
 export function parsedOptions(
     options: RouterOptions = {}
 ): RouterParsedOptions {
     const base = getBaseUrl(options);
-    const routes = Array.from(options.routes ?? []);
+    const routes = filterRoutesByLayer(
+        options.routes ?? [],
+        options.layer || false
+    );
     return Object.freeze<RouterParsedOptions>({
         rootStyle: options.rootStyle || false,
         root: options.root || '',

package/src/route.ts

@@ -158,6 +158,11 @@ export class Route {
         const match =
             isSameOrigin && isSameBase ? options.matcher(to, base) : null;
 
+        if (match) {
+            applyRouteParams(match, toInput, base, to);
+            Object.assign(this.params, match.params);
+        }
+
         this.url = to;
         this.path = match
             ? to.pathname.substring(base.pathname.length - 1)
@@ -176,27 +181,18 @@ export class Route {
                 : null;
         this.meta = this.config?.meta || {};
 
-        // Initialize state object - create new local object, merge externally passed state
         const state: RouteState = {};
         if (toInput.state) {
             Object.assign(state, toInput.state);
         }
         this.state = state;
 
-        // Process query parameters
         for (const key of new Set(to.searchParams.keys())) {
             this.query[key] = to.searchParams.get(key)!;
             this.queryArray[key] = to.searchParams.getAll(key);
         }
         this.hash = to.hash;
 
-        // Apply user-provided route parameters (if match is successful)
-        if (match) {
-            applyRouteParams(match, toInput, base, to);
-            // Assign matched parameters to route object
-            Object.assign(this.params, match.params);
-        }
-
         // Set status code
         // Prioritize user-provided statusCode
         if (typeof toInput.statusCode === 'number') {

package/src/types.ts

@@ -110,6 +110,8 @@ export interface RouteConfig {
     beforeEnter?: RouteConfirmHook;
     beforeUpdate?: RouteConfirmHook;
     beforeLeave?: RouteConfirmHook;
+    /** Mark this route as only effective in layer mode */
+    layer?: boolean;
 
     /**
      * Route override function for hybrid app development