solid-hook-form 1.9.0 → 1.9.2

package/dist/main.d.ts

@@ -1,16 +1,8 @@
 import * as solid_js from 'solid-js';
 import { Accessor, JSXElement, ParentProps } from 'solid-js';
-import { Path, LiteralUnion, FieldPath, FieldPathValue, Resolver } from 'react-hook-form';
+import { FieldPath, FieldPathValue, Path, LiteralUnion, Resolver } from 'react-hook-form';
 export { Path } from 'react-hook-form';
 
-type Message = string;
-type FieldError = {
-    type: LiteralUnion<keyof Rules, string>;
-    ref?: HTMLElement;
-    message?: Message;
-};
-type FieldErrors<F extends FormValues = FormValues> = Partial<Record<Path<F>, FieldError>>;
-
 type ValidateResult = Message | boolean | undefined;
 type Validate<V, F> = (value: V, formValues: F) => ValidateResult | Promise<ValidateResult>;
 type ValidationValue = boolean | number | string | RegExp;
@@ -30,6 +22,23 @@ type Rules<F extends FormValues = FormValues, N extends FieldPath<F> = FieldPath
     validate?: Validate<FieldPathValue<F, N>, F>;
 };
 
+type Message = string;
+type FieldError = {
+    type: LiteralUnion<keyof Rules, string>;
+    ref?: HTMLElement;
+    message?: Message;
+};
+type FieldErrors<F extends FormValues = FormValues> = Partial<Record<Path<F>, FieldError>>;
+
+type Ref = HTMLElement | null;
+type RegisterReturn<F extends FormValues> = {
+    name: Path<F>;
+    ref(ref: Ref): void;
+    onInput(event: Event | unknown): void;
+    onChange(event: Event | unknown): void;
+};
+type Register<F extends FormValues> = (name: Path<F>, options?: Rules<F, Path<F>>) => RegisterReturn<F>;
+
 type Control<F extends FormValues> = {
     values: Accessor<F>;
     errors: Accessor<FieldErrors<F>>;
@@ -39,37 +48,24 @@ type UseControllerArg<F extends FormValues> = {
     control: Control<F>;
     name: Path<F>;
     rules?: Rules<F>;
-    render(arg: UseControllerReturn): JSXElement;
+    render(arg: UseControllerReturn<F>): JSXElement;
 };
-type UseControllerReturn = {
-    field: {
-        name: string;
+type UseControllerReturn<F extends FormValues> = {
+    field: RegisterReturn<F> & {
         value: Accessor<any>;
-        onInput(event: Event): void;
-        onChange(event: Event): void;
-        ref(element: HTMLElement): void;
     };
     fieldState: {
         error: Accessor<FieldError | undefined>;
     };
 };
-type UseController = <F extends FormValues>(arg: UseControllerArg<F>) => UseControllerReturn;
 type ControllerProps<F extends FormValues> = {
     control: Control<F>;
     name: Path<F>;
     rules?: Rules<F>;
-    render(arg: UseControllerReturn): JSXElement;
+    render(arg: UseControllerReturn<F>): JSXElement;
 };
 
 type FormValues = Record<string, any>;
-type Ref = HTMLElement | null;
-type RegisterReturn<F extends FormValues> = {
-    name: Path<F>;
-    ref(ref: Ref): void;
-    onInput(event: Event): void;
-    onChange(event: Event): void;
-};
-type Register<T extends FormValues> = (name: Path<T>, options?: Rules<T, Path<T>>) => RegisterReturn<T>;
 type GetValues<F extends FormValues> = {
     (): F;
     <N extends FieldPath<F>>(name: N): FieldPathValue<F, N>;
@@ -85,6 +81,10 @@ type CreateFormArg<F extends FormValues> = {
 };
 type CreateFormReturn<F extends FormValues = FormValues> = {
     control: Control<F>;
+    formState: {
+        errors: Accessor<FieldErrors<F>>;
+        isValid: Accessor<boolean>;
+    };
     values: Accessor<F>;
     errors: Accessor<FieldErrors<F>>;
     isValid: Accessor<boolean>;
@@ -99,7 +99,7 @@ type CreateForm = <F extends FormValues>(arg?: CreateFormArg<F>) => CreateFormRe
 
 declare const createForm: CreateForm;
 
-declare const useController: UseController;
+declare const useController: <F extends FormValues>(arg: UseControllerArg<F>) => UseControllerReturn<F>;
 
 declare const Controller: <F extends FormValues>(props: ControllerProps<F>) => solid_js.JSX.Element;
 

package/dist/main.js

@@ -5,6 +5,10 @@ import { memo, createComponent } from 'solid-js/web';
 
 // src/logic/get_value.ts
 var getFieldValue = (event) => {
+  const isEvent = event instanceof Event;
+  if (!isEvent) {
+    return event;
+  }
   const field = event.target;
   if (field instanceof HTMLSelectElement) {
     return field.value;
@@ -361,6 +365,10 @@ var createForm = (arg = { defaultValues: {} }) => {
   };
   return {
     control,
+    formState: {
+      errors,
+      isValid
+    },
     values,
     errors,
     isValid,
@@ -372,13 +380,24 @@ var createForm = (arg = { defaultValues: {} }) => {
     reset
   };
 };
+var FormContext = createContext();
+
+// src/use_form_context.ts
+var useFormContext = () => {
+  const form = useContext(FormContext);
+  return form;
+};
+
+// src/use_controller.ts
 var useController = (arg) => {
-  const fieldProps = arg.control.register(arg.name, arg.rules);
+  const form = useFormContext();
+  const control = form?.control || arg.control;
+  const fieldProps = control.register(arg.name, arg.rules);
   const value = createMemo(() => {
-    return get(arg.control.values(), arg.name);
+    return get(control.values(), arg.name);
   });
   const error = createMemo(() => {
-    return arg.control.errors()[arg.name];
+    return control.errors()[arg.name];
   });
   return {
     field: {
@@ -394,16 +413,6 @@ var Controller = (props) => {
   const controller = useController(props);
   return memo(() => props.render(controller));
 };
-var FormContext = createContext();
-
-// src/use_form_context.ts
-var useFormContext = () => {
-  const form = useContext(FormContext);
-  if (!form) {
-    throw new Error("useFormContext: cannot find a FormProvider");
-  }
-  return form;
-};
 var FormProvider = (props) => {
   return createComponent(FormContext.Provider, {
     get value() {

package/dist/main.jsx

@@ -3,6 +3,10 @@ import { createMemo, createSignal as createSignal2 } from "solid-js";
 
 // src/logic/get_value.ts
 var getFieldValue = (event) => {
+  const isEvent = event instanceof Event;
+  if (!isEvent) {
+    return event;
+  }
   const field = event.target;
   if (field instanceof HTMLSelectElement) {
     return field.value;
@@ -362,6 +366,10 @@ var createForm = (arg = { defaultValues: {} }) => {
   };
   return {
     control,
+    formState: {
+      errors,
+      isValid
+    },
     values,
     errors,
     isValid,
@@ -376,13 +384,30 @@ var createForm = (arg = { defaultValues: {} }) => {
 
 // src/use_controller.ts
 import { createMemo as createMemo2 } from "solid-js";
+
+// src/use_form_context.ts
+import { useContext } from "solid-js";
+
+// src/form_context.ts
+import { createContext } from "solid-js";
+var FormContext = createContext();
+
+// src/use_form_context.ts
+var useFormContext = () => {
+  const form = useContext(FormContext);
+  return form;
+};
+
+// src/use_controller.ts
 var useController = (arg) => {
-  const fieldProps = arg.control.register(arg.name, arg.rules);
+  const form = useFormContext();
+  const control = form?.control || arg.control;
+  const fieldProps = control.register(arg.name, arg.rules);
   const value = createMemo2(() => {
-    return get(arg.control.values(), arg.name);
+    return get(control.values(), arg.name);
   });
   const error = createMemo2(() => {
-    return arg.control.errors()[arg.name];
+    return control.errors()[arg.name];
   });
   return {
     field: {
@@ -401,22 +426,6 @@ var Controller = (props) => {
   return <>{props.render(controller)}</>;
 };
 
-// src/use_form_context.ts
-import { useContext } from "solid-js";
-
-// src/form_context.ts
-import { createContext } from "solid-js";
-var FormContext = createContext();
-
-// src/use_form_context.ts
-var useFormContext = () => {
-  const form = useContext(FormContext);
-  if (!form) {
-    throw new Error("useFormContext: cannot find a FormProvider");
-  }
-  return form;
-};
-
 // src/form_provider.tsx
 var FormProvider = (props) => {
   return <FormContext.Provider value={props.form}>{props.children}</FormContext.Provider>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-hook-form",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "type": "module",
   "main": "./dist/main.js",
   "module": "./dist/main.js",