@kuckit/app-web 2.0.7 → 3.0.0

package/dist/index.d.ts

@@ -2,13 +2,14 @@ import * as react0 from "react";
 import { ComponentType, ReactNode } from "react";
 import * as _tanstack_react_query0 from "@tanstack/react-query";
 import { QueryClient } from "@tanstack/react-query";
-import { RouteComponent } from "@tanstack/react-router";
+import { AnyRoute, RouteComponent } from "@tanstack/react-router";
 import { ClientModuleSpec, ClientModuleSpec as ClientModuleSpec$1, NavItem, NavRegistry, RouteDefinition, RouteRegistry, SlotRegistry } from "@kuckit/sdk-react";
 import * as _orpc_client0 from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import * as better_auth_react0 from "better-auth/react";
 import { createAuthClient } from "better-auth/react";
+import * as react_jsx_runtime0 from "react/jsx-runtime";
 import * as better_auth0 from "better-auth";
 import { AppRouterClient as AppRouterClient$1 } from "@kuckit/api/routers/index";
 
@@ -765,4 +766,47 @@ declare function createORPCUtils(client: AppRouterClient$1): ORPCUtils;
 declare function createAuthClientService(serverUrl: string): any;
 declare function createKuckitWebServices(options?: CreateServicesOptions): KuckitWebServices;
 //#endregion
-export { type AuthClient, type ClientModuleSpec, type CreateKuckitWebProviderOptions, type CreateServicesOptions, type KuckitWebConfig, type KuckitWebContext, type KuckitWebProviderProps, type KuckitWebRouterProps, type KuckitWebServices, type ModuleRoute, type NavItem, type ORPCUtils, type RouteDefinition, createAuthClientService, createKuckitWebProvider, createKuckitWebServices, createORPCUtils, createQueryClient, createRPCClient, createRPCLink, useAuth, useKuckitWeb, useOrpc, useQueryClient, useRpc, useServices, withKuckitWeb };
+//#region src/router.d.ts
+/**
+ * Context type for TanStack Router integration with Kuckit.
+ * This is passed via router context to enable oRPC access in route loaders.
+ */
+interface KuckitRouterContext {
+  orpc: ORPCUtils;
+  queryClient: QueryClient;
+  authClient: AuthClient;
+}
+/**
+ * Build TanStack Router routes from a RouteRegistry
+ *
+ * This function converts module-registered routes into TanStack Router
+ * route objects that can be added to the route tree.
+ *
+ * @param routeRegistry - Registry containing module routes
+ * @param rootRoute - The root route to attach module routes to
+ * @returns Array of TanStack route objects
+ */
+declare function buildModuleRoutes(routeRegistry: RouteRegistry, rootRoute: AnyRoute): AnyRoute[];
+/**
+ * Merge static routes with module routes
+ *
+ * This is used to combine the codegen route tree with dynamic module routes.
+ */
+declare function mergeRouteTrees<TStaticRoutes extends object>(staticRouteTree: TStaticRoutes, _moduleRoutes: AnyRoute[]): TStaticRoutes;
+//#endregion
+//#region src/components/KuckitModuleRoute.d.ts
+/**
+ * Dynamic route renderer for Kuckit module routes.
+ *
+ * This component looks up the current path in the RouteRegistry
+ * and renders the corresponding module component if found.
+ *
+ * Route resolution is context-aware:
+ * - When rendered under /dashboard/*: matches dashboard routes
+ * - When rendered at root level: matches root-level routes (paths starting with '/' but not '/dashboard/')
+ *
+ * For root routes with meta.requiresAuth: true, redirects to /login if not authenticated.
+ */
+declare function KuckitModuleRoute(): react_jsx_runtime0.JSX.Element | null;
+//#endregion
+export { type AuthClient, type ClientModuleSpec, type CreateKuckitWebProviderOptions, type CreateServicesOptions, KuckitModuleRoute, type KuckitRouterContext, type KuckitWebConfig, type KuckitWebContext, type KuckitWebProviderProps, type KuckitWebRouterProps, type KuckitWebServices, type ModuleRoute, type NavItem, type ORPCUtils, type RouteDefinition, buildModuleRoutes, createAuthClientService, createKuckitWebProvider, createKuckitWebServices, createORPCUtils, createQueryClient, createRPCClient, createRPCLink, mergeRouteTrees, useAuth, useKuckitWeb, useOrpc, useQueryClient, useRpc, useServices, withKuckitWeb };

