Skip to content

Fix/12 hour format validation #1631

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

Open
Sho-ki wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/12 hour format validation #1631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d35be5a
add error handle when going over 12 when specifying 12-hour format
Sho-ki May 16, 2024
f8ae891
add test
Sho-ki May 16, 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
11 changes: 7 additions & 4 deletions src/impl/tokenParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,10 +451,13 @@ export class TokenParser {
if (!this.isValid) {
return { input, tokens: this.tokens, invalidReason: this.invalidReason };
} else {
const [rawMatches, matches] = match(input, this.regex, this.handlers),
[result, zone, specificOffset] = matches
? dateTimeFromMatches(matches)
: [null, null, undefined];
const [rawMatches, matches] = match(input, this.regex, this.handlers);
if (hasOwnProperty(matches, "h") && matches.h > 12) {
throw new ConflictingSpecificationError("Can't go over 12 when specifying 12-hour format");
}
const [result, zone, specificOffset] = matches
? dateTimeFromMatches(matches)
: [null, null, undefined];
if (hasOwnProperty(matches, "a") && hasOwnProperty(matches, "H")) {
throw new ConflictingSpecificationError(
"Can't include meridiem when specifying 24-hour format"
Expand Down
6 changes: 6 additions & 0 deletions test/datetime/tokenParse.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ test("DateTime.fromFormat() throws if you specify meridiem with 24-hour time", (
expect(() => DateTime.fromFormat("930PM", "Hmma")).toThrow(ConflictingSpecificationError);
});

test("DateTime.fromFormat() throws if h is used with 24-hour time", () => {
expect(() => DateTime.fromFormat("18:30 AM", "h:mm a")).toThrowError(
ConflictingSpecificationError
);
});

// #714
test("DateTime.fromFormat() makes dots optional and handles non breakable spaces", () => {
function parseMeridiem(input, isAM) {
Expand Down