@dboio/cli 0.6.14 → 0.8.0

package/src/lib/timestamps.js

@@ -20,20 +20,42 @@ export function parseServerDate(dateStr, serverTz) {
   if (!serverTz || serverTz === 'UTC') return asUtc;
 
   // Find offset: format this UTC instant in the server timezone,
-  // then compute the difference to determine the actual UTC time
-  const parts = new Intl.DateTimeFormat('en-US', {
+  // then compute the difference to determine the actual UTC time.
+  // Use hourCycle:'h23' (range 0-23) to avoid the hour12:false quirk where
+  // midnight is returned as "24" instead of "00" on some V8 versions.
+  const fmt = new Intl.DateTimeFormat('en-US', {
     timeZone: serverTz,
     year: 'numeric', month: '2-digit', day: '2-digit',
     hour: '2-digit', minute: '2-digit', second: '2-digit',
-    hour12: false,
-  }).formatToParts(asUtc);
+    hourCycle: 'h23',
+  });
 
-  const p = {};
-  for (const { type, value } of parts) p[type] = value;
-  const tzLocal = new Date(`${p.year}-${p.month}-${p.day}T${p.hour}:${p.minute}:${p.second}Z`);
-  const offset = tzLocal - asUtc;
+  // Helper: compute the UTC offset (ms) for a given UTC instant in serverTz.
+  // Returns the offset such that: localTime (as UTC) = utcInstant + offset.
+  const getOffset = (utcInstant) => {
+    const parts = fmt.formatToParts(utcInstant);
+    const p = {};
+    for (const { type, value } of parts) p[type] = value;
+    const tzLocal = new Date(`${p.year}-${p.month}-${p.day}T${p.hour}:${p.minute}:${p.second}Z`);
+    if (isNaN(tzLocal.getTime())) return null;
+    return tzLocal - utcInstant;
+  };
 
-  return new Date(asUtc.getTime() - offset);
+  // Step 1: estimate the UTC equivalent by computing the offset at asUtc.
+  // asUtc is the server's local time naively parsed as UTC, so it may sit in
+  // a different DST regime than the true UTC. This gives a rough approximation.
+  const offset1 = getOffset(asUtc);
+  if (offset1 === null) return asUtc; // fallback: treat as UTC
+
+  const approx = new Date(asUtc.getTime() - offset1);
+
+  // Step 2: recompute the offset at the approximated true UTC.
+  // This corrects for DST boundary crossings where step 1 used the wrong
+  // summer/winter offset — one iteration is sufficient since DST shifts by 1h.
+  const offset2 = getOffset(approx);
+  if (offset2 === null) return approx;
+
+  return new Date(asUtc.getTime() - offset2);
 }
 
 /**