package/dist/index.js

@@ -1,12 +1,13 @@
 import { createContext, createElement, useContext, useEffect, useMemo, useState } from "react";
 import { QueryCache, QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { RouterProvider, createRoute, createRouter } from "@tanstack/react-router";
+import { Link, RouterProvider, createRoute, createRouter, useNavigate, useRouterState } from "@tanstack/react-router";
 import { KuckitNavProvider, KuckitRpcProvider, KuckitSlotProvider, loadKuckitClientModules } from "@kuckit/sdk-react";
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
 import { createAuthClient } from "better-auth/react";
 import { inferAdditionalFields } from "better-auth/client/plugins";
+import { jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/services.ts
 function createQueryClient(onError) {
@@ -158,7 +159,8 @@ function InternalKuckitWebProvider({ config, routeTree, rootRoute, children }) {
 			defaultPendingComponent: Loader,
 			context: {
 				orpc: services.orpc,
-				queryClient: services.queryClient
+				queryClient: services.queryClient,
+				authClient: services.authClient
 			}
 		});
 	}, [
@@ -207,4 +209,158 @@ function withKuckitWeb(Component, options) {
 }
 
 //#endregion
-export { createAuthClientService, createKuckitWebProvider, createKuckitWebServices, createORPCUtils, createQueryClient, createRPCClient, createRPCLink, useAuth, useKuckitWeb, useOrpc, useQueryClient, useRpc, useServices, withKuckitWeb };
+//#region src/router.ts
+/**
+* Build TanStack Router routes from a RouteRegistry
+*
+* This function converts module-registered routes into TanStack Router
+* route objects that can be added to the route tree.
+*
+* @param routeRegistry - Registry containing module routes
+* @param rootRoute - The root route to attach module routes to
+* @returns Array of TanStack route objects
+*/
+function buildModuleRoutes(routeRegistry, rootRoute) {
+	const routes = routeRegistry.getAll();
+	const routeMap = /* @__PURE__ */ new Map();
+	for (const routeDef of routes) {
+		const route = createModuleRoute(routeDef, rootRoute);
+		routeMap.set(routeDef.id, route);
+	}
+	return routes.filter((r) => !r.parentRouteId || r.parentRouteId === "__root__").map((r) => routeMap.get(r.id)).filter(Boolean);
+}
+/**
+* Create a single TanStack route from a RouteDefinition
+*/
+function createModuleRoute(routeDef, parentRoute) {
+	return createRoute({
+		getParentRoute: () => parentRoute,
+		path: routeDef.path,
+		component: routeDef.component,
+		...routeDef.meta?.title && { head: () => ({ meta: [{ title: routeDef.meta.title }] }) }
+	});
+}
+/**
+* Merge static routes with module routes
+*
+* This is used to combine the codegen route tree with dynamic module routes.
+*/
+function mergeRouteTrees(staticRouteTree, _moduleRoutes) {
+	return staticRouteTree;
+}
+
+//#endregion
+//#region src/components/KuckitModuleRoute.tsx
+/**
+* Helper to determine if a route path is a root-level route (outside dashboard).
+* Root routes start with '/' but NOT '/dashboard'.
+*/
+function isRootLevelRoute(path) {
+	return path.startsWith("/") && !path.startsWith("/dashboard");
+}
+/**
+* Dynamic route renderer for Kuckit module routes.
+*
+* This component looks up the current path in the RouteRegistry
+* and renders the corresponding module component if found.
+*
+* Route resolution is context-aware:
+* - When rendered under /dashboard/*: matches dashboard routes
+* - When rendered at root level: matches root-level routes (paths starting with '/' but not '/dashboard/')
+*
+* For root routes with meta.requiresAuth: true, redirects to /login if not authenticated.
+*/
+function KuckitModuleRoute() {
+	const { routeRegistry } = useKuckitWeb();
+	const authClient = useAuth();
+	const { location } = useRouterState();
+	const navigate = useNavigate();
+	const pathname = location.pathname;
+	const [authChecked, setAuthChecked] = useState(false);
+	const [isAuthenticated, setIsAuthenticated] = useState(false);
+	const isDashboardContext = pathname.startsWith("/dashboard");
+	const contextRoutes = routeRegistry.getAll().filter((r) => {
+		const isRoot = isRootLevelRoute(r.path);
+		return isDashboardContext ? !isRoot : isRoot;
+	});
+	const modulePathname = isDashboardContext ? pathname.replace("/dashboard", "") || "/" : pathname;
+	function matchRoute(routePath, pathname$1) {
+		if (routePath === pathname$1) return true;
+		if (routePath.endsWith("/$")) {
+			const base = routePath.slice(0, -1);
+			return pathname$1.startsWith(base);
+		}
+		return false;
+	}
+	const exactMatch = contextRoutes.find((r) => r.path === pathname);
+	const catchAllMatch = contextRoutes.find((r) => r.path.endsWith("/$") && matchRoute(r.path, pathname));
+	let routeDef = exactMatch || catchAllMatch;
+	if (!routeDef && isDashboardContext) {
+		const exactDash = contextRoutes.find((r) => r.path === modulePathname);
+		const catchAllDash = contextRoutes.find((r) => r.path.endsWith("/$") && matchRoute(r.path, modulePathname));
+		routeDef = exactDash || catchAllDash;
+	}
+	useEffect(() => {
+		async function checkAuth() {
+			if (!routeDef) {
+				setAuthChecked(true);
+				return;
+			}
+			if (isDashboardContext) {
+				setAuthChecked(true);
+				setIsAuthenticated(true);
+				return;
+			}
+			if (routeDef.meta?.requiresAuth) {
+				if (!(await authClient.getSession()).data) {
+					navigate({
+						to: "/login",
+						search: { redirect: pathname }
+					});
+					return;
+				}
+				setIsAuthenticated(true);
+			}
+			setAuthChecked(true);
+		}
+		checkAuth();
+	}, [
+		routeDef,
+		isDashboardContext,
+		pathname,
+		navigate,
+		authClient
+	]);
+	if (!isDashboardContext && routeDef?.meta?.requiresAuth && !authChecked) return /* @__PURE__ */ jsx("div", {
+		className: "flex items-center justify-center min-h-screen",
+		children: /* @__PURE__ */ jsx("div", { className: "animate-spin rounded-full h-8 w-8 border-b-2 border-primary" })
+	});
+	if (!isDashboardContext && routeDef?.meta?.requiresAuth && !isAuthenticated) return null;
+	if (!routeDef) return /* @__PURE__ */ jsxs("div", {
+		className: "flex flex-col items-center justify-center min-h-[50vh] gap-4",
+		children: [
+			/* @__PURE__ */ jsx("h1", {
+				className: "text-2xl font-bold",
+				children: "Page Not Found"
+			}),
+			/* @__PURE__ */ jsxs("p", {
+				className: "text-muted-foreground",
+				children: [
+					"The page \"",
+					pathname,
+					"\" could not be found."
+				]
+			}),
+			/* @__PURE__ */ jsx(Link, {
+				to: "/",
+				className: "text-primary hover:underline",
+				children: "Go Home"
+			})
+		]
+	});
+	const Component = routeDef.component;
+	return /* @__PURE__ */ jsx(Component, {});
+}
+
+//#endregion
+export { KuckitModuleRoute, buildModuleRoutes, createAuthClientService, createKuckitWebProvider, createKuckitWebServices, createORPCUtils, createQueryClient, createRPCClient, createRPCLink, mergeRouteTrees, useAuth, useKuckitWeb, useOrpc, useQueryClient, useRpc, useServices, withKuckitWeb };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@kuckit/app-web",
-	"version": "2.0.7",
+	"version": "3.0.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -23,9 +23,9 @@
 		"prepublishOnly": "npm run build && node ../../scripts/resolve-workspace-protocols.cjs && node ../../scripts/check-no-workspace-protocol.cjs"
 	},
 	"dependencies": {
-		"@kuckit/sdk-react": "^2.0.7",
-		"@kuckit/api": "^2.0.7",
-		"@kuckit/auth": "^2.0.7",
+		"@kuckit/sdk-react": "^3.0.0",
+		"@kuckit/api": "^3.0.0",
+		"@kuckit/auth": "^3.0.0",
 		"@tanstack/react-query": "^5.85.5",
 		"@tanstack/react-router": "^1.114.25",
 		"@orpc/client": "^1.10.0",