add new timezones and add names

Author: maxrimue

index.ts

@@ -1,4 +1,4 @@
-import timezones from "./timezones";
+import timezones, {timezonesType} from "./timezones";
 
 interface formattedTime {
   hours: number;
@@ -11,7 +11,8 @@ interface tizoResult {
   original: [number, number];
   utc: [number, number];
   local: [number, number];
-  timezones: any;
+  timezones: timezonesType;
+  inputTimezone: {offset: number | [number, number]; name: string};
 }
 
 /** Get Date()'s local offset and translate Date()'s answer from minutes to hours */
@@ -38,6 +39,20 @@ function applyOffset(dateObj: Date, offset: number | [number, number]) {
   }
 }
 
+function fetchTimezone(
+  key: string
+): {offset: number | [number, number]; name: string} {
+  if (key === undefined) {
+    return {offset: 0, name: ""};
+  }
+
+  if (timezones[key]) {
+    return timezones[key];
+  } else {
+    throw new Error(`Timezone not found: ${key}`);
+  }
+}
+
 function converter(input: formattedTime): tizoResult {
   let hours = 0;
 
@@ -63,18 +78,14 @@ function converter(input: formattedTime): tizoResult {
   }
 
   const minutes = input.minutes;
-
-  let offset: number | [number, number];
-  if (timezones[input.timezone]) {
-    offset = timezones[input.timezone];
-  }
+  const inputTimezone = fetchTimezone(input.timezone);
 
   const timeObj = new Date();
   timeObj.setHours(hours);
   timeObj.setMinutes(minutes);
 
   const timeObjUTC = new Date(timeObj.getTime());
-  applyOffset(timeObjUTC, offset);
+  applyOffset(timeObjUTC, inputTimezone.offset);
 
   const timeObjLocal = new Date(timeObjUTC.getTime());
   applyOffset(timeObjLocal, getLocalOffset());
@@ -83,7 +94,8 @@ function converter(input: formattedTime): tizoResult {
     original: [timeObj.getHours(), timeObj.getMinutes()],
     utc: [timeObjUTC.getHours(), timeObjUTC.getMinutes()],
     local: [timeObjLocal.getHours(), timeObjLocal.getMinutes()],
-    timezones: timezones,
+    timezones,
+    inputTimezone,
   };
 }
 
