@webiny/app 6.3.0 → 6.4.0-beta.1

package/features/router/RouteUrl.js

@@ -1,232 +1,99 @@
-/**
- * Utility class for route URL pattern matching and generation.
- * Handles simple route patterns with :param syntax (e.g., /cms/entries/:modelId).
- *
- * Public API uses static methods, which internally construct RouteUrl instances
- * to handle the logic through proper instance methods.
- */
-export class RouteUrl {
-  static patternCache = new Map();
-  constructor(pattern, params, baseUrl) {
-    this.pattern = pattern;
-    this.params = params;
-    this.baseUrl = this.normalizeBaseUrl(baseUrl);
-  }
-
-  /**
-   * Generate a URL from a route pattern and parameters.
-   * Path parameters are injected into the pattern, remaining parameters become query strings.
-   *
-   * @param pattern - Route pattern (e.g., '/security/api-keys/:id')
-   * @param params - Parameters object (e.g., { id: 123, new: true })
-   * @param baseUrl - Optional base URL to prepend (e.g., '/tenant123')
-   * @returns Generated URL string
-   *
-   * @example
-   * RouteUrl.fromPattern('/security/api-keys/:id', { id: 123, new: true })
-   * // Returns: '/security/api-keys/123?new=true'
-   *
-   * @example
-   * RouteUrl.fromPattern('/file-manager', {}, '/tenant123')
-   * // Returns: '/tenant123/file-manager'
-   */
-  static fromPattern(pattern, params, baseUrl) {
-    const routeUrl = new RouteUrl(pattern, params, baseUrl);
-    return routeUrl.generate();
-  }
-
-  /**
-   * Match a pathname against a route pattern and extract parameters.
-   * If baseUrl is provided, it will be stripped from the pathname before matching.
-   *
-   * @param pathname - The pathname to match (e.g., '/tenant123/security/api-keys/123')
-   * @param pattern - Route pattern (e.g., '/security/api-keys/:id')
-   * @param baseUrl - Optional base URL to strip before matching (e.g., '/tenant123')
-   * @returns Object with extracted params if matched, null otherwise
-   *
-   * @example
-   * RouteUrl.match('/security/api-keys/123', '/security/api-keys/:id')
-   * // Returns: { params: { id: '123' } }
-   *
-   * @example
-   * RouteUrl.match('/tenant123/file-manager', '/file-manager', '/tenant123')
-   * // Returns: { params: {} }
-   */
-  static match(pathname, pattern, baseUrl) {
-    const routeUrl = new RouteUrl(pattern, undefined, baseUrl);
-    return routeUrl.matchPathname(pathname);
-  }
-
-  /**
-   * Generate a URL from the instance's pattern, params, and baseUrl.
-   */
-  generate() {
-    if (!this.params) {
-      return this.baseUrl + this.pattern;
+class RouteUrl {
+    static{
+        this.patternCache = new Map();
     }
-
-    // Extract path parameter names from pattern
-    const pathKeys = this.extractPathKeys();
-
-    // Replace :param with actual values
-    let url = this.replacePathParams();
-
-    // Handle empty url
-    if (!url || url === "") {
-      url = "/";
+    constructor(pattern, params, baseUrl){
+        this.pattern = pattern;
+        this.params = params;
+        this.baseUrl = this.normalizeBaseUrl(baseUrl);
     }
-
-    // Prepend baseUrl
-    url = this.baseUrl + url;
-
-    // Add query parameters for keys not used in the path
-    const queryString = this.buildQueryString(pathKeys);
-    if (queryString) {
-      url += `?${queryString}`;
-    }
-    return url;
-  }
-
-  /**
-   * Match a pathname against the instance's pattern.
-   */
-  matchPathname(pathname) {
-    // Strip baseUrl from pathname if provided
-    if (this.baseUrl && pathname.startsWith(this.baseUrl)) {
-      pathname = pathname.slice(this.baseUrl.length) || "/";
-    } else if (this.baseUrl) {
-      // pathname doesn't start with baseUrl, no match
-      return null;
+    static fromPattern(pattern, params, baseUrl) {
+        const routeUrl = new RouteUrl(pattern, params, baseUrl);
+        return routeUrl.generate();
     }
-
-    // Handle wildcard pattern
-    if (this.pattern === "*" || this.pattern === "(.*)") {
-      return {
-        params: {}
-      };
-    }
-
-    // Get or create cached pattern
-    let compiled = RouteUrl.patternCache.get(this.pattern);
-    if (!compiled) {
-      compiled = this.compilePattern();
-      RouteUrl.patternCache.set(this.pattern, compiled);
+    static match(pathname, pattern, baseUrl) {
+        const routeUrl = new RouteUrl(pattern, void 0, baseUrl);
+        return routeUrl.matchPathname(pathname);
     }
-    const match = pathname.match(compiled.regex);
-    if (!match) {
-      return null;
+    generate() {
+        if (!this.params) return this.baseUrl + this.pattern;
+        const pathKeys = this.extractPathKeys();
+        let url = this.replacePathParams();
+        if (!url || "" === url) url = "/";
+        url = this.baseUrl + url;
+        const queryString = this.buildQueryString(pathKeys);
+        if (queryString) url += `?${queryString}`;
+        return url;
     }
-
-    // Extract parameters from capture groups
-    const params = {};
-    compiled.keys.forEach((key, index) => {
-      const value = match[index + 1];
-      if (value !== undefined) {
-        params[key] = decodeURIComponent(value);
-      }
-    });
-    return {
-      params
-    };
-  }
-
-  /**
-   * Extract path parameter names from the pattern.
-   */
-  extractPathKeys() {
-    const pathKeys = new Set();
-    const paramRegex = /:([a-zA-Z_][a-zA-Z0-9_]*)/g;
-    let match;
-    while ((match = paramRegex.exec(this.pattern)) !== null) {
-      pathKeys.add(match[1]);
+    matchPathname(pathname) {
+        if (this.baseUrl && pathname.startsWith(this.baseUrl)) pathname = pathname.slice(this.baseUrl.length) || "/";
+        else if (this.baseUrl) return null;
+        if ("*" === this.pattern || "(.*)" === this.pattern) return {
+            params: {}
+        };
+        let compiled = RouteUrl.patternCache.get(this.pattern);
+        if (!compiled) {
+            compiled = this.compilePattern();
+            RouteUrl.patternCache.set(this.pattern, compiled);
+        }
+        const match = pathname.match(compiled.regex);
+        if (!match) return null;
+        const params = {};
+        compiled.keys.forEach((key, index)=>{
+            const value = match[index + 1];
+            if (void 0 !== value) params[key] = decodeURIComponent(value);
+        });
+        return {
+            params
+        };
     }
-    return pathKeys;
-  }
-
-  /**
-   * Replace :param placeholders with actual values from params.
-   */
-  replacePathParams() {
-    return this.pattern.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, key) => {
-      const value = this.params[key];
-      if (value === undefined || value === null) {
-        return "";
-      }
-      return encodeURIComponent(String(value));
-    });
-  }
-
-  /**
-   * Build query string from params that are not path parameters.
-   */
-  buildQueryString(pathKeys) {
-    const queryParams = {};
-    for (const key in this.params) {
-      if (!pathKeys.has(key)) {
-        queryParams[key] = this.params[key];
-      }
+    extractPathKeys() {
+        const pathKeys = new Set();
+        const paramRegex = /:([a-zA-Z_][a-zA-Z0-9_]*)/g;
+        let match;
+        while(null !== (match = paramRegex.exec(this.pattern)))pathKeys.add(match[1]);
+        return pathKeys;
     }
-    if (Object.keys(queryParams).length === 0) {
-      return "";
+    replacePathParams() {
+        return this.pattern.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, key)=>{
+            const value = this.params[key];
+            if (null == value) return "";
+            return encodeURIComponent(String(value));
+        });
     }
-    const searchParams = new URLSearchParams();
-    for (const key in queryParams) {
-      const value = queryParams[key];
-      if (value !== undefined && value !== null) {
-        if (Array.isArray(value)) {
-          value.forEach(v => searchParams.append(key, String(v)));
-        } else {
-          searchParams.append(key, String(value));
+    buildQueryString(pathKeys) {
+        const queryParams = {};
+        for(const key in this.params)if (!pathKeys.has(key)) queryParams[key] = this.params[key];
+        if (0 === Object.keys(queryParams).length) return "";
+        const searchParams = new URLSearchParams();
+        for(const key in queryParams){
+            const value = queryParams[key];
+            if (null != value) if (Array.isArray(value)) value.forEach((v)=>searchParams.append(key, String(v)));
+            else searchParams.append(key, String(value));
         }
-      }
+        return searchParams.toString();
     }
-    return searchParams.toString();
-  }
-
-  /**
-   * Normalize baseUrl by ensuring it starts with / and doesn't end with /
-   */
-  normalizeBaseUrl(baseUrl) {
-    if (!baseUrl || baseUrl === "/") {
-      return "";
+    normalizeBaseUrl(baseUrl) {
+        if (!baseUrl || "/" === baseUrl) return "";
+        let normalized = baseUrl;
+        if (!normalized.startsWith("/")) normalized = "/" + normalized;
+        if (normalized.endsWith("/")) normalized = normalized.slice(0, -1);
+        return normalized;
     }
-    let normalized = baseUrl;
-
-    // Ensure it starts with /
-    if (!normalized.startsWith("/")) {
-      normalized = "/" + normalized;
+    compilePattern() {
+        const keys = [];
+        let regexPattern = this.pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\\\*/g, ".*");
+        regexPattern = regexPattern.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, key)=>{
+            keys.push(key);
+            return "([^/]+)";
+        });
+        const regex = new RegExp(`^${regexPattern}$`);
+        return {
+            regex,
+            keys
+        };
     }
-
-    // Remove trailing /
-    if (normalized.endsWith("/")) {
-      normalized = normalized.slice(0, -1);
-    }
-    return normalized;
-  }
-
-  /**
-   * Compile the instance's pattern into a regex and extract parameter names.
-   */
-  compilePattern() {
-    const keys = [];
-
-    // Escape special regex characters except for :param syntax
-    let regexPattern = this.pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&") // Escape special chars
-    .replace(/\\\*/g, ".*"); // Handle * wildcard (already escaped by above)
-
-    // Replace :param with capture groups
-    regexPattern = regexPattern.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, key) => {
-      keys.push(key);
-      return "([^/]+)"; // Match any non-slash characters
-    });
-
-    // Create regex that matches the entire pathname
-    const regex = new RegExp(`^${regexPattern}$`);
-    return {
-      regex,
-      keys
-    };
-  }
 }
+export { RouteUrl };
 
 //# sourceMappingURL=RouteUrl.js.map

package/features/router/RouteUrl.js.map

@@ -1 +1 @@
-{"version":3,"names":["RouteUrl","patternCache","Map","constructor","pattern","params","baseUrl","normalizeBaseUrl","fromPattern","routeUrl","generate","match","pathname","undefined","matchPathname","pathKeys","extractPathKeys","url","replacePathParams","queryString","buildQueryString","startsWith","slice","length","compiled","get","compilePattern","set","regex","keys","forEach","key","index","value","decodeURIComponent","Set","paramRegex","exec","add","replace","_","encodeURIComponent","String","queryParams","has","Object","searchParams","URLSearchParams","Array","isArray","v","append","toString","normalized","endsWith","regexPattern","push","RegExp"],"sources":["RouteUrl.ts"],"sourcesContent":["interface Params {\n    [key: string]: any;\n}\n\ninterface MatchResult {\n    params: Record<string, string>;\n}\n\n/**\n * Utility class for route URL pattern matching and generation.\n * Handles simple route patterns with :param syntax (e.g., /cms/entries/:modelId).\n *\n * Public API uses static methods, which internally construct RouteUrl instances\n * to handle the logic through proper instance methods.\n */\nexport class RouteUrl {\n    private static patternCache = new Map<string, { regex: RegExp; keys: string[] }>();\n\n    private readonly pattern: string;\n    private readonly params: Params | undefined;\n    private readonly baseUrl: string;\n\n    private constructor(pattern: string, params?: Params, baseUrl?: string) {\n        this.pattern = pattern;\n        this.params = params;\n        this.baseUrl = this.normalizeBaseUrl(baseUrl);\n    }\n\n    /**\n     * Generate a URL from a route pattern and parameters.\n     * Path parameters are injected into the pattern, remaining parameters become query strings.\n     *\n     * @param pattern - Route pattern (e.g., '/security/api-keys/:id')\n     * @param params - Parameters object (e.g., { id: 123, new: true })\n     * @param baseUrl - Optional base URL to prepend (e.g., '/tenant123')\n     * @returns Generated URL string\n     *\n     * @example\n     * RouteUrl.fromPattern('/security/api-keys/:id', { id: 123, new: true })\n     * // Returns: '/security/api-keys/123?new=true'\n     *\n     * @example\n     * RouteUrl.fromPattern('/file-manager', {}, '/tenant123')\n     * // Returns: '/tenant123/file-manager'\n     */\n    static fromPattern(pattern: string, params?: Params, baseUrl?: string): string {\n        const routeUrl = new RouteUrl(pattern, params, baseUrl);\n        return routeUrl.generate();\n    }\n\n    /**\n     * Match a pathname against a route pattern and extract parameters.\n     * If baseUrl is provided, it will be stripped from the pathname before matching.\n     *\n     * @param pathname - The pathname to match (e.g., '/tenant123/security/api-keys/123')\n     * @param pattern - Route pattern (e.g., '/security/api-keys/:id')\n     * @param baseUrl - Optional base URL to strip before matching (e.g., '/tenant123')\n     * @returns Object with extracted params if matched, null otherwise\n     *\n     * @example\n     * RouteUrl.match('/security/api-keys/123', '/security/api-keys/:id')\n     * // Returns: { params: { id: '123' } }\n     *\n     * @example\n     * RouteUrl.match('/tenant123/file-manager', '/file-manager', '/tenant123')\n     * // Returns: { params: {} }\n     */\n    static match(pathname: string, pattern: string, baseUrl?: string): MatchResult | null {\n        const routeUrl = new RouteUrl(pattern, undefined, baseUrl);\n        return routeUrl.matchPathname(pathname);\n    }\n\n    /**\n     * Generate a URL from the instance's pattern, params, and baseUrl.\n     */\n    private generate(): string {\n        if (!this.params) {\n            return this.baseUrl + this.pattern;\n        }\n\n        // Extract path parameter names from pattern\n        const pathKeys = this.extractPathKeys();\n\n        // Replace :param with actual values\n        let url = this.replacePathParams();\n\n        // Handle empty url\n        if (!url || url === \"\") {\n            url = \"/\";\n        }\n\n        // Prepend baseUrl\n        url = this.baseUrl + url;\n\n        // Add query parameters for keys not used in the path\n        const queryString = this.buildQueryString(pathKeys);\n        if (queryString) {\n            url += `?${queryString}`;\n        }\n\n        return url;\n    }\n\n    /**\n     * Match a pathname against the instance's pattern.\n     */\n    private matchPathname(pathname: string): MatchResult | null {\n        // Strip baseUrl from pathname if provided\n        if (this.baseUrl && pathname.startsWith(this.baseUrl)) {\n            pathname = pathname.slice(this.baseUrl.length) || \"/\";\n        } else if (this.baseUrl) {\n            // pathname doesn't start with baseUrl, no match\n            return null;\n        }\n\n        // Handle wildcard pattern\n        if (this.pattern === \"*\" || this.pattern === \"(.*)\") {\n            return { params: {} };\n        }\n\n        // Get or create cached pattern\n        let compiled = RouteUrl.patternCache.get(this.pattern);\n        if (!compiled) {\n            compiled = this.compilePattern();\n            RouteUrl.patternCache.set(this.pattern, compiled);\n        }\n\n        const match = pathname.match(compiled.regex);\n        if (!match) {\n            return null;\n        }\n\n        // Extract parameters from capture groups\n        const params: Record<string, string> = {};\n        compiled.keys.forEach((key, index) => {\n            const value = match[index + 1];\n            if (value !== undefined) {\n                params[key] = decodeURIComponent(value);\n            }\n        });\n\n        return { params };\n    }\n\n    /**\n     * Extract path parameter names from the pattern.\n     */\n    private extractPathKeys(): Set<string> {\n        const pathKeys = new Set<string>();\n        const paramRegex = /:([a-zA-Z_][a-zA-Z0-9_]*)/g;\n        let match;\n        while ((match = paramRegex.exec(this.pattern)) !== null) {\n            pathKeys.add(match[1]);\n        }\n        return pathKeys;\n    }\n\n    /**\n     * Replace :param placeholders with actual values from params.\n     */\n    private replacePathParams(): string {\n        return this.pattern.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, key) => {\n            const value = this.params![key];\n            if (value === undefined || value === null) {\n                return \"\";\n            }\n            return encodeURIComponent(String(value));\n        });\n    }\n\n    /**\n     * Build query string from params that are not path parameters.\n     */\n    private buildQueryString(pathKeys: Set<string>): string {\n        const queryParams: Record<string, any> = {};\n\n        for (const key in this.params) {\n            if (!pathKeys.has(key)) {\n                queryParams[key] = this.params[key];\n            }\n        }\n\n        if (Object.keys(queryParams).length === 0) {\n            return \"\";\n        }\n\n        const searchParams = new URLSearchParams();\n\n        for (const key in queryParams) {\n            const value = queryParams[key];\n            if (value !== undefined && value !== null) {\n                if (Array.isArray(value)) {\n                    value.forEach(v => searchParams.append(key, String(v)));\n                } else {\n                    searchParams.append(key, String(value));\n                }\n            }\n        }\n\n        return searchParams.toString();\n    }\n\n    /**\n     * Normalize baseUrl by ensuring it starts with / and doesn't end with /\n     */\n    private normalizeBaseUrl(baseUrl?: string): string {\n        if (!baseUrl || baseUrl === \"/\") {\n            return \"\";\n        }\n\n        let normalized = baseUrl;\n\n        // Ensure it starts with /\n        if (!normalized.startsWith(\"/\")) {\n            normalized = \"/\" + normalized;\n        }\n\n        // Remove trailing /\n        if (normalized.endsWith(\"/\")) {\n            normalized = normalized.slice(0, -1);\n        }\n\n        return normalized;\n    }\n\n    /**\n     * Compile the instance's pattern into a regex and extract parameter names.\n     */\n    private compilePattern(): { regex: RegExp; keys: string[] } {\n        const keys: string[] = [];\n\n        // Escape special regex characters except for :param syntax\n        let regexPattern = this.pattern\n            .replace(/[.+?^${}()|[\\]\\\\]/g, \"\\\\$&\") // Escape special chars\n            .replace(/\\\\\\*/g, \".*\"); // Handle * wildcard (already escaped by above)\n\n        // Replace :param with capture groups\n        regexPattern = regexPattern.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, key) => {\n            keys.push(key);\n            return \"([^/]+)\"; // Match any non-slash characters\n        });\n\n        // Create regex that matches the entire pathname\n        const regex = new RegExp(`^${regexPattern}$`);\n\n        return { regex, keys };\n    }\n}\n"],"mappings":"AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,QAAQ,CAAC;EAClB,OAAeC,YAAY,GAAG,IAAIC,GAAG,CAA4C,CAAC;EAM1EC,WAAWA,CAACC,OAAe,EAAEC,MAAe,EAAEC,OAAgB,EAAE;IACpE,IAAI,CAACF,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,MAAM,GAAGA,MAAM;IACpB,IAAI,CAACC,OAAO,GAAG,IAAI,CAACC,gBAAgB,CAACD,OAAO,CAAC;EACjD;;EAEA;AACJ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACI,OAAOE,WAAWA,CAACJ,OAAe,EAAEC,MAAe,EAAEC,OAAgB,EAAU;IAC3E,MAAMG,QAAQ,GAAG,IAAIT,QAAQ,CAACI,OAAO,EAAEC,MAAM,EAAEC,OAAO,CAAC;IACvD,OAAOG,QAAQ,CAACC,QAAQ,CAAC,CAAC;EAC9B;;EAEA;AACJ;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACI,OAAOC,KAAKA,CAACC,QAAgB,EAAER,OAAe,EAAEE,OAAgB,EAAsB;IAClF,MAAMG,QAAQ,GAAG,IAAIT,QAAQ,CAACI,OAAO,EAAES,SAAS,EAAEP,OAAO,CAAC;IAC1D,OAAOG,QAAQ,CAACK,aAAa,CAACF,QAAQ,CAAC;EAC3C;;EAEA;AACJ;AACA;EACYF,QAAQA,CAAA,EAAW;IACvB,IAAI,CAAC,IAAI,CAACL,MAAM,EAAE;MACd,OAAO,IAAI,CAACC,OAAO,GAAG,IAAI,CAACF,OAAO;IACtC;;IAEA;IACA,MAAMW,QAAQ,GAAG,IAAI,CAACC,eAAe,CAAC,CAAC;;IAEvC;IACA,IAAIC,GAAG,GAAG,IAAI,CAACC,iBAAiB,CAAC,CAAC;;IAElC;IACA,IAAI,CAACD,GAAG,IAAIA,GAAG,KAAK,EAAE,EAAE;MACpBA,GAAG,GAAG,GAAG;IACb;;IAEA;IACAA,GAAG,GAAG,IAAI,CAACX,OAAO,GAAGW,GAAG;;IAExB;IACA,MAAME,WAAW,GAAG,IAAI,CAACC,gBAAgB,CAACL,QAAQ,CAAC;IACnD,IAAII,WAAW,EAAE;MACbF,GAAG,IAAI,IAAIE,WAAW,EAAE;IAC5B;IAEA,OAAOF,GAAG;EACd;;EAEA;AACJ;AACA;EACYH,aAAaA,CAACF,QAAgB,EAAsB;IACxD;IACA,IAAI,IAAI,CAACN,OAAO,IAAIM,QAAQ,CAACS,UAAU,CAAC,IAAI,CAACf,OAAO,CAAC,EAAE;MACnDM,QAAQ,GAAGA,QAAQ,CAACU,KAAK,CAAC,IAAI,CAAChB,OAAO,CAACiB,MAAM,CAAC,IAAI,GAAG;IACzD,CAAC,MAAM,IAAI,IAAI,CAACjB,OAAO,EAAE;MACrB;MACA,OAAO,IAAI;IACf;;IAEA;IACA,IAAI,IAAI,CAACF,OAAO,KAAK,GAAG,IAAI,IAAI,CAACA,OAAO,KAAK,MAAM,EAAE;MACjD,OAAO;QAAEC,MAAM,EAAE,CAAC;MAAE,CAAC;IACzB;;IAEA;IACA,IAAImB,QAAQ,GAAGxB,QAAQ,CAACC,YAAY,CAACwB,GAAG,CAAC,IAAI,CAACrB,OAAO,CAAC;IACtD,IAAI,CAACoB,QAAQ,EAAE;MACXA,QAAQ,GAAG,IAAI,CAACE,cAAc,CAAC,CAAC;MAChC1B,QAAQ,CAACC,YAAY,CAAC0B,GAAG,CAAC,IAAI,CAACvB,OAAO,EAAEoB,QAAQ,CAAC;IACrD;IAEA,MAAMb,KAAK,GAAGC,QAAQ,CAACD,KAAK,CAACa,QAAQ,CAACI,KAAK,CAAC;IAC5C,IAAI,CAACjB,KAAK,EAAE;MACR,OAAO,IAAI;IACf;;IAEA;IACA,MAAMN,MAA8B,GAAG,CAAC,CAAC;IACzCmB,QAAQ,CAACK,IAAI,CAACC,OAAO,CAAC,CAACC,GAAG,EAAEC,KAAK,KAAK;MAClC,MAAMC,KAAK,GAAGtB,KAAK,CAACqB,KAAK,GAAG,CAAC,CAAC;MAC9B,IAAIC,KAAK,KAAKpB,SAAS,EAAE;QACrBR,MAAM,CAAC0B,GAAG,CAAC,GAAGG,kBAAkB,CAACD,KAAK,CAAC;MAC3C;IACJ,CAAC,CAAC;IAEF,OAAO;MAAE5B;IAAO,CAAC;EACrB;;EAEA;AACJ;AACA;EACYW,eAAeA,CAAA,EAAgB;IACnC,MAAMD,QAAQ,GAAG,IAAIoB,GAAG,CAAS,CAAC;IAClC,MAAMC,UAAU,GAAG,4BAA4B;IAC/C,IAAIzB,KAAK;IACT,OAAO,CAACA,KAAK,GAAGyB,UAAU,CAACC,IAAI,CAAC,IAAI,CAACjC,OAAO,CAAC,MAAM,IAAI,EAAE;MACrDW,QAAQ,CAACuB,GAAG,CAAC3B,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1B;IACA,OAAOI,QAAQ;EACnB;;EAEA;AACJ;AACA;EACYG,iBAAiBA,CAAA,EAAW;IAChC,OAAO,IAAI,CAACd,OAAO,CAACmC,OAAO,CAAC,4BAA4B,EAAE,CAACC,CAAC,EAAET,GAAG,KAAK;MAClE,MAAME,KAAK,GAAG,IAAI,CAAC5B,MAAM,CAAE0B,GAAG,CAAC;MAC/B,IAAIE,KAAK,KAAKpB,SAAS,IAAIoB,KAAK,KAAK,IAAI,EAAE;QACvC,OAAO,EAAE;MACb;MACA,OAAOQ,kBAAkB,CAACC,MAAM,CAACT,KAAK,CAAC,CAAC;IAC5C,CAAC,CAAC;EACN;;EAEA;AACJ;AACA;EACYb,gBAAgBA,CAACL,QAAqB,EAAU;IACpD,MAAM4B,WAAgC,GAAG,CAAC,CAAC;IAE3C,KAAK,MAAMZ,GAAG,IAAI,IAAI,CAAC1B,MAAM,EAAE;MAC3B,IAAI,CAACU,QAAQ,CAAC6B,GAAG,CAACb,GAAG,CAAC,EAAE;QACpBY,WAAW,CAACZ,GAAG,CAAC,GAAG,IAAI,CAAC1B,MAAM,CAAC0B,GAAG,CAAC;MACvC;IACJ;IAEA,IAAIc,MAAM,CAAChB,IAAI,CAACc,WAAW,CAAC,CAACpB,MAAM,KAAK,CAAC,EAAE;MACvC,OAAO,EAAE;IACb;IAEA,MAAMuB,YAAY,GAAG,IAAIC,eAAe,CAAC,CAAC;IAE1C,KAAK,MAAMhB,GAAG,IAAIY,WAAW,EAAE;MAC3B,MAAMV,KAAK,GAAGU,WAAW,CAACZ,GAAG,CAAC;MAC9B,IAAIE,KAAK,KAAKpB,SAAS,IAAIoB,KAAK,KAAK,IAAI,EAAE;QACvC,IAAIe,KAAK,CAACC,OAAO,CAAChB,KAAK,CAAC,EAAE;UACtBA,KAAK,CAACH,OAAO,CAACoB,CAAC,IAAIJ,YAAY,CAACK,MAAM,CAACpB,GAAG,EAAEW,MAAM,CAACQ,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,MAAM;UACHJ,YAAY,CAACK,MAAM,CAACpB,GAAG,EAAEW,MAAM,CAACT,KAAK,CAAC,CAAC;QAC3C;MACJ;IACJ;IAEA,OAAOa,YAAY,CAACM,QAAQ,CAAC,CAAC;EAClC;;EAEA;AACJ;AACA;EACY7C,gBAAgBA,CAACD,OAAgB,EAAU;IAC/C,IAAI,CAACA,OAAO,IAAIA,OAAO,KAAK,GAAG,EAAE;MAC7B,OAAO,EAAE;IACb;IAEA,IAAI+C,UAAU,GAAG/C,OAAO;;IAExB;IACA,IAAI,CAAC+C,UAAU,CAAChC,UAAU,CAAC,GAAG,CAAC,EAAE;MAC7BgC,UAAU,GAAG,GAAG,GAAGA,UAAU;IACjC;;IAEA;IACA,IAAIA,UAAU,CAACC,QAAQ,CAAC,GAAG,CAAC,EAAE;MAC1BD,UAAU,GAAGA,UAAU,CAAC/B,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxC;IAEA,OAAO+B,UAAU;EACrB;;EAEA;AACJ;AACA;EACY3B,cAAcA,CAAA,EAAsC;IACxD,MAAMG,IAAc,GAAG,EAAE;;IAEzB;IACA,IAAI0B,YAAY,GAAG,IAAI,CAACnD,OAAO,CAC1BmC,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IAAA,CACtCA,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;;IAE7B;IACAgB,YAAY,GAAGA,YAAY,CAAChB,OAAO,CAAC,4BAA4B,EAAE,CAACC,CAAC,EAAET,GAAG,KAAK;MAC1EF,IAAI,CAAC2B,IAAI,CAACzB,GAAG,CAAC;MACd,OAAO,SAAS,CAAC,CAAC;IACtB,CAAC,CAAC;;IAEF;IACA,MAAMH,KAAK,GAAG,IAAI6B,MAAM,CAAC,IAAIF,YAAY,GAAG,CAAC;IAE7C,OAAO;MAAE3B,KAAK;MAAEC;IAAK,CAAC;EAC1B;AACJ","ignoreList":[]}
+{"version":3,"file":"features/router/RouteUrl.js","sources":["../../../src/features/router/RouteUrl.ts"],"sourcesContent":["interface Params {\n    [key: string]: any;\n}\n\ninterface MatchResult {\n    params: Record<string, string>;\n}\n\n/**\n * Utility class for route URL pattern matching and generation.\n * Handles simple route patterns with :param syntax (e.g., /cms/entries/:modelId).\n *\n * Public API uses static methods, which internally construct RouteUrl instances\n * to handle the logic through proper instance methods.\n */\nexport class RouteUrl {\n    private static patternCache = new Map<string, { regex: RegExp; keys: string[] }>();\n\n    private readonly pattern: string;\n    private readonly params: Params | undefined;\n    private readonly baseUrl: string;\n\n    private constructor(pattern: string, params?: Params, baseUrl?: string) {\n        this.pattern = pattern;\n        this.params = params;\n        this.baseUrl = this.normalizeBaseUrl(baseUrl);\n    }\n\n    /**\n     * Generate a URL from a route pattern and parameters.\n     * Path parameters are injected into the pattern, remaining parameters become query strings.\n     *\n     * @param pattern - Route pattern (e.g., '/security/api-keys/:id')\n     * @param params - Parameters object (e.g., { id: 123, new: true })\n     * @param baseUrl - Optional base URL to prepend (e.g., '/tenant123')\n     * @returns Generated URL string\n     *\n     * @example\n     * RouteUrl.fromPattern('/security/api-keys/:id', { id: 123, new: true })\n     * // Returns: '/security/api-keys/123?new=true'\n     *\n     * @example\n     * RouteUrl.fromPattern('/file-manager', {}, '/tenant123')\n     * // Returns: '/tenant123/file-manager'\n     */\n    static fromPattern(pattern: string, params?: Params, baseUrl?: string): string {\n        const routeUrl = new RouteUrl(pattern, params, baseUrl);\n        return routeUrl.generate();\n    }\n\n    /**\n     * Match a pathname against a route pattern and extract parameters.\n     * If baseUrl is provided, it will be stripped from the pathname before matching.\n     *\n     * @param pathname - The pathname to match (e.g., '/tenant123/security/api-keys/123')\n     * @param pattern - Route pattern (e.g., '/security/api-keys/:id')\n     * @param baseUrl - Optional base URL to strip before matching (e.g., '/tenant123')\n     * @returns Object with extracted params if matched, null otherwise\n     *\n     * @example\n     * RouteUrl.match('/security/api-keys/123', '/security/api-keys/:id')\n     * // Returns: { params: { id: '123' } }\n     *\n     * @example\n     * RouteUrl.match('/tenant123/file-manager', '/file-manager', '/tenant123')\n     * // Returns: { params: {} }\n     */\n    static match(pathname: string, pattern: string, baseUrl?: string): MatchResult | null {\n        const routeUrl = new RouteUrl(pattern, undefined, baseUrl);\n        return routeUrl.matchPathname(pathname);\n    }\n\n    /**\n     * Generate a URL from the instance's pattern, params, and baseUrl.\n     */\n    private generate(): string {\n        if (!this.params) {\n            return this.baseUrl + this.pattern;\n        }\n\n        // Extract path parameter names from pattern\n        const pathKeys = this.extractPathKeys();\n\n        // Replace :param with actual values\n        let url = this.replacePathParams();\n\n        // Handle empty url\n        if (!url || url === \"\") {\n            url = \"/\";\n        }\n\n        // Prepend baseUrl\n        url = this.baseUrl + url;\n\n        // Add query parameters for keys not used in the path\n        const queryString = this.buildQueryString(pathKeys);\n        if (queryString) {\n            url += `?${queryString}`;\n        }\n\n        return url;\n    }\n\n    /**\n     * Match a pathname against the instance's pattern.\n     */\n    private matchPathname(pathname: string): MatchResult | null {\n        // Strip baseUrl from pathname if provided\n        if (this.baseUrl && pathname.startsWith(this.baseUrl)) {\n            pathname = pathname.slice(this.baseUrl.length) || \"/\";\n        } else if (this.baseUrl) {\n            // pathname doesn't start with baseUrl, no match\n            return null;\n        }\n\n        // Handle wildcard pattern\n        if (this.pattern === \"*\" || this.pattern === \"(.*)\") {\n            return { params: {} };\n        }\n\n        // Get or create cached pattern\n        let compiled = RouteUrl.patternCache.get(this.pattern);\n        if (!compiled) {\n            compiled = this.compilePattern();\n            RouteUrl.patternCache.set(this.pattern, compiled);\n        }\n\n        const match = pathname.match(compiled.regex);\n        if (!match) {\n            return null;\n        }\n\n        // Extract parameters from capture groups\n        const params: Record<string, string> = {};\n        compiled.keys.forEach((key, index) => {\n            const value = match[index + 1];\n            if (value !== undefined) {\n                params[key] = decodeURIComponent(value);\n            }\n        });\n\n        return { params };\n    }\n\n    /**\n     * Extract path parameter names from the pattern.\n     */\n    private extractPathKeys(): Set<string> {\n        const pathKeys = new Set<string>();\n        const paramRegex = /:([a-zA-Z_][a-zA-Z0-9_]*)/g;\n        let match;\n        while ((match = paramRegex.exec(this.pattern)) !== null) {\n            pathKeys.add(match[1]);\n        }\n        return pathKeys;\n    }\n\n    /**\n     * Replace :param placeholders with actual values from params.\n     */\n    private replacePathParams(): string {\n        return this.pattern.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, key) => {\n            const value = this.params![key];\n            if (value === undefined || value === null) {\n                return \"\";\n            }\n            return encodeURIComponent(String(value));\n        });\n    }\n\n    /**\n     * Build query string from params that are not path parameters.\n     */\n    private buildQueryString(pathKeys: Set<string>): string {\n        const queryParams: Record<string, any> = {};\n\n        for (const key in this.params) {\n            if (!pathKeys.has(key)) {\n                queryParams[key] = this.params[key];\n            }\n        }\n\n        if (Object.keys(queryParams).length === 0) {\n            return \"\";\n        }\n\n        const searchParams = new URLSearchParams();\n\n        for (const key in queryParams) {\n            const value = queryParams[key];\n            if (value !== undefined && value !== null) {\n                if (Array.isArray(value)) {\n                    value.forEach(v => searchParams.append(key, String(v)));\n                } else {\n                    searchParams.append(key, String(value));\n                }\n            }\n        }\n\n        return searchParams.toString();\n    }\n\n    /**\n     * Normalize baseUrl by ensuring it starts with / and doesn't end with /\n     */\n    private normalizeBaseUrl(baseUrl?: string): string {\n        if (!baseUrl || baseUrl === \"/\") {\n            return \"\";\n        }\n\n        let normalized = baseUrl;\n\n        // Ensure it starts with /\n        if (!normalized.startsWith(\"/\")) {\n            normalized = \"/\" + normalized;\n        }\n\n        // Remove trailing /\n        if (normalized.endsWith(\"/\")) {\n            normalized = normalized.slice(0, -1);\n        }\n\n        return normalized;\n    }\n\n    /**\n     * Compile the instance's pattern into a regex and extract parameter names.\n     */\n    private compilePattern(): { regex: RegExp; keys: string[] } {\n        const keys: string[] = [];\n\n        // Escape special regex characters except for :param syntax\n        let regexPattern = this.pattern\n            .replace(/[.+?^${}()|[\\]\\\\]/g, \"\\\\$&\") // Escape special chars\n            .replace(/\\\\\\*/g, \".*\"); // Handle * wildcard (already escaped by above)\n\n        // Replace :param with capture groups\n        regexPattern = regexPattern.replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, key) => {\n            keys.push(key);\n            return \"([^/]+)\"; // Match any non-slash characters\n        });\n\n        // Create regex that matches the entire pathname\n        const regex = new RegExp(`^${regexPattern}$`);\n\n        return { regex, keys };\n    }\n}\n"],"names":["RouteUrl","Map","pattern","params","baseUrl","routeUrl","pathname","undefined","pathKeys","url","queryString","compiled","match","key","index","value","decodeURIComponent","Set","paramRegex","_","encodeURIComponent","String","queryParams","Object","searchParams","URLSearchParams","Array","v","normalized","keys","regexPattern","regex","RegExp"],"mappings":"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"}

package/features/router/Router.js

@@ -1,129 +1,72 @@
 import { RouteUrl } from "./RouteUrl.js";
-/**
- * Router manages a collection of route definitions and resolves pathnames to matched routes.
- */
-export class Router {
-  routes = [];
-  constructor(baseUrl = "") {
-    this.baseUrl = baseUrl;
-  }
-
-  /**
-   * Set or update route definitions. Routes with the same name will be replaced.
-   *
-   * @param routes - Array of route definitions to add
-   */
-  setRoutes(routes) {
-    routes.forEach(route => {
-      const index = this.routes.findIndex(r => r.name === route.name);
-      if (index > -1) {
-        this.routes[index] = route;
-      } else {
-        this.routes.push(route);
-      }
-    });
-    this.sortRoutes();
-  }
-
-  /**
-   * Find a route by name.
-   *
-   * @param name - Route name to find
-   * @returns Route definition if found, undefined otherwise
-   */
-  findRoute(name) {
-    return this.routes.find(r => r.name === name);
-  }
-
-  /**
-   * Resolve a pathname to a matched route.
-   * The pathname will be matched against patterns after stripping the baseUrl.
-   *
-   * @param pathname - The pathname to resolve (e.g., '/tenant123/cms/entries/123')
-   * @param queryParams - Optional query parameters to merge into route params
-   * @returns Matched route with onMatch callback, or null if no route matches
-   */
-  resolve(pathname, queryParams) {
-    for (const route of this.routes) {
-      const pattern = route.path === "*" ? "(.*)" : route.path;
-      const matchResult = RouteUrl.match(pathname, pattern, this.baseUrl);
-      if (matchResult) {
-        const matchedRoute = {
-          name: route.name,
-          path: route.path,
-          pathname,
-          params: {
-            ...matchResult.params,
-            ...(queryParams || {})
-          }
-        };
-        const onMatch = matched => {
-          route.onMatch(matched);
-        };
-        return {
-          matchedRoute,
-          onMatch
-        };
-      }
+class Router {
+    constructor(baseUrl = ""){
+        this.routes = [];
+        this.baseUrl = baseUrl;
+    }
+    setRoutes(routes) {
+        routes.forEach((route)=>{
+            const index = this.routes.findIndex((r)=>r.name === route.name);
+            if (index > -1) this.routes[index] = route;
+            else this.routes.push(route);
+        });
+        this.sortRoutes();
+    }
+    findRoute(name) {
+        return this.routes.find((r)=>r.name === name);
+    }
+    resolve(pathname, queryParams) {
+        for (const route of this.routes){
+            const pattern = "*" === route.path ? "(.*)" : route.path;
+            const matchResult = RouteUrl.match(pathname, pattern, this.baseUrl);
+            if (matchResult) {
+                const matchedRoute = {
+                    name: route.name,
+                    path: route.path,
+                    pathname,
+                    params: {
+                        ...matchResult.params,
+                        ...queryParams || {}
+                    }
+                };
+                const onMatch = (matched)=>{
+                    route.onMatch(matched);
+                };
+                return {
+                    matchedRoute,
+                    onMatch
+                };
+            }
+        }
+        return null;
+    }
+    getBaseUrl() {
+        return this.baseUrl;
+    }
+    sortRoutes() {
+        const INDEX_PATH = "/";
+        const WILDCARD_PATTERNS = [
+            "*",
+            "(.*)"
+        ];
+        this.routes.sort((a, b)=>{
+            const pathA = a.path || "*";
+            const pathB = b.path || "*";
+            const isWildcardA = WILDCARD_PATTERNS.includes(pathA);
+            const isWildcardB = WILDCARD_PATTERNS.includes(pathB);
+            const isIndexA = pathA === INDEX_PATH;
+            const isIndexB = pathB === INDEX_PATH;
+            if (isWildcardA && isWildcardB || isIndexA && isIndexB) return 0;
+            if (isIndexA && isWildcardB) return -1;
+            if (isWildcardA && isIndexB) return 1;
+            if (isWildcardA) return 1;
+            if (isWildcardB) return -1;
+            if (isIndexA) return 1;
+            if (isIndexB) return -1;
+            return 0;
+        });
     }
-    return null;
-  }
-
-  /**
-   * Get the current baseUrl.
-   */
-  getBaseUrl() {
-    return this.baseUrl;
-  }
-
-  /**
-   * Sort routes to ensure proper matching order.
-   * Wildcard routes (*) and index routes (/) are moved to the bottom.
-   */
-  sortRoutes() {
-    const INDEX_PATH = "/";
-    const WILDCARD_PATTERNS = ["*", "(.*)"];
-    this.routes.sort((a, b) => {
-      const pathA = a.path || "*";
-      const pathB = b.path || "*";
-      const isWildcardA = WILDCARD_PATTERNS.includes(pathA);
-      const isWildcardB = WILDCARD_PATTERNS.includes(pathB);
-      const isIndexA = pathA === INDEX_PATH;
-      const isIndexB = pathB === INDEX_PATH;
-
-      // Both are wildcards or both are index - maintain order
-      if (isWildcardA && isWildcardB || isIndexA && isIndexB) {
-        return 0;
-      }
-
-      // Index path should come before wildcard
-      if (isIndexA && isWildcardB) {
-        return -1;
-      }
-      if (isWildcardA && isIndexB) {
-        return 1;
-      }
-
-      // Push wildcards to the bottom
-      if (isWildcardA) {
-        return 1;
-      }
-      if (isWildcardB) {
-        return -1;
-      }
-
-      // Push index to the bottom (but above wildcards)
-      if (isIndexA) {
-        return 1;
-      }
-      if (isIndexB) {
-        return -1;
-      }
-
-      // All other routes maintain their order
-      return 0;
-    });
-  }
 }
+export { Router };
 
 //# sourceMappingURL=Router.js.map

package/features/router/Router.js.map

@@ -1 +1 @@
-{"version":3,"names":["RouteUrl","Router","routes","constructor","baseUrl","setRoutes","forEach","route","index","findIndex","r","name","push","sortRoutes","findRoute","find","resolve","pathname","queryParams","pattern","path","matchResult","match","matchedRoute","params","onMatch","matched","getBaseUrl","INDEX_PATH","WILDCARD_PATTERNS","sort","a","b","pathA","pathB","isWildcardA","includes","isWildcardB","isIndexA","isIndexB"],"sources":["Router.ts"],"sourcesContent":["import type { RouteDefinition, MatchedRoute } from \"./abstractions.js\";\nimport { RouteUrl } from \"./RouteUrl.js\";\n\ninterface ResolveResult {\n    matchedRoute: MatchedRoute;\n    onMatch: (route: MatchedRoute) => void;\n}\n\n/**\n * Router manages a collection of route definitions and resolves pathnames to matched routes.\n */\nexport class Router {\n    private routes: RouteDefinition[] = [];\n    private baseUrl: string;\n\n    constructor(baseUrl: string = \"\") {\n        this.baseUrl = baseUrl;\n    }\n\n    /**\n     * Set or update route definitions. Routes with the same name will be replaced.\n     *\n     * @param routes - Array of route definitions to add\n     */\n    setRoutes(routes: RouteDefinition[]): void {\n        routes.forEach(route => {\n            const index = this.routes.findIndex(r => r.name === route.name);\n\n            if (index > -1) {\n                this.routes[index] = route;\n            } else {\n                this.routes.push(route);\n            }\n        });\n\n        this.sortRoutes();\n    }\n\n    /**\n     * Find a route by name.\n     *\n     * @param name - Route name to find\n     * @returns Route definition if found, undefined otherwise\n     */\n    findRoute(name: string): RouteDefinition | undefined {\n        return this.routes.find(r => r.name === name);\n    }\n\n    /**\n     * Resolve a pathname to a matched route.\n     * The pathname will be matched against patterns after stripping the baseUrl.\n     *\n     * @param pathname - The pathname to resolve (e.g., '/tenant123/cms/entries/123')\n     * @param queryParams - Optional query parameters to merge into route params\n     * @returns Matched route with onMatch callback, or null if no route matches\n     */\n    resolve(pathname: string, queryParams?: Record<string, unknown>): ResolveResult | null {\n        for (const route of this.routes) {\n            const pattern = route.path === \"*\" ? \"(.*)\" : route.path;\n            const matchResult = RouteUrl.match(pathname, pattern, this.baseUrl);\n\n            if (matchResult) {\n                const matchedRoute: MatchedRoute = {\n                    name: route.name,\n                    path: route.path,\n                    pathname,\n                    params: { ...matchResult.params, ...(queryParams || {}) }\n                };\n\n                const onMatch = (matched: MatchedRoute) => {\n                    route.onMatch(matched);\n                };\n\n                return { matchedRoute, onMatch };\n            }\n        }\n\n        return null;\n    }\n\n    /**\n     * Get the current baseUrl.\n     */\n    getBaseUrl(): string {\n        return this.baseUrl;\n    }\n\n    /**\n     * Sort routes to ensure proper matching order.\n     * Wildcard routes (*) and index routes (/) are moved to the bottom.\n     */\n    private sortRoutes(): void {\n        const INDEX_PATH = \"/\";\n        const WILDCARD_PATTERNS = [\"*\", \"(.*)\"];\n\n        this.routes.sort((a, b) => {\n            const pathA = a.path || \"*\";\n            const pathB = b.path || \"*\";\n\n            const isWildcardA = WILDCARD_PATTERNS.includes(pathA);\n            const isWildcardB = WILDCARD_PATTERNS.includes(pathB);\n            const isIndexA = pathA === INDEX_PATH;\n            const isIndexB = pathB === INDEX_PATH;\n\n            // Both are wildcards or both are index - maintain order\n            if ((isWildcardA && isWildcardB) || (isIndexA && isIndexB)) {\n                return 0;\n            }\n\n            // Index path should come before wildcard\n            if (isIndexA && isWildcardB) {\n                return -1;\n            }\n            if (isWildcardA && isIndexB) {\n                return 1;\n            }\n\n            // Push wildcards to the bottom\n            if (isWildcardA) {\n                return 1;\n            }\n            if (isWildcardB) {\n                return -1;\n            }\n\n            // Push index to the bottom (but above wildcards)\n            if (isIndexA) {\n                return 1;\n            }\n            if (isIndexB) {\n                return -1;\n            }\n\n            // All other routes maintain their order\n            return 0;\n        });\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"features/router/Router.js","sources":["../../../src/features/router/Router.ts"],"sourcesContent":["import type { RouteDefinition, MatchedRoute } from \"./abstractions.js\";\nimport { RouteUrl } from \"./RouteUrl.js\";\n\ninterface ResolveResult {\n    matchedRoute: MatchedRoute;\n    onMatch: (route: MatchedRoute) => void;\n}\n\n/**\n * Router manages a collection of route definitions and resolves pathnames to matched routes.\n */\nexport class Router {\n    private routes: RouteDefinition[] = [];\n    private baseUrl: string;\n\n    constructor(baseUrl: string = \"\") {\n        this.baseUrl = baseUrl;\n    }\n\n    /**\n     * Set or update route definitions. Routes with the same name will be replaced.\n     *\n     * @param routes - Array of route definitions to add\n     */\n    setRoutes(routes: RouteDefinition[]): void {\n        routes.forEach(route => {\n            const index = this.routes.findIndex(r => r.name === route.name);\n\n            if (index > -1) {\n                this.routes[index] = route;\n            } else {\n                this.routes.push(route);\n            }\n        });\n\n        this.sortRoutes();\n    }\n\n    /**\n     * Find a route by name.\n     *\n     * @param name - Route name to find\n     * @returns Route definition if found, undefined otherwise\n     */\n    findRoute(name: string): RouteDefinition | undefined {\n        return this.routes.find(r => r.name === name);\n    }\n\n    /**\n     * Resolve a pathname to a matched route.\n     * The pathname will be matched against patterns after stripping the baseUrl.\n     *\n     * @param pathname - The pathname to resolve (e.g., '/tenant123/cms/entries/123')\n     * @param queryParams - Optional query parameters to merge into route params\n     * @returns Matched route with onMatch callback, or null if no route matches\n     */\n    resolve(pathname: string, queryParams?: Record<string, unknown>): ResolveResult | null {\n        for (const route of this.routes) {\n            const pattern = route.path === \"*\" ? \"(.*)\" : route.path;\n            const matchResult = RouteUrl.match(pathname, pattern, this.baseUrl);\n\n            if (matchResult) {\n                const matchedRoute: MatchedRoute = {\n                    name: route.name,\n                    path: route.path,\n                    pathname,\n                    params: { ...matchResult.params, ...(queryParams || {}) }\n                };\n\n                const onMatch = (matched: MatchedRoute) => {\n                    route.onMatch(matched);\n                };\n\n                return { matchedRoute, onMatch };\n            }\n        }\n\n        return null;\n    }\n\n    /**\n     * Get the current baseUrl.\n     */\n    getBaseUrl(): string {\n        return this.baseUrl;\n    }\n\n    /**\n     * Sort routes to ensure proper matching order.\n     * Wildcard routes (*) and index routes (/) are moved to the bottom.\n     */\n    private sortRoutes(): void {\n        const INDEX_PATH = \"/\";\n        const WILDCARD_PATTERNS = [\"*\", \"(.*)\"];\n\n        this.routes.sort((a, b) => {\n            const pathA = a.path || \"*\";\n            const pathB = b.path || \"*\";\n\n            const isWildcardA = WILDCARD_PATTERNS.includes(pathA);\n            const isWildcardB = WILDCARD_PATTERNS.includes(pathB);\n            const isIndexA = pathA === INDEX_PATH;\n            const isIndexB = pathB === INDEX_PATH;\n\n            // Both are wildcards or both are index - maintain order\n            if ((isWildcardA && isWildcardB) || (isIndexA && isIndexB)) {\n                return 0;\n            }\n\n            // Index path should come before wildcard\n            if (isIndexA && isWildcardB) {\n                return -1;\n            }\n            if (isWildcardA && isIndexB) {\n                return 1;\n            }\n\n            // Push wildcards to the bottom\n            if (isWildcardA) {\n                return 1;\n            }\n            if (isWildcardB) {\n                return -1;\n            }\n\n            // Push index to the bottom (but above wildcards)\n            if (isIndexA) {\n                return 1;\n            }\n            if (isIndexB) {\n                return -1;\n            }\n\n            // All other routes maintain their order\n            return 0;\n        });\n    }\n}\n"],"names":["Router","baseUrl","routes","route","index","r","name","pathname","queryParams","pattern","matchResult","RouteUrl","matchedRoute","onMatch","matched","INDEX_PATH","WILDCARD_PATTERNS","a","b","pathA","pathB","isWildcardA","isWildcardB","isIndexA","isIndexB"],"mappings":";AAWO,MAAMA;IAIT,YAAYC,UAAkB,EAAE,CAAE;aAH1B,MAAM,GAAsB,EAAE;QAIlC,IAAI,CAAC,OAAO,GAAGA;IACnB;IAOA,UAAUC,MAAyB,EAAQ;QACvCA,OAAO,OAAO,CAACC,CAAAA;YACX,MAAMC,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAACC,CAAAA,IAAKA,EAAE,IAAI,KAAKF,MAAM,IAAI;YAE9D,IAAIC,QAAQ,IACR,IAAI,CAAC,MAAM,CAACA,MAAM,GAAGD;iBAErB,IAAI,CAAC,MAAM,CAAC,IAAI,CAACA;QAEzB;QAEA,IAAI,CAAC,UAAU;IACnB;IAQA,UAAUG,IAAY,EAA+B;QACjD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAACD,CAAAA,IAAKA,EAAE,IAAI,KAAKC;IAC5C;IAUA,QAAQC,QAAgB,EAAEC,WAAqC,EAAwB;QACnF,KAAK,MAAML,SAAS,IAAI,CAAC,MAAM,CAAE;YAC7B,MAAMM,UAAUN,AAAe,QAAfA,MAAM,IAAI,GAAW,SAASA,MAAM,IAAI;YACxD,MAAMO,cAAcC,SAAS,KAAK,CAACJ,UAAUE,SAAS,IAAI,CAAC,OAAO;YAElE,IAAIC,aAAa;gBACb,MAAME,eAA6B;oBAC/B,MAAMT,MAAM,IAAI;oBAChB,MAAMA,MAAM,IAAI;oBAChBI;oBACA,QAAQ;wBAAE,GAAGG,YAAY,MAAM;wBAAE,GAAIF,eAAe,CAAC,CAAC;oBAAE;gBAC5D;gBAEA,MAAMK,UAAU,CAACC;oBACbX,MAAM,OAAO,CAACW;gBAClB;gBAEA,OAAO;oBAAEF;oBAAcC;gBAAQ;YACnC;QACJ;QAEA,OAAO;IACX;IAKA,aAAqB;QACjB,OAAO,IAAI,CAAC,OAAO;IACvB;IAMQ,aAAmB;QACvB,MAAME,aAAa;QACnB,MAAMC,oBAAoB;YAAC;YAAK;SAAO;QAEvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAACC,GAAGC;YACjB,MAAMC,QAAQF,EAAE,IAAI,IAAI;YACxB,MAAMG,QAAQF,EAAE,IAAI,IAAI;YAExB,MAAMG,cAAcL,kBAAkB,QAAQ,CAACG;YAC/C,MAAMG,cAAcN,kBAAkB,QAAQ,CAACI;YAC/C,MAAMG,WAAWJ,UAAUJ;YAC3B,MAAMS,WAAWJ,UAAUL;YAG3B,IAAKM,eAAeC,eAAiBC,YAAYC,UAC7C,OAAO;YAIX,IAAID,YAAYD,aACZ,OAAO;YAEX,IAAID,eAAeG,UACf,OAAO;YAIX,IAAIH,aACA,OAAO;YAEX,IAAIC,aACA,OAAO;YAIX,IAAIC,UACA,OAAO;YAEX,IAAIC,UACA,OAAO;YAIX,OAAO;QACX;IACJ;AACJ"}