@colisweb/rescript-toolkit 5.36.0 → 5.37.1

package/package.json

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

package/src/form/ReSchema.res

@@ -77,6 +77,12 @@ module Make = (Lenses: Lenses) => {
           error: option<string>,
         }): t
       | ArrayNonEmpty({field: Lenses.field<array<'a>>, error: option<string>}): t
+      | ForbiddenCharaters({
+          field: Lenses.field<string>,
+          characters: array<string>,
+          optionalPredicate?: Lenses.state => bool,
+          error: option<string>,
+        }): t
 
     type schema = array<t>
 
@@ -124,6 +130,9 @@ module Make = (Lenses: Lenses) => {
     let nonEmpty = (~error=?, ~optionalPredicate=?, field) => [
       StringNonEmpty({field, ?optionalPredicate, error}),
     ]
+    let forbiddenCharacters = (~error=?, ~optionalPredicate=?, ~characters, field) => [
+      ForbiddenCharaters({field, ?optionalPredicate, characters, error}),
+    ]
 
     let string = (~min=?, ~minError=?, ~max=?, ~maxError=?, field) => {
       mergeValidators([
@@ -389,6 +398,19 @@ module Make = (Lenses: Lenses) => {
             : Valid,
         )
       }
+    | Validation.ForbiddenCharaters({field, error, characters} as props) => {
+        let value = Lenses.get(values, field)
+        let isOptional = props.optionalPredicate->Option.mapWithDefault(false, fn => fn(values))
+
+        (
+          Field(field),
+          isOptional
+            ? Valid
+            : characters->Array.some(char => value->Js.String2.includes(char))
+            ? Error(error->Option.getWithDefault(i18n.invalidCharacter(characters)))
+            : Valid,
+        )
+      }
     }
 
   let getFieldValidator = (~validators, ~fieldName) =>
@@ -414,6 +436,7 @@ module Make = (Lenses: Lenses) => {
       | Validation.ArrayNonEmpty({field}) => Field(field) == fieldName
       | Validation.CustomNestedSchema2({field}) => Field(field) == fieldName
       | Validation.Phone({field}) => Field(field) == fieldName
+      | Validation.ForbiddenCharaters({field}) => Field(field) == fieldName
       }
     )
 
@@ -440,6 +463,7 @@ module Make = (Lenses: Lenses) => {
       | Validation.CustomNestedSchema2({field}) => Field(field) == fieldName
       | Validation.OptionNonEmpty({field}) => Field(field) == fieldName
       | Validation.ArrayNonEmpty({field}) => Field(field) == fieldName
+      | Validation.ForbiddenCharaters({field}) => Field(field) == fieldName
       }
     )
 

package/src/form/ReSchemaI18n.res

@@ -13,6 +13,7 @@ type t = {
   phone: string,
   passwordTooShort: string,
   passwordCantContainLogin: string,
+  invalidCharacter: array<string> => string,
 }
 
 let default = {
@@ -37,4 +38,8 @@ let default = {
   phone: "Format du numéro invalide. Ex : +33612345678",
   passwordTooShort: "Le mot de passe doit contenir au moins 10 caractères, avoir au moins 1 minuscule, 1 majuscule et un chiffre.",
   passwordCantContainLogin: "Le mot de passe ne peut pas contenir l'identifiant.",
+  invalidCharacter: characters =>
+    `Ce champ contient un caractère non autorisé parmi cette liste: ${characters->Js.Array2.joinWith(
+        " ",
+      )}`,
 }

package/src/form/Reform.res

@@ -124,6 +124,7 @@ module Make = (Config: Config) => {
       | Validation.CustomNestedSchema2({field}) => (Field(field), Pristine)
       | Validation.OptionNonEmpty({field}) => (Field(field), Pristine)
       | Validation.ArrayNonEmpty({field}) => (Field(field), Pristine)
+      | Validation.ForbiddenCharaters({field}) => (Field(field), Pristine)
       }
     )
   }

package/src/vendors/ReactTable.res

@@ -87,7 +87,11 @@ and instanceCell = {
   render: (string, unit) => React.element,
 }
 
-type rec filterProps<'filterValue> = {column: filterColumn<'filterValue>, state: state}
+type rec filterProps<'filterValue, 'filter> = {
+  column: filterColumn<'filterValue>,
+  state: state,
+  setFilter: (string, 'filter) => unit,
+}
 and filterColumn<'filterValue> = {
   filterValue: option<'filterValue>,
   setFilter: option<'filterValue> => unit,
@@ -99,7 +103,7 @@ external makeColumn: (
   ~accessor: 'data => 'cellValue,
   ~id: string,
   ~header: React.element,
-  ~filterRender: filterProps<'filterValue> => React.element=?,
+  ~filterRender: filterProps<'filterValue, 'filter> => React.element=?,
   ~filter: string=?,
   ~cell: cellProps<'cellValue> => React.element=?,
   ~minWidth: int=?,