revojs 0.1.7 → 0.1.9

package/dist/index.d.ts

@@ -57,6 +57,7 @@ type StatusCode = 100 | 101 | 102 | 103 | 200 | 201 | 202 | 203 | 204 | 205 | 20
 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 States = Record<string, unknown>;
 interface CookieOptions {
   domain?: string;
   expires?: Date;
@@ -78,6 +79,7 @@ interface RouterContext {
   parameters: Record<string, string>;
 }
 interface ServerContext<T extends Context = Context> {
+  states: States;
   request: Request;
   response: ResponseConfig;
   variables: T;
@@ -88,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> {
@@ -120,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 useRouter(scope: Scope): RouterContext;
 declare function useServer<T extends Context>(scope: Scope): ServerContext<T>;
 declare function useUrl(scope: Scope, base?: string): URL;
 declare function useQuery(scope: Scope): Record<string, string>;
@@ -129,6 +135,8 @@ declare function useCookies<T extends Schema>(scope: Scope, schema: T): InferOut
 declare function useSetCookies(scope: Scope): Record<string, string>;
 declare function useSetCookies<T extends Schema>(scope: Scope, schema: T): InferOutput<T>;
 declare function setCookie(scope: Scope, name: string, value: string, options?: CookieOptions): void;
+declare function getState<T>(scope: Scope, name: string): T;
+declare function setState<T>(scope: Scope, name: string, value: T): void;
 declare function sendText(scope: Scope, text: string, config?: Mergeable<ResponseConfig>): Response;
 declare function sendHtml(scope: Scope, text: string, config?: Mergeable<ResponseConfig>): Response;
 declare function sendJson<T>(scope: Scope, value: T, config?: Mergeable<ResponseConfig>): Response;
@@ -143,6 +151,7 @@ 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>;
 //#endregion
 //#region src/app/index.d.ts
@@ -151,13 +160,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>;
@@ -166,7 +178,7 @@ interface Module {
 interface Source {
   match: string;
   entries: Array<string>;
-  suffix?: string;
+  resolve?: (path: string) => string;
 }
 interface App {
   config: Config;
@@ -180,4 +192,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, Schema, Scope, Server, ServerContext, Source, StatusCode, StopEvent, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineMiddleware, defineRoute, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, toRoutePath, useCookies, useQuery, 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, 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 useRouter(scope) {
+	return scope.getContext(ROUTER_CONTEXT);
+}
 function useServer(scope) {
 	return scope.getContext(SERVER_CONTEXT);
 }
@@ -132,6 +135,30 @@ function setCookie(scope, name, value, options) {
 	if (import.meta.client) document.cookie = cookie;
 	else response.headers.append("Set-Cookie", cookie);
 }
+function getState(scope, name) {
+	if (import.meta.server) {
+		const { states } = useServer(scope);
+		return states[name];
+	} else {
+		if (STATES === void 0) {
+			const element = document.getElementById("STATES");
+			STATES = element?.textContent ? JSON.parse(element.textContent) : {};
+		}
+		return STATES[name];
+	}
+}
+function setState(scope, name, value) {
+	if (import.meta.server) {
+		const { states } = useServer(scope);
+		states[name] = value;
+	} else {
+		if (STATES === void 0) {
+			const element = document.getElementById("STATES");
+			STATES = element?.textContent ? JSON.parse(element.textContent) : {};
+		}
+		STATES[name] = value;
+	}
+}
 function sendText(scope, text, config) {
 	const { response } = useServer(scope);
 	response.headers.set("Content-Type", "text/plain");
@@ -176,9 +203,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);
@@ -190,12 +215,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 });
 		}
 	};
 }
@@ -203,6 +240,7 @@ const ROUTER_CONTEXT = defineContext("ROUTER_CONTEXT");
 const SERVER_CONTEXT = defineContext("SERVER_CONTEXT");
 const WILDCARD = "$";
 const PARAMETER = ":";
+let STATES;
 const mimeTypes = {
 	txt: "text/plain",
 	css: "text/css",
@@ -296,7 +334,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];
@@ -313,23 +351,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 {
@@ -346,9 +384,10 @@ const CLIENT = "client";
 async function $fetch(scope, input, options) {
 	let response;
 	if (import.meta.server) {
-		const { request, variables } = useServer(scope);
+		const { states, request, variables } = useServer(scope);
 		const next = new Scope();
 		next.setContext(SERVER_CONTEXT, {
+			states,
 			request: new Request(new URL(input.toString(), request.url), options),
 			response: { headers: new Headers() },
 			variables
@@ -364,4 +403,4 @@ async function $fetch(scope, input, options) {
 }
 
 //#endregion
-export { $fetch, CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, Scope, StopEvent, WILDCARD, createApp, createServer, defineContext, defineMiddleware, defineRoute, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, toRoutePath, useCookies, useQuery, useServer, useSetCookies, useUrl };
+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 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.1.7",
+    "version": "0.1.9",
     "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 {