@esmx/router 3.0.0-rc.49 → 3.0.0-rc.51

package/dist/matcher.mjs

@@ -1,12 +1,15 @@
 import { compile, match } from "path-to-regexp";
 export function createMatcher(routes) {
   const compiledRoutes = createRouteMatches(routes);
-  return (toURL, baseURL) => {
+  return (toURL, baseURL, cb) => {
     const matchPath = toURL.pathname.substring(baseURL.pathname.length - 1);
     const matches = [];
     const params = {};
     const collectMatchingRoutes = (routes2) => {
       for (const item of routes2) {
+        if (cb && !cb(item)) {
+          continue;
+        }
         if (item.children.length && collectMatchingRoutes(item.children)) {
           matches.unshift(item);
           return true;

package/dist/options.mjs

@@ -32,7 +32,7 @@ function getBaseUrl(options) {
 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 = (_a = options.routes) != null ? _a : [];
   return Object.freeze({
     rootStyle: options.rootStyle || false,
     root: options.root || "",

package/dist/route.mjs

@@ -85,9 +85,20 @@ export class Route {
     const base = options.base;
     const toInput = resolveRouteLocationInput(routeOptions.toInput, from);
     const to = options.normalizeURL(parseLocation(toInput, base), from);
-    const isSameOrigin = to.origin === base.origin;
-    const isSameBase = to.pathname.startsWith(base.pathname);
-    const match = isSameOrigin && isSameBase ? options.matcher(to, base) : null;
+    let match = null;
+    if (to.origin === base.origin && to.pathname.startsWith(base.pathname)) {
+      const isLayer = toType === RouteType.pushLayer;
+      match = options.matcher(to, base, (config) => {
+        if (isLayer) {
+          return config.layer !== false;
+        }
+        return config.layer !== true;
+      });
+    }
+    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 +118,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
      *
@@ -91,7 +93,7 @@ export interface RouteMatchResult {
     readonly matches: readonly RouteParsedConfig[];
     readonly params: Record<string, string | string[] | undefined>;
 }
-export type RouteMatcher = (targetURL: URL, baseURL: URL) => RouteMatchResult;
+export type RouteMatcher = (to: URL, base: URL, cb?: (item: RouteParsedConfig) => boolean) => RouteMatchResult;
 /**
  * Route constructor options interface
  */

package/package.json

@@ -32,7 +32,7 @@
     },
     "devDependencies": {
         "@biomejs/biome": "1.9.4",
-        "@esmx/lint": "3.0.0-rc.49",
+        "@esmx/lint": "3.0.0-rc.51",
         "@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.49",
+    "version": "3.0.0-rc.51",
     "type": "module",
     "private": false,
     "exports": {
@@ -60,5 +60,5 @@
         "template",
         "public"
     ],
-    "gitHead": "640eb582ee922d64bf47ed38bb8d6ce9cb2369e4"
+    "gitHead": "5556ca6bbaf29a673861c685a19414d5853b9166"
 }

package/src/matcher.ts

@@ -3,7 +3,11 @@ import type { RouteConfig, RouteMatcher, RouteParsedConfig } from './types';
 
 export function createMatcher(routes: RouteConfig[]): RouteMatcher {
     const compiledRoutes = createRouteMatches(routes);
-    return (toURL: URL, baseURL: URL) => {
+    return (
+        toURL: URL,
+        baseURL: URL,
+        cb?: (item: RouteParsedConfig) => boolean
+    ) => {
         const matchPath = toURL.pathname.substring(baseURL.pathname.length - 1);
         const matches: RouteParsedConfig[] = [];
         const params: Record<string, string | string[]> = {};
@@ -11,6 +15,9 @@ export function createMatcher(routes: RouteConfig[]): RouteMatcher {
             routes: RouteParsedConfig[]
         ): boolean => {
             for (const item of routes) {
+                if (cb && !cb(item)) {
+                    continue;
+                }
                 // Depth-first traversal
                 if (
                     item.children.length &&

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';
 
 /**
@@ -60,7 +65,7 @@ export function parsedOptions(
     options: RouterOptions = {}
 ): RouterParsedOptions {
     const base = getBaseUrl(options);
-    const routes = Array.from(options.routes ?? []);
+    const routes = options.routes ?? [];
     return Object.freeze<RouterParsedOptions>({
         rootStyle: options.rootStyle || false,
         root: options.root || '',

package/src/route.ts

@@ -153,10 +153,27 @@ export class Route {
         const base = options.base;
         const toInput = resolveRouteLocationInput(routeOptions.toInput, from);
         const to = options.normalizeURL(parseLocation(toInput, base), from);
-        const isSameOrigin = to.origin === base.origin;
-        const isSameBase = to.pathname.startsWith(base.pathname);
-        const match =
-            isSameOrigin && isSameBase ? options.matcher(to, base) : null;
+        let match: RouteMatchResult | null = null;
+
+        // Check if URL origin matches base origin (protocol + hostname + port)
+        // If origins don't match, treat as external URL and don't attempt route matching
+        if (
+            to.origin === base.origin &&
+            to.pathname.startsWith(base.pathname)
+        ) {
+            const isLayer = toType === RouteType.pushLayer;
+            match = options.matcher(to, base, (config) => {
+                if (isLayer) {
+                    return config.layer !== false;
+                }
+                return config.layer !== true;
+            });
+        }
+
+        if (match) {
+            applyRouteParams(match, toInput, base, to);
+            Object.assign(this.params, match.params);
+        }
 
         this.url = to;
         this.path = match
@@ -176,27 +193,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
@@ -144,7 +146,11 @@ export interface RouteMatchResult {
     readonly params: Record<string, string | string[] | undefined>;
 }
 
-export type RouteMatcher = (targetURL: URL, baseURL: URL) => RouteMatchResult;
+export type RouteMatcher = (
+    to: URL,
+    base: URL,
+    cb?: (item: RouteParsedConfig) => boolean
+) => RouteMatchResult;
 
 /**
  * Route constructor options interface