revojs 0.1.44 → 0.1.46

package/dist/{app-D84eOfpA.mjs → app-DqEq3uwt.mjs}

@@ -313,7 +313,7 @@ async function invoke(scope, pipeline, index = 0) {
 }
 async function createServer() {
 	const router = new Router();
-	const middlewares = new Array();
+	const middleware = new Array();
 	const routes = await import("#routes").then((module) => Object.entries(module.default));
 	for (const [path, route] of routes) {
 		const segments = path.split("/");
@@ -324,13 +324,13 @@ async function createServer() {
 		}
 		router.use(segments, route);
 	}
-	middlewares.push(router);
+	middleware.push(...await import("#middleware").then((module) => Object.values(module.default)), router);
 	return {
 		router,
-		middlewares,
+		middleware,
 		async fetch(scope) {
 			try {
-				return await invoke(scope, middlewares) ?? sendNotFound(scope);
+				return await invoke(scope, middleware) ?? sendNotFound(scope);
 			} catch (value) {
 				if (value instanceof Response) return value;
 				throw value;
@@ -596,18 +596,21 @@ var App = class extends Hookable {
 					children: []
 				}
 			},
-			sources: { routes: {
-				match: "**/{get,head,post,put,delete,connect,options,trace,patch}.{js,ts}",
-				entries: ["./routes"]
-			} },
+			sources: {
+				routes: {
+					match: "**/{get,head,post,put,delete,connect,options,trace,patch}.{js,ts}",
+					entries: ["./routes"]
+				},
+				middleware: {
+					match: "**/*.{js,ts}",
+					entries: ["./middleware"]
+				}
+			},
 			variables: {},
-			development: { middlewares: [] },
-			build: {
-				externals: [],
-				templates: {},
-				virtuals: {},
-				alias: {}
-			}
+			development: { middleware: [] },
+			templates: {},
+			virtuals: {},
+			vite: {}
 		});
 	}
 };

package/dist/commands/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as version, t as name } from "../package-B2uzCFzB.mjs";
+import { n as version, t as name } from "../package-CHq5U5yh.mjs";
 import { defineCommand, runMain } from "citty";
 //#region src/commands/run/index.ts
 var run_default = defineCommand({ setup() {} });

package/dist/{index-j4qntB2R.d.mts → index-BaqVUbna.d.mts}

