fix: DateTime throws when year is invalid and throwOnInvalid is true (#…

…1539)
moment · Nov 14, 2023 · 11ad011 · 11ad011
1 parent 825b77a
commit 11ad011
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/datetime.js b/src/datetime.js
@@ -810,6 +810,10 @@ export default class DateTime {
       );
     }
 
+    if (!inst.isValid) {
+      return DateTime.invalid(inst.invalid);
+    }
+
     return inst;
   }
 

diff --git a/test/datetime/invalid.test.js b/test/datetime/invalid.test.js
@@ -72,3 +72,18 @@ test("throwOnInvalid throws", () => {
 test("DateTime.invalid throws if you don't provide a reason", () => {
   expect(() => DateTime.invalid()).toThrow();
 });
+
+test("throwOnInvalid throws if year is too big", () => {
+  try {
+    Settings.throwOnInvalid = true;
+    expect(() =>
+      DateTime.fromObject({
+        year: 9999999,
+        month: 5,
+        day: 25,
+      })
+    ).toThrow();
+  } finally {
+    Settings.throwOnInvalid = false;
+  }
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -810,6 +810,10 @@ export default class DateTime { @@
           );
         }
+        if (!inst.isValid) {
+          return DateTime.invalid(inst.invalid);
+        }
         return inst;
       }
@@ Expand Down @@