feat: distinguish between timezone format ZZ (es.+0100) and Z (es. +0…

…1:00) (#92)
gr2m · Feb 15, 2019 · c465304 · c465304
1 parent bf9ebda
commit c465304
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/lib/parseformat.js b/lib/parseformat.js
@@ -15,7 +15,9 @@ var regexAbbreviatedMonthNames = new RegExp(abbreviatedMonthNames.join('|'), 'i'
 var regexFirstSecondThirdFourth = /(\d+)(st|nd|rd|th)\b/i
 var regexEndian = /(\d{1,4})([/.-])(\d{1,2})[/.-](\d{1,4})/
 
-var regexTimezone = /((\+|-)\d\d:?\d\d)$/
+var regexTimezoneOneZ = /((\+|-)\d\d:\d\d)$/
+var regexTimezoneTwoZ = /((\+|-)\d\d\d\d)$/
+
 var amOrPm = '(' + ['AM?', 'PM?'].join('|') + ')'
 var regexHoursWithLeadingZeroDigitMinutesSecondsAmPm = new RegExp('0\\d\\:\\d{1,2}\\:\\d{1,2}(\\s*)' + amOrPm, 'i')
 var regexHoursWithLeadingZeroDigitMinutesAmPm = new RegExp('0\\d\\:\\d{1,2}(\\s*)' + amOrPm, 'i')
@@ -100,8 +102,8 @@ function parseFormat (dateString, options) {
 
   // TIME
 
-  // timezone +02:00 ☛ Z
-  format = format.replace(regexTimezone, 'Z')
+  // timezone +02:00 ☛ Z, timezone +0200 ☛ ZZ
+  format = regexTimezoneOneZ.test(format) ? format.replace(regexTimezoneOneZ, 'Z') : format.replace(regexTimezoneTwoZ, 'ZZ')
   // 23:39:43.331 ☛ 'HH:mm:ss.SSS'
   format = format.replace(regexISO8601HoursWithLeadingZeroMinutesSecondsMilliseconds, 'HH:mm:ss.SSS')
   // 23:39:43.33 ☛ 'HH:mm:ss.SS'

diff --git a/test/moment-parseformat-test.js b/test/moment-parseformat-test.js
@@ -67,17 +67,23 @@ test('GitHub issues', function (t) {
   t.equal(moment.parseFormat('Feb 1 2016 1:03:22.1'), 'MMM D YYYY H:mm:ss.S', 'Feb 1 2016 1:03:22.111 → MMM D YYYY H:mm:ss.S')
 
   // https://github.com/gr2m/moment-parseformat/issues/56
-  t.equal(moment.parseFormat('2014-23-04T01:20:28.888+0200'), 'YYYY-MM-DDTHH:mm:ss.SSSZ', '#56 2014-23-04T01:20:28.888+0200 → YYYY-MM-DDTHH:mm:ss.SSSZ')
-  t.equal(moment.parseFormat('2014-09-04T01:20:28.888+0200'), 'YYYY-MM-DDTHH:mm:ss.SSSZ', '#56 2014-09-04T01:20:28.888+0200 → YYYY-MM-DDTHH:mm:ss.SSSZ')
-  t.equal(moment.parseFormat('2014-09-04T01:20:28.888-0200'), 'YYYY-MM-DDTHH:mm:ss.SSSZ', '#56 2014-09-04T01:20:28.888-0200 → YYYY-MM-DDTHH:mm:ss.SSSZ')
-  t.equal(moment.parseFormat('2014-09-04T01:20:28+0200'), 'YYYY-MM-DDTHH:mm:ssZ', '#56 2014-09-04T01:20:28+0200 → YYYY-MM-DDTHH:mm:ssZ')
-  t.end()
+  t.equal(moment.parseFormat('2014-23-04T01:20:28.888+0200'), 'YYYY-MM-DDTHH:mm:ss.SSSZZ', '#56 2014-23-04T01:20:28.888+0200 → YYYY-MM-DDTHH:mm:ss.SSSZZ')
+  t.equal(moment.parseFormat('2014-09-04T01:20:28.888+0200'), 'YYYY-MM-DDTHH:mm:ss.SSSZZ', '#56 2014-09-04T01:20:28.888+0200 → YYYY-MM-DDTHH:mm:ss.SSSZZ')
+  t.equal(moment.parseFormat('2014-09-04T01:20:28.888-0200'), 'YYYY-MM-DDTHH:mm:ss.SSSZZ', '#56 2014-09-04T01:20:28.888-0200 → YYYY-MM-DDTHH:mm:ss.SSSZZ')
+  t.equal(moment.parseFormat('2014-09-04T01:20:28+0200'), 'YYYY-MM-DDTHH:mm:ssZZ', '#56 2014-09-04T01:20:28+0200 → YYYY-MM-DDTHH:mm:ssZZ')
+
+  t.equal(moment.parseFormat('2014-23-04T01:20:28.888+02:00'), 'YYYY-MM-DDTHH:mm:ss.SSSZ', '#56 2014-23-04T01:20:28.888+0200 → YYYY-MM-DDTHH:mm:ss.SSSZ')
+  t.equal(moment.parseFormat('2014-09-04T01:20:28.888+02:00'), 'YYYY-MM-DDTHH:mm:ss.SSSZ', '#56 2014-09-04T01:20:28.888+0200 → YYYY-MM-DDTHH:mm:ss.SSSZ')
+  t.equal(moment.parseFormat('2014-09-04T01:20:28.888-02:00'), 'YYYY-MM-DDTHH:mm:ss.SSSZ', '#56 2014-09-04T01:20:28.888-0200 → YYYY-MM-DDTHH:mm:ss.SSSZ')
+  t.equal(moment.parseFormat('2014-09-04T01:20:28+02:00'), 'YYYY-MM-DDTHH:mm:ssZ', '#56 2014-09-04T01:20:28+0200 → YYYY-MM-DDTHH:mm:ssZ')
 
   // https://github.com/gr2m/moment-parseformat/issues/65
   t.equal(moment.parseFormat('Aug 11 2015 11:20p'), 'MMM D YYYY h:mma', '#65 Aug 11 2015 11:20p → MMM D YYYY H:mmp')
   t.equal(moment.parseFormat('Aug 11 2015 11:20a'), 'MMM D YYYY h:mma', '#65 Aug 11 2015 11:20p → MMM D YYYY H:mmp')
   t.equal(moment.parseFormat('Aug 11 2015 11:20P'), 'MMM D YYYY h:mmA', '#65 Aug 11 2015 11:20p → MMM D YYYY H:mmp')
   t.equal(moment.parseFormat('Aug 11 2015 11:20A'), 'MMM D YYYY h:mmA', '#65 Aug 11 2015 11:20p → MMM D YYYY H:mmp')
+
+  t.end()
 })
 
 test('GitHub issues - special cases', function (t) {