@colisweb/rescript-toolkit 2.31.1 → 2.33.1

package/bsconfig.json

@@ -34,7 +34,11 @@
     "rescript-react-update",
     "restorative"
   ],
-  "ppx-flags": ["decco/ppx", "lenses-ppx/ppx"],
+  "ppx-flags": [
+    "decco/ppx",
+    "lenses-ppx/ppx",
+    "res-react-intl/ppx"
+  ],
   "refmt": 3,
   "warnings": {
     "number": "-44-30-32",
@@ -46,4 +50,4 @@
     "-open Belt",
     "-open Cx"
   ]
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.31.1",
+  "version": "2.33.1",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build",
@@ -87,6 +87,7 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-intl": "5.24.7",
+    "res-react-intl": "3.1.2",
     "react-is": "17.0.2",
     "sass": "1.45.0"
   }

package/src/form/FormValidationFunctions.res

@@ -0,0 +1,296 @@
+open ReactIntl
+
+module Msg = {
+  @@intl.messages
+  let requiredValue = {defaultMessage: "required value"}
+  let requiredPosInt = {defaultMessage: "must be a positive integer"}
+  let requiredPosIntOrFloat = {defaultMessage: "must be a positive integer or float"}
+  let wrongFormat = {defaultMessage: "Wrong format (req: {exemple})"}
+  let maxNumberOfPackets = {defaultMessage: "Nb packets"}
+  let totalVolume = {defaultMessage: "Total volume"}
+  let binPacking = {defaultMessage: "Bin packing"}
+  let vehicleNameAlreadyUsed = {defaultMessage: "This name is already used in another flat rate"}
+
+  let requiredAlphanumericMax4 = {
+    defaultMessage: "required format : 4 characters or numbers (exemples: 'A1b2' 'abcd')",
+  }
+  let required14Digits = {
+    defaultMessage: "required format : 14 digits",
+  }
+}
+
+let toReformResult = (opt: option<string>): Reform.fieldState =>
+  switch opt {
+  | Some(e) => Error(e)
+  | None => Valid
+  }
+
+let requiredStringNonEmpty = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | _ => None
+  }
+}
+
+let requiredPosInt = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | value if !Toolkit.Utils.Regex.Test.isPositiveInt(value) =>
+    Some(Intl.formatMessage(intl, Msg.requiredPosInt))
+  | _ => None
+  }
+}
+
+let optionalPosInt = (intl, value) => {
+  switch value {
+  | "" => None
+  | value if !Toolkit.Utils.Regex.Test.isPositiveInt(value) =>
+    Some(Intl.formatMessage(intl, Msg.requiredPosInt))
+  | _ => None
+  }
+}
+let requiredPosFloat = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | value if !Toolkit.Utils.Regex.Test.isPositiveIntOrFloat(value) =>
+    Some(Intl.formatMessage(intl, Msg.requiredPosIntOrFloat))
+  | _ => None
+  }
+}
+
+let requiredFloat = (intl, value) => {
+  switch value->Js.String2.split("-") {
+  | _ if value === "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | ["", value]
+  | [value] if Toolkit.Utils.Regex.Test.isPositiveIntOrFloat(value) =>
+    None
+  | _ => Some(Intl.formatMessage(intl, Msg.requiredPosIntOrFloat))
+  }
+}
+
+let optionalFloat = (intl, value) => {
+  switch value->Js.String2.split("-") {
+  | _ if value === "" => None
+  | ["", value]
+  | [value] if Toolkit.Utils.Regex.Test.isPositiveIntOrFloat(value) =>
+    None
+  | _ => Some(Intl.formatMessage(intl, Msg.requiredPosIntOrFloat))
+  }
+}
+
+let requiredPosFloatCurrencyEur = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Currency.WithUnit.decodeFromString {
+    | Ok(#EUR(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 EUR' '0.5 EUR'"}))
+    }
+  }
+}
+
+let requiredPosFloatTimeHour = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
+    | Ok(#h(_)) => None
+    | _ => Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 h' '0.5 h'"}))
+    }
+  }
+}
+
+let requiredPosFloatTimeMin = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
+    | Ok(#min(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 min' '0.5 min'"}))
+    }
+  }
+}
+
+let requiredPosFloatTimeHour_Min = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
+    | Ok(#h(_)) => None
+    | Ok(#min(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 min' '0.5 h'"}))
+    }
+  }
+}
+
+let optionalPosFloatTimeMin = (intl, value) => {
+  switch value {
+  | "" => None
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Time.WithUnit.decodeFromString {
+    | Ok(#min(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 min' '0.5 min'"}))
+    }
+  }
+}
+
+let requiredPosFloatPriceEurByHour = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.CompositeUnits.CurrencyPerTime.WithUnit.decodeFromString {
+    | Ok(#EUR_h(_)) => None
+    | _ =>
+      Some(
+        Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 EUR/h' '0.5 EUR/h'"}),
+      )
+    }
+  }
+}
+let requiredPosFloatPriceEurByKm = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.CompositeUnits.CurrencyPerDistance.WithUnit.decodeFromString {
+    | Ok(#EUR_km(_)) => None
+    | _ =>
+      Some(
+        Intl.formatMessageWithValues(
+          intl,
+          Msg.wrongFormat,
+          {"exemple": "'10 EUR/km' '0.5 EUR/km'"},
+        ),
+      )
+    }
+  }
+}
+
+let requiredPosFloatDistanceKm = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    | Ok(#km(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 km' '0.5 km'"}))
+    }
+  }
+}
+let requiredPosFloatDistanceKm_M = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    | Ok(#km(_)) => None
+    | Ok(#m(_)) => None
+    | _ => Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'15 m' '0.5 km'"}))
+    }
+  }
+}
+
+let optionalPosFloatDistanceKm = (intl, value) => {
+  switch value {
+  | "" => None
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    | Ok(#km(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 km' '0.5 km'"}))
+    }
+  }
+}
+
+let requiredPosFloatVolumeM3 = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Volume.WithUnit.decodeFromString {
+    | Ok(#m3(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": `'10 m³' '0.5 m³'`}))
+    }
+  }
+}
+
+let requiredPosFloatDimensionCm = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    | Ok(#cm(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 cm' '0.5 cm'"}))
+    }
+  }
+}
+let requiredPosFloatDimensionCm_M = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Dimension.WithUnit.decodeFromString {
+    | Ok(#cm(_)) => None
+    | Ok(#m(_)) => None
+    | _ => Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 cm' '0.5 m'"}))
+    }
+  }
+}
+
+let requiredPosFloatWeightKg = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Weight.WithUnit.decodeFromString {
+    | Ok(#kg(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 kg' '0.5 kg'"}))
+    }
+  }
+}
+let optionalPosFloatWeightKg = (intl, value) => {
+  switch value {
+  | "" => None
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Weight.WithUnit.decodeFromString {
+    | Ok(#kg(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 kg' '0.5 kg'"}))
+    }
+  }
+}
+let requiredPosFloatWeightG = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch v->Toolkit.Decoders.UnitMeasure.Weight.WithUnit.decodeFromString {
+    | Ok(#g(_)) => None
+    | _ =>
+      Some(Intl.formatMessageWithValues(intl, Msg.wrongFormat, {"exemple": "'10 kg' '0.5 kg'"}))
+    }
+  }
+}
+
+let requiredAlphanumericMax4 = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch Js.Re.test_(%re("/^[a-zA-Z0-9]{4}$/"), v) {
+    | true => None
+    | false => Some(Intl.formatMessage(intl, Msg.requiredAlphanumericMax4))
+    }
+  }
+}
+
+let required14Digits = (intl, value) => {
+  switch value {
+  | "" => Some(Intl.formatMessage(intl, Msg.requiredValue))
+  | v =>
+    switch Js.Re.test_(%re("/^[0-9]{14}$/"), v) {
+    | true => None
+    | false => Some(Intl.formatMessage(intl, Msg.required14Digits))
+    }
+  }
+}

