@colisweb/rescript-toolkit 2.59.2 → 2.61.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.59.2",
+  "version": "2.61.0",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build -with-deps",
@@ -78,7 +78,7 @@
     "rescript-classnames": "6.0.0",
     "rescript-react-update": "5.0.0",
     "sanitize-html": "1.27.4",
-    "swr": "1.3.0",
+    "swr": "2.0.0",
     "tailwindcss": "3.2.4"
   },
   "devDependencies": {

package/src/fetcher/Toolkit__Fetcher.res

@@ -4,19 +4,16 @@ module type Config = {
 }
 
 module Make = (Config: Config) => {
-  let key: Config.Request.argument => Swr.SwrKey.t = (arr)=> Config.key(arr)->Js.Array2.joinWith("--")->Swr.SwrKey.make
+  let key: Config.Request.argument => Swr.SwrKey.t = arr =>
+    Config.key(arr)->Js.Array2.joinWith("--")->Swr.SwrKey.make
 
   let use = (
     ~options: option<Swr.fetcherOptions>=?,
     argument: option<Config.Request.argument>,
   ): Toolkit__Hooks.fetcher<Config.Request.response> =>
-    Toolkit__Hooks.useFetcher(
-      ~options?,
-      argument->Option.map(key),
-      () => {
-        Config.Request.exec(argument->Option.getExn)->Promise.Js.fromResult
-      },
-    )
+    Toolkit__Hooks.useFetcher(~options?, argument->Option.map(key), () => {
+      Config.Request.exec(argument->Option.getExn)->Promise.Js.fromResult
+    })
 
   let useOptional = (
     ~options: option<Swr.fetcherOptions>=?,
@@ -26,3 +23,28 @@ module Make = (Config: Config) => {
       Config.Request.exec(argument->Option.getExn)->Promise.Js.fromResult
     })
 }
+
+module type MutationConfig = {
+  module Request: Toolkit__Request.Config
+  let key: string
+}
+
+module MakeMutation = (Config: MutationConfig) => {
+  let key = Config.key->Swr.SwrKey.make
+
+  let useMutation = (
+    ~options: option<Swr.mutationFetcherOptions<Config.Request.response>>=?,
+    key: string,
+  ) => {
+    Swr.useSwrMutation(
+      Swr.SwrKey.make(key),
+      (_url, {arg}) => {
+        Config.Request.exec(arg)->Promise.Js.fromResult
+      },
+      switch options {
+      | Some(options) => options->Obj.magic
+      | None => {revalidate: true}
+      },
+    )
+  }
+}

package/src/ui/Toolkit__Ui_Alert.res

@@ -4,7 +4,7 @@ type status = [#success | #error | #warning | #info]
 let make = (~title, ~description=?, ~status, ~className=?) =>
   <div
     className={cx([
-      "py-2 px-4 flex items-center border rounded",
+      "p-4 flex items-center border rounded-lg",
       switch status {
       | #success => "bg-success-50 border-success-500"
       | #error => "bg-danger-50 border-danger-500"
@@ -16,18 +16,19 @@ let make = (~title, ~description=?, ~status, ~className=?) =>
     {switch status {
     | #success => <BsReactIcons.MdCheckCircle size=28 className="text-success-600 flex-shrink-0" />
     | #error => <BsReactIcons.MdWarning size=28 className="text-danger-600 flex-shrink-0" />
-    | #warning => <BsReactIcons.MdWarning size=28 className="text-warning-600 flex-shrink-0" />
+    | #warning =>
+      <BsReactIcons.FaExclamationTriangle size=28 className="text-warning-600 flex-shrink-0" />
     | #info => <BsReactIcons.FaExclamationCircle size=28 className="text-info-600 flex-shrink-0" />
     }}
     <div className="mx-3">
       <div
         className={cx([
-          description->Option.isSome ? "font-bold" : "",
+          description->Option.isSome ? "font-semibold" : "",
           {
             switch status {
             | #success => "text-success-600"
             | #error => "text-danger-600"
-            | #warning => "text-warning-600"
+            | #warning => "text-warning-700"
             | #info => "text-info-600"
             }
           },

package/src/vendors/BsReactIcons.res

@@ -5980,3 +5980,8 @@ module FaCog = {
   @module("react-icons/fa") @react.component
   external make: (~size: int=?, ~color: string=?, ~className: string=?) => React.element = "FaCog"
 }
+module FaExclamationTriangle = {
+  @module("react-icons/fa") @react.component
+  external make: (~size: int=?, ~color: string=?, ~className: string=?) => React.element =
+    "FaExclamationTriangle"
+}

package/src/vendors/Swr.res

@@ -12,6 +12,7 @@ type fetcherOptions
 @obj
 external makeFetcherOptions: (
   ~suspense: bool=?,
+  ~keepPreviousData: bool=?,
   ~fetcher: 'fetcher=?,
   ~fallbackData: 'data=?,
   ~revalidateOnFocus: bool=?,
@@ -43,16 +44,39 @@ type fetcher<'data> = {
   data: option<'data>,
   error: option<Js.Exn.t>,
   isValidating: bool,
+  isLoading: bool,
   mutate: (. unit) => Js.Promise.t<bool>,
 }
 
+type mutationFetcherOptions<'optimisticData> = {
+  optimisticData?: 'optimisticData => 'optimisticData,
+  revalidate?: bool,
+  populateCache?: bool,
+}
+
+type mutationFetcher<'params, 'data, 'error> = {
+  data: option<'data>,
+  error: option<Js.Exn.t>,
+  isMutating: bool,
+  trigger: 'params => Promise.Js.t<'data, 'error>,
+}
+
 module SwrKey = Toolkit__Identifier.MakeString()
 
 @module("swr")
 external useSwr: (option<SwrKey.t>, 'fn, 'fetcherOptions) => fetcher<'data> = "default"
 
+type mutationParams<'params> = {arg: 'params}
+@module("swr/mutation")
+external useSwrMutation: (
+  SwrKey.t,
+  (string, mutationParams<'params>) => 'response,
+  mutationFetcherOptions<'optimisticData>,
+) => mutationFetcher<'params, 'data, 'error> = "default"
+
 @module("swr")
-external useSwrOptional: (option<SwrKey.t>, '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"