revojs 0.1.20 → 0.1.22

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

@@ -50,7 +50,7 @@ var Router = class extends Radix {
 		const { pathname } = useUrl(scope);
 		const context = {
 			route: this.rootNode,
-			segments: pathname.substring(1).split("/").concat(request.method.toLowerCase()),
+			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, index + 1);
+				return wildcardNode.value ?? invoke$1(wildcardNode, context.segments.length);
 			}
 		};
 		const route = invoke$1(this.rootNode, 0);
@@ -117,7 +117,7 @@ function withQuery(input, query) {
 }
 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 +144,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 +160,7 @@ function getState(scope, name) {
 	}
 }
 function setState(scope, name, value) {
-	if (import.meta.server) {
+	if (isServer) {
 		const { states } = useServer(scope);
 		states[name] = value;
 	} else {
@@ -207,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()?.toLocaleLowerCase().replaceAll("index", "").split(".").slice(0, -1).filter(Boolean) ?? [];
-	return result.concat(properties).join("/");
+	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));
@@ -218,7 +217,10 @@ async function createServer() {
 	const router = new Router();
 	const middlewares = new Array();
 	const routes = await import("#virtual/routes").then((module) => Object.entries(module.default));
-	for (const [path, route] of routes) router.use(toRoutePath(path), route);
+	for (const [path, route] of routes) {
+		const [result, method] = toRoutePath(path);
+		router.use(method + "/" + result, route);
+	}
 	middlewares.push(router);
 	return {
 		router,
@@ -282,22 +284,34 @@ 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 {
-	constructor() {
-		super("stop");
-	}
-};
-var Scope = class extends EventTarget {
+var Scope = class {
 	parentScope;
 	context;
+	hooks;
 	constructor(parentScope) {
-		super();
 		this.parentScope = parentScope;
-		this.parentScope?.onStop(() => this.stop());
 		this.context = {};
+		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;
 	}
 	getContext(input) {
 		let scope = this;
@@ -310,13 +324,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;
 }
@@ -365,4 +376,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, 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, 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 };

package/dist/{index-D-rKmbh3.d.ts → index-CUwjaRno.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,22 @@ interface Schema<T = unknown, TOutput = T> {
     };
   };
 }
-declare class StopEvent extends Event {
-  constructor();
-}
-declare class Scope extends EventTarget {
+declare class Scope {
   parentScope?: Scope;
   readonly context: Context;
+  readonly hooks: Record<string, Array<Invoke>>;
   constructor(parentScope?: Scope);
+  registerHook<T extends Invoke>(name: Descriptor<T>, invoke: T): () => void;
+  dispatchHook<T extends Invoke>(name: Descriptor<T>, ...inputs: Parameters<T>): Promise<Awaited<ReturnType<T>>[]>;
   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";
@@ -143,7 +138,7 @@ declare function sendRedirect(scope: Scope, path: string, config?: Mergeable<Res
 declare function sendBadRequest(scope: Scope, text: string, config?: Mergeable<ResponseConfig>): Response;
 declare function sendUnauthorized(scope: Scope, config?: Mergeable<ResponseConfig>): Response;
 declare function mimeType(file: string): MimeType;
-declare function toRoutePath(path: string): string;
+declare function toRoutePath(path: string): [string, ...Array<string>];
 declare function invoke(scope: Scope, pipeline: Array<Middleware>, index?: number): Promise<Result>;
 declare function createServer(): Promise<Server>;
 declare const ROUTER_CONTEXT: Descriptor<RouterContext>;
@@ -152,6 +147,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;
@@ -191,4 +188,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, 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, 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 };

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-D-rKmbh3.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, 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 };

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-C4yy27ko.js";
+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";
 
 //#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, 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 };

package/dist/kit/index.d.ts

@@ -1,4 +1,4 @@
-import { App, Virtual } from "../index-D-rKmbh3.js";
+import { App, Virtual } from "../index-CUwjaRno.js";
 
 //#region src/kit/index.d.ts
 declare function useKit(app: App, source: string | URL): {

package/dist/vite/index.d.ts

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

package/dist/vite/index.js

@@ -1,4 +1,4 @@
-import { CLIENT, SERVER, SERVER_CONTEXT, Scope, createApp, invoke } from "../app-C4yy27ko.js";
+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 { isRunnableDevEnvironment } from "vite";
@@ -307,7 +307,7 @@ function virtuals(virtuals$1) {
 //#endregion
 //#region package.json
 var name = "revojs";
-var version = "0.1.20";
+var version = "0.1.22";
 
 //#endregion
 //#region src/vite/index.ts
@@ -406,18 +406,14 @@ 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();
 					});

package/package.json

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