revojs 0.1.8 → 0.1.10

package/dist/index.d.ts

@@ -90,9 +90,12 @@ interface Route {
 interface Middleware {
   fetch: (scope: Scope, next?: () => Result) => Result;
 }
+interface Exception {
+  fetch: (scope: Scope, exception: unknown) => Result;
+}
 interface Server {
   router: Router;
-  pipeline: Array<Middleware>;
+  middlewares: Array<Middleware>;
   fetch: (scope: Scope) => Promise<Response>;
 }
 interface WildcardNode<T> {
@@ -122,6 +125,7 @@ declare class Router extends Radix<Route> implements Middleware {
 }
 declare function defineRoute<T extends Route>(route: T): T;
 declare function defineMiddleware<T extends Middleware>(middleware: T): T;
+declare function defineException<T extends Exception>(exception: T): T;
 declare function useRouter(scope: Scope): RouterContext;
 declare function useServer<T extends Context>(scope: Scope): ServerContext<T>;
 declare function useUrl(scope: Scope, base?: string): URL;
@@ -157,13 +161,16 @@ type Virtual = (environment: Environment) => undefined | string | Promise<string
 interface DevelopmentConfig {
   middlewares: Array<Middleware>;
 }
+interface BuildConfig {
+  externals: Array<string>;
+}
 interface Config {
   modules: Array<Module>;
   client?: string;
   server?: string;
-  externals: Array<string>;
   sources: Record<string, Source>;
   development: DevelopmentConfig;
+  build: BuildConfig;
 }
 interface Module {
   config?: Mergeable<Config>;
@@ -172,7 +179,7 @@ interface Module {
 interface Source {
   match: string;
   entries: Array<string>;
-  suffix?: string;
+  resolve?: (path: string) => string;
 }
 interface App {
   config: Config;
@@ -186,4 +193,4 @@ declare const CLIENT = "client";
 //#region src/client/index.d.ts
 declare function $fetch<T>(scope: Scope, input: string | URL, options?: RequestInit): Promise<T>;
 //#endregion
-export { $fetch, App, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, HttpMethod, InferInput, InferOutput, 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, StopEvent, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineMiddleware, defineRoute, getState, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useQuery, useRouter, useServer, useSetCookies, useUrl };
+export { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Exception, Failure, HttpMethod, InferInput, InferOutput, 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, StopEvent, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineException, defineMiddleware, defineRoute, getState, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useQuery, useRouter, useServer, useSetCookies, useUrl };

package/dist/index.js

@@ -88,6 +88,9 @@ function defineRoute(route) {
 function defineMiddleware(middleware) {
 	return middleware;
 }
+function defineException(exception) {
+	return exception;
+}
 function useRouter(scope) {
 	return scope.getContext(ROUTER_CONTEXT);
 }
@@ -132,8 +135,8 @@ function setCookie(scope, name, value, options) {
 	if (options?.priority) cookie += `; Priority=${options.priority}`;
 	if (options?.sameSite) cookie += `; SameSite=${options.sameSite}`;
 	if (options?.secure) cookie += `; Secure`;
-	if (import.meta.client) document.cookie = cookie;
-	else response.headers.append("Set-Cookie", cookie);
+	if (import.meta.server) response.headers.append("Set-Cookie", cookie);
+	else document.cookie = cookie;
 }
 function getState(scope, name) {
 	if (import.meta.server) {
@@ -203,9 +206,7 @@ function invoke(scope, pipeline, index = 0) {
 }
 async function createServer() {
 	const router = new Router();
-	const pipeline = new Array();
-	const middlewares = await import("#virtual/middlewares").then((module) => Object.entries(module.default));
-	for (const [_, middleware] of middlewares) pipeline.push(middleware);
+	const middlewares = new Array();
 	const assets = await import("#virtual/assets").then((module) => Object.entries(module.default));
 	for (const [path, asset] of assets) router.use(`GET/${path}`, defineRoute({ async fetch(scope) {
 		const { response } = useServer(scope);
@@ -217,12 +218,24 @@ async function createServer() {
 		const [name, method] = toRoutePath(path);
 		router.use(method?.toUpperCase() + name, route);
 	}
-	pipeline.push(router);
+	const exceptions = await import("#virtual/exceptions").then((module) => Object.values(module.default));
+	middlewares.push(defineMiddleware({ async fetch(scope, next) {
+		try {
+			return await next?.();
+		} catch (value) {
+			for (const exception of exceptions) {
+				const result = exception.fetch(scope, value);
+				if (result) return result;
+			}
+			if (value instanceof Response) return value;
+		}
+	} }));
+	middlewares.push(router);
 	return {
 		router,
-		pipeline,
+		middlewares,
 		async fetch(scope) {
-			return await invoke(scope, pipeline) ?? sendText(scope, "NOT_FOUND", { status: 404 });
+			return await invoke(scope, middlewares) ?? sendText(scope, "NOT_FOUND", { status: 404 });
 		}
 	};
 }
@@ -324,7 +337,7 @@ function parseSchema(scope, schema, value) {
 }
 function mergeObjects(base, input) {
 	if (input === null || input === void 0) return mergeObjects(base, {});
-	const object = structuredClone(input);
+	const object = Object.assign({}, input);
 	for (const key in base) {
 		if (key === "__proto__" || key === "constructor") continue;
 		const value = base[key];
@@ -341,23 +354,23 @@ function mergeObjects(base, input) {
 function createApp(inputConfig) {
 	let config = mergeObjects(inputConfig, {
 		modules: [],
-		externals: [],
 		sources: {
 			assets: {
 				match: "**/*",
 				entries: ["./public"],
-				suffix: "?raw"
+				resolve: (path) => path + "?raw"
 			},
 			routes: {
 				match: "**/*.{js,ts}",
 				entries: ["./routes"]
 			},
-			middlewares: {
+			exceptions: {
 				match: "**/*.{js,ts}",
-				entries: ["./middlewares"]
+				entries: ["./exceptions"]
 			}
 		},
-		development: { middlewares: [] }
+		development: { middlewares: [] },
+		build: { externals: [] }
 	});
 	for (const module of config.modules) config = mergeObjects(config, module.config);
 	return {
@@ -393,4 +406,4 @@ async function $fetch(scope, input, options) {
 }
 
 //#endregion
-export { $fetch, CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, StopEvent, WILDCARD, createApp, createServer, defineContext, defineMiddleware, defineRoute, getState, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useQuery, useRouter, useServer, useSetCookies, useUrl };
+export { $fetch, CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, StopEvent, WILDCARD, createApp, createServer, defineContext, defineException, defineMiddleware, defineRoute, getState, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useQuery, useRouter, useServer, useSetCookies, useUrl };

package/package.json

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

package/src/types/index.d.ts

@@ -26,12 +26,12 @@ declare module "#virtual/routes" {
     export default routes;
 }
 
-declare module "#virtual/middlewares" {
-    import type { Middleware } from "revojs";
+declare module "#virtual/exceptions" {
+    import type { Exception } from "revojs";
 
-    const middlewares: Record<string, Middleware>;
+    const exceptions: Record<string, Exception>;
 
-    export default middlewares;
+    export default exceptions;
 }
 
 interface ImportMeta {