Merge pull request #11 from berdario/dates-pre-100

fix Date construction for years 0 <= y < 100
purescript-contrib · Jun 23, 2017 · f882b5f · f882b5f
2 parents 54f4b20 + 73c04f3
commit f882b5f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/Data/JSDate.js b/src/Data/JSDate.js
@@ -1,6 +1,22 @@
 /* global exports */
 "use strict";
 
+var createDate = function (y, m, d, h, mi, s, ms) {
+  var date = new Date(Date.UTC(y, m, d, h, mi, s, ms));
+  if (y >= 0 && y < 100) {
+    date.setUTCFullYear(y);
+  }
+  return date;
+};
+
+var createLocalDate = function (y, m, d, h, mi, s, ms) {
+  var date = new Date(y, m, d, h, mi, s, ms);
+  if (y >= 0 && y < 100) {
+    date.setFullYear(y);
+  }
+  return date;
+};
+
 exports.isValid = function (date) {
   return !isNaN(date.getTime());
 };
@@ -15,13 +31,12 @@ exports.toInstantImpl = function (just) {
 };
 
 exports.jsdate = function (parts) {
-  var t = Date.UTC(parts.year, parts.month, parts.day, parts.hour, parts.minute, parts.second, parts.millisecond);
-  return new Date(t);
+  return createDate(parts.year, parts.month, parts.day, parts.hour, parts.minute, parts.second, parts.millisecond);
 };
 
 exports.jsdateLocal = function (parts) {
   return function () {
-    return new Date(parts.year, parts.month, parts.day, parts.hour, parts.minute, parts.second, parts.millisecond);
+    return createLocalDate(parts.year, parts.month, parts.day, parts.hour, parts.minute, parts.second, parts.millisecond);
   };
 };
 

diff --git a/test/Test/Main.purs b/test/Test/Main.purs
@@ -56,6 +56,7 @@ main = do
 
   log "Check that a roundtrip conversion of a dates results in the input"
   assert $ JSD.toDateTime (JSD.fromDateTime dateTime) == Just dateTime
+  assert $ JSD.toDateTime (JSD.fromDateTime ancientDateTime) == Just ancientDateTime
   assert $ JSD.toDateTime (JSD.fromDateTime bottom) == Just bottom
   assert $ JSD.toDateTime (JSD.fromDateTime top) == Just top
 
@@ -80,3 +81,8 @@ main = do
     DT.Time <$> toEnum 2 <*> toEnum 21 <*> toEnum 43 <*> toEnum 678
 
   dateTime = DT.DateTime date time
+
+  ancientDate = unsafePartial $ fromJust $
+    DT.canonicalDate <$> toEnum 1 <*> pure DT.January <*> toEnum 1
+
+  ancientDateTime = DT.DateTime ancientDate time