@colisweb/rescript-toolkit 4.26.1 → 4.26.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "4.26.1",
+  "version": "4.26.3",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",
@@ -40,7 +40,7 @@
     "case": "1.6.3",
     "click-outside-hook": "1.1.0",
     "copy-to-clipboard": "3.3.3",
-    "date-fns": "2.30.0",
+    "date-fns": "3.2.0",
     "decco": "1.6.0",
     "dedent": "0.7.0",
     "lenses-ppx": "6.1.10",

package/src/decoders/Toolkit__Decoders.res

@@ -358,6 +358,10 @@ module UnitMeasure = {
       let errorPrefix = "Time with unit"
     })
 
+    module S = Make({
+      include Config
+      let wrapValue = Config.wrapValue(#s)
+    })
     module Min = Make({
       include Config
       let wrapValue = Config.wrapValue(#min)

package/src/intl/Toolkit__Intl.res

@@ -93,6 +93,13 @@ module Make = (Config: IntlConfig) => {
     @react.component
     let make = (~children) => {
       let intl = useIntl()
+      let locale = useCurrentLocale()
+
+      React.useLayoutEffect1(() => {
+        DateFns.setDefaultOptions({locale: locale->getDateFnsLocale})
+        None
+      }, [locale])
+
       <RawIntlProvider value=intl> children </RawIntlProvider>
     }
   }

package/src/ui/Toolkit__Ui_WeekDateFilter.res

@@ -115,11 +115,9 @@ let make = (~initialStart=?, ~selectedDay=?, ~children: state => React.element)
     () => {
       let defaultTimeslot: Toolkit__Decoders.DatetimeTimeSlot.t = {
         let today = Js.Date.make()
-        let timeSlotStart = isSm ? DateFns.startOfWeek(today, {weekStartsOn: 1}) : today
+        let timeSlotStart = isSm ? DateFns.startOfWeek(today) : today
 
-        let timeSlotEnd = isSm
-          ? DateFns.endOfWeek(today, {weekStartsOn: 1})
-          : today->DateFns.addDays(2)
+        let timeSlotEnd = isSm ? DateFns.endOfWeek(today) : today->DateFns.addDays(2)
         {
           start: timeSlotStart,
           end_: timeSlotEnd,

package/src/ui/Toolkit__Ui_WeekdayNavigation.res

@@ -119,8 +119,7 @@ let make = (
 
       // we build the default displayed period around the selectedDay
       let defaultPeriod: period = {
-        let periodStart =
-          periodLength === 7 ? DateFns.startOfWeek(selectedDay, {weekStartsOn: 1}) : selectedDay
+        let periodStart = periodLength === 7 ? DateFns.startOfWeek(selectedDay) : selectedDay
 
         let periodEnd = periodStart->DateFns.addDays(periodLength - 1)
 

package/src/utils/Toolkit__Utils_UnitMeasure.res

@@ -68,24 +68,33 @@ module Weight = {
 module Time = {
   include Unit({
     @deriving(jsConverter)
-    type unitEnum = [#min | #h]
+    type unitEnum = [#min | #h | #s]
   })
 
-  type t = [#min(float) | #h(float)]
+  type t = [#min(float) | #h(float) | #s(float)]
 
   let wrapValue = (unit, value) => {
     switch unit {
     | #min => #min(value)
     | #h => #h(value)
+    | #s => #s(value)
     }
   }
 
   let toValue = value =>
     switch value {
+    | #s(v)
     | #min(v)
     | #h(v) => v
     }
 
+  let toString = value =>
+    switch value {
+    | #min(v) => v->Float.toString ++ " min"
+    | #h(v) => v->Float.toString ++ " h"
+    | #s(v) => v->Float.toString ++ " s"
+    }
+
   let display = (value, ~digits as _=2, ()) => {
     let _initialDate = Js.Date.make()
 
@@ -101,23 +110,37 @@ module Time = {
       DateFns.intervalToDuration(
         ~interval={start: _initialDate, end_: _initialDate->DateFns.addHours(v)},
       )
+    | #s(v) =>
+      DateFns.intervalToDuration(
+        ~interval={start: _initialDate, end_: _initialDate->DateFns.addSeconds(v)},
+      )
     }
 
-    switch (duration.hours, duration.minutes) {
-    | (Some(h), Some(min)) if min->Int.toString->String.length === 1 =>
-      `${h->Int.toString} : 0${min->Int.toString}`
-    | (Some(h), Some(min)) => `${h->Int.toString} : ${min->Int.toString}`
-    | (Some(h), _) => `${h->Int.toString} h`
-    | (_, Some(min)) => `${min->Int.toString} min`
-    | _ => ""
+    switch (
+      duration.years,
+      duration.months,
+      duration.days,
+      duration.hours,
+      duration.minutes,
+      duration.seconds,
+    ) {
+    | (None, None, None, Some(h), Some(min), sec) =>
+      let secondsAsMinutesRounded = sec->Option.mapWithDefault(0, sec => sec > 30 ? 1 : 0)
+      let minRounded =
+        (min + secondsAsMinutesRounded === 60 ? 0 : min + secondsAsMinutesRounded)->Int.toString
+      let hRounded = min + secondsAsMinutesRounded === 60 ? h + 1 : h
+
+      `${hRounded->Int.toString} : ${minRounded->String.length === 1
+          ? "0" ++ minRounded
+          : minRounded}`
+    | (None, None, None, Some(h), None, _) => `${h->Int.toString} h`
+    | (None, None, None, None, Some(min), sec) =>
+      let secondsAsMinutesRounded = sec->Option.mapWithDefault(0, sec => sec > 30 ? 1 : 0)
+      `${(min + secondsAsMinutesRounded)->Int.toString} min`
+    | (None, None, None, None, None, Some(sec)) => `${sec->Int.toString} sec`
+    | _ => DateFns.formatDuration(duration)
     }
   }
-
-  let toString = value =>
-    switch value {
-    | #min(v) => v->Float.toString ++ " min"
-    | #h(v) => v->Float.toString ++ " h"
-    }
 }
 
 module Dimension = {

package/src/vendors/DateFns.res

@@ -1,5 +1,3 @@
-type startOfWeekOptions = {weekStartsOn: int}
-
 type intervalObject = {
   start: Js.Date.t,
   @as("end")
@@ -15,27 +13,29 @@ type durationObject = {
   seconds: option<int>,
 }
 
+type dateFnsLocale
+@module("date-fns/locale")
+external frLocale: dateFnsLocale = "fr"
+@module("date-fns/locale")
+external enLocale: dateFnsLocale = "enUS"
+
+type options = {locale: dateFnsLocale}
+
+@module("date-fns") external setDefaultOptions: options => unit = "setDefaultOptions"
+
 // intervals
 
 @module("date-fns")
 external intervalToDuration: (~interval: intervalObject) => durationObject = "intervalToDuration"
 
-type dateFnsLocale
-@module("date-fns/locale/fr")
-external frLocale: dateFnsLocale = "default"
-@module("date-fns/locale/en-US")
-external enLocale: dateFnsLocale = "default"
-
-type formatDistanceToNowOptions = {locale: dateFnsLocale}
 @module("date-fns")
-external distanceInWordsToNow: (Js.Date.t, formatDistanceToNowOptions) => string =
-  "formatDistanceToNow"
+external distanceInWordsToNow: Js.Date.t => string = "formatDistanceToNow"
 
 @module("date-fns/differenceInMinutes")
-external differenceInMinutes: (Js.Date.t, Js.Date.t) => float = "default"
+external differenceInMinutes: (Js.Date.t, Js.Date.t) => float = "differenceInMinutes"
 
 @module("date-fns/differenceInDays")
-external differenceInDays: (Js.Date.t, Js.Date.t) => int = "default"
+external differenceInDays: (Js.Date.t, Js.Date.t) => int = "differenceInDays"
 
 @module("date-fns")
 external areIntervalsOverlapping: (intervalObject, intervalObject, Js.t<'a>) => bool =
@@ -56,15 +56,18 @@ external parseISO: string => Js.Date.t = "parseISO"
 
 @module("date-fns") external formatWithPattern: (Js.Date.t, string) => string = "format"
 
-type formatWithPatternOptions = {
-  locale?: dateFnsLocale,
-  weekStartsOn?: int,
-  firstWeekContainsDate?: int,
-}
+type formatWithPatternOptions = {firstWeekContainsDate?: int}
+
 @module("date-fns")
 external formatWithPatternWithOptions: (Js.Date.t, string, formatWithPatternOptions) => string =
   "format"
 
+@module("date-fns")
+external lightFormat: (Js.Date.t, string) => string = "lightFormat"
+
+@module("date-fns")
+external formatDuration: durationObject => string = "formatDuration"
+
 // set
 
 @module("date-fns")
@@ -90,9 +93,9 @@ external startOfDay: Js.Date.t => Js.Date.t = "startOfDay"
 @module("date-fns")
 external endOfDay: Js.Date.t => Js.Date.t = "endOfDay"
 @module("date-fns")
-external startOfWeek: (Js.Date.t, startOfWeekOptions) => Js.Date.t = "startOfWeek"
+external startOfWeek: Js.Date.t => Js.Date.t = "startOfWeek"
 @module("date-fns")
-external endOfWeek: (Js.Date.t, startOfWeekOptions) => Js.Date.t = "endOfWeek"
+external endOfWeek: Js.Date.t => Js.Date.t = "endOfWeek"
 @module("date-fns")
 external addWeeks: (Js.Date.t, float) => Js.Date.t = "addWeeks"
 @module("date-fns")
@@ -137,7 +140,7 @@ external isFirstDayOfMonth: Js.Date.t => bool = "isFirstDayOfMonth"
 // other
 
 @module("date-fns")
-external getWeekNumber: (Js.Date.t, startOfWeekOptions) => int = "getWeek"
+external getWeekNumber: Js.Date.t => int = "getWeek"
 
 @module("date-fns")
 external getTime: Js.Date.t => float = "getTime"
@@ -179,6 +182,3 @@ external isSunday: Js.Date.t => bool = "isSunday"
 
 @module("date-fns")
 external minutesToHours: int => int = "minutesToHours"
-
-@module("date-fns")
-external lightFormat: (Js.Date.t, string) => string = "lightFormat"

package/src/vendors/ReactDayPicker.res

@@ -317,8 +317,8 @@ module RangeDayPickerInput = {
       to: now->DateFns.endOfDay,
     }
     let currentWeekRange: range = {
-      from: now->DateFns.startOfWeek({weekStartsOn: 1}),
-      to: now->DateFns.endOfWeek({weekStartsOn: 1}),
+      from: now->DateFns.startOfWeek,
+      to: now->DateFns.endOfWeek,
     }
     let currentMonthRange: range = {
       from: now->DateFns.startOfMonth,
@@ -497,7 +497,7 @@ module RangeDayPickerInput = {
                   <p className="ml-4">
                     <ReactIntl.FormattedMessage
                       defaultMessage="Semaine {number}"
-                      values={"number": DateFns.getWeekNumber(Js.Date.make(), {weekStartsOn: 1})}
+                      values={"number": DateFns.getWeekNumber(Js.Date.make())}
                     />
                   </p>
                 </div>