@formatjs/intl-locale 5.3.9 → 5.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-locale",
-  "version": "5.3.9",
+  "version": "5.3.11",
   "description": "Intl.Locale polyfill",
   "keywords": [
     "ecma402",
@@ -15,7 +15,10 @@
   "bugs": "https://github.com/formatjs/formatjs/issues",
   "license": "MIT",
   "author": "Long Ho <holevietlong@gmail.com>",
-  "repository": "formatjs/formatjs.git",
+  "repository": {
+    "type": "git",
+    "url": "formatjs/formatjs.git"
+  },
   "type": "module",
   "types": "index.d.ts",
   "exports": {
@@ -25,7 +28,7 @@
     "./should-polyfill.js": "./should-polyfill.js"
   },
   "dependencies": {
-    "@formatjs/intl-getcanonicallocales": "3.2.10",
-    "@formatjs/intl-supportedvaluesof": "2.3.8"
+    "@formatjs/intl-getcanonicallocales": "3.2.12",
+    "@formatjs/intl-supportedvaluesof": "2.3.10"
   }
 }

package/polyfill-force.d.ts

@@ -1 +1 @@
-export { };
+export {}

package/polyfill-force.js

@@ -1,5 +1,20 @@
 import { supportedValuesOf } from "@formatjs/intl-supportedvaluesof";
