revojs 0.0.46 → 0.0.47

package/dist/app/index.d.ts

@@ -11,19 +11,19 @@ export type ClientConfig = {
 export type ServerConfig = {
     entry: ServerEntry;
 };
-export type DevelopmentConfig<T> = {
-    middleware: Array<Middleware<T>>;
+export type DevelopmentConfig = {
+    middleware: Array<Middleware>;
 };
-export type Config<T> = {
+export type Config = {
     client: ClientConfig;
     server: false | ServerConfig;
     markdown: Record<string, Template>;
-    dev: DevelopmentConfig<T>;
+    dev: DevelopmentConfig;
 };
-export type App<T> = {
-    config: Config<T>;
+export type App = {
+    config: Config;
     virtuals: Record<string, (environment: Environment) => string>;
 };
-export declare const createApp: <T>(config?: NestedPartial<Config<T>>) => App<T>;
+export declare const createApp: <T>(config?: NestedPartial<Config>) => App;
 export declare const SERVER = "ssr";
 export declare const CLIENT = "client";

package/dist/http/index.d.ts

@@ -1,3 +1,4 @@
+import { Scope } from "../signals";
 export type CookieOptions = {
     domain?: string;
     expires?: Date;
@@ -12,31 +13,26 @@ export type HttpMethod = "GET" | "HEAD" | "PATCH" | "POST" | "PUT" | "DELETE" |
 export type Encoding = "ascii" | "utf8" | "utf-8" | "utf16le" | "ucs2" | "ucs-2" | "base64" | "latin1" | "binary" | "hex";
 export 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;
 export 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";
-export type Context<T> = {
-    inputs: Record<string, string>;
-    variables: T;
-};
 export type Set = {
     status?: StatusCode;
     message?: string;
     headers: Headers;
 };
-export type Event<T = Record<string, unknown>> = {
+export declare class Event extends Scope {
     request: Request;
     response: Set;
-    context: Context<T>;
-};
-export type Handle<T> = (event: Event<T>) => void | Response | Promise<void | Response>;
-export type Middleware<T> = (event: Event<T>, next: Handle<T>) => void | Response | Promise<void | Response>;
-export declare const createEvent: <T>(request: Request, context: Context<T>) => Event<T>;
-export declare const sendText: <T>(event: Event<T>, text: string) => Response;
-export declare const sendHtml: <T>(event: Event<T>, text: string) => Response;
-export declare const sendJson: <TValue, T>(event: Event<T>, value: TValue) => Response;
-export declare const sendRedirect: <T>(event: Event<T>, path: string) => Response;
-export declare const sendBadRequest: <T>(event: Event<T>, text: string) => Response;
-export declare const sendUnauthorized: <T>(event: Event<T>) => Response;
-export declare const getRequestUrl: <T>(event: Event<T> | Request) => URL;
-export declare const getCookies: <T>(event: Event<T>) => Record<string, string>;
-export declare const getSetCookies: <T>(event: Event<T>) => Record<string, string>;
-export declare const setCookie: <T>(event: Event<T>, name: string, value: string, options?: CookieOptions) => void;
+    constructor(request: Request);
+}
+export type Handle = (event: Event) => void | Response | Promise<void | Response>;
+export type Middleware = (event: Event, next: Handle) => void | Response | Promise<void | Response>;
+export declare const sendText: (event: Event, text: string) => Response;
+export declare const sendHtml: (event: Event, text: string) => Response;
+export declare const sendJson: <T>(event: Event, value: T) => Response;
+export declare const sendRedirect: (event: Event, path: string) => Response;
+export declare const sendBadRequest: (event: Event, text: string) => Response;
+export declare const sendUnauthorized: (event: Event) => Response;
+export declare const getRequestUrl: (event: Event, base?: string) => URL;
+export declare const getCookies: (event: Event) => Record<string, string>;
+export declare const getSetCookies: (event: Event) => Record<string, string>;
+export declare const setCookie: (event: Event, name: string, value: string, options?: CookieOptions) => void;
 export declare const getMimeType: (file: string) => MimeType;

package/dist/index.js

@@ -478,12 +478,14 @@ const HOST_CONTEXT = defineContext("HOST_CONTEXT");
 
 //#endregion
 //#region src/http/index.ts
-const createEvent = (request, context) => {
-	return {
-		request,
-		response: { headers: new Headers() },
-		context
-	};
+var Event$1 = class extends Scope {
+	request;
+	response;
+	constructor(request) {
+		super();
+		this.request = request;
+		this.response = { headers: new Headers() };
+	}
 };
 const sendText = (event, text) => {
 	event.response.headers.set("Content-Type", "text/plain");
@@ -510,8 +512,8 @@ const sendUnauthorized = (event) => {
 	event.response.status = 401;
 	return new Response(null, event.response);
 };
-const getRequestUrl = (event) => {
-	return new URL(event instanceof Request ? event.url : event.request.url);
+const getRequestUrl = (event, base) => {
+	return new URL(event.request.url, base);
 };
 const getCookies = (event) => {
 	const cookies = event.request.headers.get("Cookie")?.split("; ") ?? [];
@@ -633,8 +635,11 @@ var Radix = class Radix {
 
 //#endregion
 //#region src/runtime/index.ts
-const useRuntime = (scope, context) => {
-	return scope.getContext(context ?? RUNTIME_CONTEXT);
+const useRuntime = (scope) => {
+	return scope.getContext(RUNTIME_CONTEXT);
+};
+const useVariables = (scope) => {
+	return scope.getContext(VARIABLE_CONTEXT);
 };
 const defineRoute = (route) => {
 	return route;
@@ -648,22 +653,23 @@ const toPath = (value) => {
 	const split = route.split(".");
 	return split.length === 3 ? [split.at(0), split.at(1)] : [split.at(0)];
 };
-const $fetch = async (scope, input, init) => {
+const $fetch = async (scope, input, options) => {
 	const { event } = useRuntime(scope);
 	let response;
 	if (event) {
 		const url = new URL(input.toString(), event.request.url);
-		response = await (await import("#virtual/runtime")).runtime.fetch(new Request(url, init), event.context);
-	} else response = await fetch(input, init);
+		const next = new Event$1(new Request(url, options));
+		next.setContext(VARIABLE_CONTEXT, useVariables(event));
+		const previous = new URL(event.request.url);
+		if (url.origin === previous.origin) response = await (await import("#virtual/runtime")).runtime.fetch(next);
+	}
+	response ??= await fetch(input, options);
 	if (response.ok === false) throw response;
 	switch (response.headers.get("Content-Type")) {
 		case "application/json": return response.json();
 		default: return response;
 	}
 };
-const getVariables = (event) => {
-	return event ? event.context.variables : import.meta.env;
-};
 const createRuntime = async () => {
 	const radix = new Radix();
 	const middlewares = new Array();
@@ -673,15 +679,7 @@ const createRuntime = async () => {
 		radix.insert((method ?? "GET").toUpperCase() + name, defineRoute({ fetch: async (event) => {
 			const route = await routes[path]?.();
 			if (typeof route === "object") return route.fetch(event);
-			if (route) {
-				const scope = new Scope();
-				try {
-					scope.setContext(RUNTIME_CONTEXT, { event });
-					return sendHtml(event, await renderToString(scope, await import("#virtual/client").then((module) => module.client)));
-				} finally {
-					scope.stop();
-				}
-			}
+			if (route) return sendHtml(event, await renderToString(event, await import("#virtual/client").then((module) => module.client)));
 		} }));
 	}
 	const assets = await import("#virtual/assets").then((module) => module.assets);
@@ -695,19 +693,19 @@ const createRuntime = async () => {
 	return {
 		radix,
 		middlewares,
-		fetch: async (request, context) => {
-			const url = getRequestUrl(request);
-			const { value: route, inputs } = radix.match(request.method + url.pathname);
-			const event = createEvent(request, {
-				...context,
-				inputs
-			});
+		fetch: async (event) => {
+			const url = getRequestUrl(event);
+			const { value: route, inputs } = radix.match(event.request.method + url.pathname);
 			try {
+				event.setContext(RUNTIME_CONTEXT, {
+					event,
+					inputs
+				});
 				if (route) {
 					const response = await invoke(event, route.fetch, 0);
 					if (response) return response;
 				}
-				return sendText(event, "Not found");
+				return sendText(event, "NOT_FOUND");
 			} catch (exception) {
 				if (exception instanceof Response) return exception;
 				throw exception;
@@ -716,6 +714,7 @@ const createRuntime = async () => {
 	};
 };
 const RUNTIME_CONTEXT = defineContext("RUNTIME_CONTEXT");
+const VARIABLE_CONTEXT = defineContext("VARIABLE_CONTEXT");
 
 //#endregion
 //#region src/router/index.tsx
@@ -730,7 +729,6 @@ const createRouter = (options) => {
 	const radix = new Radix();
 	const url = createState();
 	const route = createState();
-	const inputs = createState();
 	for (const path in options.routes) {
 		const [name] = toPath(path);
 		if (name) {
@@ -739,24 +737,25 @@ const createRouter = (options) => {
 		}
 	}
 	const registerRouterContext = async (scope) => {
-		const { event } = useRuntime(scope);
 		const fetch$1 = async () => {
+			const { event } = useRuntime(scope);
 			url.value = new URL(event?.request.url ?? window?.location.href);
 			const match = radix.match(url.value.pathname);
-			inputs.value = match.inputs;
+			scope.setContext(RUNTIME_CONTEXT, {
+				event,
+				inputs: match.inputs
+			});
 			const Page$1 = await match.value?.();
-			if (Page$1) route.value = /* @__PURE__ */ h(Page$1, inputs.value);
+			if (Page$1) route.value = /* @__PURE__ */ h(Page$1, null);
 		};
 		if (isClient()) useEvent(scope, window, "popstate", () => navigator.dispatchEvent(new NavigateEvent()));
-		if (event) inputs.value = event.context.inputs;
 		await fetch$1().then(() => useEvent(scope, navigator, "navigate", fetch$1));
 		scope.setContext(ROUTER_CONTEXT, {
 			options,
 			navigator,
 			url,
 			radix,
-			route,
-			inputs
+			route
 		});
 		return useRouter(scope);
 	};
@@ -766,7 +765,7 @@ const createRouter = (options) => {
 	};
 };
 const useRouter = (scope, context) => {
-	const { url, route, inputs, navigator } = scope.getContext(context ?? ROUTER_CONTEXT);
+	const { url, route, navigator } = scope.getContext(context ?? ROUTER_CONTEXT);
 	const navigate = (path) => {
 		if (isClient()) {
 			if (window.location.pathname != path) window.history.pushState(window.history.state, "", path);
@@ -780,7 +779,6 @@ const useRouter = (scope, context) => {
 	return {
 		url,
 		route,
-		inputs,
 		navigator,
 		navigate,
 		anchorNavigate
@@ -801,10 +799,11 @@ const createLocale = (options) => {
 	const locale = createState(options.defaultLocale);
 	const messages = createState();
 	const registerLocaleContext = async (scope) => {
-		const { inputs, navigator } = useRouter(scope);
+		const { inputs } = useRuntime(scope);
+		const { navigator } = useRouter(scope);
 		const fetch$1 = async () => {
 			if (options.input) {
-				const input = inputs.value?.[options.input];
+				const input = inputs[options.input];
 				if (input && input in options.locales) locale.value = input;
 			}
 			if (locale.value) {
@@ -935,4 +934,4 @@ const markdownToSlot = (input, options) => {
 };
 
 //#endregion
-export { $fetch, CLIENT, Compute, HOST_CONTEXT, Handler, LOCALE_CONTEXT, MountedEvent, NavigateEvent, Page, ROUTER_CONTEXT, RUNTIME_CONTEXT, Radix, SERVER, Scope, StopEvent, activeCompute, components, createApp, createCompute, createElement, createEvent, createLocale, createMemo, createRouter, createRuntime, createState, defineComponent, defineContext, defineRoute, fileName, fromValue, getCookies, getCustomElement, getMimeType, getRequestUrl, getSetCookies, getVariables, hydrate, isClient, isServer, isTemplate, markdownToSlot, preventDefault, registerComponent, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, stopImmediatePropagation, stopPropagation, targets, toArray, toCustomElement, toFragment, toPath, toRange, toString, useEvent, useHost, useLocale, useRouter, useRuntime };
+export { $fetch, CLIENT, Compute, Event$1 as Event, HOST_CONTEXT, Handler, LOCALE_CONTEXT, MountedEvent, NavigateEvent, Page, ROUTER_CONTEXT, RUNTIME_CONTEXT, Radix, SERVER, Scope, StopEvent, VARIABLE_CONTEXT, activeCompute, components, createApp, createCompute, createElement, createLocale, createMemo, createRouter, createRuntime, createState, defineComponent, defineContext, defineRoute, fileName, fromValue, getCookies, getCustomElement, getMimeType, getRequestUrl, getSetCookies, hydrate, isClient, isServer, isTemplate, markdownToSlot, preventDefault, registerComponent, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, stopImmediatePropagation, stopPropagation, targets, toArray, toCustomElement, toFragment, toPath, toRange, toString, useEvent, useHost, useLocale, useRouter, useRuntime, useVariables };

package/dist/presets/bun.js

@@ -1,12 +1,16 @@
+import { Event, VARIABLE_CONTEXT } from "./runtime-7PuIOxLz.js";
 import { runtime } from "#virtual/runtime";
 import { serve } from "bun";
 
 //#region src/presets/bun.ts
 serve({ fetch: (request) => {
-	return runtime.fetch(request, {
-		inputs: {},
-		variables: process.env
-	});
+	const event = new Event(request);
+	event.setContext(VARIABLE_CONTEXT, process.env);
+	try {
+		return runtime.fetch(event);
+	} finally {
+		event.stop();
+	}
 } });
 
 //#endregion

package/dist/presets/cloudflare.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    fetch: <T>(request: Request, env: T) => Promise<Response>;
+    fetch: (request: Request, variables: Record<string, unknown>) => Promise<Response>;
 };
 export default _default;

package/dist/presets/cloudflare.js

@@ -1,11 +1,15 @@
+import { Event, VARIABLE_CONTEXT } from "./runtime-7PuIOxLz.js";
 import { runtime } from "#virtual/runtime";
 
 //#region src/presets/cloudflare.ts
-var cloudflare_default = { fetch: (request, env) => {
-	return runtime.fetch(request, {
-		inputs: {},
-		variables: env
-	});
+var cloudflare_default = { fetch: (request, variables) => {
+	const event = new Event(request);
+	event.setContext(VARIABLE_CONTEXT, variables);
+	try {
+		return runtime.fetch(event);
+	} finally {
+		event.stop();
+	}
 } };
 
 //#endregion

package/dist/presets/runtime-7PuIOxLz.js

@@ -0,0 +1,61 @@
+//#region src/signals/index.ts
+var StopEvent = class extends Event {
+	constructor() {
+		super("stop");
+	}
+};
+var Scope = class extends EventTarget {
+	parentScope;
+	context;
+	constructor(scope) {
+		super();
+		this.parentScope = scope;
+		this.context = new Map();
+	}
+	getContext(input) {
+		let scope = this;
+		const seen = new Set();
+		while (scope && !seen.has(scope)) {
+			seen.add(scope);
+			if (scope.context.has(input)) return scope.context.get(input);
+			scope = scope.parentScope;
+		}
+		return {};
+	}
+	setContext(input, value) {
+		this.context.set(input, value);
+	}
+	onStop(input) {
+		this.addEventListener("stop", input, { once: true });
+	}
+	stop() {
+		return this.dispatchEvent(new StopEvent());
+	}
+};
+function defineContext(key) {
+	return key;
+}
+
+//#endregion
+//#region src/http/index.ts
+var Event$1 = class extends Scope {
+	request;
+	response;
+	constructor(request) {
+		super();
+		this.request = request;
+		this.response = { headers: new Headers() };
+	}
+};
+
+//#endregion
+//#region src/html/index.ts
+const HOST_CONTEXT = defineContext("HOST_CONTEXT");
+
+//#endregion
+//#region src/runtime/index.ts
+const RUNTIME_CONTEXT = defineContext("RUNTIME_CONTEXT");
+const VARIABLE_CONTEXT = defineContext("VARIABLE_CONTEXT");
+
+//#endregion
+export { Event$1 as Event, VARIABLE_CONTEXT };

package/dist/router/index.d.ts

@@ -11,7 +11,6 @@ export type RouterContext<T extends RouterOptions = RouterOptions> = {
     url: State<URL | undefined>;
     radix: Radix<() => Promise<ComponentConstructor<Events, Attributes>>>;
     route: State<Slot | undefined>;
-    inputs: State<Record<string, string> | undefined>;
 };
 export declare class NavigateEvent extends Event {
     constructor();
@@ -22,7 +21,6 @@ export declare const createRouter: <T extends RouterOptions>(options: T) => {
     registerRouterContext: (scope: Scope) => Promise<{
         url: State<URL | undefined>;
         route: State<unknown>;
-        inputs: State<Record<string, string> | undefined>;
         navigator: EventTarget;
         navigate: (path: string) => void;
         anchorNavigate: (event: Event) => void;
@@ -31,7 +29,6 @@ export declare const createRouter: <T extends RouterOptions>(options: T) => {
 export declare const useRouter: <T extends RouterContext>(scope: Scope, context?: Descriptor<T>) => {
     url: State<URL | undefined>;
     route: State<unknown>;
-    inputs: State<Record<string, string> | undefined>;
     navigator: EventTarget;
     navigate: (path: string) => void;
     anchorNavigate: (event: Event) => void;

package/dist/runtime/index.d.ts

@@ -1,22 +1,24 @@
-import { type Context, type Event, type Handle, type Middleware } from "../http";
+import { Event, type Handle, type Middleware } from "../http";
 import { Radix } from "../radix";
-import { type Descriptor, Scope } from "../signals";
-export type Route<T> = {
-    fetch: Handle<T>;
+import { Scope } from "../signals";
+export type Route = {
+    fetch: Handle;
 };
-export type Runtime<T> = {
-    radix: Radix<Route<T>>;
-    middlewares: Array<Middleware<T>>;
-    fetch: (request: Request, context: Context<T>) => Promise<Response>;
+export type Runtime = {
+    radix: Radix<Route>;
+    middlewares: Array<Middleware>;
+    fetch: (event: Event) => Promise<Response>;
 };
-export type RuntimeContext<T = Record<string, unknown>> = {
-    event?: Event<T>;
+export type RuntimeContext = {
+    event?: Event;
+    inputs: Record<string, string>;
 };
-export declare const useRuntime: <T extends RuntimeContext>(scope: Scope, context?: Descriptor<T>) => RuntimeContext<Record<string, unknown>>;
-export declare const defineRoute: <T>(route: Route<T>) => Route<T>;
+export declare const useRuntime: (scope: Scope) => RuntimeContext;
+export declare const useVariables: <T>(scope: Scope) => T;
+export declare const defineRoute: (route: Route) => Route;
 export declare const fileName: (path: string) => string | undefined;
 export declare const toPath: (value: string) => (string | undefined)[];
-export declare const $fetch: <T>(scope: Scope, input: string | URL, init?: RequestInit) => Promise<T>;
-export declare const getVariables: <T>(event?: Event<T>) => T;
-export declare const createRuntime: <T>() => Promise<Runtime<T>>;
-export declare const RUNTIME_CONTEXT: Descriptor<RuntimeContext<Record<string, unknown>>>;
+export declare const $fetch: <T>(scope: Scope, input: string | URL, options?: RequestInit) => Promise<T>;
+export declare const createRuntime: () => Promise<Runtime>;
+export declare const RUNTIME_CONTEXT: import("..").Descriptor<RuntimeContext>;
+export declare const VARIABLE_CONTEXT: import("..").Descriptor<Record<string, unknown>>;

package/package.json

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

package/src/types/index.d.ts

@@ -13,11 +13,11 @@ declare module "#virtual/client" {
 }
 
 declare module "#virtual/routes" {
-    export const routes: Record<string, () => Promise<Route<T> | ComponentConstructor<Events, Attributes>>>;
+    export const routes: Record<string, () => Promise<Route | ComponentConstructor<Events, Attributes>>>;
 }
 
 declare module "#virtual/runtime" {
     import type { Runtime } from "revojs";
 
-    export const runtime: Runtime<T>;
+    export const runtime: Runtime;
 }