@colisweb/rescript-toolkit 2.10.0 → 2.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.10.0",
+  "version": "2.11.2",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build",

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__Request2.res

@@ -3,7 +3,7 @@ module type Config = {
   type response
   type error
   let exec: argument => Promise.promise<
-    result<response, Axios2.WithResult.customError<error, 'res, 'header, 'req>>,
+    result<response, Axios2.WithResult.customError<error, Js.Json.t>>,
   >
 }
 

package/src/vendors/Axios2.res

@@ -23,24 +23,24 @@ type auth = {
 }
 type proxy = {host: int, port: int, auth: auth}
 
-type response<'data, 'header> = {
+type response<'data> = {
   data: 'data,
   status: int,
   statusText: string,
-  headers: Js.t<'header>,
+  headers: Js.Dict.t<string>,
   config: config,
 }
 
-type error<'responseData, 'responseHeader, 'request> = {
-  request: option<'request>,
-  response: option<response<'responseData, 'responseHeader>>,
+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, 'b>, 'err>
+type adapter<'a, 'b, 'err> = config => Promise.Js.t<response<'a>, 'err>
 
 @module("axios")
-external isAxiosError: error<'a, 'b, 'c> => bool = "isAxiosError"
+external isAxiosError: error<'a> => bool = "isAxiosError"
 
 @obj
 external makeConfig: (
@@ -72,24 +72,15 @@ external makeConfig: (
 ) => config = ""
 
 @module("axios")
-external get: (string, ~config: config=?, unit) => Promise.Js.t<response<'data, 'headers>, 'err> =
-  "get"
+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, 'headers>, 'err> = "post"
+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, 'headers>, 'err> = "put"
+external put: (string, ~data: 'a, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> =
+  "put"
 
 @module("axios")
 external patch: (
@@ -97,21 +88,14 @@ external patch: (
   ~data: 'a,
   ~config: config=?,
   unit,
-) => Promise.Js.t<response<'data, 'headers>, 'err> = "patch"
+) => Promise.Js.t<response<'data>, 'err> = "patch"
 
 @module("axios")
-external delete: (
-  string,
-  ~config: config=?,
-  unit,
-) => Promise.Js.t<response<'data, 'headers>, 'err> = "delete"
+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, 'headers>, 'err> = "options"
+external options: (string, ~config: config=?, unit) => Promise.Js.t<response<'data>, 'err> =
+  "options"
 
 module Interceptors = {
   @module("axios") @scope(("default", "interceptors", "request"))
@@ -123,19 +107,15 @@ module Interceptors = {
 }
 
 module WithResult = {
-  type customError<'apiError, 'response, 'headers, 'request> = [
-    | #default(error<'response, 'headers, 'request>)
+  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,
-    'headers,
-    'request,
-  > => customError<'a, 'response, 'headers, 'request>
+  type mapError<'a, 'response, 'headers, 'request> = error<'response> => customError<'a, 'response>
 
   let toResult = (promise, ~mapError, ~decodeData) =>
     promise
@@ -151,53 +131,47 @@ module WithResult = {
     })
 
   let get = (
-    string,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => get(string, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => get(string, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let post = (
-    string,
     ~data,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => post(string, ~data, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => post(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let put = (
-    string,
     ~data,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => put(string, ~data, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => put(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let patch = (
-    string,
     ~data,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => patch(string, ~data, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => patch(string, ~data, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let delete = (
-    string,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => delete(string, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => delete(string, ~config?, ())->toResult(~decodeData, ~mapError)
 
   let options = (
-    string,
     ~config=?,
     ~decodeData: decodeData<'newData, 'err>,
     ~mapError: option<mapError<'a, 'response, 'headers, 'request>>=?,
-    unit,
-  ) => options(string, ~config?, unit)->toResult(~decodeData, ~mapError)
+    string,
+  ) => options(string, ~config?, ())->toResult(~decodeData, ~mapError)
 }

package/src/vendors/BsDateFns.res

@@ -53,6 +53,11 @@ external parseISO: string => Js.Date.t = "parseISO"
 
 @module("date-fns") external formatWithPattern: (Js.Date.t, string) => string = "format"
 
+type formatWithPatternOptions = {locale: dateFnsLocale}
+@module("date-fns")
+external formatWithPatternWithOptions: (Js.Date.t, string, formatWithPatternOptions) => string =
+  "format"
+
 // set
 
 @module("date-fns")