dce-reactkit 4.2.4-beta-timestamp.1 → 4.2.4-beta-timestamp.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-reactkit",
-  "version": "4.2.4-beta-timestamp.1",
+  "version": "4.2.4-beta-timestamp.2",
   "description": "Shared components for Harvard DCE apps",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/helpers/getTimestampFromTimeInfoInET.ts

@@ -42,7 +42,7 @@ const getTimestampFromTimeInfoInET = (
   const hh = padZerosLeft(hour, 2);
   const min = padZerosLeft(minute, 2);
 
-  // Use Intl.DateTimeFormat to get the ET offset for the given date
+  // Use Intl.DateTimeFormat to get the ET offset and ET components
   const dateForET = new Date(Date.UTC(year, month - 1, day, hour, minute, 0));
   const options: Intl.DateTimeFormatOptions = {
     timeZone: 'America/New_York',
@@ -53,6 +53,7 @@ const getTimestampFromTimeInfoInET = (
     minute: '2-digit',
     second: '2-digit',
     hour12: false,
+    timeZoneName: 'shortOffset',
   };
   const parts: Intl.DateTimeFormatPart[] = new Intl.DateTimeFormat('en-US', options).formatToParts(dateForET);
   const etYear: string | undefined = parts.find((p: Intl.DateTimeFormatPart) => {
@@ -73,17 +74,29 @@ const getTimestampFromTimeInfoInET = (
   const etSecond: string | undefined = parts.find((p: Intl.DateTimeFormatPart) => {
     return p.type === 'second';
   })?.value;
+  const tzName: string | undefined = parts.find((p: Intl.DateTimeFormatPart) => {
+    return p.type === 'timeZoneName';
+  })?.value;
 
-  // Build ET date string and parse as if local, then get UTC timestamp
-  if (!etYear || !etMonth || !etDay || !etHour || !etMinute || !etSecond) {
+  // Validate we got everything we need
+  if (!etYear || !etMonth || !etDay || !etHour || !etMinute || !etSecond || !tzName) {
     throw new ErrorWithCode(
       'Failed to parse date parts from Intl.DateTimeFormat',
       ReactKitErrorCode.ETTimestampInvalid,
     );
   }
-  const etDateString: string = `${etYear}-${etMonth}-${etDay}T${etHour}:${etMinute}:${etSecond}`;
-  const etDate: Date = new Date(etDateString);
-  const timestamp: number = etDate.getTime();
+
+  // Extract numeric offset from "GMT-4" or "UTC-5"
+  const offsetNum = Number(tzName.replace(/^(GMT|UTC)/, ''));
+  const sign = offsetNum >= 0 ? '+' : '-';
+  const offset = `${sign}${padZerosLeft(Math.abs(offsetNum), 2)}:00`;
+
+  // Build ISO string with offset
+  const etDateString = `${etYear}-${etMonth}-${etDay}T${etHour}:${etMinute}:${etSecond}${offset}`;
+
+  // Parse into ET timestamp
+  const etDate = new Date(etDateString);
+  const timestamp = etDate.getTime();
 
   // Verify that the timestamp is correct
   const timeInfoInET = getTimeInfoInET(timestamp);
@@ -95,7 +108,9 @@ const getTimestampFromTimeInfoInET = (
     || timeInfoInET.minute !== minute
   ) {
     throw new ErrorWithCode(
-      `Timestamp mismatch: expected ${year}-${mm}-${dd} ${hh}:${min}, got ${timeInfoInET.year}-${padZerosLeft(timeInfoInET.month, 2)}-${padZerosLeft(timeInfoInET.day, 2)} ${padZerosLeft(timeInfoInET.hour, 2)}:${padZerosLeft(timeInfoInET.minute, 2)}`,
+      `Timestamp mismatch: expected ${year}-${mm}-${dd} ${hh}:${min}, `
+      + `got ${timeInfoInET.year}-${padZerosLeft(timeInfoInET.month, 2)}-${padZerosLeft(timeInfoInET.day, 2)} `
+      + `${padZerosLeft(timeInfoInET.hour, 2)}:${padZerosLeft(timeInfoInET.minute, 2)}`,
       ReactKitErrorCode.ETTimestampInvalid,
     );
   }