@colisweb/rescript-toolkit 4.29.3 → 5.0.0

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "4.29.3",
+  "version": "5.0.0",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",
-    "dev:res": "node_modules/.bin/rescript build -with-deps -w",
+    "dev:res": "node_modules/.bin/rescript build -w",
     "dev": "NINJA_ANSI_FORCED=1 vite",
     "build": "NINJA_ANSI_FORCED=1 vite build",
     "preview": "NINJA_ANSI_FORCED=1 vite preview",
@@ -28,59 +28,58 @@
   "license": "MIT",
   "dependencies": {
     "@colisweb/bs-react-intl-extractor-bin": "0.12.2",
-    "@colisweb/restorative": "1.0.0",
-    "@datadog/browser-rum": "5.4.0",
-    "@headlessui/react": "1.7.17",
+    "@datadog/browser-rum": "5.8.0",
+    "@dck/rescript-promise": "1.1.0",
+    "@dck/restorative": "1.1.0",
+    "@greenlabs/ppx-spice": "0.2.1",
+    "@headlessui/react": "1.7.18",
     "@headlessui/tailwindcss": "0.2.0",
     "@reach/auto-id": "0.18.0",
-    "@rescript/react": "0.11.0",
-    "autoprefixer": "10.4.16",
+    "@rescript/react": "0.12.0",
+    "autoprefixer": "10.4.17",
     "axios": "0.24.0",
-    "bs-axios": "0.0.43",
     "case": "1.6.3",
     "click-outside-hook": "1.1.0",
     "copy-to-clipboard": "3.3.3",
     "date-fns": "3.2.0",
-    "decco": "1.6.0",
     "dedent": "0.7.0",
     "lenses-ppx": "6.1.10",
     "list-selectors": "2.0.1",
     "lodash": "4.17.21",
-    "msw": "2.0.10",
-    "postcss": "8.4.32",
+    "msw": "2.1.2",
+    "postcss": "8.4.33",
     "postcss-preset-env": "8.0.1",
     "prismjs": "1.29.0",
     "react": "18.2.0",
     "react-big-calendar": "1.5.2",
     "react-datepicker": "3.8.0",
-    "react-day-picker": "8.8.2",
+    "react-day-picker": "8.10.0",
     "react-dom": "18.2.0",
-    "react-error-boundary": "4.0.11",
+    "react-error-boundary": "4.0.12",
     "react-helmet": "6.1.0",
-    "react-icons": "4.12.0",
-    "react-intl": "6.5.5",
+    "react-icons": "5.0.1",
+    "react-intl": "6.6.1",
     "react-portal": "4.2.2",
     "react-select": "5.8.0",
     "react-table": "7.8.0",
-    "react-use": "17.4.2",
-    "reason-promise": "1.1.5",
+    "react-use": "17.4.3",
     "res-react-intl": "3.1.2",
-    "rescript": "10.1.4",
+    "rescript": "11.0.0",
     "rescript-classnames": "6.0.0",
     "rescript-react-update": "5.0.2",
     "sanitize-html": "1.27.4",
     "swr": "2.2.2",
-    "tailwindcss": "3.3.6",
+    "tailwindcss": "3.4.1",
     "use-local-storage-state": "19.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.23.5",
+    "@babel/core": "7.23.7",
     "@jihchi/vite-plugin-rescript": "5.5.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.1.0",
+    "@vitejs/plugin-react": "4.2.1",
     "babel-loader": "8.2.5",
     "highlight.js": "11.9.0",
     "husky": "8.0.3",
@@ -91,11 +90,14 @@
     "rehype-autolink-headings": "^6.1.1",
     "rehype-highlight": "^6.0.0",
     "rehype-slug": "^5.1.0",
-    "sass": "1.69.3",
-    "vite": "5.0.5"
+    "sass": "1.69.7",
+    "vite": "5.0.11"
   },
   "packageManager": "yarn@3.3.1",
   "msw": {
     "workerDirectory": "public"
+  },
+  "engines": {
+    "node": ">=18"
   }
 }

package/{bsconfig.json → rescript.json}

