@formatjs/intl-datetimeformat 7.2.0 → 7.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formatjs/intl-datetimeformat",
   "description": "Intl.DateTimeFormat polyfill",
-  "version": "7.2.0",
+  "version": "7.2.1",
   "license": "MIT",
   "author": "Long Ho <holevietlong@gmail.com>",
   "type": "module",
@@ -18,12 +18,12 @@
   "dependencies": {
     "decimal.js": "^10.6.0",
     "tslib": "^2.8.1",
-    "@formatjs/ecma402-abstract": "3.1.0",
-    "@formatjs/intl-localematcher": "0.8.0"
+    "@formatjs/ecma402-abstract": "3.1.1",
+    "@formatjs/intl-localematcher": "0.8.1"
   },
   "devDependencies": {
-    "@formatjs/intl-getcanonicallocales": "3.2.0",
-    "@formatjs/intl-locale": "5.2.0"
+    "@formatjs/intl-getcanonicallocales": "3.2.1",
+    "@formatjs/intl-locale": "5.2.1"
   },
   "bugs": "https://github.com/formatjs/formatjs/issues",
   "homepage": "https://github.com/formatjs/formatjs#readme",

package/polyfill.iife.js

@@ -6816,7 +6816,8 @@
     getInternalSlots: getInternalSlots2,
     localeData,
     getDefaultTimeZone,
-    tzData
+    tzData,
+    rangeFormatOptions
   }) {
     x = TimeClip(x);
     const internalSlots = getInternalSlots2(dtf);
@@ -6913,7 +6914,7 @@
           }
         }
         if (p === "hour" && hourCycle === "h24") {
-          if (v === 0) {
+          if (v === 0 && !(rangeFormatOptions == null ? void 0 : rangeFormatOptions.isDifferentDate)) {
             v = 24;
           }
         }
@@ -7040,6 +7041,7 @@
     let rangePattern;
     let dateFieldsPracticallyEqual = true;
     let patternContainsLargerDateField = false;
+    let firstDifferingField;
     for (const fieldName of TABLE_2_FIELDS) {
       if (dateFieldsPracticallyEqual && !patternContainsLargerDateField) {
         let rp = fieldName in rangePatterns ? rangePatterns[fieldName] : void 0;
@@ -7052,6 +7054,7 @@
             let v2 = tm2.hour;
             if (v1 > 11 && v2 < 11 || v1 < 11 && v2 > 11) {
               dateFieldsPracticallyEqual = false;
+              firstDifferingField = fieldName;
             }
           } else if (fieldName === "dayPeriod") {
           } else if (fieldName === "fractionalSecondDigits") {
@@ -7067,12 +7070,14 @@
             );
             if (!SameValue(v1, v2)) {
               dateFieldsPracticallyEqual = false;
+              firstDifferingField = fieldName;
             }
           } else {
             let v1 = tm1[fieldName];
             let v2 = tm2[fieldName];
             if (!SameValue(v1, v2)) {
               dateFieldsPracticallyEqual = false;
+              firstDifferingField = fieldName;
             }
           }
         }
@@ -7090,6 +7095,10 @@
       }
       return result2;
     }
+    if (rangePattern === void 0 && firstDifferingField === "ampm") {
+      rangePattern = "hour" in rangePatterns ? rangePatterns["hour"] : void 0;
+    }
+    const datesDiffer = tm1.year !== tm2.year || tm1.month !== tm2.month || tm1.day !== tm2.day;
     let result = [];
     if (rangePattern === void 0) {
       rangePattern = rangePatterns.default;
@@ -7125,7 +7134,9 @@
         z = y;
       }
       const patternParts = PartitionPattern(pattern2);
-      let partResult = FormatDateTimePattern(dtf, patternParts, z, implDetails);
+      let partResult = FormatDateTimePattern(dtf, patternParts, z, __spreadProps(__spreadValues({}, implDetails), {
+        rangeFormatOptions: { isDifferentDate: datesDiffer }
+      }));
       for (const r of partResult) {
         r.source = source;
       }

