valyrian.js 7.2.12 → 8.0.1

package/dist/request/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../lib/request/index.ts"],
-  "sourcesContent": ["import { isNodeJs } from \"valyrian.js\";\n\ninterface UrlOptions {\n  base: string; // Used to prefix the url for scoped requests.\n  node: string | null; // Used to redirect local requests to node server for server side rendering.\n  api: string | null; // Used to redirect api requests to node server for server side rendering.\n}\n\ninterface RequestOptions {\n  allowedMethods?: string[];\n  urls?: UrlOptions;\n  [key: string | number | symbol]: any;\n}\n\ninterface RequestOptionsWithUrls extends RequestOptions {\n  urls: UrlOptions;\n  allowedMethods: string[];\n}\n\ninterface SendOptions extends RequestOptionsWithUrls, RequestInit {\n  allowedMethods: string[];\n  method: string;\n  headers: Record<string, string>;\n  resolveWithFullResponse?: boolean;\n}\n\nexport interface RequestInterface {\n  // eslint-disable-next-line no-unused-vars\n  (method: string, url: string, data?: Record<string, any>, options?: Partial<SendOptions>): any | Response;\n  // eslint-disable-next-line no-unused-vars\n  new: (baseUrl: string, options?: RequestOptions) => RequestInterface;\n  // eslint-disable-next-line no-unused-vars\n  setOptions: (key: string, value: any) => void;\n  // eslint-disable-next-line no-unused-vars\n  getOptions: (key?: string) => RequestOptions | void;\n  // eslint-disable-next-line no-unused-vars\n  get: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  post: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  put: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  patch: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  delete: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  head: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  options: (url: string, data?: Record<string, any>, options?: Record<string, any>) => any | Response;\n  [key: string | number | symbol]: any;\n}\n\n// This method is used to serialize an object into a query string.\nfunction serialize(obj: Record<string, any>, prefix: string = \"\"): string {\n  return Object.keys(obj)\n    .map((prop: string) => {\n      const k = prefix ? `${prefix}[${prop}]` : prop;\n      return typeof obj[prop] === \"object\"\n        ? serialize(obj[prop], k)\n        : `${encodeURIComponent(k)}=${encodeURIComponent(obj[prop])}`;\n    })\n    .join(\"&\");\n}\n\nfunction parseUrl(url: string, options: RequestOptionsWithUrls) {\n  let u = /^https?/gi.test(url) ? url : options.urls.base + url;\n\n  const parts = u.split(\"?\");\n  u = parts[0].trim().replace(/^\\/\\//, \"/\").replace(/\\/$/, \"\").trim();\n\n  if (parts[1]) {\n    u += `?${parts[1]}`;\n  }\n\n  if (isNodeJs && typeof options.urls.node === \"string\") {\n    options.urls.node = options.urls.node;\n\n    if (typeof options.urls.api === \"string\") {\n      options.urls.api = options.urls.api.replace(/\\/$/gi, \"\").trim();\n      u = u.replace(options.urls.api, options.urls.node);\n    }\n\n    if (!/^https?/gi.test(u)) {\n      u = options.urls.node + u;\n    }\n  }\n\n  return u;\n}\n\nconst defaultOptions: RequestOptions = { allowedMethods: [\"get\", \"post\", \"put\", \"patch\", \"delete\", \"head\", \"options\"] };\n\n// eslint-disable-next-line sonarjs/cognitive-complexity\nfunction Requester(baseUrl = \"\", options: RequestOptions = defaultOptions) {\n  const url = baseUrl.replace(/\\/$/gi, \"\").trim();\n  if (!options.urls) {\n    options.urls = {\n      base: \"\",\n      node: null,\n      api: null\n    };\n  }\n\n  if (!options.allowedMethods) {\n    options.allowedMethods = defaultOptions.allowedMethods;\n  }\n\n  const opts: RequestOptionsWithUrls = {\n    ...(options as RequestOptionsWithUrls),\n    urls: {\n      node: options.urls.node || null,\n      api: options.urls.api || null,\n      base: options.urls.base ? options.urls.base + url : url\n    }\n  };\n\n  const request = async function request(method: string, url: string, data?: Record<string, any>, options = {}) {\n    const innerOptions: SendOptions = {\n      method: method.toUpperCase(),\n      headers: {},\n      resolveWithFullResponse: false,\n      ...opts,\n      ...options\n    } as SendOptions;\n\n    if (!innerOptions.headers.Accept) {\n      innerOptions.headers.Accept = \"application/json\";\n    }\n\n    const acceptType = innerOptions.headers.Accept;\n    const contentType = innerOptions.headers[\"Content-Type\"] || innerOptions.headers[\"content-type\"] || \"\";\n\n    if (innerOptions.allowedMethods.indexOf(method) === -1) {\n      throw new Error(\"Method not allowed\");\n    }\n\n    if (data) {\n      if (innerOptions.method === \"GET\" && typeof data === \"object\") {\n        url += `?${serialize(data)}`;\n      }\n\n      if (innerOptions.method !== \"GET\") {\n        if (/json/gi.test(contentType)) {\n          innerOptions.body = JSON.stringify(data);\n        } else {\n          let formData;\n          if (data instanceof FormData) {\n            formData = data;\n          } else {\n            formData = new FormData();\n            for (const i in data) {\n              formData.append(i, data[i]);\n            }\n          }\n          innerOptions.body = formData;\n        }\n      }\n    }\n\n    const response = await fetch(parseUrl(url, opts), innerOptions);\n    let body = null;\n    if (!response.ok) {\n      const err = new Error(response.statusText) as Error & { response?: any; body?: any };\n      err.response = response;\n      if (/text/gi.test(acceptType)) {\n        err.body = await response.text();\n      }\n\n      if (/json/gi.test(acceptType)) {\n        try {\n          err.body = await response.json();\n        } catch (error) {\n          // ignore\n        }\n      }\n\n      throw err;\n    }\n\n    if (innerOptions.resolveWithFullResponse) {\n      return response;\n    }\n\n    if (/text/gi.test(acceptType)) {\n      body = await response.text();\n      return body;\n    }\n\n    if (/json/gi.test(acceptType)) {\n      try {\n        body = await response.json();\n        return body;\n      } catch (error) {\n        // ignore\n      }\n    }\n\n    return response;\n  } as unknown as RequestInterface;\n\n  request.new = (baseUrl: string, options?: RequestOptions) => Requester(baseUrl, { ...opts, ...(options || {}) });\n\n  request.setOption = (key: string, value: any) => {\n    let result = opts;\n\n    const parsed = key.split(\".\");\n    let next;\n\n    while (parsed.length) {\n      next = parsed.shift() as string;\n\n      const nextIsArray = next.indexOf(\"[\") > -1;\n      if (nextIsArray) {\n        const idx = next.replace(/\\D/gi, \"\");\n        next = next.split(\"[\")[0];\n        parsed.unshift(idx);\n      }\n\n      if (parsed.length > 0 && typeof result[next] !== \"object\") {\n        result[next] = nextIsArray ? [] : {};\n      }\n\n      if (parsed.length === 0 && typeof value !== \"undefined\") {\n        result[next] = value;\n      }\n\n      result = result[next];\n    }\n\n    return result;\n  };\n\n  request.getOptions = (key?: string) => {\n    if (!key) {\n      return opts;\n    }\n\n    let result = opts;\n    const parsed = key.split(\".\");\n    let next;\n\n    while (parsed.length) {\n      next = parsed.shift() as string;\n\n      const nextIsArray = next.indexOf(\"[\") > -1;\n      if (nextIsArray) {\n        const idx = next.replace(/\\D/gi, \"\");\n        next = next.split(\"[\")[0];\n        parsed.unshift(idx);\n      }\n\n      if (parsed.length > 0 && typeof result[next] !== \"object\") {\n        return null;\n      }\n\n      if (parsed.length === 0) {\n        return result[next];\n      }\n\n      result = result[next];\n    }\n  };\n\n  opts.allowedMethods.forEach(\n    (method) =>\n      (request[method] = (url: string, data?: Record<string, any>, options?: Record<string, any>) =>\n        request(method, url, data, options))\n  );\n\n  return request;\n}\n\nexport const request = Requester();\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { isNodeJs } from \"valyrian.js\";\nimport { get, set } from \"valyrian.js/utils\";\n\ninterface UrlOptions {\n  base?: string; // Used to prefix the url for scoped requests.\n  node?: string | null; // Used to redirect local requests to node server for server side rendering.\n  api?: string | null; // Used to redirect api requests to node server for server side rendering.\n}\n\ninterface RequestOptions {\n  allowedMethods?: string[];\n  urls?: UrlOptions;\n  [key: string | number | symbol]: any;\n}\n\ninterface RequestOptionsWithUrls extends RequestOptions {\n  urls: UrlOptions;\n  allowedMethods: string[];\n}\n\ninterface SendOptions extends RequestOptionsWithUrls, RequestInit {\n  allowedMethods: string[];\n  method: string;\n  headers: Record<string, string>;\n  resolveWithFullResponse?: boolean;\n}\n\nexport interface RequestInterface {\n  // eslint-disable-next-line no-unused-vars\n  (method: string, url: string, data?: Record<string, any> | null, options?: Partial<SendOptions>): any | Response;\n  // eslint-disable-next-line no-unused-vars\n  new: (baseUrl: string, options?: RequestOptions) => RequestInterface;\n  // eslint-disable-next-line no-unused-vars\n  setOptions: (key: string, value: any) => void;\n  // eslint-disable-next-line no-unused-vars\n  getOptions: (key?: string) => RequestOptions | void;\n  // eslint-disable-next-line no-unused-vars\n  get: (url: string, data?: Record<string, any> | null, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  post: (url: string, data?: Record<string, any> | null, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  put: (url: string, data?: Record<string, any> | null, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  patch: (url: string, data?: Record<string, any> | null, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  delete: (url: string, data?: Record<string, any> | null, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  head: (url: string, data?: Record<string, any> | null, options?: Record<string, any>) => any | Response;\n  // eslint-disable-next-line no-unused-vars\n  options: (url: string, data?: Record<string, any> | null, options?: Record<string, any>) => any | Response;\n  [key: string | number | symbol]: any;\n}\n\n// This method is used to serialize an object into a query string.\nfunction serialize(obj: Record<string, any>, prefix: string = \"\"): URLSearchParams {\n  const params = new URLSearchParams();\n\n  Object.keys(obj).forEach((prop: string) => {\n    const key = prefix ? `${prefix}[${prop}]` : prop;\n    if (typeof obj[prop] === \"object\") {\n      params.append(key, serialize(obj[prop], key).toString());\n    } else {\n      params.append(key, obj[prop]);\n    }\n  });\n\n  return params;\n}\n\nfunction serializeFormData(data: Record<string, any>): FormData {\n  return Object.entries(data).reduce((fd, [key, value]) => {\n    fd.append(key, value);\n    return fd;\n  }, new FormData());\n}\n\nfunction parseUrl(url: string, options: RequestOptionsWithUrls) {\n  const urlWithoutSlash = url.replace(/\\/+$/, \"\").trim();\n  const u = /^https?/gi.test(urlWithoutSlash) ? urlWithoutSlash : `${options.urls.base}${urlWithoutSlash}`;\n\n  if (isNodeJs && typeof options.urls.node === \"string\") {\n    if (typeof options.urls.api === \"string\") {\n      return new URL(u.replace(options.urls.api, options.urls.node));\n    }\n\n    if (!/^https?/gi.test(u)) {\n      return new URL(u, options.urls.node);\n    }\n  }\n\n  if (/^https?/gi.test(u)) {\n    return new URL(u);\n  }\n\n  return new URL(u, options.urls.base);\n}\n\nconst defaultOptions: RequestOptions = { allowedMethods: [\"get\", \"post\", \"put\", \"patch\", \"delete\", \"head\", \"options\"] };\n\n// eslint-disable-next-line sonarjs/cognitive-complexity\nfunction Requester(baseUrl = \"\", options: RequestOptions = defaultOptions) {\n  const url = baseUrl.replace(/\\/$/gi, \"\").trim();\n  if (!options.urls) {\n    options.urls = {\n      base: \"\",\n      node: null,\n      api: null\n    };\n  }\n\n  if (!options.allowedMethods) {\n    options.allowedMethods = defaultOptions.allowedMethods;\n  }\n\n  const opts: RequestOptionsWithUrls = {\n    ...(options as RequestOptionsWithUrls),\n    urls: {\n      node: options.urls.node || null,\n      api: options.urls.api || null,\n      base: options.urls.base ? options.urls.base + url : url\n    }\n  };\n\n  // eslint-disable-next-line complexity\n  const request = async function request(\n    method: string,\n    url: string,\n    data?: Record<string, any> | null,\n    options: Record<string, any> = {}\n  ) {\n    const innerOptions: SendOptions = {\n      method: method.toUpperCase(),\n      headers: {},\n      resolveWithFullResponse: false,\n      ...opts,\n      ...options\n    } as SendOptions;\n\n    innerOptions.headers = { ...innerOptions.headers, ...opts.headers, ...options.headers };\n\n    if (!innerOptions.headers.Accept) {\n      innerOptions.headers.Accept = \"application/json\";\n    }\n\n    const acceptType = innerOptions.headers.Accept;\n    const contentType = innerOptions.headers[\"Content-Type\"] || innerOptions.headers[\"content-type\"] || \"\";\n\n    if (!innerOptions.allowedMethods.includes(method)) {\n      throw new Error(`Method ${method} not allowed. Allowed methods: ${innerOptions.allowedMethods.join(\", \")}`);\n    }\n\n    let finalUrl: URL;\n    try {\n      finalUrl = parseUrl(url, opts);\n    } catch (error) {\n      throw new Error(`Failed to parse URL: ${url}`);\n    }\n\n    if (data) {\n      const isJson = /json/gi.test(contentType);\n\n      if (innerOptions.method === \"GET\" && typeof data === \"object\") {\n        finalUrl.search = serialize(data).toString();\n      } else if (innerOptions.method !== \"GET\") {\n        innerOptions.body = isJson ? JSON.stringify(data) : serializeFormData(data);\n      }\n    }\n\n    const response = await fetch(finalUrl.toString(), innerOptions);\n    let body = null;\n    if (!response.ok) {\n      const err = new Error(`${response.status}: ${response.statusText}`) as Error & { response?: any; body?: any };\n      err.response = response;\n      if (/text/gi.test(acceptType)) {\n        err.body = await response.text();\n      }\n\n      if (/json/gi.test(acceptType)) {\n        try {\n          err.body = await response.json();\n        } catch (error) {\n          err.body = null;\n          // eslint-disable-next-line no-console\n          console.warn(\"Failed to parse JSON response:\", error);\n        }\n      }\n\n      throw err;\n    }\n\n    if (innerOptions.resolveWithFullResponse) {\n      return response;\n    }\n\n    if (/text/gi.test(acceptType)) {\n      body = await response.text();\n    } else if (/json/gi.test(acceptType)) {\n      try {\n        body = await response.json();\n      } catch (error) {\n        // eslint-disable-next-line no-console\n        console.warn(\"Failed to parse JSON response:\", error);\n        body = null;\n      }\n    } else if (/blob/gi.test(acceptType)) {\n      body = await response.blob();\n    } else if (/arraybuffer/gi.test(acceptType)) {\n      body = await response.arrayBuffer();\n    } else {\n      body = response;\n    }\n\n    return body || response;\n  } as unknown as RequestInterface;\n\n  request.new = (baseUrl: string, options?: RequestOptions) => Requester(baseUrl, { ...opts, ...(options || {}) });\n\n  request.setOption = (key: string, value: any) => {\n    set(opts, key, value);\n    return opts;\n  };\n\n  request.getOptions = (key?: string) => {\n    if (key) {\n      return get(opts, key);\n    }\n\n    return opts;\n  };\n\n  Object.assign(\n    request,\n    opts.allowedMethods.reduce((acc: Record<string, any>, method) => {\n      acc[method] = (url: string, data?: Record<string, any> | null, options?: Record<string, any>) =>\n        request(method, url, data, options);\n      return acc;\n    }, {})\n  );\n\n  return request;\n}\n\nexport const request = Requester();\n"],
+  "mappings": "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",
   "names": ["request", "url", "options", "baseUrl"]
 }

