revojs 0.1.19 → 0.1.21

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

@@ -45,12 +45,12 @@ var Radix = class {
 	}
 };
 var Router = class extends Radix {
-	fetch(scope, next) {
+	fetch(scope) {
 		const { request } = useServer(scope);
 		const { pathname } = useUrl(scope);
 		const context = {
 			route: this.rootNode,
-			segments: (request.method.toUpperCase() + pathname).split("/"),
+			segments: (request.method.toLowerCase() + pathname).split("/"),
 			parameters: {}
 		};
 		const invoke$1 = (node, index) => {
@@ -71,7 +71,7 @@ var Router = class extends Radix {
 			if (node.children[WILDCARD]) {
 				const wildcardNode = node.children[WILDCARD];
 				context.parameters[wildcardNode.parameter] = segment;
-				return wildcardNode.value ?? invoke$1(wildcardNode, segment.length);
+				return wildcardNode.value ?? invoke$1(wildcardNode, context.segments.length);
 			}
 		};
 		const route = invoke$1(this.rootNode, 0);
@@ -79,7 +79,7 @@ var Router = class extends Radix {
 			scope.setContext(ROUTER_CONTEXT, context);
 			return route.fetch(scope);
 		}
-		return next?.();
+		throw sendText(scope, "NOT_FOUND", { status: 404 });
 	}
 };
 function defineRoute(route) {
@@ -88,9 +88,6 @@ function defineRoute(route) {
 function defineMiddleware(middleware) {
 	return middleware;
 }
-function defineException(exception) {
-	return exception;
-}
 function useRouter(scope) {
 	return scope.getContext(ROUTER_CONTEXT);
 }
@@ -210,9 +207,8 @@ function mimeType(file) {
 	return mimeTypes[extension ?? ""] ?? "text/plain";
 }
 function toRoutePath(path) {
-	const result = ("/" + path).replaceAll(/\[\.\.\.(.*?)\]/g, (_, value) => WILDCARD + value).replaceAll(/\[(.*?)\]/g, (_, value) => PARAMETER + value).split("/");
-	const properties = result.pop()?.toUpperCase().split(".") ?? [];
-	return [result.join("/"), ...properties];
+	const segments = path.toLowerCase().replaceAll(/\[\.\.\.(.*?)\]/g, (_, value) => WILDCARD + value).replaceAll(/\[(.*?)\]/g, (_, value) => PARAMETER + value).split(".");
+	return [(segments.shift() ?? "").split("/").filter((value) => value !== "index").join("/"), ...segments];
 }
 async function invoke(scope, pipeline, index = 0) {
 	return await pipeline.at(index)?.fetch(scope, async () => await invoke(scope, pipeline, index + 1));
@@ -220,35 +216,21 @@ async function invoke(scope, pipeline, index = 0) {
 async function createServer() {
 	const router = new Router();
 	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);
-		response.headers.set("Content-Type", mimeType(path));
-		return new Response(asset, response);
-	} }));
 	const routes = await import("#virtual/routes").then((module) => Object.entries(module.default));
 	for (const [path, route] of routes) {
-		const [name, method] = toRoutePath(path);
-		router.use(method?.toUpperCase() + name, route);
+		const [result, method] = toRoutePath(path);
+		router.use(method + "/" + result, route);
 	}
-	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,
 		middlewares,
 		async fetch(scope) {
-			return await invoke(scope, middlewares) ?? sendText(scope, "NOT_FOUND", { status: 404 });
+			try {
+				return await invoke(scope, middlewares);
+			} catch (value) {
+				if (value instanceof Response) return value;
+			}
 		}
 	};
 }
