@colisweb/rescript-toolkit 5.13.0 → 5.14.0

package/package.json

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

package/src/form/ReSchema.res

@@ -29,6 +29,7 @@ module Make = (Lenses: Lenses) => {
       | Email({field: Lenses.field<string>, error: option<string>}): t
       | Phone({field: Lenses.field<string>, error: option<string>}): t
       | Password({field: Lenses.field<string>, error: option<string>}): t
+      | OptionalPassword({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
@@ -84,7 +85,8 @@ module Make = (Lenses: Lenses) => {
 
     let email = (~error=?, field) => [Email({field, error})]
     let phone = (~error=?, field) => [Phone({field, error})]
-    let password = (~error=?, field) => [Phone({field, error})]
+    let password = (~error=?, field) => [Password({field, error})]
+    let optionalPassword = (~error=?, field) => [OptionalPassword({field, error})]
 
     let nonEmpty = (~error=?, field) => [StringNonEmpty({field, error})]
 
@@ -231,6 +233,19 @@ module Make = (Lenses: Lenses) => {
           },
         )
       }
+    | Validation.OptionalPassword({field, error}) => {
+        let value = Lenses.get(values, field)
+
+        (
+          Field(field),
+          switch value {
+          | "" => Valid
+          | password if !Js.Re.test_(%re("/(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}/"), password) =>
+            Error(error->Option.getWithDefault(i18n.passwordTooShort))
+          | _ => Valid
+          },
+        )
+      }
     | Validation.NoValidation({field}) => (Field(field), Valid)
     | Validation.StringNonEmpty({field, error}) =>
       let value = Lenses.get(values, field)
@@ -330,6 +345,7 @@ module Make = (Lenses: Lenses) => {
       | Validation.FloatMax({field}) => Field(field) == fieldName
       | Validation.Email({field}) => Field(field) == fieldName
       | Validation.Password({field}) => Field(field) == fieldName
+      | Validation.OptionalPassword({field}) => Field(field) == fieldName
       | Validation.NoValidation({field}) => Field(field) == fieldName
       | Validation.StringNonEmpty({field}) => Field(field) == fieldName
       | Validation.StringRegExp({field}) => Field(field) == fieldName
@@ -351,6 +367,7 @@ module Make = (Lenses: Lenses) => {
       | Validation.Phone({field}) => Field(field) == fieldName
       | Validation.True({field}) => Field(field) == fieldName
       | Validation.Password({field}) => Field(field) == fieldName
+      | Validation.OptionalPassword({field}) => Field(field) == fieldName
       | Validation.IntMin({field}) => Field(field) == fieldName
       | Validation.IntMax({field}) => Field(field) == fieldName
       | Validation.FloatMin({field}) => Field(field) == fieldName

package/src/form/Reform.res

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