revojs 0.1.21 → 0.1.23

package/dist/{app-gPmc1xyv.js → app-COQSSDHs.js}

@@ -109,15 +109,12 @@ function useQuery(scope, schema) {
 }
 function withQuery(input, query) {
 	const url = new URL(input);
-	for (const name in query) {
-		const value = query[name];
-		if (value) url.searchParams.set(name, value);
-	}
+	for (const name in query) url.searchParams.set(name, query[name]);
 	return url.href;
 }
 function useCookies(scope, schema) {
 	const { request } = useServer(scope);
-	const entries = (import.meta.client ? document.cookie : request.headers.get("Cookie") ?? "").split("; ").reduce((result, cookie) => {
+	const entries = (isClient ? document.cookie : request.headers.get("Cookie") ?? "").split("; ").reduce((result, cookie) => {
 		const [name, value] = cookie.split("=");
 		if (name && value) result[name] = decodeURIComponent(value);
 		return result;
@@ -144,11 +141,11 @@ 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.server) response.headers.append("Set-Cookie", cookie);
+	if (isServer) response.headers.append("Set-Cookie", cookie);
 	else document.cookie = cookie;
 }
 function getState(scope, name) {
-	if (import.meta.server) {
+	if (isServer) {
 		const { states } = useServer(scope);
 		return states[name];
 	} else {
@@ -160,7 +157,7 @@ function getState(scope, name) {
 	}
 }
 function setState(scope, name, value) {
-	if (import.meta.server) {
+	if (isServer) {
 		const { states } = useServer(scope);
 		states[name] = value;
 	} else {
@@ -230,6 +227,7 @@ async function createServer() {
 				return await invoke(scope, middlewares);
 			} catch (value) {
 				if (value instanceof Response) return value;
+				throw value;
 			}
 		}
 	};
@@ -284,21 +282,38 @@ const mimeTypes = {
 	exe: "application/vnd.microsoft.portable-executable",
 	apk: "application/vnd.android.package-archive"
 };
+const isServer = import.meta.server ?? globalThis?.import?.meta?.server;
+const isClient = import.meta.client ?? globalThis?.import?.meta?.client;
 
 //#endregion
 //#region src/shared/index.ts
-var StopEvent = class extends Event {
+var Hookable = class {
+	hooks;
 	constructor() {
-		super("stop");
+		this.hooks = {};
+	}
+	registerHook(name, invoke$1) {
+		const targets = this.hooks[name] ?? [];
+		targets.push(invoke$1);
+		this.hooks[name] = targets;
+		return () => {
+			const index = this.hooks[name]?.indexOf(invoke$1);
+			if (index && index >= 0) this.hooks[name]?.splice(index, 1);
+			if (this.hooks[name]?.length === 0) delete this.hooks[name];
+		};
+	}
+	async dispatchHook(name, ...inputs) {
+		const results = new Array();
+		for (const invoke$1 of this.hooks[name] ?? []) results.push(await invoke$1(...inputs));
+		return results;
 	}
 };
-var Scope = class extends EventTarget {
+var Scope = class extends Hookable {
 	parentScope;
 	context;
 	constructor(parentScope) {
 		super();
 		this.parentScope = parentScope;
-		this.parentScope?.onStop(() => this.stop());
 		this.context = {};
 	}
 	getContext(input) {
@@ -312,13 +327,10 @@ var Scope = class extends EventTarget {
 	setContext(input, value) {
 		this.context[input] = value;
 	}
-	onStop(input) {
-		this.addEventListener("stop", input, { once: true });
-	}
-	stop() {
-		return this.dispatchEvent(new StopEvent());
-	}
 };
+function defineHook(name) {
+	return name;
+}
 function defineContext(name) {
 	return name;
 }
@@ -327,7 +339,7 @@ function isFailure(result) {
 }
 function parseSchema(scope, schema, value) {
 	const result = schema["~standard"].validate(value);
-	if (isFailure(result)) throw sendBadRequest(scope, result.issues.map((issue) => issue.message).join(", "));
+	if (isFailure(result)) throw sendJson(scope, result, { status: 400 });
 	return result.value;
 }
 function mergeObjects(base, input) {
@@ -346,25 +358,28 @@ function mergeObjects(base, input) {
 
 //#endregion
 //#region src/app/index.ts
-function createApp(inputConfig) {
-	let config = mergeObjects(inputConfig, {
-		modules: [],
-		sources: { routes: {
-			match: "**/*.{get,head,post,put,delete,connect,options,trace,patch}.{js,ts}",
-			entries: ["./routes"]
-		} },
-		development: { middlewares: [] },
-		build: { externals: [] }
-	});
-	for (const module of config.modules) config = mergeObjects(config, module.config);
-	return {
-		config,
-		virtuals: {},
-		alias: {}
-	};
-}
+var App = class extends Hookable {
+	config;
+	constructor(inputConfig) {
+		super();
+		this.config = mergeObjects(inputConfig, {
+			modules: [],
+			sources: { routes: {
+				match: "**/*.{get,head,post,put,delete,connect,options,trace,patch}.{js,ts}",
+				entries: ["./routes"]
+			} },
+			development: { middlewares: [] },
+			build: {
+				externals: [],
+				virtuals: {},
+				alias: {}
+			}
+		});
+		for (const module of this.config.modules) this.config = mergeObjects(this.config, module.config);
+	}
+};
 const SERVER = "ssr";
 const CLIENT = "client";
 
 //#endregion
-export { 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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+export { App, CLIENT, Hookable, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/{index-D6BvOWjN.d.ts → index-DSP2l2h5.d.ts}

@@ -2,7 +2,8 @@
 type Descriptor<T> = string & {
   [descriptor]: T;
 };
-type Context = Record<string, unknown>;
+type Invoke = (...inputs: Array<any>) => any;
+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"];
@@ -25,28 +26,25 @@ interface Schema<T = unknown, TOutput = T> {
     };
   };
 }
-declare class StopEvent extends Event {
+declare class Hookable {
+  private readonly hooks;
   constructor();
+  registerHook<T extends Invoke>(name: Descriptor<T>, invoke: T): () => void;
+  dispatchHook<T extends Invoke>(name: Descriptor<T>, ...inputs: Parameters<T>): Promise<Awaited<ReturnType<T>>[]>;
 }
-declare class Scope extends EventTarget {
-  parentScope?: Scope;
-  readonly context: Context;
+declare class Scope extends Hookable {
+  private parentScope?;
+  private readonly context;
   constructor(parentScope?: Scope);
   getContext<T>(input: Descriptor<T>): T;
   setContext<T>(input: Descriptor<T>, value: T): void;
-  onStop(input: (event: StopEvent) => void): void;
-  stop(): boolean;
 }
+declare function defineHook<T extends Invoke>(name: string): Descriptor<T>;
 declare function defineContext<T>(name: string): Descriptor<T>;
 declare function isFailure<T>(result: Output<T>): result is Failure;
 declare function parseSchema<T extends Schema>(scope: Scope, schema: T, value: unknown): InferOutput<T>;
 declare function mergeObjects<TBase, TInput>(base: TBase, input: TInput): TBase & TInput;
 declare const descriptor: unique symbol;
-declare global {
-  interface ElementEventMap {
-    stop: StopEvent;
-  }
-}
 //#endregion
 //#region src/server/index.d.ts
 type CookiePriority = "Low" | "Medium" | "High";
@@ -152,6 +150,8 @@ declare const WILDCARD = "$";
 declare const PARAMETER = ":";
 declare let STATES: States;
 declare const mimeTypes: Record<string, MimeType>;
+declare const isServer: boolean;
+declare const isClient: boolean;
 //#endregion
 //#region src/app/index.d.ts
 type Environment = typeof CLIENT | typeof SERVER;
@@ -161,6 +161,8 @@ interface DevelopmentConfig {
 }
 interface BuildConfig {
   externals: Array<string>;
+  virtuals: Record<string, Virtual>;
+  alias: Record<string, string>;
 }
 interface Config {
   modules: Array<Module>;
@@ -179,16 +181,14 @@ interface Source {
   entries: Array<string>;
   resolve?: (path: string) => string;
 }
-interface App {
+declare class App extends Hookable {
   config: Config;
-  virtuals: Record<string, Virtual>;
-  alias: Record<string, string>;
+  constructor(inputConfig?: Mergeable<Config>);
 }
-declare function createApp(inputConfig?: Mergeable<Config>): App;
 declare const SERVER = "ssr";
 declare const CLIENT = "client";
 //#endregion
 //#region src/client/index.d.ts
 declare function $fetch<T>(scope: Scope, input: string | URL, options?: RequestInit): Promise<T>;
 //#endregion
-export { $fetch, App, BuildConfig, 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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+export { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, Hookable, HttpMethod, InferInput, InferOutput, Invoke, 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, Success, Virtual, WILDCARD, WildcardNode, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { $fetch, App, BuildConfig, 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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./index-D6BvOWjN.js";
-export { $fetch, App, BuildConfig, 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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+import { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, Hookable, HttpMethod, InferInput, InferOutput, Invoke, 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, Success, Virtual, WILDCARD, WildcardNode, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./index-DSP2l2h5.js";
+export { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, Hookable, HttpMethod, InferInput, InferOutput, Invoke, 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, Success, Virtual, WILDCARD, WildcardNode, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/index.js

@@ -1,9 +1,9 @@
-import { 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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./app-gPmc1xyv.js";
+import { App, CLIENT, Hookable, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./app-COQSSDHs.js";
 
 //#region src/client/index.ts
 async function $fetch(scope, input, options) {
 	let response;
-	if (import.meta.server) {
+	if (isServer) {
 		const { states, request, variables } = useServer(scope);
 		const next = new Scope();
 		const url = new URL(input.toString(), request.url);
@@ -25,4 +25,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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+export { $fetch, App, CLIENT, Hookable, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, createServer, defineContext, defineHook, defineMiddleware, defineRoute, getState, invoke, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/kit/index.d.ts

@@ -1,12 +1,11 @@
-import { App, Virtual } from "../index-D6BvOWjN.js";
+import { App, Virtual } from "../index-DSP2l2h5.js";
 
 //#region src/kit/index.d.ts
-declare function useKit(app: App, source: string | URL): {
-  source: string;
-  toPath: (...paths: Array<string>) => string;
-  addVirtual: (name: string, virtual: Virtual) => void;
-  addAlias: (name: string, path: string) => void;
+declare function useKit(source: string | URL): {
+  fromModule(...paths: Array<string>): string;
 };
+declare function addAlias(app: App, name: string, path: string): void;
+declare function addVirtual(app: App, name: string, virtual: Virtual): void;
 declare function addRoutes(app: App, path: string): void;
 //#endregion
-export { addRoutes, useKit };
+export { addAlias, addRoutes, addVirtual, useKit };

package/dist/kit/index.js

@@ -1,3 +1,3 @@
-import { addRoutes, useKit } from "../kit-Bzr1NqHb.js";
+import { addAlias, addRoutes, addVirtual, useKit } from "../kit-CUuTaZz2.js";
 
-export { addRoutes, useKit };
+export { addAlias, addRoutes, addVirtual, useKit };

package/dist/kit-CUuTaZz2.js

@@ -0,0 +1,23 @@
+import { dirname, join, posix, win32 } from "path";
+import { fileURLToPath } from "url";
+
+//#region src/kit/index.ts
+function useKit(source) {
+	source = source.toString();
+	if (source.startsWith("file://")) source = dirname(fileURLToPath(source));
+	return { fromModule(...paths) {
+		return join(source, ...paths).split(win32.sep).join(posix.sep);
+	} };
+}
+function addAlias(app, name, path) {
+	app.config.build.alias["#alias/" + name] = path;
+}
+function addVirtual(app, name, virtual) {
+	app.config.build.virtuals["#virtual/" + name] = virtual;
+}
+function addRoutes(app, path) {
+	app.config.sources.routes?.entries.push(path);
+}
+
+//#endregion
+export { addAlias, addRoutes, addVirtual, useKit };

package/dist/vite/index.d.ts

@@ -1,4 +1,4 @@
-import { Config, Mergeable } from "../index-D6BvOWjN.js";
+import { Config, Mergeable } from "../index-DSP2l2h5.js";
 import { Plugin } from "vite";
 
 //#region src/vite/index.d.ts

package/dist/vite/index.js

@@ -1,6 +1,6 @@
-import { CLIENT, SERVER, SERVER_CONTEXT, Scope, createApp, invoke } from "../app-gPmc1xyv.js";
-import { useKit } from "../kit-Bzr1NqHb.js";
-import { basename, dirname, isAbsolute, join, posix, relative, win32 } from "path";
+import { App, CLIENT, SERVER, SERVER_CONTEXT, Scope, invoke } from "../app-COQSSDHs.js";
+import { addVirtual } from "../kit-CUuTaZz2.js";
+import { basename, dirname, isAbsolute, join, posix, relative, resolve, win32 } from "path";
 import { isRunnableDevEnvironment } from "vite";
 import { once } from "events";
 import { Readable, Stream } from "stream";
@@ -175,7 +175,7 @@ function client() {
 				const path = key.substring(0, key.length - 7);
 				if (bundle) for (const name$1 in bundle) {
 					const file = bundle[name$1];
-					if (file && file.type === "asset" && file.fileName === basename(path)) return file.source.toString();
+					if (file.type === "asset" && file.fileName === basename(path)) return file.source.toString();
 				}
 				return readFileSync(path, "utf-8");
 			}
@@ -307,28 +307,27 @@ function virtuals(virtuals$1) {
 //#endregion
 //#region package.json
 var name = "revojs";
-var version = "0.1.21";
+var version = "0.1.23";
 
 //#endregion
 //#region src/vite/index.ts
 function revojs(config) {
-	const app = createApp(config);
+	const app = new App(config);
 	return [
 		{
 			name,
 			version,
 			sharedDuringBuild: true,
 			async config() {
-				const { toPath, addVirtual } = useKit(app, process.cwd());
 				for (const module of app.config.modules) await module.setup?.(app);
-				if (app.config.client) addVirtual("client", () => `import client from "${app.config.client}?client"; export default client`);
-				if (app.config.server) addVirtual("server", () => `import { createServer } from "revojs"; export default await createServer()`);
+				if (app.config.client) addVirtual(app, "client", () => `import client from "${app.config.client}?client"; export default client`);
+				if (app.config.server) addVirtual(app, "server", () => `import { createServer } from "revojs"; export default await createServer()`);
 				for (const name$1 in app.config.sources) {
 					const source = app.config.sources[name$1];
-					if (source) addVirtual(name$1, () => {
+					addVirtual(app, name$1, () => {
 						const entries = {};
 						for (let path of source.entries) {
-							path = isAbsolute(path) ? path : toPath(path);
+							path = isAbsolute(path) ? path : resolve(path);
 							for (const asset of globSync(source.match, { cwd: path })) entries[asset] = join(path, asset).split(win32.sep).join(posix.sep);
 						}
 						const content = Object.values(entries).reduce((content$1, path, index) => content$1 + `import $${index} from "${source.resolve?.(path) ?? path}" \n`, "");
@@ -341,7 +340,7 @@ function revojs(config) {
 				return {
 					appType: "custom",
 					optimizeDeps: { exclude: ["revojs"] },
-					resolve: { alias: app.alias },
+					resolve: { alias: app.config.build.alias },
 					build: {
 						emptyOutDir: false,
 						assetsInlineLimit: 4096 * 4,
@@ -356,7 +355,8 @@ function revojs(config) {
 							});
 							for (const key in builder.environments) {
 								const environment = builder.environments[key];
-								if (environment) await builder.build(environment);
+								await builder.build(environment);
+								if (environment.name === CLIENT && typeof environment.config.build.rollupOptions.input === "string") await rm(resolve(environment.config.build.outDir, basename(environment.config.build.rollupOptions.input)));
 							}
 						}
 					},
@@ -365,7 +365,7 @@ function revojs(config) {
 							consumer: "client",
 							resolve: { noExternal: true },
 							build: {
-								rollupOptions: { input: { index: app.config.client } },
+								rollupOptions: { input: app.config.client },
 								outDir: "./dist/public",
 								copyPublicDir: true
 							},
@@ -382,7 +382,7 @@ function revojs(config) {
 								externalConditions: ["import"]
 							},
 							build: {
-								rollupOptions: { input: { index: app.config.server } },
+								rollupOptions: { input: app.config.server },
 								outDir: "./dist",
 								copyPublicDir: false
 							},
@@ -406,25 +406,21 @@ function revojs(config) {
 						if (server) {
 							request.url = request.originalUrl;
 							const scope = new Scope();
-							try {
-								scope.setContext(SERVER_CONTEXT, {
-									states: {},
-									request: fromNodeRequest(request, response),
-									response: { headers: new Headers() },
-									variables: process.env
-								});
-								var result = await invoke(scope, app.config.development.middlewares.concat({ fetch: server.fetch }));
-								if (result) await toNodeRequest(result, response);
-							} finally {
-								scope.stop();
-							}
+							scope.setContext(SERVER_CONTEXT, {
+								states: {},
+								request: fromNodeRequest(request, response),
+								response: { headers: new Headers() },
+								variables: process.env
+							});
+							var result = await invoke(scope, app.config.development.middlewares.concat({ fetch: server.fetch }));
+							if (result) await toNodeRequest(result, response);
 						}
 						next();
 					});
 				};
 			}
 		},
-		virtuals(app.virtuals),
+		virtuals(app.config.build.virtuals),
 		client(),
 		entry(),
 		css()

package/package.json

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

package/dist/kit-Bzr1NqHb.js

@@ -1,26 +0,0 @@
-import { dirname, join, posix, win32 } from "path";
-import { fileURLToPath } from "url";
-
-//#region src/kit/index.ts
-function useKit(app, source) {
-	source = source.toString();
-	if (source.startsWith("file://")) source = dirname(fileURLToPath(source));
-	return {
-		source,
-		toPath: (...paths) => {
-			return join(source, ...paths).split(win32.sep).join(posix.sep);
-		},
-		addVirtual: (name, virtual) => {
-			app.virtuals["#virtual/" + name] = virtual;
-		},
-		addAlias: (name, path) => {
-			app.alias["#alias/" + name] = join(source, path).split(win32.sep).join(posix.sep);
-		}
-	};
-}
-function addRoutes(app, path) {
-	app.config.sources.routes?.entries.push(path);
-}
-
-//#endregion
-export { addRoutes, useKit };