Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(datetime): handle am / pm variants #5406

Merged
merged 18 commits into from
Aug 9, 2024
Merged

fix(datetime): handle am / pm variants #5406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7bc8ce0
initial commit
timreichen Jul 10, 2024
41af26c
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Jul 11, 2024
4f0e836
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Jul 11, 2024
2b999ab
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Jul 31, 2024
092bdca
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Aug 1, 2024
413b8a0
update
timreichen Aug 2, 2024
d836a17
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Aug 2, 2024
cbae847
update
timreichen Aug 2, 2024
e197d9a
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Aug 2, 2024
61ef45c
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Aug 6, 2024
3f78b03
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Aug 8, 2024
0d5ee62
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Aug 8, 2024
501abf8
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Aug 8, 2024
89712ac
clean diff
iuioiua Aug 9, 2024
4ae2c0a
add pm tests
timreichen Aug 9, 2024
2d524c4
remove dead code
timreichen Aug 9, 2024
3535144
update
timreichen Aug 9, 2024
9c93c1c
Merge branch 'main' into datetime-fix-am/pm-variants
timreichen Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions datetime/_date_time_formatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,21 @@
break;
}
case "dayPeriod": {
value = /^(A|P)M/.exec(string)?.[0] as string;
value = /^[AP](?:\.M\.|M\.?)/i.exec(string)?.[0] as string;
switch (value.toUpperCase()) {
case "AM":
case "AM.":
case "A.M.":
value = "AM";
break;

Check warning on line 471 in datetime/_date_time_formatter.ts

View check run for this annotation

Codecov / codecov/patch

datetime/_date_time_formatter.ts#L470-L471 

Added lines #L470 - L471 were not covered by tests
case "PM":
case "PM.":
case "P.M.":
value = "PM";
break;
default:
throw new Error(`dayPeriod '${value}' is not supported.`);

Check warning on line 478 in datetime/_date_time_formatter.ts

View check run for this annotation

Codecov / codecov/patch

datetime/_date_time_formatter.ts#L478 

Added line #L478 was not covered by tests
}
break;
}
case "literal": {
Expand Down Expand Up @@ -542,7 +556,24 @@
const dayPeriod = parts.find(
(part: DateTimeFormatPart) => part.type === "dayPeriod",
);
if (dayPeriod?.value === "PM") value += 12;
if (dayPeriod) {
switch (dayPeriod.value.toUpperCase()) {
case "AM":
case "AM.":
case "A.M.":
// ignore
break;
case "PM":
case "PM.":
case "P.M.":
value += 12;
break;
default:
throw new Error(
`dayPeriod '${dayPeriod.value}' is not supported.`,
);
}
}
utc ? date.setUTCHours(value) : date.setHours(value);
break;
}
Expand Down
176 changes: 173 additions & 3 deletions datetime/_date_time_formatter_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@ Deno.test("dateTimeFormatter.format()", () => {
new Date(2020, 0, 1, 23, 59, 59),
"2020-01-01 23:59:59 PM",
],
[
"yyyy-MM-dd hh:mm:ss a",
new Date(2020, 0, 1, 23, 59, 59),
"2020-01-01 11:59:59 PM",
],
["yyyy-MM-dd a", new Date(2020, 0, 1), "2020-01-01 AM"],
["yyyy-MM-dd HH:mm:ss a", new Date(2020, 0, 1), "2020-01-01 00:00:00 AM"],
["yyyy-MM-dd hh:mm:ss a", new Date(2020, 0, 1), "2020-01-01 12:00:00 AM"],
["yyyy", new Date(2020, 0, 1), "2020"],
["MM", new Date(2020, 0, 1), "01"],
] as const;
Expand Down Expand Up @@ -74,7 +81,7 @@ Deno.test("dateTimeFormatter.partsToDate()", () => {
const format = "yyyy-MM-dd HH:mm:ss.SSS a";
const formatter = new DateTimeFormatter(format);
assertEquals(
+formatter.partsToDate([
formatter.partsToDate([
{ type: "year", value: "2020" },
{ type: "month", value: "01" },
{ type: "day", value: "01" },
Expand All @@ -85,7 +92,170 @@ Deno.test("dateTimeFormatter.partsToDate()", () => {
{ type: "dayPeriod", value: "AM" },
{ type: "timeZoneName", value: "UTC" },
]),
+date,
date,
);
});
Deno.test("dateTimeFormatter.partsToDate() works with am dayPeriod", () => {
const date = new Date("2020-01-01T00:00:00.000Z");
using _time = new FakeTime(date);
iuioiua marked this conversation as resolved.
Show resolved Hide resolved
const format = "HH a";
const formatter = new DateTimeFormatter(format);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "AM" },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "AM." },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "A.M." },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "am" },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "am." },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "a.m." },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
});
Deno.test("dateTimeFormatter.partsToDate() works with pm dayPeriod", () => {
const date = new Date("2020-01-01T13:00:00.000Z");
using _time = new FakeTime(date);
const format = "HH a";
const formatter = new DateTimeFormatter(format);

assertEquals(
formatter.partsToDate([
{ type: "hour", value: "01" },
{ type: "dayPeriod", value: "PM" },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "01" },
{ type: "dayPeriod", value: "PM." },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "01" },
{ type: "dayPeriod", value: "P.M." },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "01" },
{ type: "dayPeriod", value: "pm" },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "01" },
{ type: "dayPeriod", value: "pm." },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
assertEquals(
formatter.partsToDate([
{ type: "hour", value: "01" },
{ type: "dayPeriod", value: "p.m." },
{ type: "timeZoneName", value: "UTC" },
]),
date,
);
});
Deno.test("dateTimeFormatter.partsToDate() throws with invalid dayPeriods", () => {
const format = "HH a";
const formatter = new DateTimeFormatter(format);
assertThrows(
() =>
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "A.M" },
{ type: "timeZoneName", value: "UTC" },
]),
Error,
"dayPeriod 'A.M' is not supported.",
);
assertThrows(
() =>
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "a.m" },
{ type: "timeZoneName", value: "UTC" },
]),
Error,
"dayPeriod 'a.m' is not supported.",
);
assertThrows(
() =>
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "P.M" },
{ type: "timeZoneName", value: "UTC" },
]),
Error,
"dayPeriod 'P.M' is not supported.",
);
assertThrows(
() =>
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "p.m" },
{ type: "timeZoneName", value: "UTC" },
]),
Error,
"dayPeriod 'p.m' is not supported.",
);
assertThrows(
() =>
formatter.partsToDate([
{ type: "hour", value: "00" },
{ type: "dayPeriod", value: "noon" },
{ type: "timeZoneName", value: "UTC" },
]),
Error,
"dayPeriod 'noon' is not supported.",
);
});

Expand Down Expand Up @@ -118,6 +288,6 @@ Deno.test("dateTimeFormatter.partsToDate() sets utc", () => {
] as const;
for (const [format, input, output] of cases) {
const formatter = new DateTimeFormatter(format);
assertEquals(+formatter.partsToDate([...input]), +output);
assertEquals(formatter.partsToDate([...input]), output);
}
});