@questpie/admin 3.5.2 → 3.5.3

package/dist/client/hooks/typed-hooks.d.mts

@@ -1,4 +1,6 @@
+import { CollectionQueryKey } from "./query-access.mjs";
 import { UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
+import { QuestpieQueryOptionsProxy } from "@questpie/tanstack-query";
 import { QuestpieApp } from "questpie/client";
 
 //#region src/client/hooks/typed-hooks.d.ts
@@ -6,11 +8,11 @@ import { QuestpieApp } from "questpie/client";
 /**
  * Extract collection names from a QuestpieApp config
  */
-type CollectionNames<TApp extends QuestpieApp> = keyof TApp["collections"] & string;
+type CollectionNames<TApp extends QuestpieApp> = CollectionQueryKey<TApp>;
 /**
  * Extract global names from a QuestpieApp config
  */
-type GlobalNames<TApp extends QuestpieApp> = keyof NonNullable<TApp["globals"]> & string;
+type GlobalNames<TApp extends QuestpieApp> = keyof QuestpieQueryOptionsProxy<TApp>["globals"] & string;
 interface TypedHooks<TApp extends QuestpieApp> {
   /**
    * Hook to fetch collection list with filters, sorting, pagination

package/dist/client/hooks/typed-hooks.mjs

@@ -1,5 +1,6 @@
-import { selectClient, selectContentLocale, useAdminStore } from "../runtime/provider.mjs";
+import { selectContentLocale, useAdminStore } from "../runtime/provider.mjs";
 import { useScopedLocale } from "../runtime/locale-scope.mjs";
+import { getCollectionQueryApi, getGlobalQueryApi, useAppClient } from "./query-access.mjs";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { createQuestpieQueryOptions } from "@questpie/tanstack-query";
 
@@ -57,14 +58,14 @@ import { createQuestpieQueryOptions } from "@questpie/tanstack-query";
 */
 function createTypedHooks() {
 	function useCollectionList(collection, options, queryOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const { locale: contentLocale } = useScopedLocale();
 		const queryOpts = createQuestpieQueryOptions(client, {
 			keyPrefix: ["questpie", "collections"],
 			locale: contentLocale
 		});
 		return useQuery({
-			...collection ? queryOpts.collections[collection].find({
+			...collection ? getCollectionQueryApi(queryOpts, collection).find({
 				...options,
 				locale: contentLocale
 			}) : {
@@ -84,14 +85,14 @@ function createTypedHooks() {
 		});
 	}
 	function useCollectionCount(collection, options, queryOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const { locale: contentLocale } = useScopedLocale();
 		const queryOpts = createQuestpieQueryOptions(client, {
 			keyPrefix: ["questpie", "collections"],
 			locale: contentLocale
 		});
 		return useQuery({
-			...collection ? queryOpts.collections[collection].count({
+			...collection ? getCollectionQueryApi(queryOpts, collection).count({
 				...options,
 				locale: contentLocale
 			}) : {
@@ -108,14 +109,14 @@ function createTypedHooks() {
 		});
 	}
 	function useCollectionItem(collection, id, options, queryOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const { locale: contentLocale } = useScopedLocale();
 		const queryOpts = createQuestpieQueryOptions(client, {
 			keyPrefix: ["questpie", "collections"],
 			locale: contentLocale
 		});
 		return useQuery({
-			...collection ? queryOpts.collections[collection].findOne({
+			...collection ? getCollectionQueryApi(queryOpts, collection).findOne({
 				where: { id },
 				locale: contentLocale,
 				...options
@@ -133,14 +134,14 @@ function createTypedHooks() {
 		});
 	}
 	function useCollectionCreate(collection, mutationOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const { locale: contentLocale } = useScopedLocale();
 		const queryClient = useQueryClient();
 		const queryOpts = createQuestpieQueryOptions(client, {
 			keyPrefix: ["questpie", "collections"],
 			locale: contentLocale
 		});
-		const baseOptions = queryOpts.collections[collection].create();
+		const baseOptions = getCollectionQueryApi(queryOpts, collection).create();
 		const listQueryKey = queryOpts.key([
 			"collections",
 			collection,
@@ -167,14 +168,14 @@ function createTypedHooks() {
 		});
 	}
 	function useCollectionUpdate(collection, mutationOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const { locale: contentLocale } = useScopedLocale();
 		const queryClient = useQueryClient();
 		const queryOpts = createQuestpieQueryOptions(client, {
 			keyPrefix: ["questpie", "collections"],
 			locale: contentLocale
 		});
-		const baseOptions = queryOpts.collections[collection].update();
+		const baseOptions = getCollectionQueryApi(queryOpts, collection).update();
 		const listQueryKey = queryOpts.key([
 			"collections",
 			collection,
@@ -208,14 +209,14 @@ function createTypedHooks() {
 		});
 	}
 	function useCollectionDelete(collection, mutationOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const { locale: contentLocale } = useScopedLocale();
 		const queryClient = useQueryClient();
 		const queryOpts = createQuestpieQueryOptions(client, {
 			keyPrefix: ["questpie", "collections"],
 			locale: contentLocale
 		});
-		const baseOptions = queryOpts.collections[collection].delete();
+		const baseOptions = getCollectionQueryApi(queryOpts, collection).delete();
 		const listQueryKey = queryOpts.key([
 			"collections",
 			collection,
@@ -249,14 +250,14 @@ function createTypedHooks() {
 		});
 	}
 	function useCollectionRestore(collection, mutationOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const { locale: contentLocale } = useScopedLocale();
 		const queryClient = useQueryClient();
 		const queryOpts = createQuestpieQueryOptions(client, {
 			keyPrefix: ["questpie", "collections"],
 			locale: contentLocale
 		});
-		const baseOptions = queryOpts.collections[collection].restore();
+		const baseOptions = getCollectionQueryApi(queryOpts, collection).restore();
 		const listQueryKey = queryOpts.key([
 			"collections",
 			collection,
@@ -290,14 +291,14 @@ function createTypedHooks() {
 		});
 	}
 	function useCollectionVersions(collection, id, options, queryOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const { locale: contentLocale } = useScopedLocale();
 		const queryOpts = createQuestpieQueryOptions(client, {
 			keyPrefix: ["questpie", "collections"],
 			locale: contentLocale
 		});
 		return useQuery({
-			...collection ? queryOpts.collections[collection].findVersions({
+			...collection ? getCollectionQueryApi(queryOpts, collection).findVersions({
 				id,
 				...options?.limit !== void 0 ? { limit: options.limit } : {},
 				...options?.offset !== void 0 ? { offset: options.offset } : {}
@@ -318,14 +319,14 @@ function createTypedHooks() {
 		});
 	}
 	function useCollectionRevertVersion(collection, mutationOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const { locale: contentLocale } = useScopedLocale();
 		const queryClient = useQueryClient();
 		const queryOpts = createQuestpieQueryOptions(client, {
 			keyPrefix: ["questpie", "collections"],
 			locale: contentLocale
 		});
-		const baseOptions = queryOpts.collections[collection].revertToVersion();
+		const baseOptions = getCollectionQueryApi(queryOpts, collection).revertToVersion();
 		const listQueryKey = queryOpts.key([
 			"collections",
 			collection,
@@ -366,13 +367,13 @@ function createTypedHooks() {
 		});
 	}
 	function useGlobal(globalName, options, queryOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const contentLocale = useAdminStore(selectContentLocale);
 		return useQuery({
-			...createQuestpieQueryOptions(client, {
+			...getGlobalQueryApi(createQuestpieQueryOptions(client, {
 				keyPrefix: ["questpie", "globals"],
 				locale: contentLocale
-			}).globals[globalName].get({
+			}), globalName).get({
 				...options,
 				locale: contentLocale
 			}),
@@ -380,7 +381,7 @@ function createTypedHooks() {
 		});
 	}
 	function useGlobalUpdate(globalName, mutationOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const contentLocale = useAdminStore(selectContentLocale);
 		const queryClient = useQueryClient();
 		const queryOpts = createQuestpieQueryOptions(client, {
@@ -394,7 +395,7 @@ function createTypedHooks() {
 			contentLocale
 		]);
 		return useMutation({
-			...queryOpts.globals[globalName].update(),
+			...getGlobalQueryApi(queryOpts, globalName).update(),
 			onSuccess: (data, variables, context) => {
 				(mutationOptions?.onSuccess)?.(data, variables, context);
 			},
@@ -406,13 +407,13 @@ function createTypedHooks() {
 		});
 	}
 	function useGlobalVersions(globalName, options, queryOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const contentLocale = useAdminStore(selectContentLocale);
 		return useQuery({
-			...createQuestpieQueryOptions(client, {
+			...getGlobalQueryApi(createQuestpieQueryOptions(client, {
 				keyPrefix: ["questpie", "globals"],
 				locale: contentLocale
-			}).globals[globalName].findVersions({
+			}), globalName).findVersions({
 				...options,
 				locale: contentLocale
 			}),
@@ -420,7 +421,7 @@ function createTypedHooks() {
 		});
 	}
 	function useGlobalRevertVersion(globalName, mutationOptions) {
-		const client = useAdminStore(selectClient);
+		const client = useAppClient();
 		const contentLocale = useAdminStore(selectContentLocale);
 		const queryClient = useQueryClient();
 		const queryOpts = createQuestpieQueryOptions(client, {
@@ -440,7 +441,7 @@ function createTypedHooks() {
 			contentLocale
 		]);
 		return useMutation({
-			...queryOpts.globals[globalName].revertToVersion(),
+			...getGlobalQueryApi(queryOpts, globalName).revertToVersion(),
 			onSuccess: (data, variables, context) => {
 				(mutationOptions?.onSuccess)?.(data, variables, context);
 			},

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-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/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_runtime21 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_runtime21.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_runtime22 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_runtime22.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_runtime23 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_runtime23.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_runtime23.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_runtime23.JSX.Element;
 //#endregion
 export { PreviewField, PreviewFieldProps, PreviewProvider, StandalonePreviewField, usePreviewContext };