revojs 0.1.11 → 0.1.12

package/dist/index.d.ts

@@ -131,6 +131,7 @@ declare function useServer<T extends Context>(scope: Scope): ServerContext<T>;
 declare function useUrl(scope: Scope, base?: string): URL;
 declare function useQuery(scope: Scope): Record<string, string>;
 declare function useQuery<T extends Schema>(scope: Scope, schema: T): InferOutput<T>;
+declare function withQuery(input: string, query: Record<string, string>): string;
 declare function useCookies(scope: Scope): Record<string, string>;
 declare function useCookies<T extends Schema>(scope: Scope, schema: T): InferOutput<T>;
 declare function useSetCookies(scope: Scope): Record<string, string>;
@@ -146,7 +147,7 @@ declare function sendBadRequest(scope: Scope, text: string, config?: Mergeable<R
 declare function sendUnauthorized(scope: Scope, config?: Mergeable<ResponseConfig>): Response;
 declare function mimeType(file: string): MimeType;
 declare function toRoutePath(path: string): [string, string | undefined];
-declare function invoke(scope: Scope, pipeline: Array<Middleware>, index?: number): Result;
+declare function invoke(scope: Scope, pipeline: Array<Middleware>, index?: number): Promise<Result>;
 declare function createServer(): Promise<Server>;
 declare const ROUTER_CONTEXT: Descriptor<RouterContext>;
 declare const SERVER_CONTEXT: Descriptor<ServerContext<Context>>;
@@ -193,4 +194,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, useQuery, useRouter, useServer, useSetCookies, useUrl };
+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, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/index.js

@@ -106,6 +106,14 @@ function useQuery(scope, schema) {
 	const entries = Object.fromEntries(searchParams);
 	return schema ? parseSchema(scope, schema, entries) : entries;
 }
+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);
+	}
+	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) => {
@@ -201,8 +209,8 @@ function toRoutePath(path) {
 	const result = ("/" + path).replaceAll(/\/index/g, "").replaceAll(/\[\.\.\.(.*?)\]/g, (_, value) => WILDCARD + value).replaceAll(/\[(.*?)\]/g, (_, value) => PARAMETER + value);
 	return (result.startsWith("/") ? result : "/" + result).split(".");
 }
-function invoke(scope, pipeline, index = 0) {
-	return pipeline.at(index)?.fetch(scope, () => invoke(scope, pipeline, index + 1));
+async function invoke(scope, pipeline, index = 0) {
+	return await pipeline.at(index)?.fetch(scope, async () => await invoke(scope, pipeline, index + 1));
 }
 async function createServer() {
 	const router = new Router();
@@ -389,13 +397,15 @@ async function $fetch(scope, input, options) {
 	if (import.meta.server) {
 		const { states, request, variables } = useServer(scope);
 		const next = new Scope();
+		const url = new URL(input.toString(), request.url);
 		next.setContext(SERVER_CONTEXT, {
 			states,
-			request: new Request(new URL(input.toString(), request.url), options),
+			request: new Request(url, options),
 			response: { headers: new Headers() },
 			variables
 		});
-		response = await (await import("#virtual/server")).default.fetch(next);
+		const previous = new URL(request.url);
+		if (url.origin === previous.origin) response = await (await import("#virtual/server")).default.fetch(next);
 	}
 	response ??= await fetch(input, options);
 	if (response.ok === false) throw response;
@@ -406,4 +416,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, useQuery, useRouter, useServer, useSetCookies, useUrl };
+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, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/package.json

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