@formatjs/intl-displaynames 8.0.0 → 8.0.2

package/locale-data/zu.js

@@ -4,7 +4,8 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
   Intl.DisplayNames.__addLocaleData({
   "data": {
     "patterns": {
-      "locale": "{0} ({1})"
+      "locale": "{0} ({1})",
+      "separator": "{0}, {1}"
     },
     "types": {
       "calendar": {
@@ -835,20 +836,12 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "eka": "isi-Ekajuk",
             "el": "isi-Greek",
             "en": "i-English",
-            "en-AU": "i-English (i-Australia)",
-            "en-CA": "i-English (i-Canada)",
-            "en-GB": "i-English (i-United Kingdom)",
-            "en-US": "i-English (i-United States)",
             "eo": "isi-Esperanto",
             "es": "isi-Spanish",
-            "es-419": "isi-Spanish (i-Latin America)",
-            "es-ES": "isi-Spanish (i-Spain)",
-            "es-MX": "isi-Spanish (i-Mexico)",
             "et": "isi-Estonia",
             "eu": "isi-Basque",
             "ewo": "isi-Ewondo",
             "fa": "isi-Persian",
-            "fa-AF": "isi-Persian (i-Afghanistan)",
             "ff": "isi-Fulah",
             "fi": "isi-Finnish",
             "fil": "isi-Filipino",
@@ -856,8 +849,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "fo": "isi-Faroese",
             "fon": "isi-Fon",
             "fr": "isi-French",
-            "fr-CA": "isi-French (i-Canada)",
-            "fr-CH": "isi-French (i-Switzerland)",
             "frc": "isi-Cajun French",
             "frr": "isi-Northern Frisian",
             "fur": "isi-Friulian",
@@ -950,8 +941,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "ksf": "isi-Bafia",
             "ksh": "isi-Colognian",
             "ku": "isi-Kurdish",
-            "ku-menu-core": "isiKurdish",
-            "ku-menu-extension": "isiKurmanji",
             "kum": "isi-Kumyk",
             "kv": "isi-Komi",
             "kw": "isi-Cornish",
@@ -1023,14 +1012,12 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "nb": "isi-Norwegian Bokmål",
             "nd": "isi-North Ndebele",
             "nds": "isi-Low German",
-            "nds-NL": "isi-Low German (i-Netherlands)",
             "ne": "isi-Nepali",
             "new": "isi-Newari",
             "ng": "isi-Ndonga",
             "nia": "isi-Nias",
             "niu": "isi-Niuean",
             "nl": "isi-Dutch",
-            "nl-BE": "isi-Dutch (i-Belgium)",
             "nmg": "isi-Kwasio",
             "nn": "isi-Norwegian Nynorsk",
             "nnh": "isi-Ngiemboon",
@@ -1065,8 +1052,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "prg": "isi-Prussian",
             "ps": "isi-Pashto",
             "pt": "isi-Portuguese",
-            "pt-BR": "isi-Portuguese (i-Brazil)",
-            "pt-PT": "isi-Portuguese (i-Portugal)",
             "qu": "isi-Quechua",
             "quc": "isi-Kʼicheʼ",
             "raj": "isi-Rajasthani",
@@ -1076,7 +1061,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "rm": "isi-Romansh",
             "rn": "isi-Rundi",
             "ro": "isi-Romanian",
-            "ro-MD": "isi-Romanian (i-Moldova)",
             "rof": "isi-Rombo",
             "ru": "isi-Russian",
             "rup": "isi-Aromanian",
@@ -1124,7 +1108,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "suk": "isi-Sukuma",
             "sv": "isi-Swedish",
             "sw": "isiSwahili",
-            "sw-CD": "isiSwahili (i-Congo - Kinshasa)",
             "swb": "isi-Comorian",
             "syr": "isi-Syriac",
             "szl": "iSilesian",
@@ -1193,7 +1176,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "za": "isiZhuang",
             "zgh": "isi-Moroccan Tamazight esivamile",
             "zh": "isi-Chinese",
-            "zh-Hans": "isi-Chinese (esenziwe-lula)",
             "zu": "isiZulu",
             "zun": "isi-Zuni",
             "zxx": "akukho okuqukethwe kolimi",
@@ -1202,9 +1184,7 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
           "narrow": {
           },
           "short": {
-            "az": "isi-Azeria",
-            "en-GB": "i-English (i-U.K.)",
-            "en-US": "i-English (i-U.S)"
+            "az": "isi-Azeria"
           }
         }
       },
@@ -1702,7 +1682,8 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
   (globalThis.__FORMATJS_DISPLAYNAMES_DATA__ = globalThis.__FORMATJS_DISPLAYNAMES_DATA__ || []).push({
   "data": {
     "patterns": {
-      "locale": "{0} ({1})"
+      "locale": "{0} ({1})",
+      "separator": "{0}, {1}"
     },
     "types": {
       "calendar": {
@@ -2533,20 +2514,12 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "eka": "isi-Ekajuk",
             "el": "isi-Greek",
             "en": "i-English",
-            "en-AU": "i-English (i-Australia)",
-            "en-CA": "i-English (i-Canada)",
-            "en-GB": "i-English (i-United Kingdom)",
-            "en-US": "i-English (i-United States)",
             "eo": "isi-Esperanto",
             "es": "isi-Spanish",
-            "es-419": "isi-Spanish (i-Latin America)",
-            "es-ES": "isi-Spanish (i-Spain)",
-            "es-MX": "isi-Spanish (i-Mexico)",
             "et": "isi-Estonia",
             "eu": "isi-Basque",
             "ewo": "isi-Ewondo",
             "fa": "isi-Persian",
-            "fa-AF": "isi-Persian (i-Afghanistan)",
             "ff": "isi-Fulah",
             "fi": "isi-Finnish",
             "fil": "isi-Filipino",
@@ -2554,8 +2527,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "fo": "isi-Faroese",
             "fon": "isi-Fon",
             "fr": "isi-French",
-            "fr-CA": "isi-French (i-Canada)",
-            "fr-CH": "isi-French (i-Switzerland)",
             "frc": "isi-Cajun French",
             "frr": "isi-Northern Frisian",
             "fur": "isi-Friulian",
@@ -2648,8 +2619,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "ksf": "isi-Bafia",
             "ksh": "isi-Colognian",
             "ku": "isi-Kurdish",
-            "ku-menu-core": "isiKurdish",
-            "ku-menu-extension": "isiKurmanji",
             "kum": "isi-Kumyk",
             "kv": "isi-Komi",
             "kw": "isi-Cornish",
@@ -2721,14 +2690,12 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "nb": "isi-Norwegian Bokmål",
             "nd": "isi-North Ndebele",
             "nds": "isi-Low German",
-            "nds-NL": "isi-Low German (i-Netherlands)",
             "ne": "isi-Nepali",
             "new": "isi-Newari",
             "ng": "isi-Ndonga",
             "nia": "isi-Nias",
             "niu": "isi-Niuean",
             "nl": "isi-Dutch",
-            "nl-BE": "isi-Dutch (i-Belgium)",
             "nmg": "isi-Kwasio",
             "nn": "isi-Norwegian Nynorsk",
             "nnh": "isi-Ngiemboon",
@@ -2763,8 +2730,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "prg": "isi-Prussian",
             "ps": "isi-Pashto",
             "pt": "isi-Portuguese",
-            "pt-BR": "isi-Portuguese (i-Brazil)",
-            "pt-PT": "isi-Portuguese (i-Portugal)",
             "qu": "isi-Quechua",
             "quc": "isi-Kʼicheʼ",
             "raj": "isi-Rajasthani",
@@ -2774,7 +2739,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "rm": "isi-Romansh",
             "rn": "isi-Rundi",
             "ro": "isi-Romanian",
-            "ro-MD": "isi-Romanian (i-Moldova)",
             "rof": "isi-Rombo",
             "ru": "isi-Russian",
             "rup": "isi-Aromanian",
@@ -2822,7 +2786,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "suk": "isi-Sukuma",
             "sv": "isi-Swedish",
             "sw": "isiSwahili",
-            "sw-CD": "isiSwahili (i-Congo - Kinshasa)",
             "swb": "isi-Comorian",
             "syr": "isi-Syriac",
             "szl": "iSilesian",
@@ -2891,7 +2854,6 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
             "za": "isiZhuang",
             "zgh": "isi-Moroccan Tamazight esivamile",
             "zh": "isi-Chinese",
-            "zh-Hans": "isi-Chinese (esenziwe-lula)",
             "zu": "isiZulu",
             "zun": "isi-Zuni",
             "zxx": "akukho okuqukethwe kolimi",
@@ -2900,9 +2862,7 @@ if (Intl.DisplayNames && typeof Intl.DisplayNames.__addLocaleData === 'function'
           "narrow": {
           },
           "short": {
-            "az": "isi-Azeria",
-            "en-GB": "i-English (i-U.K.)",
-            "en-US": "i-English (i-U.S)"
+            "az": "isi-Azeria"
           }
         }
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-displaynames",
-  "version": "8.0.0",
+  "version": "8.0.2",
   "description": "Polyfill for: https://tc39.es/proposal-intl-displaynames",
   "keywords": [
     "Intl",
@@ -20,6 +20,12 @@
     "url": "formatjs/formatjs.git"
   },
   "type": "module",
+  "sideEffects": [
+    "./polyfill.js",
+    "./polyfill-force.js",
+    "./polyfill.iife.js",
+    "./locale-data/*.js"
+  ],
   "types": "index.d.ts",
   "exports": {
     ".": "./index.js",
@@ -30,6 +36,6 @@
     "./should-polyfill.js": "./should-polyfill.js"
   },
   "dependencies": {
-    "@formatjs/intl-localematcher": "0.10.0"
+    "@formatjs/intl-localematcher": "0.10.1"
   }
 }

package/polyfill-force.js

@@ -681,20 +681,43 @@ function checkReceiver(receiver, methodName) {
 }
 function getNameForTypeLanguage(languageDisplay, localeData, style, canonicalCode, fallback) {
 	const typesData = localeData.types.language[languageDisplay];
-	const name = typesData[style][canonicalCode] || typesData.long[canonicalCode];
-	if (name === void 0) {
-		const regionMatch = /-([a-z]{2}|\d{3})\b/i.exec(canonicalCode);
-		if (regionMatch) {
-			const languageSubTag = canonicalCode.substring(0, regionMatch.index) + canonicalCode.substring(regionMatch.index + regionMatch[0].length);
-			const regionSubTag = regionMatch[1];
-			const name = typesData[style][languageSubTag] || typesData.long[languageSubTag];
-			if (name !== void 0 && regionSubTag) {
-				const regionsData = localeData.types.region;
-				const regionDisplayName = regionsData[style][regionSubTag] || regionsData.long[regionSubTag];
-				if (regionDisplayName || fallback === "code") return localeData.patterns.locale.replace("{0}", name).replace("{1}", regionDisplayName || regionSubTag);
-			} else return name;
+	const languageName = (code) => typesData[style][code] || typesData.long[code];
+	const exact = languageName(canonicalCode);
+	if (exact !== void 0) return exact;
+	const parts = canonicalCode.split("-");
+	const scriptIndex = /^[A-Z][a-z]{3}$/.test(parts[1] || "") ? 1 : -1;
+	const regionIndex = parts.findIndex((part, index) => index > 0 && /^(?:[A-Z]{2}|[0-9]{3})$/.test(part));
+	let script = parts[scriptIndex];
+	let region = parts[regionIndex];
+	let name;
+	if (languageDisplay === "dialect") {
+		if (script && region) {
+			name = languageName(parts.filter((_, index) => index !== regionIndex).join("-"));
+			if (name !== void 0) script = void 0;
+			else {
+				name = languageName(parts.filter((_, index) => index !== scriptIndex).join("-"));
+				if (name !== void 0) region = void 0;
+			}
 		}
-	} else return name;
+	}
+	name ??= languageName(parts.filter((_, index) => index !== scriptIndex && index !== regionIndex).join("-"));
+	if (name === void 0 || !script && !region) return void 0;
+	const qualifiers = [];
+	for (const [code, names] of [[script, localeData.types.script], [region, localeData.types.region]]) {
+		if (!code) continue;
+		const display = names[style][code] || names.long[code];
+		if (!display && fallback === "none") return void 0;
+		qualifiers.push(display || code);
+	}
+	const pattern = localeData.patterns.locale;
+	const nested = (value) => value.replace(/[()（）]/g, (bracket) => {
+		if (pattern.includes("(") && (bracket === "(" || bracket === ")")) return bracket === "(" ? "[" : "]";
+		if (pattern.includes("（") && (bracket === "（" || bracket === "）")) return bracket === "（" ? "［" : "］";
+		return bracket;
+	});
+	const substitute = (format, first, second) => format.replace(/\{([01])\}/g, (_, index) => index === "0" ? first : second);
+	const qualifier = qualifiers.map(nested).reduce((first, second) => substitute(localeData.patterns.separator ?? "{0}, {1}", first, second));
+	return substitute(pattern, nested(name), qualifier);
 }
 defineProperty(ensureIntl(), "DisplayNames", { value: DisplayNames });
 const buf = globalThis.__FORMATJS_DISPLAYNAMES_DATA__;