revojs 0.0.24 → 0.0.25

package/dist/html/index.d.ts

@@ -67,7 +67,7 @@ export interface CustomElementConstructor<TEvents extends Events, TAttributes ex
     new (): CustomElement<TEvents, TAttributes>;
 }
 export declare class MountedEvent extends Event {
-    constructor(event?: EventInit);
+    constructor();
 }
 export declare const isTemplate: (value: object) => value is Template;
 export declare const createElement: <TEvents extends Events, TAttributes extends Attributes>(input: string | ComponentConstructor<TEvents, TAttributes>, attributes?: AttributeInput<TAttributes>, ...children: Array<Slot>) => Slot;
@@ -79,14 +79,15 @@ export declare const defineComponent: <TEvents extends Events = {}, 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 const getGlobalStyles: () => CSSStyleSheet[];
-export declare const useEvent: (scope: Scope, target: EventTarget | undefined, event: string, input: EventListener<Event>, options?: AddEventListenerOptions) => number;
+export declare function useEvent<T extends keyof ElementEventMap>(scope: Scope, target: EventTarget | undefined, event: T, input: EventListener<ElementEventMap[T]>, options?: AddEventListenerOptions): void;
+export declare function useEvent<T extends keyof WindowEventMap>(scope: Scope, target: Window | undefined, event: T, input: EventListener<WindowEventMap[T]>, options?: AddEventListenerOptions): void;
+export declare function useEvent<T extends keyof HTMLElementEventMap>(scope: Scope, target: HTMLElement | undefined, event: T, input: EventListener<HTMLElementEventMap[T]>, options?: AddEventListenerOptions): void;
 export declare const getCustomElement: (node: Node | null) => CustomElement<Events, Attributes> | undefined;
 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 const MOUNTED_HOOK: Descriptor<HTMLElement>;
 export declare const components: Map<string, ComponentConstructor<Events, Attributes>>;
 declare global {
     interface HTMLElementEventMap {

package/dist/index.js

@@ -107,29 +107,20 @@ const namespace = (tag) => {
 
 //#endregion
 //#region src/signals/index.ts
-var Hooks = class {
-	hooks;
+var StopEvent = class extends Event {
 	constructor() {
-		this.hooks = new Map();
-	}
-	on(scope, input, invoke) {
-		const invokes = this.hooks.get(input) ?? new Set();
-		invokes.add(invoke);
-		this.hooks.set(input, invokes);
-		return scope.dispose.push(() => invokes.delete(invoke));
-	}
-	dispatch(input, value) {
-		const invokes = this.hooks.get(input);
-		if (invokes) for (const invoke of invokes) invoke(value);
+		super("stop");
 	}
 };
-var Scope = class {
-	dispose;
+var Scope = class extends EventTarget {
 	constructor() {
-		this.dispose = new Array();
+		super();
+	}
+	onStop(input) {
+		this.addEventListener("stop", input, { once: true });
 	}
 	stop() {
-		while (this.dispose.length) this.dispose.pop()?.(this);
+		return this.dispatchEvent(new StopEvent());
 	}
 };
 var Compute = class extends Scope {
@@ -153,7 +144,7 @@ var Handler = class Handler {
 			const set = computes.get(key) ?? new Set();
 			computes.set(key, set.add(compute));
 			targets.set(target, computes);
-			compute.scope.dispose.push(() => {
+			compute.scope.onStop(() => {
 				compute.stop();
 				set.delete(compute);
 			});
@@ -197,9 +188,6 @@ function fromValue(value) {
 	if (value instanceof Function) return fromValue(value());
 	return value;
 }
-function defineHook(key) {
-	return key;
-}
 function defineContext(key) {
 	return key;
 }
@@ -209,8 +197,8 @@ const targets = new WeakMap();
 //#endregion
 //#region src/html/index.ts
 var MountedEvent = class extends Event {
-	constructor(event) {
-		super("mounted", event);
+	constructor() {
+		super("mounted");
 	}
 };
 const isTemplate = (value) => {
@@ -325,8 +313,10 @@ const renderToNode = async (scope, slot) => {
 				const element = document.createElementNS(namespace(slot.tag), slot.tag);
 				for (const name in slot.attributes) {
 					const value = slot.attributes[name];
-					if (name.startsWith("on")) useEvent(scope, element, name.substring(2).toLowerCase(), value);
-					else createCompute(scope, () => {
+					if (name.startsWith("on")) {
+						const event = name.substring(2).toLowerCase();
+						useEvent(scope, element, event, value);
+					} else createCompute(scope, () => {
 						const set = toString(value);
 						if (set === "" || set === "false") return element.removeAttribute(name);
 						return element.setAttribute(name, set);
@@ -442,7 +432,7 @@ const getGlobalStyles = () => {
 		return sheet;
 	});
 };
-const useEvent = (scope, target, event, input, options) => {
+function useEvent(scope, target, event, input, options) {
 	const controller = new AbortController();
 	target?.addEventListener(event, (event$1) => {
 		if (Array.isArray(input)) for (const target$1 of input) target$1?.(event$1);
@@ -451,8 +441,8 @@ const useEvent = (scope, target, event, input, options) => {
 		signal: controller.signal,
 		...options
 	});
-	return scope.dispose.push(() => controller.abort());
-};
+	scope.onStop(() => controller.abort());
+}
 const getCustomElement = (node) => {
 	if (node) {
 		if ("component" in node) return node;
@@ -464,7 +454,6 @@ const isServer = () => typeof window === "undefined";
 const preventDefault = (event) => event.preventDefault();
 const stopPropagation = (event) => event.stopPropagation();
 const stopImmediatePropagation = (event) => event.stopImmediatePropagation();
-const MOUNTED_HOOK = defineHook("MOUNTED_HOOK");
 const components = new Map();
 
 //#endregion
@@ -766,11 +755,7 @@ const Outlet = defineComponent({
 			if (name) radix.insert(name, routes[path]);
 		}
 		const url = createState(new URL(event ? event.request.url : window.location.href));
-		if (isClient()) {
-			const controller = new AbortController();
-			window.addEventListener("popstate", () => url.value = new URL(window.location.href), { signal: controller.signal });
-			scope.dispose.push(() => controller.abort());
-		}
+		if (isClient()) useEvent(scope, window, "popstate", () => url.value = new URL(window.location.href));
 		return async () => {
 			const { value, inputs } = radix.match(url.value.pathname);
 			const Page = await value?.();
@@ -791,4 +776,4 @@ const anchorNavigate = (event) => {
 };
 
 //#endregion
-export { $fetch, Compute, Handler, Hooks, MOUNTED_HOOK, MountedEvent, Outlet, RUNTIME_CONTEXT, Radix, Scope, activeCompute, anchorNavigate, components, createApp, createCompute, createElement, createEvent, createMemo, createRuntime, createState, defineComponent, defineContext, defineHook, defineRoute, fileName, fromValue, getAssets, getCookies, getCustomElement, getGlobalStyles, getMimeType, getRequestUrl, getRoutes, getSetCookies, getVariables, isClient, isServer, isTemplate, markdownToSlot, navigate, preventDefault, registerComponent, renderToNode, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, stopImmediatePropagation, stopPropagation, targets, toCustomElement, toFragment, toPath, toString, useEvent };
+export { $fetch, Compute, Handler, MountedEvent, Outlet, RUNTIME_CONTEXT, Radix, Scope, StopEvent, activeCompute, anchorNavigate, components, createApp, createCompute, createElement, createEvent, createMemo, createRuntime, createState, defineComponent, defineContext, defineRoute, fileName, fromValue, getAssets, getCookies, getCustomElement, getGlobalStyles, getMimeType, getRequestUrl, getRoutes, getSetCookies, getVariables, isClient, isServer, isTemplate, markdownToSlot, navigate, preventDefault, registerComponent, renderToNode, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, stopImmediatePropagation, stopPropagation, targets, toCustomElement, toFragment, toPath, toString, useEvent };

package/dist/jsx/index.js

@@ -1,10 +1,4 @@
 
-//#region src/signals/index.ts
-function defineHook(key) {
-	return key;
-}
-
-//#endregion
 //#region src/html/index.ts
 const createElement = (input, attributes, ...children) => {
 	return {
@@ -13,7 +7,6 @@ const createElement = (input, attributes, ...children) => {
 		children
 	};
 };
-const MOUNTED_HOOK = defineHook("MOUNTED_HOOK");
 
 //#endregion
 //#region src/jsx/index.ts

package/dist/signals/index.d.ts

@@ -6,16 +6,13 @@ export type Descriptor<T> = string & {
 export interface State<T> {
     value: T;
 }
-export declare class Hooks {
-    readonly hooks: Map<string, Set<(value: any) => unknown>>;
+export declare class StopEvent extends Event {
     constructor();
-    on<T>(scope: Scope, input: Descriptor<T>, invoke: (value: T) => unknown): number;
-    dispatch<T>(input: Descriptor<T>, value: T): void;
 }
-export declare class Scope {
-    readonly dispose: Array<(scope: Scope) => void>;
+export declare class Scope extends EventTarget {
     constructor();
-    stop(): void;
+    onStop(input: (event: StopEvent) => void): void;
+    stop(): boolean;
 }
 export declare class Compute<T = void> extends Scope {
     readonly scope: Scope;
@@ -32,8 +29,12 @@ export declare function createState<T>(value: T): State<T>;
 export declare function createCompute<T>(scope: Scope, invoke: (scope: Scope) => T): T;
 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 defineHook<T>(key: string): Descriptor<T>;
 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>>>>;
+declare global {
+    interface ElementEventMap {
+        stop: StopEvent;
+    }
+}
 export {};

package/package.json

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