@dereekb/date 13.0.5 → 13.0.7

package/index.cjs.js

@@ -1097,8 +1097,10 @@ function isSameDateTimezoneConversionConfig(a, b) {
  * @returns
  */
 function getCurrentSystemOffsetInMs(date) {
-    const systemTimezone = requireCurrentTimezone();
-    return calculateTimezoneOffset(systemTimezone, date);
+    // Use native getTimezoneOffset() instead of calculateTimezoneOffset() to avoid
+    // a DST edge case where toZonedTime() creates an epoch that lands on the system's
+    // DST transition boundary, causing formatDate to return the wrong hour.
+    return -date.getTimezoneOffset() * util.MS_IN_MINUTE;
 }
 /**
  * Returns the current system time offset in hours.
@@ -1133,24 +1135,32 @@ function getCurrentSystemOffsetInMinutes(date) {
  * @returns
  */
 function calculateTimezoneOffset(timezone, date) {
-    /*
-    // BUG: There is a bug with getTimezoneOffset where the offset is not calculated properly for the first 2 hours after the DST change.
-    // https://github.com/marnusw/date-fns-tz/issues/227
+    let tzOffset;
+    // UTC always has zero offset; skip toZonedTime which can produce wrong results
+    // when the shifted epoch lands on the system's DST transition boundary.
+    if (util.isConsideredUtcTimezoneString(timezone)) {
+        tzOffset = 0;
+    }
+    else {
+        /*
+        // BUG: There is a bug with getTimezoneOffset where the offset is not calculated properly for the first 2 hours after the DST change.
+        // https://github.com/marnusw/date-fns-tz/issues/227
     
-    const tzOffset = getTimezoneOffset(timezone, date);
-    */
-    /*
-     * WORKAROUND: This is the current workaround. Performance hit seems negligible for all UI use cases.
-     */
-    // inputTimeDate.setSeconds(0);         // NOTE: setting seconds/milliseconds during the daylight savings epoch will also remove an hour
-    // inputTimeDate.setMilliseconds(0);    // do not clear seconds in this way.
-    const inputTimeUnrounded = date.getTime();
-    const secondsAndMs = inputTimeUnrounded % util.MS_IN_MINUTE; // determine the number of seconds and milliseconds (prepare to round to nearest minute)
-    const inputTime = inputTimeUnrounded - secondsAndMs; // remove seconds and ms as it will throw off the final tzOffset
-    const zoneDate = dateFnsTz.toZonedTime(inputTime, timezone);
-    const zoneDateStr = dateFnsTz.format(zoneDate, 'yyyy-MM-dd HH:mm'); // ignore seconds, etc.
-    const zoneDateTime = new Date(zoneDateStr + 'Z').getTime();
-    const tzOffset = zoneDateTime - inputTime;
+        const tzOffset = getTimezoneOffset(timezone, date);
+        */
+        /*
+         * WORKAROUND: This is the current workaround. Performance hit seems negligible for all UI use cases.
+         */
+        // inputTimeDate.setSeconds(0);         // NOTE: setting seconds/milliseconds during the daylight savings epoch will also remove an hour
+        // inputTimeDate.setMilliseconds(0);    // do not clear seconds in this way.
+        const inputTimeUnrounded = date.getTime();
+        const secondsAndMs = inputTimeUnrounded % util.MS_IN_MINUTE; // determine the number of seconds and milliseconds (prepare to round to nearest minute)
+        const inputTime = inputTimeUnrounded - secondsAndMs; // remove seconds and ms as it will throw off the final tzOffset
+        const zoneDate = dateFnsTz.toZonedTime(inputTime, timezone);
+        const zoneDateStr = dateFnsTz.format(zoneDate, 'yyyy-MM-dd HH:mm'); // ignore seconds, etc.
+        const zoneDateTime = new Date(zoneDateStr + 'Z').getTime();
+        tzOffset = zoneDateTime - inputTime;
+    }
     return tzOffset;
 }
 function calculateAllConversions(date, converter, map = ((x) => x)) {
@@ -2303,7 +2313,9 @@ function dateCellTimingEventRange(timing) {
  * @returns
  */
 function getDateCellTimingFirstEventDateRange(timing) {
-    return fitDateRangeToDayPeriod({ start: timing.startsAt, end: timing.end }, timing.timezone);
+    const duration = calculateExpectedDateCellTimingDuration(timing);
+    const end = dateFns.addMinutes(timing.startsAt, duration);
+    return { start: timing.startsAt, end };
 }
 /**
  * Returns the number of hours in a DateCellTiming's duration.

package/index.esm.js

@@ -1,4 +1,4 @@
-import { MS_IN_HOUR, MS_IN_MINUTE, MINUTES_IN_DAY, isISO8601DateString, filterMaybeArrayValues, asArray, dayOfWeek, sortNumbersAscendingFunction, MS_IN_SECOND, SORT_VALUE_LESS_THAN, SORT_VALUE_GREATER_THAN, SORT_VALUE_EQUAL, copyArray, compareFnOrder, MS_IN_DAY, daysOfWeekArray, groupValues, minutesToFractionalHours, safeCompareEquality, DATE_NOW_VALUE, mapIdentityFunction, UTC_TIMEZONE_STRING, cachedGetter, parseISO8601DayStringToUTCDate, isSameNonNullValue, isConsideredUtcTimezoneString, replaceStringsFunction, repeatString, isEqualDate, startOfDayForUTCDateInUTC, range, pushArrayItemsIntoArray, sumOfIntegersBetween, makeValuesGroupMap, lastValue, sortAscendingIndexNumberRefFunction, indexRangeCheckFunction, asGetter, mergeFilterFunctions, isDate as isDate$2, HOURS_IN_DAY, getNextDay, iterablesAreSetEquivalent, daysOfWeekFromEnabledDays, forEachInIterable, enabledDaysFromDaysOfWeek, addToSet, invertFilter, firstValueFromIterable, HashSet, roundNumberUpToStep, protectedFactory, TimeAM, isLogicalDateStringCode as isLogicalDateStringCode$1, dateFromLogicalDate as dateFromLogicalDate$1, flattenArray, splitJoinRemainder } from '@dereekb/util';
+import { MS_IN_HOUR, MS_IN_MINUTE, MINUTES_IN_DAY, isISO8601DateString, filterMaybeArrayValues, asArray, dayOfWeek, sortNumbersAscendingFunction, MS_IN_SECOND, SORT_VALUE_LESS_THAN, SORT_VALUE_GREATER_THAN, SORT_VALUE_EQUAL, copyArray, compareFnOrder, MS_IN_DAY, daysOfWeekArray, groupValues, minutesToFractionalHours, safeCompareEquality, DATE_NOW_VALUE, mapIdentityFunction, UTC_TIMEZONE_STRING, cachedGetter, parseISO8601DayStringToUTCDate, isConsideredUtcTimezoneString, isSameNonNullValue, replaceStringsFunction, repeatString, isEqualDate, startOfDayForUTCDateInUTC, range, pushArrayItemsIntoArray, sumOfIntegersBetween, makeValuesGroupMap, lastValue, sortAscendingIndexNumberRefFunction, indexRangeCheckFunction, asGetter, mergeFilterFunctions, isDate as isDate$2, HOURS_IN_DAY, getNextDay, iterablesAreSetEquivalent, daysOfWeekFromEnabledDays, forEachInIterable, enabledDaysFromDaysOfWeek, addToSet, invertFilter, firstValueFromIterable, HashSet, roundNumberUpToStep, protectedFactory, TimeAM, isLogicalDateStringCode as isLogicalDateStringCode$1, dateFromLogicalDate as dateFromLogicalDate$1, flattenArray, splitJoinRemainder } from '@dereekb/util';
 export { dateFromDateOrTimeMillisecondsNumber, unixDateTimeSecondsNumberForNow, unixDateTimeSecondsNumberFromDate, unixDateTimeSecondsNumberFromDateOrTimeNumber, unixDateTimeSecondsNumberToDate } from '@dereekb/util';
 import { isEqual, isSameDay, isDate as isDate$1, startOfMinute, isValid, parseISO, min, max, isAfter as isAfter$1, isBefore as isBefore$1, set, addMilliseconds, startOfMonth, endOfWeek, startOfWeek, endOfMonth, addDays, addHours, addMinutes, differenceInDays, startOfDay, addMonths, addWeeks, endOfDay, endOfHour, startOfHour, endOfMinute, differenceInMinutes, differenceInHours, millisecondsToHours, millisecondsToMinutes, formatDistanceStrict, formatDistance, formatDistanceToNow, format as format$1, parse, getMinutes, getSeconds, getMilliseconds, differenceInMilliseconds, setWeek, getWeek, getYear, getDay, isPast, addSeconds } from 'date-fns';
 import { Expose, Type, Exclude } from 'class-transformer';
@@ -1096,8 +1096,10 @@ function isSameDateTimezoneConversionConfig(a, b) {
  * @returns
  */
 function getCurrentSystemOffsetInMs(date) {
-    const systemTimezone = requireCurrentTimezone();
-    return calculateTimezoneOffset(systemTimezone, date);
+    // Use native getTimezoneOffset() instead of calculateTimezoneOffset() to avoid
+    // a DST edge case where toZonedTime() creates an epoch that lands on the system's
+    // DST transition boundary, causing formatDate to return the wrong hour.
+    return -date.getTimezoneOffset() * MS_IN_MINUTE;
 }
 /**
  * Returns the current system time offset in hours.
@@ -1132,24 +1134,32 @@ function getCurrentSystemOffsetInMinutes(date) {
  * @returns
  */
 function calculateTimezoneOffset(timezone, date) {
-    /*
-    // BUG: There is a bug with getTimezoneOffset where the offset is not calculated properly for the first 2 hours after the DST change.
-    // https://github.com/marnusw/date-fns-tz/issues/227
+    let tzOffset;
+    // UTC always has zero offset; skip toZonedTime which can produce wrong results
+    // when the shifted epoch lands on the system's DST transition boundary.
+    if (isConsideredUtcTimezoneString(timezone)) {
+        tzOffset = 0;
+    }
+    else {
+        /*
+        // BUG: There is a bug with getTimezoneOffset where the offset is not calculated properly for the first 2 hours after the DST change.
+        // https://github.com/marnusw/date-fns-tz/issues/227
     
-    const tzOffset = getTimezoneOffset(timezone, date);
-    */
-    /*
-     * WORKAROUND: This is the current workaround. Performance hit seems negligible for all UI use cases.
-     */
-    // inputTimeDate.setSeconds(0);         // NOTE: setting seconds/milliseconds during the daylight savings epoch will also remove an hour
-    // inputTimeDate.setMilliseconds(0);    // do not clear seconds in this way.
-    const inputTimeUnrounded = date.getTime();
-    const secondsAndMs = inputTimeUnrounded % MS_IN_MINUTE; // determine the number of seconds and milliseconds (prepare to round to nearest minute)
-    const inputTime = inputTimeUnrounded - secondsAndMs; // remove seconds and ms as it will throw off the final tzOffset
-    const zoneDate = toZonedTime(inputTime, timezone);
-    const zoneDateStr = format(zoneDate, 'yyyy-MM-dd HH:mm'); // ignore seconds, etc.
-    const zoneDateTime = new Date(zoneDateStr + 'Z').getTime();
-    const tzOffset = zoneDateTime - inputTime;
+        const tzOffset = getTimezoneOffset(timezone, date);
+        */
+        /*
+         * WORKAROUND: This is the current workaround. Performance hit seems negligible for all UI use cases.
+         */
+        // inputTimeDate.setSeconds(0);         // NOTE: setting seconds/milliseconds during the daylight savings epoch will also remove an hour
+        // inputTimeDate.setMilliseconds(0);    // do not clear seconds in this way.
+        const inputTimeUnrounded = date.getTime();
+        const secondsAndMs = inputTimeUnrounded % MS_IN_MINUTE; // determine the number of seconds and milliseconds (prepare to round to nearest minute)
+        const inputTime = inputTimeUnrounded - secondsAndMs; // remove seconds and ms as it will throw off the final tzOffset
+        const zoneDate = toZonedTime(inputTime, timezone);
+        const zoneDateStr = format(zoneDate, 'yyyy-MM-dd HH:mm'); // ignore seconds, etc.
+        const zoneDateTime = new Date(zoneDateStr + 'Z').getTime();
+        tzOffset = zoneDateTime - inputTime;
+    }
     return tzOffset;
 }
 function calculateAllConversions(date, converter, map = ((x) => x)) {
@@ -2302,7 +2312,9 @@ function dateCellTimingEventRange(timing) {
  * @returns
  */
 function getDateCellTimingFirstEventDateRange(timing) {
-    return fitDateRangeToDayPeriod({ start: timing.startsAt, end: timing.end }, timing.timezone);
+    const duration = calculateExpectedDateCellTimingDuration(timing);
+    const end = addMinutes(timing.startsAt, duration);
+    return { start: timing.startsAt, end };
 }
 /**
  * Returns the number of hours in a DateCellTiming's duration.

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dereekb/date",
-  "version": "13.0.5",
+  "version": "13.0.7",
   "peerDependencies": {
-    "@dereekb/rxjs": "13.0.5",
-    "@dereekb/util": "13.0.5",
+    "@dereekb/rxjs": "13.0.7",
+    "@dereekb/util": "13.0.7",
     "@vvo/tzdb": "^6.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.15.1",
@@ -14,7 +14,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@dereekb/rxjs": "13.0.5"
+    "@dereekb/rxjs": "13.0.7"
   },
   "exports": {
     "./package.json": "./package.json",