@@ -1,3 +1,5 @@
+import { UserConfig } from "vite";
+
 //#region src/shared/index.d.ts
 type Descriptor<T> = string & {
   [descriptor]: T;
@@ -7,7 +9,8 @@ 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> = { [Key in keyof T]?: Mergeable<T[Key]> };
+type Primitive = string | number | boolean | bigint | symbol | null | undefined;
+type Mergeable<T> = T extends Primitive ? T : T extends Array<infer U> ? Array<Mergeable<U>> : { [K in keyof T]?: Mergeable<T[K]> };
 interface Issue {
   readonly message: string;
 }
@@ -90,9 +93,14 @@ interface Middleware {
 }
 interface Server {
   router: Router;
-  middlewares: Array<Middleware>;
+  middleware: Array<Middleware>;
   fetch: (scope: Scope) => Result;
 }
+interface PathNode<T> {
+  type: "PATH";
+  value?: T;
+  children: Record<string, Node<T>>;
+}
 interface WildcardNode<T> {
   type: "WILDCARD";
   value?: T;
@@ -105,21 +113,16 @@ interface OptionalWildcardNode<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;
   parameter: string;
   children: Record<string, Node<T>>;
 }
-interface PathNode<T> {
-  type: "PATH";
+interface OptionalParameterNode<T> {
+  type: "OPTIONAL-PARAMETER";
   value?: T;
+  parameter: string;
   children: Record<string, Node<T>>;
 }
 declare class Radix<T> {
@@ -187,20 +190,14 @@ declare const mimeTypes: Record<string, string>;
 //#region src/app/index.d.ts
 type Environment = typeof CLIENT | typeof SERVER;
 type Virtual = (environment: Environment) => undefined | string | Promise<string>;
-type Content = () => string;
+type Content = () => string | Promise<string>;
 interface Template {
   tagName: string;
   attributes: Record<string, string>;
   children: Array<string | Template>;
 }
 interface DevelopmentConfig {
-  middlewares: Array<Middleware>;
-}
-interface BuildConfig {
-  externals: Array<string>;
-  templates: Record<string, Content>;
-  virtuals: Record<string, Virtual>;
-  alias: Record<string, string>;
+  middleware: Array<Middleware>;
 }
 interface Config {
   modules: Array<Module>;
@@ -210,11 +207,12 @@ interface Config {
   sources: Record<string, Source>;
   variables: Record<string, unknown>;
   development: DevelopmentConfig;
-  build: BuildConfig;
+  templates: Record<string, Content>;
+  virtuals: Record<string, Virtual>;
+  vite: UserConfig;
 }
 interface Module {
-  config?: () => Mergeable<Config> | Promise<Mergeable<Config>>;
-  setup?: (app: App) => void | Promise<void>;
+  setup?: (app: App) => void | Mergeable<Config> | Promise<void | Mergeable<Config>>;
 }
 interface Source {
   match: string | Array<string>;
@@ -232,4 +230,4 @@ declare const CLOSE_HOOK: Descriptor<() => void>;
 //#region src/client/index.d.ts
 declare function $fetch<T>(scope: Scope, input: string | URL, options?: RequestInit): Promise<T>;
 //#endregion
-export { defineRoute as $, PARAMETER_MATCH as A, withQuery as At, SERVER_CONTEXT as B, Output as Bt, OPTIONAL_PARAMETER as C, useHeaders as Ct, OptionalParameterNode as D, useServer as Dt, OPTIONAL_WILDCARD_MATCH as E, useRouter as Et, ResponseConfig as F, InferInput as Ft, StatusCode as G, defineHook as Gt, Server as H, Scope as Ht, Result as I, InferOutput as It, WildcardNode as J, parseSchema as Jt, WILDCARD as K, isFailure as Kt, Route as L, Invoke as Lt, PathNode as M, Descriptor as Mt, ROUTER_CONTEXT as N, Failure as Nt, OptionalWildcardNode as O, useSetCookies as Ot, Radix as P, Hookable as Pt, defineMiddleware as Q, Router as R, Issue as Rt, Node as S, useCookies as St, OPTIONAL_WILDCARD as T, useQuery as Tt, ServerContext as U, Success as Ut, STATES as V, Schema as Vt, States as W, defineContext as Wt, cookieSameSites as X, cookiePriorities as Y, createServer as Z, CookieSameSite as _, sendUnauthorized as _t, CLOSE_HOOK as a, isServer as at, Middleware as b, statusCodes as bt, DevelopmentConfig as c, parseCookiePair as ct, SERVER as d, sendForbidden as dt, encodings as et, Source as f, sendNoContent as ft, CookiePriority as g, sendResponse as gt, CookieOptions as h, sendRedirect as ht, CLIENT as i, isClient as it, ParameterNode as j, Context as jt, PARAMETER as k, useUrl as kt, Environment as l, sendBadRequest as lt, Virtual as m, sendOk as mt, App as n, httpMethods as nt, Config as o, mimeType as ot, Template as p, sendNotFound as pt, WILDCARD_MATCH as q, mergeObjects as qt, BuildConfig as r, invoke as rt, Content as s, mimeTypes as st, $fetch as t, getState as tt, Module as u, sendCreated as ut, Encoding as v, setCookie as vt, OPTIONAL_PARAMETER_MATCH as w, useParameters as wt, MimeType as x, useBody as xt, HttpMethod as y, setState as yt, RouterContext as z, Mergeable as zt };
+export { encodings as $, ParameterNode as A, Context as At, STATES as B, Primitive as Bt, OPTIONAL_PARAMETER_MATCH as C, useParameters as Ct, OptionalWildcardNode as D, useSetCookies as Dt, OptionalParameterNode as E, useServer as Et, Result as F, InferOutput as Ft, WILDCARD as G, defineHook as Gt, ServerContext as H, Scope as Ht, Route as I, Invoke as It, cookiePriorities as J, parseSchema as Jt, WILDCARD_MATCH as K, isFailure as Kt, Router as L, Issue as Lt, ROUTER_CONTEXT as M, Failure as Mt, Radix as N, Hookable as Nt, PARAMETER as O, useUrl as Ot, ResponseConfig as P, InferInput as Pt, defineRoute as Q, RouterContext as R, Mergeable as Rt, OPTIONAL_PARAMETER as S, useHeaders as St, OPTIONAL_WILDCARD_MATCH as T, useRouter as Tt, States as U, Success as Ut, Server as V, Schema as Vt, StatusCode as W, defineContext as Wt, createServer as X, cookieSameSites as Y, defineMiddleware as Z, Encoding as _, setCookie as _t, Config as a, mimeType as at, MimeType as b, useBody as bt, Environment as c, sendBadRequest as ct, Source as d, sendNoContent as dt, getState as et, Template as f, sendNotFound as ft, CookieSameSite as g, sendUnauthorized as gt, CookiePriority as h, sendResponse as ht, CLOSE_HOOK as i, isServer as it, PathNode as j, Descriptor as jt, PARAMETER_MATCH as k, withQuery as kt, Module as l, sendCreated as lt, CookieOptions as m, sendRedirect as mt, App as n, invoke as nt, Content as o, mimeTypes as ot, Virtual as p, sendOk as pt, WildcardNode as q, mergeObjects as qt, CLIENT as r, isClient as rt, DevelopmentConfig as s, parseCookiePair as st, $fetch as t, httpMethods as tt, SERVER as u, sendForbidden as ut, HttpMethod as v, setState as vt, OPTIONAL_WILDCARD as w, useQuery as wt, Node as x, useCookies as xt, Middleware as y, statusCodes as yt, SERVER_CONTEXT as z, Output as zt };

package/dist/index.d.mts

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

package/dist/kit/index.d.mts

@@ -1,13 +1,13 @@
-import { m as Virtual, n as App, s as Content } from "../index-j4qntB2R.mjs";
+import { n as App, o as Content, p as Virtual } from "../index-BaqVUbna.mjs";
 
 //#region src/kit/index.d.ts
 declare function useKit(source: string | URL): {
   fromModule(...paths: Array<string>): string;
 };
-declare function addAlias(app: App, name: string, path: string): void;
 declare function addTemplate(app: App, name: string, content: Content): void;
 declare function addVirtual(app: App, name: string, virtual: Virtual): void;
 declare function addRoutes(app: App, path: string): void;
+declare function addMiddleware(app: App, path: string): void;
 declare function addTypes(app: App, name: string, content: Content): void;
 //#endregion
-export { addAlias, addRoutes, addTemplate, addTypes, addVirtual, useKit };
+export { addMiddleware, addRoutes, addTemplate, addTypes, addVirtual, useKit };

package/dist/kit/index.mjs

@@ -8,20 +8,20 @@ function useKit(source) {
 		return join(source, ...paths).split(win32.sep).join(posix.sep);
 	} };
 }
-function addAlias(app, name, path) {
-	app.config.build.alias["#alias/" + name] = path;
-}
 function addTemplate(app, name, content) {
-	app.config.build.templates[name] = content;
+	app.config.templates[name] = content;
 }
 function addVirtual(app, name, virtual) {
-	app.config.build.virtuals["#" + name] = virtual;
+	app.config.virtuals["#" + name] = virtual;
 }
 function addRoutes(app, path) {
 	app.config.sources.routes?.entries.push(path);
 }
+function addMiddleware(app, path) {
+	app.config.sources.middleware?.entries.push(path);
+}
 function addTypes(app, name, content) {
 	addTemplate(app, `types/${name}.d.ts`, content);
 }
 //#endregion
-export { addAlias, addRoutes, addTemplate, addTypes, addVirtual, useKit };
+export { addMiddleware, addRoutes, addTemplate, addTypes, addVirtual, useKit };

package/dist/{package-B2uzCFzB.mjs → package-CHq5U5yh.mjs}

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

package/dist/vite/index.d.mts

@@ -1,5 +1,5 @@
-import { o as Config, zt as Mergeable } from "../index-j4qntB2R.mjs";
-import { Plugin } from "vite";
+import { Rt as Mergeable, a as Config } from "../index-BaqVUbna.mjs";
+import { PluginOption } from "vite";
 
 //#region src/vite/index.d.ts
 interface Import {
@@ -8,6 +8,6 @@ interface Import {
   path: string;
 }
 declare function toImportName(path: string): string;
-declare function revojs(config?: Mergeable<Config>): Array<Plugin>;
+declare function revojs(config?: Mergeable<Config>): Promise<Array<PluginOption>>;
 //#endregion
 export { Import, revojs, toImportName };

package/dist/vite/index.mjs

@@ -1,11 +1,11 @@
-import { N as invoke, n as CLIENT, o as Scope, r as CLOSE_HOOK, t as App, u as mergeObjects, x as SERVER_CONTEXT } from "../app-D84eOfpA.mjs";
-import { n as version, t as name } from "../package-B2uzCFzB.mjs";
+import { N as invoke, n as CLIENT, o as Scope, r as CLOSE_HOOK, t as App, u as mergeObjects, x as SERVER_CONTEXT } from "../app-DqEq3uwt.mjs";
+import { n as version, t as name } from "../package-CHq5U5yh.mjs";
 import { addTemplate, addTypes, addVirtual, useKit } from "../kit/index.mjs";
 import { basename, dirname, 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 { isRunnableDevEnvironment, mergeConfig } from "vite";
 import { once } from "events";
 import { Readable } from "stream";
 //#region src/vite/node/index.ts
@@ -141,8 +141,12 @@ function toHtmlTagDescriptor(template, injectTo) {
 function toImportName(path) {
 	return path.replace(/\.[^/.]+$/, "").replace(/\[\[\.\.\.(.*?)\]\]/g, "$1").replace(/\[\.\.\.(.*?)\]/g, "$1").replace(/\[\[(.*?)\]\]/g, "$1").replace(/\[(.*?)\]/g, "$1").split("/").flatMap((segment) => segment.split(/[-_]/g)).filter(Boolean).map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1)).join("").replace(/[^a-zA-Z0-9_$]/g, "");
 }
-function revojs(config) {
+async function revojs(config) {
 	const app = new App(config);
+	for (const module of app.config.modules) {
+		const result = await module.setup?.(app);
+		if (typeof result === "object") app.config = mergeObjects(app.config, result);
+	}
 	return [
 		{
 			name,
@@ -151,8 +155,6 @@ function revojs(config) {
 			api: { [name]: app },
 			async config() {
 				const { fromModule } = useKit(cwd());
-				for (const module of app.config.modules) app.config = mergeObjects(app.config, await module.config?.());
-				for (const module of app.config.modules) await module.setup?.(app);
 				addVirtual(app, "client", () => {
 					if (app.config.client) return `import client from "${fromModule(app.config.client)}?client"; export default client`;
 				});
@@ -178,15 +180,15 @@ function revojs(config) {
 						return content;
 					});
 					addTypes(app, name, () => {
-						let content = entries.reduce((content, entry) => content + `export declare const ${entry.import}: typeof import("${entry.path}")["default"] \n`, "");
+						let content = entries.reduce((content, entry) => content += `export declare const ${entry.import}: typeof import("${entry.path}") extends { default: infer D } ? D : typeof import("${entry.path}") \n`, "");
 						content += `declare const entries: { ${entries.map((entry) => `"${entry.name}": typeof ${entry.import}`)} } \n`;
 						content += `export default entries`;
-						return content;
+						return `declare module "#${name}" { ${content} }`;
 					});
 				}
 				const meta = resolve(".revojs");
 				addTemplate(app, "index.d.ts", () => {
-					return Object.keys(app.config.build.templates).reduce((content, name) => {
+					return Object.keys(app.config.templates).reduce((content, name) => {
 						if (name.startsWith("types/")) content += `import "./${name}" \n`;
 						return content;
 					}, "");
@@ -195,20 +197,15 @@ function revojs(config) {
 					recursive: true,
 					force: true
 				});
-				for (const template in app.config.build.templates) {
+				for (const template in app.config.templates) {
 					const path = join(meta, template);
 					mkdirSync(dirname(path), { recursive: true });
-					writeFileSync(path, app.config.build.templates[template]());
+					writeFileSync(path, await app.config.templates[template]());
 				}
-				return {
+				return mergeConfig({
 					appType: "custom",
 					optimizeDeps: { exclude: ["revojs"] },
-					resolve: { alias: app.config.build.alias },
-					build: {
-						emptyOutDir: false,
-						assetsInlineLimit: 4096 * 4,
-						rolldownOptions: { external: app.config.build.externals }
-					},
+					build: { emptyOutDir: false },
 					define: Object.entries(app.config.variables).reduce((variables, [name, value]) => ({
 						...variables,
 						[`import.meta.${name}`]: value
@@ -259,7 +256,7 @@ function revojs(config) {
 							}
 						} }
 					}
-				};
+				}, app.config.vite);
 			},
 			transformIndexHtml: {
 				order: "pre",
@@ -292,7 +289,7 @@ function revojs(config) {
 									response: { headers: new Headers() },
 									variables: process.env
 								});
-								var result = await invoke(scope, app.config.development.middlewares.concat({ fetch: server.fetch }));
+								var result = await invoke(scope, app.config.development.middleware.concat({ fetch: server.fetch }));
 								if (result) await toNodeRequest(result, response);
 							}
 							next();
@@ -301,8 +298,9 @@ function revojs(config) {
 				}
 			}
 		},
-		virtuals(app.config.build.virtuals),
-		client()
+		virtuals(app.config.virtuals),
+		client(),
+		app.config.vite.plugins
 	];
 }
 //#endregion

package/package.json

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

package/src/types/middlewares.d.ts

@@ -0,0 +1,7 @@
+declare module "#middleware" {
+    import type { Middleware } from "revojs";
+
+    const entries: Record<string, Middleware>;
+
+    export default entries;
+}