@colisweb/rescript-toolkit 2.9.1-mobile → 2.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.9.1-mobile",
+  "version": "2.11.1",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build",
@@ -65,7 +65,7 @@
     "reschema": "1.3.1",
     "rescript": "9.1.4",
     "rescript-classnames": "6.0.0",
-    "rescript-logger": "2.0.0",
+    "rescript-logger": "2.0.2",
     "rescript-react-update": "5.0.0",
     "restorative": "0.4.0-beta.1",
     "sanitize-html": "2.6.1",

package/src/fetcher/Toolkit__Fetcher2.res

@@ -0,0 +1,28 @@
+module type Config = {
+  module Request: Toolkit__Request2.Config
+  let key: Request.argument => array<string>
+}
+
+module Make = (Config: Config) => {
+  let key: Config.Request.argument => array<string> = Config.key
+
+  let use = (
+    ~options: option<Swr.fetcherOptions>=?,
+    key: option<Config.Request.argument>,
+  ): Toolkit__Hooks.fetcher<Config.Request.response> =>
+    Toolkit__Hooks.useFetcher(~options?, key->Option.map(Config.key), () => {
+      let key = key->Option.getExn
+
+      Config.Request.exec(key)->Promise.Js.fromResult
+    })
+
+  let useOptional = (
+    ~options: option<Swr.fetcherOptions>=?,
+    key: option<Config.Request.argument>,
+  ): Toolkit__Hooks.fetcher<option<Config.Request.response>> =>
+    Toolkit__Hooks.useOptionalFetcher(~options?, key->Option.map(Config.key), () => {
+      let key = key->Option.getExn
+
+      Config.Request.exec(key)->Promise.Js.fromResult
+    })
+}

package/src/request/Toolkit__Request.res

@@ -203,37 +203,3 @@ let delete = (
   | Some(c) =>
     request->Axios.Instance.deletec(url, c)->toResult(~mapError?, ~errorDecoder?, mapData)
   }
-
-module Error = {
-  type rec errorType = [
-    | #overlappingActivations(array<activation>)
-    | #compileError(string)
-    | #accessRefused
-    | #unknown
-  ]
-  @decco and activation = {ruleTitle: string}
-
-  let encoder: Decco.encoder<errorType> = _v => ""->Decco.stringToJson
-
-  let decoder: Decco.decoder<errorType> = json => {
-    let error = json->Obj.magic
-    let value = switch error["code"] {
-    | Some("OVERLAPPING_ACTIVATIONS") =>
-      #overlappingActivations(
-        error["overlapped"]->Obj.magic->Array.map(a => a->activation_decode->Result.getExn),
-      )
-
-    | Some("COMPILE_ERROR") => #compileError(error["compileError"]->Obj.magic)
-    | Some("ACCESS_REFUSED") => #accessRefused
-
-    | _ => #unknown
-    }
-
-    value->Ok
-  }
-
-  let codec: Decco.codec<errorType> = (encoder, decoder)
-
-  @decco
-  type t = @decco.codec(codec) errorType
-}

package/src/request/Toolkit__Request2.res

@@ -0,0 +1,12 @@
+module type Config = {
+  type argument
+  type response
+  type error
+  let exec: argument => Promise.promise<
+    result<response, Axios2.WithResult.customError<error, Js.Json.t>>,
+  >
+}
+
+module Make = (Config: Config) => {
+  include Config
+}

package/src/unleash/Toolkit__Unleash.res

@@ -27,19 +27,10 @@ module MakeFeature = (C: Config) => {
   type t = config<C.argument>
 
   let exec = (var: C.input) =>
-    (Axios.get(C.envUrl ++ C.featureName)
-    |> Js.Promise.then_(res => res["data"]->Js.Promise.resolve)
-    |> Js.Promise.then_(data =>
-      switch t_decode(data) {
-      | Result.Ok(feat) => Js.Promise.resolve(feat)
-      | Result.Error(_err) =>
-        %log.error(
-          "unleash decode"
-          ("err", _err)
-        )
-        Js.Promise.reject(Js.Exn.raiseError(C.featureName ++ " : parse error"))
-      }
-    )
-    |> Promise.Js.fromBsPromise
-    |> Promise.Js.toResult)->Promise.mapOk(C.exec(var))
+    Axios2.get(C.envUrl ++ C.featureName, ())
+    ->Promise.Js.toResult
+    ->Promise.flatMapOk(({data}) => {
+      Promise.resolved(t_decode(data))
+    })
+    ->Promise.mapOk(C.exec(var))
 }

