revojs 0.0.66 → 0.0.68

package/dist/html/index.d.ts

@@ -76,7 +76,7 @@ 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 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 const toString: (slot: Slot) => string;
 export declare const toArray: (hydration: Hydration) => Array<Node>;
 export declare const toRange: (hydration: Hydration) => Range;

package/dist/index.js

@@ -1,9 +1,134 @@
-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) => {
 	return {
-		config: defu(config, {
+		config: mergeObjects(config, {
 			client: { entry: "./index.html" },
 			server: { entry: "revojs/presets/node" },
 			dev: { middleware: [] }
@@ -256,122 +381,6 @@ 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) => {
@@ -421,17 +430,29 @@ const $fetch = async (scope, input, options) => {
 		default: return response;
 	}
 };
-const useAsync = (scope, invoke) => {
+const useAsync = (scope, invoke, options) => {
 	const { tasks } = useRuntime(scope);
 	const state = createState();
 	const isLoading = createState(true);
-	const task = invoke().then((value) => state.value = value).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 useFetch = (scope, input, options) => {
+	return useAsync(scope, async () => await $fetch(scope, input, options), options);
+};
 const createRuntime = async () => {
 	const radix = new Radix();
 	const middlewares = new Array();
@@ -901,4 +922,4 @@ const useLocale = (scope, context) => {
 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, useRequestUrl, useRoute, useRouter, useRuntime, useSetCookies };

package/dist/jsx/index.d.ts

@@ -367,5 +367,5 @@ 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 const h: <TEvents extends import("..").Events, TAttributes extends import("..").Attributes>(input: string | ((attributes: import("..").AttributeInput<import("..").Attributes>) => Slot) | import("..").ComponentConstructor<TEvents, TAttributes>, attributes?: import("..").AttributeInput<TAttributes>, ...children: Array<Slot>) => Slot;
 export declare const fragment: ({ children }: Fragment) => unknown[];

package/dist/runtime/index.d.ts

@@ -21,6 +21,9 @@ export type RuntimeContext<T = Record<string, unknown>> = {
 export type RouteContext = {
     inputs: State<Record<string, string>>;
 };
+export type AsyncOptions = {
+    catch?: (error: unknown) => 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;
@@ -29,9 +32,15 @@ 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>) => {
+export declare const useAsync: <T>(scope: Scope, invoke: () => Promise<T>, options?: AsyncOptions) => {
+    state: State<T | undefined>;
+    isLoading: State<boolean>;
+    execute: () => Promise<T | undefined>;
+};
+export declare const 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 const RUNTIME_CONTEXT: import("..").Descriptor<RuntimeContext<Record<string, unknown>>>;

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.66",
+    "version": "0.0.68",
     "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"
     }