@colisweb/rescript-toolkit 2.46.3 → 2.46.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.46.3",
+  "version": "2.46.6",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build -with-deps",

package/src/decoders/Toolkit__Decoders.res

@@ -228,11 +228,15 @@ module UnitMeasure = {
       | Some([_match, None, _unit]) => Decco.error(`${errorPrefix} unhandled no value`, jsonString)
       | Some([Some(_match), Some(value), Some(unit)]) => {
           let value = value->Js.Float.fromString
-          switch unit->Js.Json.string->Config.unitEnum_decode {
+          switch unit
+          ->Js.String2.replaceByRe(%re("/\s/"), "")
+          ->Js.Json.string
+          ->Config.unitEnum_decode {
           | Ok(unit) => Config.wrapValue(unit, value)->Ok
           | Error(_) => Decco.error(`${errorPrefix} unhandled unit '${unit}'`, jsonString)
           }
         }
+
       | Some(_) => Decco.error(`${errorPrefix} regex capture group error`, jsonString)
       }
     }

package/src/form/Toolkit__FormValidationFunctions.res

@@ -19,6 +19,9 @@ module Msg = {
   let required14Digits = {
     defaultMessage: "Format requis : 14 chiffres",
   }
+  let requiredStrictPosInt = {
+    defaultMessage: "Doit etre un entier strictement positif",
+  }
 }
 
 let toReSchemaResult = (opt: option<string>): ReSchema.fieldState =>
@@ -43,6 +46,15 @@ let requiredPosInt = (intl, value) => {
   }
 }
 
+let requiredStrictPosInt = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | value if !Toolkit__Utils_Regex.Test.isStrictPositiveInt(value) =>
+    Some(Intl.formatMessage(intl, Msg.requiredStrictPosInt))
+  | _ => None
+  }
+}
+
 let optionalPosInt = (intl, value) => {
   switch value {
   | "" => None

package/src/utils/Toolkit__Utils_Regex.res

@@ -1,7 +1,9 @@
 let positiveIntRegex = %re("/^[0-9]+$/")
+let strictPositiveIntReex = %re("/^[0-9]*[1-9][0-9]*$/")
 let positiveIntOrFloatRegex = %re("/^[0-9]+(?:\.?[0-9]+)?$/")
 
 module Test = {
   let isPositiveInt = Js.Re.test_(positiveIntRegex, _)
+  let isStrictPositiveInt = Js.Re.test_(strictPositiveIntReex, _)
   let isPositiveIntOrFloat = Js.Re.test_(positiveIntOrFloatRegex, _)
 }

package/src/utils/Toolkit__Utils_UnitMeasure.res

@@ -24,8 +24,8 @@ module Unit = (Config: UnitConfig) => {
   @decco
   type unitEnum = @decco.codec(codec) Config.unitEnum
 
-  let unitEnumToString = v => v->Config.unitEnumToJs
-  let unitEnumFromString = v => v->Config.unitEnumFromJs
+  let unitEnumToString = Config.unitEnumToJs
+  let unitEnumFromString = Config.unitEnumFromJs
 }
 
 module Weight = {