@colisweb/rescript-toolkit 2.54.2 → 2.54.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.54.2",
+  "version": "2.54.3",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build -with-deps",

package/src/fetcher/Toolkit__Fetcher.res

@@ -4,29 +4,25 @@ module type Config = {
 }
 
 module Make = (Config: Config) => {
-  let key: Config.Request.argument => array<string> = Config.key
+  let key: Config.Request.argument => Swr.SwrKey.t = (arr)=> Config.key(arr)->Js.Array2.joinWith("--")->Swr.SwrKey.make
 
   let use = (
     ~options: option<Swr.fetcherOptions>=?,
-    key: option<Config.Request.argument>,
+    argument: option<Config.Request.argument>,
   ): Toolkit__Hooks.fetcher<Config.Request.response> =>
     Toolkit__Hooks.useFetcher(
       ~options?,
-      key->Option.map(k => Config.key(k)->Js.Array2.joinWith("--")),
+      argument->Option.map(key),
       () => {
-        let key = key->Option.getExn
-
-        Config.Request.exec(key)->Promise.Js.fromResult
+        Config.Request.exec(argument->Option.getExn)->Promise.Js.fromResult
       },
     )
 
   let useOptional = (
     ~options: option<Swr.fetcherOptions>=?,
-    key: option<Config.Request.argument>,
+    argument: 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
+    Toolkit__Hooks.useOptionalFetcher(~options?, argument->Option.map(key), () => {
+      Config.Request.exec(argument->Option.getExn)->Promise.Js.fromResult
     })
 }

package/src/vendors/Swr.res

@@ -46,25 +46,27 @@ type fetcher<'data> = {
   mutate: (. unit) => Js.Promise.t<bool>,
 }
 
+module SwrKey = Toolkit__Identifier.MakeString()
+
 @module("swr")
-external useSwr: ('key, 'fn, 'fetcherOptions) => fetcher<'data> = "default"
+external useSwr: (option<SwrKey.t>, 'fn, 'fetcherOptions) => fetcher<'data> = "default"
 
 @module("swr")
-external useSwrOptional: ('key, 'fn, 'fetcherOptions) => fetcher<option<'data>> = "default"
+external useSwrOptional: (option<SwrKey.t>, 'fn, 'fetcherOptions) => fetcher<option<'data>> = "default"
 
 type cache
 @module("swr") external cache: cache = "cache"
 @send external clear: cache => unit = "clear"
-@send external delete: (cache, 'key) => unit = "delete"
+@send external delete: (cache, option<SwrKey.t>) => unit = "delete"
 
 module SwrConfig = {
   type t
 
   @send
-  external mutate0: (t, 'key) => unit = "mutate"
+  external mutate0: (t, SwrKey.t) => unit = "mutate"
 
   @send
-  external mutate: (t, 'key, 'data, bool) => unit = "mutate"
+  external mutate: (t, SwrKey.t, 'data, bool) => unit = "mutate"
 
   @module("swr") @react.component
   external make: (~value: fetcherOptions=?, ~children: React.element) => React.element = "SWRConfig"