package/src/primitives/Toolkit__Primitives.res

@@ -52,6 +52,8 @@ module Array = {
   let tail = array => array->Array.get(array->Array.length - 1)
   let tailExn = array => array->Array.getExn(array->Array.length - 1)
   let isLastIndex = (array, index) => array->Array.length - 1 == index
+
+  let flatten = array => array->Array.reduce([], (acc, value) => acc->Array.concat(value))
 }
 
 module Result = {

package/src/ui/Toolkit__Ui_Alert.res

@@ -4,23 +4,36 @@ type status = [#success | #error | #warning | #info]
 let make = (~title, ~description=?, ~status, ~className=?) =>
   <div
     className={cx([
-      "py-2 px-4 flex items-center",
+      "py-2 px-4 flex items-center border rounded",
       switch status {
-      | #success => "bg-success-50"
-      | #error => "bg-danger-50"
-      | #warning => "bg-warning-50"
-      | #info => "bg-info-50"
+      | #success => "bg-success-50 border-success-500"
+      | #error => "bg-danger-50 border-danger-500"
+      | #warning => "bg-warning-50 border-warning-500"
+      | #info => "bg-info-50 border-info-500"
       },
       className->Option.getWithDefault(""),
     ])}>
     {switch status {
-    | #success => <BsReactIcons.MdCheckCircle size=28 className="text-success-500 flex-shrink-0" />
+    | #success => <BsReactIcons.MdCheckCircle size=28 className="text-success-600 flex-shrink-0" />
     | #error => <BsReactIcons.MdWarning size=28 className="text-danger-600 flex-shrink-0" />
-    | #warning => <BsReactIcons.MdWarning size=28 className="text-warning-500 flex-shrink-0" />
-    | #info => <BsReactIcons.MdInfoOutline size=28 className="text-info-500 flex-shrink-0" />
+    | #warning => <BsReactIcons.MdWarning size=28 className="text-warning-600 flex-shrink-0" />
+    | #info => <BsReactIcons.FaExclamationCircle size=28 className="text-info-600 flex-shrink-0" />
     }}
     <div className="mx-3">
-      <div className={description->Option.isSome ? "font-bold" : ""}> title </div>
+      <div
+        className={cx([
+          description->Option.isSome ? "font-bold" : "",
+          {
+            switch status {
+            | #success => "text-success-600"
+            | #error => "text-danger-600"
+            | #warning => "text-warning-600"
+            | #info => "text-info-600"
+            }
+          },
+        ])}>
+        title
+      </div>
       {description->Option.getWithDefault(React.null)}
     </div>
   </div>