added check for "h"

moment · Jan 6, 2024 · a6f3b55 · a6f3b55
1 parent 14af2d2
commit a6f3b55
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/impl/tokenParser.js b/src/impl/tokenParser.js
@@ -453,7 +453,7 @@ export function explainFromTokens(locale, input, format) {
     } else if (
       hasOwnProperty(matches, "h") &&
       matches["h"] > 12 &&
-      tokens.find((t) => t.val === "hh")
+      tokens.find((t) => t.val === "h" || t.val === "hh")
     ) {
       const hourValue = matches["h"];
       return {

diff --git a/test/datetime/tokenParse.test.js b/test/datetime/tokenParse.test.js
@@ -18,7 +18,16 @@ test("DateTime.fromFormat() parses basic times", () => {
   expect(i.millisecond).toBe(445);
 });
 
-test("DateTime.fromFormat() yields Invalid reason for invalid input", () => {
+test("DateTime.fromFormat() yields Invalid reason for invalid 12-hour time", () => {
+  const i = DateTime.fromFormat("11-08-2023 15:00 AM", "MM-dd-yyyy h:mm a");
+  expect(i.invalid).not.toBeNull();
+  expect(i.invalid.reason).toEqual("unit out of range");
+  expect(i.invalid.explanation).toEqual(
+    "you specified 15 (of type number) as an hour along with a meridiem, which is invalid"
+  );
+});
+
+test("DateTime.fromFormat() yields Invalid reason for invalid 12-hour time with padding", () => {
   const i = DateTime.fromFormat("11-08-2023 15:00 AM", "MM-dd-yyyy hh:mm a");
   expect(i.invalid).not.toBeNull();
   expect(i.invalid.reason).toEqual("unit out of range");