From a7b9c6e48881667c132def8f8b7adf8bab3c8542 Mon Sep 17 00:00:00 2001 From: kiki-kanri Date: Sat, 10 Aug 2024 16:53:03 +0800 Subject: [PATCH] fix: prevent default value handling from overwriting non-null/undefined falsy values --- src/datetime.ts | 8 ++++---- src/math.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/datetime.ts b/src/datetime.ts index 2fd29e7..b750baf 100644 --- a/src/datetime.ts +++ b/src/datetime.ts @@ -67,14 +67,14 @@ export const getDateRangeFromDate = (date: Date, type: DateRangeType, options?: startDate = startOfMonth(lastMonth); } else if (type === 'lastWeek') { const lastWeek = subWeeks(date, 1); - endDate = endOfWeek(lastWeek, { weekStartsOn: options?.weekStartsOn || 1 }); - startDate = startOfWeek(lastWeek, { weekStartsOn: options?.weekStartsOn || 1 }); + endDate = endOfWeek(lastWeek, { weekStartsOn: options?.weekStartsOn ?? 1 }); + startDate = startOfWeek(lastWeek, { weekStartsOn: options?.weekStartsOn ?? 1 }); } else if (type === 'thisMonth') { endDate = endOfMonth(date); startDate = startOfMonth(date); } else if (type === 'thisWeek') { - endDate = endOfWeek(date, { weekStartsOn: options?.weekStartsOn || 1 }); - startDate = startOfWeek(date, { weekStartsOn: options?.weekStartsOn || 1 }); + endDate = endOfWeek(date, { weekStartsOn: options?.weekStartsOn ?? 1 }); + startDate = startOfWeek(date, { weekStartsOn: options?.weekStartsOn ?? 1 }); } else if (type === 'today') { endDate = endOfDay(date); startDate = startOfDay(date); diff --git a/src/math.ts b/src/math.ts index b041e36..681b7de 100644 --- a/src/math.ts +++ b/src/math.ts @@ -48,6 +48,6 @@ export const calculateToPercentageString = (molecular: CalculableValue, denomina const molecularDecimal = new Decimal(molecular.toString()); const denominatorDecimal = new Decimal(denominator.toString()); const calculationResult = molecularDecimal.div(denominatorDecimal); - const result = calculationResult.isNaN() ? '0.00' : calculationResult.times(100).toFixed(options?.decimalPlaces || 2); - return options?.withSymbol ?? true ? `${result}%` : result; + const result = calculationResult.isNaN() ? '0.00' : calculationResult.times(100).toFixed(options?.decimalPlaces ?? 2); + return (options?.withSymbol ?? true) ? `${result}%` : result; };