revojs 0.1.22 → 0.1.23

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

@@ -109,10 +109,7 @@ 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) {
@@ -230,6 +227,7 @@ async function createServer() {
 				return await invoke(scope, middlewares);
 			} catch (value) {
 				if (value instanceof Response) return value;
+				throw value;
 			}
 		}
 	};
@@ -289,13 +287,9 @@ const isClient = import.meta.client ?? globalThis?.import?.meta?.client;
 
 //#endregion
 //#region src/shared/index.ts
-var Scope = class {
-	parentScope;
-	context;
+var Hookable = class {
 	hooks;
-	constructor(parentScope) {
-		this.parentScope = parentScope;
-		this.context = {};
+	constructor() {
 		this.hooks = {};
 	}
 	registerHook(name, invoke$1) {
@@ -313,6 +307,15 @@ var Scope = class {
 		for (const invoke$1 of this.hooks[name] ?? []) results.push(await invoke$1(...inputs));
 		return results;
 	}
+};
+var Scope = class extends Hookable {
+	parentScope;
+	context;
+	constructor(parentScope) {
+		super();
+		this.parentScope = parentScope;
+		this.context = {};
+	}
 	getContext(input) {
 		let scope = this;
 		while (scope) {
@@ -336,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) {
@@ -355,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, WILDCARD, createApp, 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 };
+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-CUwjaRno.d.ts → index-DSP2l2h5.d.ts}

@@ -26,13 +26,16 @@ interface Schema<T = unknown, TOutput = T> {
     };
   };
 }
-declare class Scope {
-  parentScope?: Scope;
-  readonly context: Context;
-  readonly hooks: Record<string, Array<Invoke>>;
-  constructor(parentScope?: Scope);
+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 Hookable {
+  private parentScope?;
+  private readonly context;
+  constructor(parentScope?: Scope);
   getContext<T>(input: Descriptor<T>): T;
   setContext<T>(input: Descriptor<T>, value: T): void;
 }
@@ -158,6 +161,8 @@ interface DevelopmentConfig {
 }
 interface BuildConfig {
   externals: Array<string>;
+  virtuals: Record<string, Virtual>;
+  alias: Record<string, string>;
 }
 interface Config {
   modules: Array<Module>;
@@ -176,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, 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, createApp, 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 };
+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, 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, createApp, 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-CUwjaRno.js";
-export { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, 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, createApp, 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 };
+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,4 +1,4 @@
-import { CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, createApp, 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-CZxSS8Ok.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) {
@@ -25,4 +25,4 @@ async function $fetch(scope, input, options) {
 }
 
 //#endregion
-export { $fetch, CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, WILDCARD, createApp, 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 };
+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-CUwjaRno.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-CUwjaRno.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-CZxSS8Ok.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.22";
+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
 							},
@@ -420,7 +420,7 @@ function revojs(config) {
 				};
 			}
 		},
-		virtuals(app.virtuals),
+		virtuals(app.config.build.virtuals),
 		client(),
 		entry(),
 		css()

package/package.json

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