revojs 0.0.32 → 0.0.33

package/dist/index.js

@@ -591,6 +591,9 @@ var Radix = class Radix {
 
 //#endregion
 //#region src/runtime/index.ts
+const useRuntime = (scope, context) => {
+	return scope.getContext(context ?? RUNTIME_CONTEXT);
+};
 const defineRoute = (route) => {
 	return route;
 };
@@ -604,7 +607,7 @@ const toPath = (value) => {
 	return split.length === 3 ? [split.at(0), split.at(1)] : [split.at(0)];
 };
 const $fetch = async (scope, input, init) => {
-	const { event } = scope.getContext(RUNTIME_CONTEXT);
+	const { event } = useRuntime(scope);
 	let response;
 	if (event) {
 		const url = new URL(input.toString(), event.request.url);
@@ -683,6 +686,7 @@ const ROUTER_CONTEXT = defineContext("ROUTER_CONTEXT");
 const createRouter = (options) => {
 	const navigator = new EventTarget();
 	const radix = new Radix();
+	const url = createState();
 	const route = createState();
 	const inputs = createState();
 	for (const path in options.routes) {
@@ -693,10 +697,10 @@ const createRouter = (options) => {
 		}
 	}
 	const registerRouterContext = async (scope) => {
-		const { event } = scope.getContext(RUNTIME_CONTEXT);
+		const { event } = useRuntime(scope);
 		const fetch$1 = async () => {
-			const url = new URL(event ? event.request.url : window.location.href);
-			const match = radix.match(url.pathname);
+			url.value = new URL(event?.request.url ?? window?.location.href);
+			const match = radix.match(url.value.pathname);
 			inputs.value = match.inputs;
 			const Page$1 = await match.value?.();
 			if (Page$1) route.value = /* @__PURE__ */ h(Page$1, inputs.value);
@@ -707,6 +711,7 @@ const createRouter = (options) => {
 		scope.setContext(ROUTER_CONTEXT, {
 			options,
 			navigator,
+			url,
 			radix,
 			route,
 			inputs
@@ -719,7 +724,7 @@ const createRouter = (options) => {
 	};
 };
 const useRouter = (scope, context) => {
-	const { route, inputs, navigator } = scope.getContext(context ?? ROUTER_CONTEXT);
+	const { url, route, inputs, navigator } = scope.getContext(context ?? ROUTER_CONTEXT);
 	const navigate = (path) => {
 		if (isClient()) window.history.pushState(window.history.state, "", path);
 		navigator.dispatchEvent(new NavigateEvent());
@@ -729,6 +734,7 @@ const useRouter = (scope, context) => {
 		navigate(event.currentTarget?.getAttribute("href") ?? "/");
 	};
 	return {
+		url,
 		route,
 		inputs,
 		navigator,
@@ -888,4 +894,4 @@ const markdownToSlot = (input, options) => {
 };
 
 //#endregion
-export { $fetch, Compute, Handler, LOCALE_CONTEXT, MountedEvent, NavigateEvent, Page, ROUTER_CONTEXT, RUNTIME_CONTEXT, Radix, Scope, StopEvent, activeCompute, components, createApp, createCompute, createElement, createEvent, createLocale, createMemo, createRouter, createRuntime, createState, defineComponent, defineContext, defineRoute, fileName, fromValue, getAssets, getCookies, getCustomElement, getGlobalStyles, getMimeType, getRequestUrl, getRoutes, getSetCookies, getVariables, isClient, isServer, isTemplate, markdownToSlot, preventDefault, registerComponent, renderToNode, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, stopImmediatePropagation, stopPropagation, targets, toCustomElement, toFragment, toPath, toString, useEvent, useLocale, useRouter };
+export { $fetch, Compute, Handler, LOCALE_CONTEXT, MountedEvent, NavigateEvent, Page, ROUTER_CONTEXT, RUNTIME_CONTEXT, Radix, Scope, StopEvent, activeCompute, components, createApp, createCompute, createElement, createEvent, createLocale, createMemo, createRouter, createRuntime, createState, defineComponent, defineContext, defineRoute, fileName, fromValue, getAssets, getCookies, getCustomElement, getGlobalStyles, getMimeType, getRequestUrl, getRoutes, getSetCookies, getVariables, isClient, isServer, isTemplate, markdownToSlot, preventDefault, registerComponent, renderToNode, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, stopImmediatePropagation, stopPropagation, targets, toCustomElement, toFragment, toPath, toString, useEvent, useLocale, useRouter, useRuntime };

package/dist/router/index.d.ts

@@ -8,6 +8,7 @@ export type RouterOptions<T extends Routes = Routes> = {
 export type RouterContext<T extends RouterOptions = RouterOptions> = {
     options: T;
     navigator: EventTarget;
+    url: State<URL | undefined>;
     radix: Radix<() => Promise<ComponentConstructor<Events, Attributes>>>;
     route: State<Slot | undefined>;
     inputs: State<Record<string, string> | undefined>;
@@ -19,6 +20,7 @@ export declare const ROUTER_CONTEXT: Descriptor<RouterContext<RouterOptions<Rout
 export declare const createRouter: <T extends RouterOptions>(options: T) => {
     ROUTER_CONTEXT: Descriptor<RouterContext<T>>;
     registerRouterContext: (scope: Scope) => Promise<{
+        url: State<URL | undefined>;
         route: State<unknown>;
         inputs: State<Record<string, string> | undefined>;
         navigator: EventTarget;
@@ -27,6 +29,7 @@ export declare const createRouter: <T extends RouterOptions>(options: T) => {
     }>;
 };
 export declare const useRouter: <T extends RouterContext>(scope: Scope, context?: Descriptor<T>) => {
+    url: State<URL | undefined>;
     route: State<unknown>;
     inputs: State<Record<string, string> | undefined>;
     navigator: EventTarget;

package/dist/runtime/index.d.ts

@@ -1,6 +1,6 @@
 import { type Context, type Event, type Handle, type Middleware } from "../http";
 import { Radix } from "../radix";
-import { Scope } from "../signals";
+import { type Descriptor, Scope } from "../signals";
 export type Route<T> = {
     fetch: Handle<T>;
 };
@@ -9,12 +9,14 @@ export type Runtime<T> = {
     middlewares: Array<Middleware<T>>;
     fetch: (request: Request, context: Context<T>) => Promise<Response>;
 };
+export type RuntimeContext<T = Record<string, unknown>> = {
+    event?: Event<T>;
+};
+export declare const useRuntime: <T extends RuntimeContext>(scope: Scope, context?: Descriptor<T>) => RuntimeContext<Record<string, unknown>>;
 export declare const defineRoute: <T>(route: Route<T>) => Route<T>;
 export declare const fileName: (path: string) => string | undefined;
 export declare const toPath: (value: string) => (string | undefined)[];
 export declare const $fetch: <T>(scope: Scope, input: string | URL, init?: RequestInit) => Promise<T>;
 export declare const getVariables: <T>(event?: Event<T>) => T;
 export declare const createRuntime: <T>() => Promise<Runtime<T>>;
-export declare const RUNTIME_CONTEXT: import("..").Descriptor<{
-    event?: Event;
-}>;
+export declare const RUNTIME_CONTEXT: Descriptor<RuntimeContext<Record<string, unknown>>>;

package/package.json

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