@octanejs/hook-form 0.1.58 → 0.1.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/hook-form",
-  "version": "0.1.58",
+  "version": "0.1.60",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -32,23 +32,23 @@
     ".": "./src/index.ts"
   },
   "peerDependencies": {
-    "octane": "^0.10.0"
+    "octane": "^0.12.0"
   },
   "devDependencies": {
-    "@octanejs/testing-library": "0.1.60",
+    "@octanejs/testing-library": "0.1.62",
     "@swc/core": "1.15.41",
     "@swc/jest": "0.2.39",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "16.3.2",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
-    "@tsrx/react": "^0.3.7",
+    "@tsrx/react": "^0.4.5",
     "esbuild": "^0.28.1",
     "jest": "30.4.2",
     "jest-environment-jsdom": "30.4.1",
     "jest-environment-node": "30.4.1",
     "jest-fixed-jsdom": "0.0.10",
-    "octane": "0.10.2",
+    "octane": "0.12.0",
     "react": "19.2.7",
     "react-dom": "19.2.7",
     "react-hook-form": "7.81.0",

package/src/FormProvider.tsrx

@@ -77,8 +77,8 @@ export function FormProvider<
 	);
 
 	<HookFormContext value={memoizedValue as unknown as UseFormReturn}>
-		<HookFormControlContext
-			value={memoizedValue.control as Control}
-		>{children}</HookFormControlContext>
+		<HookFormControlContext value={memoizedValue.control as Control}>
+			{children}
+		</HookFormControlContext>
 	</HookFormContext>
 }

package/src/controller.tsrx

@@ -10,6 +10,6 @@ export const Controller = <
 	TFieldValues extends FieldValues = FieldValues,
 	TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
 	TTransformedValues = TFieldValues,
->(props: ControllerProps<TFieldValues, TName, TTransformedValues>) => props.render(
-	useController<TFieldValues, TName, TTransformedValues>(props),
-);
+>(
+	props: ControllerProps<TFieldValues, TName, TTransformedValues>,
+) => props.render(useController<TFieldValues, TName, TTransformedValues>(props));

package/src/form.tsrx

@@ -29,79 +29,83 @@ export function Form<TFieldValues extends FieldValues, TTransformedValues = TFie
 		...rest
 	} = props;
 
