@questpie/admin 3.5.2 → 3.5.4

package/dist/client/hooks/use-collection.mjs

@@ -1,7 +1,33 @@
 import { useQuestpieQueryOptions } from "./use-questpie-query-options.mjs";
+import { useEffect } from "react";
 import { useMutation, useQuery } from "@tanstack/react-query";
+import { buildCollectionTopic } from "@questpie/tanstack-query";
 
 //#region src/client/hooks/use-collection.ts
+function useCollectionRealtimeInvalidation({ client, collection, options, realtime, queryClient }) {
+	const topicSignature = JSON.stringify(collection ? buildCollectionTopic(collection, options) : null);
+	useEffect(() => {
+		if (!collection || !realtime) return;
+		const realtimeApi = client?.realtime;
+		if (!realtimeApi?.subscribe) return;
+		const topic = JSON.parse(topicSignature);
+		if (!topic) return;
+		return realtimeApi.subscribe(topic, () => {
+			queryClient.invalidateQueries({ queryKey: [
+				"questpie",
+				"collections",
+				"collections",
+				collection
+			] });
+		});
+	}, [
+		client,
+		collection,
+		queryClient,
+		realtime,
+		topicSignature
+	]);
+}
 /**
 * Hook to fetch collection list with filters, sorting, pagination
 *
@@ -14,24 +40,32 @@ import { useMutation, useQuery } from "@tanstack/react-query";
 * ```
 */
 function useCollectionList(collection, options, queryOptions, realtimeOptions) {
-	const { queryOpts, locale } = useQuestpieQueryOptions();
+	const { queryOpts, queryClient, locale, client } = useQuestpieQueryOptions();
 	const findOptions = {
 		...options,
 		locale
 	};
+	const baseQuery = collection ? queryOpts.collections[collection].find(findOptions, { realtime: realtimeOptions?.realtime }) : {
+		queryKey: [
+			"questpie",
+			"collections",
+			"__none__",
+			"find"
+		],
+		queryFn: () => ({
+			docs: [],
+			totalDocs: 0
+		})
+	};
+	useCollectionRealtimeInvalidation({
+		client,
+		collection: collection ? String(collection) : void 0,
+		options: findOptions,
+		realtime: realtimeOptions?.realtime,
+		queryClient
+	});
 	return useQuery({
-		...collection ? queryOpts.collections[collection].find(findOptions, { realtime: realtimeOptions?.realtime }) : {
-			queryKey: [
-				"questpie",
-				"collections",
-				"__none__",
-				"find"
-			],
-			queryFn: () => ({
-				docs: [],
-				totalDocs: 0
-			})
-		},
+		...baseQuery,
 		enabled: !!collection && (queryOptions?.enabled ?? true),
 		...queryOptions
 	});
@@ -54,21 +88,29 @@ function useCollectionList(collection, options, queryOptions, realtimeOptions) {
 * ```
 */
 function useCollectionCount(collection, options, queryOptions, realtimeOptions) {
-	const { queryOpts, locale } = useQuestpieQueryOptions();
+	const { queryOpts, queryClient, locale, client } = useQuestpieQueryOptions();
 	const countOptions = {
 		...options,
 		locale
 	};
+	const baseQuery = collection ? queryOpts.collections[collection].count(countOptions, { realtime: realtimeOptions?.realtime }) : {
+		queryKey: [
+			"questpie",
+			"collections",
+			"__none__",
+			"count"
+		],
+		queryFn: () => 0
+	};
+	useCollectionRealtimeInvalidation({
+		client,
+		collection: collection ? String(collection) : void 0,
+		options: countOptions,
+		realtime: realtimeOptions?.realtime,
+		queryClient
+	});
 	return useQuery({
-		...collection ? queryOpts.collections[collection].count(countOptions, { realtime: realtimeOptions?.realtime }) : {
-			queryKey: [
-				"questpie",
-				"collections",
-				"__none__",
-				"count"
-			],
-			queryFn: () => 0
-		},
+		...baseQuery,
 		enabled: !!collection && (queryOptions?.enabled ?? true),
 		...queryOptions
 	});

package/dist/client/hooks/use-reactive-fields.d.mts

@@ -1,3 +1,4 @@
+import "react";
 import { UseFormReturn } from "react-hook-form";
 import { FieldReactiveSchema } from "questpie/client";
 

package/dist/client/hooks/use-reactive-fields.mjs

@@ -10,6 +10,8 @@ import { useFormContext, useWatch } from "react-hook-form";
 * Watches form changes and triggers server-side reactive handlers.
 * Supports batched RPC calls with debouncing.
 */
+const EMPTY_REACTIVE_FIELD_STATE = {};
+const ReactiveFieldStatesContext = React.createContext({});
 /**
 * Get sibling data for a field path (for fields inside arrays)
 */
@@ -66,6 +68,19 @@ function getChangedDeps(prevDeps, nextDeps) {
 	for (const [dep, value] of Object.entries(nextDeps)) if (prevDeps[dep] !== value) changed.push(dep);
 	return changed;
 }
+function mergeReactiveFieldState(base, reactive) {
+	return {
+		hidden: base.hidden === true || reactive?.hidden === true,
+		readOnly: base.readOnly === true || reactive?.readOnly === true,
+		disabled: base.disabled === true || reactive?.disabled === true
+	};
+}
+function ReactiveFieldStatesProvider({ fieldStates, children }) {
+	return React.createElement(ReactiveFieldStatesContext.Provider, { value: fieldStates }, children);
+}
+function useReactiveFieldState(fieldPath) {
+	return React.useContext(ReactiveFieldStatesContext)[fieldPath] ?? EMPTY_REACTIVE_FIELD_STATE;
+}
 /**
 * Hook to manage reactive field states.
 * Watches form changes and triggers server-side handlers when dependencies change.
@@ -198,4 +213,4 @@ function useReactiveFields({ collection, mode = "collection", reactiveConfigs, d
 }
 
 //#endregion
-export { useReactiveFields };
+export { ReactiveFieldStatesProvider, mergeReactiveFieldState, useReactiveFieldState, useReactiveFields };

package/dist/client/hooks/use-server-actions.mjs

@@ -14,6 +14,13 @@ import * as React from "react";
 * Server actions have their handlers stripped during serialization; this hook
 * creates client-side wrappers that execute actions via the server API.
 */
+var ServerActionValidationError = class extends Error {
+	constructor(message, fieldErrors) {
+		super(message);
+		this.fieldErrors = fieldErrors;
+		this.name = "ServerActionValidationError";
+	}
+};
 function getActionErrorMessage(response, t) {
 	if (response.error) return response.error;
 	if (response.result?.toast?.message) return response.result.toast.message;
@@ -106,7 +113,11 @@ function mapServerAction(serverAction, collection, fieldRegistry, client, locale
 						data,
 						locale
 					});
-					if (!response.success || response.result?.type === "error") throw new Error(getActionErrorMessage(response, t));
+					if (!response.success || response.result?.type === "error") {
+						const message = getActionErrorMessage(response, t);
+						if (response.result?.errors) throw new ServerActionValidationError(message, response.result.errors);
+						throw new Error(message);
+					}
 					await applyServerActionEffects(response.result, ctx);
 					return response.result?.toast?.message;
 				}

package/dist/client/hooks/use-upload.d.mts

@@ -0,0 +1,40 @@
+//#region src/client/hooks/use-upload.d.ts
+interface Asset {
+  id: string;
+  key: string;
+  filename: string;
+  mimeType: string;
+  size: number;
+  visibility: "public" | "private";
+  url?: string;
+  width?: number | null;
+  height?: number | null;
+  alt?: string | null;
+  caption?: string | null;
+  createdAt?: string;
+  updatedAt?: string;
+}
+interface UploadOptions {
+  to?: string;
+  /**
+   * Optional destination path/folder forwarded to the collection's upload so a
+   * blob upload lands inside a folder (e.g. an `assets` row's required `path`).
+   */
+  path?: string;
+  onProgress?: (progress: number) => void;
+  signal?: AbortSignal;
+}
+interface UploadManyOptions extends UploadOptions {
+  onProgress?: (progress: number, fileIndex?: number) => void;
+}
+interface UseUploadReturn {
+  upload: (file: File, options?: UploadOptions) => Promise<Asset>;
+  uploadMany: (files: File[], options?: UploadManyOptions) => Promise<Asset[]>;
+  isUploading: boolean;
+  progress: number;
+  error: Error | null;
+  reset: () => void;
+}
+declare function useUpload(): UseUploadReturn;
+//#endregion
+export { Asset, useUpload };

package/dist/client/hooks/use-upload.mjs

@@ -29,7 +29,7 @@ function useUpload() {
 	}, [uploadCollections]);
 	const uploadMutation = useMutation({
 		mutationFn: async ({ file, options }) => {
-			const { to, onProgress, signal } = options ?? {};
+			const { to, path, onProgress, signal } = options ?? {};
 			const targetCollection = resolveTargetCollection(to);
 			if (!targetCollection) throw new Error(getMissingCollectionMessage());
 			const collectionApi = client.collections[targetCollection];
@@ -38,6 +38,7 @@ function useUpload() {
 			return {
 				asset: await collectionApi.upload(file, {
 					signal,
+					path,
 					onProgress: (p) => {
 						setProgress(p);
 						onProgress?.(p);
@@ -56,7 +57,7 @@ function useUpload() {
 	});
 	const uploadManyMutation = useMutation({
 		mutationFn: async ({ files, options }) => {
-			const { to, onProgress, signal } = options ?? {};
+			const { to, path, onProgress, signal } = options ?? {};
 			const targetCollection = resolveTargetCollection(to);
 			if (!targetCollection) throw new Error(getMissingCollectionMessage());
 			if (files.length === 0) return {
@@ -68,6 +69,7 @@ function useUpload() {
 			setProgress(0);
 			const results = await collectionApi.uploadMany(files, {
 				signal,
+				path,
 				onProgress: (p, fileIndex) => {
 					setProgress(p);
 					onProgress?.(p, fileIndex);

package/dist/client/hooks/use-view-state.mjs

@@ -1,5 +1,6 @@
 import { useAdminStore } from "../runtime/provider.mjs";
 import { getAdminPreferenceQueryKey, useSetAdminPreference } from "./use-admin-preferences.mjs";
+import { cloneFilters, filtersEqual, sortConfigEqual } from "../lib/view-filter-utils.mjs";
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useQueryClient, useSuspenseQuery } from "@tanstack/react-query";
 
@@ -102,7 +103,7 @@ function useViewState(defaultColumns, initialConfig, collectionName, userId) {
 			}
 		};
 		return {
-			filters: initialConfig?.filters ?? [],
+			filters: cloneFilters(initialConfig?.filters ?? []),
 			sortConfig: initialConfig?.sortConfig ?? null,
 			visibleColumns: defaultColumns,
 			groupBy: initialConfig?.groupBy ?? null,
@@ -273,17 +274,24 @@ function useViewState(defaultColumns, initialConfig, collectionName, userId) {
 		resetConfig: useCallback(() => {
 			setConfig({
 				...EMPTY_CONFIG,
-				visibleColumns: defaultColumns
+				filters: cloneFilters(initialConfig?.filters ?? []),
+				sortConfig: initialConfig?.sortConfig ?? null,
+				visibleColumns: defaultColumns,
+				groupBy: initialConfig?.groupBy ?? null,
+				realtime: initialConfig?.realtime,
+				includeDeleted: initialConfig?.includeDeleted ?? false
 			});
-		}, [setConfig, defaultColumns]),
+		}, [
+			setConfig,
+			defaultColumns,
+			initialConfig
+		]),
 		hasChanges: useMemo(() => {
-			return config.filters.length > 0 || config.sortConfig !== null || (config.groupBy ?? null) !== (initialConfig?.groupBy ?? null) || (config.collapsedGroups?.length ?? 0) > 0 || config.realtime !== initialConfig?.realtime || (config.includeDeleted ?? false) !== (initialConfig?.includeDeleted ?? false) || config.pagination?.page !== 1 || config.pagination?.pageSize !== 25 || JSON.stringify([...config.visibleColumns].sort()) !== JSON.stringify([...defaultColumns].sort());
+			return !filtersEqual(config.filters, initialConfig?.filters ?? []) || !sortConfigEqual(config.sortConfig ?? null, initialConfig?.sortConfig ?? null) || (config.groupBy ?? null) !== (initialConfig?.groupBy ?? null) || (config.collapsedGroups?.length ?? 0) > 0 || config.realtime !== initialConfig?.realtime || (config.includeDeleted ?? false) !== (initialConfig?.includeDeleted ?? false) || config.pagination?.page !== 1 || config.pagination?.pageSize !== 25 || JSON.stringify([...config.visibleColumns].sort()) !== JSON.stringify([...defaultColumns].sort());
 		}, [
 			config,
 			defaultColumns,
-			initialConfig?.includeDeleted,
-			initialConfig?.groupBy,
-			initialConfig?.realtime
+			initialConfig
 		]),
 		isLoading: false
 	};

package/dist/client/i18n/hooks.d.mts

@@ -0,0 +1,20 @@
+import { I18nText } from "./types.mjs";
+import "react";
+import "date-fns";
+
+//#region src/client/i18n/hooks.d.ts
+
+/**
+ * Resolve I18nText to string
+ *
+ * @example
+ * ```tsx
+ * function Label({ text }: { text: I18nText }) {
+ *   const resolve = useResolveText();
+ *   return <span>{resolve(text)}</span>;
+ * }
+ * ```
+ */
+declare function useResolveText(): (text: I18nText | ((values: Record<string, any>) => I18nText) | undefined, fallback?: string, contextValues?: Record<string, any>) => string;
+//#endregion
+export { useResolveText };

package/dist/client/lib/utils.d.mts

@@ -0,0 +1,6 @@
+import { ClassValue } from "clsx";
+
+//#region src/client/lib/utils.d.ts
+declare function cn(...inputs: ClassValue[]): string;
+//#endregion
+export { cn };

package/dist/client/lib/view-filter-utils.mjs

@@ -0,0 +1,30 @@
+//#region src/client/lib/view-filter-utils.ts
+function filterValueEqual(a, b) {
+	if (Array.isArray(a) || Array.isArray(b)) {
+		if (!Array.isArray(a) || !Array.isArray(b)) return false;
+		if (a.length !== b.length) return false;
+		return a.every((value, index) => value === b[index]);
+	}
+	return a === b;
+}
+function filtersEqual(a = [], b = []) {
+	if (a.length !== b.length) return false;
+	return a.every((filter, index) => {
+		const other = b[index];
+		return filter.id === other.id && filter.field === other.field && filter.operator === other.operator && filterValueEqual(filter.value, other.value);
+	});
+}
+function cloneFilters(filters) {
+	return filters.map((filter) => ({
+		...filter,
+		value: Array.isArray(filter.value) ? [...filter.value] : filter.value
+	}));
+}
+function sortConfigEqual(a, b) {
+	if (a === b) return true;
+	if (!a || !b) return false;
+	return a.field === b.field && a.direction === b.direction;
+}
+
+//#endregion
+export { cloneFilters, filtersEqual, sortConfigEqual };

package/dist/client/preview/block-scope-context.d.mts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as react_jsx_runtime20 from "react/jsx-runtime";
+import * as react_jsx_runtime55 from "react/jsx-runtime";
 
 //#region src/client/preview/block-scope-context.d.ts
 
@@ -35,7 +35,7 @@ declare function BlockScopeProvider({
   blockId,
   basePath,
   children
-}: BlockScopeProviderProps): react_jsx_runtime20.JSX.Element;
+}: BlockScopeProviderProps): react_jsx_runtime55.JSX.Element;
 /**
  * Get current block scope context.
  *

package/dist/client/preview/preview-banner.d.mts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime21 from "react/jsx-runtime";
+import * as react_jsx_runtime56 from "react/jsx-runtime";
 
 //#region src/client/preview/preview-banner.d.ts
 
@@ -40,6 +40,6 @@ declare function PreviewBanner({
   isPreviewMode,
   className,
   exitPreviewUrl
-}: PreviewBannerProps): react_jsx_runtime21.JSX.Element | null;
+}: PreviewBannerProps): react_jsx_runtime56.JSX.Element | null;
 //#endregion
 export { PreviewBanner, PreviewBannerProps };

package/dist/client/preview/preview-field.d.mts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import * as react_jsx_runtime22 from "react/jsx-runtime";
+import * as react_jsx_runtime57 from "react/jsx-runtime";
 
 //#region src/client/preview/preview-field.d.ts
 
@@ -68,7 +68,7 @@ declare function PreviewProvider({
   }) => void;
   onFieldValueEdited?: (payload: PreviewFieldValueEditedPayload) => void;
   children: React.ReactNode;
-}): react_jsx_runtime22.JSX.Element;
+}): react_jsx_runtime57.JSX.Element;
 /**
  * Hook to access preview context.
  */
@@ -107,7 +107,7 @@ declare function PreviewField({
   style,
   onClick,
   onValueCommit
-}: PreviewFieldProps): react_jsx_runtime22.JSX.Element;
+}: PreviewFieldProps): react_jsx_runtime57.JSX.Element;
 /**
  * Standalone PreviewField that works without context.
  * Useful when you can't use PreviewProvider.
@@ -131,6 +131,6 @@ declare function StandalonePreviewField({
     blockId?: string;
     fieldType?: "regular" | "block" | "relation";
   }) => void;
-}): react_jsx_runtime22.JSX.Element;
+}): react_jsx_runtime57.JSX.Element;
 //#endregion
 export { PreviewField, PreviewFieldProps, PreviewProvider, StandalonePreviewField, usePreviewContext };

package/dist/client/runtime/provider.mjs

@@ -19,6 +19,13 @@ const CONTENT_LOCALE_COOKIE = "questpie_content_locale";
 /** Cookie max age (1 year) */
 const LOCALE_COOKIE_MAX_AGE = 3600 * 24 * 365;
 const LEGACY_LOCALE_COOKIE = "questpie_locale";
+const PUBLIC_BRANDING_PATHS = [
+	"/login",
+	"/forgot-password",
+	"/reset-password",
+	"/accept-invite",
+	"/setup"
+];
 function setCookie(name, value) {
 	if (typeof document === "undefined") return;
 	document.cookie = `${name}=${value}; path=/; max-age=${LOCALE_COOKIE_MAX_AGE}; SameSite=Lax`;
@@ -201,13 +208,25 @@ function applyFavicon(href) {
 	}
 	link.href = href;
 }
+function isPublicBrandingPath(basePath) {
+	if (typeof window === "undefined") return false;
+	const currentPath = window.location.pathname.replace(/\/+$/, "");
+	const normalizedBase = basePath.replace(/\/+$/, "");
+	return PUBLIC_BRANDING_PATHS.some((path) => {
+		const fullPath = `${normalizedBase}${path}`.replace(/\/+$/, "");
+		return currentPath === fullPath || currentPath.startsWith(`${fullPath}/`);
+	});
+}
 function BrandingSync() {
 	const store = useContext(AdminStoreContext);
 	useEffect(() => {
 		if (!store) return;
-		const client = store.getState().client;
-		if (!client || !client.routes?.getAdminConfig) return;
-		client.routes.getAdminConfig().then((config) => {
+		const state = store.getState();
+		const routes = state.client?.routes;
+		if (!routes) return;
+		const configRequest = isPublicBrandingPath(state.basePath) && typeof routes.getPublicAdminConfig === "function" ? routes.getPublicAdminConfig() : routes.getAdminConfig?.();
+		if (!configRequest) return;
+		configRequest.then((config) => {
 			const branding = config?.branding;
 			if (!branding) return;
 			const next = {};

package/dist/client/scope/picker.d.mts

@@ -1,5 +1,5 @@
 import { ScopePickerProps } from "./types.mjs";
-import * as react_jsx_runtime26 from "react/jsx-runtime";
+import * as react_jsx_runtime60 from "react/jsx-runtime";
 
 //#region src/client/scope/picker.d.ts
 
@@ -48,6 +48,6 @@ declare function ScopePicker({
   clearText,
   className,
   compact
-}: ScopePickerProps): react_jsx_runtime26.JSX.Element;
+}: ScopePickerProps): react_jsx_runtime60.JSX.Element;
 //#endregion
 export { ScopePicker };

package/dist/client/scope/provider.d.mts

@@ -1,5 +1,5 @@
 import { ScopeContextValue, ScopeProviderProps } from "./types.mjs";
-import * as react_jsx_runtime27 from "react/jsx-runtime";
+import * as react_jsx_runtime61 from "react/jsx-runtime";
 
 //#region src/client/scope/provider.d.ts
 
@@ -29,7 +29,7 @@ declare function ScopeProvider({
   headerName,
   storageKey,
   defaultScope
-}: ScopeProviderProps): react_jsx_runtime27.JSX.Element;
+}: ScopeProviderProps): react_jsx_runtime61.JSX.Element;
 /**
  * Hook to access the current scope context.
  *