@alepha/react 0.13.2 → 0.13.4

package/dist/core/index.d.ts

@@ -1192,6 +1192,7 @@ interface ReactRouterState {
    * Optional meta information associated with the current page.
    */
   meta: Record<string, any>;
+  name?: string;
 }
 interface RouterStackItem {
   route: PageRoute;
@@ -2297,6 +2298,35 @@ declare class ReactRouter<T$1 extends object> {
   isActive(href: string, options?: {
     startWith?: boolean;
   }): boolean;
+  node(name: keyof VirtualRouter<T$1> | string, config?: {
+    params?: Record<string, any>;
+    query?: Record<string, any>;
+  }): {
+    label: any;
+    href: string;
+    children: undefined;
+    type: "page";
+    name: string;
+    parent?: PageRoute;
+    match: string;
+    path?: string | undefined;
+    schema?: PageConfigSchema | undefined;
+    resolve?: ((context: PageResolve<PageConfigSchema, TPropsParentDefault>) => any) | undefined;
+    component?: react0.FC<any> | undefined;
+    lazy?: (() => Promise<{
+      default: react0.FC<any>;
+    }>) | undefined;
+    can?: (() => boolean) | undefined;
+    errorHandler?: ErrorHandler | undefined;
+    static?: boolean | {
+      entries?: Partial<PageRequestConfig<PageConfigSchema>>[] | undefined;
+    } | undefined;
+    cache?: ServerRouteCache | undefined;
+    client?: (boolean | ClientOnlyProps) | undefined;
+    onServerResponse?: ((request: ServerRequest) => unknown) | undefined;
+    onLeave?: (() => void) | undefined;
+    animation?: PageAnimation | undefined;
+  };
   path(name: keyof VirtualRouter<T$1> | string, config?: {
     params?: Record<string, any>;
     query?: Record<string, any>;

package/dist/core/index.js

@@ -487,7 +487,8 @@ const NestedView = (props) => {
 	useEvents({
 		"react:transition:begin": async ({ previous, state: state$1 }) => {
 			const layer = previous.layers[index];
-			if (`${state$1.url.pathname}/`.startsWith(`${layer?.path}/`)) return;
+			if (!layer) return;
+			if (`${state$1.url.pathname}/`.startsWith(`${layer.path}/`)) return;
 			const animationExit = parseAnimation(layer.route?.animation, state$1, "exit");
 			if (animationExit) {
 				const duration = animationExit.duration || 200;
@@ -579,25 +580,35 @@ function parseAnimation(animationLike, state, type = "enter") {
 //#endregion
 //#region src/core/components/NotFound.tsx
 function NotFoundPage(props) {
-	return /* @__PURE__ */ jsx("div", {
+	return /* @__PURE__ */ jsxs("div", {
 		style: {
-			height: "100vh",
+			width: "100%",
+			minHeight: "90vh",
+			boxSizing: "border-box",
 			display: "flex",
 			flexDirection: "column",
 			justifyContent: "center",
 			alignItems: "center",
 			textAlign: "center",
-			fontFamily: "sans-serif",
-			padding: "1rem",
+			fontFamily: "system-ui, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, sans-serif",
+			padding: "2rem",
 			...props.style
 		},
-		children: /* @__PURE__ */ jsx("h1", {
+		children: [/* @__PURE__ */ jsx("div", {
 			style: {
-				fontSize: "1rem",
-				marginBottom: "0.5rem"
+				fontSize: "6rem",
+				fontWeight: 200,
+				lineHeight: 1
 			},
-			children: "404 - This page does not exist"
-		})
+			children: "404"
+		}), /* @__PURE__ */ jsx("div", {
+			style: {
+				fontSize: "0.875rem",
+				marginTop: "1rem",
+				opacity: .6
+			},
+			children: "Page not found"
+		})]
 	});
 }
 
@@ -1012,8 +1023,7 @@ var ReactServerProvider = class {
 	async registerPages(templateLoader) {
 		const template = await templateLoader();
 		if (template) this.preprocessedTemplate = this.preprocessTemplate(template);
-		for (const page of this.pageApi.getPages()) {
-			if (page.children?.length) continue;
+		for (const page of this.pageApi.getPages()) if (page.component || page.lazy) {
 			this.log.debug(`+ ${page.match} -> ${page.name}`);
 			this.serverRouterProvider.createRoute({
 				...page,
@@ -1110,6 +1120,7 @@ var ReactServerProvider = class {
 				onError: () => null,
 				layers: []
 			};
+			state.name = route.name;
 			if (this.alepha.has(ServerLinksProvider)) this.alepha.store.set("alepha.server.request.apiLinks", await this.alepha.inject(ServerLinksProvider).getUserApiLinks({
 				user: serverRequest.user,
 				authorization: serverRequest.headers.authorization
@@ -1117,6 +1128,7 @@ var ReactServerProvider = class {
 			let target = route;
 			while (target) {
 				if (route.can && !route.can()) {
+					this.log.warn(`Access to page '${route.name}' is forbidden by can() check`);
 					reply.status = 403;
 					reply.headers["content-type"] = "text/plain";
 					return "Forbidden";
@@ -1130,7 +1142,10 @@ var ReactServerProvider = class {
 			this.serverTimingProvider.beginTiming("createLayers");
 			const { redirect } = await this.pageApi.createLayers(route, state);
 			this.serverTimingProvider.endTiming("createLayers");
-			if (redirect) return reply.redirect(redirect);
+			if (redirect) {
+				this.log.debug("Resolver resulted in redirection", { redirect });
+				return reply.redirect(redirect);
+			}
 			reply.headers["content-type"] = "text/html";
 			reply.headers["cache-control"] = "no-store, no-cache, must-revalidate, proxy-revalidate";
 			reply.headers.pragma = "no-cache";
@@ -1138,8 +1153,10 @@ var ReactServerProvider = class {
 			const html = this.renderToHtml(template, state);
 			if (html instanceof Redirection) {
 				reply.redirect(typeof html.redirect === "string" ? html.redirect : this.pageApi.href(html.redirect));
+				this.log.debug("Rendering resulted in redirection", { redirect: html.redirect });
 				return;
 			}
+			this.log.trace("Page rendered to HTML successfully");
 			const event = {
 				request: serverRequest,
 				state,
@@ -1292,6 +1309,7 @@ var ReactBrowserRouterProvider = class extends RouterProvider {
 			const { route, params } = this.match(pathname);
 			const query = {};
 			if (search) for (const [key, value] of new URLSearchParams(search).entries()) query[key] = String(value);
+			state.name = route?.page.name;
 			state.query = query;
 			state.params = params ?? {};
 			if (isPageRoute(route)) {
@@ -1524,6 +1542,15 @@ var ReactRouter = class {
 		if (options.startWith && !isActive) isActive = current.startsWith(href);
 		return isActive;
 	}
+	node(name, config = {}) {
+		const page = this.pageApi.page(name);
+		return {
+			...page,
+			label: page.label ?? page.name,
+			href: this.path(name, config),
+			children: void 0
+		};
+	}
 	path(name, config = {}) {
 		return this.pageApi.pathname(name, {
 			params: {