@questpie/admin 3.0.3 → 3.0.5

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

@@ -1,3 +1,4 @@
+import { useValidationTranslator } from "./use-validation-error-map.mjs";
 import { useCollectionSchema } from "./use-collection-schema.mjs";
 import { useGlobalSchema } from "./use-global-schema.mjs";
 import { c } from "react/compiler-runtime";
@@ -37,6 +38,112 @@ function stripAdditionalProperties(schema) {
 	if (s.items) s.items = stripAdditionalProperties(s.items);
 	return s;
 }
+function translateResolverErrors(errors, translate, parentPath = "") {
+	const translatedErrors = Array.isArray(errors) ? [...errors] : { ...errors };
+	for (const [key, value] of Object.entries(translatedErrors)) {
+		if (!value || typeof value !== "object") continue;
+		const path = parentPath ? `${parentPath}.${key}` : key;
+		if (isFieldError(value)) translatedErrors[key] = translateFieldError(value, translate, path);
+		else translatedErrors[key] = translateResolverErrors(value, translate, path);
+	}
+	return translatedErrors;
+}
+function isFieldError(value) {
+	return "message" in value || "type" in value;
+}
+function translateFieldError(error, translate, path) {
+	const translated = translateAjvMessage(error, translate, path);
+	const types = error.types && typeof error.types === "object" ? Object.fromEntries(Object.entries(error.types).map(([key, value]) => [key, Array.isArray(value) ? value.map((message) => translateAjvMessage({
+		...error,
+		type: key,
+		message: String(message)
+	}, translate, path)) : translateAjvMessage({
+		...error,
+		type: key,
+		message: String(value)
+	}, translate, path)])) : error.types;
+	return {
+		...error,
+		message: translated,
+		...types && { types }
+	};
+}
+function translateAjvMessage(error, translate, field) {
+	const message = typeof error.message === "string" ? error.message : "";
+	const type = typeof error.type === "string" ? error.type : "";
+	const baseParams = { field };
+	if (message.startsWith("validation.")) return translate(message, baseParams);
+	switch (type) {
+		case "required": return translate("validation.required", baseParams);
+		case "type": return translate("validation.invalidType", {
+			...baseParams,
+			expected: extractExpectedType(message) ?? "unknown",
+			received: extractReceivedType(message) ?? "unknown"
+		});
+		case "enum": return translate("validation.enum.invalid", baseParams);
+		case "minLength": return translate("validation.string.min", {
+			...baseParams,
+			min: extractFirstNumber(message) ?? ""
+		});
+		case "maxLength": return translate("validation.string.max", {
+			...baseParams,
+			max: extractFirstNumber(message) ?? ""
+		});
+		case "pattern": return translate("validation.string.regex", baseParams);
+		case "format": return translate(formatMessageToValidationKey(message), baseParams);
+		case "minimum":
+		case "exclusiveMinimum": return translate("validation.number.min", {
+			...baseParams,
+			min: extractFirstNumber(message) ?? ""
+		});
+		case "maximum":
+		case "exclusiveMaximum": return translate("validation.number.max", {
+			...baseParams,
+			max: extractFirstNumber(message) ?? ""
+		});
+		case "minItems": return translate("validation.array.min", {
+			...baseParams,
+			min: extractFirstNumber(message) ?? ""
+		});
+		case "maxItems": return translate("validation.array.max", {
+			...baseParams,
+			max: extractFirstNumber(message) ?? ""
+		});
+		default: return interpolateMessage(message, baseParams);
+	}
+}
+function extractFirstNumber(message) {
+	const match = message.match(/\d+/);
+	return match ? Number(match[0]) : void 0;
+}
+function extractExpectedType(message) {
+	return message.match(/must be (?:a |an )?([A-Za-z_][\w-]*)/)?.[1] ?? message.match(/expected ([A-Za-z_][\w-]*)/)?.[1];
+}
+function extractReceivedType(message) {
+	return message.match(/received ([A-Za-z_][\w-]*)/)?.[1];
+}
+function formatMessageToValidationKey(message) {
+	if (message.includes("\"email\"")) return "validation.string.email";
+	if (message.includes("\"uri\"") || message.includes("\"url\"")) return "validation.string.url";
+	if (message.includes("\"date-time\"")) return "validation.string.datetime";
+	if (message.includes("\"time\"")) return "validation.time.invalid";
+	return "validation.string.regex";
+}
+function interpolateMessage(message, params) {
+	return message.replace(/\{\{(\w+)\}\}/g, (_, key) => {
+		const value = params[key];
+		return value !== void 0 ? String(value) : "";
+	});
+}
+function withTranslatedResolver(resolver, translate) {
+	return async (values, context, options) => {
+		const result = await resolver(values, context, options);
+		return {
+			...result,
+			errors: translateResolverErrors(result.errors, translate)
+		};
+	};
+}
 /**
 * Hook to create a react-hook-form resolver using server's JSON Schema
 *
@@ -80,77 +187,82 @@ function stripAdditionalProperties(schema) {
 * ```
 */
 function useServerValidation(collection, t0) {
-	const $ = c(17);
+	const $ = c(18);
 	let t1;
 	if ($[0] !== t0) {
 		t1 = t0 === void 0 ? {} : t0;
 		$[0] = t0;
 		$[1] = t1;
 	} else t1 = $[1];
-	const { mode: t2, enabled: t3 } = t1;
+	const { mode: t2, enabled: t3, schema: schemaOverride } = t1;
 	const mode = t2 === void 0 ? "create" : t2;
 	const enabled = t3 === void 0 ? true : t3;
+	const translateValidation = useValidationTranslator();
+	const shouldFetchSchema = enabled && !schemaOverride;
 	let t4;
-	if ($[2] !== enabled) {
-		t4 = { enabled };
-		$[2] = enabled;
+	if ($[2] !== shouldFetchSchema) {
+		t4 = { enabled: shouldFetchSchema };
+		$[2] = shouldFetchSchema;
 		$[3] = t4;
 	} else t4 = $[3];
-	const { data: schema, isLoading, error } = useCollectionSchema(collection, t4);
+	const { data: queriedSchema, isLoading: queriedIsLoading, error: queriedError } = useCollectionSchema(collection, t4);
+	const schema = schemaOverride ?? queriedSchema;
+	const isLoading = schemaOverride ? false : queriedIsLoading;
+	const error = schemaOverride ? null : queriedError;
 	let t5;
-	if ($[4] !== collection || $[5] !== error || $[6] !== isLoading || $[7] !== mode || $[8] !== schema?.validation?.insert || $[9] !== schema?.validation?.update) {
+	if ($[4] !== collection || $[5] !== error || $[6] !== isLoading || $[7] !== mode || $[8] !== schema?.validation?.insert || $[9] !== schema?.validation?.update || $[10] !== translateValidation) {
 		bb0: {
 			const jsonSchema = stripAdditionalProperties(mode === "create" ? schema?.validation?.insert : schema?.validation?.update);
 			if (!jsonSchema || typeof jsonSchema !== "object") {
 				const t6 = error ?? null;
 				let t7;
-				if ($[11] !== isLoading || $[12] !== t6) {
+				if ($[12] !== isLoading || $[13] !== t6) {
 					t7 = {
 						resolver: void 0,
 						hasServerSchema: false,
 						isLoading,
 						error: t6
 					};
-					$[11] = isLoading;
-					$[12] = t6;
-					$[13] = t7;
-				} else t7 = $[13];
+					$[12] = isLoading;
+					$[13] = t6;
+					$[14] = t7;
+				} else t7 = $[14];
 				t5 = t7;
 				break bb0;
 			}
 			try {
-				const resolver = ajvResolver(jsonSchema, {
+				const resolver = withTranslatedResolver(ajvResolver(jsonSchema, {
 					allErrors: true,
 					strict: false,
 					coerceTypes: true,
 					useDefaults: true,
 					formats: {}
-				}, { mode: "async" });
+				}, { mode: "async" }), translateValidation);
 				let t7;
-				if ($[14] !== resolver) {
+				if ($[15] !== resolver) {
 					t7 = {
 						resolver,
 						hasServerSchema: true,
 						isLoading: false,
 						error: null
 					};
-					$[14] = resolver;
-					$[15] = t7;
-				} else t7 = $[15];
+					$[15] = resolver;
+					$[16] = t7;
+				} else t7 = $[16];
 				t5 = t7;
 			} catch (t6) {
 				const e = t6;
 				console.warn(`[useServerValidation] Failed to compile JSON Schema for ${collection}:`, e);
 				let t7;
-				if ($[16] === Symbol.for("react.memo_cache_sentinel")) {
+				if ($[17] === Symbol.for("react.memo_cache_sentinel")) {
 					t7 = {
 						resolver: void 0,
 						hasServerSchema: false,
 						isLoading: false,
 						error: e instanceof Error ? e : new Error(String(e))
 					};
-					$[16] = t7;
-				} else t7 = $[16];
+					$[17] = t7;
+				} else t7 = $[17];
 				t5 = t7;
 			}
 		}
@@ -160,8 +272,9 @@ function useServerValidation(collection, t0) {
 		$[7] = mode;
 		$[8] = schema?.validation?.insert;
 		$[9] = schema?.validation?.update;
-		$[10] = t5;
-	} else t5 = $[10];
+		$[10] = translateValidation;
+		$[11] = t5;
+	} else t5 = $[11];
 	return t5;
 }
 /**
@@ -206,7 +319,7 @@ function usePreferServerValidation(collection, t0, fallbackResolver) {
 * @returns Server validation result with resolver
 */
 function useGlobalServerValidation(globalName, t0) {
-	const $ = c(15);
+	const $ = c(16);
 	let t1;
 	if ($[0] !== t0) {
 		t1 = t0 === void 0 ? {} : t0;
@@ -215,6 +328,7 @@ function useGlobalServerValidation(globalName, t0) {
 	} else t1 = $[1];
 	const { enabled: t2 } = t1;
 	const enabled = t2 === void 0 ? true : t2;
+	const translateValidation = useValidationTranslator();
 	let t3;
 	if ($[2] !== enabled) {
 		t3 = { enabled };
@@ -223,58 +337,58 @@ function useGlobalServerValidation(globalName, t0) {
 	} else t3 = $[3];
 	const { data: schema, isLoading, error } = useGlobalSchema(globalName, t3);
 	let t4;
-	if ($[4] !== error || $[5] !== globalName || $[6] !== isLoading || $[7] !== schema?.validation?.update) {
+	if ($[4] !== error || $[5] !== globalName || $[6] !== isLoading || $[7] !== schema?.validation?.update || $[8] !== translateValidation) {
 		bb0: {
 			const jsonSchema = stripAdditionalProperties(schema?.validation?.update);
 			if (!jsonSchema || typeof jsonSchema !== "object") {
 				const t5 = error ?? null;
 				let t6;
-				if ($[9] !== isLoading || $[10] !== t5) {
+				if ($[10] !== isLoading || $[11] !== t5) {
 					t6 = {
 						resolver: void 0,
 						hasServerSchema: false,
 						isLoading,
 						error: t5
 					};
-					$[9] = isLoading;
-					$[10] = t5;
-					$[11] = t6;
-				} else t6 = $[11];
+					$[10] = isLoading;
+					$[11] = t5;
+					$[12] = t6;
+				} else t6 = $[12];
 				t4 = t6;
 				break bb0;
 			}
 			try {
-				const resolver = ajvResolver(jsonSchema, {
+				const resolver = withTranslatedResolver(ajvResolver(jsonSchema, {
 					allErrors: true,
 					strict: false,
 					coerceTypes: true,
 					useDefaults: true
-				}, { mode: "async" });
+				}, { mode: "async" }), translateValidation);
 				let t6;
-				if ($[12] !== resolver) {
+				if ($[13] !== resolver) {
 					t6 = {
 						resolver,
 						hasServerSchema: true,
 						isLoading: false,
 						error: null
 					};
-					$[12] = resolver;
-					$[13] = t6;
-				} else t6 = $[13];
+					$[13] = resolver;
+					$[14] = t6;
+				} else t6 = $[14];
 				t4 = t6;
 			} catch (t5) {
 				const e = t5;
 				console.warn(`[useGlobalServerValidation] Failed to compile JSON Schema for ${globalName}:`, e);
 				let t6;
-				if ($[14] === Symbol.for("react.memo_cache_sentinel")) {
+				if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
 					t6 = {
 						resolver: void 0,
 						hasServerSchema: false,
 						isLoading: false,
 						error: e instanceof Error ? e : new Error(String(e))
 					};
-					$[14] = t6;
-				} else t6 = $[14];
+					$[15] = t6;
+				} else t6 = $[15];
 				t4 = t6;
 			}
 		}
@@ -282,8 +396,9 @@ function useGlobalServerValidation(globalName, t0) {
 		$[5] = globalName;
 		$[6] = isLoading;
 		$[7] = schema?.validation?.update;
-		$[8] = t4;
-	} else t4 = $[8];
+		$[8] = translateValidation;
+		$[9] = t4;
+	} else t4 = $[9];
 	return t4;
 }
 

package/dist/client/hooks/use-server-widget-data.mjs

@@ -42,7 +42,7 @@ function useServerWidgetData(widgetId, options) {
 		$[3] = widgetId;
 		$[4] = t1;
 	} else t1 = $[4];
-	const t2 = options?.enabled ?? true;
+	const t2 = !!widgetId && (options?.enabled ?? true);
 	const t3 = options?.refreshInterval;
 	let t4;
 	if ($[5] !== t0 || $[6] !== t1 || $[7] !== t2 || $[8] !== t3) {

package/dist/client/hooks/use-setup-status.d.mts

@@ -5,17 +5,17 @@ import * as _tanstack_react_query0 from "@tanstack/react-query";
 /**
  * Setup Status Hook
  *
- * Hook to check if the app setup is required (no users exist).
+ * Hook to check if the app setup is required (no admin users exist).
  * Useful for redirecting to setup page on first visit.
  */
 interface SetupStatus {
-  /** Whether setup is required (no users exist) */
+  /** Whether setup is required (no admin users exist) */
   required: boolean;
 }
 /**
  * Check if setup is required.
  *
- * Returns `required: true` if no users exist in the system,
+ * Returns `required: true` if no admin users exist in the system,
  * meaning the setup page should be shown to create the first admin.
  *
  * @example

package/dist/client/hooks/use-setup-status.mjs

@@ -6,13 +6,13 @@ import { useQuery } from "@tanstack/react-query";
 /**
 * Setup Status Hook
 *
-* Hook to check if the app setup is required (no users exist).
+* Hook to check if the app setup is required (no admin users exist).
 * Useful for redirecting to setup page on first visit.
 */
 /**
 * Check if setup is required.
 *
-* Returns `required: true` if no users exist in the system,
+* Returns `required: true` if no admin users exist in the system,
 * meaning the setup page should be shown to create the first admin.
 *
 * @example

package/dist/client/hooks/use-transition-stage.mjs

@@ -80,16 +80,8 @@ function useTransitionStage(resourceName, options) {
 	let t2;
 	if ($[6] !== mode || $[7] !== queryClient || $[8] !== resourceName) {
 		t2 = () => {
-			if (mode === "collection") queryClient.invalidateQueries({ queryKey: [
-				"questpie",
-				"collections",
-				resourceName
-			] });
-			else queryClient.invalidateQueries({ queryKey: [
-				"questpie",
-				"globals",
-				resourceName
-			] });
+			if (mode === "collection") queryClient.invalidateQueries({ queryKey: ["questpie", "collections"] });
+			else queryClient.invalidateQueries({ queryKey: ["questpie", "globals"] });
 			queryClient.invalidateQueries({ queryKey: [
 				"questpie",
 				"audit",

package/dist/client/hooks/use-validation-error-map.mjs

@@ -1,6 +1,6 @@
 import { useSafeI18n } from "../i18n/hooks.mjs";
 import { c } from "react/compiler-runtime";
-import { createZodErrorMap } from "questpie/shared";
+import { createValidationTranslator, createZodErrorMap } from "questpie/shared";
 
 //#region src/client/hooks/use-validation-error-map.ts
 /**
@@ -33,25 +33,43 @@ import { createZodErrorMap } from "questpie/shared";
 * }
 * ```
 */
+function useValidationTranslator() {
+	const $ = c(5);
+	const i18n = useSafeI18n();
+	const t0 = i18n?.locale;
+	let t1;
+	if ($[0] !== t0) {
+		t1 = createValidationTranslator(void 0, t0);
+		$[0] = t0;
+		$[1] = t1;
+	} else t1 = $[1];
+	const fallbackTranslate = t1;
+	let t2;
+	if ($[2] !== fallbackTranslate || $[3] !== i18n) {
+		t2 = (key, params) => {
+			if (i18n) {
+				const translated = i18n.t(key, params);
+				if (translated !== key) return translated;
+			}
+			return fallbackTranslate(key, params);
+		};
+		$[2] = fallbackTranslate;
+		$[3] = i18n;
+		$[4] = t2;
+	} else t2 = $[4];
+	return t2;
+}
 function useValidationErrorMap() {
 	const $ = c(2);
-	const i18n = useSafeI18n();
+	const translate = useValidationTranslator();
 	let t0;
-	if ($[0] !== i18n) {
-		const translate = (key, params) => {
-			if (i18n) return i18n.t(key, params);
-			if (!params) return key;
-			return key.replace(/\{\{(\w+)\}\}/g, (_, paramKey) => {
-				const value = params[paramKey];
-				return value !== void 0 ? String(value) : `{{${paramKey}}}`;
-			});
-		};
+	if ($[0] !== translate) {
 		t0 = createZodErrorMap(translate);
-		$[0] = i18n;
+		$[0] = translate;
 		$[1] = t0;
 	} else t0 = $[1];
 	return t0;
 }
 
 //#endregion
-export { useValidationErrorMap };
+export { useValidationErrorMap, useValidationTranslator };