package/src/abstract/FormatDateTimePattern.d.ts

@@ -5,10 +5,13 @@ export interface FormatDateTimePatternImplDetails {
 	getInternalSlots(dtf: Intl.DateTimeFormat | DateTimeFormat): IntlDateTimeFormatInternal;
 	localeData: Record<string, DateTimeFormatLocaleInternalData>;
 	getDefaultTimeZone(): string;
+	rangeFormatOptions?: {
+		isDifferentDate?: boolean;
+	};
 }
 /**
 * https://tc39.es/ecma402/#sec-partitiondatetimepattern
 * @param dtf
 * @param x
 */
-export declare function FormatDateTimePattern(dtf: Intl.DateTimeFormat | DateTimeFormat, patternParts: IntlDateTimeFormatPart[], x: Decimal, { getInternalSlots, localeData, getDefaultTimeZone, tzData }: FormatDateTimePatternImplDetails & ToLocalTimeImplDetails): IntlDateTimeFormatPart[];
+export declare function FormatDateTimePattern(dtf: Intl.DateTimeFormat | DateTimeFormat, patternParts: IntlDateTimeFormatPart[], x: Decimal, { getInternalSlots, localeData, getDefaultTimeZone, tzData, rangeFormatOptions }: FormatDateTimePatternImplDetails & ToLocalTimeImplDetails): IntlDateTimeFormatPart[];

package/src/abstract/FormatDateTimePattern.js

