Add support for Z token (#77)

taylorhakes · Feb 10, 2020 · d514f2f · d514f2f
1 parent 4d8a468
commit d514f2f
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 15 deletions.
diff --git a/src/fecha.ts b/src/fecha.ts
@@ -1,4 +1,4 @@
-const token = /d{1,4}|M{1,4}|YY(?:YY)?|S{1,3}|Do|ZZ|([HhMsDm])\1?|[aA]|"[^"]*"|'[^']*'/g;
+const token = /d{1,4}|M{1,4}|YY(?:YY)?|S{1,3}|Do|ZZ|Z|([HhMsDm])\1?|[aA]|"[^"]*"|'[^']*'/g;
 const twoDigitsOptional = "[1-9]\\d?";
 const twoDigits = "\\d\\d";
 const threeDigits = "\\d{3}";
@@ -185,6 +185,15 @@ const formatFlags: Record<
       (offset > 0 ? "-" : "+") +
       pad(Math.floor(Math.abs(offset) / 60) * 100 + (Math.abs(offset) % 60), 4)
     );
+  },
+  Z(dateObj: Date): string {
+    const offset = dateObj.getTimezoneOffset();
+    return (
+      (offset > 0 ? "-" : "+") +
+      pad(Math.floor(Math.abs(offset) / 60), 2) +
+      ":" +
+      pad(Math.abs(offset) % 60, 2)
+    );
   }
 };
 
@@ -210,6 +219,20 @@ const amPm: ParseInfo = [
     return null;
   }
 ];
+const timezoneOffset: ParseInfo = [
+  "timezoneOffset",
+  "[^\\s]*?[\\+\\-]\\d\\d:?\\d\\d|[^\\s]*?Z?",
+  (v: string): number | null => {
+    const parts = (v + "").match(/([+-]|\d\d)/gi);
+
+    if (parts) {
+      const minutes = +parts[1] * 60 + parseInt(parts[2], 10);
+      return parts[0] === "+" ? minutes : -minutes;
+    }
+
+    return 0;
+  }
+];
 const parseFlags: Record<string, ParseInfo> = {
   D: ["day", twoDigitsOptional],
   DD: ["day", twoDigits],
@@ -245,20 +268,8 @@ const parseFlags: Record<string, ParseInfo> = {
   MMMM: ["month", word, monthUpdate("monthNames")],
   a: amPm,
   A: amPm,
-  ZZ: [
-    "timezoneOffset",
-    "[^\\s]*?[\\+\\-]\\d\\d:?\\d\\d|[^\\s]*?Z?",
-    (v: string): number | null => {
-      const parts = (v + "").match(/([+-]|\d\d)/gi);
-
-      if (parts) {
-        const minutes = +parts[1] * 60 + parseInt(parts[2], 10);
-        return parts[0] === "+" ? minutes : -minutes;
-      }
-
-      return 0;
-    }
-  ]
+  ZZ: timezoneOffset,
+  Z: timezoneOffset
 };
 
 // Some common format strings

diff --git a/test.js b/test.js
@@ -209,6 +209,18 @@ testParse(
   "HH:mm:ss [GMT]ZZ [(EST)]",
   new Date(Date.UTC(year, 0, 1, 14, 20, 31))
 );
+testParse(
+  "timezone offset with colon",
+  "09:20:31 GMT-05:00 (EST)",
+  "HH:mm:ss [GMT]ZZ [(EST)]",
+  new Date(Date.UTC(year, 0, 1, 14, 20, 31))
+);
+testParse(
+  "timezone offset with Z",
+  "09:20:31 GMT-05:00 (EST)",
+  "HH:mm:ss [GMT]Z [(EST)]",
+  new Date(Date.UTC(year, 0, 1, 14, 20, 31))
+);
 testParse(
   "timezone offset positive",
   "09:20:31 GMT+0611",
@@ -233,6 +245,12 @@ testParse(
   "HH:mm:ssZZ",
   new Date(Date.UTC(year, 0, 1, 9, 20, 31))
 );
+testParse(
+  "UTC timezone offset without explicit offset with Z",
+  "09:20:31Z",
+  "HH:mm:ssZ",
+  new Date(Date.UTC(year, 0, 1, 9, 20, 31))
+);
 testParse(
   "UTC timezone offset without GMT",
   "09:20:31 -0000 (UTC)",
@@ -441,6 +459,9 @@ testFormat("rd", new Date(2001, 2, 23), "Do", "23rd");
 test("timezone offset", function() {
   assert(fecha.format(new Date(2001, 2, 11), "ZZ").match(/^[\+\-]\d{4}$/));
 });
+test("timezone offset with colon", function() {
+  assert(fecha.format(new Date(2001, 2, 11), "Z").match(/^[\+\-]\d{2}:\d{2}$/));
+});
 
 // Random groupings
 testFormat(