@colisweb/rescript-toolkit 4.8.1 → 4.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "4.8.1",
+  "version": "4.9.0",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",

package/src/form/ReSchema.res

@@ -36,6 +36,10 @@ module Make = (Lenses: Lenses) => {
       | FloatMin({field: Lenses.field<float>, min: float, error: option<string>}): t
       | FloatMax({field: Lenses.field<float>, max: float, error: option<string>}): t
       | Custom({field: Lenses.field<'a>, predicate: Lenses.state => fieldState}): t
+      | CustomNestedSchema({
+          field: Lenses.field<'a>,
+          predicate: Lenses.state => array<(int, recordValidationState<'a>)>,
+        }): t
       | True({field: Lenses.field<bool>, error: option<string>}): t
       | False({field: Lenses.field<bool>, error: option<string>}): t
       | OptionNonEmpty({field: Lenses.field<option<'a>>, error: option<string>}): t
@@ -56,6 +60,10 @@ module Make = (Lenses: Lenses) => {
 
     let custom = (field, predicate) => [Custom({field, predicate})]
 
+    let customNestedSchema = (field, predicate) => {
+      [CustomNestedSchema({field, predicate})]
+    }
+
     let optionNonEmpty = (~error=?, field) => [OptionNonEmpty({field, error})]
 
     let arrayNonEmpty = (~error=?, field) => [ArrayNonEmpty({field, error})]
@@ -216,7 +224,33 @@ module Make = (Lenses: Lenses) => {
           : Error(error->Belt.Option.getWithDefault(i18n.stringMax(~value, ~max))),
       )
     | Validation.Custom({field, predicate}) => (Field(field), predicate(values))
+    | Validation.CustomNestedSchema({field, predicate}) => {
+        let results = predicate(values)
 
+        let errors =
+          results
+          ->Array.map(((index, result)) => {
+            switch result {
+            | Errors(errors) =>
+              errors->Array.map(((fieldName, error)) => {
+                switch (fieldName->Obj.magic, error) {
+                | (Field(name), Error(e)) =>
+                  Some({
+                    error: e,
+                    index,
+                    name: name->Obj.magic,
+                  })
+                | _ => None
+                }
+              })
+            | Valid => []
+            }
+          })
+          ->Array.reduce([], (acc, el) => acc->Array.concat(el))
+          ->Array.keepMap(v => v)
+
+        (Field(field)->Obj.magic, errors->Array.length > 0 ? NestedErrors(errors) : Valid)
+      }
     | Validation.OptionNonEmpty({field, error}) => {
         let value = Lenses.get(values, field)
 
@@ -255,6 +289,7 @@ module Make = (Lenses: Lenses) => {
       | Validation.StringMin({field}) => Field(field) == fieldName
       | Validation.StringMax({field}) => Field(field) == fieldName
       | Validation.Custom({field}) => Field(field) == fieldName
+      | Validation.CustomNestedSchema({field}) => Field(field) == fieldName
       | Validation.OptionNonEmpty({field}) => Field(field) == fieldName
       | Validation.ArrayNonEmpty({field}) => Field(field) == fieldName
       }
@@ -276,6 +311,7 @@ module Make = (Lenses: Lenses) => {
       | Validation.StringMin({field}) => Field(field) == fieldName
       | Validation.StringMax({field}) => Field(field) == fieldName
       | Validation.Custom({field}) => Field(field) == fieldName
+      | Validation.CustomNestedSchema({field}) => Field(field) == fieldName
       | Validation.OptionNonEmpty({field}) => Field(field) == fieldName
       | Validation.ArrayNonEmpty({field}) => Field(field) == fieldName
       }

package/src/form/Reform.res

@@ -59,7 +59,7 @@ module Make = (Config: Config) => {
     state: state,
     getFieldState: field => fieldState,
     getFieldError: field => option<string>,
-    getNestedFieldError: (field, int) => array<childFieldError>,
+    getNestedFieldError: (field, string, int) => option<string>,
     handleChange: 'a. (Config.field<'a>, 'a) => unit,
     arrayPush: 'a. (Config.field<array<'a>>, 'a) => unit,
     arrayUpdateByIndex: 'a. (~field: Config.field<array<'a>>, ~index: int, 'a) => unit,
@@ -114,6 +114,7 @@ module Make = (Config: Config) => {
       | Validation.StringMin({field}) => (Field(field), Pristine)
       | Validation.StringMax({field}) => (Field(field), Pristine)
       | Validation.Custom({field}) => (Field(field), Pristine)
+      | Validation.CustomNestedSchema({field}) => (Field(field), Pristine)
       | Validation.OptionNonEmpty({field}) => (Field(field), Pristine)
       | Validation.ArrayNonEmpty({field}) => (Field(field), Pristine)
       }
@@ -180,7 +181,7 @@ module Make = (Config: Config) => {
     ~onSubmit,
     ~onSubmitFail=ignore,
     ~i18n=?,
-    ~validationStrategy=OnDemand,
+    ~validationStrategy=OnChange,
     (),
   ) => {
     let intl = useIntl()
@@ -257,6 +258,8 @@ module Make = (Config: Config) => {
                       field,
                       (Valid: fieldState),
                     ))
+
+                  self.send(SetFormState(Valid))
                   self.send(SetFieldsState(newFieldsState))
                   submit ? self.send(Submit) : ()
                 }
@@ -332,16 +335,25 @@ module Make = (Config: Config) => {
             ),
           })
         | FieldArrayUpdateByIndex(field, value, index) =>
-          Update({
-            ...state,
-            values: Config.set(
-              state.values,
-              field,
-              Config.get(state.values, field)->Belt.Array.mapWithIndex((i, currentValue) =>
-                i == index ? value : currentValue
+          UpdateWithSideEffects(
+            {
+              ...state,
+              values: Config.set(
+                state.values,
+                field,
+                Config.get(state.values, field)->Belt.Array.mapWithIndex((i, currentValue) =>
+                  i == index ? value : currentValue
+                ),
               ),
-            ),
-          })
+            },
+            self => {
+              switch validationStrategy {
+              | OnChange => self.send(ValidateField(Field(field)))
+              | OnDemand => ()
+              }
+              None
+            },
+          )
         | SetFormState(newState) => Update({...state, formState: newState})
         | ResetForm =>
           Update({
@@ -389,12 +401,17 @@ module Make = (Config: Config) => {
           }
       )
 
-    let getNestedFieldError = (field, index) =>
+    let getNestedFieldError = (field, subfield, index) =>
       switch getFieldState(field) {
-      | NestedErrors(errors) => errors->Array.keep(error => error.index === index)
+      | NestedErrors(errors) =>
+        errors
+        ->Array.getBy(error => error.index === index && error.name === subfield)
+        ->Option.map(({error}) => error)
+
       | Pristine
       | Valid
-      | Error(_) => []
+      | Error(_) =>
+        None
       }
 
     let validateFields = (fields: array<field>) => {

package/src/form/Toolkit__FormValidationFunctions.res

@@ -7,7 +7,7 @@ module Msg = {
   let requiredPosIntOrFloat = {
     defaultMessage: "Doit être un entier positif ou un nombre a virgule",
   }
-   let requiredRatio = {
+  let requiredRatio = {
     defaultMessage: "Doit être un nombre compris entre 0 et 1 en excluant 0 (exemples: '0.1' '0.85' '1')",
   }
   let wrongFormat = {defaultMessage: "Mauvais format (req: {exemple})"}
@@ -102,7 +102,8 @@ let requiredStrictPosFloat = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | value
-    if !Toolkit__Utils_Regex.Test.isPositiveIntOrFloat(value) || value->Float.fromString === Some(0.) =>
+    if !Toolkit__Utils_Regex.Test.isPositiveIntOrFloat(value) ||
+    value->Float.fromString === Some(0.) =>
     Some(Intl.formatMessage(intl, Msg.requiredPosIntOrFloat))
   | _ => None
   }
@@ -112,7 +113,9 @@ let requiredRatio = (intl, value) => {
   switch value {
   | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
   | value
-    if !Toolkit__Utils_Regex.Test.isPositiveIntOrFloat(value) || value->Float.fromString === Some(0.) || value->Float.fromString->Option.getWithDefault(2.) > 1.  =>
+    if !Toolkit__Utils_Regex.Test.isPositiveIntOrFloat(value) ||
+    value->Float.fromString === Some(0.) ||
+    value->Float.fromString->Option.getWithDefault(2.) > 1. =>
     Some(Intl.formatMessage(intl, Msg.requiredRatio))
   | _ => None
   }