diff --git a/src/table/column/date/tryParseISO.js b/src/table/column/date/tryParseISO.js index 622a1d95..dab3f884 100644 --- a/src/table/column/date/tryParseISO.js +++ b/src/table/column/date/tryParseISO.js @@ -1,14 +1,12 @@ -var pattern = /(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d:[0-5]\d\.\d+)|(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d:[0-5]\d)|(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d)/; +var patternWithTime = /(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d:[0-5]\d\.\d+)|(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d:[0-5]\d)|(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d)/; +var patternDateOnly = /^\d{4}-[01]\d-[0-3]\d$/; function tryParseISO(iso) { - if (pattern.test(iso)) + if (patternWithTime.test(iso) || patternDateOnly.test(iso)) { return iso; - else - throw new TypeError(iso + ' is not a valid Date'); - - - - + } else { + throw new TypeError(iso + ' is not a valid Date'); + } } module.exports = tryParseISO; \ No newline at end of file