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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-reactkit",
-  "version": "4.2.3",
+  "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

@@ -36,21 +36,67 @@ const getTimestampFromTimeInfoInET = (
     minute,
   } = opts;
 
-  // Determine if the date is in DST in Eastern Time
-  const tempDate = new Date(year, month - 1, day);
-  const janOffset = new Date(year, 0, 1).getTimezoneOffset();
-  const isDST = tempDate.getTimezoneOffset() < janOffset;
-  const etOffset = isDST ? '-04:00' : '-05:00';
-
   // Format with leading zeroes
   const mm = padZerosLeft(month, 2);
   const dd = padZerosLeft(day, 2);
   const hh = padZerosLeft(hour, 2);
   const min = padZerosLeft(minute, 2);
 
-  // Build ET ISO string and convert to UTC timestamp
-  const etISOString = `${year}-${mm}-${dd}T${hh}:${min}:00${etOffset}`;
-  const timestamp = (new Date(etISOString)).getTime();
+  // 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',
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    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) => {
+    return p.type === 'year';
+  })?.value;
+  const etMonth: string | undefined = parts.find((p: Intl.DateTimeFormatPart) => {
+    return p.type === 'month';
+  })?.value;
+  const etDay: string | undefined = parts.find((p: Intl.DateTimeFormatPart) => {
+    return p.type === 'day';
+  })?.value;
+  const etHour: string | undefined = parts.find((p: Intl.DateTimeFormatPart) => {
+    return p.type === 'hour';
+  })?.value;
+  const etMinute: string | undefined = parts.find((p: Intl.DateTimeFormatPart) => {
+    return p.type === 'minute';
+  })?.value;
+  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;
+
+  // 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,
+    );
+  }
+
+  // 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);
@@ -62,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,
     );
   }