package/dist/router/index.d.ts

@@ -1,41 +1,38 @@
 import { Component, POJOComponent, VnodeComponentInterface } from "valyrian.js";
-interface Request {
+export interface Request {
     params: Record<string, any>;
     query: Record<string, any>;
     url: string;
     path: string;
     matches: string[];
-    redirect: (path: string, parentComponent?: Component | POJOComponent | VnodeComponentInterface) => false;
+    redirect: (path: string) => Promise<string | void>;
 }
-interface Middleware {
-    (req: Request, res?: any): Promise<any | Component | POJOComponent | VnodeComponentInterface> | any | Component | POJOComponent | VnodeComponentInterface;
+export interface Middleware {
+    (req: Request, err?: any): Promise<any | Component | POJOComponent | VnodeComponentInterface> | any | Component | POJOComponent | VnodeComponentInterface;
 }
-interface Middlewares extends Array<Middleware> {
-}
-interface Path {
-    method: string;
-    path: string;
-    middlewares: Middlewares;
-    params: string[];
-    regexp: RegExp;
-}
-interface RouterInterface {
-    paths: Path[];
-    container: Element | string | null;
-    query: Record<string, string | number>;
-    options: Record<string, any>;
-    url: string;
-    path: string;
-    params: Record<string, string | number | any>;
-    matches: string[];
-    pathPrefix: string;
-    add(method: string, ...args: Middlewares): Router;
-    use(...args: (string | Middleware | Router)[]): Router;
-    routes(): string[];
-    go(path: string, parentComponent?: Component | POJOComponent | VnodeComponentInterface): Promise<string | void>;
-}
-export declare class Router implements RouterInterface {
-    paths: Path[];
+export declare const RouterError: {
+    new (message?: string): {
+        status: number | undefined;
+        name: string;
+        message: string;
+        stack?: string;
+        cause?: unknown;
+    };
+    new (message?: string, options?: ErrorOptions): {
+        status: number | undefined;
+        name: string;
+        message: string;
+        stack?: string;
+        cause?: unknown;
+    };
+    captureStackTrace(targetObject: object, constructorOpt?: Function): void;
+    captureStackTrace(targetObject: object, constructorOpt?: Function): void;
+    prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
+    stackTraceLimit: number;
+};
+type RouteParams = string | Middleware | Router | (string | Middleware | Router | RouteParams)[];
+export declare class Router {
+    private routeTree;
     container: Element | string | null;
     query: Record<string, string | number>;
     options: Record<string, any>;
@@ -44,12 +41,18 @@ export declare class Router implements RouterInterface {
     params: Record<string, string | number | any>;
     matches: string[];
     pathPrefix: string;
+    private errorHandlers;
     constructor(pathPrefix?: string);
-    add(path: string, ...middlewares: Middlewares): Router;
-    use(...middlewares: Middlewares | Router[] | string[]): Router;
+    add(...args: RouteParams[]): Router;
+    catch(...args: (number | string | Error | typeof Error | Middleware)[]): Router;
     routes(): string[];
-    go(path: string, parentComponent?: Component | POJOComponent | VnodeComponentInterface, preventPushState?: boolean): Promise<string | void>;
+    go(path: string, parentComponent?: Component | POJOComponent | VnodeComponentInterface): Promise<string | void>;
     getOnClickHandler(url: string): (e: MouseEvent) => void;
+    private getAllRoutes;
+    private createRequest;
+    private getErrorConditionMiddlewares;
+    private handleError;
+    private searchComponent;
 }
 export declare function redirect(url: string, parentComponent?: Component | POJOComponent | VnodeComponentInterface, preventPushState?: boolean): Promise<string | void>;
 export declare function mountRouter(elementContainer: string | any, router: Router): void;

package/dist/router/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/router/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EACT,aAAa,EACb,uBAAuB,EASxB,MAAM,aAAa,CAAC;AAErB,UAAU,OAAO;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,uBAAuB,KAAK,KAAK,CAAC;CAC1G;AAED,UAAU,UAAU;IAElB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,GACpB,OAAO,CAAC,GAAG,GAAG,SAAS,GAAG,aAAa,GAAG,uBAAuB,CAAC,GAClE,GAAG,GACH,SAAS,GACT,aAAa,GACb,uBAAuB,CAAC;CAC7B;AAED,UAAU,WAAY,SAAQ,KAAK,CAAC,UAAU,CAAC;CAAG;AAElD,UAAU,IAAI;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,eAAe;IACvB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC;IAC9C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IAEnB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,WAAW,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC;IAEvD,MAAM,IAAI,MAAM,EAAE,CAAC;IAEnB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,uBAAuB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACjH;AAuJD,qBAAa,MAAO,YAAW,eAAe;IAC5C,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAQ;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAM;IAC5C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAClC,GAAG,EAAE,MAAM,CAAM;IACjB,IAAI,EAAE,MAAM,CAAM;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC,CAAM;IACnD,OAAO,EAAE,MAAM,EAAE,CAAM;IACvB,UAAU,EAAE,MAAM,CAAM;gBAEZ,UAAU,GAAE,MAAW;IAInC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,WAAW,GAAG,MAAM;IAMtD,GAAG,CAAC,GAAG,WAAW,EAAE,WAAW,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM;IA2B9D,MAAM,IAAI,MAAM,EAAE;IAIZ,EAAE,CACN,IAAI,EAAE,MAAM,EACZ,eAAe,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,uBAAuB,EACrE,gBAAgB,UAAQ,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAwCzB,iBAAiB,CAAC,GAAG,EAAE,MAAM,OAChB,UAAU;CAOxB;AAID,wBAAgB,QAAQ,CACtB,GAAG,EAAE,MAAM,EACX,eAAe,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,uBAAuB,EACrE,gBAAgB,UAAQ,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAKxB;AAED,wBAAgB,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAkBhF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/router/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EACT,aAAa,EACb,uBAAuB,EASxB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,UAAU;IAEzB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,GACpB,OAAO,CAAC,GAAG,GAAG,SAAS,GAAG,aAAa,GAAG,uBAAuB,CAAC,GAClE,GAAG,GACH,SAAS,GACT,aAAa,GACb,uBAAuB,CAAC;CAC7B;AA4ID,eAAO,MAAM,WAAW;;gBACd,MAAM,GAAG,SAAS;;;;;;;gBAAlB,MAAM,GAAG,SAAS;;;;;;;;mDA6BxB,OAAK,QAAQ;;CA5BhB,CAAC;AAEF,KAAK,WAAW,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC;AAEjG,qBAAa,MAAM;IACjB,OAAO,CAAC,SAAS,CAAmB;IACpC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAQ;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAM;IAC5C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAClC,GAAG,EAAE,MAAM,CAAM;IACjB,IAAI,EAAE,MAAM,CAAM;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC,CAAM;IACnD,OAAO,EAAE,MAAM,EAAE,CAAM;IACvB,UAAU,EAAE,MAAM,CAAM;IAExB,OAAO,CAAC,aAAa,CAAoE;gBAE7E,UAAU,GAAE,MAAW;IAInC,GAAG,CAAC,GAAG,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM;IA8BnC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,KAAK,GAAG,UAAU,CAAC,EAAE,GAAG,MAAM;IAyB/E,MAAM,IAAI,MAAM,EAAE;IAKZ,EAAE,CACN,IAAI,EAAE,MAAM,EACZ,eAAe,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,uBAAuB,GACpE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA2EzB,iBAAiB,CAAC,GAAG,EAAE,MAAM,OAChB,UAAU;IAYvB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,4BAA4B;YAgCtB,WAAW;YAwEX,eAAe;CA4B9B;AAID,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,MAAM,EACX,eAAe,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,uBAAuB,EACrE,gBAAgB,UAAQ,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAOxB;AAED,wBAAgB,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAiBhF"}

package/dist/router/index.js

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var router_exports = {};
 __export(router_exports, {
   Router: () => Router,
+  RouterError: () => RouterError,
   mountRouter: () => mountRouter,
   redirect: () => redirect
 });
@@ -39,83 +40,85 @@ function getPathWithoutLastSlash(path) {
   }
   return pathWithoutLastSlash;
 }
-var addPath = ({
-  router,
-  method,
-  path,
-  middlewares
-}) => {
-  if (!method || !path || !Array.isArray(middlewares) || middlewares.length === 0) {
-    throw new Error(`Invalid route input: ${method} ${path} ${middlewares}`);
-  }
-  const realpath = path.replace(/(\S)(\/+)$/, "$1");
-  const params = (realpath.match(/:(\w+)?/gi) || []).map((param) => param.slice(1));
-  const regexpPath = "^" + realpath.replace(/:(\w+)/gi, "([^\\/\\s]+)") + "$";
-  router.paths.push({
-    method,
-    path: realpath,
-    middlewares: flat(middlewares),
-    params,
-    regexp: new RegExp(regexpPath, "i")
-  });
-};
 function parseQuery(queryParts) {
   const parts = queryParts ? queryParts.split("&") : [];
   const query = {};
   for (const nameValue of parts) {
     const [name, value] = nameValue.split("=", 2);
-    query[name] = value || "";
+    query[name] = isNaN(Number(value)) === false ? Number(value) : value === "true" ? true : value === "false" ? false : value;
   }
   return query;
 }
-function searchMiddlewares(router, path) {
-  const middlewares = [];
-  const params = {};
-  const matches = [];
-  for (const item of router.paths) {
-    const match = item.regexp.exec(path);
-    if (Array.isArray(match)) {
-      middlewares.push(...item.middlewares);
-      match.shift();
-      for (const [index, key] of item.params.entries()) {
-        params[key] = match[index];
-      }
-      matches.push(...match);
-      if (item.method === "add") {
-        router.path = getPathWithoutPrefix(item.path, router.pathPrefix);
-        break;
+var RouteTree = class {
+  root = { segment: "", children: /* @__PURE__ */ new Map(), isDynamic: false };
+  addRoute(path, middlewares) {
+    const segments = path === "/" ? [path] : path.split("/").filter(Boolean);
+    let currentNode = this.root;
+    for (const segment of segments) {
+      const isDynamic = segment.startsWith(":");
+      const key = isDynamic ? ":" : segment;
+      if (!currentNode.children.has(key)) {
+        currentNode.children.set(key, {
+          segment,
+          children: /* @__PURE__ */ new Map(),
+          isDynamic,
+          paramKey: isDynamic ? segment.slice(1) : void 0
+        });
       }
+      currentNode = currentNode.children.get(key);
     }
+    currentNode.middlewares = middlewares;
   }
-  router.params = params;
-  router.matches = matches;
-  return middlewares;
-}
-async function searchComponent(router, middlewares) {
-  const request = {
-    params: router.params,
-    query: router.query,
-    url: router.url,
-    path: router.path,
-    matches: router.matches,
-    redirect: (path, parentComponent) => {
-      router.go(path, parentComponent);
-      return false;
-    }
-  };
-  let response;
-  for (const middleware of middlewares) {
-    response = await middleware(request, response);
-    if (response !== void 0 && ((0, import_valyrian.isComponent)(response) || (0, import_valyrian.isVnodeComponent)(response))) {
-      return response;
-    }
-    if (response === false) {
-      return false;
+  // Search for a route in the tree
+  // eslint-disable-next-line sonarjs/cognitive-complexity
+  findRoute(path) {
+    const pathWithoutLastSlash = getPathWithoutLastSlash(path);
+    const segments = pathWithoutLastSlash === "/" ? [pathWithoutLastSlash] : pathWithoutLastSlash.split("/").filter(Boolean);
+    let currentNode = this.root;
+    const params = {};
+    const wildcardMiddlewares = [];
+    const segmentsLength = segments.length;
+    for (let i = 0; i < segmentsLength; i++) {
+      if (!currentNode) {
+        break;
+      }
+      const segment = segments[i];
+      let found = false;
+      for (const [key, child] of currentNode.children) {
+        if (key === segment) {
+          currentNode = child;
+          found = true;
+          break;
+        }
+        if (segment !== ".*" && key === ":") {
+          currentNode = child;
+          params[child.paramKey] = segment;
+          found = true;
+          break;
+        }
+        if (key === ".*" && !found) {
+          wildcardMiddlewares.push(...child.middlewares || []);
+        }
+      }
+      if (!found) {
+        if (currentNode.children.has(".*")) {
+          return { middlewares: wildcardMiddlewares, params };
+        }
+        return null;
+      }
     }
+    const allMiddlewares = [...wildcardMiddlewares, ...currentNode.middlewares || []];
+    if (allMiddlewares.length === 0) {
+      return null;
+    }
+    return { middlewares: allMiddlewares, params };
   }
-}
+};
+var RouterError = class RouterError2 extends Error {
+  status = 500;
+};
 var Router = class _Router {
-  paths = [];
+  routeTree = new RouteTree();
   container = null;
   query = {};
   options = {};
@@ -124,55 +127,93 @@ var Router = class _Router {
   params = {};
   matches = [];
   pathPrefix = "";
+  errorHandlers = /* @__PURE__ */ new Map();
   constructor(pathPrefix = "") {
     this.pathPrefix = pathPrefix;
   }
-  add(path, ...middlewares) {
-    const pathWithoutLastSlash = getPathWithoutLastSlash(`${this.pathPrefix}${path}`);
-    addPath({ router: this, method: "add", path: pathWithoutLastSlash, middlewares });
-    return this;
-  }
-  use(...middlewares) {
+  add(...args) {
+    const flatArgs = flat(args);
     const path = getPathWithoutLastSlash(
-      `${this.pathPrefix}${typeof middlewares[0] === "string" ? middlewares.shift() : "/"}`
+      `${this.pathPrefix}${typeof flatArgs[0] === "string" ? flatArgs.shift() : "/.*"}`
     );
-    for (const item of middlewares) {
-      if (item instanceof _Router) {
-        const subrouter = item;
-        for (const subpath of subrouter.paths) {
-          addPath({
-            router: this,
-            method: subpath.method,
-            path: `${path}${subpath.path}`.replace(/^\/\//, "/"),
-            middlewares: subpath.middlewares
-          });
-        }
-        continue;
+    if (flatArgs.length === 1 && flatArgs[0] instanceof _Router) {
+      const subrouter = flatArgs[0];
+      for (const subroute of subrouter.routes()) {
+        const subroutePath = `${path}${subroute}`;
+        this.routeTree.addRoute(subroutePath, subrouter.routeTree.findRoute(subroute).middlewares || []);
+      }
+    } else {
+      if (flatArgs.some((item) => item instanceof _Router)) {
+        throw new RouterError("You cannot add middlewares when adding a subrouter.");
       }
-      if (typeof item === "function") {
-        addPath({ router: this, method: "use", path: `${path}.*`, middlewares: [item] });
+      if (flatArgs.some((item) => typeof item !== "function")) {
+        throw new RouterError("All middlewares must be functions.");
       }
+      this.routeTree.addRoute(path, flatArgs);
     }
     return this;
   }
+  catch(...args) {
+    const condition = typeof args[0] === "number" || typeof args[0] === "string" || args[0].name.includes("Error") ? args.shift() : "generic";
+    if (typeof condition !== "number" && typeof condition !== "string" && !condition.name.includes("Error")) {
+      throw new RouterError("The condition must be a number, string or an instance of Error.");
+    }
+    if (args.some((item) => typeof item !== "function")) {
+      throw new RouterError("All middlewares must be functions.");
+    }
+    let handlers = this.errorHandlers.get(condition);
+    if (!handlers) {
+      handlers = [];
+      this.errorHandlers.set(condition, handlers);
+    }
+    handlers.push(...args);
+    return this;
+  }
   routes() {
-    return this.paths.filter((path) => path.method === "add").map((path) => path.path);
+    return this.getAllRoutes(this.routeTree.root, "");
   }
-  async go(path, parentComponent, preventPushState = false) {
+  // eslint-disable-next-line sonarjs/cognitive-complexity
+  async go(path, parentComponent) {
     if (!path) {
-      throw new Error("router.url.required");
+      return this.handleError(new RouterError("The URL is empty."), parentComponent);
+    }
+    if (/%[^0-9A-Fa-f]{2}/.test(path)) {
+      return this.handleError(new RouterError(`The URL ${path} is malformed.`));
     }
     const constructedPath = getPathWithoutLastSlash(`${this.pathPrefix}${path}`);
     const parts = constructedPath.split("?", 2);
     this.url = constructedPath;
     this.query = parseQuery(parts[1]);
-    const middlewares = searchMiddlewares(this, parts[0].replace(/(.+)\/$/, "$1").split("#")[0]);
-    let component = await searchComponent(this, middlewares);
+    const finalPath = parts[0].replace(/(.+)\/$/, "$1").split("#")[0];
+    this.path = path;
+    let route = this.routeTree.findRoute(finalPath);
+    if (!route || !route.middlewares) {
+      const finalPathParts = finalPath.split("/");
+      while (finalPathParts.length > 0) {
+        finalPathParts.pop();
+        const wildcardRoute = this.routeTree.findRoute(finalPathParts.join("/") + "/.*");
+        if (wildcardRoute) {
+          route = wildcardRoute;
+          break;
+        }
+      }
+      if (!route || !route.middlewares) {
+        const error = new RouterError(`The URL ${constructedPath} was not found in the router's registered paths.`);
+        error.status = 404;
+        return this.handleError(error, parentComponent);
+      }
+    }
+    const { middlewares, params } = route;
+    this.params = params;
+    let component = await this.searchComponent(middlewares, parentComponent);
     if (component === false) {
       return;
     }
     if (!component) {
-      throw new Error(`The url ${constructedPath} requested wasn't found`);
+      return this.handleError(
+        new RouterError(`The URL ${constructedPath} did not return a valid component.`),
+        parentComponent
+      );
     }
     if ((0, import_valyrian.isComponent)(parentComponent) || (0, import_valyrian.isVnodeComponent)(parentComponent)) {
       const childComponent = (0, import_valyrian.isVnodeComponent)(component) ? component : (0, import_valyrian.v)(component, {});
@@ -183,7 +224,7 @@ var Router = class _Router {
         component = (0, import_valyrian.v)(parentComponent, {}, childComponent);
       }
     }
-    if (!import_valyrian.isNodeJs && !preventPushState) {
+    if (!import_valyrian.isNodeJs && window.location.pathname + window.location.search !== constructedPath) {
       window.history.pushState(null, "", constructedPath);
     }
     if (this.container) {
@@ -192,17 +233,128 @@ var Router = class _Router {
   }
   getOnClickHandler(url) {
     return (e) => {
+      if (e.button !== 0 || e.ctrlKey || e.metaKey || e.shiftKey || e.altKey || e.defaultPrevented) {
+        return;
+      }
       if (typeof url === "string" && url.length > 0) {
         this.go(url);
       }
       e.preventDefault();
     };
   }
+  getAllRoutes(node, prefix) {
+    const routes = [];
+    for (const [key, child] of node.children) {
+      const newPrefix = `${prefix}/${child.isDynamic ? `:${child.paramKey}` : key}`.replace(/\/$/, "");
+      if (child.middlewares) {
+        routes.push(newPrefix);
+      }
+      routes.push(...this.getAllRoutes(child, newPrefix));
+    }
+    return routes;
+  }
+  createRequest() {
+    return {
+      params: this.params,
+      query: this.query,
+      url: this.url,
+      path: this.path,
+      matches: this.matches,
+      redirect: (path) => this.go(path)
+    };
+  }
+  getErrorConditionMiddlewares(error) {
+    for (const [condition, middlewares] of this.errorHandlers) {
+      if (typeof condition !== "number" && typeof condition !== "string" && error instanceof condition && error.name === condition.name) {
+        return middlewares;
+      }
+    }
+    for (const [condition, middlewares] of this.errorHandlers) {
+      if (typeof condition === "number" && (error.status === condition || error.code === condition)) {
+        return middlewares;
+      }
+    }
+    for (const [condition, middlewares] of this.errorHandlers) {
+      if (typeof condition === "string" && (error.name === condition || error.message.includes(condition))) {
+        return middlewares;
+      }
+    }
+    return this.errorHandlers.get("generic") || false;
+  }
+  // eslint-disable-next-line sonarjs/cognitive-complexity
+  async handleError(error, parentComponent) {
+    const request = this.createRequest();
+    let component = null;
+    const middlewares = this.getErrorConditionMiddlewares(error);
+    if (middlewares === false) {
+      throw error;
+    }
+    let response;
+    try {
+      for (const middleware of middlewares) {
+        response = await middleware(request, error);
+        if (response !== void 0 && ((0, import_valyrian.isComponent)(response) || (0, import_valyrian.isVnodeComponent)(response))) {
+          component = response;
+          break;
+        }
+        if (response === false) {
+          return;
+        }
+      }
+    } catch (err) {
+      err.cause = error;
+      let errorCauseCount = 0;
+      while (err.cause) {
+        errorCauseCount++;
+      }
+      if (errorCauseCount > 20) {
+        throw new RouterError("Too many error causes. Possible circular error handling.");
+      }
+      return this.handleError(err, parentComponent);
+    }
+    if (component) {
+      if ((0, import_valyrian.isComponent)(parentComponent) || (0, import_valyrian.isVnodeComponent)(parentComponent)) {
+        const childComponent = (0, import_valyrian.isVnodeComponent)(component) ? component : (0, import_valyrian.v)(component, {});
+        if ((0, import_valyrian.isVnodeComponent)(parentComponent)) {
+          parentComponent.children.push(childComponent);
+          component = parentComponent;
+        } else {
+          component = (0, import_valyrian.v)(parentComponent, {}, childComponent);
+        }
+      }
+      if (!import_valyrian.isNodeJs && window.location.pathname + window.location.search !== this.url) {
+        window.history.pushState(null, "", this.url);
+      }
+      if (this.container) {
+        return (0, import_valyrian.mount)(this.container, component);
+      }
+    }
+    throw error;
+  }
+  async searchComponent(middlewares, parentComponent) {
+    const request = this.createRequest();
+    let response;
+    for (const middleware of middlewares) {
+      try {
+        response = await middleware(request);
+      } catch (error) {
+        return this.handleError(error, parentComponent);
+      }
+      if (response !== void 0 && ((0, import_valyrian.isComponent)(response) || (0, import_valyrian.isVnodeComponent)(response))) {
+        return response;
+      }
+      if (response === false) {
+        return false;
+      }
+    }
+    return response;
+  }
 };
 var localRedirect;
-function redirect(url, parentComponent, preventPushState = false) {
+async function redirect(url, parentComponent, preventPushState = false) {
   if (!localRedirect) {
-    throw new Error("router.redirect.not.found");
+    console.warn("Redirect function is not initialized. Please mount the router first.");
+    return;
   }
   return localRedirect(url, parentComponent, preventPushState);
 }
@@ -212,14 +364,13 @@ function mountRouter(elementContainer, router) {
   if (!import_valyrian.isNodeJs) {
     let onPopStateGoToRoute2 = function() {
       const pathWithoutPrefix = getPathWithoutPrefix(document.location.pathname, router.pathPrefix);
-      router.go(pathWithoutPrefix, void 0, true);
+      router.go(pathWithoutPrefix);
     };
     var onPopStateGoToRoute = onPopStateGoToRoute2;
     window.addEventListener("popstate", onPopStateGoToRoute2, false);
     onPopStateGoToRoute2();
   }
-  (0, import_valyrian.directive)("route", (vnode) => {
-    const url = vnode.props["v-route"];
+  (0, import_valyrian.directive)("route", (url, vnode) => {
     (0, import_valyrian.setAttribute)("href", url, vnode);
     (0, import_valyrian.setAttribute)("onclick", router.getOnClickHandler(url), vnode);
   });