@questpie/admin 2.0.0 → 3.0.1

package/dist/client/hooks/use-current-user.d.mts

@@ -24,7 +24,7 @@
  */
 /**
  * Basic user type from Better Auth session
- * Extended by the actual CMS user schema
+ * Extended by the actual user schema
  */
 interface BasicUser {
   id: string;
@@ -36,6 +36,10 @@ interface BasicUser {
   banned?: boolean;
   banReason?: string | null;
 }
+/**
+ * Session state returned by useSession hooks
+ */
+
 /**
  * Get the current authenticated user from session.
  *
@@ -53,5 +57,4 @@ interface BasicUser {
  */
 declare function useCurrentUser<TUser = BasicUser>(): TUser | null;
 //#endregion
-export { useCurrentUser };
-//# sourceMappingURL=use-current-user.d.mts.map
+export { useCurrentUser };

package/dist/client/hooks/use-current-user.mjs

@@ -1,4 +1,5 @@
 import { useAuthClientSafe } from "./use-auth.mjs";
+import { c } from "react/compiler-runtime";
 
 //#region src/client/hooks/use-current-user.ts
 /**
@@ -75,5 +76,4 @@ function useSessionState() {
 }
 
 //#endregion
-export { useCurrentUser, useSessionState };
-//# sourceMappingURL=use-current-user.mjs.map
+export { useCurrentUser, useSessionState };

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

@@ -1,4 +1,6 @@
-import * as React$1 from "react";
+import { trackDependencies } from "../utils/dependency-tracker.mjs";
+import * as React from "react";
+import { useQuery } from "@tanstack/react-query";
 import { useFormContext, useWatch } from "react-hook-form";
 
 //#region src/client/hooks/use-field-hooks.ts
@@ -43,44 +45,65 @@ function createHookContext(form, fieldName, locale) {
 */
 function useFieldHooks({ fieldName, fullFieldName, locale, compute, onChange, defaultValue, loadOptions, staticOptions }) {
 	const form = useFormContext();
-	const [asyncOptions, setAsyncOptions] = React$1.useState(void 0);
-	const [optionsLoading, setOptionsLoading] = React$1.useState(false);
-	const [loadOptionsDeps, setLoadOptionsDeps] = React$1.useState([]);
-	const hookCtx = React$1.useMemo(() => createHookContext(form, fieldName, locale), [
+	const [loadOptionsDeps, setLoadOptionsDeps] = React.useState([]);
+	const [computeDeps, setComputeDeps] = React.useState([]);
+	const hookCtx = React.useMemo(() => createHookContext(form, fieldName, locale), [
 		form,
 		fieldName,
 		locale
 	]);
-	const watchedValues = useWatch({ control: form.control });
-	const allValues = React$1.useMemo(() => watchedValues ?? {}, [watchedValues]);
-	React$1.useEffect(() => {
-		if (!loadOptions) return;
-		const values = form.getValues();
-		const deps = [];
-		const proxy = new Proxy(values, { get(target, prop) {
-			if (typeof prop === "string" && !prop.startsWith("_")) deps.push(prop);
-			return target[prop];
-		} });
-		try {
-			loadOptions(proxy);
-		} catch {}
-		setLoadOptionsDeps([...new Set(deps)]);
+	React.useEffect(() => {
+		if (!compute) {
+			setComputeDeps([]);
+			return;
+		}
+		const tracked = trackDependencies(form.getValues() ?? {}, compute);
+		setComputeDeps([...new Set(tracked.deps)]);
+	}, [compute, form]);
+	React.useEffect(() => {
+		if (!loadOptions) {
+			setLoadOptionsDeps([]);
+			return;
+		}
+		const tracked_0 = trackDependencies(form.getValues() ?? {}, (proxyValues) => {
+			loadOptions(proxyValues);
+			return null;
+		});
+		setLoadOptionsDeps([...new Set(tracked_0.deps)]);
 	}, [loadOptions, form]);
-	const computedValue = React$1.useMemo(() => {
+	const watchedDeps = React.useMemo(() => [...new Set([...computeDeps, ...loadOptionsDeps])], [computeDeps, loadOptionsDeps]);
+	const watchedDepValues = useWatch({
+		control: form.control,
+		name: watchedDeps,
+		disabled: watchedDeps.length === 0
+	});
+	const watchedDepMap = React.useMemo(() => {
+		const depMap = {};
+		if (watchedDeps.length === 0) return depMap;
+		const values_1 = Array.isArray(watchedDepValues) ? watchedDepValues : [watchedDepValues];
+		for (const [index, dep] of watchedDeps.entries()) depMap[dep] = values_1[index];
+		return depMap;
+	}, [watchedDeps, watchedDepValues]);
+	const computeDepKey = React.useMemo(() => {
+		if (!computeDeps.length) return "";
+		return JSON.stringify(computeDeps.map((dep_0) => watchedDepMap[dep_0]));
+	}, [computeDeps, watchedDepMap]);
+	const computedValue = React.useMemo(() => {
 		if (!compute) return void 0;
 		try {
-			return compute(allValues);
+			return compute(form.getValues() ?? {});
 		} catch (error) {
 			console.error(`Compute error for ${fieldName}:`, error);
 			return;
 		}
 	}, [
 		compute,
-		allValues,
-		fieldName
+		form,
+		fieldName,
+		computeDepKey
 	]);
-	const defaultValueInitialized = React$1.useRef(false);
-	React$1.useEffect(() => {
+	const defaultValueInitialized = React.useRef(false);
+	React.useEffect(() => {
 		if (defaultValueInitialized.current) return;
 		if (defaultValue === void 0) return;
 		if (compute) {
@@ -95,8 +118,8 @@ function useFieldHooks({ fieldName, fullFieldName, locale, compute, onChange, de
 		const initDefaultValue = async () => {
 			let resolvedValue;
 			if (typeof defaultValue === "function") {
-				const values = form.getValues();
-				resolvedValue = await Promise.resolve(defaultValue(values));
+				const values_3 = form.getValues();
+				resolvedValue = await Promise.resolve(defaultValue(values_3));
 			} else resolvedValue = defaultValue;
 			const currentVal = form.getValues(fullFieldName);
 			if (currentVal === void 0 || currentVal === null) form.setValue(fullFieldName, resolvedValue, {
@@ -112,39 +135,25 @@ function useFieldHooks({ fieldName, fullFieldName, locale, compute, onChange, de
 		form,
 		compute
 	]);
-	const trackedDepValues = React$1.useMemo(() => {
-		if (!loadOptionsDeps.length) return [];
-		return loadOptionsDeps.map((dep) => allValues[dep]);
-	}, [loadOptionsDeps, allValues]);
-	const trackedDepKey = React$1.useMemo(() => JSON.stringify(trackedDepValues), [trackedDepValues]);
-	const initialOptionsLoadDone = React$1.useRef(false);
-	const prevDepKeyRef = React$1.useRef("");
-	React$1.useEffect(() => {
-		if (!loadOptions) return;
-		if (loadOptionsDeps.length === 0 && !initialOptionsLoadDone.current) return;
-		if (!(!initialOptionsLoadDone.current || prevDepKeyRef.current !== trackedDepKey)) return;
-		prevDepKeyRef.current = trackedDepKey;
-		initialOptionsLoadDone.current = true;
-		const fetchOptions = async () => {
-			setOptionsLoading(true);
-			try {
-				setAsyncOptions(await loadOptions(allValues));
-			} catch (error) {
-				console.error(`Failed to load options for ${fieldName}:`, error);
-				setAsyncOptions([]);
-			} finally {
-				setOptionsLoading(false);
-			}
-		};
-		fetchOptions();
-	}, [
-		loadOptions,
-		loadOptionsDeps,
-		trackedDepKey,
-		allValues,
-		fieldName
-	]);
-	const handleChange = React$1.useCallback((value) => {
+	const { data: asyncOptions, isLoading: optionsLoading } = useQuery({
+		queryKey: [
+			"questpie",
+			"field-hooks-options",
+			fieldName,
+			React.useMemo(() => {
+				if (!loadOptionsDeps.length) return "";
+				return JSON.stringify(loadOptionsDeps.map((dep_1) => watchedDepMap[dep_1]));
+			}, [loadOptionsDeps, watchedDepMap])
+		],
+		queryFn: async () => {
+			if (!loadOptions) return [];
+			return loadOptions(form.getValues() ?? {});
+		},
+		enabled: !!loadOptions && loadOptionsDeps.length > 0,
+		staleTime: 3e4,
+		placeholderData: (prev) => prev
+	});
+	const handleChange = React.useCallback((value) => {
 		if (compute) return;
 		form.setValue(fullFieldName, value, {
 			shouldDirty: true,
@@ -155,8 +164,8 @@ function useFieldHooks({ fieldName, fullFieldName, locale, compute, onChange, de
 			const runOnChange = async () => {
 				try {
 					await Promise.resolve(onChange(value, hookCtx));
-				} catch (error) {
-					console.error(`onChange error for ${fieldName}:`, error);
+				} catch (error_0) {
+					console.error(`onChange error for ${fieldName}:`, error_0);
 				}
 			};
 			runOnChange();
@@ -169,7 +178,7 @@ function useFieldHooks({ fieldName, fullFieldName, locale, compute, onChange, de
 		fieldName,
 		compute
 	]);
-	const options = React$1.useMemo(() => {
+	const options = React.useMemo(() => {
 		if (loadOptions) return asyncOptions;
 		return staticOptions;
 	}, [
@@ -187,5 +196,4 @@ function useFieldHooks({ fieldName, fullFieldName, locale, compute, onChange, de
 }
 
 //#endregion
-export { useFieldHooks };
-//# sourceMappingURL=use-field-hooks.mjs.map
+export { useFieldHooks };

package/dist/client/hooks/use-field-options.d.mts

@@ -1,17 +1,10 @@
 import { SerializedOptionsConfig } from "questpie";
 
 //#region src/client/hooks/use-field-options.d.ts
-
-/**
- * Option item
- */
 interface OptionItem {
   value: string | number;
   label: string | Record<string, string>;
 }
-/**
- * Options for useFieldOptions hook
- */
 interface UseFieldOptionsOptions {
   /** Collection or global name */
   collection: string;
@@ -30,9 +23,6 @@ interface UseFieldOptionsOptions {
   /** Whether to enable fetching */
   enabled?: boolean;
 }
-/**
- * Result from useFieldOptions hook
- */
 interface UseFieldOptionsResult {
   /** Current options */
   options: OptionItem[];
@@ -53,28 +43,6 @@ interface UseFieldOptionsResult {
   /** Error */
   error: Error | null;
 }
-/**
- * Hook to fetch dynamic options for select/relation fields.
- * Supports search, pagination, and dependency-based refetching.
- *
- * @example
- * ```tsx
- * const { options, isLoading, search, setSearch, loadMore } = useFieldOptions({
- *   collection: "orders",
- *   field: "items.0.city",
- *   optionsConfig: schema.fields.city.reactive?.options,
- * });
- *
- * return (
- *   <Select
- *     options={options}
- *     isLoading={isLoading}
- *     onInputChange={setSearch}
- *     onMenuScrollToBottom={loadMore}
- *   />
- * );
- * ```
- */
 declare function useFieldOptions({
   collection,
   mode,
@@ -86,5 +54,4 @@ declare function useFieldOptions({
   enabled
 }: UseFieldOptionsOptions): UseFieldOptionsResult;
 //#endregion
-export { OptionItem, UseFieldOptionsOptions, UseFieldOptionsResult, useFieldOptions };
-//# sourceMappingURL=use-field-options.d.mts.map
+export { OptionItem, UseFieldOptionsOptions, UseFieldOptionsResult, useFieldOptions };