-	const submit = useCallback(async (event) => {
-		let hasError = false;
-		let type = '';
+	const submit = useCallback(
+		async (event) => {
+			let hasError = false;
+			let type = '';
 
-		await control.handleSubmit(async (data) => {
-			const formData = new FormData();
-			let formDataJson = '';
+			await control.handleSubmit(async (data) => {
+				const formData = new FormData();
+				let formDataJson = '';
 
-			try {
-				formDataJson = JSON.stringify(data);
-			} catch {
-			}
-
-			const flattenFormValues = flatten(data as FieldValues);
-
-			for (const key in flattenFormValues) {
-				formData.append(key, flattenFormValues[key]);
-			}
+				try {
+					formDataJson = JSON.stringify(data);
+				} catch {}
 
-			if (onSubmit) {
-				await onSubmit({
-					data: data as TTransformedValues,
-					event,
-					method,
-					formData,
-					formDataJson,
-				});
-			}
+				const flattenFormValues = flatten(data as FieldValues);
 
-			if (action) {
-				try {
-					const shouldStringifySubmissionData = [
-						headers && headers['Content-Type'],
-						encType,
-					].some((value) => value && value.includes('json'));
+				for (const key in flattenFormValues) {
+					formData.append(key, flattenFormValues[key]);
+				}
 
-					const response = await fetch(String(action), {
+				if (onSubmit) {
+					await onSubmit({
+						data: data as TTransformedValues,
+						event,
 						method,
-						headers: {
-							...headers,
-							...(encType && encType !== 'multipart/form-data' ? { 'Content-Type': encType } : {}),
-						},
-						body: shouldStringifySubmissionData ? formDataJson : formData,
+						formData,
+						formDataJson,
 					});
+				}
+
+				if (action) {
+					try {
+						const shouldStringifySubmissionData = [
+							headers && headers['Content-Type'],
+							encType,
+						].some((value) => value && value.includes('json'));
+
+						const response = await fetch(String(action), {
+							method,
+							headers: {
+								...headers,
+								...(encType && encType !== 'multipart/form-data'
+									? { 'Content-Type': encType }
+									: {}),
+							},
+							body: shouldStringifySubmissionData ? formDataJson : formData,
+						});
 
-					if (
-						response &&
+						if (
+							response &&
 							(validateStatus
 								? !validateStatus(response.status)
 								: response.status < 200 || response.status >= 300)
-					) {
+						) {
+							hasError = true;
+							onError && onError({ response });
+							type = String(response.status);
+						} else {
+							onSuccess && onSuccess({ response });
+						}
+					} catch (error) {
 						hasError = true;
-						onError && onError({ response });
-						type = String(response.status);
-					} else {
-						onSuccess && onSuccess({ response });
+						onError && onError({ error });
 					}
-				} catch (error) {
-					hasError = true;
-					onError && onError({ error });
 				}
-			}
-		})(event);
+			})(event);
 
-		if (hasError && control) {
-			control._subjects.state.next({
-				isSubmitSuccessful: false,
-			});
-			control.setError('root.server', {
-				type,
-			});
-		}
-	}, [control, onSubmit, method, action, headers, encType, validateStatus, onError, onSuccess]);
+			if (hasError && control) {
+				control._subjects.state.next({
+					isSubmitSuccessful: false,
+				});
+				control.setError('root.server', {
+					type,
+				});
+			}
+		},
+		[control, onSubmit, method, action, headers, encType, validateStatus, onError, onSuccess],
+	);
 
 	useEffect(() => {
 		setMounted(true);
@@ -111,12 +115,16 @@ export function Form<TFieldValues extends FieldValues, TTransformedValues = TFie
 		return render({ submit });
 	}
 
-	return <form
-		noValidate={mounted}
-		action={action as string | undefined}
-		method={method}
-		encType={encType}
-		onSubmit={submit}
-		{...rest}
-	>{children}</form>;
+	return (
+		<form
+			noValidate={mounted}
+			action={action as string | undefined}
+			method={method}
+			encType={encType}
+			onSubmit={submit}
+			{...rest}
+		>
+			{children}
+		</form>
+	);
 }

package/src/formStateSubscribe.tsrx

@@ -9,15 +9,16 @@ import type { FieldValues, UseFormStateProps, UseFormStateReturn } from './types
 export type FormStateSubscribeProps<
 	TFieldValues extends FieldValues,
 	TTransformedValues = TFieldValues,
-> =
-	UseFormStateProps<TFieldValues, TTransformedValues> & {
-		render: (values: UseFormStateReturn<TFieldValues>) => OctaneNode;
-	};
+> = UseFormStateProps<TFieldValues, TTransformedValues> & {
+	render: (values: UseFormStateReturn<TFieldValues>) => OctaneNode;
+};
 
 export const FormStateSubscribe = <
 	TFieldValues extends FieldValues,
 	TTransformedValues = TFieldValues,
->(props: FormStateSubscribeProps<TFieldValues, TTransformedValues>) => {
+>(
+	props: FormStateSubscribeProps<TFieldValues, TTransformedValues>,
+) => {
 	const { control, disabled, exact, name, render } = props;
 	return render(useFormState({ control, name, disabled, exact }));
 };

package/src/watch.tsrx

@@ -7,17 +7,20 @@ import type { FieldPath, FieldValues, WatchProps, WatchRenderValue } from './typ
 
 export const Watch = <
 	TFieldValues extends FieldValues = FieldValues,
-	TFieldName extends | FieldPath<TFieldValues>
-	| readonly [FieldPath<TFieldValues>, ...FieldPath<TFieldValues>[]]
-	| FieldPath<TFieldValues>[]
-	| readonly FieldPath<TFieldValues>[]
-	| undefined = undefined,
+	TFieldName extends
+		| FieldPath<TFieldValues>
+		| readonly [FieldPath<TFieldValues>, ...FieldPath<TFieldValues>[]]
+		| FieldPath<TFieldValues>[]
+		| readonly FieldPath<TFieldValues>[]
+		| undefined = undefined,
 	TContext = any,
 	TTransformedValues = TFieldValues,
 	TComputeValue = undefined,
->(props: WatchProps<TFieldName, TFieldValues, TContext, TTransformedValues, TComputeValue>) =>
+>(
+	props: WatchProps<TFieldName, TFieldValues, TContext, TTransformedValues, TComputeValue>,
+) =>
 	props.render(
-		useWatch({ name: props.names, ...props as any }) as WatchRenderValue<
+		useWatch({ name: props.names, ...(props as any) }) as WatchRenderValue<
 			TFieldName,
 			TFieldValues,
 			TComputeValue