@@ -100,7 +112,7 @@ export default (input: string): tizoResult => {
     hours: Number(formattedInputArr[1]),
     minutes: Number(formattedInputArr[2] || 0),
     amOrPm: formattedInputArr[3],
-    timezone: formattedInputArr[4] || "utc",
+    timezone: formattedInputArr[4],
   };
 
   if (

test.ts

@@ -46,3 +46,21 @@ test("am/pm", t => {
   t.deepEqual(tizo("11pm").utc, [23, 0]);
   t.deepEqual(tizo("12pm").utc, [12, 0]);
 });
+
+test("get input timezone", t => {
+  t.deepEqual(tizo("09 30 pt").inputTimezone, {
+    name: "Pacific Time",
+    offset: -8,
+  });
+});
+
+test("default input timezone", t => {
+  t.deepEqual(tizo("9").inputTimezone, {
+    name: "",
+    offset: 0,
+  });
+});
+
+test("throws if unrecognized timezone", t => {
+  t.throws(() => tizo("12 am ooooot"));
+});

timezones.ts

@@ -1,36 +1,65 @@
-/** Get the offset of a timezone (key) in hours or [hours, minutes] */
-export default {
-  // Europe
-  utc: "0",
-  gmt: "0",
-  bst: "+1",
-  ist: "+1",
-  wet: "0",
-  west: "+1",
-  cet: "+1",
-  cest: "+2",
-  eet: "+2",
-  eest: "+3",
-  msk: "+3",
-  msd: "+4",
-  // US/Canada
-  ast: "-4",
-  adt: "-3",
-  est: "-5",
-  edt: "-4",
-  cst: "-6",
-  cdt: "-5",
-  mst: "-7",
-  mdt: "-6",
-  pst: "-8",
-  pdt: "-7",
-  hst: "-10",
-  akst: "-9",
-  akdt: "-8",
-  // Australia
-  aest: "+10",
-  aedt: "+11",
-  acst: ["+9", "30"],
-  acdt: ["+10", "30"],
-  awst: "+8",
+export interface timezonesType {
+  [timezone: string]: {offset: number | [number, number]; name: string};
+}
+
+/** Get the offset of a timezone (key) in hours or [hours, minutes], and the name */
+const timezones: timezonesType = {
+  idlw: {offset: -12, name: "International Date Line West"},
+  hast: {offset: -10, name: "Hawaii-Aleutian Standard Time"},
+  hdt: {offset: -9, name: "Hawai Daylight Time"},
+  akst: {offset: -9, name: "Alaska Standard Time"},
+  yst: {offset: -9, name: "Yukon Standard Time"},
+  akdt: {offset: -8, name: "Alaska Daylight Time"},
+  ydt: {offset: -8, name: "Yukon Daylight Time"},
+  pst: {offset: -8, name: "Pacific Standard Time"},
+  pt: {offset: -8, name: "Pacific Time"},
+  pdt: {offset: -7, name: "Pacific Daylight Time"},
+  mst: {offset: -7, name: "Mountain Standard Time"},
+  mdt: {offset: -6, name: "Mountain Daylight Time"},
+  cst: {offset: -6, name: "Central Standard Time"},
+  cdt: {offset: -5, name: "Central Daylight Time"},
+  est: {offset: -5, name: "Eastern Standard Time"},
+  edt: {offset: -4, name: "Eastern Daylight Time"},
+  ast: {offset: -4, name: "Atlantic Standard Time"},
+  adt: {offset: -3, name: "Atlantic Daylight Time"},
+  nst: {offset: [-3, -30], name: "Newfoundland Standard Time"},
+  ndt: {offset: [-2, -30], name: "Newfoundland Daylight Time"},
+  wet: {offset: 0, name: "West European Time"},
+  utc: {offset: 0, name: "Coordinated Universal Time"},
+  gmt: {offset: 0, name: "Greenwhich Mean Time"},
+  west: {offset: 1, name: "West European Summer Time"},
+  wedt: {offset: 1, name: "West European Daylight Time"},
+  bst: {offset: 1, name: "British Summer Time"},
+  cet: {offset: 1, name: "Central European Time"},
+  met: {offset: 1, name: "Middle European Time"},
+  cest: {offset: 2, name: "Central European Summer Time"},
+  cedt: {offset: 2, name: "Central European Daylight Time"},
+  mest: {offset: 2, name: "Middle European Summer Time"},
+  wast: {offset: 2, name: "West Africa Summer Time"},
+  eet: {offset: 2, name: "East European Time"},
+  cat: {offset: 2, name: "Central Africa Time"},
+  sast: {offset: 2, name: "South Africa Standard Time"},
+  eest: {offset: 3, name: "East European Summer Time"},
+  eedt: {offset: 3, name: "East European Daylight Time"},
+  bt: {offset: 3, name: "Baghdad Time"},
+  msk: {offset: 3, name: "Moscow Time"},
+  eat: {offset: 3, name: "East African Time"},
+  irt: {offset: [3, 30], name: "Iran Time"},
+  irst: {offset: [4, 30], name: "Iran Summer Time"},
+  ist: {offset: [5, 30], name: "Indian Standard Time"},
+  ict: {offset: 7, name: "Indochina Time"},
+  cnst: {offset: 8, name: "China Standard Time"},
+  awst: {offset: 8, name: "Australian Western Standard Time"},
+  jst: {offset: 9, name: "Japan/Korea Standard Time"},
+  awdt: {offset: 9, name: "Australian Western Daylight Time"},
+  acst: {offset: [9, 30], name: "Australian Central Standard Time"},
+  acdt: {offset: [10, 30], name: "Australian Central Daylight Time"},
+  aest: {offset: 10, name: "Australian Eastern Standard Time"},
+  aedt: {offset: 11, name: "Australian Eastern Daylight Time"},
+  nft: {offset: 11, name: "Norfolk Time"},
+  idle: {offset: 12, name: "International Date Line East"},
+  nzst: {offset: 12, name: "New Zealand Standard Time"},
+  nzdt: {offset: 13, name: "New Zealand Daylight Time"},
 };
+
+export default timezones;