@btst/stack 2.9.3 → 2.10.0

package/src/plugins/cms/client/plugin.tsx

@@ -8,6 +8,7 @@ import {
 import { createRoute } from "@btst/yar";
 import type { ComponentType } from "react";
 import type { QueryClient } from "@tanstack/react-query";
+import { createSanitizedSSRLoaderError } from "../../utils";
 import type { CMSApiRouter } from "../api";
 import { createCMSQueryKeys } from "../query-keys";
 
@@ -163,6 +164,12 @@ function createDashboardLoader(config: CMSClientConfig) {
 				apiBasePath,
 				headers,
 			};
+			const client = createApiClient<CMSApiRouter>({
+				baseURL: apiBaseURL,
+				basePath: apiBasePath,
+			});
+			const queries = createCMSQueryKeys(client, headers);
+			const typesQuery = queries.cmsTypes.list();
 
 			try {
 				// Before hook - authorization check
@@ -173,13 +180,7 @@ function createDashboardLoader(config: CMSClientConfig) {
 					);
 				}
 
-				const client = createApiClient<CMSApiRouter>({
-					baseURL: apiBaseURL,
-					basePath: apiBasePath,
-				});
-				const queries = createCMSQueryKeys(client, headers);
-
-				await queryClient.prefetchQuery(queries.cmsTypes.list());
+				await queryClient.prefetchQuery(typesQuery);
 
 				// After hook
 				if (hooks?.afterLoadDashboard) {
@@ -187,9 +188,7 @@ function createDashboardLoader(config: CMSClientConfig) {
 				}
 
 				// Check if there was an error
-				const queryState = queryClient.getQueryState(
-					queries.cmsTypes.list().queryKey,
-				);
+				const queryState = queryClient.getQueryState(typesQuery.queryKey);
 				if (queryState?.error && hooks?.onLoadError) {
 					const error =
 						queryState.error instanceof Error
@@ -205,6 +204,15 @@ function createDashboardLoader(config: CMSClientConfig) {
 						"[btst/cms] route.loader() failed — no server running at build time. " +
 							"Use myStack.api.cms.prefetchForRoute() for SSG data prefetching.",
 					);
+				} else {
+					const errToStore = createSanitizedSSRLoaderError();
+					await queryClient.prefetchQuery({
+						queryKey: typesQuery.queryKey,
+						queryFn: () => {
+							throw errToStore;
+						},
+						retry: false,
+					});
 				}
 				if (hooks?.onLoadError) {
 					await hooks.onLoadError(error as Error, context);
@@ -231,6 +239,18 @@ function createContentListLoader(typeSlug: string, config: CMSClientConfig) {
 				apiBasePath,
 				headers,
 			};
+			const client = createApiClient<CMSApiRouter>({
+				baseURL: apiBaseURL,
+				basePath: apiBasePath,
+			});
+			const queries = createCMSQueryKeys(client, headers);
+			const limit = 20;
+			const typesQuery = queries.cmsTypes.list();
+			const listQuery = queries.cmsContent.list({
+				typeSlug,
+				limit,
+				offset: 0,
+			});
 
 			try {
 				// Before hook - authorization check
@@ -241,22 +261,10 @@ function createContentListLoader(typeSlug: string, config: CMSClientConfig) {
 					);
 				}
 
-				const client = createApiClient<CMSApiRouter>({
-					baseURL: apiBaseURL,
-					basePath: apiBasePath,
-				});
-				const queries = createCMSQueryKeys(client, headers);
-				const limit = 20;
-
 				// Prefetch content types
-				await queryClient.prefetchQuery(queries.cmsTypes.list());
+				await queryClient.prefetchQuery(typesQuery);
 
 				// Prefetch content list using infinite query (matches useSuspenseInfiniteQuery in hooks)
-				const listQuery = queries.cmsContent.list({
-					typeSlug,
-					limit,
-					offset: 0,
-				});
 				await queryClient.prefetchInfiniteQuery({
 					queryKey: listQuery.queryKey,
 					queryFn: async ({ pageParam = 0 }) => {
@@ -285,9 +293,7 @@ function createContentListLoader(typeSlug: string, config: CMSClientConfig) {
 				}
 
 				// Check if there was an error in either query
-				const typesState = queryClient.getQueryState(
-					queries.cmsTypes.list().queryKey,
-				);
+				const typesState = queryClient.getQueryState(typesQuery.queryKey);
 				const listState = queryClient.getQueryState(listQuery.queryKey);
 				const queryError = typesState?.error || listState?.error;
 				if (queryError && hooks?.onLoadError) {
@@ -305,6 +311,16 @@ function createContentListLoader(typeSlug: string, config: CMSClientConfig) {
 						"[btst/cms] route.loader() failed — no server running at build time. " +
 							"Use myStack.api.cms.prefetchForRoute() for SSG data prefetching.",
 					);
+				} else {
+					const errToStore = createSanitizedSSRLoaderError();
+					await queryClient.prefetchInfiniteQuery({
+						queryKey: listQuery.queryKey,
+						queryFn: () => {
+							throw errToStore;
+						},
+						initialPageParam: 0,
+						retry: false,
+					});
 				}
 				if (hooks?.onLoadError) {
 					await hooks.onLoadError(error as Error, context);
@@ -335,6 +351,15 @@ function createContentEditorLoader(
 				apiBasePath,
 				headers,
 			};
+			const client = createApiClient<CMSApiRouter>({
+				baseURL: apiBaseURL,
+				basePath: apiBasePath,
+			});
+			const queries = createCMSQueryKeys(client, headers);
+			const typesQuery = queries.cmsTypes.list();
+			const detailQuery = id
+				? queries.cmsContent.detail(typeSlug, id)
+				: undefined;
 
 			try {
 				// Before hook - authorization check
@@ -345,17 +370,9 @@ function createContentEditorLoader(
 					);
 				}
 
-				const client = createApiClient<CMSApiRouter>({
-					baseURL: apiBaseURL,
-					basePath: apiBasePath,
-				});
-				const queries = createCMSQueryKeys(client, headers);
-
-				const promises = [queryClient.prefetchQuery(queries.cmsTypes.list())];
+				const promises = [queryClient.prefetchQuery(typesQuery)];
 				if (id) {
-					promises.push(
-						queryClient.prefetchQuery(queries.cmsContent.detail(typeSlug, id)),
-					);
+					promises.push(queryClient.prefetchQuery(detailQuery!));
 				}
 				await Promise.all(promises);
 
@@ -365,13 +382,9 @@ function createContentEditorLoader(
 				}
 
 				// Check if there was an error
-				const typesState = queryClient.getQueryState(
-					queries.cmsTypes.list().queryKey,
-				);
+				const typesState = queryClient.getQueryState(typesQuery.queryKey);
 				const itemState = id
-					? queryClient.getQueryState(
-							queries.cmsContent.detail(typeSlug, id).queryKey,
-						)
+					? queryClient.getQueryState(detailQuery!.queryKey)
 					: null;
 				const queryError = typesState?.error || itemState?.error;
 				if (queryError && hooks?.onLoadError) {
@@ -389,6 +402,24 @@ function createContentEditorLoader(
 						"[btst/cms] route.loader() failed — no server running at build time. " +
 							"Use myStack.api.cms.prefetchForRoute() for SSG data prefetching.",
 					);
+				} else {
+					const errToStore = createSanitizedSSRLoaderError();
+					await queryClient.prefetchQuery({
+						queryKey: typesQuery.queryKey,
+						queryFn: () => {
+							throw errToStore;
+						},
+						retry: false,
+					});
+					if (detailQuery) {
+						await queryClient.prefetchQuery({
+							queryKey: detailQuery.queryKey,
+							queryFn: () => {
+								throw errToStore;
+							},
+							retry: false,
+						});
+					}
 				}
 				if (hooks?.onLoadError) {
 					await hooks.onLoadError(error as Error, context);

package/src/plugins/comments/client/plugin.tsx

@@ -2,10 +2,14 @@
 import { lazy } from "react";
 import {
 	defineClientPlugin,
+	createApiClient,
 	isConnectionError,
 } from "@btst/stack/plugins/client";
 import { createRoute } from "@btst/yar";
 import type { QueryClient } from "@tanstack/react-query";
+import type { CommentsApiRouter } from "../api";
+import { createCommentsQueryKeys } from "../query-keys";
+import { createSanitizedSSRLoaderError } from "../../utils";
 
 // Lazy load page components for code splitting
 const ModerationPageComponent = lazy(() =>
@@ -36,6 +40,11 @@ export interface LoaderContext {
 	apiBasePath: string;
 	/** Optional headers for the request */
 	headers?: Headers;
+	/**
+	 * Optional current user ID for SSR loaders that need user-scoped query keys.
+	 * Hooks (e.g. beforeLoadUserComments) may populate this.
+	 */
+	currentUserId?: string;
 	/** Additional context properties */
 	[key: string]: unknown;
 }
@@ -81,7 +90,7 @@ export interface CommentsClientConfig {
 function createModerationLoader(config: CommentsClientConfig) {
 	return async () => {
 		if (typeof window === "undefined") {
-			const { apiBasePath, apiBaseURL, headers, hooks } = config;
+			const { queryClient, apiBasePath, apiBaseURL, headers, hooks } = config;
 			const context: LoaderContext = {
 				path: "/comments/moderation",
 				isSSR: true,
@@ -89,15 +98,43 @@ function createModerationLoader(config: CommentsClientConfig) {
 				apiBasePath,
 				headers,
 			};
+			const client = createApiClient<CommentsApiRouter>({
+				baseURL: apiBaseURL,
+				basePath: apiBasePath,
+			});
+			const queries = createCommentsQueryKeys(client, headers);
+			const listQuery = queries.comments.list({
+				status: "pending",
+				limit: 20,
+				offset: 0,
+			});
 			try {
 				if (hooks?.beforeLoadModeration) {
 					await hooks.beforeLoadModeration(context);
 				}
+				await queryClient.prefetchQuery(listQuery);
+				const queryState = queryClient.getQueryState(listQuery.queryKey);
+				if (queryState?.error && hooks?.onLoadError) {
+					const error =
+						queryState.error instanceof Error
+							? queryState.error
+							: new Error(String(queryState.error));
+					await hooks.onLoadError(error, context);
+				}
 			} catch (error) {
 				if (isConnectionError(error)) {
 					console.warn(
 						"[btst/comments] route.loader() failed — no server running at build time.",
 					);
+				} else {
+					const errToStore = createSanitizedSSRLoaderError();
+					await queryClient.prefetchQuery({
+						queryKey: listQuery.queryKey,
+						queryFn: () => {
+							throw errToStore;
+						},
+						retry: false,
+					});
 				}
 				if (hooks?.onLoadError) {
 					await hooks.onLoadError(error as Error, context);
@@ -110,7 +147,7 @@ function createModerationLoader(config: CommentsClientConfig) {
 function createUserCommentsLoader(config: CommentsClientConfig) {
 	return async () => {
 		if (typeof window === "undefined") {
-			const { apiBasePath, apiBaseURL, headers, hooks } = config;
+			const { queryClient, apiBasePath, apiBaseURL, headers, hooks } = config;
 			const context: LoaderContext = {
 				path: "/comments",
 				isSSR: true,
@@ -118,15 +155,58 @@ function createUserCommentsLoader(config: CommentsClientConfig) {
 				apiBasePath,
 				headers,
 			};
+			const client = createApiClient<CommentsApiRouter>({
+				baseURL: apiBaseURL,
+				basePath: apiBasePath,
+			});
+			const queries = createCommentsQueryKeys(client, headers);
+			const getUserListQuery = (currentUserId: string) =>
+				queries.comments.list({
+					authorId: currentUserId,
+					sort: "desc",
+					limit: 20,
+					offset: 0,
+				});
 			try {
 				if (hooks?.beforeLoadUserComments) {
 					await hooks.beforeLoadUserComments(context);
 				}
+				const currentUserId =
+					typeof context.currentUserId === "string"
+						? context.currentUserId
+						: undefined;
+				if (currentUserId) {
+					const listQuery = getUserListQuery(currentUserId);
+					await queryClient.prefetchQuery(listQuery);
+					const queryState = queryClient.getQueryState(listQuery.queryKey);
+					if (queryState?.error && hooks?.onLoadError) {
+						const error =
+							queryState.error instanceof Error
+								? queryState.error
+								: new Error(String(queryState.error));
+						await hooks.onLoadError(error, context);
+					}
+				}
 			} catch (error) {
 				if (isConnectionError(error)) {
 					console.warn(
 						"[btst/comments] route.loader() failed — no server running at build time.",
 					);
+				} else {
+					const currentUserId =
+						typeof context.currentUserId === "string"
+							? context.currentUserId
+							: undefined;
+					if (currentUserId) {
+						const errToStore = createSanitizedSSRLoaderError();
+						await queryClient.prefetchQuery({
+							queryKey: getUserListQuery(currentUserId).queryKey,
+							queryFn: () => {
+								throw errToStore;
+							},
+							retry: false,
+						});
+					}
 				}
 				if (hooks?.onLoadError) {
 					await hooks.onLoadError(error as Error, context);

package/src/plugins/comments/client/utils.ts

@@ -1,5 +1,6 @@
 import { useState, useEffect } from "react";
 import type { CommentsPluginOverrides } from "./overrides";
+import { toError as toErrorShared } from "../error-utils";
 
 /**
  * Resolves `currentUserId` from the plugin overrides, supporting both a static
@@ -40,20 +41,7 @@ export function useResolvedCurrentUserId(
  *    copied onto the Error via Object.assign so callers can inspect them.
  * 3. Anything else — converted via String().
  */
-export function toError(error: unknown): Error {
-	if (error instanceof Error) return error;
-	if (typeof error === "object" && error !== null) {
-		const obj = error as Record<string, unknown>;
-		const message =
-			(typeof obj.message === "string" ? obj.message : null) ||
-			(typeof obj.error === "string" ? obj.error : null) ||
-			JSON.stringify(error);
-		const err = new Error(message);
-		Object.assign(err, error);
-		return err;
-	}
-	return new Error(String(error));
-}
+export const toError = toErrorShared;
 
 export function getInitials(name: string | null | undefined): string {
 	if (!name) return "?";

package/src/plugins/comments/error-utils.ts

@@ -0,0 +1,17 @@
+/**
+ * Normalize any thrown value into an Error.
+ */
+export function toError(error: unknown): Error {
+	if (error instanceof Error) return error;
+	if (typeof error === "object" && error !== null) {
+		const obj = error as Record<string, unknown>;
+		const message =
+			(typeof obj.message === "string" ? obj.message : null) ||
+			(typeof obj.error === "string" ? obj.error : null) ||
+			JSON.stringify(error);
+		const err = new Error(message);
+		Object.assign(err, error);
+		return err;
+	}
+	return new Error(String(error));
+}

package/src/plugins/comments/query-keys.ts

@@ -10,7 +10,7 @@ import {
 	commentCountDiscriminator,
 	commentsThreadDiscriminator,
 } from "./api/query-key-defs";
-import { toError } from "./client/utils";
+import { toError } from "./error-utils";
 
 interface CommentsListParams {
 	resourceId?: string;

package/src/plugins/form-builder/client/plugin.tsx

@@ -9,6 +9,7 @@ import {
 import { createRoute } from "@btst/yar";
 import type { ComponentType } from "react";
 import type { QueryClient } from "@tanstack/react-query";
+import { createSanitizedSSRLoaderError } from "../../utils";
 import type { FormBuilderApiRouter } from "../api";
 import { createFormBuilderQueryKeys } from "../query-keys";
 
@@ -160,6 +161,13 @@ function createFormListLoader(config: FormBuilderClientConfig) {
 				apiBasePath,
 				headers,
 			};
+			const client = createApiClient<FormBuilderApiRouter>({
+				baseURL: apiBaseURL,
+				basePath: apiBasePath,
+			});
+			const queries = createFormBuilderQueryKeys(client, headers);
+			const limit = 20;
+			const listQuery = queries.forms.list({ limit, offset: 0 });
 
 			try {
 				// Before hook - authorization check
@@ -170,15 +178,7 @@ function createFormListLoader(config: FormBuilderClientConfig) {
 					);
 				}
 
-				const client = createApiClient<FormBuilderApiRouter>({
-					baseURL: apiBaseURL,
-					basePath: apiBasePath,
-				});
-				const queries = createFormBuilderQueryKeys(client, headers);
-				const limit = 20;
-
 				// Prefetch forms using infinite query
-				const listQuery = queries.forms.list({ limit, offset: 0 });
 				await queryClient.prefetchInfiniteQuery({
 					queryKey: listQuery.queryKey,
 					queryFn: async ({ pageParam = 0 }) => {
@@ -221,6 +221,16 @@ function createFormListLoader(config: FormBuilderClientConfig) {
 						"[btst/form-builder] route.loader() failed — no server running at build time. " +
 							"Use myStack.api.formBuilder.prefetchForRoute() for SSG data prefetching.",
 					);
+				} else {
+					const errToStore = createSanitizedSSRLoaderError();
+					await queryClient.prefetchInfiniteQuery({
+						queryKey: listQuery.queryKey,
+						queryFn: () => {
+							throw errToStore;
+						},
+						initialPageParam: 0,
+						retry: false,
+					});
 				}
 				if (hooks?.onLoadError) {
 					await hooks.onLoadError(error as Error, context);
@@ -249,6 +259,12 @@ function createFormBuilderLoader(
 				apiBasePath,
 				headers,
 			};
+			const client = createApiClient<FormBuilderApiRouter>({
+				baseURL: apiBaseURL,
+				basePath: apiBasePath,
+			});
+			const queries = createFormBuilderQueryKeys(client, headers);
+			const formQuery = id ? queries.forms.byId(id) : undefined;
 
 			try {
 				// Before hook - authorization check
@@ -259,15 +275,9 @@ function createFormBuilderLoader(
 					);
 				}
 
-				const client = createApiClient<FormBuilderApiRouter>({
-					baseURL: apiBaseURL,
-					basePath: apiBasePath,
-				});
-				const queries = createFormBuilderQueryKeys(client, headers);
-
 				// Prefetch form if editing
 				if (id) {
-					await queryClient.prefetchQuery(queries.forms.byId(id));
+					await queryClient.prefetchQuery(formQuery!);
 				}
 
 				// After hook
@@ -277,9 +287,7 @@ function createFormBuilderLoader(
 
 				// Check if there was an error
 				if (id) {
-					const queryState = queryClient.getQueryState(
-						queries.forms.byId(id).queryKey,
-					);
+					const queryState = queryClient.getQueryState(formQuery!.queryKey);
 					if (queryState?.error && hooks?.onLoadError) {
 						const error =
 							queryState.error instanceof Error
@@ -295,6 +303,15 @@ function createFormBuilderLoader(
 						"[btst/form-builder] route.loader() failed — no server running at build time. " +
 							"Use myStack.api.formBuilder.prefetchForRoute() for SSG data prefetching.",
 					);
+				} else if (formQuery) {
+					const errToStore = createSanitizedSSRLoaderError();
+					await queryClient.prefetchQuery({
+						queryKey: formQuery.queryKey,
+						queryFn: () => {
+							throw errToStore;
+						},
+						retry: false,
+					});
 				}
 				if (hooks?.onLoadError) {
 					await hooks.onLoadError(error as Error, context);
@@ -323,6 +340,18 @@ function createSubmissionsLoader(
 				apiBasePath,
 				headers,
 			};
+			const client = createApiClient<FormBuilderApiRouter>({
+				baseURL: apiBaseURL,
+				basePath: apiBasePath,
+			});
+			const queries = createFormBuilderQueryKeys(client, headers);
+			const limit = 20;
+			const formQuery = queries.forms.byId(formId);
+			const submissionsQuery = queries.formSubmissions.list({
+				formId,
+				limit,
+				offset: 0,
+			});
 
 			try {
 				// Before hook - authorization check
@@ -333,21 +362,8 @@ function createSubmissionsLoader(
 					);
 				}
 
-				const client = createApiClient<FormBuilderApiRouter>({
-					baseURL: apiBaseURL,
-					basePath: apiBasePath,
-				});
-				const queries = createFormBuilderQueryKeys(client, headers);
-				const limit = 20;
-
 				// Prefetch form and submissions
-				await queryClient.prefetchQuery(queries.forms.byId(formId));
-
-				const submissionsQuery = queries.formSubmissions.list({
-					formId,
-					limit,
-					offset: 0,
-				});
+				await queryClient.prefetchQuery(formQuery);
 				await queryClient.prefetchInfiniteQuery({
 					queryKey: submissionsQuery.queryKey,
 					queryFn: async ({ pageParam = 0 }) => {
@@ -379,9 +395,7 @@ function createSubmissionsLoader(
 				}
 
 				// Check if there was an error
-				const formState = queryClient.getQueryState(
-					queries.forms.byId(formId).queryKey,
-				);
+				const formState = queryClient.getQueryState(formQuery.queryKey);
 				const submissionsState = queryClient.getQueryState(
 					submissionsQuery.queryKey,
 				);
@@ -400,6 +414,16 @@ function createSubmissionsLoader(
 						"[btst/form-builder] route.loader() failed — no server running at build time. " +
 							"Use myStack.api.formBuilder.prefetchForRoute() for SSG data prefetching.",
 					);
+				} else {
+					const errToStore = createSanitizedSSRLoaderError();
+					await queryClient.prefetchInfiniteQuery({
+						queryKey: submissionsQuery.queryKey,
+						queryFn: () => {
+							throw errToStore;
+						},
+						initialPageParam: 0,
+						retry: false,
+					});
 				}
 				if (hooks?.onLoadError) {
 					await hooks.onLoadError(error as Error, context);