-import { emitUnicodeLanguageId, emitUnicodeLocaleId, isStructurallyValidLanguageTag, isUnicodeLanguageSubtag, isUnicodeRegionSubtag, isUnicodeScriptSubtag, likelySubtags, parseUnicodeLanguageId, parseUnicodeLocaleId } from "@formatjs/intl-getcanonicallocales";
+import { emitUnicodeLanguageId, emitUnicodeLocaleId, isStructurallyValidLanguageTag, isUnicodeLanguageSubtag, isUnicodeRegionSubtag, isUnicodeScriptSubtag, isUnicodeVariantSubtag, likelySubtags, parseUnicodeLanguageId, parseUnicodeLocaleId } from "@formatjs/intl-getcanonicallocales";
+//#region packages/ecma262-abstract/ToString.js
+/**
+* https://tc39.es/ecma262/#sec-tostring
+*/
+function ToString(o) {
+	if (typeof o === "symbol") throw TypeError("Cannot convert a Symbol value to a string");
+	return String(o);
+}
+//#endregion
+//#region packages/ecma402-abstract/IsUnicodeLocaleIdentifierType.js
+/** Tests the Unicode locale identifier `type` grammar, not locale support. */
+function IsUnicodeLocaleIdentifierType(value) {
+	return /^[a-z0-9]{3,8}(-[a-z0-9]{3,8})*(?![\s\S])/i.test(value);
+}
+//#endregion
 //#region packages/ecma262-abstract/HasOwnProperty.js
 /**
 * https://www.ecma-international.org/ecma-262/11.0/index.html#sec-hasownproperty
@@ -38,15 +53,6 @@ function CoerceOptionsToObject(options) {
 	return ToObject(options);
 }
 //#endregion
-//#region packages/ecma262-abstract/ToString.js
-/**
-* https://tc39.es/ecma262/#sec-tostring
-*/
-function ToString(o) {
-	if (typeof o === "symbol") throw TypeError("Cannot convert a Symbol value to a string");
-	return String(o);
-}
-//#endregion
 //#region packages/ecma402-abstract/GetOption.js
 /**
 * https://tc39.es/ecma402/#sec-getoption
@@ -57,7 +63,7 @@ function ToString(o) {
 * @param fallback
 */
 function GetOption(opts, prop, type, values, fallback) {
-	if (typeof opts !== "object") throw new TypeError("Options must be an object");
+	if (opts === null || typeof opts !== "object" && typeof opts !== "function") throw new TypeError("Options must be an object");
 	let value = opts[prop];
 	if (value !== void 0) {
 		if (type !== "boolean" && type !== "string") throw new TypeError("invalid type");
@@ -946,9 +952,13 @@ const characterOrders = {
 //#endregion
 //#region packages/intl-locale/get_internal_slots.ts
 const internalSlotMap = /* @__PURE__ */ new WeakMap();
-function getInternalSlots(x, internalSlotsList = []) {
+function getInternalSlotsIfPresent(x) {
+	return internalSlotMap.get(x);
+}
+function getInternalSlots(x, internalSlotsList) {
 	let internalSlots = internalSlotMap.get(x);
 	if (!internalSlots) {
+		if (internalSlotsList === void 0) throw new TypeError("Intl.Locale method called on incompatible receiver");
 		internalSlots = Object.create(null, internalSlotsList.reduce((all, prop) => {
 			all[prop] = {
 				enumerable: false,
@@ -4179,29 +4189,36 @@ const weekData = {
 };
 //#endregion
 //#region packages/intl-locale/preference-data.ts
-function getCalendarPreferenceDataForRegion(region) {
-	return (calendars[(region ? region.toUpperCase() : null) || ""] || calendars["001"]).map((c) => {
-		if (c === "gregorian") return "gregory";
-		if (c === "islamic-civil") return "islamicc";
-		return c;
-	});
+function getCalendarPreferenceDataForRegion(region, regionOverride, language) {
+	for (const candidate of [regionOverride, region]) {
+		if (!candidate) continue;
+		const territory = candidate.toUpperCase();
+		const values = calendars[`${language}-${territory}`] || calendars[territory];
+		if (values) return values.map((c) => c === "gregorian" ? "gregory" : c);
+	}
+	return ["gregory"];
 }
-function getHourCyclesPreferenceDataForLocaleOrRegion(locale, region) {
-	const _locale = locale.toLowerCase();
-	const _region = region ? region.toUpperCase() : "";
-	return [...hourCycles[_locale] || hourCycles[_region] || hourCycles[`${_locale}-001`] || hourCycles["001"]];
+function getHourCyclesPreferenceDataForLocaleOrRegion(language, region, regionOverride) {
+	for (const candidate of [regionOverride, region]) {
+		if (!candidate) continue;
+		const territory = candidate.toUpperCase();
+		const values = hourCycles[`${language}-${territory}`] || hourCycles[territory];
+		if (values) return [...values];
+	}
+	return ["h23"];
 }
 function getTimeZonePreferenceForRegion(region) {
 	const territory = region.toLowerCase();
 	if (timezones[territory]) return [...timezones[territory]];
 	return [];
 }
-function getWeekDataForRegion(region) {
-	return weekData[(region ? region.toUpperCase() : "") || "001"] || weekData["001"];
+function getWeekDataForRegion(region, regionOverride) {
+	const _region = region ? region.toUpperCase() : "";
+	const override = (regionOverride || "").toUpperCase();
+	return weekData[override] || weekData[_region] || weekData["001"];
 }
 //#endregion
 //#region packages/intl-locale/index.ts
-const ALPHANUM_3_8 = /^[a-z0-9]{3,8}$/i;
 const RELEVANT_EXTENSION_KEYS = [
 	"ca",
 	"co",
@@ -4211,17 +4228,23 @@ const RELEVANT_EXTENSION_KEYS = [
 	"nu",
 	"fw"
 ];
-const UNICODE_TYPE_REGEX = /^[a-z0-9]{3,8}(-[a-z0-9]{3,8})*$/i;
 function applyOptionsToTag(tag, options) {
 	invariant(typeof tag === "string", "language tag must be a string");
 	invariant(isStructurallyValidLanguageTag(tag), "malformed language tag", RangeError);
+	tag = Intl.getCanonicalLocales(tag)[0];
 	const language = GetOption(options, "language", "string", void 0, void 0);
 	if (language !== void 0) invariant(isUnicodeLanguageSubtag(language), "Malformed unicode_language_subtag", RangeError);
 	const script = GetOption(options, "script", "string", void 0, void 0);
 	if (script !== void 0) invariant(isUnicodeScriptSubtag(script), "Malformed unicode_script_subtag", RangeError);
 	const region = GetOption(options, "region", "string", void 0, void 0);
 	if (region !== void 0) invariant(isUnicodeRegionSubtag(region), "Malformed unicode_region_subtag", RangeError);
+	const variants = GetOption(options, "variants", "string", void 0, void 0);
 	const languageId = parseUnicodeLanguageId(tag);
+	if (variants !== void 0) {
+		const subtags = variants.replace(/[A-Z]/g, (character) => character.toLowerCase()).split("-");
+		if (subtags.some((variant) => !isUnicodeVariantSubtag(variant)) || new Set(subtags).size !== subtags.length) throw new RangeError("Malformed unicode_variant_subtag");
+		languageId.variants = subtags;
+	}
 	if (language !== void 0) languageId.lang = language;
 	if (script !== void 0) languageId.script = script;
 	if (region !== void 0) languageId.region = region;
@@ -4263,6 +4286,8 @@ function applyUnicodeExtensionToTag(tag, options, relevantExtensionKeys) {
 		});
 	} else unicodeExtension.keywords = keywords;
 	result.locale = Intl.getCanonicalLocales(emitUnicodeLocaleId(ast))[0];
+	const canonicalExtension = parseUnicodeLocaleId(result.locale).extensions.find((extension) => extension.type === "u");
+	for (const key of relevantExtensionKeys) result[key] = canonicalExtension?.keywords.find((keyword) => keyword[0] === key)?.[1];
 	return result;
 }
 function mergeUnicodeLanguageId(lang, script, region, variants = [], replacement) {
@@ -4281,49 +4306,38 @@ function mergeUnicodeLanguageId(lang, script, region, variants = [], replacement
 }
 function addLikelySubtags(tag) {
 	const ast = parseUnicodeLocaleId(tag);
-	const { lang, script, region, variants } = ast.lang;
-	if (script && region) {
-		const match = likelySubtags[emitUnicodeLanguageId({
+	const { lang, variants } = ast.lang;
+	const script = ast.lang.script === "Zzzz" ? void 0 : ast.lang.script;
+	const region = ast.lang.region === "ZZ" ? void 0 : ast.lang.region;
+	if (lang !== "und" && script && region) return tag;
+	for (const candidate of [
+		{
 			lang,
 			script,
 			region,
 			variants: []
-		})];
-		if (match) {
-			ast.lang = mergeUnicodeLanguageId(void 0, void 0, void 0, variants, parseUnicodeLanguageId(match));
-			return emitUnicodeLocaleId(ast);
-		}
-	}
-	if (script) {
-		const match = likelySubtags[emitUnicodeLanguageId({
+		},
+		{
 			lang,
 			script,
 			variants: []
-		})];
-		if (match) {
-			ast.lang = mergeUnicodeLanguageId(void 0, void 0, region, variants, parseUnicodeLanguageId(match));
-			return emitUnicodeLocaleId(ast);
-		}
-	}
-	if (region) {
-		const match = likelySubtags[emitUnicodeLanguageId({
+		},
+		{
 			lang,
 			region,
 			variants: []
-		})];
-		if (match) {
-			ast.lang = mergeUnicodeLanguageId(void 0, script, void 0, variants, parseUnicodeLanguageId(match));
-			return emitUnicodeLocaleId(ast);
+		},
+		{
+			lang,
+			variants: []
 		}
+	]) {
+		const match = likelySubtags[emitUnicodeLanguageId(candidate)];
+		if (!match) continue;
+		ast.lang = mergeUnicodeLanguageId(lang, script, region, variants, parseUnicodeLanguageId(match));
+		return emitUnicodeLocaleId(ast);
 	}
-	const match = likelySubtags[lang] || likelySubtags[emitUnicodeLanguageId({
-		lang: "und",
-		script,
-		variants: []
-	})];
-	if (!match) throw new Error(`No match for addLikelySubtags`);
-	ast.lang = mergeUnicodeLanguageId(void 0, script, region, variants, parseUnicodeLanguageId(match));
-	return emitUnicodeLocaleId(ast);
+	return tag;
 }
 /**
 * From: https://github.com/unicode-org/icu/blob/4231ca5be053a22a1be24eb891817458c97db709/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java#L2395
@@ -4332,11 +4346,11 @@ function addLikelySubtags(tag) {
 function removeLikelySubtags(tag) {
 	let maxLocale = addLikelySubtags(tag);
 	if (!maxLocale) return tag;
+	const ast = parseUnicodeLocaleId(maxLocale);
 	maxLocale = emitUnicodeLanguageId({
 		...parseUnicodeLanguageId(maxLocale),
 		variants: []
 	});
-	const ast = parseUnicodeLocaleId(tag);
 	const { lang: { lang, script, region, variants } } = ast;
 	if (addLikelySubtags(emitUnicodeLanguageId({
 		lang,
@@ -4365,7 +4379,7 @@ function removeLikelySubtags(tag) {
 			lang: mergeUnicodeLanguageId(lang, script, void 0, variants)
 		});
 	}
-	return tag;
+	return emitUnicodeLocaleId(ast);
 }
 function createArrayFromListOrRestricted(list, restricted) {
 	let result = list;
@@ -4376,13 +4390,19 @@ function calendarsOfLocale(loc) {
 	const locInternalSlots = getInternalSlots(loc);
 	const restricted = locInternalSlots.calendar;
 	const locale = locInternalSlots.locale;
-	let region;
-	if (locale !== "root") region = loc.maximize().region;
-	return createArrayFromListOrRestricted(getCalendarPreferenceDataForRegion(region), restricted);
+	const { region, regionOverride } = regionPreference(loc);
+	return createArrayFromListOrRestricted(getCalendarPreferenceDataForRegion(region, regionOverride, parseUnicodeLanguageId(locale).lang), restricted);
 }
 function collationsOfLocale(loc) {
-	const restricted = getInternalSlots(loc).collation;
-	const supportedCollations = supportedValuesOf("collation").filter((co) => co !== "standard" && co !== "search");
+	const locInternalSlots = getInternalSlots(loc);
+	const restricted = locInternalSlots.collation;
+	if (restricted !== void 0) return [restricted];
+	const locale = locInternalSlots.locale;
+	if (!Intl.Collator.supportedLocalesOf([locale], { localeMatcher: "lookup" }).length) return ["emoji", "eor"];
+	const supportedCollations = supportedValuesOf("collation").filter((co) => co !== "standard" && co !== "search" && new Intl.Collator(locale, {
+		collation: co,
+		localeMatcher: "lookup"
+	}).resolvedOptions().collation === co);
 	supportedCollations.sort();
 	return createArrayFromListOrRestricted(supportedCollations, restricted);
 }
@@ -4390,9 +4410,8 @@ function hourCyclesOfLocale(loc) {
 	const locInternalSlots = getInternalSlots(loc);
 	const restricted = locInternalSlots.hourCycle;
 	const locale = locInternalSlots.locale;
-	let region;
-	if (locale !== "root") region = loc.maximize().region;
-	return createArrayFromListOrRestricted(getHourCyclesPreferenceDataForLocaleOrRegion(locale, region), restricted);
+	const { region, regionOverride } = regionPreference(loc);
+	return createArrayFromListOrRestricted(getHourCyclesPreferenceDataForLocaleOrRegion(parseUnicodeLanguageId(locale).lang, region, regionOverride), restricted);
 }
 function numberingSystemsOfLocale(loc) {
 	const locInternalSlots = getInternalSlots(loc);
@@ -4416,13 +4435,25 @@ function translateCharacterOrder(order) {
 	return "ltr";
 }
 function characterDirectionOfLocale(loc) {
-	return translateCharacterOrder(characterOrders[loc.minimize().toString()]);
+	const locale = loc.minimize().toString();
+	return translateCharacterOrder(characterOrders[locale]);
 }
-function weekInfoOfLocale(loc) {
+function regionPreference(loc) {
 	const locale = getInternalSlots(loc).locale;
-	let region;
-	if (locale !== "root") region = loc.maximize().region;
-	return getWeekDataForRegion(region);
+	const ast = parseUnicodeLocaleId(locale);
+	const extension = ast.extensions.find((ext) => ext.type === "u");
+	const subdivisionRegion = (key) => {
+		const match = (extension?.keywords.find((entry) => entry[0] === key)?.[1])?.match(/^([a-z]{2}|[0-9]{3})[a-z0-9]{1,4}$/i);
+		return match ? new Locale(`und-${match[1]}`).region : void 0;
+	};
+	return {
+		region: ast.lang.region || subdivisionRegion("sd") || parseUnicodeLanguageId(addLikelySubtags(locale)).region || "001",
+		regionOverride: subdivisionRegion("rg")
+	};
+}
+function weekInfoOfLocale(loc) {
+	const { region, regionOverride } = regionPreference(loc);
+	return getWeekDataForRegion(region, regionOverride);
 }
 const TABLE_1 = [
 	"sun",
@@ -4434,7 +4465,7 @@ const TABLE_1 = [
 	"sat"
 ];
 function weekdayToString(fw) {
-	return TABLE_1[+fw];
+	return /^[0-7]$/.test(fw) ? TABLE_1[Number(fw) % 7] : fw;
 }
 var Locale = class Locale {
 	constructor(tag, opts) {
@@ -4451,30 +4482,30 @@ var Locale = class Locale {
 		if (relevantExtensionKeys.indexOf("kf") > -1) internalSlotsList.push("caseFirst");
 		if (relevantExtensionKeys.indexOf("kn") > -1) internalSlotsList.push("numeric");
 		if (tag === void 0) throw new TypeError("First argument to Intl.Locale constructor can't be empty or missing");
-		if (typeof tag !== "string" && typeof tag !== "object") throw new TypeError("tag must be a string or object");
+		if (tag === null || typeof tag !== "string" && typeof tag !== "object" && typeof tag !== "function") throw new TypeError("tag must be a string or object");
 		let tagInternalSlots;
-		if (typeof tag === "object" && (tagInternalSlots = getInternalSlots(tag)) && HasOwnProperty(tagInternalSlots, "initializedLocale")) tag = tagInternalSlots.locale;
-		else tag = tag.toString();
+		if (typeof tag === "object" && (tagInternalSlots = getInternalSlotsIfPresent(tag)) && HasOwnProperty(tagInternalSlots, "initializedLocale")) tag = tagInternalSlots.locale;
+		else tag = ToString(tag);
 		let internalSlots = getInternalSlots(this, internalSlotsList);
 		let options = CoerceOptionsToObject(opts);
 		tag = applyOptionsToTag(tag, options);
 		const opt = Object.create(null);
 		const calendar = GetOption(options, "calendar", "string", void 0, void 0);
 		if (calendar !== void 0) {
-			if (!UNICODE_TYPE_REGEX.test(calendar)) throw new RangeError("invalid calendar");
+			if (!IsUnicodeLocaleIdentifierType(calendar)) throw new RangeError("invalid calendar");
 		}
 		opt.ca = calendar;
 		const collation = GetOption(options, "collation", "string", void 0, void 0);
 		if (collation !== void 0) {
-			if (!UNICODE_TYPE_REGEX.test(collation)) throw new RangeError("invalid collation");
+			if (!IsUnicodeLocaleIdentifierType(collation)) throw new RangeError("invalid collation");
 		}
 		opt.co = collation;
 		let fw = GetOption(options, "firstDayOfWeek", "string", void 0, void 0);
 		if (fw !== void 0) {
 			fw = weekdayToString(fw);
-			if (!ALPHANUM_3_8.test(fw)) throw new RangeError("Invalid firstDayOfWeek");
+			if (!IsUnicodeLocaleIdentifierType(fw)) throw new RangeError("Invalid firstDayOfWeek");
 		}
-		opt.fw = fw;
+		opt.fw = fw?.toLowerCase();
 		opt.hc = GetOption(options, "hourCycle", "string", [
 			"h11",
 			"h12",
@@ -4492,7 +4523,7 @@ var Locale = class Locale {
 		opt.kn = kn;
 		const numberingSystem = GetOption(options, "numberingSystem", "string", void 0, void 0);
 		if (numberingSystem !== void 0) {
-			if (!UNICODE_TYPE_REGEX.test(numberingSystem)) throw new RangeError("Invalid numberingSystem");
+			if (!IsUnicodeLocaleIdentifierType(numberingSystem)) throw new RangeError("Invalid numberingSystem");
 		}
 		opt.nu = numberingSystem;
 		const r = applyUnicodeExtensionToTag(tag, opt, relevantExtensionKeys);
@@ -4502,7 +4533,7 @@ var Locale = class Locale {
 		internalSlots.firstDayOfWeek = r.fw;
 		internalSlots.hourCycle = r.hc;
 		if (relevantExtensionKeys.indexOf("kf") > -1) internalSlots.caseFirst = r.kf;
-		if (relevantExtensionKeys.indexOf("kn") > -1) internalSlots.numeric = SameValue(r.kn, "true");
+		if (relevantExtensionKeys.indexOf("kn") > -1) internalSlots.numeric = r.kn === "" || SameValue(r.kn, "true");
 		internalSlots.numberingSystem = r.nu;
 	}
 	/**
@@ -4511,7 +4542,8 @@ var Locale = class Locale {
 	maximize() {
 		const locale = getInternalSlots(this).locale;
 		try {
-			return new Locale(addLikelySubtags(locale));
+			const maximizedLocale = addLikelySubtags(locale);
+			return new Locale(maximizedLocale);
 		} catch {
 			return new Locale(locale);
 		}
@@ -4522,13 +4554,16 @@ var Locale = class Locale {
 	minimize() {
 		const locale = getInternalSlots(this).locale;
 		try {
-			return new Locale(removeLikelySubtags(locale));
+			const minimizedLocale = removeLikelySubtags(locale);
+			return new Locale(minimizedLocale);
 		} catch {
 			return new Locale(locale);
 		}
 	}
 	toString() {
-		return getInternalSlots(this).locale;
+		const slots = getInternalSlots(this);
+		if (!HasOwnProperty(slots, "initializedLocale")) throw new TypeError("Error uninitialized locale");
+		return slots.locale;
 	}
 	get baseName() {
 		const locale = getInternalSlots(this).locale;
@@ -4642,7 +4677,9 @@ var Locale = class Locale {
 	}
 	/**
 	* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/getWeekInfo
-	* https://tc39.es/proposal-intl-locale-info/#sec-Intl.Locale.prototype.getWeekInfo
+	* ECMA-402 §15.3.22 Intl.Locale.prototype.getWeekInfo, steps 3–7.
+	* https://tc39.es/ecma402/#sec-Intl.Locale.prototype.getWeekInfo
+	* https://github.com/tc39/ecma402/blob/b1c961988b9a07894b1dc3dc2b5626ea48387d61/spec/locale.html#L420-L424
 	*/
 	getWeekInfo() {
 		const info = Object.create(Object.prototype);
@@ -4651,10 +4688,10 @@ var Locale = class Locale {
 		const wi = weekInfoOfLocale(this);
 		const we = wi.weekend;
 		createDataProperty(info, "firstDay", wi.firstDay);
-		createDataProperty(info, "weekend", we);
-		createDataProperty(info, "minimalDays", wi.minimalDays);
+		createDataProperty(info, "weekend", [...we]);
 		const fw = internalSlots.firstDayOfWeek;
-		if (fw !== void 0) info.firstDay = fw;
+		const day = TABLE_1.indexOf(fw);
+		if (day !== -1) info.firstDay = day || 7;
 		return info;
 	}
 	static {
@@ -4678,8 +4715,6 @@ try {
 		configurable: true
 	});
 } catch {}
-//#endregion
-//#region packages/intl-locale/polyfill-force.ts
 defineProperty(ensureIntl(), "Locale", { value: Locale });
 //#endregion