Skip to content

Commit f882b5f

Browse files
authored
Merge pull request #11 from berdario/dates-pre-100
fix Date construction for years 0 <= y < 100
2 parents 54f4b20 + 73c04f3 commit f882b5f

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

src/Data/JSDate.js

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
/* global exports */
22
"use strict";
33

4+
var createDate = function (y, m, d, h, mi, s, ms) {
5+
var date = new Date(Date.UTC(y, m, d, h, mi, s, ms));
6+
if (y >= 0 && y < 100) {
7+
date.setUTCFullYear(y);
8+
}
9+
return date;
10+
};
11+
12+
var createLocalDate = function (y, m, d, h, mi, s, ms) {
13+
var date = new Date(y, m, d, h, mi, s, ms);
14+
if (y >= 0 && y < 100) {
15+
date.setFullYear(y);
16+
}
17+
return date;
18+
};
19+
420
exports.isValid = function (date) {
521
return !isNaN(date.getTime());
622
};
@@ -15,13 +31,12 @@ exports.toInstantImpl = function (just) {
1531
};
1632

1733
exports.jsdate = function (parts) {
18-
var t = Date.UTC(parts.year, parts.month, parts.day, parts.hour, parts.minute, parts.second, parts.millisecond);
19-
return new Date(t);
34+
return createDate(parts.year, parts.month, parts.day, parts.hour, parts.minute, parts.second, parts.millisecond);
2035
};
2136

2237
exports.jsdateLocal = function (parts) {
2338
return function () {
24-
return new Date(parts.year, parts.month, parts.day, parts.hour, parts.minute, parts.second, parts.millisecond);
39+
return createLocalDate(parts.year, parts.month, parts.day, parts.hour, parts.minute, parts.second, parts.millisecond);
2540
};
2641
};
2742

test/Test/Main.purs

+6
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ main = do
5656

5757
log "Check that a roundtrip conversion of a dates results in the input"
5858
assert $ JSD.toDateTime (JSD.fromDateTime dateTime) == Just dateTime
59+
assert $ JSD.toDateTime (JSD.fromDateTime ancientDateTime) == Just ancientDateTime
5960
assert $ JSD.toDateTime (JSD.fromDateTime bottom) == Just bottom
6061
assert $ JSD.toDateTime (JSD.fromDateTime top) == Just top
6162

@@ -80,3 +81,8 @@ main = do
8081
DT.Time <$> toEnum 2 <*> toEnum 21 <*> toEnum 43 <*> toEnum 678
8182

8283
dateTime = DT.DateTime date time
84+
85+
ancientDate = unsafePartial $ fromJust $
86+
DT.canonicalDate <$> toEnum 1 <*> pure DT.January <*> toEnum 1
87+
88+
ancientDateTime = DT.DateTime ancientDate time

0 commit comments

Comments
 (0)