@@ -30,7 +30,7 @@ function offsetToGmtString(gmtFormat, hourFormat, offsetInMs, style) {
 * @param dtf
 * @param x
 */
-export function FormatDateTimePattern(dtf, patternParts, x, { getInternalSlots, localeData, getDefaultTimeZone, tzData }) {
+export function FormatDateTimePattern(dtf, patternParts, x, { getInternalSlots, localeData, getDefaultTimeZone, tzData, rangeFormatOptions }) {
 	x = TimeClip(x);
 	/** IMPL START */
 	const internalSlots = getInternalSlots(dtf);
@@ -130,8 +130,21 @@ export function FormatDateTimePattern(dtf, patternParts, x, { getInternalSlots,
 					v = 12;
 				}
 			}
+			// GH #4535: In h24 format, midnight is typically shown as 24:00 (end of day).
+			// However, in date ranges where dates differ (e.g., "May 3, 22:00 – May 4, 00:00"),
+			// showing "May 4, 24:00" is semantically incorrect because 24:00 of May 4 would
+			// actually be May 5, 00:00. In this case, keep midnight as 00:00 for clarity.
+			//
+			// LDML Spec (UTS #35): "Tuesday 24:00 = Wednesday 00:00" - they represent the same
+			// instant. The 'k' symbol (1-24) means 24:00 represents the END of day, not the start.
+			// See: https://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table
+			//
+			// Note: ICU4J's SimpleDateFormat always converts 0→24 for 'k' pattern without this
+			// range-aware check. Our fix is more semantically correct for date range formatting.
+			// See: https://github.com/unicode-org/icu/blob/main/icu4j/main/core/src/main/java/com/ibm/icu/text/SimpleDateFormat.java
 			if (p === "hour" && hourCycle === "h24") {
-				if (v === 0) {
+				if (v === 0 && !rangeFormatOptions?.isDifferentDate) {
+					// Only convert 0 to 24 when NOT in a range with different dates
 					v = 24;
 				}
 			}

package/src/abstract/PartitionDateTimeRangePattern.js

@@ -46,6 +46,8 @@ export function PartitionDateTimeRangePattern(dtf, x, y, implDetails) {
 	let rangePattern;
 	let dateFieldsPracticallyEqual = true;
 	let patternContainsLargerDateField = false;
+	// Track the first field that differs between the two dates
+	let firstDifferingField;
 	for (const fieldName of TABLE_2_FIELDS) {
 		if (dateFieldsPracticallyEqual && !patternContainsLargerDateField) {
 			let rp = fieldName in rangePatterns ? rangePatterns[fieldName] : undefined;
@@ -58,6 +60,7 @@ export function PartitionDateTimeRangePattern(dtf, x, y, implDetails) {
 					let v2 = tm2.hour;
 					if (v1 > 11 && v2 < 11 || v1 < 11 && v2 > 11) {
 						dateFieldsPracticallyEqual = false;
+						firstDifferingField = fieldName;
 					}
 				} else if (fieldName === "dayPeriod") {} else if (fieldName === "fractionalSecondDigits") {
 					let fractionalSecondDigits = internalSlots.fractionalSecondDigits;
@@ -68,12 +71,14 @@ export function PartitionDateTimeRangePattern(dtf, x, y, implDetails) {
 					let v2 = Math.floor(tm2.millisecond * 10 ** (fractionalSecondDigits - 3));
 					if (!SameValue(v1, v2)) {
 						dateFieldsPracticallyEqual = false;
+						firstDifferingField = fieldName;
 					}
 				} else {
 					let v1 = tm1[fieldName];
 					let v2 = tm2[fieldName];
 					if (!SameValue(v1, v2)) {
 						dateFieldsPracticallyEqual = false;
+						firstDifferingField = fieldName;
 					}
 				}
 			}
@@ -86,6 +91,25 @@ export function PartitionDateTimeRangePattern(dtf, x, y, implDetails) {
 		}
 		return result;
 	}
+	// GH #4535: ICU4J-style AM_PM → HOUR fallback.
+	// When AM_PM differs but no AM_PM pattern exists, try the HOUR pattern.
+	// This handles cases where CLDR provides 'H' (24-hour) patterns but not 'h' (12-hour),
+	// or the skeleton uses hour12:true but CLDR only has 24-hour interval patterns.
+	//
+	// ICU4J DateIntervalFormat.java genIntervalPattern() method (~line 1825):
+	//   // for 24 hour system, interval patterns in resource file
+	//   // might not include pattern when am_pm differ,
+	//   // which should be the same as hour differ.
+	//   if (field == Calendar.AM_PM) {
+	//       pattern = fInfo.getIntervalPattern(bestSkeleton, Calendar.HOUR);
+	//   }
+	// See: https://github.com/unicode-org/icu/blob/main/icu4j/main/core/src/main/java/com/ibm/icu/text/DateIntervalFormat.java#L2018
+	// LDML Spec: https://unicode.org/reports/tr35/tr35-dates.html#intervalFormats
+	if (rangePattern === undefined && firstDifferingField === "ampm") {
+		rangePattern = "hour" in rangePatterns ? rangePatterns["hour"] : undefined;
+	}
+	// GH #4535: Check if dates (year/month/day) differ for h24 midnight handling
+	const datesDiffer = tm1.year !== tm2.year || tm1.month !== tm2.month || tm1.day !== tm2.day;
 	let result = [];
 	if (rangePattern === undefined) {
 		rangePattern = rangePatterns.default;
@@ -161,7 +185,10 @@ export function PartitionDateTimeRangePattern(dtf, x, y, implDetails) {
 			z = y;
 		}
 		const patternParts = PartitionPattern(pattern);
-		let partResult = FormatDateTimePattern(dtf, patternParts, z, implDetails);
+		let partResult = FormatDateTimePattern(dtf, patternParts, z, {
+			...implDetails,
+			rangeFormatOptions: { isDifferentDate: datesDiffer }
+		});
 		for (const r of partResult) {
 			r.source = source;
 		}

package/src/packer.d.ts

@@ -1,4 +1,4 @@
-import { type UnpackedData, type PackedData } from "./types.js";
+import { type UnpackedData, type PackedData } from "./types.ts";
 import { type UnpackedZoneData } from "@formatjs/ecma402-abstract";
 export declare function pack(data: UnpackedData): PackedData;
 export declare function unpack(data: PackedData): Record<string, UnpackedZoneData[]>;