rolling date-fns#2423 back

LucasHFS · Aug 16, 2021 · 83a9bc4 · 83a9bc4
1 parent a3e7e6e
commit 83a9bc4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/formatDuration/index.js b/src/formatDuration/index.js
@@ -73,17 +73,17 @@ const defaultFormat = [
  * formatDuration({ years: 2, months: 9, weeks: 3 }, { delimiter: ', ' })
  * //=> '2 years, 9 months, 3 weeks'
  */
-export default function formatDuration(duration, options) {
+export default function formatDuration(duration, options = {}) {
   if (arguments.length < 1) {
     throw new TypeError(
       `1 argument required, but only ${arguments.length} present`
     )
   }
 
-  const format = options?.format || defaultFormat
-  const locale = options?.locale || defaultLocale
-  const zero = options?.zero || false
-  const delimiter = options?.delimiter || ' '
+  const format = options.format || defaultFormat
+  const locale = options.locale || defaultLocale
+  const zero = options.zero || false
+  const delimiter = options.delimiter || ' '
 
   const result = format
     .reduce((acc, unit) => {

diff --git a/src/getWeekYear/index.ts b/src/getWeekYear/index.ts
@@ -53,21 +53,22 @@ import {
  */
 export default function getWeekYear(
   dirtyDate: Date | number,
-  options?: LocaleOptions & WeekStartOptions & FirstWeekContainsDateOptions
+  options: LocaleOptions & WeekStartOptions & FirstWeekContainsDateOptions = {}
 ): number {
   requiredArgs(1, arguments)
 
   const date = toDate(dirtyDate)
   const year = date.getFullYear()
 
+  const locale = options.locale
   const localeFirstWeekContainsDate =
-    options?.locale?.options?.firstWeekContainsDate
+    locale && locale.options && locale.options.firstWeekContainsDate
   const defaultFirstWeekContainsDate =
     localeFirstWeekContainsDate == null
       ? 1
       : toInteger(localeFirstWeekContainsDate)
   const firstWeekContainsDate =
-    options?.firstWeekContainsDate == null
+    options.firstWeekContainsDate == null
       ? defaultFirstWeekContainsDate
       : toInteger(options.firstWeekContainsDate)
 

diff --git a/src/getWeeksInMonth/index.ts b/src/getWeeksInMonth/index.ts
@@ -37,7 +37,7 @@ import { LocaleOptions, WeekStartOptions } from '../types'
  */
 export default function getWeeksInMonth(
   date: Date | number,
-  options?: LocaleOptions & WeekStartOptions
+  options: LocaleOptions & WeekStartOptions = {}
 ): number {
   requiredArgs(1, arguments)