revojs 0.1.53 → 0.1.55

package/dist/commands/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as version, t as name } from "../package-D8FgpUMW.mjs";
+import { n as version, t as name } from "../package-BcN3Ewsh.mjs";
 import { resolvePaths } from "../kit/index.mjs";
 import { defineCommand, runMain } from "citty";
 import { copyFileSync, mkdirSync } from "fs";

package/dist/{index-B4nGVcLE.d.mts → index-DOmfkUsW.d.mts}

@@ -1,45 +1,18 @@
 import { UserConfig } from "vite";
 
 //#region src/router/index.d.ts
-type Node<T> = PathNode<T> | WildcardNode<T> | OptionalWildcardNode<T> | ParameterNode<T> | OptionalParameterNode<T> | GroupNode<T> | HookNode<T>;
-interface PathNode<T> {
-  type: "PATH";
-  value?: T;
-  children: Record<string, Node<T>>;
-}
-interface WildcardNode<T> {
-  type: "WILDCARD";
-  value?: T;
-  parameter: string;
-  children: Record<string, Node<T>>;
-}
-interface OptionalWildcardNode<T> {
-  type: "OPTIONAL-WILDCARD";
-  value?: T;
-  parameter: string;
-  children: Record<string, Node<T>>;
-}
-interface ParameterNode<T> {
-  type: "PARAMETER";
-  value?: T;
-  parameter: string;
-  children: Record<string, Node<T>>;
-}
-interface OptionalParameterNode<T> {
-  type: "OPTIONAL-PARAMETER";
+type NodeType = "PATH" | "PARAMETER" | "OPTIONAL-PARAMETER" | "WILDCARD" | "OPTIONAL-WILDCARD" | "GROUP";
+interface Node<T> {
+  type: NodeType;
+  name: string;
   value?: T;
-  parameter: string;
-  children: Record<string, Node<T>>;
-}
-interface GroupNode<T> {
-  type: "GROUP";
-  label: string;
-  children: Record<string, Node<T>>;
-}
-interface HookNode<T> {
-  type: "HOOK";
-  value?: Array<T>;
-  children: Record<string, Node<T>>;
+  hooks: Array<T>;
+  parameter?: Node<T>;
+  optionalParameter?: Node<T>;
+  wildcard?: Node<T>;
+  optionalWildcard?: Node<T>;
+  groups: Map<string, Node<T>>;
+  children: Map<string, Node<T>>;
 }
 interface RouterContext<T> {
   route?: T;
@@ -54,12 +27,6 @@ declare class Router<T> {
   use(segments: Array<string>, value: T): Node<T>;
   match(segments: Array<string>): RouterContext<T>;
 }
-declare const WILDCARD = "@";
-declare const OPTIONAL_WILDCARD = "@@";
-declare const PARAMETER = "@@@";
-declare const OPTIONAL_PARAMETER = "@@@@";
-declare const GROUP = "@@@@@";
-declare const HOOK = "@@@@@@";
 declare const WILDCARD_MATCH: RegExp;
 declare const OPTIONAL_WILDCARD_MATCH: RegExp;
 declare const PARAMETER_MATCH: RegExp;
@@ -259,4 +226,4 @@ declare function createStaticMiddleware(resolve: (path: string | URL) => Awaitab
   fetch(scope: Scope, next: (() => Result) | undefined): Promise<void | Response>;
 };
 //#endregion
-export { sendUnauthorized as $, WILDCARD as $t, StatusCode as A, Scope as At, isClient as B, Node as Bt, Result as C, Awaitable as Ct, STATES as D, Invoke as Dt, SERVER_ROUTER_CONTEXT as E, Hookable as Et, defineRoute as F, GROUP_MATCH as Ft, sendBadRequest as G, OptionalParameterNode as Gt, mimeType as H, OPTIONAL_PARAMETER_MATCH as Ht, encodings as I, GroupNode as It, sendNoContent as J, PARAMETER_MATCH as Jt, sendCreated as K, OptionalWildcardNode as Kt, getState as L, HOOK as Lt, cookieSameSites as M, defineHook as Mt, createServer as N, mergeObjects as Nt, Server as O, Mergeable as Ot, defineMiddleware as P, GROUP as Pt, sendResponse as Q, RouterContext as Qt, httpMethods as R, HOOK_MATCH as Rt, ResponseConfig as S, parseSchema as St, SERVER_CONTEXT as T, Descriptor as Tt, mimeTypes as U, OPTIONAL_WILDCARD as Ut, isServer as V, OPTIONAL_PARAMETER as Vt, parseCookiePair as W, OPTIONAL_WILDCARD_MATCH as Wt, sendOk as X, PathNode as Xt, sendNotFound as Y, ParameterNode as Yt, sendRedirect as Z, Router as Zt, CookieSameSite as _, Output as _t, CLIENT as a, useHeaders as at, Middleware as b, isFailure as bt, Content as c, useRouter as ct, Module as d, useUrl as dt, WILDCARD_MATCH as en, setCookie as et, SERVER as f, withQuery as ft, CookiePriority as g, Issue as gt, CookieOptions as h, InferOutput as ht, Asset as i, useCookies as it, cookiePriorities as j, defineContext as jt, ServerContext as k, Primitive as kt, DevelopmentConfig as l, useServer as lt, Template as m, InferInput as mt, fetch as n, statusCodes as nt, CLOSE_HOOK as o, useParameters as ot, Source as p, Failure as pt, sendForbidden as q, PARAMETER as qt, App as r, useBody as rt, Config as s, useQuery as st, createStaticMiddleware as t, WildcardNode as tn, setState as tt, Environment as u, useSetCookies as ut, Encoding as v, Schema as vt, Route as w, Context as wt, MimeType as x, isSuccess as xt, HttpMethod as y, Success as yt, invoke as z, HookNode as zt };
+export { sendUnauthorized as $, StatusCode as A, Scope as At, isClient as B, PARAMETER_MATCH as Bt, Result as C, Awaitable as Ct, STATES as D, Invoke as Dt, SERVER_ROUTER_CONTEXT as E, Hookable as Et, defineRoute as F, HOOK_MATCH as Ft, sendBadRequest as G, mimeType as H, RouterContext as Ht, encodings as I, Node as It, sendNoContent as J, sendCreated as K, getState as L, NodeType as Lt, cookieSameSites as M, defineHook as Mt, createServer as N, mergeObjects as Nt, Server as O, Mergeable as Ot, defineMiddleware as P, GROUP_MATCH as Pt, sendResponse as Q, httpMethods as R, OPTIONAL_PARAMETER_MATCH as Rt, ResponseConfig as S, parseSchema as St, SERVER_CONTEXT as T, Descriptor as Tt, mimeTypes as U, WILDCARD_MATCH as Ut, isServer as V, Router as Vt, parseCookiePair as W, sendOk as X, sendNotFound as Y, sendRedirect as Z, CookieSameSite as _, Output as _t, CLIENT as a, useHeaders as at, Middleware as b, isFailure as bt, Content as c, useRouter as ct, Module as d, useUrl as dt, setCookie as et, SERVER as f, withQuery as ft, CookiePriority as g, Issue as gt, CookieOptions as h, InferOutput as ht, Asset as i, useCookies as it, cookiePriorities as j, defineContext as jt, ServerContext as k, Primitive as kt, DevelopmentConfig as l, useServer as lt, Template as m, InferInput as mt, fetch as n, statusCodes as nt, CLOSE_HOOK as o, useParameters as ot, Source as p, Failure as pt, sendForbidden as q, App as r, useBody as rt, Config as s, useQuery as st, createStaticMiddleware as t, setState as tt, Environment as u, useSetCookies as ut, Encoding as v, Schema as vt, Route as w, Context as wt, MimeType as x, isSuccess as xt, HttpMethod as y, Success as yt, invoke as z, OPTIONAL_WILDCARD_MATCH as zt };

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { $ as sendUnauthorized, $t as WILDCARD, A as StatusCode, At as Scope, B as isClient, Bt as Node, C as Result, Ct as Awaitable, D as STATES, Dt as Invoke, E as SERVER_ROUTER_CONTEXT, Et as Hookable, F as defineRoute, Ft as GROUP_MATCH, G as sendBadRequest, Gt as OptionalParameterNode, H as mimeType, Ht as OPTIONAL_PARAMETER_MATCH, I as encodings, It as GroupNode, J as sendNoContent, Jt as PARAMETER_MATCH, K as sendCreated, Kt as OptionalWildcardNode, L as getState, Lt as HOOK, M as cookieSameSites, Mt as defineHook, N as createServer, Nt as mergeObjects, O as Server, Ot as Mergeable, P as defineMiddleware, Pt as GROUP, Q as sendResponse, Qt as RouterContext, R as httpMethods, Rt as HOOK_MATCH, S as ResponseConfig, St as parseSchema, T as SERVER_CONTEXT, Tt as Descriptor, U as mimeTypes, Ut as OPTIONAL_WILDCARD, V as isServer, Vt as OPTIONAL_PARAMETER, W as parseCookiePair, Wt as OPTIONAL_WILDCARD_MATCH, X as sendOk, Xt as PathNode, Y as sendNotFound, Yt as ParameterNode, Z as sendRedirect, Zt as Router, _ as CookieSameSite, _t as Output, a as CLIENT, at as useHeaders, b as Middleware, bt as isFailure, c as Content, ct as useRouter, d as Module, dt as useUrl, en as WILDCARD_MATCH, et as setCookie, f as SERVER, ft as withQuery, g as CookiePriority, gt as Issue, h as CookieOptions, ht as InferOutput, i as Asset, it as useCookies, j as cookiePriorities, jt as defineContext, k as ServerContext, kt as Primitive, l as DevelopmentConfig, lt as useServer, m as Template, mt as InferInput, n as fetch, nt as statusCodes, o as CLOSE_HOOK, ot as useParameters, p as Source, pt as Failure, q as sendForbidden, qt as PARAMETER, r as App, rt as useBody, s as Config, st as useQuery, t as createStaticMiddleware, tn as WildcardNode, tt as setState, u as Environment, ut as useSetCookies, v as Encoding, vt as Schema, w as Route, wt as Context, x as MimeType, xt as isSuccess, y as HttpMethod, yt as Success, z as invoke, zt as HookNode } from "./index-B4nGVcLE.mjs";
-export { App, Asset, Awaitable, CLIENT, CLOSE_HOOK, Config, Content, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, GROUP, GROUP_MATCH, GroupNode, HOOK, HOOK_MATCH, HookNode, Hookable, HttpMethod, InferInput, InferOutput, Invoke, Issue, Mergeable, Middleware, MimeType, Module, Node, OPTIONAL_PARAMETER, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD, OPTIONAL_WILDCARD_MATCH, OptionalParameterNode, OptionalWildcardNode, Output, PARAMETER, PARAMETER_MATCH, ParameterNode, PathNode, Primitive, ResponseConfig, Result, Route, Router, RouterContext, SERVER, SERVER_CONTEXT, SERVER_ROUTER_CONTEXT, STATES, Schema, Scope, Server, ServerContext, Source, StatusCode, Success, Template, WILDCARD, WILDCARD_MATCH, WildcardNode, cookiePriorities, cookieSameSites, createServer, createStaticMiddleware, defineContext, defineHook, defineMiddleware, defineRoute, encodings, fetch, getState, httpMethods, invoke, isClient, isFailure, isServer, isSuccess, mergeObjects, mimeType, mimeTypes, parseCookiePair, parseSchema, sendBadRequest, sendCreated, sendForbidden, sendNoContent, sendNotFound, sendOk, sendRedirect, sendResponse, sendUnauthorized, setCookie, setState, statusCodes, useBody, useCookies, useHeaders, useParameters, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+import { $ as sendUnauthorized, A as StatusCode, At as Scope, B as isClient, Bt as PARAMETER_MATCH, C as Result, Ct as Awaitable, D as STATES, Dt as Invoke, E as SERVER_ROUTER_CONTEXT, Et as Hookable, F as defineRoute, Ft as HOOK_MATCH, G as sendBadRequest, H as mimeType, Ht as RouterContext, I as encodings, It as Node, J as sendNoContent, K as sendCreated, L as getState, Lt as NodeType, M as cookieSameSites, Mt as defineHook, N as createServer, Nt as mergeObjects, O as Server, Ot as Mergeable, P as defineMiddleware, Pt as GROUP_MATCH, Q as sendResponse, R as httpMethods, Rt as OPTIONAL_PARAMETER_MATCH, S as ResponseConfig, St as parseSchema, T as SERVER_CONTEXT, Tt as Descriptor, U as mimeTypes, Ut as WILDCARD_MATCH, V as isServer, Vt as Router, W as parseCookiePair, X as sendOk, Y as sendNotFound, Z as sendRedirect, _ as CookieSameSite, _t as Output, a as CLIENT, at as useHeaders, b as Middleware, bt as isFailure, c as Content, ct as useRouter, d as Module, dt as useUrl, et as setCookie, f as SERVER, ft as withQuery, g as CookiePriority, gt as Issue, h as CookieOptions, ht as InferOutput, i as Asset, it as useCookies, j as cookiePriorities, jt as defineContext, k as ServerContext, kt as Primitive, l as DevelopmentConfig, lt as useServer, m as Template, mt as InferInput, n as fetch, nt as statusCodes, o as CLOSE_HOOK, ot as useParameters, p as Source, pt as Failure, q as sendForbidden, r as App, rt as useBody, s as Config, st as useQuery, t as createStaticMiddleware, tt as setState, u as Environment, ut as useSetCookies, v as Encoding, vt as Schema, w as Route, wt as Context, x as MimeType, xt as isSuccess, y as HttpMethod, yt as Success, z as invoke, zt as OPTIONAL_WILDCARD_MATCH } from "./index-DOmfkUsW.mjs";
+export { App, Asset, Awaitable, CLIENT, CLOSE_HOOK, Config, Content, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, GROUP_MATCH, HOOK_MATCH, Hookable, HttpMethod, InferInput, InferOutput, Invoke, Issue, Mergeable, Middleware, MimeType, Module, Node, NodeType, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD_MATCH, Output, PARAMETER_MATCH, Primitive, ResponseConfig, Result, Route, Router, RouterContext, SERVER, SERVER_CONTEXT, SERVER_ROUTER_CONTEXT, STATES, Schema, Scope, Server, ServerContext, Source, StatusCode, Success, Template, WILDCARD_MATCH, cookiePriorities, cookieSameSites, createServer, createStaticMiddleware, defineContext, defineHook, defineMiddleware, defineRoute, encodings, fetch, getState, httpMethods, invoke, isClient, isFailure, isServer, isSuccess, mergeObjects, mimeType, mimeTypes, parseCookiePair, parseSchema, sendBadRequest, sendCreated, sendForbidden, sendNoContent, sendNotFound, sendOk, sendRedirect, sendResponse, sendUnauthorized, setCookie, setState, statusCodes, useBody, useCookies, useHeaders, useParameters, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { $ as Router, A as useBody, B as isFailure, C as sendOk, D as setCookie, E as sendUnauthorized, F as useRouter, G as HOOK, H as parseSchema, I as useServer, J as OPTIONAL_PARAMETER_MATCH, K as HOOK_MATCH, L as useSetCookies, M as useHeaders, N as useParameters, O as setState, P as useQuery, Q as PARAMETER_MATCH, R as useUrl, S as sendNotFound, T as sendResponse, U as GROUP, V as isSuccess, W as GROUP_MATCH, X as OPTIONAL_WILDCARD_MATCH, Y as OPTIONAL_WILDCARD, Z as PARAMETER, _ as parseCookiePair, a as cookieSameSites, at as SERVER, b as sendForbidden, c as defineRoute, ct as defineContext, d as httpMethods, et as WILDCARD, f as invoke, g as mimeTypes, h as mimeType, i as cookiePriorities, it as CLOSE_HOOK, j as useCookies, k as statusCodes, l as encodings, lt as defineHook, m as isServer, n as SERVER_ROUTER_CONTEXT, nt as App, o as createServer, ot as Hookable, p as isClient, q as OPTIONAL_PARAMETER, r as STATES, rt as CLIENT, s as defineMiddleware, st as Scope, t as SERVER_CONTEXT, tt as WILDCARD_MATCH, u as getState, ut as mergeObjects, v as sendBadRequest, w as sendRedirect, x as sendNoContent, y as sendCreated, z as withQuery } from "./server-BKOK-LN2.mjs";
+import { $ as SERVER, A as useBody, B as isFailure, C as sendOk, D as setCookie, E as sendUnauthorized, F as useRouter, G as OPTIONAL_PARAMETER_MATCH, H as parseSchema, I as useServer, J as Router, K as OPTIONAL_WILDCARD_MATCH, L as useSetCookies, M as useHeaders, N as useParameters, O as setState, P as useQuery, Q as CLOSE_HOOK, R as useUrl, S as sendNotFound, T as sendResponse, U as GROUP_MATCH, V as isSuccess, W as HOOK_MATCH, X as App, Y as WILDCARD_MATCH, Z as CLIENT, _ as parseCookiePair, a as cookieSameSites, b as sendForbidden, c as defineRoute, d as httpMethods, et as Hookable, f as invoke, g as mimeTypes, h as mimeType, i as cookiePriorities, it as mergeObjects, j as useCookies, k as statusCodes, l as encodings, m as isServer, n as SERVER_ROUTER_CONTEXT, nt as defineContext, o as createServer, p as isClient, q as PARAMETER_MATCH, r as STATES, rt as defineHook, s as defineMiddleware, t as SERVER_CONTEXT, tt as Scope, u as getState, v as sendBadRequest, w as sendRedirect, x as sendNoContent, y as sendCreated, z as withQuery } from "./server-BplNURRd.mjs";
 import assets from "#assets";
 //#region src/client/index.ts
 async function fetch(scope, input, options) {
@@ -52,4 +52,4 @@ function createStaticMiddleware(resolve) {
 	} });
 }
 //#endregion
-export { App, CLIENT, CLOSE_HOOK, GROUP, GROUP_MATCH, HOOK, HOOK_MATCH, Hookable, OPTIONAL_PARAMETER, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD, OPTIONAL_WILDCARD_MATCH, PARAMETER, PARAMETER_MATCH, Router, SERVER, SERVER_CONTEXT, SERVER_ROUTER_CONTEXT, STATES, Scope, WILDCARD, WILDCARD_MATCH, cookiePriorities, cookieSameSites, createServer, createStaticMiddleware, defineContext, defineHook, defineMiddleware, defineRoute, encodings, fetch, getState, httpMethods, invoke, isClient, isFailure, isServer, isSuccess, mergeObjects, mimeType, mimeTypes, parseCookiePair, parseSchema, sendBadRequest, sendCreated, sendForbidden, sendNoContent, sendNotFound, sendOk, sendRedirect, sendResponse, sendUnauthorized, setCookie, setState, statusCodes, useBody, useCookies, useHeaders, useParameters, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+export { App, CLIENT, CLOSE_HOOK, GROUP_MATCH, HOOK_MATCH, Hookable, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD_MATCH, PARAMETER_MATCH, Router, SERVER, SERVER_CONTEXT, SERVER_ROUTER_CONTEXT, STATES, Scope, WILDCARD_MATCH, cookiePriorities, cookieSameSites, createServer, createStaticMiddleware, defineContext, defineHook, defineMiddleware, defineRoute, encodings, fetch, getState, httpMethods, invoke, isClient, isFailure, isServer, isSuccess, mergeObjects, mimeType, mimeTypes, parseCookiePair, parseSchema, sendBadRequest, sendCreated, sendForbidden, sendNoContent, sendNotFound, sendOk, sendRedirect, sendResponse, sendUnauthorized, setCookie, setState, statusCodes, useBody, useCookies, useHeaders, useParameters, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/kit/index.d.mts

@@ -1,4 +1,4 @@
-import { c as Content, r as App } from "../index-B4nGVcLE.mjs";
+import { c as Content, r as App } from "../index-DOmfkUsW.mjs";
 
 //#region src/kit/index.d.ts
 declare function useKit(source: string | URL): {

package/dist/{package-D8FgpUMW.mjs → package-BcN3Ewsh.mjs}

@@ -1,5 +1,5 @@
 //#region package.json
 var name = "revojs";
-var version = "0.1.53";
+var version = "0.1.55";
 //#endregion
 export { version as n, name as t };

package/dist/{server-BKOK-LN2.mjs → server-BplNURRd.mjs}

@@ -109,94 +109,97 @@ var Router = class {
 	constructor(rootNode) {
 		this.rootNode = rootNode ?? {
 			type: "PATH",
-			children: {}
+			name: "",
+			children: /* @__PURE__ */ new Map(),
+			groups: /* @__PURE__ */ new Map(),
+			hooks: []
 		};
 	}
 	use(segments, value) {
 		let node = this.rootNode;
-		for (const next of segments) {
-			const optionalWildcardMatch = (next.match(OPTIONAL_WILDCARD_MATCH) ?? []).at(1);
-			if (typeof optionalWildcardMatch === "string") {
-				let childNode = node.children["@@"];
-				childNode ??= {
+		for (const segment of segments) {
+			const optionalWildcard = OPTIONAL_WILDCARD_MATCH.exec(segment)?.[1];
+			if (typeof optionalWildcard === "string") {
+				node.optionalWildcard ??= {
 					type: "OPTIONAL-WILDCARD",
-					parameter: optionalWildcardMatch,
-					children: {}
+					name: optionalWildcard,
+					children: /* @__PURE__ */ new Map(),
+					groups: /* @__PURE__ */ new Map(),
+					hooks: []
 				};
-				node.children["@@"] ??= childNode;
-				node = childNode;
+				node = node.optionalWildcard;
 				continue;
 			}
-			const wildcardMatch = (next.match(WILDCARD_MATCH) ?? []).at(1);
-			if (typeof wildcardMatch === "string") {
-				let childNode = node.children["@"];
-				childNode ??= {
+			const wildcard = WILDCARD_MATCH.exec(segment)?.[1];
+			if (typeof wildcard === "string") {
+				node.wildcard ??= {
 					type: "WILDCARD",
-					parameter: wildcardMatch,
-					children: {}
+					name: wildcard,
+					children: /* @__PURE__ */ new Map(),
+					groups: /* @__PURE__ */ new Map(),
+					hooks: []
 				};
-				node.children["@"] ??= childNode;
-				node = childNode;
+				node = node.wildcard;
 				continue;
 			}
-			const optionalParameterMatch = (next.match(OPTIONAL_PARAMETER_MATCH) ?? []).at(1);
-			if (typeof optionalParameterMatch === "string") {
-				let childNode = node.children[OPTIONAL_PARAMETER];
-				childNode ??= {
+			const optionalParameter = OPTIONAL_PARAMETER_MATCH.exec(segment)?.[1];
+			if (typeof optionalParameter === "string") {
+				node.optionalParameter ??= {
 					type: "OPTIONAL-PARAMETER",
-					parameter: optionalParameterMatch,
-					children: {}
+					name: optionalParameter,
+					children: /* @__PURE__ */ new Map(),
+					groups: /* @__PURE__ */ new Map(),
+					hooks: []
 				};
-				node.children[OPTIONAL_PARAMETER] ??= childNode;
-				node = childNode;
+				node = node.optionalParameter;
 				continue;
 			}
-			const parameterMatch = (next.match(PARAMETER_MATCH) ?? []).at(1);
-			if (typeof parameterMatch === "string") {
-				let childNode = node.children["@@@"];
-				childNode ??= {
+			const parameter = PARAMETER_MATCH.exec(segment)?.[1];
+			if (typeof parameter === "string") {
+				node.parameter ??= {
 					type: "PARAMETER",
-					parameter: parameterMatch,
-					children: {}
+					name: parameter,
+					children: /* @__PURE__ */ new Map(),
+					groups: /* @__PURE__ */ new Map(),
+					hooks: []
 				};
-				node.children["@@@"] ??= childNode;
-				node = childNode;
+				node = node.parameter;
 				continue;
 			}
-			const groupMatch = (next.match(GROUP_MATCH) ?? []).at(1);
-			if (groupMatch) {
-				let childNode = node.children[GROUP];
-				childNode ??= {
-					type: "GROUP",
-					label: groupMatch,
-					children: {}
-				};
-				node.children[GROUP] ??= childNode;
-				node = childNode;
+			const group = GROUP_MATCH.exec(segment)?.[1];
+			if (typeof group === "string") {
+				let child = node.groups.get(group);
+				if (!child) {
+					child = {
+						type: "GROUP",
+						name: group,
+						children: /* @__PURE__ */ new Map(),
+						groups: /* @__PURE__ */ new Map(),
+						hooks: []
+					};
+					node.groups.set(group, child);
+				}
+				node = child;
 				continue;
 			}
-			if (next.match(HOOK_MATCH)?.[1]) {
-				let childNode = node.children[HOOK];
-				childNode ??= {
-					type: "HOOK",
-					children: {}
+			if (typeof HOOK_MATCH.exec(segment)?.[1] === "string") {
+				node.hooks.push(value);
+				return node;
+			}
+			let child = node.children.get(segment);
+			if (!child) {
+				child = {
+					type: "PATH",
+					name: segment,
+					children: /* @__PURE__ */ new Map(),
+					groups: /* @__PURE__ */ new Map(),
+					hooks: []
 				};
-				node.children[HOOK] ??= childNode;
-				node = childNode;
-				continue;
+				node.children.set(segment, child);
 			}
-			let childNode = node.children[next];
-			childNode ??= {
-				type: "PATH",
-				children: {}
-			};
-			node.children[next] ??= childNode;
-			node = childNode;
+			node = child;
 		}
-		if (node.type === "HOOK") {
-			node.value ??= [];
-			node.value.push(value);
-		} else if (node.type === "PATH" || node.type === "PARAMETER" || node.type === "OPTIONAL-PARAMETER" || node.type === "WILDCARD" || node.type === "OPTIONAL-WILDCARD") node.value = value;
+		node.value = value;
 		return node;
 	}
 	match(segments) {
@@ -206,67 +209,57 @@ var Router = class {
 			groups: [],
 			hooks: []
 		};
-		const invoke = (node, index) => {
-			const hookNode = node.children[HOOK];
-			if (hookNode?.value) context.hooks.push(...hookNode.value);
-			if (index === context.segments.length) return node;
-			const segment = context.segments[index];
-			if (node.children[segment]) {
-				const route = invoke(node.children[segment], index + 1);
-				if (route) return route;
-			}
-			if (node.children["@@@@@"]) {
-				const groupNode = node.children[GROUP];
-				const route = invoke(groupNode, index);
-				if (route) {
-					context.groups.push(groupNode.label);
-					return route;
-				}
-			}
-			if (node.children["@@@@"]) {
-				const optionalParameterNode = node.children[OPTIONAL_PARAMETER];
-				const route = invoke(optionalParameterNode, index + 1);
-				if (route) {
-					context.parameters[optionalParameterNode.parameter] = segment;
-					return route;
-				}
-			}
-			if (node.children["@@@"]) {
-				const parameterNode = node.children["@@@"];
-				const route = invoke(parameterNode, index + 1);
-				if (route) {
-					context.parameters[parameterNode.parameter] = segment;
-					return route;
-				}
-			}
-			if (node.children["@@"]) {
-				const optionalWildcardNode = node.children["@@"];
-				const wildcardPath = context.segments.slice(index).join("/");
-				context.parameters[optionalWildcardNode.parameter] = wildcardPath;
-				return optionalWildcardNode ?? invoke(optionalWildcardNode, context.segments.length);
-			}
-			if (node.children["@"]) {
-				const wildcardNode = node.children["@"];
-				const wildcardPath = context.segments.slice(index).join("/");
-				context.parameters[wildcardNode.parameter] = wildcardPath;
-				return wildcardNode ?? invoke(wildcardNode, context.segments.length);
-			}
-		};
-		const match = invoke(this.rootNode, 0);
-		if (match?.type === "PATH" || match?.type === "PARAMETER" || match?.type === "OPTIONAL-PARAMETER" || match?.type === "WILDCARD" || match?.type === "OPTIONAL-WILDCARD") context.route = match.value;
+		visit(this.rootNode, 0, context);
 		return context;
 	}
 };
-const WILDCARD = "@";
-const OPTIONAL_WILDCARD = "@@";
-const PARAMETER = "@@@";
-const OPTIONAL_PARAMETER = "@@@@";
-const GROUP = "@@@@@";
-const HOOK = "@@@@@@";
-const WILDCARD_MATCH = /\[\.\.\.(.*?)\]/;
-const OPTIONAL_WILDCARD_MATCH = /\[\[\.\.\.(.*?)\]\]/;
-const PARAMETER_MATCH = /\[(.*?)\]/;
-const OPTIONAL_PARAMETER_MATCH = /\[\[(.*?)\]\]/;
+function visit(node, index, context) {
+	const hookCount = context.hooks.length;
+	const groupCount = context.groups.length;
+	if (node.hooks.length > 0) context.hooks.push(...node.hooks);
+	if (node.type === "GROUP") context.groups.push(node.name);
+	if (match(node, index, context)) return true;
+	context.hooks.length = hookCount;
+	context.groups.length = groupCount;
+	return false;
+}
+function match(node, index, context) {
+	if (index === context.segments.length) {
+		if (node.value !== void 0) {
+			context.route = node.value;
+			return true;
+		}
+		for (const group of node.groups.values()) if (visit(group, index, context)) return true;
+		if (node.optionalParameter && visit(node.optionalParameter, index, context)) return true;
+		if (node.optionalWildcard && assign(node.optionalWildcard, "", index, context)) return true;
+		return false;
+	}
+	for (const group of node.groups.values()) if (visit(group, index, context)) return true;
+	const segment = context.segments[index] ?? "";
+	const child = node.children.get(segment);
+	if (child && visit(child, index + 1, context)) return true;
+	if (node.parameter && assign(node.parameter, segment, index + 1, context)) return true;
+	if (node.optionalParameter && assign(node.optionalParameter, segment, index + 1, context)) return true;
+	if (node.wildcard) {
+		const rest = context.segments.slice(index).join("/");
+		if (assign(node.wildcard, rest, context.segments.length, context)) return true;
+	}
+	if (node.optionalWildcard) {
+		const rest = context.segments.slice(index).join("/");
+		if (assign(node.optionalWildcard, rest, context.segments.length, context)) return true;
+	}
+	return false;
+}
+function assign(node, value, index, context) {
+	context.parameters[node.name] = value;
+	if (visit(node, index, context)) return true;
+	delete context.parameters[node.name];
+	return false;
+}
+const WILDCARD_MATCH = /^\[\.\.\.(.*)\]$/;
+const OPTIONAL_WILDCARD_MATCH = /^\[\[\.\.\.(.*)\]\]$/;
+const PARAMETER_MATCH = /^\[(.*)\]$/;
+const OPTIONAL_PARAMETER_MATCH = /^\[\[(.*)\]\]$/;
 const GROUP_MATCH = /^\((.*)\)$/;
 const HOOK_MATCH = /^\+(.+)$/;
 //#endregion
@@ -659,4 +652,4 @@ const mimeTypes = {
 	"apk": "application/vnd.android.package-archive"
 };
 //#endregion
-export { Router as $, useBody as A, isFailure as B, sendOk as C, setCookie as D, sendUnauthorized as E, useRouter as F, HOOK as G, parseSchema as H, useServer as I, OPTIONAL_PARAMETER_MATCH as J, HOOK_MATCH as K, useSetCookies as L, useHeaders as M, useParameters as N, setState as O, useQuery as P, PARAMETER_MATCH as Q, useUrl as R, sendNotFound as S, sendResponse as T, GROUP as U, isSuccess as V, GROUP_MATCH as W, OPTIONAL_WILDCARD_MATCH as X, OPTIONAL_WILDCARD as Y, PARAMETER as Z, parseCookiePair as _, cookieSameSites as a, SERVER as at, sendForbidden as b, defineRoute as c, defineContext as ct, httpMethods as d, WILDCARD as et, invoke as f, mimeTypes as g, mimeType as h, cookiePriorities as i, CLOSE_HOOK as it, useCookies as j, statusCodes as k, encodings as l, defineHook as lt, isServer as m, SERVER_ROUTER_CONTEXT as n, App as nt, createServer as o, Hookable as ot, isClient as p, OPTIONAL_PARAMETER as q, STATES as r, CLIENT as rt, defineMiddleware as s, Scope as st, SERVER_CONTEXT as t, WILDCARD_MATCH as tt, getState as u, mergeObjects as ut, sendBadRequest as v, sendRedirect as w, sendNoContent as x, sendCreated as y, withQuery as z };
+export { SERVER as $, useBody as A, isFailure as B, sendOk as C, setCookie as D, sendUnauthorized as E, useRouter as F, OPTIONAL_PARAMETER_MATCH as G, parseSchema as H, useServer as I, Router as J, OPTIONAL_WILDCARD_MATCH as K, useSetCookies as L, useHeaders as M, useParameters as N, setState as O, useQuery as P, CLOSE_HOOK as Q, useUrl as R, sendNotFound as S, sendResponse as T, GROUP_MATCH as U, isSuccess as V, HOOK_MATCH as W, App as X, WILDCARD_MATCH as Y, CLIENT as Z, parseCookiePair as _, cookieSameSites as a, sendForbidden as b, defineRoute as c, httpMethods as d, Hookable as et, invoke as f, mimeTypes as g, mimeType as h, cookiePriorities as i, mergeObjects as it, useCookies as j, statusCodes as k, encodings as l, isServer as m, SERVER_ROUTER_CONTEXT as n, defineContext as nt, createServer as o, isClient as p, PARAMETER_MATCH as q, STATES as r, defineHook as rt, defineMiddleware as s, SERVER_CONTEXT as t, Scope as tt, getState as u, sendBadRequest as v, sendRedirect as w, sendNoContent as x, sendCreated as y, withQuery as z };

package/dist/vite/index.d.mts

@@ -1,4 +1,4 @@
-import { Ot as Mergeable, s as Config } from "../index-B4nGVcLE.mjs";
+import { Ot as Mergeable, s as Config } from "../index-DOmfkUsW.mjs";
 import { PluginOption } from "vite";
 
 //#region src/vite/index.d.ts

package/dist/vite/index.mjs

@@ -1,5 +1,5 @@
-import { f as invoke, h as mimeType, it as CLOSE_HOOK, nt as App, rt as CLIENT, st as Scope, t as SERVER_CONTEXT, ut as mergeObjects } from "../server-BKOK-LN2.mjs";
-import { n as version, t as name } from "../package-D8FgpUMW.mjs";
+import { Q as CLOSE_HOOK, X as App, Z as CLIENT, f as invoke, h as mimeType, it as mergeObjects, t as SERVER_CONTEXT, tt as Scope } from "../server-BplNURRd.mjs";
+import { n as version, t as name } from "../package-BcN3Ewsh.mjs";
 import { addTemplate, addTypes, addVirtual, resolvePaths, useKit } from "../kit/index.mjs";
 import { mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from "fs";
 import { basename, dirname, isAbsolute, join, posix, relative, resolve, win32 } from "path";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.1.53",
+    "version": "0.1.55",
     "license": "MIT",
     "repository": "tellua/revojs",
     "bin": {