@@ -367,21 +349,10 @@ function mergeObjects(base, input) {
 function createApp(inputConfig) {
 	let config = mergeObjects(inputConfig, {
 		modules: [],
-		sources: {
-			assets: {
-				match: "**/*",
-				entries: ["./public"],
-				resolve: (path) => path + "?raw"
-			},
-			routes: {
-				match: "**/{get,head,post,put,delete,connect,options,trace,patch}.{js,ts}",
-				entries: ["./routes"]
-			},
-			exceptions: {
-				match: "**/*.{js,ts}",
-				entries: ["./exceptions"]
-			}
-		},
+		sources: { routes: {
+			match: "**/*.{get,head,post,put,delete,connect,options,trace,patch}.{js,ts}",
+			entries: ["./routes"]
+		} },
 		development: { middlewares: [] },
 		build: { externals: [] }
 	});
@@ -396,4 +367,4 @@ const SERVER = "ssr";
 const CLIENT = "client";
 
 //#endregion
-export { 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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+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 };

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

@@ -90,13 +90,10 @@ interface Route {
 interface Middleware {
   fetch: (scope: Scope, next?: () => Result) => Result;
 }
-interface Exception {
-  fetch: (scope: Scope, exception: unknown) => Result;
-}
 interface Server {
   router: Router;
   middlewares: Array<Middleware>;
-  fetch: (scope: Scope) => Promise<Response>;
+  fetch: (scope: Scope) => Result;
 }
 interface WildcardNode<T> {
   type: "WILDCARD";
@@ -121,11 +118,10 @@ declare class Radix<T> {
   use(path: string, value: T): Node<T>;
 }
 declare class Router extends Radix<Route> implements Middleware {
-  fetch(scope: Scope, next?: () => Result): Result;
+  fetch(scope: Scope): Result;
 }
 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;
@@ -179,7 +175,7 @@ interface Module {
   setup?: (app: App) => void | Promise<void>;
 }
 interface Source {
-  match: string;
+  match: string | Array<string>;
   entries: Array<string>;
   resolve?: (path: string) => string;
 }
@@ -195,4 +191,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, 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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+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 };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { $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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./index-nAhU8KOA.js";
-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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+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 };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { 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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./app-D1k2p6G_.js";
+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";
 
 //#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, 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, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };
+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 };

package/dist/kit/index.d.ts

@@ -0,0 +1,12 @@
+import { App, Virtual } from "../index-D6BvOWjN.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 addRoutes(app: App, path: string): void;
+//#endregion
+export { addRoutes, useKit };

package/dist/kit/index.js

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

package/dist/kit-Bzr1NqHb.js

@@ -0,0 +1,26 @@
+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 };

package/dist/vite/index.d.ts

@@ -1,15 +1,7 @@
-import { App, Config, Mergeable, Virtual } from "../index-nAhU8KOA.js";
+import { Config, Mergeable } from "../index-D6BvOWjN.js";
 import { Plugin } from "vite";
 
 //#region src/vite/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 addRoutes(app: App, path: string): void;
-declare function addAssets(app: App, path: string): void;
 declare function revojs(config?: Mergeable<Config>): Array<Plugin>;
 //#endregion
-export { addAssets, addRoutes, revojs, useKit };
+export { revojs };

package/dist/vite/index.js

@@ -1,11 +1,12 @@
-import { CLIENT, SERVER, SERVER_CONTEXT, Scope, createApp, invoke } from "../app-D1k2p6G_.js";
+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 { isRunnableDevEnvironment } from "vite";
 import { once } from "events";
 import { Readable, Stream } from "stream";
 import { existsSync, readFileSync } from "fs";
-import { basename, dirname, isAbsolute, join, posix, relative, win32 } from "path";
-import { fileURLToPath } from "url";
 import { globSync } from "tinyglobby";
+import { rm } from "fs/promises";
 
 //#region src/vite/node/index.ts
 function splitSetCookieString(cookiesString) {
@@ -306,32 +307,10 @@ function virtuals(virtuals$1) {
 //#endregion
 //#region package.json
 var name = "revojs";
-var version = "0.1.19";
+var version = "0.1.21";
 
 //#endregion
 //#region src/vite/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$1, virtual) => {
-			app.virtuals["#virtual/" + name$1] = virtual;
-		},
-		addAlias: (name$1, path) => {
-			app.alias["#alias/" + name$1] = join(source, path).split(win32.sep).join(posix.sep);
-		}
-	};
-}
-function addRoutes(app, path) {
-	app.config.sources.routes?.entries.push(path);
-}
-function addAssets(app, path) {
-	app.config.sources.assets?.entries.push(path);
-}
 function revojs(config) {
 	const app = createApp(config);
 	return [
@@ -363,22 +342,32 @@ function revojs(config) {
 					appType: "custom",
 					optimizeDeps: { exclude: ["revojs"] },
 					resolve: { alias: app.alias },
-					build: { rollupOptions: { external: app.config.build.externals } },
-					builder: { async buildApp(builder) {
-						for (const key in builder.environments) {
-							const environment = builder.environments[key];
-							if (environment) await builder.build(environment);
+					build: {
+						emptyOutDir: false,
+						assetsInlineLimit: 4096 * 4,
+						rollupOptions: { external: app.config.build.externals }
+					},
+					builder: {
+						sharedConfigBuild: true,
+						async buildApp(builder) {
+							await rm("./dist", {
+								recursive: true,
+								force: true
+							});
+							for (const key in builder.environments) {
+								const environment = builder.environments[key];
+								if (environment) await builder.build(environment);
+							}
 						}
-					} },
+					},
 					environments: {
 						...app.config.client && { [CLIENT]: {
 							consumer: "client",
 							resolve: { noExternal: true },
 							build: {
 								rollupOptions: { input: { index: app.config.client } },
-								outDir: "./dist/client",
-								copyPublicDir: true,
-								emptyOutDir: true
+								outDir: "./dist/public",
+								copyPublicDir: true
 							},
 							define: {
 								"import.meta.server": false,
@@ -394,9 +383,8 @@ function revojs(config) {
 							},
 							build: {
 								rollupOptions: { input: { index: app.config.server } },
-								outDir: "./dist/server",
-								copyPublicDir: false,
-								emptyOutDir: true
+								outDir: "./dist",
+								copyPublicDir: false
 							},
 							define: {
 								"import.meta.server": true,
@@ -444,4 +432,4 @@ function revojs(config) {
 }
 
 //#endregion
-export { addAssets, addRoutes, revojs, useKit };
+export { revojs };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.1.19",
+    "version": "0.1.21",
     "type": "module",
     "repository": "coverbase/revojs",
     "license": "MIT",
@@ -9,6 +9,10 @@
             "types": "./dist/index.d.ts",
             "import": "./dist/index.js"
         },
+        "./kit": {
+            "types": "./dist/kit/index.d.ts",
+            "import": "./dist/kit/index.js"
+        },
         "./vite": {
             "types": "./dist/vite/index.d.ts",
             "import": "./dist/vite/index.js"

package/src/types/index.d.ts

@@ -12,12 +12,6 @@ declare module "#virtual/server" {
     export default server;
 }
 
-declare module "#virtual/assets" {
-    const assets: Record<string, string>;
-
-    export default assets;
-}
-
 declare module "#virtual/routes" {
     import type { Route } from "revojs";
 
@@ -26,14 +20,6 @@ declare module "#virtual/routes" {
     export default routes;
 }
 
-declare module "#virtual/exceptions" {
-    import type { Exception } from "revojs";
-
-    const exceptions: Record<string, Exception>;
-
-    export default exceptions;
-}
-
 interface ImportMeta {
     readonly server: boolean;
     readonly client: boolean;