@formatjs/intl-getcanonicallocales 3.1.1 → 3.2.0

package/index.d.ts

@@ -1,5 +1,5 @@
-export declare function getCanonicalLocales(locales?: string[] | string): string[];
-export * from './src/emitter.js';
-export { isStructurallyValidLanguageTag, isUnicodeLanguageSubtag, isUnicodeRegionSubtag, isUnicodeScriptSubtag, parseUnicodeLanguageId, parseUnicodeLocaleId, } from './src/parser.js';
-export * from './src/types.js';
-export * from './src/likelySubtags.generated.js';
+export declare function getCanonicalLocales(locales?: string[] | string | Intl.Locale | Intl.Locale[] | ArrayLike<string | Intl.Locale>): string[];
+export * from "./src/emitter.js";
+export { isStructurallyValidLanguageTag, isUnicodeLanguageSubtag, isUnicodeRegionSubtag, isUnicodeScriptSubtag, parseUnicodeLanguageId, parseUnicodeLocaleId } from "./src/parser.js";
+export * from "./src/types.js";
+export * from "./src/likelySubtags.generated.js";

package/index.js

@@ -1,31 +1,69 @@
-import { CanonicalizeUnicodeLocaleId } from './src/canonicalizer.js';
-import { emitUnicodeLocaleId } from './src/emitter.js';
-import { parseUnicodeLocaleId } from './src/parser.js';
+import { CanonicalizeUnicodeLocaleId } from "./src/canonicalizer.js";
+import { emitUnicodeLocaleId } from "./src/emitter.js";
+import { parseUnicodeLocaleId } from "./src/parser.js";
 /**
- * https://tc39.es/ecma402/#sec-canonicalizelocalelist
- * @param locales
- */
+* Check if value is an Intl.Locale object by checking for [[InitializedLocale]] internal slot
+* We detect this by checking if it's an Intl.Locale instance
+*
+* Per ECMA-402 #sec-canonicalizelocalelist step 7.c:
+* "If Type(kValue) is Object and kValue has an [[InitializedLocale]] internal slot, then
+*  Let tag be kValue.[[Locale]]"
+*
+* https://tc39.es/ecma402/#sec-canonicalizelocalelist
+*/
+function isLocaleObject(value) {
+	return typeof value === "object" && value !== null && typeof value.toString === "function" && typeof value.baseName === "string" && typeof value.language === "string";
+}
+/**
+* https://tc39.es/ecma402/#sec-canonicalizelocalelist
+* @param locales
+*/
 function CanonicalizeLocaleList(locales) {
-    if (locales === undefined) {
-        return [];
-    }
-    var seen = [];
-    if (typeof locales === 'string') {
-        locales = [locales];
-    }
-    for (var _i = 0, locales_1 = locales; _i < locales_1.length; _i++) {
-        var locale = locales_1[_i];
-        var canonicalizedTag = emitUnicodeLocaleId(CanonicalizeUnicodeLocaleId(parseUnicodeLocaleId(locale)));
-        if (seen.indexOf(canonicalizedTag) < 0) {
-            seen.push(canonicalizedTag);
-        }
-    }
-    return seen;
+	// Step 1-2: If locales is undefined, return empty list
+	if (locales === undefined) {
+		return [];
+	}
+	const seen = [];
+	// Step 3-4: Handle string or Locale object by wrapping in array
+	// Per spec: "If Type(locales) is String or Type(locales) is Object and locales has an
+	// [[InitializedLocale]] internal slot, then Let O be CreateArrayFromList(« locales »)"
+	if (typeof locales === "string" || isLocaleObject(locales)) {
+		locales = [locales];
+	}
+	// Step 5-6: Convert to object and get length for array-like objects
+	// Per spec: "Let O be ? ToObject(locales)" and "Let len be ? ToLength(? Get(O, "length"))"
+	const O = Object(locales);
+	const len = typeof O.length === "number" ? O.length : 0;
+	// Step 7: Iterate through elements
+	for (let k = 0; k < len; k++) {
+		// Check if property exists
+		if (!(k in O)) {
+			continue;
+		}
+		const kValue = O[k];
+		// Step 7c-d: Extract locale string
+		let tag;
+		if (typeof kValue === "string") {
+			tag = kValue;
+		} else if (isLocaleObject(kValue)) {
+			// For Intl.Locale objects, use toString() which returns the canonicalized locale
+			tag = kValue.toString();
+		} else {
+			throw new TypeError(`Invalid locale type: expected string or Intl.Locale, got ${typeof kValue}`);
+		}
+		// Step 7e-g: Validate and canonicalize
+		const canonicalizedTag = emitUnicodeLocaleId(CanonicalizeUnicodeLocaleId(parseUnicodeLocaleId(tag)));
+		// Step 7h: Deduplicate
+		if (seen.indexOf(canonicalizedTag) < 0) {
+			seen.push(canonicalizedTag);
+		}
+	}
+	return seen;
 }
 export function getCanonicalLocales(locales) {
-    return CanonicalizeLocaleList(locales);
+	return CanonicalizeLocaleList(locales);
 }
-export * from './src/emitter.js';
-export { isStructurallyValidLanguageTag, isUnicodeLanguageSubtag, isUnicodeRegionSubtag, isUnicodeScriptSubtag, parseUnicodeLanguageId, parseUnicodeLocaleId, } from './src/parser.js';
-export * from './src/types.js';
-export * from './src/likelySubtags.generated.js';
+export * from "./src/emitter.js";
+export { isStructurallyValidLanguageTag, isUnicodeLanguageSubtag, isUnicodeRegionSubtag, isUnicodeScriptSubtag, parseUnicodeLanguageId, parseUnicodeLocaleId } from "./src/parser.js";
+export * from "./src/types.js";
+export * from "./src/likelySubtags.generated.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formatjs/intl-getcanonicallocales",
   "description": "Intl.getCanonicalLocales polyfill",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "license": "MIT",
   "author": "Long Ho <holevietlong@gmail.com>",
   "type": "module",
