@colisweb/rescript-toolkit 5.4.1 → 5.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "5.4.1",
+  "version": "5.5.0",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",
@@ -29,6 +29,7 @@
   "dependencies": {
     "@colisweb/bs-react-intl-extractor-bin": "0.12.2",
     "@datadog/browser-rum": "5.8.0",
+    "@dck/rescript-ky": "^2.0.0",
     "@dck/rescript-promise": "1.1.0",
     "@dck/restorative": "1.1.0",
     "@greenlabs/ppx-spice": "0.2.1",
@@ -43,6 +44,7 @@
     "copy-to-clipboard": "3.3.3",
     "date-fns": "3.2.0",
     "dedent": "0.7.0",
+    "ky": "^1.2.4",
     "lenses-ppx": "6.1.10",
     "list-selectors": "2.0.1",
     "lodash": "4.17.21",

package/rescript.json

@@ -30,7 +30,8 @@
     "@greenlabs/ppx-spice",
     "rescript-classnames",
     "rescript-react-update",
-    "@dck/restorative"
+    "@dck/restorative",
+    "@dck/rescript-ky"
   ],
   "ppx-flags": [
     ["@greenlabs/ppx-spice/ppx"],

package/src/primitives/Toolkit__Primitives.res

@@ -5,13 +5,6 @@ module String = {
   @ocaml.doc(" TODO: remove ")
   let join = joinNonEmty
 
-  let includes = (str1, str2) => {
-    str1
-    ->Js.String2.toLowerCase
-    ->Js.String2.normalizeByForm("NFD")
-    ->Js.String2.includes(str2->Js.String2.toLowerCase->Js.String2.normalizeByForm("NFD"))
-  }
-
   /**
   *Normalize NFD*: replace by re remove split by commponents the accent letters
   and deletes the accent component only, leaving the un-accented letter
@@ -23,8 +16,8 @@ module String = {
     ->Js.String2.replaceByRe(%re("/[\u0300-\u036f]/g"), "")
   }
 
-  let includes = (str, search) => {
-    str->normalizeForSearch->Js.String2.includes(search)
+  let normalizedIncludes = (str, search) => {
+    str->normalizeForSearch->Js.String2.includes(search->normalizeForSearch)
   }
 }
 

package/src/request/Request.res

@@ -0,0 +1,205 @@
+type error<'apiError> =
+  | DecodeError(Spice.decodeError)
+  | Unknown(Ky.error<Js.Json.t>)
+  | Custom('apiError)
+
+type requestConfig<'apiError, 'response> = {
+  path: string,
+  requestOptions: Ky.requestOptions<Js.Json.t, Js.Json.t, Js.Json.t, 'response>,
+  key?: array<string>,
+  customError?: Ky.error<Js.Json.t> => Promise.t<error<'apiError>>,
+  mapPromise?: Js.Json.t => result<'response, error<'apiError>>,
+}
+
+%%private(
+  let fetch = (
+    ~instance,
+    ~path,
+    ~requestOptions,
+    ~mapPromise=?,
+    ~customError=?,
+    ~response_decode,
+  ) => {
+    // TODO :
+    // - parseJson
+    // - abort controller signal
+    Ky.Instance.asCallable(instance)(path, ~options=requestOptions)
+    ->Ky.Response.json()
+    ->Promise.Js.fromBsPromise
+    ->Promise.Js.toResult
+    ->Promise.flatMap(response => {
+      switch response {
+      | Error(err) => {
+          let error: Ky.error<'a> = err->Obj.magic
+          customError->Option.mapWithDefault(Promise.resolved(Error(Unknown(error))), fn =>
+            fn(error)->Promise.map(e => Error(e))
+          )
+        }
+      | Ok(response) =>
+        switch mapPromise {
+        | None =>
+          Promise.resolved(
+            switch response->response_decode {
+            | Ok(_) as ok => ok
+            | Error(decodeError) => Error(DecodeError(decodeError))
+            },
+          )
+        | Some(fn) => Promise.resolved(fn(response))
+        }
+      }
+    })
+  }
+)
+module type Config = {
+  type argument
+  type response
+  type error
+  let instance: Ky.Instance.t
+  let response_decode: Js.Json.t => result<response, Spice.decodeError>
+  let config: argument => requestConfig<error, response>
+}
+
+let fetchAPI = (
+  type argument response err,
+  config: module(Config with
+    type argument = argument
+    and type response = response
+    and type error = err
+  ),
+  argument: argument,
+): Promise.t<result<response, error<err>>> => {
+  let module(C) = config
+  let requestConfig = C.config(argument)
+
+  fetch(
+    ~instance=C.instance,
+    ~path=requestConfig.path,
+    ~response_decode=C.response_decode,
+    ~requestOptions=requestConfig.requestOptions,
+    ~customError=?requestConfig.customError,
+    ~mapPromise=?requestConfig.mapPromise,
+  )
+}
+let useFetcher = (
+  type argument response error,
+  ~options: option<Swr.fetcherOptions>=?,
+  config: module(Config with
+    type argument = argument
+    and type response = response
+    and type error = error
+  ),
+  argument: option<argument>,
+): Toolkit__Hooks.fetcher<response> => {
+  let module(C) = config
+
+  Toolkit__Hooks.useFetcher(
+    ~options?,
+    argument->Option.flatMap(argument => {
+      let requestConfig = C.config(argument)
+
+      switch requestConfig.key->Obj.magic {
+      | None =>
+        Js.Exn.raiseError(
+          `You are using a config without a key for this path ${requestConfig.path}`,
+        )
+      | Some(key) => key
+      }
+    }),
+    () => {
+      fetchAPI(config, argument->Option.getExn)->Promise.Js.fromResult
+    },
+  )
+}
+
+let useOptionalFetcher = (
+  type argument response error,
+  ~options: option<Swr.fetcherOptions>=?,
+  config: module(Config with
+    type argument = argument
+    and type response = response
+    and type error = error
+  ),
+  argument: option<argument>,
+): Toolkit__Hooks.fetcher<response> => {
+  let module(C) = config
+
+  Toolkit__Hooks.useOptionalFetcher(
+    ~options?,
+    argument->Option.flatMap(argument => {
+      let requestConfig = C.config(argument)
+
+      switch requestConfig.key->Obj.magic {
+      | None =>
+        Js.Exn.raiseError(
+          `You are using a config without a key for this path ${requestConfig.path}`,
+        )
+      | Some(key) => key
+      }
+    }),
+    () => {
+      fetchAPI(config, argument->Option.getExn)->Promise.Js.fromResult
+    },
+  )
+}
+
+type state<'data, 'error> =
+  | NotAsked
+  | Loading
+  | Done(result<'data, 'error>)
+
+%%private(
+  let minInt = -999999999
+  let maxInt = 1000000000
+
+  let increment = (num: int): int => num !== maxInt ? num + 1 : minInt
+)
+
+let useManualRequest = (
+  type argument response error,
+  config: module(Config with
+    type argument = argument
+    and type response = response
+    and type error = error
+  ),
+) => {
+  let module(Config) = config
+
+  let lastCallId = React.useRef(0)
+  let canceled = React.useRef(false)
+  let (state, set) = React.useState(() => NotAsked)
+  let isMounted = ReactUse.useMountedState(.)
+
+  let trigger = argument => {
+    lastCallId.current = lastCallId.current->increment
+    let callId = lastCallId.current
+
+    set(_ => Loading)
+
+    canceled.current = false
+
+    fetchAPI(module(Config), argument)->Promise.map(result => {
+      let isCanceled = callId !== lastCallId.current || canceled.current
+
+      if isMounted() && !isCanceled {
+        set(_ => Done(result))
+      }
+
+      (result, isCanceled)
+    })
+  }
+
+  let cancel = React.useCallback(() => canceled.current = true, [])
+
+  (state, trigger, cancel)
+}
+
+external exnToError: Js.Exn.t => error<'a> = "%identity"
+
+let decodeResponseError = (responseError, decoder) => {
+  responseError
+  ->Ky.Response.json()
+  ->Promise.Js.fromBsPromise
+  ->Promise.Js.toResult
+  ->Promise.mapError(Obj.magic)
+  ->Promise.flatMapOk(json => json->decoder->Promise.resolved)
+}

package/src/ui/Toolkit__Ui_MultiSelect.res

@@ -46,12 +46,7 @@ let make = (
   let filterOptionsBySearch = (~options, ~search) => {
     options->Array.keep(({label}) =>
       // normalize nfd -> replace by re remove split by commponents the accent letters and deletes the accent component only, leaving the un-accented letter
-      search == "" ||
-        label
-        ->Js.String2.toLowerCase
-        ->Js.String2.normalizeByForm("NFD")
-        ->Js.String2.replaceByRe(%re("/[\u0300-\u036f]/g"), "")
-        ->Js.String2.includes(search)
+      search == "" || Toolkit__Primitives.String.normalizedIncludes(label, search)
     )
   }
 
@@ -99,12 +94,7 @@ let make = (
               onChange={event => {
                 let target = event->ReactEvent.Form.currentTarget
                 // normalize nfd -> replace by re remove split by commponents the accent letters and deletes the accent component only, leaving the un-accented letter
-                setSearch(_ =>
-                  target["value"]
-                  ->Js.String2.toLowerCase
-                  ->Js.String2.normalizeByForm("NFD")
-                  ->Js.String2.replaceByRe(%re("/[\u0300-\u036f]/g"), "")
-                )
+                setSearch(_ => target["value"])
               }}
             />
           </div>
@@ -112,12 +102,7 @@ let make = (
       {options
       ->Array.keep(({label}) =>
         // normalize nfd -> replace by re remove split by commponents the accent letters and deletes the accent component only, leaving the un-accented letter
-        search == "" ||
-          label
-          ->Js.String2.toLowerCase
-          ->Js.String2.normalizeByForm("NFD")
-          ->Js.String2.replaceByRe(%re("/[\u0300-\u036f]/g"), "")
-          ->Js.String2.includes(search)
+        search == "" || Toolkit__Primitives.String.normalizedIncludes(label, search)
       )
       ->Array.mapWithIndex((i, item) => {
         let {label, value} = item

package/src/ui/Toolkit__Ui_MultiSelectWithValidation.res

@@ -121,12 +121,7 @@ let make = (
   let filterOptionsBySearch = (~options, ~search) => {
     options->Array.keep(({label}) =>
       // normalize nfd -> replace by re remove split by commponents the accent letters and deletes the accent component only, leaving the un-accented letter
-      search == "" ||
-        label
-        ->Js.String2.toLowerCase
-        ->Js.String2.normalizeByForm("NFD")
-        ->Js.String2.replaceByRe(%re("/[\u0300-\u036f]/g"), "")
-        ->Js.String2.includes(search)
+      search == "" || Toolkit__Primitives.String.normalizedIncludes(label, search)
     )
   }
 
@@ -173,7 +168,7 @@ let make = (
               onChange={event => {
                 let target = event->ReactEvent.Form.currentTarget
 
-                setSearch(_ => target["value"]->Toolkit__Primitives.String.normalizeForSearch)
+                setSearch(_ => target["value"])
               }}
             />
           </div>

package/src/ui/Toolkit__Ui_SelectWithValidation.res

@@ -50,8 +50,7 @@ module Options = {
   let make = (~options, ~deferredSearch, ~itemClassName, ~setSelectedOption, ~selectedOption) => {
     options
     ->Array.keep(({label}) =>
-      deferredSearch == "" ||
-        label->Toolkit__Primitives.String.normalizeForSearch->Js.String2.includes(deferredSearch)
+      deferredSearch == "" || Toolkit__Primitives.String.normalizedIncludes(label, deferredSearch)
     )
     ->Array.mapWithIndex((i, item) => {
       let {label, value} = item