package/src/vendors/Axios2.res

@@ -0,0 +1,177 @@
+type config
+
+module Headers = {
+  type t
+
+  external fromObj: Js.t<{..}> => t = "%identity"
+  external fromDict: Js.Dict.t<string> => t = "%identity"
+}
+
+module CancelToken = {
+  type t
+
+  @module("axios")
+  external source: unit => t = "source"
+}
+
+type requestTransformer<'data, 'a, 'transformedData> = ('data, Js.t<'a>) => 'transformedData
+type responseTransformer<'data, 'transformedData> = 'data => 'transformedData
+type paramsSerializer<'params, 'serializedParams> = 'params => 'serializedParams
+type auth = {
+  username: string,
+  password: string,
+}
+type proxy = {host: int, port: int, auth: auth}
+
+type response<'data> = {
+  data: 'data,
+  status: int,
+  statusText: string,
+  headers: Js.Dict.t<string>,
+  config: config,
+}
+
+type error<'responseData> = {
+  request: option<Js.Json.t>,
+  response: option<response<'responseData>>,
+  message: string,
+}
+
+type adapter<'a, 'b, 'err> = config => Promise.Js.t<response<'a>, 'err>
+
+@module("axios")
+external isAxiosError: error<'a> => bool = "isAxiosError"
+
+@obj
+external makeConfig: (
+  ~url: string=?,
+  ~_method: string=?,
+  ~baseURL: string=?,
+  ~transformRequest: array<requestTransformer<'data, Js.t<'a>, 'tranformedData>>=?,
+  ~transformResponse: array<responseTransformer<'data, 'tranformedData>>=?,
+  ~headers: Headers.t=?,
+  ~params: Js.t<'params>=?,
+  ~paramsSerializer: paramsSerializer<'params, 'serializedParams>=?,
+  ~data: Js.t<'data>=?,
+  ~timeout: int=?,
+  ~withCredentials: bool=?,
+  ~adapter: adapter<'a, 'b, 'err>=?,
+  ~auth: auth=?,
+  ~responseType: string=?,
+  ~xsrfCookieName: string=?,
+  ~xsrfHeaderName: string=?,
+  ~onUploadProgress: 'uploadProgress => unit=?,
+  ~onDownloadProgress: 'downloadProgress => unit=?,
+  ~maxContentLength: int=?,
+  ~validateStatus: int => bool=?,
+  ~maxRedirects: int=?,
+  ~socketPath: string=?,
+  ~proxy: proxy=?,
+  ~cancelToken: CancelToken.t=?,
+  unit,
+) => config = ""
+
+@module("axios")
+external get: (string, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> = "get"
+
+@module("axios")
+external post: (string, ~data: 'a, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> =
+  "post"
+
+@module("axios")
+external put: (string, ~data: 'a, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> =
+  "put"
+
+@module("axios")
+external patch: (
+  string,
+  ~data: 'a,
+  ~config: config=?,
+  unit,
+) => Promise.Js.t<response<'data>, 'err> = "patch"
+
+@module("axios")
+external delete: (string, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> = "delete"
+
+@module("axios")
+external options: (string, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> =
+  "options"
+
+module Interceptors = {
+  @module("axios") @scope(("default", "interceptors", "request"))
+  external requestInterceptor: ('config => Promise.Js.t<'updatedConfig, 'error>) => unit = "use"
+
+  @module("axios") @scope(("default", "interceptors", "response"))
+  external responseInterceptor: ('response => Promise.Js.t<'updatedResponse, 'error>) => unit =
+    "use"
+}
+
+module WithResult = {
+  type customError<'apiError, 'response> = [
+    | #default(error<'response>)
+    | #decodeError(Decco.decodeError)
+    | #custom('apiError)
+  ]
+
+  type decodeData<'newData, 'err> = Js.Json.t => result<'newData, 'err>
+
+  type mapError<'a, 'response, 'headers, 'request> = error<'response> => customError<'a, 'response>
+
+  let toResult = (promise, ~mapError, ~decodeData) =>
+    promise
+    ->Promise.Js.toResult
+    ->Promise.mapError(err => mapError->Option.mapWithDefault(#default(err), fn => fn(err)))
+    ->Promise.flatMapOk(response => {
+      Promise.resolved(
+        switch decodeData(response.data) {
+        | Ok(_) as ok => ok
+        | Error(decodeError) => Error(#decodeError(decodeError))
+        },
+      )
+    })
+
+  let get = (
+    ~config=?,
+    ~decodeData: decodeData<'newData, 'err>,
+    ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
+    string,
+  ) => get(string, ~config?, ())->toResult(~decodeData, ~mapError)
+
+  let post = (
+    ~data,
+    ~config=?,
+    ~decodeData: decodeData<'newData, 'err>,
+    ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
+    string,
+  ) => post(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
+
+  let put = (
+    ~data,
+    ~config=?,
+    ~decodeData: decodeData<'newData, 'err>,
+    ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
+    string,
+  ) => put(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
+
+  let patch = (
+    ~data,
+    ~config=?,
+    ~decodeData: decodeData<'newData, 'err>,
+    ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
+    string,
+  ) => patch(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
+
+  let delete = (
+    ~config=?,
+    ~decodeData: decodeData<'newData, 'err>,
+    ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
+    string,
+  ) => delete(string, ~config?, ())->toResult(~decodeData, ~mapError)
+
+  let options = (
+    ~config=?,
+    ~decodeData: decodeData<'newData, 'err>,
+    ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
+    string,
+  ) => options(string, ~config?, ())->toResult(~decodeData, ~mapError)
+}

package/.env

@@ -1 +0,0 @@
-STORYBOOK_HERE_API_KEY=XdOccRM258JaG5yYFTQYOwqSE_hrosqcWHugsLUOrIg

package/.merlin

@@ -1,66 +0,0 @@
-####{BSB GENERATED: NO EDIT
-FLG -ppx /Users/colisweb/Projects/rescript-toolkit/node_modules/decco/ppx
-FLG -ppx /Users/colisweb/Projects/rescript-toolkit/node_modules/lenses-ppx/ppx
-FLG -ppx /Users/colisweb/Projects/rescript-toolkit/node_modules/rescript-logger/ppx
-FLG -ppx '/Users/colisweb/Projects/rescript-toolkit/node_modules/rescript/darwin/bsc.exe -as-ppx -bs-jsx 3'
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/rescript/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/rescript/lib/ocaml
-FLG -open Belt -open Cx
-FLG -w +a-4-9-20-40-41-42-50-61-102-44-30-32-40-42-61
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/bs-css/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/bs-css/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/bs-css-emotion/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/bs-css-emotion/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/@rescript/react/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/@rescript/react/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/bs-axios/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/bs-axios/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/reason-promise/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/reason-promise/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/reason-react/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/reason-react/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/decco/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/decco/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/rescript-classnames/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/rescript-classnames/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/rescript-logger/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/rescript-logger/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/reschema/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/reschema/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/rescript-react-update/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/rescript-react-update/lib/ocaml
-S /Users/colisweb/Projects/rescript-toolkit/node_modules/restorative/lib/ocaml
-B /Users/colisweb/Projects/rescript-toolkit/node_modules/restorative/lib/ocaml
-S stories
-B lib/bs/stories
-S src
-B lib/bs/src
-S src/router
-B lib/bs/src/router
-S src/unleash
-B lib/bs/src/unleash
-S src/sentry
-B lib/bs/src/sentry
-S src/request
-B lib/bs/src/request
-S src/decoders
-B lib/bs/src/decoders
-S src/hooks
-B lib/bs/src/hooks
-S src/identifier
-B lib/bs/src/identifier
-S src/primitives
-B lib/bs/src/primitives
-S src/utils
-B lib/bs/src/utils
-S src/fetcher
-B lib/bs/src/fetcher
-S src/form
-B lib/bs/src/form
-S src/vendors
-B lib/bs/src/vendors
-S src/vendors/reach-ui
-B lib/bs/src/vendors/reach-ui
-S src/ui
-B lib/bs/src/ui
-####BSB GENERATED: NO EDIT}