Fixed bug in parsing

Author: taylorhakes

dist/fecha.min.js

@@ -250,14 +250,14 @@
     // Make literals inactive by replacing them with ??
     mask = mask.replace(literal, function($0, $1) {
       literals.push($1);
-      return '??';
+      return '@@@';
     });
     // Apply formatting rules
     mask = mask.replace(token, function ($0) {
       return $0 in formatFlags ? formatFlags[$0](dateObj, i18n) : $0.slice(1, $0.length - 1);
     });
     // Inline literal values back into the formatted value
-    return mask.replace(/\?\?/g, function() {
+    return mask.replace(/@@@/g, function() {
       return literals.shift();
     });
   };
@@ -286,6 +286,11 @@
 
     var dateInfo = {};
     var parseInfo = [];
+    var literals = [];
+    format = format.replace(literal, function($0, $1) {
+      literals.push($1);
+      return '@@@';
+    });
     var newFormat = regexEscape(format).replace(token, function ($0) {
       if (parseFlags[$0]) {
         var info = parseFlags[$0];
@@ -295,6 +300,9 @@
 
       return $0;
     });
+    newFormat = newFormat.replace(/@@@/g, function() {
+      return literals.shift();
+    });
     var matches = dateStr.match(new RegExp(newFormat, 'i'));
     if (!matches) {
       return null;

lib/fecha.umd.js

@@ -1,6 +1,6 @@
 {
   "name": "fecha",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "Date formatting and parsing",
   "main": "lib/fecha.umd.js",
   "module": "src/fecha.js",

package.json

@@ -244,14 +244,14 @@ fecha.format = function (dateObj, mask, i18nSettings) {
   // Make literals inactive by replacing them with ??
   mask = mask.replace(literal, function($0, $1) {
     literals.push($1);
-    return '??';
+    return '@@@';
   });
   // Apply formatting rules
   mask = mask.replace(token, function ($0) {
     return $0 in formatFlags ? formatFlags[$0](dateObj, i18n) : $0.slice(1, $0.length - 1);
   });
   // Inline literal values back into the formatted value
-  return mask.replace(/\?\?/g, function() {
+  return mask.replace(/@@@/g, function() {
     return literals.shift();
   });
 };
@@ -280,6 +280,11 @@ fecha.parse = function (dateStr, format, i18nSettings) {
 
   var dateInfo = {};
   var parseInfo = [];
+  var literals = [];
+  format = format.replace(literal, function($0, $1) {
+    literals.push($1);
+    return '@@@';
+  });
   var newFormat = regexEscape(format).replace(token, function ($0) {
     if (parseFlags[$0]) {
       var info = parseFlags[$0];
@@ -289,6 +294,9 @@ fecha.parse = function (dateStr, format, i18nSettings) {
 
     return $0;
   });
+  newFormat = newFormat.replace(/@@@/g, function() {
+    return literals.shift();
+  });
   var matches = dateStr.match(new RegExp(newFormat, 'i'));
   if (!matches) {
     return null;

src/fecha.js

@@ -50,6 +50,7 @@ testParse('UTC timezone offset', '09:20:31 GMT-0000 (UTC)', 'HH:mm:ss ZZ', new D
 testParse('UTC timezone offset without explicit offset', '09:20:31Z', 'HH:mm:ssZZ', new Date(year, 0, 1, 9, 20, 31));
 testParse('UTC timezone offset without GMT', '09:20:31 -0000 (UTC)', 'HH:mm:ss ZZ', new Date(Date.UTC(year, 0, 1, 9, 20, 31)));
 testParse('invalid date', 'hello', 'HH:mm:ss ZZ', null);
+testParse('formatted date with brackets', '2019-04-12T15:53', 'YYYY-MM-DD[T]HH:mm', new Date(2019, 3, 12, 15, 53))
 test('i18n month short parse', function() {
   assert.equal(+fecha.parse('def 3rd, 2021', 'MMM Do, YYYY', {
     monthNamesShort: ['Adk', 'Def', 'Sdfs', 'Sdf', 'Sdh', 'Tre', 'Iis', 'Swd', 'Ews', 'Sdf', 'Qaas', 'Ier']