@colisweb/rescript-toolkit 4.20.5 → 4.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "4.20.5",
+  "version": "4.21.0",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",
@@ -94,5 +94,8 @@
     "sass": "1.69.3",
     "vite": "4.4.11"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.3.1",
+  "msw": {
+    "workerDirectory": "public"
+  }
 }

package/src/intl/Toolkit__Intl.res

@@ -80,6 +80,8 @@ module Make = (Config: IntlConfig) => {
   let setCurrentLocale = (locale: availableLanguages) => store.dispatch(SetLocale(locale))
 
   let useCurrentLocale = () => store.useStore().locale
+  let getCurrentLocale = () => store.getState().locale
+  let getIntl = () => store.getState().intl
   let useIntl = () => store.useStore().intl
 
   let getDateFnsLocale = locale =>

package/src/intl/Toolkit__Intl.resi

@@ -23,8 +23,11 @@ module Make: (Config: IntlConfig) =>
   let locale: availableLanguages
   let intl: ReactIntl.Intl.t
   let useIntl: unit => ReactIntl.Intl.t
+  let getIntl: unit => ReactIntl.Intl.t
+  let getCurrentLocale: unit => availableLanguages
   let useCurrentLocale: unit => availableLanguages
   let setCurrentLocale: availableLanguages => unit
+
   let getDateFnsLocale: availableLanguages => DateFns.dateFnsLocale
 
   module Provider: {

package/src/mock/MockOverlay.res

@@ -1,7 +1,7 @@
 let localStorageKey = "@colisweb/mock"
 
 @react.component
-let make = (~worker: Msw.worker, ~workerOptions: Msw.startOptions={}, ~children) => {
+let make = (~worker: Msw.worker, ~workerOptions: Msw.startOptions={}, ~className="", ~children) => {
   let (mockEnabled, setMock) = Toolkit__Hooks.useLocalStorageState(
     localStorageKey,
     {
@@ -26,9 +26,13 @@ let make = (~worker: Msw.worker, ~workerOptions: Msw.startOptions={}, ~children)
 
   <React.Suspense fallback={<Toolkit__Ui_SpinnerFullScreen />}>
     <label
-      className={`fixed top-2 left-1/2 flex flex-row gap-2 items-center justify-center ${mockEnabled
+      className={cx([
+        "fixed top-2 left-1/2 flex flex-row gap-2 items-center justify-center",
+        mockEnabled
           ? "bg-success-100 border-success-400 text-success-700"
-          : "bg-neutral-100"} p-1 border rounded-lg z-50 cursor-pointer`}>
+          : "bg-neutral-100 p-1 border rounded-lg z-50 cursor-pointer",
+        className,
+      ])}>
       <span> {"Mock"->React.string} </span>
       <input
         type_={"checkbox"}

package/src/mock/index.md

@@ -49,7 +49,7 @@ open Identifiers
 let mocks = [
   Msw.Rest.get(
     "https://api.url",
-    (req, res, ctx) => {
+    ({params}) => {
       open ColiswebApi.V5.Transporter.GetContactsWithParameters.Config
       let _emptyResponse = []
       let defaultResponse = [
@@ -69,18 +69,18 @@ let mocks = [
         }
       ]
 
-      let transporterId = req.params["transporterId"]
+      let transporterId = params->Js.Dict.get("transporterId")
 
       switch transporterId {
-      | "9" => res(Msw.Ctx.json(ctx, defaultResponse))
-      | _ => ()
+      | Some("9") => Msw.HttpResponse.json(defaultResponse->response_encode)
+      | _ => Msw.HttpResponse.json(_emptyResponse->response_encode)
       }
     },
   ),
   Msw.Rest.put(
     "https://api.url",
-    (_req, res, ctx) => {
-      res(Msw.Ctx.status(ctx, 200))
+    (_) => {
+      Msw.HttpResponse.jsonWithOptions(Js.Json.null, {status: 200})
     },
   ),
 ]

package/src/vendors/Msw.res

@@ -15,7 +15,7 @@ external stop: worker => unit = "stop"
 @module("msw")
 external delay: unit => Promise.Js.t<unit, unit> = "delay"
 @module("msw")
-external delayCustom: int => Promise.Js.t<unit, unit> = "delay"
+external delayCustom: int => Promise.Js.t<unit, 'err> = "delay"
 
 module HttpResponse = {
   type t
@@ -54,6 +54,18 @@ module Http = {
   external delete: (string, httpRequest => HttpResponse.t) => mock = "delete"
   @module("msw") @scope("http")
   external all: (string, httpRequest => HttpResponse.t) => mock = "all"
+
+  @module("msw") @scope("http")
+  external getAsync: (string, httpRequest => Promise.Js.t<HttpResponse.t, 'err>) => mock = "get"
+  @module("msw") @scope("http")
+  external putAsync: (string, httpRequest => Promise.Js.t<HttpResponse.t, 'err>) => mock = "put"
+  @module("msw") @scope("http")
+  external postAsync: (string, httpRequest => Promise.Js.t<HttpResponse.t, 'err>) => mock = "post"
+  @module("msw") @scope("http")
+  external deleteAsync: (string, httpRequest => Promise.Js.t<HttpResponse.t, 'err>) => mock =
+    "delete"
+  @module("msw") @scope("http")
+  external allAsync: (string, httpRequest => Promise.Js.t<HttpResponse.t, 'err>) => mock = "all"
 }
 
 @module("msw")