@colisweb/rescript-toolkit 4.10.2 → 4.10.3

package/package.json

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

package/src/decoders/Toolkit__Decoders.res

@@ -419,12 +419,12 @@ module UnitMeasure = {
 
 module StringArray = {
   let encoder = (encoder, value) =>
-    value->Array.map(encoder) |> Js.Array.joinWith(",") |> Decco.stringToJson
+    value->Array.map(encoder)->Js.Array2.joinWith(",")->Decco.stringToJson
 
   let decoder = (decoder, json) =>
-    switch json |> Decco.stringFromJson {
+    switch json->Decco.stringFromJson {
     | Ok(string) =>
-      let resultArray = (string |> Js.String.split(","))->Array.map(e => e->Js.Json.string->decoder)
+      let resultArray = string->Js.String2.split(",")->Array.map(e => e->Js.Json.string->decoder)
       let error = resultArray->Array.getBy(Result.isError)
       switch error {
       | Some(_) => Decco.error(~path="", "Invalid content", json)

package/src/form/ReSchemaI18n.res

@@ -13,22 +13,22 @@ type t = {
 }
 
 let default = {
-  false_: () => "This value should be false",
-  true_: () => "This value should be true",
+  false_: () => "Cette valeur doit être fausse",
+  true_: () => "Cette valeur doit être vraie",
   intMin: (~value as _value, ~min) =>
-    "This value must be greater than or equal to " ++ string_of_int(min),
+    `Cette valeur doit être supérieur ou égale à ${min->Int.toString}`,
   intMax: (~value as _value, ~max) =>
-    "This value must be less than or equal to " ++ string_of_int(max),
+    `Cette valeur doit être inférieur ou égale à ${max->Int.toString}`,
   floatMin: (~value as _value, ~min) =>
-    "This value must be greater than or equal to " ++ Js.Float.toString(min),
+    `Cette valeur doit être supérieur ou égale à ${min->Js.Float.toString}`,
   floatMax: (~value as _value, ~max) =>
-    "This value must be less than or equal to " ++ Js.Float.toString(max),
-  email: (~value) => value ++ " is not a valid email",
-  stringNonEmpty: (~value as _) => "String must not be empty",
+    `Cette valeur doit être supérieur ou égale à ${max->Js.Float.toString}`,
+  email: (~value) => `${value} n'est pas un e-mail valide`,
+  stringNonEmpty: (~value as _) => "Champs requis",
   stringRegExp: (~value as _value, ~pattern) =>
-    "This value must match the following: /" ++ pattern ++ "/",
+    `Cette valeur doit correspondre à ce pattern /${pattern}/`,
   stringMin: (~value as _value, ~min) =>
-    "This value must be at least " ++ string_of_int(min) ++ " characters",
+    `Le champ doit avoir au minimum ${min->Int.toString} caractères.`,
   stringMax: (~value as _value, ~max) =>
-    "This value must be at most " ++ string_of_int(max) ++ " characters",
+    `Le champ doit avoir au maximum ${max->Int.toString} caractères.`,
 }

package/src/form/Reform.res

@@ -1,5 +1,3 @@
-open ReactIntl
-
 module type Config = {
   type field<'a>
   type state
@@ -180,13 +178,10 @@ module Make = (Config: Config) => {
     ~schema=[]: Validation.schema,
     ~onSubmit,
     ~onSubmitFail=ignore,
-    ~i18n=?,
+    ~i18n: ReSchemaI18n.t=ReSchemaI18n.default,
     ~validationStrategy=OnChange,
     (),
   ) => {
-    let intl = useIntl()
-    let i18n = i18n->Option.getWithDefault(Toolkit__FormValidationFunctions.i18n(intl))
-
     let (state, send) = ReactUpdate.useReducerWithMapState(
       (state, action) => {
         switch action {

package/src/form/Toolkit__FormValidationFunctions.res

@@ -395,21 +395,3 @@ let required14Digits = (intl, value) => {
     }
   }
 }
-
-let i18n = intl => {
-  ...ReSchemaI18n.default,
-  stringNonEmpty: (~value as _) => intl->Intl.formatMessage(Msg.stringNonEmpty),
-  intMin: (~value as _: int, ~min: int) =>
-    intl->Intl.formatMessageWithValues(Msg.minValue, {"value": min}),
-  intMax: (~value as _: int, ~max: int) =>
-    intl->Intl.formatMessageWithValues(Msg.maxValue, {"value": max}),
-  floatMin: (~value as _: float, ~min: float) =>
-    intl->Intl.formatMessageWithValues(Msg.minValue, {"value": min}),
-  floatMax: (~value as _: float, ~max: float) =>
-    intl->Intl.formatMessageWithValues(Msg.maxValue, {"value": max}),
-  email: (~value as _: string) => intl->Intl.formatMessage(Msg.email),
-  stringMin: (~value as _: string, ~min: int) =>
-    intl->Intl.formatMessageWithValues(Msg.stringMin, {"value": min}),
-  stringMax: (~value as _: string, ~max: int) =>
-    intl->Intl.formatMessageWithValues(Msg.stringMax, {"value": max}),
-}

package/src/primitives/Toolkit__Primitives.res

@@ -1,6 +1,6 @@
 module String = {
   let joinNonEmty = (~separator=", ", parts: array<string>): string =>
-    parts->Array.keep(str => str !== "") |> Js.Array.joinWith(separator)
+    parts->Array.keep(str => str !== "")->Js.Array2.joinWith(separator)
 
   @ocaml.doc(" TODO: remove ")
   let join = joinNonEmty
@@ -39,7 +39,7 @@ module Option = {
     }
 
   let join = (~separator=" ", parts) =>
-    (parts->Array.keepMap(v => v) |> Js.Array.joinWith(separator))->fromString
+    parts->Array.keepMap(v => v)->Js.Array2.joinWith(separator)->fromString
 
   let mapString = opt => opt->Option.flatMap(fromString)
 
@@ -61,7 +61,7 @@ module Option = {
 
 module Array = {
   let joinNonEmpty = (~separator=", ", parts: array<string>): string =>
-    parts->Array.keep(str => str !== "") |> Js.Array.joinWith(separator)
+    parts->Array.keep(str => str !== "")->Js.Array2.joinWith(separator)
 
   let tail = array => array->Array.get(array->Array.length - 1)
   let tailExn = array => array->Array.getExn(array->Array.length - 1)

package/src/router/Toolkit__Router.res

@@ -32,9 +32,7 @@ module Make = (Config: RouterConfig) => {
       let previousRoute = Toolkit__Hooks.usePrevious(currentRoute)
 
       React.useLayoutEffect1(() => {
-        let watcherID = RescriptReactRouter.watchUrl(url =>
-          setCurrentRoute(_ => url |> Config.make)
-        )
+        let watcherID = RescriptReactRouter.watchUrl(url => setCurrentRoute(_ => url->Config.make))
         Some(() => RescriptReactRouter.unwatchUrl(watcherID))
       }, [setCurrentRoute])