revojs 0.0.54 → 0.0.56

package/dist/index.js

@@ -163,7 +163,7 @@ var Handler = class Handler {
 		}
 		const value = Reflect.get(target, key);
 		if (value) {
-			if (typeof value === "function") return value.bind(target);
+			if (typeof value === "function" && !value.prototype) return value.bind(target);
 			if (typeof value === "object") return new Proxy(value, new Handler());
 		}
 		return value;
@@ -386,10 +386,10 @@ const defineComponent = (options) => {
 const toCustomElement = (Component) => {
 	return class extends HTMLElement {
 		static formAssociated = true;
-		component;
-		internals;
-		constructor() {
-			super();
+		component = new Component();
+		internals = this.attachInternals();
+		async connectedCallback() {
+			let rootNode = this;
 			const findParent = (node) => {
 				if (node) {
 					if ("component" in node) return node;
@@ -397,11 +397,8 @@ const toCustomElement = (Component) => {
 					return findParent(node.parentNode);
 				}
 			};
-			this.component = new Component(void 0, findParent(this.parentNode)?.component.scope);
-			this.internals = this.attachInternals();
-		}
-		async connectedCallback() {
-			let rootNode = this;
+			const parentNode = findParent(this.parentNode);
+			if (parentNode) this.component.scope.parentScope = parentNode.component.scope;
 			if (this.component.shadowRoot) rootNode = this.shadowRoot ?? this.attachShadow(this.component.shadowRoot);
 			for (const [name, event] of Object.entries(Component.$events)) Reflect.set(this.component.events, name, (value) => {
 				if (value instanceof Event) return;
@@ -752,15 +749,15 @@ const createRouter = (options) => {
 	}
 	const registerRouterContext = async (scope) => {
 		const fetch$1 = async () => {
+			const { inputs } = useRoute(scope);
 			const { request } = useRuntime(scope);
 			url.value = new URL(request?.url ?? window?.location.href);
 			const match = radix.match(url.value.pathname);
-			scope.setContext(ROUTE_CONTEXT, { inputs: createState(match.inputs) });
-			const Page$1 = await match.value?.();
-			if (Page$1) route.value = /* @__PURE__ */ h(Page$1, null);
+			inputs.value = match.inputs;
+			route.value = await match.value?.();
 		};
 		if (isClient()) useEvent(scope, window, "popstate", () => navigator.dispatchEvent(new NavigateEvent()));
-		await fetch$1().then(() => useEvent(scope, navigator, "navigate", fetch$1));
+		scope.setContext(ROUTE_CONTEXT, { inputs: createState() });
 		scope.setContext(ROUTER_CONTEXT, {
 			options,
 			navigator,
@@ -768,6 +765,7 @@ const createRouter = (options) => {
 			radix,
 			route
 		});
+		await fetch$1().then(() => useEvent(scope, navigator, "navigate", fetch$1));
 		return useRouter(scope);
 	};
 	return {
@@ -799,7 +797,10 @@ const Page = defineComponent({
 	name: "x-page",
 	setup: ({ scope }) => {
 		const { route } = useRouter(scope);
-		return () => route.value;
+		return () => {
+			const Page$1 = route.value;
+			if (Page$1) return /* @__PURE__ */ h(Page$1, null);
+		};
 	}
 });
 
@@ -840,13 +841,9 @@ const useLocale = (scope, context) => {
 	const $ = (key) => {
 		return () => messages.value?.[key] ?? key;
 	};
-	const prefix = (input) => {
-		return () => `/${locale.value}` + (input ?? "");
-	};
 	return {
 		locale,
 		messages,
-		prefix,
 		$
 	};
 };

package/dist/locale/index.d.ts

@@ -16,13 +16,11 @@ export declare const createLocale: <T extends LocaleOptions>(options: T) => {
     registerLocaleContext: (scope: Scope) => Promise<{
         locale: State<string | undefined>;
         messages: State<Record<string, string> | undefined>;
-        prefix: (input?: string) => () => string;
         $: (key: never) => () => string | number | symbol;
     }>;
 };
 export declare const useLocale: <T extends LocaleContext>(scope: Scope, context?: Descriptor<T>) => {
     locale: State<string | undefined>;
     messages: State<Record<string, string> | undefined>;
-    prefix: (input?: string) => () => string;
     $: (key: keyof T["options"]["locales"][keyof T["options"]["locales"]]) => () => string | number | symbol;
 };

package/dist/router/index.d.ts

@@ -1,4 +1,4 @@
-import { type Attributes, type ComponentConstructor, type Events, type Slot } from "../html";
+import { type Attributes, type ComponentConstructor, type Events } from "../html";
 import { Radix } from "../radix";
 import { type Descriptor, Scope, type State } from "../signals";
 export type Routes = Record<string, () => Promise<ComponentConstructor<Events, Attributes>>>;
@@ -10,7 +10,7 @@ export type RouterContext<T extends RouterOptions = RouterOptions> = {
     navigator: EventTarget;
     url: State<URL | undefined>;
     radix: Radix<() => Promise<ComponentConstructor<Events, Attributes>>>;
-    route: State<Slot | undefined>;
+    route: State<ComponentConstructor<Events, Attributes> | undefined>;
 };
 export declare class NavigateEvent extends Event {
     constructor();
@@ -20,7 +20,7 @@ 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>;
+        route: State<ComponentConstructor<Events, Attributes> | undefined>;
         navigator: EventTarget;
         navigate: (path: string) => void;
         anchorNavigate: (event: Event) => void;
@@ -28,7 +28,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>;
+    route: State<ComponentConstructor<Events, Attributes> | undefined>;
     navigator: EventTarget;
     navigate: (path: string) => void;
     anchorNavigate: (event: Event) => void;

package/dist/signals/index.d.ts

@@ -10,7 +10,7 @@ export declare class StopEvent extends Event {
     constructor();
 }
 export declare class Scope extends EventTarget {
-    readonly parentScope?: Scope;
+    parentScope?: Scope;
     readonly context: Map<string, unknown>;
     constructor(parentScope?: Scope);
     getContext<T>(input: Descriptor<T>): T;

package/package.json

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