@colisweb/rescript-toolkit 5.10.6 → 5.12.0

package/package.json

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

package/src/form/ReSchema.res

@@ -27,6 +27,7 @@ module Make = (Lenses: Lenses) => {
   module Validation = {
     type rec t =
       | Email({field: Lenses.field<string>, error: option<string>}): t
+      | Phone({field: Lenses.field<string>, error: option<string>}): t
       | NoValidation({field: Lenses.field<'a>}): t
       | StringNonEmpty({field: Lenses.field<string>, error: option<string>}): t
       | StringRegExp({field: Lenses.field<string>, matches: string, error: option<string>}): t
@@ -81,6 +82,7 @@ module Make = (Lenses: Lenses) => {
     let false_ = (~error=?, field) => [False({field, error})]
 
     let email = (~error=?, field) => [Email({field, error})]
+    let phone = (~error=?, field) => [Phone({field, error})]
 
     let nonEmpty = (~error=?, field) => [StringNonEmpty({field, error})]
 
@@ -198,6 +200,22 @@ module Make = (Lenses: Lenses) => {
           ? Valid
           : Error(error->Belt.Option.getWithDefault(i18n.email(~value))),
       )
+    | Validation.Phone({field, error}) =>
+      let value = Lenses.get(values, field)
+      (
+        Field(field),
+        switch value {
+        | "" => Error(i18n.stringNonEmpty(~value=""))
+        | phone =>
+          if !(phone->Js.String2.startsWith("+33")) {
+            Error(error->Option.getWithDefault(i18n.phone))
+          } else if phone->Js.String2.sliceToEnd(~from=3)->Js.String2.length != 9 {
+            Error(error->Option.getWithDefault(i18n.phone))
+          } else {
+            Valid
+          }
+        },
+      )
     | Validation.NoValidation({field}) => (Field(field), Valid)
     | Validation.StringNonEmpty({field, error}) =>
       let value = Lenses.get(values, field)
@@ -306,6 +324,7 @@ module Make = (Lenses: Lenses) => {
       | Validation.OptionNonEmpty({field}) => Field(field) == fieldName
       | Validation.ArrayNonEmpty({field}) => Field(field) == fieldName
       | Validation.CustomNestedSchema2({field}) => Field(field) == fieldName
+      | Validation.Phone({field}) => Field(field) == fieldName
       }
     )
 
@@ -313,6 +332,7 @@ module Make = (Lenses: Lenses) => {
     validators->Belt.Array.keep(validator =>
       switch validator {
       | Validation.False({field}) => Field(field) == fieldName
+      | Validation.Phone({field}) => Field(field) == fieldName
       | Validation.True({field}) => Field(field) == fieldName
       | Validation.IntMin({field}) => Field(field) == fieldName
       | Validation.IntMax({field}) => Field(field) == fieldName

package/src/form/ReSchemaI18n.res

@@ -10,6 +10,7 @@ type t = {
   stringRegExp: (~value: string, ~pattern: string) => string,
   stringMin: (~value: string, ~min: int) => string,
   stringMax: (~value: string, ~max: int) => string,
+  phone: string,
 }
 
 let default = {
@@ -31,4 +32,5 @@ let default = {
     `Le champ doit avoir au minimum ${min->Int.toString} caractères.`,
   stringMax: (~value as _value, ~max) =>
     `Le champ doit avoir au maximum ${max->Int.toString} caractères.`,
+  phone: "Format du numéro invalide. Ex : +33612345678",
 }

package/src/form/Reform.res

@@ -111,6 +111,7 @@ module Make = (Config: Config) => {
       | Validation.FloatMin({field}) => (Field(field), Pristine)
       | Validation.FloatMax({field}) => (Field(field), Pristine)
       | Validation.Email({field}) => (Field(field), Pristine)
+      | Validation.Phone({field}) => (Field(field), Pristine)
       | Validation.NoValidation({field}) => (Field(field), Pristine)
       | Validation.StringNonEmpty({field}) => (Field(field), Pristine)
       | Validation.StringRegExp({field}) => (Field(field), Pristine)

package/src/form/Toolkit__FormValidationFunctions.res

@@ -48,6 +48,15 @@ module Msg = {
   }
   let optionNonEmpty = {defaultMessage: "Champ requis"}
   let invalidValue = {defaultMessage: "Valeur non valide."}
+  let passwordTooShort = {
+    defaultMessage: "Le mot de passe doit contenir au moins 10 caractères, avoir au moins 1 minuscule, 1 majuscule et un chiffre.",
+  }
+  let passwordCantBeEqualLogin = {
+    defaultMessage: "Veuillez ne pas utiliser votre idenfiant comme mot de passe",
+  }
+  let passwordCantContainLogin = {
+    defaultMessage: "Le mot de passe ne peut pas contenir l'identifiant.",
+  }
 }
 
 let toReSchemaResult = (opt: option<string>): ReSchema.fieldState<'a> =>
@@ -395,3 +404,14 @@ let required14Digits = (intl, value) => {
     }
   }
 }
+let password = (intl, ~login, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | p if !Js.Re.test_(%re("/(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}/"), p) =>
+    Some(intl->Intl.formatMessage(Msg.passwordTooShort))
+  | p if p === login => Some(intl->Intl.formatMessage(Msg.passwordCantBeEqualLogin))
+  | p if p->Js.String2.toLowerCase->Js.String2.includes(login->Js.String2.toLowerCase) =>
+    Some(intl->Intl.formatMessage(Msg.passwordCantContainLogin))
+  | _ => None
+  }
+}