@vuehookform/core 0.4.7 → 0.6.0

package/dist/vuehookform.js

@@ -539,14 +539,15 @@ function clearFieldTouched(touchedFields, fieldName) {
 }
 function clearFieldErrors(errors, fieldName) {
 	const currentErrors = errors.value;
-	const keys = Object.keys(currentErrors);
-	if (keys.length === 0) return;
+	if (Object.keys(currentErrors).length === 0) return;
+	const nestedError = get(currentErrors, fieldName);
 	const prefix = `${fieldName}.`;
-	const keysToDelete = [];
-	for (const key of keys) if (key === fieldName || key.startsWith(prefix)) keysToDelete.push(key);
-	if (keysToDelete.length === 0) return;
+	const flatKeysToDelete = [];
+	for (const key of Object.keys(currentErrors)) if (key === fieldName || key.startsWith(prefix)) flatKeysToDelete.push(key);
+	if (nestedError === void 0 && flatKeysToDelete.length === 0) return;
 	const newErrors = { ...currentErrors };
-	for (const key of keysToDelete) delete newErrors[key];
+	for (const key of flatKeysToDelete) delete newErrors[key];
+	if (nestedError !== void 0) unset(newErrors, fieldName);
 	errors.value = newErrors;
 }
 function updateFieldDirtyState(dirtyFields, defaultValues, defaultValueHashes, fieldName, currentValue) {
@@ -590,7 +591,6 @@ function createFieldError(errors, criteriaMode = "firstError") {
 	const firstError = errors[0];
 	if (!firstError) return "";
 	if (criteriaMode === "firstError") return firstError.message;
-	if (errors.length === 1) return firstError.message;
 	const types = {};
 	for (const err of errors) {
 		const existing = types[err.type];
@@ -843,13 +843,13 @@ function createFieldRegistration(ctx, validate) {
 				const error = await fieldOpts.validate(value);
 				if (requestId !== ctx.validationRequestIds.get(fieldName)) return;
 				if (ctx.resetGeneration.value !== resetGenAtStart) return;
-				if (error) ctx.errors.value = {
-					...ctx.errors.value,
-					[fieldName]: error
-				};
-				else {
+				if (error) {
+					const newErrors = { ...ctx.errors.value };
+					set(newErrors, fieldName, error);
+					ctx.errors.value = newErrors;
+				} else {
 					const newErrors = { ...ctx.errors.value };
-					delete newErrors[fieldName];
+					unset(newErrors, fieldName);
 					ctx.errors.value = newErrors;
 				}
 			};
@@ -1008,7 +1008,7 @@ function createFieldRegistration(ctx, validate) {
 		unregister
 	};
 }
-function createFieldArrayManager(ctx, validate, setFocus) {
+function createFieldArrayManager(ctx, validate, setFocus, formMethods) {
 	function fields(name, options) {
 		if (__DEV__) {
 			const syntaxError = validatePathSyntax(name);
@@ -1052,16 +1052,76 @@ function createFieldArrayManager(ctx, validate, setFocus) {
 				if (item) indexCache.set(item.key, i);
 			}
 		};
-		const createItem = (key) => ({
-			key,
-			get index() {
-				return indexCache.get(key) ?? -1;
-			},
-			remove() {
-				const currentIndex = indexCache.get(key) ?? -1;
-				if (currentIndex !== -1) removeAt(currentIndex);
-			}
-		});
+		const buildPath = (index, subPath) => {
+			return subPath ? `${name}.${index}.${subPath}` : `${name}.${index}`;
+		};
+		const createScopedMethods = (indexGetter) => {
+			return {
+				register: (subPath, options$1) => formMethods.register(buildPath(indexGetter(), subPath), options$1),
+				setValue: (subPath, value, options$1) => formMethods.setValue(buildPath(indexGetter(), subPath), value, options$1),
+				getValue: (subPath) => formMethods.getValues(buildPath(indexGetter(), subPath)),
+				watch: (subPath) => formMethods.watch(buildPath(indexGetter(), subPath)),
+				getFieldState: (subPath) => formMethods.getFieldState(buildPath(indexGetter(), subPath)),
+				trigger: (subPath) => {
+					const index = indexGetter();
+					if (!subPath) return formMethods.trigger(buildPath(index));
+					if (Array.isArray(subPath)) return formMethods.trigger(subPath.map((p) => buildPath(index, p)));
+					return formMethods.trigger(buildPath(index, subPath));
+				},
+				clearErrors: (subPath) => {
+					const index = indexGetter();
+					if (!subPath) {
+						formMethods.clearErrors(buildPath(index));
+						return;
+					}
+					if (Array.isArray(subPath)) {
+						formMethods.clearErrors(subPath.map((p) => buildPath(index, p)));
+						return;
+					}
+					formMethods.clearErrors(buildPath(index, subPath));
+				},
+				setError: (subPath, error) => formMethods.setError(buildPath(indexGetter(), subPath), error)
+			};
+		};
+		const createItem = (key) => {
+			const getIndex = () => indexCache.get(key) ?? -1;
+			let scoped = null;
+			const getScoped = () => scoped ??= createScopedMethods(getIndex);
+			return {
+				key,
+				get index() {
+					return getIndex();
+				},
+				remove() {
+					const currentIndex = getIndex();
+					if (currentIndex !== -1) removeAt(currentIndex);
+				},
+				get register() {
+					return getScoped().register;
+				},
+				get setValue() {
+					return getScoped().setValue;
+				},
+				get getValue() {
+					return getScoped().getValue;
+				},
+				get watch() {
+					return getScoped().watch;
+				},
+				get getFieldState() {
+					return getScoped().getFieldState;
+				},
+				get trigger() {
+					return getScoped().trigger;
+				},
+				get clearErrors() {
+					return getScoped().clearErrors;
+				},
+				get setError() {
+					return getScoped().setError;
+				}
+			};
+		};
 		if (fa.items.value.length === 0 && fa.values.length > 0) {
 			fa.items.value = fa.values.map(() => createItem(generateId()));
 			rebuildIndexCache();
@@ -1378,8 +1438,6 @@ function useForm(options) {
 		el.focus();
 		if (focusOptions?.shouldSelect && el instanceof HTMLInputElement && typeof el.select === "function") el.select();
 	}
-	const setFocusWrapper = (name) => setFocus(name);
-	const { fields } = createFieldArrayManager(ctx, validate, setFocusWrapper);
 	let lastSyncTime = 0;
 	const SYNC_DEBOUNCE_MS = 16;
 	function syncWithDebounce() {
@@ -1469,7 +1527,7 @@ function useForm(options) {
 			try {
 				syncWithDebounce();
 				if (await validate()) {
-					await onValid(ctx.formData);
+					await onValid(deepClone(ctx.formData));
 					ctx.isSubmitSuccessful.value = true;
 				} else {
 					onInvalid?.(formState.value.errors);
@@ -1551,7 +1609,6 @@ function useForm(options) {
 			}
 		}
 		const opts = resetFieldOptions || {};
-		ctx.resetGeneration.value++;
 		ctx.validationCache.delete(`${name}:partial`);
 		ctx.validationCache.delete(`${name}:full`);
 		const errorTimer = ctx.errorDelayTimers.get(name);
@@ -1560,6 +1617,11 @@ function useForm(options) {
 			ctx.errorDelayTimers.delete(name);
 		}
 		ctx.pendingErrors.delete(name);
+		const schemaTimer = ctx.schemaValidationTimers.get(name);
+		if (schemaTimer) {
+			clearTimeout(schemaTimer);
+			ctx.schemaValidationTimers.delete(name);
+		}
 		let defaultValue = opts.defaultValue;
 		if (defaultValue === void 0) defaultValue = get(ctx.defaultValues, name);
 		else {
@@ -1672,13 +1734,13 @@ function useForm(options) {
 			}
 		}
 		syncWithDebounce();
-		if (nameOrNames === void 0) return { ...ctx.formData };
+		if (nameOrNames === void 0) return deepClone(ctx.formData);
 		if (Array.isArray(nameOrNames)) {
 			const result = {};
-			for (const fieldName of nameOrNames) result[fieldName] = get(ctx.formData, fieldName);
+			for (const fieldName of nameOrNames) result[fieldName] = deepClone(get(ctx.formData, fieldName));
 			return result;
 		}
-		return get(ctx.formData, nameOrNames);
+		return deepClone(get(ctx.formData, nameOrNames));
 	}
 	function getFieldState(name) {
 		if (__DEV__) {
@@ -1712,13 +1774,20 @@ function useForm(options) {
 		}
 		if (options$1?.markAsSubmitted) ctx.submitCount.value++;
 		if (name === void 0) return await validate();
-		if (Array.isArray(name)) {
-			let allValid = true;
-			for (const fieldName of name) if (!await validate(fieldName)) allValid = false;
-			return allValid;
-		}
+		if (Array.isArray(name)) return (await Promise.all(name.map((fieldName) => validate(fieldName)))).every((isValid) => isValid);
 		return await validate(name);
 	}
+	const setFocusWrapper = (name) => setFocus(name);
+	const { fields } = createFieldArrayManager(ctx, validate, setFocusWrapper, {
+		register: (name, options$1) => register(name, options$1),
+		setValue: (name, value, options$1) => setValue(name, value, options$1),
+		getValues: (name) => getValues(name),
+		watch: (name) => watch$1(name),
+		getFieldState: (name) => getFieldState(name),
+		trigger: (name) => trigger(name),
+		clearErrors: (name) => clearErrors(name),
+		setError: (name, error) => setError(name, error)
+	});
 	return {
 		register,
 		unregister,
@@ -1838,3 +1907,5 @@ function isFieldError(error) {
 	return typeof error === "object" && error !== null && "type" in error && "message" in error && typeof error.type === "string" && typeof error.message === "string";
 }
 export { FormContextKey, clearPathCache, get, isFieldError, provideForm, set, unset, useController, useForm, useFormContext, useFormState, useWatch };
+
+//# sourceMappingURL=vuehookform.js.map