@colisweb/rescript-toolkit 4.29.2 → 5.0.0

package/src/identifier/Toolkit__Identifier.res

@@ -1,63 +1,42 @@
 module MakeString = () => {
-  module Id: {
-    @decco
-    type t
-    module Dict: {
-      type key = t
-      @decco
-      type t<'a>
-      let get: (t<'a>, key) => option<'a>
-      @set_index
-      external set: (t<'a>, key, 'a) => unit = ""
-      @val
-      external keys: t<'a> => array<string> = "Object.keys"
-      @obj /** Returns an empty dictionary. */
-      external empty: unit => t<'a> = ""
-      let unsafeDeleteKey: (. t<string>, string) => unit
-      let entries: t<'a> => array<(key, 'a)>
-      let values: t<'a> => array<'a>
-      let fromList: list<(key, 'a)> => t<'a>
-      let fromArray: array<(key, 'a)> => t<'a>
-      let map: ((. 'a) => 'b, t<'a>) => t<'b>
-      let deleteKey: (t<'a>, key) => t<'a>
-    }
-  } = {
-    @decco
+  module Id = {
+    @spice
     type t = string
     module Dict = {
       include Js.Dict
 
       let deleteKey: (t<'a>, string) => t<'a> = %raw("function (dict, key) {
-  const newDict = Object.assign({},dict);
-  delete newDict[key];
-  return newDict;
-}")
-      let t_encode = (encoder, dict) => dict->Js.Dict.map((. a) => encoder(a), _)->Js.Json.object_
+        const newDict = Object.assign({},dict);
+        delete newDict[key];
+        return newDict;
+      }")
+
+      let t_encode = (encoder, dict): Js.Json.t => Js.Json.Object(Js.Dict.map(encoder, dict))
 
       let t_decode = (decoder, json) => {
-        open Decco
-        switch Js.Json.decodeObject(json) {
-        | Some(dict) =>
+        open Spice
+        switch (json: Js.Json.t) {
+        | Js.Json.Object(dict) =>
           dict
           ->Js.Dict.entries
           ->Belt.Array.reduce(Ok(Js.Dict.empty()), (acc, (key, value)) =>
             switch (acc, decoder(value)) {
             | (Error(_), _) => acc
 
-            | (_, Error({path} as error)) => Error({...error, path: "." ++ key ++ path})
+            | (_, Error({path} as error)) => Error({...error, path: "." ++ (key ++ path)})
 
             | (Ok(prev), Ok(newVal)) =>
               let () = prev->Js.Dict.set(key, newVal)
               Ok(prev)
             }
           )
-        | None => Error({path: "", message: "Not a dict", value: json})
+        | _ => Error({path: "", message: "Not a dict", value: json})
         }
       }
     }
   }
 
-  @decco
+  @spice
   type t = Id.t
 
   module Dict = Id.Dict
@@ -68,14 +47,14 @@ module MakeString = () => {
 
 module MakeInt = () => {
   module Id: {
-    @decco
+    @spice
     type t
   } = {
-    @decco
+    @spice
     type t = int
   }
 
-  @decco
+  @spice
   type t = Id.t
   external make: int => t = "%identity"
   external toInt: t => int = "%identity"
@@ -86,42 +65,20 @@ module MakeInt = () => {
 }
 
 module MakeStringOrInt = () => {
-  module Id: {
-    @decco
-    type t
-    module Dict: {
-      type key = t
-      @decco
-      type t<'a>
-      let get: (t<'a>, key) => option<'a>
-      @set_index
-      external set: (t<'a>, key, 'a) => unit = ""
-      @val
-      external keys: t<'a> => array<string> = "Object.keys"
-      @obj /** Returns an empty dictionary. */
-      external empty: unit => t<'a> = ""
-      let unsafeDeleteKey: (. t<string>, string) => unit
-      let entries: t<'a> => array<(key, 'a)>
-      let values: t<'a> => array<'a>
-      let fromList: list<(key, 'a)> => t<'a>
-      let fromArray: array<(key, 'a)> => t<'a>
-      let map: ((. 'a) => 'b, t<'a>) => t<'b>
-      let deleteKey: (t<'a>, key) => t<'a>
-    }
-  } = {
-    let encoder: Decco.encoder<string> = id => id->Decco.stringToJson
+  module Id = {
+    let encoder: Spice.encoder<string> = id => id->Spice.stringToJson
 
-    let decoder: Decco.decoder<string> = json =>
-      switch (Decco.stringFromJson(json), Decco.intFromJson(json)) {
+    let decoder: Spice.decoder<string> = json =>
+      switch (Spice.stringFromJson(json), Spice.intFromJson(json)) {
       | (Ok(v), _) => Ok(v)
       | (_, Ok(v)) => Ok(v->Int.toString)
       | (Error(err), _) => Error(err)
       }
 
-    let codec: Decco.codec<string> = (encoder, decoder)
+    let codec: Spice.codec<string> = (encoder, decoder)
 
-    @decco
-    type t = @decco.codec(codec) string
+    @spice
+    type t = @spice.codec(codec) string
     module Dict = {
       include Js.Dict
 
@@ -131,10 +88,10 @@ module MakeStringOrInt = () => {
   return newDict;
 }")
 
-      let t_encode = (encoder, dict) => dict->Js.Dict.map((. a) => encoder(a), _)->Js.Json.object_
+      let t_encode = (encoder, dict) => dict->Js.Dict.map(encoder, _)->Js.Json.object_
 
       let t_decode = (decoder, json) => {
-        open Decco
+        open Spice
         switch Js.Json.decodeObject(json) {
         | Some(dict) =>
           dict
@@ -156,7 +113,7 @@ module MakeStringOrInt = () => {
     }
   }
 
-  @decco
+  @spice
   type t = Id.t
 
   module Dict = Id.Dict

package/src/identifier/index.md

@@ -1,6 +1,6 @@
 # Identifier
 
-Convert a string or an int in an opaque type with a decco decoder.
+Convert a string or an int in an opaque type with a spice decoder.
 Mostly used for identifiers.
 
 ## API
@@ -13,7 +13,7 @@ module DeliveryId = Toolkit.Identifier.MakeString({});
 /**
  somewhere
 **/
-[@decco]
+[@spice]
 type response = {
   deliveryId: DeliveryId.t
 };
@@ -29,7 +29,7 @@ module DeliveryId = Toolkit.Identifier.MakeInt({});
 /**
  somewhere
 **/
-[@decco]
+[@spice]
 type response = {
   deliveryId: DeliveryId.t
 };

package/src/intl/Toolkit__Intl.res

@@ -97,7 +97,7 @@ module Make = (Config: IntlConfig) => {
       let intl = useIntl()
       let locale = useCurrentLocale()
 
-      React.useLayoutEffect1(() => {
+      React.useLayoutEffect(() => {
         DateFns.setDefaultOptions({locale: locale->getDateFnsLocale})
         None
       }, [locale])

package/src/mock/MockOverlay.res

@@ -10,7 +10,7 @@ let make = (~worker: Msw.worker, ~workerOptions: Msw.startOptions={}, ~className
   )
   let (workerStarted, setWorkerStarted) = React.useState(() => false)
 
-  React.useLayoutEffect1(() => {
+  React.useLayoutEffect(() => {
     if mockEnabled {
       worker->Msw.start(workerOptions)
       setWorkerStarted(_ => true)

package/src/request/index.md

@@ -8,9 +8,9 @@ module API = {
     module Config = {
       type argument = unit;
 
-      [@decco]
+      [@spice]
       type response = array(user)
-      [@decco]
+      [@spice]
       and user = {
         name: string
       };
@@ -41,12 +41,12 @@ module API = {
         | `accessRefused
         | `unknown
       ]
-      [@decco]
+      [@spice]
       and activation = {ruleTitle: string};
 
-      let encoder: Decco.encoder(errorType) = _v => ""->Decco.stringToJson;
+      let encoder: Spice.encoder(errorType) = _v => ""->Spice.stringToJson;
 
-      let decoder: Decco.decoder(errorType) =
+      let decoder: Spice.decoder(errorType) =
         json => {
           let error = json->Obj.magic;
           let value =
@@ -66,23 +66,23 @@ module API = {
           value->Ok;
         };
 
-      let codec: Decco.codec(errorType) = (encoder, decoder);
+      let codec: Spice.codec(errorType) = (encoder, decoder);
 
-      [@decco]
-      type t = [@decco.codec codec] errorType;
+      [@spice]
+      type t = [@spice.codec codec] errorType;
     };
 
     module Config = {
       type argument = unit;
 
-      [@decco]
+      [@spice]
       type response = array(user)
-      [@decco]
+      [@spice]
       and user = {
         name: string
       };
 
-      [@decco]
+      [@spice]
       type error = Error.t;
 
       let exec = clientId => {

package/src/router/Toolkit__Router.res

@@ -31,7 +31,7 @@ module Make = (Config: RouterConfig) => {
 
       let previousRoute = Toolkit__Hooks.usePrevious(currentRoute)
 
-      React.useLayoutEffect1(() => {
+      React.useLayoutEffect(() => {
         let watcherID = RescriptReactRouter.watchUrl(url => setCurrentRoute(_ => url->Config.make))
         Some(() => RescriptReactRouter.unwatchUrl(watcherID))
       }, [setCurrentRoute])
@@ -128,13 +128,13 @@ module Make = (Config: RouterConfig) => {
 
     @react.component
     let make = (~to_: Config.t, ~behavior=Replace) => {
-      React.useEffect0(() => {
+      React.useEffect(() => {
         switch behavior {
         | Push => navigate(to_)
         | Replace => replace(to_)
         }
         None
-      })
+      }, [])
 
       React.null
     }
@@ -143,11 +143,11 @@ module Make = (Config: RouterConfig) => {
   module RedirectExternal = {
     @react.component
     let make = (~url: string) => {
-      React.useEffect0(() => {
+      React.useEffect(() => {
         Browser.Location.replace(Browser.Location.location, url)
 
         None
-      })
+      }, [])
 
       React.null
     }
@@ -172,11 +172,11 @@ module Make = (Config: RouterConfig) => {
     )
 
     let use = (routes: array<link>) => {
-      React.useLayoutEffect0(() => {
+      React.useLayoutEffect(() => {
         store.dispatch(Update(routes))
 
         Some(() => store.dispatch(Reset))
-      })
+      }, [])
     }
 
     @react.component
@@ -340,7 +340,7 @@ module Make = (Config: RouterConfig) => {
     ) => {
       let (isOpen, setIsOpen) = React.useState(() => false)
       let currentRoute = useRoute()
-      let toggle = React.useCallback0(_ => setIsOpen(v => !v))
+      let toggle = React.useCallback(_ => setIsOpen(v => !v), [])
       let hasActiveSubRoute = links->Array.some(link => {
         switch link {
         | Legacy(_) => false
@@ -361,14 +361,14 @@ module Make = (Config: RouterConfig) => {
         })
       })
 
-      React.useEffect1(() => {
+      React.useEffect(() => {
         if !isNavOpen {
           setIsOpen(_ => false)
         }
         None
       }, [isNavOpen])
 
-      <>
+      <React.Fragment>
         <button
           onClick={_ => {
             openMenu()
@@ -416,7 +416,7 @@ module Make = (Config: RouterConfig) => {
           | _ => <LinksList links relativeRoute onLinkClick isNavOpen />
           }}
         </div>
-      </>
+      </React.Fragment>
     }
   }
 }

package/src/ui/Toolkit__Ui_Autocomplete.res

@@ -144,7 +144,7 @@ let make = (
                 {additionnalOption->Option.getWithDefault(React.null)}
               </div>
             | Ok(suggestions) =>
-              <>
+              <React.Fragment>
                 {suggestions
                 ->Array.mapWithIndex((i, suggestion) => {
                   <HeadlessUi.Combobox.OptionRender
@@ -167,7 +167,7 @@ let make = (
                 })
                 ->React.array}
                 {additionnalOption->Option.getWithDefault(React.null)}
-              </>
+              </React.Fragment>
             }}
           </HeadlessUi.Combobox.Options>
         </HeadlessUi.Transition>

package/src/ui/Toolkit__Ui_Button.res

@@ -133,7 +133,7 @@ let make = (
 ) => {
   let (clicked, setClicked) = React.useState(() => false)
 
-  React.useEffect1(() => {
+  React.useEffect(() => {
     let timeoutId = Js.Global.setTimeout(() => {
       setClicked(_ => false)
     }, 3000)

package/src/ui/Toolkit__Ui_ButtonGroup2.res

@@ -25,7 +25,7 @@ let make = (
   let (activeIndex, setActiveIndex) = React.useState(() => defaultActiveIndex)
   let previousIndex = Toolkit__Hooks.usePrevious(activeIndex)
 
-  React.useEffect2(() => {
+  React.useEffect(() => {
     onIndexChange->Option.forEach(fn => {
       switch previousIndex {
       | Some(previousIndex) if previousIndex !== activeIndex =>

package/src/ui/Toolkit__Ui_Checkbox.res

@@ -21,7 +21,7 @@ let make = (
   let (isChecked, setChecked) = React.useState(() => checked->Option.getWithDefault(false))
   let previousChecked = Toolkit__Hooks.usePrevious(isChecked)
 
-  React.useEffect2(() => {
+  React.useEffect(() => {
     switch (previousChecked, checked) {
     | (Some(previous), Some(checked)) if previous != checked => setChecked(_ => checked)
     | _ => ()

package/src/ui/Toolkit__Ui_Coordinates.res

@@ -21,11 +21,11 @@ let make = (~coordinates: Toolkit__Decoders.Coordinates.t, ~copyWrapperClassName
                   | [{value}] => value->React.string
                   | [{value}, _] => value->React.string
                   | [val1, _, val2] =>
-                    <>
+                    <React.Fragment>
                       {val1.value->React.string}
                       {"."->React.string}
                       {val2.value->React.string}
-                    </>
+                    </React.Fragment>
                   | _ => React.null
                   }
                 }}
@@ -37,11 +37,11 @@ let make = (~coordinates: Toolkit__Decoders.Coordinates.t, ~copyWrapperClassName
                   | [{value}] => value->React.string
                   | [{value}, _] => value->React.string
                   | [val1, _, val2] =>
-                    <>
+                    <React.Fragment>
                       {val1.value->React.string}
                       {"."->React.string}
                       {val2.value->React.string}
-                    </>
+                    </React.Fragment>
                   | _ => React.null
                   }
                 }}

package/src/ui/Toolkit__Ui_DatetimeInput.res

@@ -44,7 +44,7 @@ module DatePicker = {
 }
 
 @react.component
-let make = React.forwardRef((
+let make = (
   ~id,
   ~name=?,
   ~value=?,
@@ -70,10 +70,10 @@ let make = React.forwardRef((
   ~timeFormat="p",
   ~timeIntervals=15,
   ~timeCaption="Heure",
-  ref_,
+  ~inputRef=?,
 ) =>
   <DatePicker
-    ref=?{ref_->Js.Nullable.toOption->Option.map(ReactDOM.Ref.domRef)}
+    ref=?{inputRef->Option.map(ReactDOM.Ref.domRef)}
     selected=?value
     ?showTimeSelect
     showPopperArrow=false
@@ -108,4 +108,3 @@ let make = React.forwardRef((
       isInvalid->Option.getWithDefault(false) ? "border-danger-500 shadow-danger-500" : "",
     ])}
   />
-)

package/src/ui/Toolkit__Ui_Dropdown.res

@@ -43,7 +43,7 @@ let make = (
 
   let (adjustmentStyle, setAdjustmentStyle) = React.useState(() => None)
 
-  React.useEffect2(() => {
+  React.useEffect(() => {
     if isOpen {
       dropDownRef.current
       ->Js.Nullable.toOption

package/src/ui/Toolkit__Ui_DropdownList.res

@@ -34,7 +34,7 @@ let make = (
   })
   let (adjustmentStyle, setAdjustmentStyle) = React.useState(() => None)
 
-  React.useEffect1(() => {
+  React.useEffect(() => {
     if isOpen && !isXs {
       Js.Global.setTimeout(() => {
         buttonRef.current

package/src/ui/Toolkit__Ui_IconButton.res

@@ -91,7 +91,7 @@ let buttonStyle = (
 }
 
 @react.component
-let make = React.forwardRef((
+let make = (
   ~size=#md,
   ~color=#white,
   ~variant=#default,
@@ -105,10 +105,10 @@ let make = React.forwardRef((
   ~ariaLabel: option<string>=?,
   ~className="",
   ~icon: React.element,
-  ref_,
-) =>
+  ~buttonRef=?,
+) => {
   <button
-    ref=?{ref_->Js.Nullable.toOption->Option.map(ReactDOM.Ref.domRef)}
+    ref=?{buttonRef->Option.map(ReactDOM.Ref.domRef)}
     disabled
     type_
     ?id
@@ -120,4 +120,4 @@ let make = React.forwardRef((
     className={cx([buttonStyle(~color, ~variant, ~size, ~disabled, ()), className])}>
     icon
   </button>
-)
+}

package/src/ui/Toolkit__Ui_Layout.res

@@ -109,7 +109,7 @@ module App = {
 
       let onLinkClick = () => isLg ? () : hideMenu()
 
-      <>
+      <React.Fragment>
         <nav
           className={cx([
             "sidenav",
@@ -137,7 +137,7 @@ module App = {
           />
         | _ => React.null
         }}
-      </>
+      </React.Fragment>
     }
   }
 
@@ -162,7 +162,7 @@ module App = {
       ->Option.getWithDefault(false)
     )
 
-    let toggleMenu = React.useCallback0(_ =>
+    let toggleMenu = React.useCallback(_ =>
       setOpen(value => {
         let newValue = !value
 
@@ -172,10 +172,10 @@ module App = {
         )
         newValue
       })
-    )
+    , [])
 
-    let hideMenu = React.useCallback(_ => setOpen(_ => false))
-    let openMenu = React.useCallback(_ => setOpen(_ => true))
+    let hideMenu = React.useCallback(_ => setOpen(_ => false), [])
+    let openMenu = React.useCallback(_ => setOpen(_ => true), [])
 
     <NavOpenContext.Provider value={isNavOpen}>
       <div>

package/src/ui/Toolkit__Ui_Listbox.res

@@ -1,5 +1,3 @@
-module Listbox = HeadlessUi.Listbox
-
 type compare<'value> =
   | Key(string)
   | ValueEquality
@@ -10,22 +8,21 @@ type compare<'value> =
       ) => bool,
     )
 
-type selectOption<'value> = Listbox.selectOption<'value>
-type options<'value> = array<selectOption<'value>>
+type options<'value> = array<HeadlessUi.Listbox.selectOption<'value>>
 
 @react.component
 let make = (
   ~options: options<'value>,
   ~compare: compare<'value>,
-  ~onChange: option<Listbox.selectOption<'value> => unit>=?,
+  ~onChange: option<HeadlessUi.Listbox.selectOption<'value> => unit>=?,
   ~placeholder=?,
-  ~defaultOption: option<Listbox.selectOption<'value>>=?,
+  ~defaultOption: option<HeadlessUi.Listbox.selectOption<'value>>=?,
   ~isDisabled=?,
   ~value=?,
   ~name=?,
 ) => {
   <div className="relative">
-    <Listbox
+    <HeadlessUi.Listbox
       value
       by={switch compare {
       | Key(objectKey) => objectKey
@@ -37,7 +34,6 @@ let make = (
             )
           }
         )->Obj.magic
-
       | Function(fn) => fn->Obj.magic
       }}
       onChange={value => {
@@ -49,22 +45,22 @@ let make = (
       ?name
       defaultValue=?{defaultOption->Obj.magic}>
       {props => {
-        <>
-          <Listbox.Button
+        <React.Fragment>
+          <HeadlessUi.Listbox.Button
             className="relative flex flex-row items-center justify-between w-full cursor-default rounded-md font-semibold bg-white py-2 pl-3 pr-4 text-left border border-gray-300">
-            {props => {
-              <>
+            {buttonProps => {
+              <React.Fragment>
                 <span className="table-cell truncate text-left">
-                  {switch (props.value, placeholder) {
+                  {switch (buttonProps.value, placeholder) {
                   | (None, Some(p)) => p->React.string
                   | (Some(selectedOption), _) => selectedOption.label->React.string
                   | _ => React.null
                   }}
                 </span>
                 <ReactIcons.FaAngleDown size={20} />
-              </>
+              </React.Fragment>
             }}
-          </Listbox.Button>
+          </HeadlessUi.Listbox.Button>
           <HeadlessUi.Transition
             show={props.isOpen}
             className="relative z-20"
@@ -74,12 +70,12 @@ let make = (
             leave="transition duration-75 ease-out"
             leaveFrom="transform scale-100 opacity-100"
             leaveTo="transform scale-95 opacity-0">
-            <Listbox.Options
+            <HeadlessUi.Listbox.Options
               static={true}
               className="absolute min-w-[250px] mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm z-20">
               {options
               ->Array.mapWithIndex((i, option) => {
-                <Listbox.Option
+                <HeadlessUi.Listbox.Option
                   key={`listbox-${i->Int.toString}`} value={option} disabled=?{option.disabled}>
                   {props => {
                     <div
@@ -114,13 +110,13 @@ let make = (
                       {option.label->React.string}
                     </div>
                   }}
-                </Listbox.Option>
+                </HeadlessUi.Listbox.Option>
               })
               ->React.array}
-            </Listbox.Options>
+            </HeadlessUi.Listbox.Options>
           </HeadlessUi.Transition>
-        </>
+        </React.Fragment>
       }}
-    </Listbox>
+    </HeadlessUi.Listbox>
   </div>
 }

package/src/ui/Toolkit__Ui_MultiSelect.res

@@ -28,7 +28,7 @@ let make = (
   let (search, setSearch) = React.useState(() => "")
   let allowFilter = options->Array.length > 5 && allowFilter
 
-  React.useEffect2(() => {
+  React.useEffect(() => {
     let prev =
       previousDefaultValue
       ->Option.getWithDefault([])

package/src/ui/Toolkit__Ui_MultiSelectWithValidation.res

@@ -103,7 +103,7 @@ let make = (
   let deferredSearch = React.useDeferredValue(search)
   let allowFilter = options->Array.length > 5 && allowFilter
 
-  React.useEffect2(() => {
+  React.useEffect(() => {
     let prev =
       previousDefaultValue
       ->Option.getWithDefault([])