revojs 0.1.43 → 0.1.45

package/dist/{app-BDHw-biB.mjs → app-B4HJTrxE.mjs}

@@ -239,7 +239,7 @@ function setState(scope, name, value) {
 }
 function sendResponse(scope, body, config) {
 	const { response } = useServer(scope);
-	if (body !== null && body !== void 0) {
+	if (body !== null && body !== void 0 && !response.headers.has("Content-Type")) {
 		if (typeof body === "object" && !ArrayBuffer.isView(body)) {
 			if (body instanceof FormData) response.headers.set("Content-Type", "multipart/form-data");
 			else if (body instanceof URLSearchParams) response.headers.set("Content-Type", "application/x-www-form-urlencoded");
@@ -257,7 +257,12 @@ function sendResponse(scope, body, config) {
 			body = JSON.stringify(body);
 		}
 	}
-	return new Response(body, mergeObjects(response, config));
+	if (config?.headers instanceof Headers) for (const [key, value] of config.headers.entries()) response.headers.set(key, value);
+	return new Response(body, {
+		status: config?.status ?? response.status,
+		statusText: config?.statusText ?? response.statusText,
+		headers: response.headers
+	});
 }
 function sendOk(scope, body, config) {
 	const { response } = useServer(scope);
@@ -308,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("/");
@@ -319,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;
@@ -591,12 +596,18 @@ 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: [] },
+			development: { middleware: [] },
 			build: {
 				externals: [],
 				templates: {},

package/dist/commands/index.mjs

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

package/dist/{index-CNiAmGY8.d.mts → index--5m6SUpo.d.mts}

@@ -68,7 +68,7 @@ interface CookieOptions {
 }
 interface ResponseConfig {
   status?: StatusCode;
-  message?: string;
+  statusText?: string;
   headers: Headers;
 }
 interface RouterContext {
@@ -90,7 +90,7 @@ interface Middleware {
 }
 interface Server {
   router: Router;
-  middlewares: Array<Middleware>;
+  middleware: Array<Middleware>;
   fetch: (scope: Scope) => Result;
 }
 interface WildcardNode<T> {
@@ -194,7 +194,7 @@ interface Template {
   children: Array<string | Template>;
 }
 interface DevelopmentConfig {
-  middlewares: Array<Middleware>;
+  middleware: Array<Middleware>;
 }
 interface BuildConfig {
   externals: Array<string>;

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-CNiAmGY8.mjs";
+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--5m6SUpo.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 };

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-BDHw-biB.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-B4HJTrxE.mjs";
 //#region src/client/index.ts
 async function $fetch(scope, input, options) {
 	let response;

package/dist/kit/index.d.mts

@@ -1,4 +1,4 @@
-import { m as Virtual, n as App, s as Content } from "../index-CNiAmGY8.mjs";
+import { m as Virtual, n as App, s as Content } from "../index--5m6SUpo.mjs";
 
 //#region src/kit/index.d.ts
 declare function useKit(source: string | URL): {
@@ -8,6 +8,7 @@ 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 { addAlias, addMiddleware, addRoutes, addTemplate, addTypes, addVirtual, useKit };

package/dist/kit/index.mjs

@@ -20,8 +20,11 @@ function addVirtual(app, 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 { addAlias, addMiddleware, addRoutes, addTemplate, addTypes, addVirtual, useKit };

package/dist/{package-DCyffKe-.mjs → package-9EF2Bhnr.mjs}

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

package/dist/vite/index.d.mts

@@ -1,4 +1,4 @@
-import { o as Config, zt as Mergeable } from "../index-CNiAmGY8.mjs";
+import { o as Config, zt as Mergeable } from "../index--5m6SUpo.mjs";
 import { Plugin } from "vite";
 
 //#region src/vite/index.d.ts

package/dist/vite/index.mjs

@@ -1,5 +1,5 @@
-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-BDHw-biB.mjs";
-import { n as version, t as name } from "../package-DCyffKe-.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-B4HJTrxE.mjs";
+import { n as version, t as name } from "../package-9EF2Bhnr.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";
@@ -292,7 +292,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();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.1.43",
+    "version": "0.1.45",
     "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;
+}