@colisweb/rescript-toolkit 2.8.0 → 2.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.8.0",
+  "version": "2.8.4",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build",

package/src/decoders/Toolkit__Decoders.res

@@ -169,14 +169,18 @@ module UnitMeasure = {
       let decoder: Decco.decoder<Toolkit__Utils_UnitMeasure.Dimension.t> = json =>
         switch Decco.stringFromJson(json) {
         | Belt.Result.Ok(v) =>
-          let valueUnitArray = v |> Js.String.split(" ")
-          switch valueUnitArray->Array.get(1) {
-          | Some("mm") => #mm(valueUnitArray->Array.getExn(0)->Js.Float.fromString)->Ok
-          | Some("cm") => #cm(valueUnitArray->Array.getExn(0)->Js.Float.fromString)->Ok
-          | Some("dm") => #dm(valueUnitArray->Array.getExn(0)->Js.Float.fromString)->Ok
-          | Some("km") => #km(valueUnitArray->Array.getExn(0)->Js.Float.fromString)->Ok
-          | None => raise(Js.Exn.raiseError("unhandled no unit"))
-          | _ => raise(Js.Exn.raiseError("unhandled weight unit"))
+          let valueUnitArray = v->Js.String2.split(" ")
+          switch (
+            valueUnitArray[0]->Belt.Option.flatMap(Belt.Float.fromString),
+            valueUnitArray[1],
+          ) {
+          | (Some(v), Some("mm")) => #mm(v)->Ok
+          | (Some(v), Some("cm")) => #cm(v)->Ok
+          | (Some(v), Some("dm")) => #dm(v)->Ok
+          | (Some(v), Some("km")) => #km(v)->Ok
+          | (None, _) => Decco.error("unhandled no value", json)
+          | (_, None) => Decco.error("unhandled no unit", json)
+          | (_, Some(_)) => Decco.error("unhandled dimension unit", json)
           }
         | Belt.Result.Error(_) as err => err
         }
@@ -233,12 +237,16 @@ module UnitMeasure = {
       let decoder: Decco.decoder<Toolkit__Utils_UnitMeasure.Weight.t> = json =>
         switch Decco.stringFromJson(json) {
         | Ok(v) =>
-          let valueUnitArray = v |> Js.String.split(" ")
-          switch valueUnitArray->Array.get(1) {
-          | Some("g") => #g(valueUnitArray->Array.getExn(0)->Js.Float.fromString)->Ok
-          | Some("kg") => #kg(valueUnitArray->Array.getExn(0)->Js.Float.fromString)->Ok
-          | None => raise(Js.Exn.raiseError("unhandled no unit"))
-          | _ => raise(Js.Exn.raiseError("unhandled weight unit"))
+          let valueUnitArray = v->Js.String2.split(" ")
+          switch (
+            valueUnitArray[0]->Belt.Option.flatMap(Belt.Float.fromString),
+            valueUnitArray[1],
+          ) {
+          | (Some(v), Some("g")) => #g(v)->Ok
+          | (Some(v), Some("kg")) => #kg(v)->Ok
+          | (None, _) => Decco.error("unhandled no value", json)
+          | (_, None) => Decco.error("unhandled no unit", json)
+          | (_, Some(_)) => Decco.error("unhandled weight unit", json)
           }
 
         | Error(_) as err => err
@@ -282,6 +290,74 @@ module UnitMeasure = {
       let convert = Toolkit__Utils_UnitMeasure.Weight.makeKg
     })
   }
+
+  module Time = {
+    module WithUnit = {
+      let encoder: Decco.encoder<Toolkit__Utils_UnitMeasure.Time.t> = value =>
+        switch value {
+        | #min(v) => Js.Json.string(v->Js.Float.toString ++ " min")
+        | #h(v) => Js.Json.string(v->Js.Float.toString ++ " h")
+        }
+
+      let decoder: Decco.decoder<Toolkit__Utils_UnitMeasure.Time.t> = json =>
+        switch Decco.stringFromJson(json) {
+        | Ok(v) =>
+          let valueUnitArray = v->Js.String2.split(" ")
+          switch (
+            valueUnitArray[0]->Belt.Option.flatMap(Belt.Float.fromString),
+            valueUnitArray[1],
+          ) {
+          | (Some(v), Some("min")) => #min(v)->Ok
+          | (Some(v), Some("h")) => #h(v)->Ok
+          | (None, _) => Decco.error("unhandled no value", json)
+          | (_, None) => Decco.error("unhandled no unit", json)
+          | (_, Some(_)) => Decco.error("unhandled time unit", json)
+          }
+
+        | Error(_) as err => err
+        }
+
+      let codec: Decco.codec<Toolkit__Utils_UnitMeasure.Time.t> = (encoder, decoder)
+
+      @decco
+      type t = @decco.codec(codec) Toolkit__Utils_UnitMeasure.Time.t
+    }
+
+    module type TimeConfig = {
+      let convert: float => Toolkit__Utils_UnitMeasure.Time.t
+    }
+
+    module Make = (C: TimeConfig) => {
+      type time = Toolkit__Utils_UnitMeasure.Time.t
+
+      let encoder: Decco.encoder<Toolkit__Utils_UnitMeasure.Time.t> = value =>
+        switch value {
+        | #min(v) => Js.Json.string(v->Js.Float.toString ++ " min")
+        | #h(v) => Js.Json.string(v->Js.Float.toString ++ " h")
+        }
+
+      let decoder: Decco.decoder<Toolkit__Utils_UnitMeasure.Time.t> = json =>
+        switch Decco.floatFromJson(json) {
+        | Ok(v) => v->C.convert->Ok
+        | Error(_) as err => err
+        }
+
+      let codec: Decco.codec<time> = (encoder, decoder)
+
+      let toValue = Toolkit__Utils_UnitMeasure.Time.toValue
+      let display = Toolkit__Utils_UnitMeasure.Time.display
+
+      @decco
+      type t = @decco.codec(codec) Toolkit__Utils_UnitMeasure.Time.t
+    }
+
+    module Min = Make({
+      let convert = Toolkit__Utils_UnitMeasure.Time.makeMin
+    })
+    module H = Make({
+      let convert = Toolkit__Utils_UnitMeasure.Time.makeH
+    })
+  }
 }
 
 // StringArray

package/src/request/Toolkit__Request.res

@@ -54,13 +54,18 @@ let toResult = (
     | Ok(response) =>
       switch response["data"]->mapData {
       | Ok(_) as ok => ok
-      | Error(error) =>
-        Error(
-          #invalidResponseData(
-            response->castToUndecodedResponse,
-            "\"" ++ (error.path ++ ("\" " ++ error.message)),
-          ),
-        )
+      | Error(error) => {
+          %log.error(
+            "Decoder failure"
+            ("err", error)
+          )
+          Error(
+            #invalidResponseData(
+              response->castToUndecodedResponse,
+              "\"" ++ (error.path ++ ("\" " ++ error.message)),
+            ),
+          )
+        }
       }
     | Error(error) =>
       if (error->castToJs)["response"] {

package/src/tailwind/tailwind.config.js

@@ -11,8 +11,7 @@ module.exports = {
       },
       boxShadow: {
         sidenav: "inset 0 0 1px 2px rgba(0, 0, 0, 0.2)",
-        sm:
-          "0px 2px 1px -1px rgba(0,0,0,0.1), 0px 1px 1px 0px rgba(0,0,0,0.1), 0px 1px 3px 0px rgba(0,0,0,0.1)",
+        sm: "0px 2px 1px -1px rgba(0,0,0,0.1), 0px 1px 1px 0px rgba(0,0,0,0.1), 0px 1px 3px 0px rgba(0,0,0,0.1)",
       },
       borderColor: {
         currentColor: "currentColor",
@@ -142,7 +141,7 @@ module.exports = {
       purple: {
         50: "#F8F1FF",
         100: "#DDC8F0",
-        300: "#8787E0",
+        300: "#B787E0",
         400: "#9151C9",
         500: "#6C1CB2",
         600: "#55158B",

package/src/ui/Toolkit__Ui_Alert.res

@@ -14,10 +14,10 @@ let make = (~title, ~description=?, ~status, ~className=?) =>
       className->Option.getWithDefault(""),
     ])}>
     {switch status {
-    | #success => <BsReactIcons.MdCheckCircle size=28 className="text-success-500" />
-    | #error => <BsReactIcons.MdWarning size=28 className="text-danger-600" />
-    | #warning => <BsReactIcons.MdWarning size=28 className="text-warning-500" />
-    | #info => <BsReactIcons.MdInfoOutline size=28 className="text-info-500" />
+    | #success => <BsReactIcons.MdCheckCircle size=28 className="text-success-500 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" />
     }}
     <div className="mx-3">
       <div className={description->Option.isSome ? "font-bold" : ""}> title </div>

package/src/utils/Toolkit__Utils_UnitMeasure.res

@@ -17,6 +17,57 @@ module Weight = {
   let makeKg = (value: float) => #kg(value)
 }
 
+module Time = {
+  type t = [#min(float) | #h(float)]
+
+  let toValue = value =>
+    switch value {
+    | #min(v)
+    | #h(v) => v
+    }
+
+  type separator = [#units | #colon]
+  let display = (value, ~separator=#units, ()) => {
+    let _initialDate = Js.Date.make()
+    let duration = switch value {
+    | #min(v) =>
+      BsDateFns.intervalToDuration(
+        ~interval={
+          start: _initialDate,
+          end_: _initialDate->BsDateFns.addMinutes(v),
+        },
+      )
+    | #h(v) =>
+      BsDateFns.intervalToDuration(
+        ~interval={start: _initialDate, end_: _initialDate->BsDateFns.addHours(v)},
+      )
+    }
+
+    let mainSeparator = {
+      switch separator {
+      | #units => " h "
+      | #colon => ":"
+      }
+    }
+    let secondarySeparator = {
+      switch separator {
+      | #units => " min"
+      | #colon => ""
+      }
+    }
+
+    switch (duration.hours, duration.minutes) {
+    | (Some(h), Some(min)) =>
+      `${h->Int.toString}${mainSeparator}${min->Int.toString}${secondarySeparator}`
+    | (Some(h), _) => `${h->Int.toString} h`
+    | (_, Some(min)) => `${min->Int.toString} min`
+    | _ => ""
+    }
+  }
+  let makeMin = (value: float) => #min(value)
+  let makeH = (value: float) => #h(value)
+}
+
 module Dimension = {
   type t = [
     | #mm(float)

package/src/vendors/BsDateFns.res

@@ -60,6 +60,8 @@ external setSeconds: (Js.Date.t, float) => Js.Date.t = "setSeconds"
 @module("date-fns")
 external setMinutes: (Js.Date.t, float) => Js.Date.t = "setMinutes"
 @module("date-fns")
+external addMinutes: (Js.Date.t, float) => Js.Date.t = "addMinutes"
+@module("date-fns")
 external setHours: (Js.Date.t, float) => Js.Date.t = "setHours"
 @module("date-fns")
 external addHours: (Js.Date.t, float) => Js.Date.t = "addHours"