npm - @formatjs/intl-datetimeformat - Versions diffs - 7.2.3 → 7.2.4 - Mend

@formatjs/intl-datetimeformat 7.2.3 → 7.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (132) hide show

package/locale-data/smn.js CHANGED Viewed

@@ -2100,7 +2100,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
       "gregory"
     ],
     "hc": [
-      "h23"
+      "h23",
+      "h12"
     ]
   },
   "locale": "smn"

package/locale-data/su-Latn.js CHANGED Viewed

@@ -3079,7 +3079,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
       "islamic-tbla"
     ],
     "hc": [
-      "h23"
+      "h23",
+      "h12"
     ]
   },
   "locale": "su-Latn"

package/locale-data/su.js CHANGED Viewed

@@ -3079,7 +3079,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
       "islamic-tbla"
     ],
     "hc": [
-      "h23"
+      "h23",
+      "h12"
     ]
   },
   "locale": "su"

package/locale-data/sv-AX.js CHANGED Viewed

@@ -5146,7 +5146,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
       "gregory"
     ],
     "hc": [
-      "h23"
+      "h23",
+      "h12"
     ]
   },
   "locale": "sv-AX"

package/locale-data/sv-FI.js CHANGED Viewed

@@ -5212,7 +5212,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
       "gregory"
     ],
     "hc": [
-      "h23"
+      "h23",
+      "h12"
     ]
   },
   "locale": "sv-FI"

package/locale-data/sv.js CHANGED Viewed

@@ -5212,7 +5212,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
       "gregory"
     ],
     "hc": [
-      "h23"
+      "h23",
+      "h12"
     ]
   },
   "locale": "sv"

package/locale-data/sw-CD.js CHANGED Viewed

@@ -4537,7 +4537,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
     ],
     "hc": [
       "",
-      "h23"
+      "h23",
+      "h12"
     ]
   },
   "locale": "sw-CD"

package/locale-data/tr.js CHANGED Viewed

@@ -4655,7 +4655,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
     ],
     "hc": [
       "h23",
-      ""
+      "",
+      "h12"
     ]
   },
   "locale": "tr"

package/locale-data/tt.js CHANGED Viewed

@@ -4486,7 +4486,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
       "gregory"
     ],
     "hc": [
-      "h23"
+      "h23",
+      "h12"
     ]
   },
   "locale": "tt"

package/locale-data/twq.js CHANGED Viewed

@@ -2103,7 +2103,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
       "islamic-tbla"
     ],
     "hc": [
-      "h23"
+      "h23",
+      "h12"
     ]
   },
   "locale": "twq"

package/locale-data/yo-BJ.js CHANGED Viewed

@@ -4501,7 +4501,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
     ],
     "hc": [
       "h23",
-      ""
+      "",
+      "h12"
     ]
   },
   "locale": "yo-BJ"

package/locale-data/yrl.js CHANGED Viewed

@@ -4803,7 +4803,8 @@ if (Intl.DateTimeFormat && typeof Intl.DateTimeFormat.__addLocaleData === 'funct
     ],
     "hc": [
       "h23",
-      ""
+      "",
+      "h12"
     ]
   },
   "locale": "yrl"

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@formatjs/intl-datetimeformat",
   "description": "Intl.DateTimeFormat polyfill",
-  "version": "7.2.3",
+  "version": "7.2.4",
   "license": "MIT",
   "author": "Long Ho <holevietlong@gmail.com>",
   "type": "module",
