revojs 0.1.22 → 0.1.24

package/dist/{app-CZxSS8Ok.js → app-B3x9-FYe.js}

@@ -1,43 +1,69 @@
 //#region src/server/index.ts
 var Radix = class {
 	rootNode;
-	constructor() {
-		this.rootNode = {
+	constructor(rootNode) {
+		this.rootNode = rootNode ?? {
 			type: "PATH",
 			children: {}
 		};
 	}
-	use(path, value) {
+	use(segments, value) {
 		let node = this.rootNode;
-		for (const segment of path.split("/")) {
-			if (segment.startsWith(WILDCARD)) {
+		for (const next of segments) {
+			const optionalWildcardMatch = (next.match(OPTIONAL_WILDCARD_MATCH) ?? []).at(1);
+			if (typeof optionalWildcardMatch === "string") {
+				let childNode$1 = node.children[WILDCARD];
+				childNode$1 ??= {
+					type: "OPTIONAL-WILDCARD",
+					parameter: optionalWildcardMatch,
+					children: {}
+				};
+				node.children[WILDCARD] ??= childNode$1;
+				node = childNode$1;
+				continue;
+			}
+			const wildcardMatch = (next.match(WILDCARD_MATCH) ?? []).at(1);
+			if (typeof wildcardMatch === "string") {
 				let childNode$1 = node.children[WILDCARD];
 				childNode$1 ??= {
 					type: "WILDCARD",
-					parameter: segment.substring(WILDCARD.length),
+					parameter: wildcardMatch,
 					children: {}
 				};
 				node.children[WILDCARD] ??= childNode$1;
 				node = childNode$1;
 				continue;
 			}
-			if (segment.startsWith(PARAMETER)) {
+			const optionalParameterMatch = (next.match(OPTIONAL_PARAMETER_MATCH) ?? []).at(1);
+			if (typeof optionalParameterMatch === "string") {
+				let childNode$1 = node.children[PARAMETER];
+				childNode$1 ??= {
+					type: "OPTIONAL-PARAMETER",
+					parameter: optionalParameterMatch,
+					children: {}
+				};
+				node.children[PARAMETER] ??= childNode$1;
+				node = childNode$1;
+				continue;
+			}
+			const parameterMatch = (next.match(PARAMETER_MATCH) ?? []).at(1);
+			if (typeof parameterMatch === "string") {
 				let childNode$1 = node.children[PARAMETER];
 				childNode$1 ??= {
 					type: "PARAMETER",
-					parameter: segment.substring(PARAMETER.length),
+					parameter: parameterMatch,
 					children: {}
 				};
 				node.children[PARAMETER] ??= childNode$1;
 				node = childNode$1;
 				continue;
 			}
-			let childNode = node.children[segment];
+			let childNode = node.children[next];
 			childNode ??= {
 				type: "PATH",
 				children: {}
 			};
-			node.children[segment] ??= childNode;
+			node.children[next] ??= childNode;
 			node = childNode;
 		}
 		node.value = value;
@@ -60,6 +86,14 @@ var Router = class extends Radix {
 				const route$1 = invoke$1(node.children[segment], index + 1);
 				if (route$1) return route$1;
 			}
+			if (node.children[OPTIONAL_PARAMETER]) {
+				const optionalParameterNode = node.children[OPTIONAL_PARAMETER];
+				const route$1 = invoke$1(optionalParameterNode, index + 1);
+				if (route$1) {
+					context.parameters[optionalParameterNode.parameter] = segment;
+					return route$1;
+				}
+			}
 			if (node.children[PARAMETER]) {
 				const parameterNode = node.children[PARAMETER];
 				const route$1 = invoke$1(parameterNode, index + 1);
@@ -68,6 +102,11 @@ var Router = class extends Radix {
 					return route$1;
 				}
 			}
+			if (node.children[OPTIONAL_WILDCARD]) {
+				const optionalWildcardNode = node.children[OPTIONAL_WILDCARD];
+				context.parameters[optionalWildcardNode.parameter] = segment;
+				return optionalWildcardNode.value ?? invoke$1(optionalWildcardNode, context.segments.length);
+			}
 			if (node.children[WILDCARD]) {
 				const wildcardNode = node.children[WILDCARD];
 				context.parameters[wildcardNode.parameter] = segment;
@@ -109,10 +148,7 @@ function useQuery(scope, schema) {
 }
 function withQuery(input, query) {
 	const url = new URL(input);
-	for (const name in query) {
-		const value = query[name];
-		if (value) url.searchParams.set(name, value);
-	}
+	for (const name in query) url.searchParams.set(name, query[name]);
 	return url.href;
 }
 function useCookies(scope, schema) {
@@ -203,12 +239,7 @@ function sendUnauthorized(scope, config) {
 	return new Response(null, mergeObjects(response, config));
 }
 function mimeType(file) {
-	const extension = /\.([a-zA-Z0-9]+?)$/.exec(file)?.at(1);
-	return mimeTypes[extension ?? ""] ?? "text/plain";
-}
-function toRoutePath(path) {
-	const segments = path.toLowerCase().replaceAll(/\[\.\.\.(.*?)\]/g, (_, value) => WILDCARD + value).replaceAll(/\[(.*?)\]/g, (_, value) => PARAMETER + value).split(".");
-	return [(segments.shift() ?? "").split("/").filter((value) => value !== "index").join("/"), ...segments];
+	return mimeTypes[/\.([a-zA-Z0-9]+?)$/.exec(file)?.at(1) ?? ""] ?? "text/plain";
 }
 async function invoke(scope, pipeline, index = 0) {
 	return await pipeline.at(index)?.fetch(scope, async () => await invoke(scope, pipeline, index + 1));
@@ -218,8 +249,13 @@ async function createServer() {
 	const middlewares = new Array();
 	const routes = await import("#virtual/routes").then((module) => Object.entries(module.default));
 	for (const [path, route] of routes) {
-		const [result, method] = toRoutePath(path);
-		router.use(method + "/" + result, route);
+		const segments = path.toLowerCase().split("/");
+		for (const attribute of segments.pop()?.split(".") ?? []) {
+			if (attribute === "index" || attribute === "js" || attribute === "ts") continue;
+			if (attribute === "get" || attribute === "post" || attribute === "put" || attribute === "delete" || attribute === "patch" || attribute === "options" || attribute === "head" || attribute === "trace" || attribute === "connect") segments.unshift(attribute);
+			else segments.push(attribute);
+		}
+		router.use(segments, route);
 	}
 	middlewares.push(router);
 	return {
@@ -230,15 +266,24 @@ async function createServer() {
 				return await invoke(scope, middlewares);
 			} catch (value) {
 				if (value instanceof Response) return value;
+				throw value;
 			}
 		}
 	};
 }
+let STATES;
 const ROUTER_CONTEXT = defineContext("ROUTER_CONTEXT");
 const SERVER_CONTEXT = defineContext("SERVER_CONTEXT");
-const WILDCARD = "$";
-const PARAMETER = ":";
-let STATES;
+const WILDCARD = "@";
+const OPTIONAL_WILDCARD = "@@";
+const PARAMETER = "@@@";
+const OPTIONAL_PARAMETER = "@@@";
+const WILDCARD_MATCH = /\[\.\.\.(.*?)\]/;
+const OPTIONAL_WILDCARD_MATCH = /\[\[\.\.\.(.*?)\]\]/;
+const PARAMETER_MATCH = /\[(.*?)\]/;
+const OPTIONAL_PARAMETER_MATCH = /\[\[(.*?)\]\]/;
+const isServer = import.meta.server ?? globalThis?.import?.meta?.server;
+const isClient = import.meta.client ?? globalThis?.import?.meta?.client;
 const mimeTypes = {
 	txt: "text/plain",
 	css: "text/css",
@@ -284,18 +329,12 @@ const mimeTypes = {
 	exe: "application/vnd.microsoft.portable-executable",
 	apk: "application/vnd.android.package-archive"
 };
-const isServer = import.meta.server ?? globalThis?.import?.meta?.server;
-const isClient = import.meta.client ?? globalThis?.import?.meta?.client;
 
 //#endregion
 //#region src/shared/index.ts
-var Scope = class {
-	parentScope;
-	context;
+var Hookable = class {
 	hooks;
-	constructor(parentScope) {
-		this.parentScope = parentScope;
-		this.context = {};
+	constructor() {
 		this.hooks = {};
 	}
 	registerHook(name, invoke$1) {
@@ -313,6 +352,15 @@ var Scope = class {
 		for (const invoke$1 of this.hooks[name] ?? []) results.push(await invoke$1(...inputs));
 		return results;
 	}
+};
+var Scope = class extends Hookable {
+	parentScope;
+	context;
+	constructor(parentScope) {
+		super();
+		this.parentScope = parentScope;
+		this.context = {};
+	}
 	getContext(input) {
 		let scope = this;
 		while (scope) {
@@ -336,7 +384,7 @@ function isFailure(result) {
 }
 function parseSchema(scope, schema, value) {
 	const result = schema["~standard"].validate(value);
-	if (isFailure(result)) throw sendBadRequest(scope, result.issues.map((issue) => issue.message).join(", "));
+	if (isFailure(result)) throw sendJson(scope, result, { status: 400 });
 	return result.value;
 }
 function mergeObjects(base, input) {
@@ -355,25 +403,42 @@ function mergeObjects(base, input) {
 
 //#endregion
 //#region src/app/index.ts
-function createApp(inputConfig) {
-	let config = mergeObjects(inputConfig, {
-		modules: [],
-		sources: { routes: {
-			match: "**/*.{get,head,post,put,delete,connect,options,trace,patch}.{js,ts}",
-			entries: ["./routes"]
-		} },
-		development: { middlewares: [] },
-		build: { externals: [] }
-	});
-	for (const module of config.modules) config = mergeObjects(config, module.config);
-	return {
-		config,
-		virtuals: {},
-		alias: {}
-	};
-}
+var App = class extends Hookable {
+	config;
+	constructor(inputConfig) {
+		super();
+		this.config = mergeObjects(inputConfig, {
+			modules: [],
+			client: "./index.html",
+			template: {
+				head: {
+					tagName: "head",
+					attributes: {},
+					children: []
+				},
+				body: {
+					tagName: "body",
+					attributes: {},
+					children: []
+				}
+			},
+			sources: { routes: {
+				match: "**/*.{get,head,post,put,delete,connect,options,trace,patch}.{js,ts}",
+				entries: ["./routes"]
+			} },
+			development: { middlewares: [] },
+			build: {
+				externals: [],
+				types: {},
+				virtuals: {},
+				alias: {}
+			}
+		});
+		for (const module of this.config.modules) this.config = mergeObjects(this.config, module.config);
+	}
+};
 const SERVER = "ssr";
 const CLIENT = "client";
 
 //#endregion
-export { CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, createApp, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+export { isServer as A, setState as B, WILDCARD_MATCH as C, getState as D, defineRoute as E, sendJson as F, useServer as G, useHeaders as H, sendRedirect as I, withQuery as J, useSetCookies as K, sendText as L, mimeTypes as M, sendBadRequest as N, invoke as O, sendHtml as P, sendUnauthorized as R, WILDCARD as S, defineMiddleware as T, useQuery as U, useCookies as V, useRouter as W, ROUTER_CONTEXT as _, Scope as a, SERVER_CONTEXT as b, isFailure as c, OPTIONAL_PARAMETER as d, OPTIONAL_PARAMETER_MATCH as f, PARAMETER_MATCH as g, PARAMETER as h, Hookable as i, mimeType as j, isClient as k, mergeObjects as l, OPTIONAL_WILDCARD_MATCH as m, CLIENT as n, defineContext as o, OPTIONAL_WILDCARD as p, useUrl as q, SERVER as r, defineHook as s, App as t, parseSchema as u, Radix as v, createServer as w, STATES as x, Router as y, setCookie as z };

package/dist/{index-CUwjaRno.d.ts → index-NJXRiTAn.d.ts}

@@ -7,7 +7,7 @@ type Context = Record<string, any>;
 type Output<T> = Success<T> | Failure;
 type InferInput<T extends Schema> = NonNullable<T["~standard"]["types"]>["input"];
 type InferOutput<T extends Schema> = NonNullable<T["~standard"]["types"]>["output"];
-type Mergeable<T> = { [P in keyof T]?: Mergeable<T[P]> };
+type Mergeable<T> = { [Key in keyof T]?: Mergeable<T[Key]> };
 interface Issue {
   readonly message: string;
 }
@@ -26,13 +26,16 @@ interface Schema<T = unknown, TOutput = T> {
     };
   };
 }
-declare class Scope {
-  parentScope?: Scope;
-  readonly context: Context;
-  readonly hooks: Record<string, Array<Invoke>>;
-  constructor(parentScope?: Scope);
+declare class Hookable {
+  private readonly hooks;
+  constructor();
   registerHook<T extends Invoke>(name: Descriptor<T>, invoke: T): () => void;
   dispatchHook<T extends Invoke>(name: Descriptor<T>, ...inputs: Parameters<T>): Promise<Awaited<ReturnType<T>>[]>;
+}
+declare class Scope extends Hookable {
+  private parentScope?;
+  private readonly context;
+  constructor(parentScope?: Scope);
   getContext<T>(input: Descriptor<T>): T;
   setContext<T>(input: Descriptor<T>, value: T): void;
 }
@@ -51,7 +54,7 @@ type Encoding = "ascii" | "utf8" | "utf-8" | "utf16le" | "ucs2" | "ucs-2" | "bas
 type StatusCode = 100 | 101 | 102 | 103 | 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 226 | 300 | 301 | 302 | 303 | 304 | 305 | 307 | 308 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 420 | 421 | 422 | 423 | 424 | 425 | 426 | 428 | 429 | 431 | 444 | 450 | 451 | 497 | 498 | 499 | 500 | 501 | 502 | 503 | 504 | 506 | 507 | 508 | 509 | 510 | 511 | 521 | 522 | 523 | 525 | 530 | 599;
 type MimeType = "text/plain" | "text/css" | "text/html" | "text/csv" | "text/javascript" | "application/json" | "application/xml" | "image/jpeg" | "image/png" | "image/gif" | "image/webp" | "image/svg+xml" | "image/bmp" | "image/x-icon" | "font/ttf" | "font/otf" | "font/woff" | "font/woff2" | "audio/mpeg" | "audio/wav" | "audio/ogg" | "audio/mp4" | "video/mp4" | "video/webm" | "video/ogg" | "video/quicktime" | "video/x-msvideo" | "application/zip" | "application/vnd.rar" | "application/x-tar" | "application/gzip" | "application/x-7z-compressed" | "application/pdf" | "application/msword" | "application/vnd.openxmlformats-officedocument.wordprocessingml.document" | "application/vnd.ms-excel" | "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" | "application/vnd.ms-powerpoint" | "application/vnd.openxmlformats-officedocument.presentationml.presentation" | "application/vnd.microsoft.portable-executable" | "application/vnd.android.package-archive";
 type Result = void | Response | Promise<void | Response>;
-type Node<T> = WildcardNode<T> | ParameterNode<T> | PathNode<T>;
+type Node<T> = OptionalWildcardNode<T> | WildcardNode<T> | OptionalParameterNode<T> | ParameterNode<T> | PathNode<T>;
 type States = Record<string, unknown>;
 interface CookieOptions {
   domain?: string;
@@ -96,6 +99,18 @@ interface WildcardNode<T> {
   parameter: string;
   children: Record<string, Node<T>>;
 }
+interface OptionalWildcardNode<T> {
+  type: "OPTIONAL-WILDCARD";
+  value?: T;
+  parameter: string;
+  children: Record<string, Node<T>>;
+}
+interface OptionalParameterNode<T> {
+  type: "OPTIONAL-PARAMETER";
+  value?: T;
+  parameter: string;
+  children: Record<string, Node<T>>;
+}
 interface ParameterNode<T> {
   type: "PARAMETER";
   value?: T;
@@ -109,8 +124,8 @@ interface PathNode<T> {
 }
 declare class Radix<T> {
   readonly rootNode: Node<T>;
-  constructor();
-  use(path: string, value: T): Node<T>;
+  constructor(rootNode?: Node<T>);
+  use(segments: Array<string>, value: T): Node<T>;
 }
 declare class Router extends Radix<Route> implements Middleware {
   fetch(scope: Scope): Result;
@@ -138,31 +153,46 @@ declare function sendRedirect(scope: Scope, path: string, config?: Mergeable<Res
 declare function sendBadRequest(scope: Scope, text: string, config?: Mergeable<ResponseConfig>): Response;
 declare function sendUnauthorized(scope: Scope, config?: Mergeable<ResponseConfig>): Response;
 declare function mimeType(file: string): MimeType;
-declare function toRoutePath(path: string): [string, ...Array<string>];
 declare function invoke(scope: Scope, pipeline: Array<Middleware>, index?: number): Promise<Result>;
 declare function createServer(): Promise<Server>;
+declare let STATES: States;
 declare const ROUTER_CONTEXT: Descriptor<RouterContext>;
 declare const SERVER_CONTEXT: Descriptor<ServerContext<Context>>;
-declare const WILDCARD = "$";
-declare const PARAMETER = ":";
-declare let STATES: States;
-declare const mimeTypes: Record<string, MimeType>;
+declare const WILDCARD = "@";
+declare const OPTIONAL_WILDCARD = "@@";
+declare const PARAMETER = "@@@";
+declare const OPTIONAL_PARAMETER = "@@@";
+declare const WILDCARD_MATCH: RegExp;
+declare const OPTIONAL_WILDCARD_MATCH: RegExp;
+declare const PARAMETER_MATCH: RegExp;
+declare const OPTIONAL_PARAMETER_MATCH: RegExp;
 declare const isServer: boolean;
 declare const isClient: boolean;
+declare const mimeTypes: Record<string, MimeType>;
 //#endregion
 //#region src/app/index.d.ts
 type Environment = typeof CLIENT | typeof SERVER;
 type Virtual = (environment: Environment) => undefined | string | Promise<string>;
+type Content = () => string;
+interface Template {
+  tagName: string;
+  attributes: Record<string, string>;
+  children: Array<string | Template>;
+}
 interface DevelopmentConfig {
   middlewares: Array<Middleware>;
 }
 interface BuildConfig {
   externals: Array<string>;
+  types: Record<string, Content>;
+  virtuals: Record<string, Virtual>;
+  alias: Record<string, string>;
 }
 interface Config {
   modules: Array<Module>;
   client?: string;
   server?: string;
+  template: Record<"head" | "body", Template>;
   sources: Record<string, Source>;
   development: DevelopmentConfig;
   build: BuildConfig;
@@ -176,16 +206,14 @@ interface Source {
   entries: Array<string>;
   resolve?: (path: string) => string;
 }
-interface App {
+declare class App extends Hookable {
   config: Config;
-  virtuals: Record<string, Virtual>;
-  alias: Record<string, string>;
+  constructor(inputConfig?: Mergeable<Config>);
 }
-declare function createApp(inputConfig?: Mergeable<Config>): App;
 declare const SERVER = "ssr";
 declare const CLIENT = "client";
 //#endregion
 //#region src/client/index.d.ts
 declare function $fetch<T>(scope: Scope, input: string | URL, options?: RequestInit): Promise<T>;
 //#endregion
-export { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, HttpMethod, InferInput, InferOutput, Invoke, Issue, Mergeable, Middleware, MimeType, Module, Node, Output, PARAMETER, ParameterNode, PathNode, ROUTER_CONTEXT, Radix, ResponseConfig, Result, Route, Router, RouterContext, SERVER, SERVER_CONTEXT, STATES, Schema, Scope, Server, ServerContext, Source, States, StatusCode, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+export { isClient as $, ParameterNode as A, Scope as At, STATES as B, OPTIONAL_PARAMETER_MATCH as C, InferInput as Ct, OptionalWildcardNode as D, Mergeable as Dt, OptionalParameterNode as E, Issue as Et, Result as F, mergeObjects as Ft, WILDCARD as G, ServerContext as H, Route as I, parseSchema as It, createServer as J, WILDCARD_MATCH as K, Router as L, ROUTER_CONTEXT as M, defineContext as Mt, Radix as N, defineHook as Nt, PARAMETER as O, Output as Ot, ResponseConfig as P, isFailure as Pt, invoke as Q, RouterContext as R, OPTIONAL_PARAMETER as S, Hookable as St, OPTIONAL_WILDCARD_MATCH as T, Invoke as Tt, States as U, Server as V, StatusCode as W, defineRoute as X, defineMiddleware as Y, getState as Z, Encoding as _, useUrl as _t, Config as a, sendJson as at, MimeType as b, Descriptor as bt, Environment as c, sendUnauthorized as ct, Source as d, useCookies as dt, isServer as et, Template as f, useHeaders as ft, CookieSameSite as g, useSetCookies as gt, CookiePriority as h, useServer as ht, CLIENT as i, sendHtml as it, PathNode as j, Success as jt, PARAMETER_MATCH as k, Schema as kt, Module as l, setCookie as lt, CookieOptions as m, useRouter as mt, App as n, mimeTypes as nt, Content as o, sendRedirect as ot, Virtual as p, useQuery as pt, WildcardNode as q, BuildConfig as r, sendBadRequest as rt, DevelopmentConfig as s, sendText as st, $fetch as t, mimeType as tt, SERVER as u, setState as ut, HttpMethod as v, withQuery as vt, OPTIONAL_WILDCARD as w, InferOutput as wt, Node as x, Failure as xt, Middleware as y, Context as yt, SERVER_CONTEXT as z };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, HttpMethod, InferInput, InferOutput, Invoke, Issue, Mergeable, Middleware, MimeType, Module, Node, Output, PARAMETER, ParameterNode, PathNode, ROUTER_CONTEXT, Radix, ResponseConfig, Result, Route, Router, RouterContext, SERVER, SERVER_CONTEXT, STATES, Schema, Scope, Server, ServerContext, Source, States, StatusCode, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./index-CUwjaRno.js";
-export { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, HttpMethod, InferInput, InferOutput, Invoke, Issue, Mergeable, Middleware, MimeType, Module, Node, Output, PARAMETER, ParameterNode, PathNode, ROUTER_CONTEXT, Radix, ResponseConfig, Result, Route, Router, RouterContext, SERVER, SERVER_CONTEXT, STATES, Schema, Scope, Server, ServerContext, Source, States, StatusCode, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+import { $ as isClient, A as ParameterNode, At as Scope, B as STATES, C as OPTIONAL_PARAMETER_MATCH, Ct as InferInput, D as OptionalWildcardNode, Dt as Mergeable, E as OptionalParameterNode, Et as Issue, F as Result, Ft as mergeObjects, G as WILDCARD, H as ServerContext, I as Route, It as parseSchema, J as createServer, K as WILDCARD_MATCH, L as Router, M as ROUTER_CONTEXT, Mt as defineContext, N as Radix, Nt as defineHook, O as PARAMETER, Ot as Output, P as ResponseConfig, Pt as isFailure, Q as invoke, R as RouterContext, S as OPTIONAL_PARAMETER, St as Hookable, T as OPTIONAL_WILDCARD_MATCH, Tt as Invoke, U as States, V as Server, W as StatusCode, X as defineRoute, Y as defineMiddleware, Z as getState, _ as Encoding, _t as useUrl, a as Config, at as sendJson, b as MimeType, bt as Descriptor, c as Environment, ct as sendUnauthorized, d as Source, dt as useCookies, et as isServer, f as Template, ft as useHeaders, g as CookieSameSite, gt as useSetCookies, h as CookiePriority, ht as useServer, i as CLIENT, it as sendHtml, j as PathNode, jt as Success, k as PARAMETER_MATCH, kt as Schema, l as Module, lt as setCookie, m as CookieOptions, mt as useRouter, n as App, nt as mimeTypes, o as Content, ot as sendRedirect, p as Virtual, pt as useQuery, q as WildcardNode, r as BuildConfig, rt as sendBadRequest, s as DevelopmentConfig, st as sendText, t as $fetch, tt as mimeType, u as SERVER, ut as setState, v as HttpMethod, vt as withQuery, w as OPTIONAL_WILDCARD, wt as InferOutput, x as Node, xt as Failure, y as Middleware, yt as Context, z as SERVER_CONTEXT } from "./index-NJXRiTAn.js";
+export { $fetch, App, BuildConfig, CLIENT, Config, Content, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, 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, ROUTER_CONTEXT, Radix, ResponseConfig, Result, Route, Router, RouterContext, SERVER, SERVER_CONTEXT, STATES, Schema, Scope, Server, ServerContext, Source, States, StatusCode, Success, Template, Virtual, WILDCARD, WILDCARD_MATCH, WildcardNode, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, createApp, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./app-CZxSS8Ok.js";
+import { A as isServer, B as setState, C as WILDCARD_MATCH, D as getState, E as defineRoute, F as sendJson, G as useServer, H as useHeaders, I as sendRedirect, J as withQuery, K as useSetCookies, L as sendText, M as mimeTypes, N as sendBadRequest, O as invoke, P as sendHtml, R as sendUnauthorized, S as WILDCARD, T as defineMiddleware, U as useQuery, V as useCookies, W as useRouter, _ as ROUTER_CONTEXT, a as Scope, b as SERVER_CONTEXT, c as isFailure, d as OPTIONAL_PARAMETER, f as OPTIONAL_PARAMETER_MATCH, g as PARAMETER_MATCH, h as PARAMETER, i as Hookable, j as mimeType, k as isClient, l as mergeObjects, m as OPTIONAL_WILDCARD_MATCH, n as CLIENT, o as defineContext, p as OPTIONAL_WILDCARD, q as useUrl, r as SERVER, s as defineHook, t as App, u as parseSchema, v as Radix, w as createServer, x as STATES, y as Router, z as setCookie } from "./app-B3x9-FYe.js";
 
 //#region src/client/index.ts
 async function $fetch(scope, input, options) {
@@ -25,4 +25,4 @@ async function $fetch(scope, input, options) {
 }
 
 //#endregion
-export { $fetch, CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, createApp, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+export { $fetch, App, CLIENT, Hookable, OPTIONAL_PARAMETER, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD, OPTIONAL_WILDCARD_MATCH, PARAMETER, PARAMETER_MATCH, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, WILDCARD_MATCH, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/kit/index.d.ts

@@ -1,12 +1,12 @@
-import { App, Virtual } from "../index-CUwjaRno.js";
+import { n as App, o as Content, p as Virtual } from "../index-NJXRiTAn.js";
 
 //#region src/kit/index.d.ts
-declare function useKit(app: App, source: string | URL): {
-  source: string;
-  toPath: (...paths: Array<string>) => string;
-  addVirtual: (name: string, virtual: Virtual) => void;
-  addAlias: (name: string, path: string) => void;
+declare function useKit(source: string | URL): {
+  fromModule(...paths: Array<string>): string;
 };
+declare function addAlias(app: App, name: string, path: string): void;
+declare function addVirtual(app: App, name: string, virtual: Virtual): void;
+declare function addTypes(app: App, name: string, types: Content): void;
 declare function addRoutes(app: App, path: string): void;
 //#endregion
-export { addRoutes, useKit };
+export { addAlias, addRoutes, addTypes, addVirtual, useKit };

package/dist/kit/index.js

@@ -1,3 +1,3 @@
-import { addRoutes, useKit } from "../kit-Bzr1NqHb.js";
+import { a as useKit, i as addVirtual, n as addRoutes, r as addTypes, t as addAlias } from "../kit-BQv19une.js";
 
-export { addRoutes, useKit };
+export { addAlias, addRoutes, addTypes, addVirtual, useKit };

package/dist/kit-BQv19une.js

@@ -0,0 +1,26 @@
+import { dirname, join, posix, win32 } from "path";
+import { fileURLToPath } from "url";
+
+//#region src/kit/index.ts
+function useKit(source) {
+	source = source.toString();
+	if (source.startsWith("file://")) source = dirname(fileURLToPath(source));
+	return { fromModule(...paths) {
+		return join(source, ...paths).split(win32.sep).join(posix.sep);
+	} };
+}
+function addAlias(app, name, path) {
+	app.config.build.alias["#alias/" + name] = path;
+}
+function addVirtual(app, name, virtual) {
+	app.config.build.virtuals["#virtual/" + name] = virtual;
+}
+function addTypes(app, name, types) {
+	app.config.build.types[name] = types;
+}
+function addRoutes(app, path) {
+	app.config.sources.routes?.entries.push(path);
+}
+
+//#endregion
+export { useKit as a, addVirtual as i, addRoutes as n, addTypes as r, addAlias as t };

package/dist/vite/index.d.ts

@@ -1,4 +1,4 @@
-import { Config, Mergeable } from "../index-CUwjaRno.js";
+import { Dt as Mergeable, a as Config } from "../index-NJXRiTAn.js";
 import { Plugin } from "vite";
 
 //#region src/vite/index.d.ts

package/dist/vite/index.js

@@ -1,13 +1,18 @@
-import { CLIENT, SERVER, SERVER_CONTEXT, Scope, createApp, invoke } from "../app-CZxSS8Ok.js";
-import { useKit } from "../kit-Bzr1NqHb.js";
-import { basename, dirname, isAbsolute, join, posix, relative, win32 } from "path";
+import { O as invoke, a as Scope, b as SERVER_CONTEXT, n as CLIENT, r as SERVER, t as App } from "../app-B3x9-FYe.js";
+import { a as useKit, i as addVirtual } from "../kit-BQv19une.js";
+import { basename, isAbsolute, join, posix, resolve, win32 } from "path";
+import { mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
+import { cwd } from "process";
+import { globSync } from "tinyglobby";
 import { isRunnableDevEnvironment } from "vite";
 import { once } from "events";
 import { Readable, Stream } from "stream";
-import { existsSync, readFileSync } from "fs";
-import { globSync } from "tinyglobby";
-import { rm } from "fs/promises";
 
+//#region package.json
+var name = "revojs";
+var version = "0.1.24";
+
+//#endregion
 //#region src/vite/node/index.ts
 function splitSetCookieString(cookiesString) {
 	if (Array.isArray(cookiesString)) return cookiesString.flatMap((c) => splitSetCookieString(c));
@@ -175,7 +180,7 @@ function client() {
 				const path = key.substring(0, key.length - 7);
 				if (bundle) for (const name$1 in bundle) {
 					const file = bundle[name$1];
-					if (file && file.type === "asset" && file.fileName === basename(path)) return file.source.toString();
+					if (file.type === "asset" && file.fileName === basename(path)) return file.source.toString();
 				}
 				return readFileSync(path, "utf-8");
 			}
@@ -191,89 +196,6 @@ function client() {
 	};
 }
 
-//#endregion
-//#region src/vite/plugins/css.ts
-function css() {
-	let devServer;
-	const styles = new Array();
-	return {
-		name: "css",
-		apply: "serve",
-		configureServer(server) {
-			devServer = server;
-		},
-		transform(_, source) {
-			if (source.match(/\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/)) {
-				if (!styles.includes(source) && !source.includes("?") && !source.includes(".node_modules") && !source.includes("@vite")) styles.push(relative(devServer.config.root, source));
-			}
-		},
-		transformIndexHtml() {
-			return [...styles.map((path) => ({
-				tag: "link",
-				injectTo: "head",
-				attrs: {
-					rel: "stylesheet",
-					href: "/" + path,
-					"data-preload": true
-				}
-			})), {
-				tag: "script",
-				injectTo: "head",
-				attrs: { type: "module" },
-				children: `
-                        const observer = new MutationObserver(() => {
-                            if (document.querySelector('style[data-vite-dev-id]')) {
-                                document.querySelectorAll('[data-preload]').forEach((node) => node.remove());
-
-                                observer.disconnect();
-                            }
-                        });
-
-                        observer.observe(document.head, { childList: true });
-                    `
-			}];
-		}
-	};
-}
-
-//#endregion
-//#region src/vite/plugins/entry.ts
-function entry() {
-	let entryName;
-	let entryPath;
-	return {
-		name: "entry",
-		enforce: "pre",
-		sharedDuringBuild: true,
-		resolveId: {
-			filter: { id: /\.html$/ },
-			handler(source, importer, options) {
-				if (this.environment.name === CLIENT) {
-					if (importer && entryPath) {
-						const path = join(dirname(importer), source);
-						if (existsSync(path)) return path;
-					}
-					if (options.isEntry) {
-						entryName = basename(source);
-						entryPath = source;
-						return entryName;
-					}
-				}
-			}
-		},
-		load: {
-			filter: { id: /\.html$/ },
-			handler(source) {
-				if (entryName && entryPath && source === entryName) return readFileSync(entryPath, {
-					encoding: "utf-8",
-					flag: "r"
-				});
-				return null;
-			}
-		}
-	};
-}
-
 //#endregion
 //#region src/vite/plugins/virtuals.ts
 function virtuals(virtuals$1) {
@@ -282,7 +204,7 @@ function virtuals(virtuals$1) {
 		name: "virtuals",
 		enforce: "pre",
 		sharedDuringBuild: true,
-		resolveId(key, importer) {
+		resolveId(key) {
 			if (cache.has(key)) return key;
 			if (key.startsWith("#")) {
 				const path = "/" + key.slice(1);
@@ -304,44 +226,70 @@ function virtuals(virtuals$1) {
 	};
 }
 
-//#endregion
-//#region package.json
-var name = "revojs";
-var version = "0.1.22";
-
 //#endregion
 //#region src/vite/index.ts
+function toHtmlTagDescriptor(template, injectTo) {
+	let children;
+	for (const entry of template.children) {
+		if (typeof entry === "string") {
+			children ??= "";
+			if (typeof children === "string") children += entry;
+		}
+		if (typeof entry === "object") {
+			children ??= [];
+			if (Array.isArray(children)) children.push(toHtmlTagDescriptor(entry, injectTo));
+		}
+	}
+	return {
+		tag: template.tagName,
+		attrs: template.attributes,
+		children,
+		injectTo
+	};
+}
 function revojs(config) {
-	const app = createApp(config);
+	const app = new App(config);
 	return [
 		{
 			name,
 			version,
 			sharedDuringBuild: true,
 			async config() {
-				const { toPath, addVirtual } = useKit(app, process.cwd());
+				const { fromModule } = useKit(cwd());
 				for (const module of app.config.modules) await module.setup?.(app);
-				if (app.config.client) addVirtual("client", () => `import client from "${app.config.client}?client"; export default client`);
-				if (app.config.server) addVirtual("server", () => `import { createServer } from "revojs"; export default await createServer()`);
+				addVirtual(app, "client", () => {
+					if (app.config.client) return `import client from "${fromModule(app.config.client)}?client"; export default client`;
+				});
+				addVirtual(app, "server", () => {
+					if (app.config.server) return `import { createServer } from "revojs"; export default await createServer()`;
+				});
 				for (const name$1 in app.config.sources) {
 					const source = app.config.sources[name$1];
-					if (source) addVirtual(name$1, () => {
+					addVirtual(app, name$1, () => {
 						const entries = {};
 						for (let path of source.entries) {
-							path = isAbsolute(path) ? path : toPath(path);
+							path = isAbsolute(path) ? path : resolve(path);
 							for (const asset of globSync(source.match, { cwd: path })) entries[asset] = join(path, asset).split(win32.sep).join(posix.sep);
 						}
-						const content = Object.values(entries).reduce((content$1, path, index) => content$1 + `import $${index} from "${source.resolve?.(path) ?? path}" \n`, "");
-						const result = Object.keys(entries).map((name$2, index) => {
+						return `${Object.values(entries).reduce((content, path, index) => content + `import $${index} from "${source.resolve?.(path) ?? path}" \n`, "")} export default {${Object.keys(entries).map((name$2, index) => {
 							if (entries[name$2]) return `"${name$2}": $${index}`;
-						});
-						return `${content} export default {${result}}`;
+						})}}`;
 					});
 				}
+				const metaTypesPath = join(resolve(".revojs"), "types");
+				rmSync(metaTypesPath, {
+					recursive: true,
+					force: true
+				});
+				mkdirSync(metaTypesPath, { recursive: true });
+				for (const type in app.config.build.types) {
+					const content = app.config.build.types[type];
+					writeFileSync(join(metaTypesPath, type), content());
+				}
 				return {
 					appType: "custom",
 					optimizeDeps: { exclude: ["revojs"] },
-					resolve: { alias: app.alias },
+					resolve: { alias: app.config.build.alias },
 					build: {
 						emptyOutDir: false,
 						assetsInlineLimit: 4096 * 4,
@@ -350,13 +298,14 @@ function revojs(config) {
 					builder: {
 						sharedConfigBuild: true,
 						async buildApp(builder) {
-							await rm("./dist", {
+							rmSync("./dist", {
 								recursive: true,
 								force: true
 							});
 							for (const key in builder.environments) {
 								const environment = builder.environments[key];
-								if (environment) await builder.build(environment);
+								await builder.build(environment);
+								if (environment.name === CLIENT && typeof environment.config.build.rollupOptions.input === "string") rmSync(resolve(environment.config.build.outDir, basename(environment.config.build.rollupOptions.input)));
 							}
 						}
 					},
@@ -365,7 +314,7 @@ function revojs(config) {
 							consumer: "client",
 							resolve: { noExternal: true },
 							build: {
-								rollupOptions: { input: { index: app.config.client } },
+								rollupOptions: { input: app.config.client },
 								outDir: "./dist/public",
 								copyPublicDir: true
 							},
@@ -382,7 +331,7 @@ function revojs(config) {
 								externalConditions: ["import"]
 							},
 							build: {
-								rollupOptions: { input: { index: app.config.server } },
+								rollupOptions: { input: app.config.server },
 								outDir: "./dist",
 								copyPublicDir: false
 							},
@@ -394,6 +343,17 @@ function revojs(config) {
 					}
 				};
 			},
+			transformIndexHtml: {
+				order: "pre",
+				handler() {
+					const entries = new Array();
+					const head = toHtmlTagDescriptor(app.config.template.head, "head");
+					if (Array.isArray(head.children)) entries.push(...head.children);
+					const body = toHtmlTagDescriptor(app.config.template.body, "body");
+					if (Array.isArray(body.children)) entries.push(...body.children);
+					return entries;
+				}
+			},
 			configResolved(config$1) {
 				if (app.config.client === void 0) delete config$1.environments[CLIENT];
 				if (app.config.server === void 0) delete config$1.environments[SERVER];
@@ -420,10 +380,8 @@ function revojs(config) {
 				};
 			}
 		},
-		virtuals(app.virtuals),
-		client(),
-		entry(),
-		css()
+		virtuals(app.config.build.virtuals),
+		client()
 	];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.1.22",
+    "version": "0.1.24",
     "type": "module",
     "repository": "coverbase/revojs",
     "license": "MIT",

package/dist/kit-Bzr1NqHb.js

@@ -1,26 +0,0 @@
-import { dirname, join, posix, win32 } from "path";
-import { fileURLToPath } from "url";
-
-//#region src/kit/index.ts
-function useKit(app, source) {
-	source = source.toString();
-	if (source.startsWith("file://")) source = dirname(fileURLToPath(source));
-	return {
-		source,
-		toPath: (...paths) => {
-			return join(source, ...paths).split(win32.sep).join(posix.sep);
-		},
-		addVirtual: (name, virtual) => {
-			app.virtuals["#virtual/" + name] = virtual;
-		},
-		addAlias: (name, path) => {
-			app.alias["#alias/" + name] = join(source, path).split(win32.sep).join(posix.sep);
-		}
-	};
-}
-function addRoutes(app, path) {
-	app.config.sources.routes?.entries.push(path);
-}
-
-//#endregion
-export { addRoutes, useKit };