@formatjs/intl-getcanonicallocales 1.2.0 → 1.2.4

package/CHANGELOG.md

@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.4](https://github.com/formatjs/formatjs/compare/@formatjs/intl-getcanonicallocales@1.2.3...@formatjs/intl-getcanonicallocales@1.2.4) (2020-05-28)
+
+
+### Bug Fixes
+
+* **@formatjs/intl-utils:** Add missing cldr-core to package.json dep ([d0b72fe](https://github.com/formatjs/formatjs/commit/d0b72fe398c7017d03e8ee66c98ad88fe3e47657))
+
+
+
+
+
+## [1.2.3](https://github.com/formatjs/formatjs/compare/@formatjs/intl-getcanonicallocales@1.2.2...@formatjs/intl-getcanonicallocales@1.2.3) (2020-05-27)
+
+**Note:** Version bump only for package @formatjs/intl-getcanonicallocales
+
+
+
+
+
+## [1.2.2](https://github.com/formatjs/formatjs/compare/@formatjs/intl-getcanonicallocales@1.2.1...@formatjs/intl-getcanonicallocales@1.2.2) (2020-05-25)
+
+
+### Bug Fixes
+
+* **@formatjs/intl-getcanonicallocales:** fix alias lookup algo ([b39e3c2](https://github.com/formatjs/formatjs/commit/b39e3c2b1baefc011825f8e443769c2095beeb12))
+* **@formatjs/intl-getcanonicallocales:** fix region casing ([396dbe7](https://github.com/formatjs/formatjs/commit/396dbe769bef6eb82ae274ba4935e70e076b2854))
+* **@formatjs/intl-getcanonicallocales:** Handle aliases properly ([9e19e4b](https://github.com/formatjs/formatjs/commit/9e19e4b769560f3717f9589ab6180e932aaf96f8))
+* **@formatjs/intl-getcanonicallocales:** set the polyfill if native impl is buggy ([555a28b](https://github.com/formatjs/formatjs/commit/555a28b2d6d3c48f69d765c5090f7880ef603adc))
+* **@formatjs/intl-locale:** fix add/remove likely subtags ([d72f952](https://github.com/formatjs/formatjs/commit/d72f952a66905a3a7edd75518ccaa72c2020273e))
+
+
+
+
+
+## [1.2.1](https://github.com/formatjs/formatjs/compare/@formatjs/intl-getcanonicallocales@1.2.0...@formatjs/intl-getcanonicallocales@1.2.1) (2020-05-23)
+
+**Note:** Version bump only for package @formatjs/intl-getcanonicallocales
+
+
+
+
+
 # [1.2.0](https://github.com/formatjs/formatjs/compare/@formatjs/intl-getcanonicallocales@1.1.1...@formatjs/intl-getcanonicallocales@1.2.0) (2020-05-23)
 
 

package/dist/canonicalizer.d.ts

@@ -8,7 +8,7 @@ We get the following transformation:
 en-u-ms-imperial ⇒ en-u-ms-uksystem
  * @param lang
  */
-export declare function canonicalizeUnicodeLanguageId(lang: UnicodeLanguageId): void;
+export declare function canonicalizeUnicodeLanguageId(unicodeLanguageId: UnicodeLanguageId): UnicodeLanguageId;
 /**
  * Canonicalize based on
  * https://www.unicode.org/reports/tr35/tr35.html#Canonical_Unicode_Locale_Identifiers

package/dist/canonicalizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"canonicalizer.d.ts","sourceRoot":"","sources":["../src/canonicalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAiB,iBAAiB,EAAC,MAAM,SAAS,CAAC;AAiD1E;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI,CA4D3E;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,eAAe,GACtB,eAAe,CA0BjB"}
+{"version":3,"file":"canonicalizer.d.ts","sourceRoot":"","sources":["../src/canonicalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAiB,iBAAiB,EAAC,MAAM,SAAS,CAAC;AA4D1E;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAC3C,iBAAiB,EAAE,iBAAiB,GACnC,iBAAiB,CAmKnB;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,eAAe,GACtB,eAAe,CA0BjB"}

package/dist/canonicalizer.js

@@ -1,8 +1,16 @@
 "use strict";
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var aliases_1 = require("./aliases");
 var parser_1 = require("./parser");
 var likelySubtags = require("cldr-core/supplemental/likelySubtags.json");
+var emitter_1 = require("./emitter");
 function canonicalizeAttrs(strs) {
     return Object.keys(strs.reduce(function (all, str) {
         all[str.toLowerCase()] = 1;
@@ -33,6 +41,16 @@ function compareKV(t1, t2) {
 function compareExtension(e1, e2) {
     return e1.type < e2.type ? -1 : e1.type > e2.type ? 1 : 0;
 }
+function mergeVariants(v1, v2) {
+    var result = __spreadArrays(v1);
+    for (var _i = 0, v2_1 = v2; _i < v2_1.length; _i++) {
+        var v = v2_1[_i];
+        if (v1.indexOf(v) < 0) {
+            result.push(v);
+        }
+    }
+    return result;
+}
 /**
  * CAVEAT: We don't do this section in the spec bc they have no JSON data
  * Use the bcp47 data to replace keys, types, tfields, and tvalues by their canonical forms. See Section 3.6.4 U Extension Data Files) and Section 3.7.1 T Extension Data Files. The aliases are in the alias attribute value, while the canonical is in the name attribute value. For example,
@@ -42,29 +60,99 @@ We get the following transformation:
 en-u-ms-imperial ⇒ en-u-ms-uksystem
  * @param lang
  */
-function canonicalizeUnicodeLanguageId(lang) {
+function canonicalizeUnicodeLanguageId(unicodeLanguageId) {
     /**
-     * If the language subtag matches the type attribute of a languageAlias element in Supplemental Data,
-     * replace the language subtag with the replacement value.
-     * - If there are additional subtags in the replacement value, add them to the result, but only if there is no corresponding subtag already in the tag.
-     * - Five special deprecated grandfathered codes (such as i-default) are in type attributes, and are also replaced.
+     * If the language subtag matches the type attribute of a languageAlias element in Supplemental Data, replace the language subtag with the replacement value.
+     *  1. If there are additional subtags in the replacement value, add them to the result, but only if there is no corresponding subtag already in the tag.
+     *  2. Five special deprecated grandfathered codes (such as i-default) are in type attributes, and are also replaced.
      */
-    var sourceLang = lang.lang.toLowerCase();
-    var langAlias = aliases_1.languageAlias[sourceLang];
-    if (langAlias) {
-        var langAliasAst = parser_1.parseUnicodeLanguageId(langAlias.split('-'));
-        lang.lang = langAliasAst.lang;
-        lang.script = lang.script || langAliasAst.script;
-        lang.region = lang.region || langAliasAst.region;
+    // From https://github.com/unicode-org/icu/blob/master/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java#L1246
+    // Try language _ variant
+    var finalLangAst = unicodeLanguageId;
+    if (unicodeLanguageId.variants.length) {
+        var replacedLang_1 = '';
+        for (var _i = 0, _a = unicodeLanguageId.variants; _i < _a.length; _i++) {
+            var variant = _a[_i];
+            if ((replacedLang_1 =
+                aliases_1.languageAlias[emitter_1.emitUnicodeLanguageId({
+                    lang: unicodeLanguageId.lang,
+                    variants: [variant],
+                })])) {
+                var replacedLangAst = parser_1.parseUnicodeLanguageId(replacedLang_1.split(parser_1.SEPARATOR));
+                finalLangAst = {
+                    lang: replacedLangAst.lang,
+                    script: finalLangAst.script || replacedLangAst.script,
+                    region: finalLangAst.region || replacedLangAst.region,
+                    variants: mergeVariants(finalLangAst.variants, replacedLangAst.variants),
+                };
+                break;
+            }
+        }
+    }
+    // language _ script _ country
+    // ug-Arab-CN -> ug-CN
+    if (finalLangAst.script && finalLangAst.region) {
+        var replacedLang_2 = aliases_1.languageAlias[emitter_1.emitUnicodeLanguageId({
+            lang: finalLangAst.lang,
+            script: finalLangAst.script,
+            region: finalLangAst.region,
+            variants: [],
+        })];
+        if (replacedLang_2) {
+            var replacedLangAst = parser_1.parseUnicodeLanguageId(replacedLang_2.split(parser_1.SEPARATOR));
+            finalLangAst = {
+                lang: replacedLangAst.lang,
+                script: replacedLangAst.script,
+                region: replacedLangAst.region,
+                variants: finalLangAst.variants,
+            };
+        }
+    }
+    // language _ country
+    // eg. az_AZ -> az_Latn_A
+    if (finalLangAst.region) {
+        var replacedLang_3 = aliases_1.languageAlias[emitter_1.emitUnicodeLanguageId({
+            lang: finalLangAst.lang,
+            region: finalLangAst.region,
+            variants: [],
+        })];
+        if (replacedLang_3) {
+            var replacedLangAst = parser_1.parseUnicodeLanguageId(replacedLang_3.split(parser_1.SEPARATOR));
+            finalLangAst = {
+                lang: replacedLangAst.lang,
+                script: finalLangAst.script || replacedLangAst.script,
+                region: replacedLangAst.region,
+                variants: finalLangAst.variants,
+            };
+        }
+    }
+    // only language
+    // e.g. twi -> ak
+    var replacedLang = aliases_1.languageAlias[emitter_1.emitUnicodeLanguageId({
+        lang: finalLangAst.lang,
+        variants: [],
+    })];
+    if (replacedLang) {
+        var replacedLangAst = parser_1.parseUnicodeLanguageId(replacedLang.split(parser_1.SEPARATOR));
+        finalLangAst = {
+            lang: replacedLangAst.lang,
+            script: finalLangAst.script || replacedLangAst.script,
+            region: finalLangAst.region || replacedLangAst.region,
+            variants: finalLangAst.variants,
+        };
     }
-    if (lang.region) {
-        var region = lang.region.toUpperCase();
+    if (finalLangAst.region) {
+        var region = finalLangAst.region.toUpperCase();
         var regionAlias = aliases_1.territoryAlias[region];
         var replacedRegion = void 0;
         if (regionAlias) {
             var regions = regionAlias.split(' ');
             replacedRegion = regions[0];
-            var likelySubtag = likelySubtags.supplemental.likelySubtags[lang.lang];
+            var likelySubtag = likelySubtags.supplemental.likelySubtags[emitter_1.emitUnicodeLanguageId({
+                lang: finalLangAst.lang,
+                script: finalLangAst.script,
+                variants: [],
+            })];
             if (likelySubtag) {
                 var likelyRegion = parser_1.parseUnicodeLanguageId(likelySubtag.split(parser_1.SEPARATOR)).region;
                 if (likelyRegion && regions.indexOf(likelyRegion) > -1) {
@@ -73,32 +161,35 @@ function canonicalizeUnicodeLanguageId(lang) {
             }
         }
         if (replacedRegion) {
-            lang.region = replacedRegion;
+            finalLangAst.region = replacedRegion;
         }
+        finalLangAst.region = finalLangAst.region.toUpperCase();
     }
-    if (lang.script) {
-        lang.script =
-            lang.script[0].toUpperCase() + lang.script.slice(1).toLowerCase();
-        if (aliases_1.scriptAlias[lang.script]) {
-            lang.script = aliases_1.scriptAlias[lang.script];
+    if (finalLangAst.script) {
+        finalLangAst.script =
+            finalLangAst.script[0].toUpperCase() +
+                finalLangAst.script.slice(1).toLowerCase();
+        if (aliases_1.scriptAlias[finalLangAst.script]) {
+            finalLangAst.script = aliases_1.scriptAlias[finalLangAst.script];
         }
     }
-    if (lang.variants.length) {
-        for (var i = 0; i < lang.variants.length; i++) {
-            var variant = lang.variants[i].toLowerCase();
+    if (finalLangAst.variants.length) {
+        for (var i = 0; i < finalLangAst.variants.length; i++) {
+            var variant = finalLangAst.variants[i].toLowerCase();
             if (aliases_1.variantAlias[variant]) {
                 var alias = aliases_1.variantAlias[variant];
                 if (parser_1.isUnicodeVariantSubtag(alias)) {
-                    lang.variants[i] = alias;
+                    finalLangAst.variants[i] = alias;
                 }
                 else if (parser_1.isUnicodeLanguageSubtag(alias)) {
                     // Yes this can happen per the spec
-                    lang.lang = alias;
+                    finalLangAst.lang = alias;
                 }
             }
         }
-        lang.variants.sort();
+        finalLangAst.variants.sort();
     }
+    return finalLangAst;
 }
 exports.canonicalizeUnicodeLanguageId = canonicalizeUnicodeLanguageId;
 /**
@@ -109,7 +200,7 @@ exports.canonicalizeUnicodeLanguageId = canonicalizeUnicodeLanguageId;
  * @param locale
  */
 function canonicalizeUnicodeLocaleId(locale) {
-    canonicalizeUnicodeLanguageId(locale.lang);
+    locale.lang = canonicalizeUnicodeLanguageId(locale.lang);
     if (locale.extensions) {
         for (var _i = 0, _a = locale.extensions; _i < _a.length; _i++) {
             var extension = _a[_i];
@@ -122,7 +213,7 @@ function canonicalizeUnicodeLocaleId(locale) {
                     break;
                 case 't':
                     if (extension.lang) {
-                        canonicalizeUnicodeLanguageId(extension.lang);
+                        extension.lang = canonicalizeUnicodeLanguageId(extension.lang);
                     }
                     extension.fields = canonicalizeKVs(extension.fields);
                     break;

package/dist/canonicalizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"canonicalizer.js","sourceRoot":"","sources":["../src/canonicalizer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"canonicalizer.js","sourceRoot":"","sources":["../src/canonicalizer.ts"],"names":[],"mappings":"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"}

package/dist/polyfill.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var _1 = require("./");
-if (!('getCanonicalLocales' in Intl)) {
+var _1 = require(".");
+if (!('getCanonicalLocales' in Intl) ||
+    // Native Intl.getCanonicalLocales is just buggy
+    Intl.getCanonicalLocales('und-x-private')[0] === 'x-private') {
     Object.defineProperty(Intl, 'getCanonicalLocales', {
         value: _1.getCanonicalLocales,
         writable: true,

package/dist/polyfill.js.map

@@ -1 +1 @@
-{"version":3,"file":"polyfill.js","sourceRoot":"","sources":["../src/polyfill.ts"],"names":[],"mappings":";;AAAA,uBAAuC;AACvC,IAAI,CAAC,CAAC,qBAAqB,IAAI,IAAI,CAAC,EAAE;IACpC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,qBAAqB,EAAE;QACjD,KAAK,EAAE,sBAAmB;QAC1B,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;CACJ"}
+{"version":3,"file":"polyfill.js","sourceRoot":"","sources":["../src/polyfill.ts"],"names":[],"mappings":";;AAAA,sBAAsC;AACtC,IACE,CAAC,CAAC,qBAAqB,IAAI,IAAI,CAAC;IAChC,gDAAgD;IAC9C,IAAY,CAAC,mBAAkD,CAC/D,eAAe,CAChB,CAAC,CAAC,CAAC,KAAK,WAAW,EACpB;IACA,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,qBAAqB,EAAE;QACjD,KAAK,EAAE,sBAAmB;QAC1B,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;CACJ"}

package/dist/umd/intl-locale.js

@@ -2145,6 +2145,13 @@
     	}
     };
 
+    var __spreadArrays$1 = (undefined && undefined.__spreadArrays) || function () {
+        for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+        for (var r = Array(s), k = 0, i = 0; i < il; i++)
+            for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+                r[k] = a[j];
+        return r;
+    };
     function canonicalizeAttrs(strs) {
         return Object.keys(strs.reduce(function (all, str) {
             all[str.toLowerCase()] = 1;
@@ -2175,6 +2182,16 @@
     function compareExtension(e1, e2) {
         return e1.type < e2.type ? -1 : e1.type > e2.type ? 1 : 0;
     }
+    function mergeVariants(v1, v2) {
+        var result = __spreadArrays$1(v1);
+        for (var _i = 0, v2_1 = v2; _i < v2_1.length; _i++) {
+            var v = v2_1[_i];
+            if (v1.indexOf(v) < 0) {
+                result.push(v);
+            }
+        }
+        return result;
+    }
     /**
      * CAVEAT: We don't do this section in the spec bc they have no JSON data
      * Use the bcp47 data to replace keys, types, tfields, and tvalues by their canonical forms. See Section 3.6.4 U Extension Data Files) and Section 3.7.1 T Extension Data Files. The aliases are in the alias attribute value, while the canonical is in the name attribute value. For example,
@@ -2184,29 +2201,99 @@
     en-u-ms-imperial ⇒ en-u-ms-uksystem
      * @param lang
      */
-    function canonicalizeUnicodeLanguageId(lang) {
+    function canonicalizeUnicodeLanguageId(unicodeLanguageId) {
         /**
-         * If the language subtag matches the type attribute of a languageAlias element in Supplemental Data,
-         * replace the language subtag with the replacement value.
-         * - If there are additional subtags in the replacement value, add them to the result, but only if there is no corresponding subtag already in the tag.
-         * - Five special deprecated grandfathered codes (such as i-default) are in type attributes, and are also replaced.
+         * If the language subtag matches the type attribute of a languageAlias element in Supplemental Data, replace the language subtag with the replacement value.
+         *  1. If there are additional subtags in the replacement value, add them to the result, but only if there is no corresponding subtag already in the tag.
+         *  2. Five special deprecated grandfathered codes (such as i-default) are in type attributes, and are also replaced.
          */
-        var sourceLang = lang.lang.toLowerCase();
-        var langAlias = languageAlias[sourceLang];
-        if (langAlias) {
-            var langAliasAst = parseUnicodeLanguageId(langAlias.split('-'));
-            lang.lang = langAliasAst.lang;
-            lang.script = lang.script || langAliasAst.script;
-            lang.region = lang.region || langAliasAst.region;
+        // From https://github.com/unicode-org/icu/blob/master/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java#L1246
+        // Try language _ variant
+        var finalLangAst = unicodeLanguageId;
+        if (unicodeLanguageId.variants.length) {
+            var replacedLang_1 = '';
+            for (var _i = 0, _a = unicodeLanguageId.variants; _i < _a.length; _i++) {
+                var variant = _a[_i];
+                if ((replacedLang_1 =
+                    languageAlias[emitUnicodeLanguageId({
+                        lang: unicodeLanguageId.lang,
+                        variants: [variant],
+                    })])) {
+                    var replacedLangAst = parseUnicodeLanguageId(replacedLang_1.split(SEPARATOR));
+                    finalLangAst = {
+                        lang: replacedLangAst.lang,
+                        script: finalLangAst.script || replacedLangAst.script,
+                        region: finalLangAst.region || replacedLangAst.region,
+                        variants: mergeVariants(finalLangAst.variants, replacedLangAst.variants),
+                    };
+                    break;
+                }
+            }
+        }
+        // language _ script _ country
+        // ug-Arab-CN -> ug-CN
+        if (finalLangAst.script && finalLangAst.region) {
+            var replacedLang_2 = languageAlias[emitUnicodeLanguageId({
+                lang: finalLangAst.lang,
+                script: finalLangAst.script,
+                region: finalLangAst.region,
+                variants: [],
+            })];
+            if (replacedLang_2) {
+                var replacedLangAst = parseUnicodeLanguageId(replacedLang_2.split(SEPARATOR));
+                finalLangAst = {
+                    lang: replacedLangAst.lang,
+                    script: replacedLangAst.script,
+                    region: replacedLangAst.region,
+                    variants: finalLangAst.variants,
+                };
+            }
+        }
+        // language _ country
+        // eg. az_AZ -> az_Latn_A
+        if (finalLangAst.region) {
+            var replacedLang_3 = languageAlias[emitUnicodeLanguageId({
+                lang: finalLangAst.lang,
+                region: finalLangAst.region,
+                variants: [],
+            })];
+            if (replacedLang_3) {
+                var replacedLangAst = parseUnicodeLanguageId(replacedLang_3.split(SEPARATOR));
+                finalLangAst = {
+                    lang: replacedLangAst.lang,
+                    script: finalLangAst.script || replacedLangAst.script,
+                    region: replacedLangAst.region,
+                    variants: finalLangAst.variants,
+                };
+            }
+        }
+        // only language
+        // e.g. twi -> ak
+        var replacedLang = languageAlias[emitUnicodeLanguageId({
+            lang: finalLangAst.lang,
+            variants: [],
+        })];
+        if (replacedLang) {
+            var replacedLangAst = parseUnicodeLanguageId(replacedLang.split(SEPARATOR));
+            finalLangAst = {
+                lang: replacedLangAst.lang,
+                script: finalLangAst.script || replacedLangAst.script,
+                region: finalLangAst.region || replacedLangAst.region,
+                variants: finalLangAst.variants,
+            };
         }
-        if (lang.region) {
-            var region = lang.region.toUpperCase();
+        if (finalLangAst.region) {
+            var region = finalLangAst.region.toUpperCase();
             var regionAlias = territoryAlias[region];
             var replacedRegion = void 0;
             if (regionAlias) {
                 var regions = regionAlias.split(' ');
                 replacedRegion = regions[0];
-                var likelySubtag = supplemental.likelySubtags[lang.lang];
+                var likelySubtag = supplemental.likelySubtags[emitUnicodeLanguageId({
+                    lang: finalLangAst.lang,
+                    script: finalLangAst.script,
+                    variants: [],
+                })];
                 if (likelySubtag) {
                     var likelyRegion = parseUnicodeLanguageId(likelySubtag.split(SEPARATOR)).region;
                     if (likelyRegion && regions.indexOf(likelyRegion) > -1) {
@@ -2215,32 +2302,35 @@
                 }
             }
             if (replacedRegion) {
-                lang.region = replacedRegion;
+                finalLangAst.region = replacedRegion;
             }
+            finalLangAst.region = finalLangAst.region.toUpperCase();
         }
-        if (lang.script) {
-            lang.script =
-                lang.script[0].toUpperCase() + lang.script.slice(1).toLowerCase();
-            if (scriptAlias[lang.script]) {
-                lang.script = scriptAlias[lang.script];
+        if (finalLangAst.script) {
+            finalLangAst.script =
+                finalLangAst.script[0].toUpperCase() +
+                    finalLangAst.script.slice(1).toLowerCase();
+            if (scriptAlias[finalLangAst.script]) {
+                finalLangAst.script = scriptAlias[finalLangAst.script];
             }
         }
-        if (lang.variants.length) {
-            for (var i = 0; i < lang.variants.length; i++) {
-                var variant = lang.variants[i].toLowerCase();
+        if (finalLangAst.variants.length) {
+            for (var i = 0; i < finalLangAst.variants.length; i++) {
+                var variant = finalLangAst.variants[i].toLowerCase();
                 if (variantAlias[variant]) {
                     var alias = variantAlias[variant];
                     if (isUnicodeVariantSubtag(alias)) {
-                        lang.variants[i] = alias;
+                        finalLangAst.variants[i] = alias;
                     }
                     else if (isUnicodeLanguageSubtag(alias)) {
                         // Yes this can happen per the spec
-                        lang.lang = alias;
+                        finalLangAst.lang = alias;
                     }
                 }
             }
-            lang.variants.sort();
+            finalLangAst.variants.sort();
         }
+        return finalLangAst;
     }
     /**
      * Canonicalize based on
@@ -2250,7 +2340,7 @@
      * @param locale
      */
     function canonicalizeUnicodeLocaleId(locale) {
-        canonicalizeUnicodeLanguageId(locale.lang);
+        locale.lang = canonicalizeUnicodeLanguageId(locale.lang);
         if (locale.extensions) {
             for (var _i = 0, _a = locale.extensions; _i < _a.length; _i++) {
                 var extension = _a[_i];
@@ -2263,7 +2353,7 @@
                         break;
                     case 't':
                         if (extension.lang) {
-                            canonicalizeUnicodeLanguageId(extension.lang);
+                            extension.lang = canonicalizeUnicodeLanguageId(extension.lang);
                         }
                         extension.fields = canonicalizeKVs(extension.fields);
                         break;