@esmx/router 3.0.0-rc.56 → 3.0.0-rc.57

package/dist/matcher.d.ts

@@ -1,3 +1,4 @@
-import type { RouteConfig, RouteMatcher } from './types';
-export declare function createMatcher(routes: RouteConfig[]): RouteMatcher;
+import type { RouteConfig, RouteMatcher, RouteParsedConfig } from './types';
+export declare function createMatcher(routes: RouteConfig[], compiledRoutes?: RouteParsedConfig[]): RouteMatcher;
+export declare function createRouteMatches(routes: RouteConfig[], base?: string): RouteParsedConfig[];
 export declare function joinPathname(pathname: string, base?: string): string;

package/dist/matcher.mjs

@@ -1,6 +1,5 @@
 import { compile, match } from "path-to-regexp";
-export function createMatcher(routes) {
-  const compiledRoutes = createRouteMatches(routes);
+export function createMatcher(routes, compiledRoutes = createRouteMatches(routes)) {
   return (toURL, baseURL, cb) => {
     const matchPath = toURL.pathname.substring(baseURL.pathname.length - 1);
     const matches = [];
@@ -29,7 +28,7 @@ export function createMatcher(routes) {
     return { matches: Object.freeze(matches), params };
   };
 }
-function createRouteMatches(routes, base = "") {
+export function createRouteMatches(routes, base = "") {
   return routes.map((route) => {
     const compilePath = joinPathname(route.path, base);
     return {

package/dist/options.mjs

@@ -1,4 +1,4 @@
-import { createMatcher } from "./matcher.mjs";
+import { createMatcher, createRouteMatches } from "./matcher.mjs";
 import { RouterMode } from "./types.mjs";
 import { isBrowser } from "./util.mjs";
 function getBaseUrl(options) {
@@ -33,6 +33,7 @@ export function parsedOptions(options = {}) {
   var _a, _b, _c, _d, _e, _f;
   const base = getBaseUrl(options);
   const routes = (_a = options.routes) != null ? _a : [];
+  const compiledRoutes = createRouteMatches(routes);
   return Object.freeze({
     rootStyle: options.rootStyle || false,
     root: options.root || "",
@@ -45,7 +46,8 @@ export function parsedOptions(options = {}) {
     mode: isBrowser ? (_b = options.mode) != null ? _b : RouterMode.history : RouterMode.memory,
     routes,
     apps: typeof options.apps === "function" ? options.apps : Object.assign({}, options.apps),
-    matcher: createMatcher(routes),
+    compiledRoutes,
+    matcher: createMatcher(routes, compiledRoutes),
     normalizeURL: (_c = options.normalizeURL) != null ? _c : (url) => url,
     fallback: (_d = options.fallback) != null ? _d : fallback,
     handleBackBoundary: (_e = options.handleBackBoundary) != null ? _e : () => {

package/dist/types.d.ts

@@ -201,6 +201,7 @@ export interface RouterOptions {
     handleLayerClose?: (router: Router, data?: any) => void;
 }
 export interface RouterParsedOptions extends Readonly<Required<RouterOptions>> {
+    readonly compiledRoutes: readonly RouteParsedConfig[];
     readonly matcher: RouteMatcher;
 }
 /**

package/package.json

@@ -39,7 +39,7 @@
         "unbuild": "3.6.0",
         "vitest": "3.2.4"
     },
-    "version": "3.0.0-rc.56",
+    "version": "3.0.0-rc.57",
     "type": "module",
     "private": false,
     "exports": {
@@ -58,5 +58,5 @@
         "template",
         "public"
     ],
-    "gitHead": "fe85a36d5b60665eb2a0e970b20071f581fc7bdc"
+    "gitHead": "bb3fbfa6de4906b7e98bc387c3e1d8e0c3164ac7"
 }

package/src/matcher.ts

@@ -1,8 +1,10 @@
 import { compile, match } from 'path-to-regexp';
 import type { RouteConfig, RouteMatcher, RouteParsedConfig } from './types';
 
-export function createMatcher(routes: RouteConfig[]): RouteMatcher {
-    const compiledRoutes = createRouteMatches(routes);
+export function createMatcher(
+    routes: RouteConfig[],
+    compiledRoutes = createRouteMatches(routes)
+): RouteMatcher {
     return (
         toURL: URL,
         baseURL: URL,
@@ -42,7 +44,7 @@ export function createMatcher(routes: RouteConfig[]): RouteMatcher {
     };
 }
 
-function createRouteMatches(
+export function createRouteMatches(
     routes: RouteConfig[],
     base = ''
 ): RouteParsedConfig[] {

package/src/options.ts

@@ -1,12 +1,7 @@
-import { createMatcher } from './matcher';
+import { createMatcher, createRouteMatches } from './matcher';
 import type { Router } from './router';
 import { RouterMode } from './types';
-import type {
-    Route,
-    RouteConfig,
-    RouterOptions,
-    RouterParsedOptions
-} from './types';
+import type { Route, RouterOptions, RouterParsedOptions } from './types';
 import { isBrowser } from './util';
 
 /**
@@ -66,6 +61,7 @@ export function parsedOptions(
 ): RouterParsedOptions {
     const base = getBaseUrl(options);
     const routes = options.routes ?? [];
+    const compiledRoutes = createRouteMatches(routes);
     return Object.freeze<RouterParsedOptions>({
         rootStyle: options.rootStyle || false,
         root: options.root || '',
@@ -83,7 +79,8 @@ export function parsedOptions(
             typeof options.apps === 'function'
                 ? options.apps
                 : Object.assign({}, options.apps),
-        matcher: createMatcher(routes),
+        compiledRoutes,
+        matcher: createMatcher(routes, compiledRoutes),
         normalizeURL: options.normalizeURL ?? ((url) => url),
         fallback: options.fallback ?? fallback,
         handleBackBoundary: options.handleBackBoundary ?? (() => {}),

package/src/types.ts

@@ -275,6 +275,7 @@ export interface RouterOptions {
 }
 
 export interface RouterParsedOptions extends Readonly<Required<RouterOptions>> {
+    readonly compiledRoutes: readonly RouteParsedConfig[];
     readonly matcher: RouteMatcher;
 }