@colisweb/rescript-toolkit 5.7.0 → 5.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "5.7.0",
+  "version": "5.8.0",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@colisweb/bs-react-intl-extractor-bin": "0.12.2",
     "@datadog/browser-rum": "5.8.0",
-    "@dck/rescript-ky": "2.0.1",
+    "@dck/rescript-ky": "2.0.3",
     "@dck/rescript-promise": "1.1.0",
     "@dck/restorative": "1.1.0",
     "@greenlabs/ppx-spice": "0.2.1",

package/rescript.json

@@ -34,7 +34,9 @@
     "@dck/rescript-ky"
   ],
   "ppx-flags": [
-    ["@greenlabs/ppx-spice/ppx"],
+    [
+      "@greenlabs/ppx-spice/ppx"
+    ],
     "lenses-ppx/ppx",
     "res-react-intl/ppx"
   ],
@@ -46,6 +48,7 @@
     "-bs-super-errors",
     "-bs-no-version-header",
     "-open Belt",
+    "-open Toolkit__Primitives_Result",
     "-open Cx"
   ]
-}
+}

package/src/primitives/Toolkit__Primitives.res

@@ -63,11 +63,3 @@ module Array = {
 
   let flatten = array => array->Array.reduce([], (acc, value) => acc->Array.concat(value))
 }
-
-module Result = {
-  let get = result =>
-    switch result {
-    | Ok(v) => Some(v)
-    | Error(_) => None
-    }
-}

package/src/primitives/Toolkit__Primitives_Result.res

@@ -0,0 +1,18 @@
+module Result = {
+  include Belt.Result
+
+  let get = result =>
+    switch result {
+    | Ok(v) => Some(v)
+    | Error(_) => None
+    }
+
+  let mapError = (result: t<'a, 'b>, fn: 'b => 'c) => {
+    switch result {
+    | Ok(_) as ok => ok
+    | Error(err) => Error(fn(err))
+    }
+  }
+
+  let mapOk = map
+}

package/src/request/Request.res

@@ -8,13 +8,13 @@ type requestConfig<'apiError, 'response> = {
   path: string,
   requestOptions: Ky.requestOptions<Js.Json.t>,
   key?: array<string>,
-  mapCustomErrors?: Ky.error => error<'apiError>,
-  mapRawResponse?: (result<Js.Json.t, Ky.error>, Ky.Response.t) => result<'response, error<'apiError>>,
+  mapCustomErrors?: Ky.error => Promise.t<error<'apiError>>,
+  mapRawResponse?: result<Js.Json.t, Ky.error> => Promise.t<result<'response, error<'apiError>>>,
 }
 
 %%private(
   let fetch = (
-    ~instance=?,
+    ~instance,
     ~path,
     ~requestOptions,
     ~mapRawResponse=?,
@@ -25,35 +25,40 @@ type requestConfig<'apiError, 'response> = {
     // - parseJson
     // - abort controller signal
 
-    let kyResponse = instance->Option.mapWithDefault(Ky.fetch(path, requestOptions), instance => {
-      (instance->Ky.Instance.asCallable)(path, ~options=requestOptions)
-    })
-    kyResponse
-    ->Ky.Response.json()
+    (instance->Ky.Instance.asCallable)(path, ~options=requestOptions)
+    ->Ky.Response.jsonFromPromise()
     ->Promise.Js.fromBsPromise
     ->Promise.Js.toResult
     ->Promise.flatMap(result => {
       let result: result<Js.Json.t, Ky.error> = result->Obj.magic
 
       let mapRawResponseOrDecode = switch mapRawResponse {
-      | Some(fn) => fn(result, kyResponse)
+      | Some(fn) => fn(result)
       | None =>
-        switch result {
-        | Error(err) => Error(Unknown(err))
-        | Ok(response) =>
-          switch response->response_decode {
-          | Ok(response) => Ok(response)
-          | Error(decodeError) => Error(DecodeError(decodeError))
-          }
-        }
+        Promise.resolved(
+          switch result {
+          | Error(err) => Error(Unknown(err))
+          | Ok(response) =>
+            switch response->response_decode {
+            | Ok(response) => Ok(response)
+            | Error(decodeError) => Error(DecodeError(decodeError))
+            }
+          },
+        )
       }
 
-      let mappedCustomErrors = switch mapRawResponseOrDecode {
-      | Error(Unknown(err)) => Error(mapCustomErrors->Option.mapWithDefault(Unknown(err), fn => fn(err)))
-      | _ as ok => ok
-      }
+      let mappedCustomErrors = mapRawResponseOrDecode->Promise.flatMapError(error => {
+        switch error {
+        | Unknown(err) =>
+          mapCustomErrors->Option.mapWithDefault(
+            Promise.resolved(Error(Unknown(err))),
+            fn => fn(err)->Promise.map(v => {Error(v)}),
+          )
+        | err => Promise.resolved(Error(err))
+        }
+      })
 
-      Promise.resolved(mappedCustomErrors)
+      mappedCustomErrors
     })
   }
 )
@@ -127,7 +132,7 @@ let useOptionalFetcher = (
     and type error = error
   ),
   argument: option<argument>,
-): Toolkit__Hooks.fetcher<response> => {
+): Toolkit__Hooks.fetcher<option<response>> => {
   let module(C) = config
 
   Toolkit__Hooks.useOptionalFetcher(
@@ -210,3 +215,12 @@ let decodeResponseError = (responseError, decoder) => {
   ->Promise.mapError(Obj.magic)
   ->Promise.flatMapOk(json => json->decoder->Promise.resolved)
 }
+
+let decodeRawResponse = (result: result<Js.Json.t, Ky.error>, decoder): result<
+  'a,
+  error<'apiError>,
+> => {
+  result
+  ->Result.mapError(err => Unknown(err))
+  ->Result.flatMap(json => json->decoder->Result.mapError(err => DecodeError(err)))
+}

package/src/ui/Toolkit__Ui_Autocomplete.res

@@ -83,7 +83,7 @@ let make = (
       }}
       value={value->Js.Nullable.fromOption}
       nullable={true}>
-      <div className="relative z-0 w-full cursor-default rounded bg-white text-left sm:text-sm">
+      <div className="relative z-0 w-full cursor-default rounded bg-white text-left">
         <HeadlessUi.Combobox.Input
           ?placeholder
           ?autoFocus
@@ -91,7 +91,7 @@ let make = (
           onChange=onInputChange
           autocomplete="off"
           className={cx([
-            "w-full border py-2 rounded pl-3 pr-10 text-sm leading-5 text-gray-900",
+            "w-full border py-2 rounded pl-3 pr-10 text-base leading-5 text-gray-900",
             isInvalid ? "border-danger-500" : "border-gray-300",
             inputClassName,
           ])}

package/src/vendors/Swr.res

@@ -95,6 +95,8 @@ module SwrConfig = {
   external mutate0: (t, SwrKey.t) => unit = "mutate"
   @send
   external mutateByKey: (t, key) => unit = "mutate"
+  @send
+  external mutateByKeyWithParams: (t, key, 'data, bool) => unit = "mutate"
 
   @send
   external mutate: (t, SwrKey.t, 'data, bool) => unit = "mutate"