revojs 0.0.67 → 0.0.69

package/dist/app/index.d.ts

@@ -24,6 +24,6 @@ export type App = {
     config: Config;
     virtuals: Record<string, Virtual>;
 };
-export declare const createApp: (config?: NestedPartial<Config>) => App;
+export declare function createApp(config?: NestedPartial<Config>): App;
 export declare const SERVER = "ssr";
 export declare const CLIENT = "client";

package/dist/html/index.d.ts

@@ -46,7 +46,6 @@ export interface ComponentOptions<TEvents extends Events, TAttributes extends At
     events?: TEvents;
     attributes?: TAttributes;
     shadowRoot?: ShadowRootInit;
-    styles?: Array<string>;
     setup: (component: Component<TEvents, TAttributes>) => Slot;
 }
 export interface Component<TEvents extends Events, TAttributes extends Attributes> {
@@ -60,7 +59,6 @@ export interface ComponentConstructor<TEvents extends Events, TAttributes extend
     $name: string;
     $events: TEvents;
     $attributes: TAttributes;
-    $styles: Array<string>;
     new (input?: Input<TEvents, TAttributes>, parentScope?: Scope): Component<TEvents, TAttributes>;
 }
 export interface CustomElement<TEvents extends Events, TAttributes extends Attributes> extends HTMLElement {
@@ -72,30 +70,30 @@ export interface CustomElementConstructor<TEvents extends Events, TAttributes ex
 export declare class MountedEvent extends Event {
     constructor();
 }
-export declare const isTemplate: <T>(value?: T) => value is Template & T;
-export declare const isCustomElement: <T>(value?: T) => value is CustomElement<Events, Attributes> & T;
-export declare const isComponent: <T>(value?: T) => value is ComponentConstructor<Events, Attributes> & T;
-export declare const useHost: (scope: Scope) => HostContext;
-export declare const createElement: <TEvents extends Events, TAttributes extends Attributes>(input: string | ComponentConstructor<TEvents, TAttributes>, attributes?: AttributeInput<TAttributes>, ...children: Array<Slot>) => Slot;
-export declare const toString: (slot: Slot) => string;
-export declare const toArray: (hydration: Hydration) => Array<Node>;
-export declare const toRange: (hydration: Hydration) => Range;
-export declare const toFragment: (hydration: Hydration) => DocumentFragment;
-export declare const hydrate: (scope: Scope, parentNode: Node, slot: Slot, index: number, previous?: Hydration) => Hydration;
-export declare const renderToString: (scope: Scope, slot: Slot) => Promise<string>;
-export declare const defineComponent: <TEvents extends Events, TAttributes extends Attributes>(options: ComponentOptions<TEvents, TAttributes>) => ComponentConstructor<TEvents, TAttributes>;
-export declare const toCustomElement: <TEvents extends Events, TAttributes extends Attributes>(Component: ComponentConstructor<TEvents, TAttributes>) => CustomElementConstructor<TEvents, TAttributes>;
-export declare const registerComponent: <TEvents extends Events, TAttributes extends Attributes>(component: ComponentConstructor<TEvents, TAttributes>) => ComponentConstructor<TEvents, TAttributes>;
+export declare function isTemplate<T>(value?: T): value is Template & T;
+export declare function isCustomElement<T>(value?: T): value is CustomElement<Events, Attributes> & T;
+export declare function isComponent<T>(value?: T): value is ComponentConstructor<Events, Attributes> & T;
+export declare function useHost(scope: Scope): HostContext;
+export declare function createElement<TEvents extends Events, TAttributes extends Attributes>(input: string | ((attributes: AttributeInput<Attributes>) => Slot) | ComponentConstructor<TEvents, TAttributes>, attributes?: AttributeInput<TAttributes>, ...children: Array<Slot>): Slot;
+export declare function toString(slot: Slot): string;
+export declare function toArray(hydration: Hydration): Array<Node>;
+export declare function toRange(hydration: Hydration): Range;
+export declare function toFragment(hydration: Hydration): DocumentFragment;
+export declare function hydrate(scope: Scope, parentNode: Node, slot: Slot, index: number, previous?: Hydration): Hydration;
+export declare function renderToString(scope: Scope, slot: Slot): Promise<string>;
+export declare function defineComponent<TEvents extends Events, TAttributes extends Attributes>(options: ComponentOptions<TEvents, TAttributes>): ComponentConstructor<TEvents, TAttributes>;
+export declare function toCustomElement<TEvents extends Events, TAttributes extends Attributes>(Component: ComponentConstructor<TEvents, TAttributes>): CustomElementConstructor<TEvents, TAttributes>;
+export declare function registerComponent<TEvents extends Events, TAttributes extends Attributes>(component: ComponentConstructor<TEvents, TAttributes>): ComponentConstructor<TEvents, TAttributes>;
 export declare function useEvent<T extends keyof ElementEventMap>(scope: Scope, target: EventTarget | undefined | null, event: T, input: EventListener<ElementEventMap[T]>, options?: AddEventListenerOptions): void;
 export declare function useEvent<T extends keyof WindowEventMap>(scope: Scope, target: Window | undefined | null, event: T, input: EventListener<WindowEventMap[T]>, options?: AddEventListenerOptions): void;
 export declare function useEvent<T extends keyof HTMLElementEventMap>(scope: Scope, target: Document | HTMLElement | undefined | null, event: T, input: EventListener<HTMLElementEventMap[T]>, options?: AddEventListenerOptions): void;
-export declare const onMounted: (scope: Scope, event: EventListener<MountedEvent>) => void;
-export declare const startViewTransition: (invoke: ViewTransitionUpdateCallback) => Promise<void>;
-export declare const isClient: () => boolean;
-export declare const isServer: () => boolean;
-export declare const preventDefault: (event: Event) => void;
-export declare const stopPropagation: (event: Event) => void;
-export declare const stopImmediatePropagation: (event: Event) => void;
+export declare function onMounted(scope: Scope, event: EventListener<MountedEvent>): void;
+export declare function startViewTransition(invoke: ViewTransitionUpdateCallback): Promise<void>;
+export declare function isClient(): boolean;
+export declare function isServer(): boolean;
+export declare function preventDefault(event: Event): void;
+export declare function stopPropagation(event: Event): void;
+export declare function stopImmediatePropagation(event: Event): void;
 export declare const components: Map<string, ComponentConstructor<Events, Attributes>>;
 export declare const HOST_CONTEXT: import("..").Descriptor<HostContext>;
 declare global {

package/dist/http/index.d.ts

@@ -20,14 +20,14 @@ export type ResponseOptions = {
 };
 export type Handle = (scope: Scope) => void | Response | Promise<void | Response>;
 export type Chain = (scope: Scope, next: Handle) => void | Response | Promise<void | Response>;
-export declare const sendText: (scope: Scope, text: string) => Response;
-export declare const sendHtml: (scope: Scope, text: string) => Response;
-export declare const sendJson: <T>(scope: Scope, value: T) => Response;
-export declare const sendRedirect: (scope: Scope, path: string) => Response;
-export declare const sendBadRequest: (scope: Scope, text: string) => Response;
-export declare const sendUnauthorized: (scope: Scope) => Response;
-export declare const useRequestUrl: (scope: Scope, base?: string) => URL;
-export declare const useCookies: (scope: Scope) => Record<string, string>;
-export declare const useSetCookies: (scope: Scope) => Record<string, string>;
-export declare const setCookie: (scope: Scope, name: string, value: string, options?: CookieOptions) => void;
-export declare const mimeType: (file: string) => MimeType;
+export declare function sendText(scope: Scope, text: string): Response;
+export declare function sendHtml(scope: Scope, text: string): Response;
+export declare function sendJson<T>(scope: Scope, value: T): Response;
+export declare function sendRedirect(scope: Scope, path: string): Response;
+export declare function sendBadRequest(scope: Scope, text: string): Response;
+export declare function sendUnauthorized(scope: Scope): Response;
+export declare function useUrl(scope: Scope, base?: string): URL;
+export declare function useCookies(scope: Scope): Record<string, string>;
+export declare function useSetCookies(scope: Scope): Record<string, string>;
+export declare function setCookie(scope: Scope, name: string, value: string, options?: CookieOptions): void;
+export declare function mimeType(file: string): MimeType;

package/dist/index.js

@@ -1,16 +1,141 @@
-import { defu } from "defu";
+//#region src/signals/index.ts
+var StopEvent = class extends Event {
+	constructor() {
+		super("stop");
+	}
+};
+var Scope = class extends EventTarget {
+	parentScope;
+	context;
+	constructor(parentScope) {
+		super();
+		this.parentScope = parentScope;
+		this.parentScope?.onStop(() => this.stop());
+		this.context = /* @__PURE__ */ new Map();
+	}
+	getContext(input) {
+		let scope = this;
+		while (scope) {
+			if (scope.context.has(input)) return scope.context.get(input);
+			scope = scope.parentScope;
+		}
+		return {};
+	}
+	setContext(input, value) {
+		this.context.set(input, value);
+	}
+	onStop(input) {
+		this.addEventListener("stop", input, { once: true });
+	}
+	stop() {
+		return this.dispatchEvent(new StopEvent());
+	}
+};
+var Compute = class extends Scope {
+	invoke;
+	constructor(parentScope, invoke) {
+		super(parentScope);
+		this.invoke = invoke;
+	}
+	run() {
+		this.stop();
+		return this.invoke(this);
+	}
+};
+var Handler = class Handler {
+	get(target, key) {
+		const compute = activeCompute;
+		if (compute) {
+			const computes = targets.get(target) ?? /* @__PURE__ */ new Map();
+			const set = computes.get(key) ?? /* @__PURE__ */ new Set();
+			computes.set(key, set.add(compute));
+			targets.set(target, computes);
+			compute.parentScope?.onStop(() => {
+				set.delete(compute);
+				if (set.size === 0) {
+					computes.delete(key);
+					if (computes.size === 0) targets.delete(target);
+				}
+			});
+		}
+		const value = Reflect.get(target, key);
+		if (value) {
+			if (typeof value === "function" && !value.prototype) return value.bind(target);
+			if (typeof value === "object") {
+				const tag = Object.prototype.toString.call(value);
+				if (tag === "[object Object]" || tag === "[object Array]" || tag === "[object Map]" || tag === "[object Set]" || tag === "[object WeakMap]" || tag === "[object WeakSet]") return new Proxy(value, new Handler());
+			}
+		}
+		return value;
+	}
+	set(target, key, value) {
+		const result = Reflect.set(target, key, value);
+		for (const compute of targets.get(target)?.get(key) ?? []) compute.run();
+		return result;
+	}
+};
+function createState(value) {
+	return new Proxy({ value }, new Handler());
+}
+function createCompute(scope, invoke) {
+	let previous = activeCompute;
+	activeCompute = new Compute(scope, invoke);
+	const result = invoke(activeCompute);
+	if (result instanceof Promise) return result.finally(() => activeCompute = previous);
+	activeCompute = previous;
+	return result;
+}
+function createMemo(scope, invoke) {
+	let state;
+	const compute = createCompute(scope, (scope$1) => {
+		const value = invoke(scope$1);
+		if (typeof state === "object") state.value = value;
+		return value;
+	});
+	state = createState(compute);
+	return state;
+}
+function fromValue(value) {
+	if (value instanceof Function) return fromValue(value());
+	return value;
+}
+function untrack(invoke) {
+	let previous = activeCompute;
+	activeCompute = void 0;
+	const result = invoke();
+	if (result instanceof Promise) return result.finally(() => activeCompute = previous);
+	activeCompute = previous;
+	return result;
+}
+function mergeObjects(base, input) {
+	const object = structuredClone(input);
+	for (const key in base) {
+		if (key === "__proto__" || key === "constructor") continue;
+		const value = base[key];
+		if (value === null || value === void 0) continue;
+		if (typeof value === "object" && typeof object[key] === "object") object[key] = mergeObjects(value, object[key]);
+		else object[key] = value;
+	}
+	return object;
+}
+function defineContext(key) {
+	return key;
+}
+let activeCompute;
+const targets = /* @__PURE__ */ new WeakMap();
 
+//#endregion
 //#region src/app/index.ts
-const createApp = (config) => {
+function createApp(config) {
 	return {
-		config: defu(config, {
+		config: mergeObjects(config, {
 			client: { entry: "./index.html" },
 			server: { entry: "revojs/presets/node" },
 			dev: { middleware: [] }
 		}),
 		virtuals: {}
 	};
-};
+}
 const SERVER = "ssr";
 const CLIENT = "client";
 
@@ -95,64 +220,64 @@ const svgElements = new Set([
 	"view",
 	"vkern"
 ]);
-const namespace = (tag) => {
+function namespace(tag) {
 	return svgElements.has(tag) ? "http://www.w3.org/2000/svg" : "http://www.w3.org/1999/xhtml";
-};
+}
 
 //#endregion
 //#region src/http/index.ts
-const sendText = (scope, text) => {
+function sendText(scope, text) {
 	const { response } = useRuntime(scope);
 	response.headers.set("Content-Type", "text/plain");
 	return new Response(text, response);
-};
-const sendHtml = (scope, text) => {
+}
+function sendHtml(scope, text) {
 	const { response } = useRuntime(scope);
 	response.headers.set("Content-Type", "text/html");
 	return new Response(text, response);
-};
-const sendJson = (scope, value) => {
+}
+function sendJson(scope, value) {
 	const { response } = useRuntime(scope);
 	response.headers.set("Content-Type", "application/json");
 	return new Response(JSON.stringify(value), response);
-};
-const sendRedirect = (scope, path) => {
+}
+function sendRedirect(scope, path) {
 	const { response } = useRuntime(scope);
 	response.status = 302;
 	response.headers.set("Location", path);
 	return new Response(null, response);
-};
-const sendBadRequest = (scope, text) => {
+}
+function sendBadRequest(scope, text) {
 	const { response } = useRuntime(scope);
 	response.status = 400;
 	return new Response(text, response);
-};
-const sendUnauthorized = (scope) => {
+}
+function sendUnauthorized(scope) {
 	const { response } = useRuntime(scope);
 	response.status = 401;
 	return new Response(null, response);
-};
-const useRequestUrl = (scope, base) => {
+}
+function useUrl(scope, base) {
 	const { request } = useRuntime(scope);
-	return new URL(request.url, base);
-};
-const useCookies = (scope) => {
+	return new URL(request?.url ?? window?.location.href, base);
+}
+function useCookies(scope) {
 	const { request } = useRuntime(scope);
 	return (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;
 	}, {});
-};
-const useSetCookies = (scope) => {
+}
+function useSetCookies(scope) {
 	const { request } = useRuntime(scope);
 	return request.headers.getSetCookie().reduce((result, cookie) => {
 		const [name, value] = cookie.split("=");
 		if (name && value) result[name] = decodeURIComponent(value);
 		return result;
 	}, {});
-};
-const setCookie = (scope, name, value, options) => {
+}
+function setCookie(scope, name, value, options) {
 	const { response } = useRuntime(scope);
 	let cookie = name + "=" + encodeURIComponent(value);
 	if (options?.domain) cookie += `; Domain=${options.domain}`;
@@ -165,11 +290,11 @@ const setCookie = (scope, name, value, options) => {
 	if (options?.secure) cookie += `; Secure`;
 	if (isClient()) document.cookie = cookie;
 	else response.headers.append("Set-Cookie", cookie);
-};
-const mimeType = (file) => {
+}
+function mimeType(file) {
 	const extension = /\.([a-zA-Z0-9]+?)$/.exec(file)?.at(1);
 	return mimeTypes[extension ?? ""] ?? "text/plain";
-};
+}
 const mimeTypes = {
 	txt: "text/plain",
 	css: "text/css",
@@ -256,149 +381,33 @@ var Radix = class Radix {
 	};
 };
 
-//#endregion
-//#region src/signals/index.ts
-var StopEvent = class extends Event {
-	constructor() {
-		super("stop");
-	}
-};
-var Scope = class extends EventTarget {
-	parentScope;
-	context;
-	constructor(parentScope) {
-		super();
-		this.parentScope = parentScope;
-		this.parentScope?.onStop(() => this.stop());
-		this.context = /* @__PURE__ */ new Map();
-	}
-	getContext(input) {
-		let scope = this;
-		while (scope) {
-			if (scope.context.has(input)) return scope.context.get(input);
-			scope = scope.parentScope;
-		}
-		return {};
-	}
-	setContext(input, value) {
-		this.context.set(input, value);
-	}
-	onStop(input) {
-		this.addEventListener("stop", input, { once: true });
-	}
-	stop() {
-		return this.dispatchEvent(new StopEvent());
-	}
-};
-var Compute = class extends Scope {
-	invoke;
-	constructor(parentScope, invoke) {
-		super(parentScope);
-		this.invoke = invoke;
-	}
-	run() {
-		this.stop();
-		return this.invoke(this);
-	}
-};
-var Handler = class Handler {
-	get(target, key) {
-		const compute = activeCompute;
-		if (compute) {
-			const computes = targets.get(target) ?? /* @__PURE__ */ new Map();
-			const set = computes.get(key) ?? /* @__PURE__ */ new Set();
-			computes.set(key, set.add(compute));
-			targets.set(target, computes);
-			compute.parentScope?.onStop(() => {
-				set.delete(compute);
-				if (set.size === 0) {
-					computes.delete(key);
-					if (computes.size === 0) targets.delete(target);
-				}
-			});
-		}
-		const value = Reflect.get(target, key);
-		if (value) {
-			if (typeof value === "function" && !value.prototype) return value.bind(target);
-			if (typeof value === "object") {
-				const tag = Object.prototype.toString.call(value);
-				if (tag === "[object Object]" || tag === "[object Array]" || tag === "[object Map]" || tag === "[object Set]" || tag === "[object WeakMap]" || tag === "[object WeakSet]") return new Proxy(value, new Handler());
-			}
-		}
-		return value;
-	}
-	set(target, key, value) {
-		const result = Reflect.set(target, key, value);
-		for (const compute of targets.get(target)?.get(key) ?? []) compute.run();
-		return result;
-	}
-};
-function createState(value) {
-	return new Proxy({ value }, new Handler());
-}
-function createCompute(scope, invoke) {
-	let previous = activeCompute;
-	activeCompute = new Compute(scope, invoke);
-	const result = invoke(activeCompute);
-	if (result instanceof Promise) return result.finally(() => activeCompute = previous);
-	activeCompute = previous;
-	return result;
-}
-function createMemo(scope, invoke) {
-	let state;
-	const compute = createCompute(scope, (scope$1) => {
-		const value = invoke(scope$1);
-		if (typeof state === "object") state.value = value;
-		return value;
-	});
-	state = createState(compute);
-	return state;
-}
-function fromValue(value) {
-	if (value instanceof Function) return fromValue(value());
-	return value;
-}
-function untrack(invoke) {
-	let previous = activeCompute;
-	activeCompute = void 0;
-	const result = invoke();
-	if (result instanceof Promise) return result.finally(() => activeCompute = previous);
-	activeCompute = previous;
-	return result;
-}
-function defineContext(key) {
-	return key;
-}
-let activeCompute;
-const targets = /* @__PURE__ */ new WeakMap();
-
 //#endregion
 //#region src/runtime/index.ts
-const isRoute = (value) => {
+function isRoute(value) {
 	return !!value && typeof value === "object" && "fetch" in value;
-};
-const useRuntime = (scope) => {
+}
+function useRuntime(scope) {
 	return scope.getContext(RUNTIME_CONTEXT);
-};
-const useRoute = (scope) => {
+}
+function useRoute(scope) {
 	return scope.getContext(ROUTE_CONTEXT);
-};
-const defineRoute = (route) => {
+}
+function defineRoute(route) {
 	return route;
-};
-const defineMiddleware = (middleware) => {
+}
+function defineMiddleware(middleware) {
 	return middleware;
-};
-const fileName = (path) => {
+}
+function fileName(path) {
 	return path.split("/").pop()?.split(".").slice(0, -1).join(".");
-};
-const toPath = (value) => {
+}
+function toPath(value) {
 	const path = (value.startsWith("/") ? value : "/" + value).replaceAll(/\/index/g, "").replaceAll(/\[(.*?)\]/g, (_, name) => ":" + name);
 	const route = path.startsWith("/") ? path : "/" + path;
 	const split = route.split(".");
 	return split.length === 3 ? [split.at(0), split.at(1)] : [split.at(0)];
-};
-const $fetch = async (scope, input, options) => {
+}
+async function $fetch(scope, input, options) {
 	const { request, variables } = useRuntime(scope);
 	let response;
 	if (request) {
@@ -420,19 +429,31 @@ const $fetch = async (scope, input, options) => {
 		case "application/json": return response.json();
 		default: return response;
 	}
-};
-const useAsync = (scope, invoke, options) => {
+}
+function useAsync(scope, invoke, options) {
 	const { tasks } = useRuntime(scope);
 	const state = createState();
 	const isLoading = createState(true);
-	const task = invoke().then((value) => state.value = value).catch(options?.catch).finally(() => isLoading.value = false);
+	const execute = async () => {
+		try {
+			state.value = await invoke().finally(() => isLoading.value = false);
+		} catch (error) {
+			options?.catch?.(error);
+		}
+		return state.value;
+	};
+	const task = execute();
 	if (isServer()) tasks.push(task);
 	return {
 		state,
-		isLoading
+		isLoading,
+		execute
 	};
-};
-const createRuntime = async () => {
+}
+function useFetch(scope, input, options) {
+	return useAsync(scope, async () => await $fetch(scope, input, options), options);
+}
+async function createRuntime() {
 	const radix = new Radix();
 	const middlewares = new Array();
 	const routes = await import("#virtual/routes").then((module) => module.default);
@@ -468,7 +489,7 @@ const createRuntime = async () => {
 		middlewares,
 		fetch: async (scope) => {
 			const { request } = useRuntime(scope);
-			const { pathname } = useRequestUrl(scope);
+			const { pathname } = useUrl(scope);
 			const { value: route, inputs } = radix.match(request.method + pathname);
 			try {
 				scope.setContext(ROUTE_CONTEXT, { inputs: createState(inputs) });
@@ -483,7 +504,7 @@ const createRuntime = async () => {
 			}
 		}
 	};
-};
+}
 const RUNTIME_CONTEXT = defineContext("RUNTIME_CONTEXT");
 const ROUTE_CONTEXT = defineContext("ROUTE_CONTEXT");
 
@@ -494,31 +515,24 @@ var MountedEvent = class extends Event {
 		super("mounted");
 	}
 };
-const isTemplate = (value) => {
+function isTemplate(value) {
 	return !!value && typeof value === "object" && "tag" in value && "attributes" in value && "children" in value;
-};
-const isCustomElement = (value) => {
+}
+function isCustomElement(value) {
 	return !!value && typeof value === "object" && "component" in value;
-};
-const isComponent = (value) => {
+}
+function isComponent(value) {
 	return !!value && typeof value === "function" && "$name" in value;
-};
-const useHost = (scope) => {
+}
+function useHost(scope) {
 	return scope.getContext(HOST_CONTEXT);
-};
-const createElement = (input, attributes, ...children) => {
-	if (isComponent(input)) {
-		const template = {
-			tag: input.$name,
-			attributes: attributes ?? {},
-			children
-		};
-		if (input.$styles.length) {
-			const classes = template.attributes["class"];
-			template.attributes["class"] = (classes ? [classes, ...input.$styles] : input.$styles).join(" ");
-		}
-		return template;
-	}
+}
+function createElement(input, attributes, ...children) {
+	if (isComponent(input)) return {
+		tag: input.$name,
+		attributes: attributes ?? {},
+		children
+	};
 	if (typeof input === "string") return {
 		tag: input,
 		attributes: attributes ?? {},
@@ -528,8 +542,8 @@ const createElement = (input, attributes, ...children) => {
 		...attributes,
 		children
 	});
-};
-const toString = (slot) => {
+}
+function toString(slot) {
 	switch (typeof slot) {
 		case "string":
 		case "number":
@@ -540,12 +554,12 @@ const toString = (slot) => {
 		case "function": return toString(slot());
 		default: return "";
 	}
-};
-const toArray = (hydration) => {
+}
+function toArray(hydration) {
 	if (Array.isArray(hydration)) return hydration.reduce((items, child) => items.concat(toArray(child)), new Array());
-	else return [hydration];
-};
-const toRange = (hydration) => {
+	return [hydration];
+}
+function toRange(hydration) {
 	const items = toArray(hydration);
 	const range = document.createRange();
 	const firstNode = items.at(0);
@@ -553,14 +567,14 @@ const toRange = (hydration) => {
 	const lastNode = items.at(-1);
 	if (lastNode) range.setEndAfter(lastNode);
 	return range;
-};
-const toFragment = (hydration) => {
+}
+function toFragment(hydration) {
 	return toArray(hydration).reduce((fragment, node) => {
 		fragment.appendChild(node);
 		return fragment;
 	}, document.createDocumentFragment());
-};
-const hydrate = (scope, parentNode, slot, index, previous) => {
+}
+function hydrate(scope, parentNode, slot, index, previous) {
 	let hydration = parentNode.childNodes.item(index);
 	if (Array.isArray(slot)) {
 		const items = new Array();
@@ -613,8 +627,8 @@ const hydrate = (scope, parentNode, slot, index, previous) => {
 	hydration ??= document.createComment("");
 	if (parentNode.childNodes.item(index) === null) parentNode.appendChild(toFragment(hydration));
 	return hydration;
-};
-const renderToString = async (scope, slot) => {
+}
+async function renderToString(scope, slot) {
 	const { tasks } = useRuntime(scope);
 	if (typeof slot === "number" || typeof slot === "bigint" || typeof slot === "boolean" || typeof slot === "string" || typeof slot === "symbol") return slot.toString();
 	if (typeof slot === "function") {
@@ -654,13 +668,12 @@ const renderToString = async (scope, slot) => {
 		return content;
 	}
 	return "<!---->";
-};
-const defineComponent = (options) => {
+}
+function defineComponent(options) {
 	class Instance {
 		static $name = options.name;
 		static $events = options.events ?? {};
 		static $attributes = options.attributes ?? {};
-		static $styles = options.styles ?? [];
 		scope;
 		events;
 		attributes;
@@ -681,8 +694,8 @@ const defineComponent = (options) => {
 	}
 	components.set(options.name, Instance);
 	return Instance;
-};
-const toCustomElement = (Component) => {
+}
+function toCustomElement(Component) {
 	return class extends HTMLElement {
 		static formAssociated = true;
 		component;
@@ -744,14 +757,14 @@ const toCustomElement = (Component) => {
 			return Object.keys(Component.$attributes ?? {});
 		}
 	};
-};
-const registerComponent = (component) => {
+}
+function registerComponent(component) {
 	if (isClient()) {
 		const previous = customElements.get(component.$name);
 		if (previous === void 0) customElements.define(component.$name, toCustomElement(component));
 	}
 	return component;
-};
+}
 function useEvent(scope, target, event, input, options) {
 	const controller = new AbortController();
 	target?.addEventListener(event, (event$1) => {
@@ -763,21 +776,31 @@ function useEvent(scope, target, event, input, options) {
 	});
 	scope.onStop(() => controller.abort());
 }
-const onMounted = (scope, event) => {
+function onMounted(scope, event) {
 	if (isClient()) {
 		const { host } = useHost(scope);
 		useEvent(scope, host, "mounted", event);
 	}
-};
-const startViewTransition = (invoke) => {
+}
+function startViewTransition(invoke) {
 	if (isClient() && document.startViewTransition !== void 0) return document.startViewTransition(invoke).updateCallbackDone;
 	return invoke();
-};
-const isClient = () => typeof window !== "undefined";
-const isServer = () => typeof window === "undefined";
-const preventDefault = (event) => event.preventDefault();
-const stopPropagation = (event) => event.stopPropagation();
-const stopImmediatePropagation = (event) => event.stopImmediatePropagation();
+}
+function isClient() {
+	return typeof window !== "undefined";
+}
+function isServer() {
+	return typeof window === "undefined";
+}
+function preventDefault(event) {
+	event.preventDefault();
+}
+function stopPropagation(event) {
+	event.stopPropagation();
+}
+function stopImmediatePropagation(event) {
+	event.stopImmediatePropagation();
+}
 const components = /* @__PURE__ */ new Map();
 const HOST_CONTEXT = defineContext("HOST_CONTEXT");
 
@@ -793,7 +816,7 @@ var AfterNavigateEvent = class extends Event {
 		super("afterNavigate");
 	}
 };
-const provideRouterContext = (scope, options) => {
+function provideRouterContext(scope, options) {
 	const url = createState();
 	const route = createState();
 	const radix = new Radix();
@@ -806,13 +829,16 @@ const provideRouterContext = (scope, options) => {
 		}
 	}
 	const fetch$1 = () => {
-		const { inputs } = useRoute(scope);
 		const { request } = useRuntime(scope);
-		url.value = new URL(request?.url ?? window?.location.href);
-		const match = radix.match(url.value.pathname);
-		inputs.value = match.inputs;
-		route.value = match.value;
-		navigator.dispatchEvent(new AfterNavigateEvent());
+		const { inputs } = useRoute(scope);
+		var next = new URL(request?.url ?? window?.location.href);
+		if (next.toString() !== url.value?.toString()) {
+			const match = radix.match(next.pathname);
+			url.value = next;
+			inputs.value = match.inputs;
+			route.value = match.value;
+			navigator.dispatchEvent(new AfterNavigateEvent());
+		}
 	};
 	if (isClient()) useEvent(scope, window, "popstate", () => navigator.dispatchEvent(new NavigateEvent()));
 	scope.setContext(ROUTE_CONTEXT, { inputs: createState() });
@@ -826,8 +852,8 @@ const provideRouterContext = (scope, options) => {
 	fetch$1();
 	useEvent(scope, navigator, "navigate", async () => await startViewTransition(fetch$1));
 	return useRouter(scope);
-};
-const useRouter = (scope, context) => {
+}
+function useRouter(scope, context) {
 	const { url, route, navigator } = scope.getContext(context ?? ROUTER_CONTEXT);
 	const navigate = (path) => {
 		if (isClient()) {
@@ -846,7 +872,7 @@ const useRouter = (scope, context) => {
 		navigate,
 		anchorNavigate
 	};
-};
+}
 const Page = defineComponent({
 	name: "x-page",
 	setup: ({ scope }) => {
@@ -858,7 +884,7 @@ const ROUTER_CONTEXT = defineContext("ROUTER_CONTEXT");
 
 //#endregion
 //#region src/locale/index.ts
-const provideLocaleContext = (scope, options) => {
+function provideLocaleContext(scope, options) {
 	const { inputs } = useRoute(scope);
 	const { navigator } = useRouter(scope);
 	const locale = createState(options.defaultLocale);
@@ -881,8 +907,8 @@ const provideLocaleContext = (scope, options) => {
 		options
 	});
 	return useLocale(scope);
-};
-const useLocale = (scope, context) => {
+}
+function useLocale(scope, context) {
 	const { locale, messages } = scope.getContext(context ?? LOCALE_CONTEXT);
 	const $ = (key) => {
 		return () => messages.value?.[key] ?? key;
@@ -897,8 +923,8 @@ const useLocale = (scope, context) => {
 		$,
 		date
 	};
-};
+}
 const LOCALE_CONTEXT = defineContext("LOCALE_CONTEXT");
 
 //#endregion
-export { $fetch, AfterNavigateEvent, CLIENT, Compute, HOST_CONTEXT, Handler, LOCALE_CONTEXT, MountedEvent, NavigateEvent, Page, ROUTER_CONTEXT, ROUTE_CONTEXT, RUNTIME_CONTEXT, Radix, SERVER, Scope, StopEvent, activeCompute, components, createApp, createCompute, createElement, createMemo, createRuntime, createState, defineComponent, defineContext, defineMiddleware, defineRoute, fileName, fromValue, hydrate, isClient, isComponent, isCustomElement, isRoute, isServer, isTemplate, mimeType, onMounted, preventDefault, provideLocaleContext, provideRouterContext, registerComponent, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, startViewTransition, stopImmediatePropagation, stopPropagation, targets, toArray, toCustomElement, toFragment, toPath, toRange, toString, untrack, useAsync, useCookies, useEvent, useHost, useLocale, useRequestUrl, useRoute, useRouter, useRuntime, useSetCookies };
+export { $fetch, AfterNavigateEvent, CLIENT, Compute, HOST_CONTEXT, Handler, LOCALE_CONTEXT, MountedEvent, NavigateEvent, Page, ROUTER_CONTEXT, ROUTE_CONTEXT, RUNTIME_CONTEXT, Radix, SERVER, Scope, StopEvent, activeCompute, components, createApp, createCompute, createElement, createMemo, createRuntime, createState, defineComponent, defineContext, defineMiddleware, defineRoute, fileName, fromValue, hydrate, isClient, isComponent, isCustomElement, isRoute, isServer, isTemplate, mergeObjects, mimeType, onMounted, preventDefault, provideLocaleContext, provideRouterContext, registerComponent, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, startViewTransition, stopImmediatePropagation, stopPropagation, targets, toArray, toCustomElement, toFragment, toPath, toRange, toString, untrack, useAsync, useCookies, useEvent, useFetch, useHost, useLocale, useRoute, useRouter, useRuntime, useSetCookies, useUrl };

package/dist/jsx/index.d.ts

@@ -1,4 +1,4 @@
-import { type EventListener, type Slot } from "../html";
+import { createElement, type EventListener, type Slot } from "../html";
 export type Fragment = {
     children: Array<Slot>;
 };
@@ -366,6 +366,6 @@ export declare namespace JSX {
     }
 }
 export declare const svgElements: Set<string>;
-export declare const namespace: (tag: string) => "http://www.w3.org/1999/xhtml" | "http://www.w3.org/2000/svg";
-export declare const h: <TEvents extends import("..").Events, TAttributes extends import("..").Attributes>(input: string | import("..").ComponentConstructor<TEvents, TAttributes>, attributes?: import("..").AttributeInput<TAttributes>, ...children: Array<Slot>) => Slot;
+export declare function namespace(tag: string): "http://www.w3.org/1999/xhtml" | "http://www.w3.org/2000/svg";
+export declare const h: typeof createElement;
 export declare const fragment: ({ children }: Fragment) => unknown[];

package/dist/jsx/index.js

@@ -10,22 +10,15 @@ const ROUTE_CONTEXT = defineContext("ROUTE_CONTEXT");
 
 //#endregion
 //#region src/html/index.ts
-const isComponent = (value) => {
+function isComponent(value) {
 	return !!value && typeof value === "function" && "$name" in value;
-};
-const createElement = (input, attributes, ...children) => {
-	if (isComponent(input)) {
-		const template = {
-			tag: input.$name,
-			attributes: attributes ?? {},
-			children
-		};
-		if (input.$styles.length) {
-			const classes = template.attributes["class"];
-			template.attributes["class"] = (classes ? [classes, ...input.$styles] : input.$styles).join(" ");
-		}
-		return template;
-	}
+}
+function createElement(input, attributes, ...children) {
+	if (isComponent(input)) return {
+		tag: input.$name,
+		attributes: attributes ?? {},
+		children
+	};
 	if (typeof input === "string") return {
 		tag: input,
 		attributes: attributes ?? {},
@@ -35,7 +28,7 @@ const createElement = (input, attributes, ...children) => {
 		...attributes,
 		children
 	});
-};
+}
 const HOST_CONTEXT = defineContext("HOST_CONTEXT");
 
 //#endregion
@@ -119,9 +112,9 @@ const svgElements = new Set([
 	"view",
 	"vkern"
 ]);
-const namespace = (tag) => {
+function namespace(tag) {
 	return svgElements.has(tag) ? "http://www.w3.org/2000/svg" : "http://www.w3.org/1999/xhtml";
-};
+}
 const h = createElement;
 const fragment = ({ children }) => children;
 

package/dist/locale/index.d.ts

@@ -9,13 +9,13 @@ export type LocaleContext = {
     messages: State<Record<string, string> | undefined>;
     options: LocaleOptions;
 };
-export declare const provideLocaleContext: (scope: Scope, options: LocaleOptions) => {
+export declare function provideLocaleContext(scope: Scope, options: LocaleOptions): {
     locale: State<string | undefined>;
     messages: State<Record<string, string> | undefined>;
     $: (key: string) => () => string | number | symbol;
     date: (date?: Date, options?: Intl.DateTimeFormatOptions) => string | undefined;
 };
-export declare const useLocale: <T extends LocaleContext>(scope: Scope, context?: Descriptor<T>) => {
+export declare function useLocale<T extends LocaleContext>(scope: Scope, context?: Descriptor<T>): {
     locale: State<string | undefined>;
     messages: State<Record<string, string> | undefined>;
     $: (key: keyof T["options"]["locales"][keyof T["options"]["locales"]]) => () => string | number | symbol;

package/dist/router/index.d.ts

@@ -17,14 +17,14 @@ export declare class NavigateEvent extends Event {
 export declare class AfterNavigateEvent extends Event {
     constructor();
 }
-export declare const provideRouterContext: (scope: Scope, options: RouterOptions) => {
+export declare function provideRouterContext(scope: Scope, options: RouterOptions): {
     url: State<URL | undefined>;
     route: State<unknown>;
     navigator: EventTarget;
     navigate: (path: string) => void;
     anchorNavigate: (event: Event) => void;
 };
-export declare const useRouter: <T extends RouterContext>(scope: Scope, context?: Descriptor<T>) => {
+export declare function useRouter<T extends RouterContext>(scope: Scope, context?: Descriptor<T>): {
     url: State<URL | undefined>;
     route: State<unknown>;
     navigator: EventTarget;

package/dist/runtime/index.d.ts

@@ -22,20 +22,26 @@ export type RouteContext = {
     inputs: State<Record<string, string>>;
 };
 export type AsyncOptions = {
-    catch?: (error: Error) => void | Promise<void>;
-};
-export declare const isRoute: <T>(value?: T) => value is Route & T;
-export declare const useRuntime: <T = Record<string, unknown>>(scope: Scope) => RuntimeContext<T>;
-export declare const useRoute: (scope: Scope) => RouteContext;
-export declare const defineRoute: (route: Route) => Route;
-export declare const defineMiddleware: (middleware: Middleware) => Middleware;
-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, options?: RequestInit) => Promise<T>;
-export declare const useAsync: <T>(scope: Scope, invoke: () => Promise<T>, options?: AsyncOptions) => {
+    catch?: (error: unknown) => void | Promise<void>;
+};
+export declare function isRoute<T>(value?: T): value is Route & T;
+export declare function useRuntime<T = Record<string, unknown>>(scope: Scope): RuntimeContext<T>;
+export declare function useRoute(scope: Scope): RouteContext;
+export declare function defineRoute(route: Route): Route;
+export declare function defineMiddleware(middleware: Middleware): Middleware;
+export declare function fileName(path: string): string | undefined;
+export declare function toPath(value: string): (string | undefined)[];
+export declare function $fetch<T>(scope: Scope, input: string | URL, options?: RequestInit): Promise<T>;
+export declare function useAsync<T>(scope: Scope, invoke: () => Promise<T>, options?: AsyncOptions): {
+    state: State<T | undefined>;
+    isLoading: State<boolean>;
+    execute: () => Promise<T | undefined>;
+};
+export declare function useFetch<T>(scope: Scope, input: string | URL, options?: RequestInit & AsyncOptions): {
     state: State<T | undefined>;
     isLoading: State<boolean>;
+    execute: () => Promise<T | undefined>;
 };
-export declare const createRuntime: () => Promise<Runtime>;
+export declare function createRuntime(): Promise<Runtime>;
 export declare const RUNTIME_CONTEXT: import("..").Descriptor<RuntimeContext<Record<string, unknown>>>;
 export declare const ROUTE_CONTEXT: import("..").Descriptor<RouteContext>;

package/dist/signals/index.d.ts

@@ -33,6 +33,7 @@ export declare function createCompute<T>(scope: Scope, invoke: (scope: Scope) =>
 export declare function createMemo<T>(scope: Scope, invoke: (scope: Scope) => T): State<T>;
 export declare function fromValue<T>(value: Value<T>): T;
 export declare function untrack<T>(invoke: () => T): T;
+export declare function mergeObjects<TBase, TInput>(base: TBase, input: TInput): TBase & TInput;
 export declare function defineContext<T>(key: string): Descriptor<T>;
 export declare let activeCompute: Compute | undefined;
 export declare const targets: WeakMap<object, Map<string | symbol, Set<Compute<void>>>>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.0.67",
+    "version": "0.0.69",
     "type": "module",
     "repository": "coverbase/revojs",
     "license": "MIT",
@@ -32,15 +32,12 @@
         "build": "rolldown -c rolldown.config.ts && tsc",
         "watch": "rolldown -w -c rolldown.config.ts && tsc --watch"
     },
-    "dependencies": {
-        "defu": "^6.1.4"
-    },
     "optionalDependencies": {
         "@rolldown/binding-linux-x64-gnu": "*"
     },
     "devDependencies": {
-        "@revojs/tsconfig": "*",
         "@revojs/rolldown": "*",
+        "@revojs/tsconfig": "*",
         "@types/bun": "^1.2.17",
         "rolldown": "^1.0.0-beta.19"
     }