@@ -23,18 +23,23 @@
   ],
   "suffix": ".bs.js",
   "namespace": false,
+  "uncurried": false,
   "bs-dependencies": [
     "@rescript/react",
-    "reason-promise",
-    "decco",
+    "@dck/rescript-promise",
+    "@greenlabs/ppx-spice",
     "rescript-classnames",
     "rescript-react-update",
-    "@colisweb/restorative"
+    "@dck/restorative"
+  ],
+  "ppx-flags": [
+    ["@greenlabs/ppx-spice/ppx"],
+    "lenses-ppx/ppx",
+    "res-react-intl/ppx"
   ],
-  "ppx-flags": ["decco/ppx", "lenses-ppx/ppx", "res-react-intl/ppx"],
   "warnings": {
     "number": "-44-30-32",
-    "error": "+5"
+    "error": "+5+4+6+8"
   },
   "bsc-flags": [
     "-bs-super-errors",

package/src/decoders/Decoders__UnitMeasure.res

@@ -0,0 +1,251 @@
+module type MakeConfig = {
+  type t
+  let toString: t => string
+  let toValue: t => float
+  let display: (t, ~digits: int=?, unit) => string
+
+  let wrapValue: float => t
+}
+
+module Make = (C: MakeConfig) => {
+  type dimension = C.t
+
+  let encoder: Spice.encoder<C.t> = value => value->C.toString->Spice.stringToJson
+
+  let decoder: Spice.decoder<C.t> = json =>
+    switch Spice.floatFromJson(json) {
+    | Ok(v) => v->C.wrapValue->Ok
+    | Error(_) as err => err
+    }
+
+  let codec: Spice.codec<dimension> = (encoder, decoder)
+
+  let toValue = C.toValue
+  let display = C.display
+  let toString = C.toString
+
+  @spice
+  type t = @spice.codec(codec) C.t
+}
+
+module type MakeWithUnitConfig = {
+  type t
+  let toString: t => string
+  let toValue: t => float
+  let display: (t, ~digits: int=?, unit) => string
+
+  module Unit: {
+    type t
+    let t_decode: Js.Json.t => result<t, Spice.decodeError>
+    let t_encode: t => Js.Json.t
+  }
+
+  let wrapValue: (Unit.t, float) => t
+
+  let errorPrefix: string
+}
+
+module MakeWithUnit = (Config: MakeWithUnitConfig) => {
+  let decodeFromString = (string: string) => {
+    // match a positive int or float followed by it's unit (capturing int/float in group1 and unit in group2)
+    let regexp = %re("/^(\d+(?:\.\d*)?)\s*(\D*)$/")
+
+    // regexpCaptures: [match , captureGroup1, captureGroup2]
+    let regexpCaptures =
+      Js.Re.exec_(regexp, string)->Belt.Option.map(r =>
+        r->Js.Re.captures->Array.map(Js.Nullable.toOption)
+      )
+
+    let jsonString = string->Js.Json.string
+
+    let errorPrefix = Config.errorPrefix
+
+    switch regexpCaptures {
+    | None => Spice.error(`${errorPrefix} unhandled format`, jsonString)
+    | Some([None, _value, _unit]) => Spice.error(`${errorPrefix} unhandled format`, jsonString)
+    | Some([_match, _value, None]) => Spice.error(`${errorPrefix} unhandled no unit`, jsonString)
+    | Some([_match, None, _unit]) => Spice.error(`${errorPrefix} unhandled no value`, jsonString)
+    | Some([Some(_match), Some(value), Some(unit)]) => {
+        let value = value->Js.Float.fromString
+        switch unit
+        // regex captures adjacent to spaces to slashes and deletes them (for composite units)
+        ->Js.String2.replaceByRe(%re("/ *\/ */"), "/")
+        ->Js.Json.string
+        ->Config.Unit.t_decode {
+        | Ok(unit) => Config.wrapValue(unit, value)->Ok
+        | Error(_) => Spice.error(`${errorPrefix} unhandled unit '${unit}'`, jsonString)
+        }
+      }
+
+    | Some(_) => Spice.error(`${errorPrefix} regex capture group error`, jsonString)
+    }
+  }
+
+  %%private(
+    let encoder: Spice.encoder<Config.t> = value => value->Config.toString->Spice.stringToJson
+    let decoder: Spice.decoder<Config.t> = json =>
+      switch Spice.stringFromJson(json) {
+      | Ok(v) => v->decodeFromString
+      | Error(_) as err => err
+      }
+    let codec: Spice.codec<Config.t> = (encoder, decoder)
+  )
+
+  let toValue = Config.toValue
+  let toString = Config.toString
+  let display = Config.display
+
+  @spice
+  type t = @spice.codec(codec) Config.t
+}
+
+module Dimension = {
+  module Config = Toolkit__Utils_UnitMeasure.Dimension
+
+  module WithUnit = MakeWithUnit({
+    include Config
+    let errorPrefix = "Dimension with unit"
+  })
+
+  module Mm = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Mm, ...)
+  })
+  module Cm = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Cm, ...)
+  })
+  module Dm = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Dm, ...)
+  })
+  module M = Make({
+    include Config
+    let wrapValue = Config.wrapValue(M, ...)
+  })
+  module Km = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Km, ...)
+  })
+}
+
+module Speed = {
+  module Config = Toolkit__Utils_UnitMeasure.Speed
+
+  module WithUnit = MakeWithUnit({
+    include Config
+    let errorPrefix = "Speed with unit"
+  })
+
+  module Km_h = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Km_h, ...)
+  })
+}
+
+module Volume = {
+  module Config = Toolkit__Utils_UnitMeasure.Volume
+
+  module WithUnit = MakeWithUnit({
+    include Config
+    let errorPrefix = "Volume with unit"
+  })
+
+  module M3 = Make({
+    include Config
+    let wrapValue = Config.wrapValue(M3, ...)
+  })
+}
+
+module EnergyCapacity = {
+  module Config = Toolkit__Utils_UnitMeasure.EnergyCapacity
+
+  module WithUnit = MakeWithUnit({
+    include Config
+    let errorPrefix = "EnergyCapacity with unit"
+  })
+
+  module KWh = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Kwh, ...)
+  })
+}
+
+module Weight = {
+  module Config = Toolkit__Utils_UnitMeasure.Weight
+
+  module WithUnit = MakeWithUnit({
+    include Config
+    let errorPrefix = "Weight with unit"
+  })
+
+  module G = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Gram, ...)
+  })
+  module Kg = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Kg, ...)
+  })
+}
+
+module Time = {
+  module Config = Toolkit__Utils_UnitMeasure.Time
+
+  module WithUnit = MakeWithUnit({
+    include Config
+    let errorPrefix = "Time with unit"
+  })
+
+  module Min = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Min, ...)
+  })
+  module H = Make({
+    include Config
+    let wrapValue = Config.wrapValue(Hour, ...)
+  })
+}
+
+module Currency = {
+  module Config = Toolkit__Utils_UnitMeasure.Currency
+
+  module WithUnit = MakeWithUnit({
+    include Config
+    let errorPrefix = "Curency with unit"
+  })
+
+  module EUR = Make({
+    include Config
+    let wrapValue = Config.wrapValue(EUR, ...)
+  })
+}
+
+module CompositeUnits = {
+  module CurrencyPerDistance = {
+    module Config = Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerDistance
+
+    module WithUnit = MakeWithUnit({
+      include Config
+      let errorPrefix = "Curency per distance with unit"
+    })
+
+    module EUR_km = Make({
+      include Config
+      let wrapValue = Config.wrapValue(EUR_km, ...)
+    })
+  }
+  module CurrencyPerTime = {
+    module Config = Toolkit__Utils_UnitMeasure.CompositeUnits.CurrencyPerTime
+
+    module WithUnit = MakeWithUnit({
+      include Config
+      let errorPrefix = "Curency per time with unit"
+    })
+
+    module EUR_h = Make({
+      include Config
+      let wrapValue = Config.wrapValue(EUR_h, ...)
+    })
+  }
+}