@@ -13,7 +13,7 @@
     "./should-polyfill.js": "./should-polyfill.js"
   },
   "dependencies": {
-    "tslib": "^2.8.0"
+    "tslib": "^2.8.1"
   },
   "bugs": "https://github.com/formatjs/formatjs/issues",
   "homepage": "https://github.com/formatjs/formatjs#readme",

package/polyfill-force.js

@@ -1,21 +1,15 @@
-import { getCanonicalLocales } from './index.js';
-if (typeof Intl === 'undefined') {
-    if (typeof window !== 'undefined') {
-        Object.defineProperty(window, 'Intl', {
-            value: {},
-        });
-        // @ts-ignore we don't include @types/node so global isn't a thing
-    }
-    else if (typeof global !== 'undefined') {
-        // @ts-ignore we don't include @types/node so global isn't a thing
-        Object.defineProperty(global, 'Intl', {
-            value: {},
-        });
-    }
+import { getCanonicalLocales } from "./index.js";
+if (typeof Intl === "undefined") {
+	if (typeof window !== "undefined") {
+		Object.defineProperty(window, "Intl", { value: {} });
+	} else if (typeof global !== "undefined") {
+		// @ts-ignore we don't include @types/node so global isn't a thing
+		Object.defineProperty(global, "Intl", { value: {} });
+	}
 }
-Object.defineProperty(Intl, 'getCanonicalLocales', {
-    value: getCanonicalLocales,
-    writable: true,
-    enumerable: false,
-    configurable: true,
+Object.defineProperty(Intl, "getCanonicalLocales", {
+	value: getCanonicalLocales,
+	writable: true,
+	enumerable: false,
+	configurable: true
 });

package/polyfill.iife.js

@@ -9408,17 +9408,36 @@
   }
 
   // packages/intl-getcanonicallocales/index.ts
+  function isLocaleObject(value) {
+    return typeof value === "object" && value !== null && typeof value.toString === "function" && typeof value.baseName === "string" && typeof value.language === "string";
+  }
   function CanonicalizeLocaleList(locales) {
     if (locales === void 0) {
       return [];
     }
     const seen = [];
-    if (typeof locales === "string") {
+    if (typeof locales === "string" || isLocaleObject(locales)) {
       locales = [locales];
     }
-    for (const locale of locales) {
+    const O = Object(locales);
+    const len = typeof O.length === "number" ? O.length : 0;
+    for (let k = 0; k < len; k++) {
+      if (!(k in O)) {
+        continue;
+      }
+      const kValue = O[k];
+      let tag;
+      if (typeof kValue === "string") {
+        tag = kValue;
+      } else if (isLocaleObject(kValue)) {
+        tag = kValue.toString();
+      } else {
+        throw new TypeError(
+          `Invalid locale type: expected string or Intl.Locale, got ${typeof kValue}`
+        );
+      }
       const canonicalizedTag = emitUnicodeLocaleId(
-        CanonicalizeUnicodeLocaleId(parseUnicodeLocaleId(locale))
+        CanonicalizeUnicodeLocaleId(parseUnicodeLocaleId(tag))
       );
       if (seen.indexOf(canonicalizedTag) < 0) {
         seen.push(canonicalizedTag);

package/polyfill.js

@@ -1,24 +1,18 @@
-import { getCanonicalLocales } from './index.js';
-import { shouldPolyfill } from './should-polyfill.js';
-if (typeof Intl === 'undefined') {
-    if (typeof window !== 'undefined') {
-        Object.defineProperty(window, 'Intl', {
-            value: {},
-        });
-        // @ts-ignore we don't include @types/node so global isn't a thing
-    }
-    else if (typeof global !== 'undefined') {
-        // @ts-ignore we don't include @types/node so global isn't a thing
-        Object.defineProperty(global, 'Intl', {
-            value: {},
-        });
-    }
+import { getCanonicalLocales } from "./index.js";
+import { shouldPolyfill } from "./should-polyfill.js";
+if (typeof Intl === "undefined") {
+	if (typeof window !== "undefined") {
+		Object.defineProperty(window, "Intl", { value: {} });
+	} else if (typeof global !== "undefined") {
+		// @ts-ignore we don't include @types/node so global isn't a thing
+		Object.defineProperty(global, "Intl", { value: {} });
+	}
 }
 if (shouldPolyfill()) {
-    Object.defineProperty(Intl, 'getCanonicalLocales', {
-        value: getCanonicalLocales,
-        writable: true,
-        enumerable: false,
-        configurable: true,
-    });
+	Object.defineProperty(Intl, "getCanonicalLocales", {
+		value: getCanonicalLocales,
+		writable: true,
+		enumerable: false,
+		configurable: true
+	});
 }

package/should-polyfill.js

@@ -1,8 +1,3 @@
 export function shouldPolyfill() {
-    return (typeof Intl === 'undefined' ||
-        !('getCanonicalLocales' in Intl) ||
-        // Native Intl.getCanonicalLocales is just buggy
-        // https://bugs.chromium.org/p/v8/issues/detail?id=10682
-        Intl.getCanonicalLocales('und-x-private')[0] ===
-            'x-private');
+	return typeof Intl === "undefined" || !("getCanonicalLocales" in Intl) || Intl.getCanonicalLocales("und-x-private")[0] === "x-private";
 }