@colisweb/rescript-toolkit 4.10.2 → 4.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "4.10.2",
+  "version": "4.10.4",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",
@@ -30,9 +30,9 @@
     "@colisweb/bs-react-intl-extractor-bin": "0.12.2",
     "@colisweb/react-day-picker": "7.4.16",
     "@colisweb/restorative": "1.0.0",
-    "@datadog/browser-rum": "4.44.0",
-    "@headlessui/react": "1.7.15",
-    "@headlessui/tailwindcss": "0.1.3",
+    "@datadog/browser-rum": "4.46.0",
+    "@headlessui/react": "1.7.16",
+    "@headlessui/tailwindcss": "0.2.0",
     "@reach/auto-id": "0.18.0",
     "@rescript/react": "0.11.0",
     "autoprefixer": "10.4.14",
@@ -47,7 +47,7 @@
     "lenses-ppx": "6.1.10",
     "list-selectors": "2.0.1",
     "lodash": "4.17.21",
-    "postcss": "8.4.24",
+    "postcss": "8.4.27",
     "postcss-preset-env": "8.0.1",
     "prismjs": "1.29.0",
     "react": "18.2.0",
@@ -59,7 +59,7 @@
     "react-icons": "4.10.1",
     "react-intl": "6.4.4",
     "react-portal": "4.2.2",
-    "react-select": "5.7.3",
+    "react-select": "5.7.4",
     "react-table": "7.8.0",
     "react-use": "17.4.0",
     "reason-promise": "1.1.5",
@@ -69,17 +69,17 @@
     "rescript-react-update": "5.0.0",
     "sanitize-html": "1.27.4",
     "swr": "2.2.0",
-    "tailwindcss": "3.3.2",
+    "tailwindcss": "3.3.3",
     "use-local-storage-state": "18.3.3"
   },
   "devDependencies": {
-    "@babel/core": "7.22.6",
+    "@babel/core": "7.22.9",
     "@jihchi/vite-plugin-rescript": "5.3.0",
     "@mdx-js/mdx": "2.3.0",
     "@mdx-js/react": "2.3.0",
     "@mdx-js/rollup": "2.3.0",
-    "@originjs/vite-plugin-commonjs": "^1.0.3",
-    "@vitejs/plugin-react": "4.0.1",
+    "@originjs/vite-plugin-commonjs": "1.0.3",
+    "@vitejs/plugin-react": "4.0.3",
     "babel-loader": "8.2.5",
     "highlight.js": "11.8.0",
     "husky": "8.0.3",
@@ -90,8 +90,8 @@
     "rehype-autolink-headings": "^6.1.1",
     "rehype-highlight": "^6.0.0",
     "rehype-slug": "^5.1.0",
-    "sass": "1.63.6",
-    "vite": "4.3.9"
+    "sass": "1.64.1",
+    "vite": "4.4.7"
   },
   "packageManager": "yarn@3.3.1"
 }

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])
 

package/src/ui/Toolkit__Ui_TextInput.res

@@ -1,6 +1,7 @@
 @react.component
 let make = React.forwardRef((
   ~id: string,
+  ~accept: option<string>=?,
   ~name: option<string>=?,
   ~value: option<string>=?,
   ~defaultValue: option<string>=?,
@@ -34,6 +35,7 @@ let make = React.forwardRef((
       isInvalid->Option.getWithDefault(false) ? "border-danger-500 shadow-danger-500" : "",
     ])}
     id
+    ?accept
     ?style
     ?name
     ?value