@@ -18,8 +18,8 @@
   "dependencies": {
     "decimal.js": "^10.6.0",
     "tslib": "^2.8.1",
-    "@formatjs/intl-localematcher": "0.8.1",
-    "@formatjs/ecma402-abstract": "3.1.1"
+    "@formatjs/ecma402-abstract": "3.1.1",
+    "@formatjs/intl-localematcher": "0.8.1"
   },
   "devDependencies": {
     "@formatjs/intl-getcanonicallocales": "3.2.1",

package/polyfill.iife.js CHANGED Viewed

@@ -8493,6 +8493,18 @@
   DateTimeFormat.relevantExtensionKeys = ["nu", "ca", "hc"];
   DateTimeFormat.__defaultTimeZone = DEFAULT_TIMEZONE;
   DateTimeFormat.getDefaultTimeZone = () => DateTimeFormat.__defaultTimeZone;
+  function findIntervalFormat(skeleton, intervalFormats) {
+    const commaIdx = skeleton.indexOf(", ");
+    if (commaIdx === -1)
+      return void 0;
+    const datePart = skeleton.slice(0, commaIdx);
+    const timePart = skeleton.slice(commaIdx + 2);
+    const canonical = timePart.replace(/[^a-zA-Z]/g, "").replace(/[abB]/g, "").replace(/(.)\1+/g, "$1");
+    if (canonical === timePart)
+      return void 0;
+    const canonicalKey = `${datePart}, ${canonical}`;
+    return intervalFormats[canonicalKey];
+  }
   DateTimeFormat.__addLocaleData = function __addLocaleData(...data2) {
     for (const { data: d, locale } of data2) {
       const _a = d, {
@@ -8535,7 +8547,7 @@
           (skeleton) => parseDateTimeSkeleton(
             skeleton,
             formats[calendar][skeleton],
-            intervalFormats[skeleton],
+            intervalFormats[skeleton] || findIntervalFormat(skeleton, intervalFormats),
             intervalFormats.intervalFormatFallback
           )
         );

package/src/core.js CHANGED Viewed

@@ -198,6 +198,25 @@ DateTimeFormat.relevantExtensionKeys = [
 ];
 DateTimeFormat.__defaultTimeZone = DEFAULT_TIMEZONE;
 DateTimeFormat.getDefaultTimeZone = () => DateTimeFormat.__defaultTimeZone;
+/**
+* GH #4535: When a format skeleton uses raw pattern form (e.g., "MMMEd, h:mm a")
+* instead of canonical form (e.g., "MMMEd, hm"), interval formats won't match
+* by exact key. This function finds the matching canonical interval format by
+* normalizing the time portion of the skeleton.
+*/
+function findIntervalFormat(skeleton, intervalFormats) {
+	const commaIdx = skeleton.indexOf(", ");
+	if (commaIdx === -1) return undefined;
+	const datePart = skeleton.slice(0, commaIdx);
+	const timePart = skeleton.slice(commaIdx + 2);
+	// Canonicalize the time part: strip non-skeleton chars (colons, spaces),
+	// remove AM/PM markers (a/b/B are implied by h/K hour symbols),
+	// and collapse repeated field chars (hh→h, mm→m, ss→s)
+	const canonical = timePart.replace(/[^a-zA-Z]/g, "").replace(/[abB]/g, "").replace(/(.)\1+/g, "$1");
+	if (canonical === timePart) return undefined;
+	const canonicalKey = `${datePart}, ${canonical}`;
+	return intervalFormats[canonicalKey];
+}
 DateTimeFormat.__addLocaleData = function __addLocaleData(...data) {
 	for (const { data: d, locale } of data) {
 		const { dateFormat, timeFormat, dateTimeFormat, formats, intervalFormats, ...rawData } = d;
@@ -225,7 +244,7 @@ DateTimeFormat.__addLocaleData = function __addLocaleData(...data) {
 			formats: {}
 		};
 		for (const calendar in formats) {
-			processedData.formats[calendar] = Object.keys(formats[calendar]).map((skeleton) => parseDateTimeSkeleton(skeleton, formats[calendar][skeleton], intervalFormats[skeleton], intervalFormats.intervalFormatFallback));
+			processedData.formats[calendar] = Object.keys(formats[calendar]).map((skeleton) => parseDateTimeSkeleton(skeleton, formats[calendar][skeleton], intervalFormats[skeleton] || findIntervalFormat(skeleton, intervalFormats), intervalFormats.intervalFormatFallback));
 		}
 		const minimizedLocale = new Intl.Locale(locale).minimize().toString();
 		DateTimeFormat.localeData[locale] = DateTimeFormat.localeData[minimizedLocale] = processedData;

package/test262-main.js CHANGED Viewed

@@ -5427,7 +5427,11 @@ Intl.DateTimeFormat.__addLocaleData({
 		hourCycle: "h23",
 		nu: ["latn"],
 		ca: ["gregory"],
-		hc: ["h23", ""]
+		hc: [
+			"h23",
+			"",
+			"h12"
+		]
 	},
 	locale: "de"
 }, {