revojs 0.1.23 → 0.1.25

package/dist/{app-COQSSDHs.js → app-DOdfHYPa.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;
@@ -200,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));
@@ -215,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 {
@@ -232,11 +271,19 @@ async function createServer() {
 		}
 	};
 }
+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",
@@ -282,8 +329,6 @@ 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
@@ -364,6 +409,19 @@ var App = class extends Hookable {
 		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"]
@@ -371,6 +429,7 @@ var App = class extends Hookable {
 			development: { middlewares: [] },
 			build: {
 				externals: [],
+				types: { "revojs.d.ts": () => `import "revojs/types"` },
 				virtuals: {},
 				alias: {}
 			}
@@ -380,6 +439,7 @@ var App = class extends Hookable {
 };
 const SERVER = "ssr";
 const CLIENT = "client";
+const CLOSE_HOOK = defineHook("CLOSE_HOOK");
 
 //#endregion
-export { App, CLIENT, Hookable, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, 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 A, setCookie as B, WILDCARD as C, defineRoute as D, defineMiddleware as E, sendHtml as F, useRouter as G, useCookies as H, sendJson as I, useUrl as J, useServer as K, sendRedirect as L, mimeType as M, mimeTypes as N, getState as O, sendBadRequest as P, sendText as R, STATES as S, createServer as T, useHeaders as U, setState as V, useQuery as W, withQuery as Y, PARAMETER_MATCH as _, Hookable as a, Router as b, defineHook as c, parseSchema as d, OPTIONAL_PARAMETER as f, PARAMETER as g, OPTIONAL_WILDCARD_MATCH as h, SERVER as i, isServer as j, invoke as k, isFailure as l, OPTIONAL_WILDCARD as m, CLIENT as n, Scope as o, OPTIONAL_PARAMETER_MATCH as p, useSetCookies as q, CLOSE_HOOK as r, defineContext as s, App as t, mergeObjects as u, ROUTER_CONTEXT as v, WILDCARD_MATCH as w, SERVER_CONTEXT as x, Radix as y, sendUnauthorized as z };

package/dist/{index-DSP2l2h5.d.ts → index-xe4wwpuC.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;
 }
@@ -54,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;
@@ -99,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;
@@ -112,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;
@@ -141,26 +153,38 @@ 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>;
 }
@@ -168,6 +192,7 @@ interface Config {
   modules: Array<Module>;
   client?: string;
   server?: string;
+  template: Record<"head" | "body", Template>;
   sources: Record<string, Source>;
   development: DevelopmentConfig;
   build: BuildConfig;
@@ -187,8 +212,9 @@ declare class App extends Hookable {
 }
 declare const SERVER = "ssr";
 declare const CLIENT = "client";
+declare const CLOSE_HOOK: Descriptor<() => void>;
 //#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, Hookable, 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, 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 { invoke as $, PARAMETER_MATCH as A, Schema as At, SERVER_CONTEXT as B, OPTIONAL_PARAMETER as C, Hookable as Ct, OptionalParameterNode as D, Issue as Dt, OPTIONAL_WILDCARD_MATCH as E, Invoke as Et, ResponseConfig as F, isFailure as Ft, StatusCode as G, Server as H, Result as I, mergeObjects as It, WildcardNode as J, WILDCARD as K, Route as L, parseSchema as Lt, PathNode as M, Success as Mt, ROUTER_CONTEXT as N, defineContext as Nt, OptionalWildcardNode as O, Mergeable as Ot, Radix as P, defineHook as Pt, getState as Q, Router as R, Node as S, Failure as St, OPTIONAL_WILDCARD as T, InferOutput as Tt, ServerContext as U, STATES as V, States as W, defineMiddleware as X, createServer as Y, defineRoute as Z, CookieSameSite as _, useSetCookies as _t, CLOSE_HOOK as a, sendHtml as at, Middleware as b, Context as bt, DevelopmentConfig as c, sendText as ct, SERVER as d, setState as dt, isClient as et, Source as f, useCookies as ft, CookiePriority as g, useServer as gt, CookieOptions as h, useRouter as ht, CLIENT as i, sendBadRequest as it, ParameterNode as j, Scope as jt, PARAMETER as k, Output as kt, Environment as l, sendUnauthorized as lt, Virtual as m, useQuery as mt, App as n, mimeType as nt, Config as o, sendJson as ot, Template as p, useHeaders as pt, WILDCARD_MATCH as q, BuildConfig as r, mimeTypes as rt, Content as s, sendRedirect as st, $fetch as t, isServer as tt, Module as u, setCookie as ut, Encoding as v, useUrl as vt, OPTIONAL_PARAMETER_MATCH as w, InferInput as wt, MimeType as x, Descriptor as xt, HttpMethod as y, withQuery as yt, RouterContext 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, Hookable, 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, 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-DSP2l2h5.js";
-export { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, Hookable, 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, 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 invoke, A as PARAMETER_MATCH, At as Schema, B as SERVER_CONTEXT, C as OPTIONAL_PARAMETER, Ct as Hookable, D as OptionalParameterNode, Dt as Issue, E as OPTIONAL_WILDCARD_MATCH, Et as Invoke, F as ResponseConfig, Ft as isFailure, G as StatusCode, H as Server, I as Result, It as mergeObjects, J as WildcardNode, K as WILDCARD, L as Route, Lt as parseSchema, M as PathNode, Mt as Success, N as ROUTER_CONTEXT, Nt as defineContext, O as OptionalWildcardNode, Ot as Mergeable, P as Radix, Pt as defineHook, Q as getState, R as Router, S as Node, St as Failure, T as OPTIONAL_WILDCARD, Tt as InferOutput, U as ServerContext, V as STATES, W as States, X as defineMiddleware, Y as createServer, Z as defineRoute, _ as CookieSameSite, _t as useSetCookies, a as CLOSE_HOOK, at as sendHtml, b as Middleware, bt as Context, c as DevelopmentConfig, ct as sendText, d as SERVER, dt as setState, et as isClient, f as Source, ft as useCookies, g as CookiePriority, gt as useServer, h as CookieOptions, ht as useRouter, i as CLIENT, it as sendBadRequest, j as ParameterNode, jt as Scope, k as PARAMETER, kt as Output, l as Environment, lt as sendUnauthorized, m as Virtual, mt as useQuery, n as App, nt as mimeType, o as Config, ot as sendJson, p as Template, pt as useHeaders, q as WILDCARD_MATCH, r as BuildConfig, rt as mimeTypes, s as Content, st as sendRedirect, t as $fetch, tt as isServer, u as Module, ut as setCookie, v as Encoding, vt as useUrl, w as OPTIONAL_PARAMETER_MATCH, wt as InferInput, x as MimeType, xt as Descriptor, y as HttpMethod, yt as withQuery, z as RouterContext } from "./index-xe4wwpuC.js";
+export { $fetch, App, BuildConfig, CLIENT, CLOSE_HOOK, 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 { App, CLIENT, Hookable, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, 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-COQSSDHs.js";
+import { A as isClient, B as setCookie, C as WILDCARD, D as defineRoute, E as defineMiddleware, F as sendHtml, G as useRouter, H as useCookies, I as sendJson, J as useUrl, K as useServer, L as sendRedirect, M as mimeType, N as mimeTypes, O as getState, P as sendBadRequest, R as sendText, S as STATES, T as createServer, U as useHeaders, V as setState, W as useQuery, Y as withQuery, _ as PARAMETER_MATCH, a as Hookable, b as Router, c as defineHook, d as parseSchema, f as OPTIONAL_PARAMETER, g as PARAMETER, h as OPTIONAL_WILDCARD_MATCH, i as SERVER, j as isServer, k as invoke, l as isFailure, m as OPTIONAL_WILDCARD, n as CLIENT, o as Scope, p as OPTIONAL_PARAMETER_MATCH, q as useSetCookies, r as CLOSE_HOOK, s as defineContext, t as App, u as mergeObjects, v as ROUTER_CONTEXT, w as WILDCARD_MATCH, x as SERVER_CONTEXT, y as Radix, z as sendUnauthorized } from "./app-DOdfHYPa.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, App, CLIENT, Hookable, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, 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, CLOSE_HOOK, 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,4 +1,4 @@
-import { App, Virtual } from "../index-DSP2l2h5.js";
+import { m as Virtual, n as App, s as Content } from "../index-xe4wwpuC.js";
 
 //#region src/kit/index.d.ts
 declare function useKit(source: string | URL): {
@@ -6,6 +6,7 @@ declare function useKit(source: string | URL): {
 };
 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 { addAlias, addRoutes, addVirtual, useKit };
+export { addAlias, addRoutes, addTypes, addVirtual, useKit };

package/dist/kit/index.js

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

package/dist/{kit-CUuTaZz2.js → kit-BQv19une.js}

@@ -15,9 +15,12 @@ function addAlias(app, 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 { addAlias, addRoutes, addVirtual, useKit };
+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-DSP2l2h5.js";
+import { Ot as Mergeable, o as Config } from "../index-xe4wwpuC.js";
 import { Plugin } from "vite";
 
 //#region src/vite/index.d.ts

package/dist/vite/index.js

@@ -1,13 +1,18 @@
-import { App, CLIENT, SERVER, SERVER_CONTEXT, Scope, invoke } from "../app-COQSSDHs.js";
-import { addVirtual } from "../kit-CUuTaZz2.js";
-import { basename, dirname, isAbsolute, join, posix, relative, resolve, win32 } from "path";
+import { i as SERVER, k as invoke, n as CLIENT, o as Scope, r as CLOSE_HOOK, t as App, x as SERVER_CONTEXT } from "../app-DOdfHYPa.js";
+import { a as useKit, i as addVirtual, r as addTypes } 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.25";
+
+//#endregion
 //#region src/vite/node/index.ts
 function splitSetCookieString(cookiesString) {
 	if (Array.isArray(cookiesString)) return cookiesString.flatMap((c) => splitSetCookieString(c));
@@ -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,13 +226,27 @@ function virtuals(virtuals$1) {
 	};
 }
 
-//#endregion
-//#region package.json
-var name = "revojs";
-var version = "0.1.23";
-
 //#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 = new App(config);
 	return [
@@ -319,9 +255,15 @@ function revojs(config) {
 			version,
 			sharedDuringBuild: true,
 			async config() {
+				const { fromModule } = useKit(cwd());
 				for (const module of app.config.modules) await module.setup?.(app);
-				if (app.config.client) addVirtual(app, "client", () => `import client from "${app.config.client}?client"; export default client`);
-				if (app.config.server) addVirtual(app, "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()`;
+				});
+				addTypes(app, "vite.d.ts", () => `import "vite/client"`);
 				for (const name$1 in app.config.sources) {
 					const source = app.config.sources[name$1];
 					addVirtual(app, name$1, () => {
@@ -330,13 +272,23 @@ function revojs(config) {
 							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 metaPath = resolve(".revojs");
+				rmSync(metaPath, {
+					recursive: true,
+					force: true
+				});
+				mkdirSync(metaPath, { recursive: true });
+				let types = "";
+				for (const type in app.config.build.types) {
+					const content = app.config.build.types[type];
+					types += content() + "\n";
+				}
+				writeFileSync(join(metaPath, "index.d.ts"), types);
 				return {
 					appType: "custom",
 					optimizeDeps: { exclude: ["revojs"] },
@@ -349,14 +301,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];
 								await builder.build(environment);
-								if (environment.name === CLIENT && typeof environment.config.build.rollupOptions.input === "string") await rm(resolve(environment.config.build.outDir, basename(environment.config.build.rollupOptions.input)));
+								if (environment.name === CLIENT && typeof environment.config.build.rollupOptions.input === "string") rmSync(resolve(environment.config.build.outDir, basename(environment.config.build.rollupOptions.input)));
 							}
 						}
 					},
@@ -394,36 +346,48 @@ 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];
 			},
 			async configureServer(devServer) {
 				const target = devServer.environments[SERVER];
-				if (isRunnableDevEnvironment(target)) return () => {
-					devServer.middlewares.use(async (request, response, next) => {
-						const server = await target.runner.import("#virtual/server").then((module) => module.default);
-						if (server) {
-							request.url = request.originalUrl;
-							const scope = new Scope();
-							scope.setContext(SERVER_CONTEXT, {
-								states: {},
-								request: fromNodeRequest(request, response),
-								response: { headers: new Headers() },
-								variables: process.env
-							});
-							var result = await invoke(scope, app.config.development.middlewares.concat({ fetch: server.fetch }));
-							if (result) await toNodeRequest(result, response);
-						}
-						next();
-					});
-				};
+				if (isRunnableDevEnvironment(target)) {
+					process.on("exit", () => app.dispatchHook(CLOSE_HOOK));
+					return () => {
+						devServer.middlewares.use(async (request, response, next) => {
+							const server = await target.runner.import("#virtual/server").then((module) => module.default);
+							if (server) {
+								request.url = request.originalUrl;
+								const scope = new Scope();
+								scope.setContext(SERVER_CONTEXT, {
+									states: {},
+									request: fromNodeRequest(request, response),
+									response: { headers: new Headers() },
+									variables: process.env
+								});
+								var result = await invoke(scope, app.config.development.middlewares.concat({ fetch: server.fetch }));
+								if (result) await toNodeRequest(result, response);
+							}
+							next();
+						});
+					};
+				}
 			}
 		},
 		virtuals(app.config.build.virtuals),
-		client(),
-		entry(),
-		css()
+		client()
 	];
 }
 

package/package.json

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