Skip to content

Commit

Permalink
perf: simplify control flow
Browse files Browse the repository at this point in the history
  • Loading branch information
jy95 committed May 1, 2024
1 parent 2ca42dc commit 6f17e96
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/utils/formatDatetimes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ function generateDateStyleFormatOptions(
options: Intl.DateTimeFormatOptions,
): Intl.DateTimeFormatOptions {
if (options.dateStyle !== undefined) {
return options;
return {
dateStyle: options.dateStyle,
};
}

const defaults: Intl.DateTimeFormatOptions = {
Expand All @@ -37,7 +39,9 @@ function generateTimeStyleFormatOptions(
options: Intl.DateTimeFormatOptions,
): Intl.DateTimeFormatOptions {
if (options.timeStyle !== undefined) {
return options;
return {
timeStyle: options.timeStyle,
};
}

const defaults: Intl.DateTimeFormatOptions = {
Expand Down Expand Up @@ -101,8 +105,7 @@ export function formatDatetimes({ config, datetimes }: Args): string[] {
if (!hasTimePart) {
let df3 = new Intl.DateTimeFormat(config.language, {
// retrieve value from user
dateStyle: options.dateStyle,
// fallback if dateStyle is not defined
// and fallback if dateStyle is not defined
...generateDateStyleFormatOptions(options),
});
return df3.format(date);
Expand All @@ -111,9 +114,7 @@ export function formatDatetimes({ config, datetimes }: Args): string[] {
// Otherwise, we have a full datetime
let df4 = new Intl.DateTimeFormat(config.language, {
// retrieve value from user
dateStyle: options.dateStyle,
timeStyle: options.timeStyle,
// fallback if dateStyle / timeStyle is not defined
// and fallback if dateStyle / timeStyle is not defined
...generateDateStyleFormatOptions(options),
...generateTimeStyleFormatOptions(options),
});
Expand Down

0 comments on commit 6f17e96

Please sign in to comment.