Skip to content

Commit 38c4443

Browse files
committed
fix: Update PeriodType.Month default variant to include full name, and long to include year. Add default variant to tests. Simplify format docs with loop
1 parent 9f3ec6b commit 38c4443

File tree

4 files changed

+77
-276
lines changed

4 files changed

+77
-276
lines changed

.changeset/twelve-cloths-live.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@layerstack/utils': patch
3+
---
4+
5+
fix: Update `PeriodType.Month` `default` variant to include full name, and `long` to include year.

packages/utils/src/lib/date.test.ts

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ describe('formatDate()', () => {
6262
const cases = [
6363
['short', defaultLocale, '11/21'],
6464
['short', fr, '21/11'],
65+
['default', defaultLocale, '11/21/2023'],
66+
['default', fr, '21/11/2023'],
6567
['long', defaultLocale, 'Nov 21, 2023'],
6668
['long', fr, '21 nov. 2023'],
6769
] as const;
@@ -80,6 +82,8 @@ describe('formatDate()', () => {
8082
const cases = [
8183
['short', defaultLocale, '11/21'],
8284
['short', fr, '21/11'],
85+
['default', defaultLocale, '11/21/2023'],
86+
['default', fr, '21/11/2023'],
8387
['long', defaultLocale, 'Nov 21, 2023'],
8488
['long', fr, '21 nov. 2023'],
8589
] as const;
@@ -140,6 +144,8 @@ describe('formatDate()', () => {
140144
const cases = [
141145
[PeriodType.WeekSun, 'short', defaultLocale, '11/19 - 11/25'],
142146
[PeriodType.WeekSun, 'short', fr, '19/11 - 25/11'],
147+
[PeriodType.WeekSun, 'default', defaultLocale, '11/19/2023 - 11/25/2023'],
148+
[PeriodType.WeekSun, 'default', fr, '19/11/2023 - 25/11/2023'],
143149
[PeriodType.WeekSun, 'long', defaultLocale, '11/19/2023 - 11/25/2023'],
144150
[PeriodType.WeekSun, 'long', fr, '19/11/2023 - 25/11/2023'],
145151
[PeriodType.WeekMon, 'long', defaultLocale, '11/20/2023 - 11/26/2023'],
@@ -158,11 +164,15 @@ describe('formatDate()', () => {
158164
const cases = [
159165
[PeriodType.Week, 'short', defaultLocale, '11/19 - 11/25'],
160166
[PeriodType.Week, 'short', fr, '20/11 - 26/11'],
167+
[PeriodType.Week, 'default', defaultLocale, '11/19/2023 - 11/25/2023'],
168+
[PeriodType.Week, 'default', fr, '20/11/2023 - 26/11/2023'],
161169
[PeriodType.Week, 'long', defaultLocale, '11/19/2023 - 11/25/2023'],
162170
[PeriodType.Week, 'long', fr, '20/11/2023 - 26/11/2023'],
163171

164172
[PeriodType.Week, 'short', defaultLocale, '11/19 - 11/25'],
165173
[PeriodType.Week, 'short', fr, '20/11 - 26/11'],
174+
[PeriodType.Week, 'default', defaultLocale, '11/19/2023 - 11/25/2023'],
175+
[PeriodType.Week, 'default', fr, '20/11/2023 - 26/11/2023'],
166176
[PeriodType.Week, 'long', defaultLocale, '11/19/2023 - 11/25/2023'],
167177
[PeriodType.Week, 'long', fr, '20/11/2023 - 26/11/2023'],
168178
] as const;
@@ -179,8 +189,10 @@ describe('formatDate()', () => {
179189
const cases = [
180190
['short', defaultLocale, 'Nov'],
181191
['short', fr, 'nov.'],
182-
['long', defaultLocale, 'November'],
183-
['long', fr, 'novembre'],
192+
['default', defaultLocale, 'November'],
193+
['default', fr, 'novembre'],
194+
['long', defaultLocale, 'November 2023'],
195+
['long', fr, 'novembre 2023'],
184196
] as const;
185197

186198
for (const c of cases) {
@@ -197,6 +209,8 @@ describe('formatDate()', () => {
197209
const cases = [
198210
['short', defaultLocale, 'Nov 23'],
199211
['short', fr, 'nov. 23'],
212+
['default', defaultLocale, 'November 2023'],
213+
['default', fr, 'novembre 2023'],
200214
['long', defaultLocale, 'November 2023'],
201215
['long', fr, 'novembre 2023'],
202216
] as const;
@@ -215,8 +229,10 @@ describe('formatDate()', () => {
215229
const cases = [
216230
['short', defaultLocale, 'Oct - Dec 23'],
217231
['short', fr, 'oct. - déc. 23'],
218-
['long', defaultLocale, 'October - December 2023'],
219-
['long', fr, 'octobre - décembre 2023'],
232+
['default', defaultLocale, 'October - December 2023'],
233+
['default', fr, 'octobre - décembre 2023'],
234+
['long', defaultLocale, 'October 2023 - December 2023'],
235+
['long', fr, 'octobre 2023 - décembre 2023'],
220236
] as const;
221237

222238
for (const c of cases) {
@@ -233,6 +249,8 @@ describe('formatDate()', () => {
233249
const cases = [
234250
['short', defaultLocale, '23'],
235251
['short', fr, '23'],
252+
['default', defaultLocale, '2023'],
253+
['default', fr, '2023'],
236254
['long', defaultLocale, '2023'],
237255
['long', fr, '2023'],
238256
] as const;
@@ -251,6 +269,8 @@ describe('formatDate()', () => {
251269
const cases = [
252270
['short', defaultLocale, '24'],
253271
['short', fr, '24'],
272+
['default', defaultLocale, '2024'],
273+
['default', fr, '2024'],
254274
['long', defaultLocale, '2024'],
255275
['long', fr, '2024'],
256276
] as const;
@@ -269,6 +289,8 @@ describe('formatDate()', () => {
269289
const cases = [
270290
['short', defaultLocale, '11/12 - 11/25'],
271291
['short', fr, '12/11 - 25/11'],
292+
['default', defaultLocale, '11/12/2023 - 11/25/2023'],
293+
['default', fr, '12/11/2023 - 25/11/2023'],
272294
['long', defaultLocale, '11/12/2023 - 11/25/2023'],
273295
['long', fr, '12/11/2023 - 25/11/2023'],
274296
] as const;
@@ -288,6 +310,8 @@ describe('formatDate()', () => {
288310
const cases = [
289311
['short', defaultLocale],
290312
['short', fr],
313+
['default', defaultLocale],
314+
['default', fr],
291315
['long', defaultLocale],
292316
['long', fr],
293317
] as const;

packages/utils/src/lib/locale.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ const defaultLocaleSettings: LocaleSettings = {
203203
},
204204
month: {
205205
short: DateToken.Month_short,
206-
default: DateToken.Month_short,
207-
long: DateToken.Month_long,
206+
default: DateToken.Month_long,
207+
long: [DateToken.Month_long, DateToken.Year_numeric],
208208
},
209209
monthsYear: {
210210
short: [DateToken.Month_short, DateToken.Year_2Digit],

0 commit comments

Comments
 (0)