[bugfix] Support ISO 8601 YYYYMM format (#5458)

diff --git a/src/lib/create/from-string.js b/src/lib/create/from-string.js
index fc748b5a382b6b86439fd3339cd9fb7de237103d..c3fd999f47ed4617703ab3bf92c2b503717f2311 100644 (file)
--- a/src/lib/create/from-string.js
+++ b/src/lib/create/from-string.js
@@ -9,8 +9,7 @@ import {defaultLocaleWeekdaysShort} from '../units/day-of-week';
 // iso 8601 regex
 // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
 var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-var yearIsoRegex = /^\s*(\d{4})$/;
+var basicIsoRegex =    /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d|))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
 
 var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
 
@@ -23,10 +22,10 @@ var isoDates = [
     ['YYYY-MM', /\d{4}-\d\d/, false],
     ['YYYYYYMMDD', /[+-]\d{10}/],
     ['YYYYMMDD', /\d{8}/],
-    // YYYYMM is NOT allowed by the standard
     ['GGGG[W]WWE', /\d{4}W\d{3}/],
     ['GGGG[W]WW', /\d{4}W\d{2}/, false],
     ['YYYYDDD', /\d{7}/],
+    ['YYYYMM', /\d{6}/, false],
     ['YYYY', /\d{4}/, false]
 ];
 
@@ -49,7 +48,7 @@ var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
 export function configFromISO(config) {
     var i, l,
         string = config._i,
-        match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string) || yearIsoRegex.exec(string),
+        match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
         allowTime, dateFormat, timeFormat, tzFormat;
 
     if (match) {

diff --git a/src/test/moment/create.js b/src/test/moment/create.js
index e9ec4fb25a8c1a3ab8331a0f611994b76d8d4dcf..31fe5d5318ce52ec3c75e568bbefd065ebe95eb5 100644 (file)
--- a/src/test/moment/create.js
+++ b/src/test/moment/create.js
@@ -564,19 +564,25 @@ test('parsing iso', function (assert) {
         }
         return '' + input;
     },
-    hourOffset = (offset > 0 ? Math.floor(offset / 60) : Math.ceil(offset / 60)),
-    minOffset = offset - (hourOffset * 60),
-    tz = (offset >= 0) ?
-        '+' + pad(hourOffset) + ':' + pad(minOffset) :
-        '-' + pad(-hourOffset) + ':' + pad(-minOffset),
+    offStr = function (offset) {
+        var hourOffset = (offset > 0 ? Math.floor(offset / 60) : Math.ceil(offset / 60)),
+            minOffset = offset - (hourOffset * 60);
+        return offset >= 0 ?
+            '+' + pad(hourOffset) + ':' + pad(minOffset) :
+            '-' + pad(-hourOffset) + ':' + pad(-minOffset);
+    },
+    tz = offStr(offset),
+    tz0 = offStr(moment([2011, 0, 1]).utcOffset()),
     tz2 = tz.replace(':', ''),
     tz3 = tz2.slice(0, 3),
     //Tz3 removes minutes digit so will break the tests when parsed if they all use the same minutes digit
+    hourOffset = (offset > 0 ? Math.floor(offset / 60) : Math.ceil(offset / 60)),
+    minOffset = offset - (hourOffset * 60),
     minutesForTz3 = pad((4 + minOffset) % 60),
-    minute = pad(4 + minOffset),
+    // minute = pad(4 + minOffset),
 
     formats = [
-        ['2011',                          '2011-01-01T00:00:00.000' + tz],
+        ['2011',                          '2011-01-01T00:00:00.000' + tz0],
         ['2011-10',                       '2011-10-01T00:00:00.000' + tz],
         ['2011-10-08',                    '2011-10-08T00:00:00.000' + tz],
         ['2011-10-08T18',                 '2011-10-08T18:00:00.000' + tz],
@@ -743,7 +749,6 @@ test('parsing iso', function (assert) {
 test('non iso 8601 strings', function (assert) {
     assert.ok(!moment('2015-10T10:15', moment.ISO_8601, true).isValid(), 'incomplete date with time');
     assert.ok(!moment('2015-W10T10:15', moment.ISO_8601, true).isValid(), 'incomplete week date with time');
-    assert.ok(!moment('201510', moment.ISO_8601, true).isValid(), 'basic YYYYMM is not allowed');
     assert.ok(!moment('2015W10T1015', moment.ISO_8601, true).isValid(), 'incomplete week date with time (basic)');
     assert.ok(!moment('2015-10-08T1015', moment.ISO_8601, true).isValid(), 'mixing extended and basic format');
     assert.ok(!moment('20151008T10:15', moment.ISO_8601, true).isValid(), 'mixing basic and extended format');