@formatjs/intl-datetimeformat 6.16.4 → 6.16.6

package/README.md

@@ -1,3 +1,3 @@
 # `intl-datetimeformat`
 
-We've migrated the docs to https://formatjs.io/docs/polyfills/intl-datetimeformat
+We've migrated the docs to https://formatjs.github.io/docs/polyfills/intl-datetimeformat

package/index.js

@@ -2,4 +2,3 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./src/core"), exports);
-//# sourceMappingURL=index.js.map

package/lib/index.js

@@ -1,2 +1 @@
 export * from './src/core';
-//# sourceMappingURL=index.js.map

package/lib/polyfill-force.js

@@ -42,4 +42,3 @@ defineProperty(Date.prototype, 'toLocaleTimeString', {
         }
     },
 });
-//# sourceMappingURL=polyfill-force.js.map

package/lib/polyfill.js

@@ -35,4 +35,3 @@ if (shouldPolyfill()) {
         },
     });
 }
-//# sourceMappingURL=polyfill.js.map

package/lib/should-polyfill.js

@@ -59,4 +59,3 @@ export function shouldPolyfill(locale) {
         return locale ? match([locale], supportedLocales, 'en') : undefined;
     }
 }
-//# sourceMappingURL=should-polyfill.js.map

package/lib/src/abstract/BasicFormatMatcher.js

@@ -104,4 +104,3 @@ export function BasicFormatMatcher(options, formats) {
     }
     return __assign({}, bestFormat);
 }
-//# sourceMappingURL=BasicFormatMatcher.js.map

package/lib/src/abstract/BestFitFormatMatcher.js

@@ -114,4 +114,3 @@ export function BestFitFormatMatcher(options, formats) {
     patternFormat.rangePatterns12 = skeletonFormat.rangePatterns12;
     return patternFormat;
 }
-//# sourceMappingURL=BestFitFormatMatcher.js.map

package/lib/src/abstract/DateTimeStyleFormat.js

@@ -48,4 +48,3 @@ export function DateTimeStyleFormat(dateStyle, timeStyle, dataLocaleData) {
     invariant(dateStyle !== undefined, 'dateStyle should not be undefined');
     return dateFormat;
 }
-//# sourceMappingURL=DateTimeStyleFormat.js.map

package/lib/src/abstract/FormatDateTime.js

@@ -13,4 +13,3 @@ export function FormatDateTime(dtf, x, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTime.js.map

package/lib/src/abstract/FormatDateTimePattern.js

@@ -184,4 +184,3 @@ export function FormatDateTimePattern(dtf, patternParts, x, _a) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTimePattern.js.map

package/lib/src/abstract/FormatDateTimeRange.js

@@ -8,4 +8,3 @@ export function FormatDateTimeRange(dtf, x, y, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTimeRange.js.map

package/lib/src/abstract/FormatDateTimeRangeToParts.js

@@ -12,4 +12,3 @@ export function FormatDateTimeRangeToParts(dtf, x, y, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTimeRangeToParts.js.map

package/lib/src/abstract/FormatDateTimeToParts.js

@@ -19,4 +19,3 @@ export function FormatDateTimeToParts(dtf, x, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTimeToParts.js.map

package/lib/src/abstract/InitializeDateTimeFormat.js

@@ -188,4 +188,3 @@ export function InitializeDateTimeFormat(dtf, locales, opts, _a) {
     internalSlots.rangePatterns = rangePatterns;
     return dtf; // TODO: remove this when https://github.com/microsoft/TypeScript/pull/50402 is merged
 }
-//# sourceMappingURL=InitializeDateTimeFormat.js.map

package/lib/src/abstract/PartitionDateTimePattern.js

@@ -17,4 +17,3 @@ export function PartitionDateTimePattern(dtf, x, implDetails) {
     var pattern = internalSlots.pattern;
     return FormatDateTimePattern(dtf, PartitionPattern(pattern), x, implDetails);
 }
-//# sourceMappingURL=PartitionDateTimePattern.js.map

package/lib/src/abstract/PartitionDateTimeRangePattern.js

@@ -117,4 +117,3 @@ export function PartitionDateTimeRangePattern(dtf, x, y, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=PartitionDateTimeRangePattern.js.map

package/lib/src/abstract/ToDateTimeOptions.js

@@ -61,4 +61,3 @@ export function ToDateTimeOptions(options, required, defaults) {
     }
     return options;
 }
-//# sourceMappingURL=ToDateTimeOptions.js.map

package/lib/src/abstract/ToLocalTime.js

@@ -48,4 +48,3 @@ export function ToLocalTime(t, calendar, timeZone, _a) {
         timeZoneOffset: timeZoneOffset,
     };
 }
-//# sourceMappingURL=ToLocalTime.js.map

package/lib/src/abstract/skeleton.js

@@ -292,4 +292,3 @@ export function splitRangePattern(pattern) {
         },
     ];
 }
-//# sourceMappingURL=skeleton.js.map

package/lib/src/abstract/utils.js

@@ -19,4 +19,3 @@ export var longMorePenalty = 6;
 export var shortLessPenalty = 6;
 export var shortMorePenalty = 3;
 export var offsetPenalty = 1;
-//# sourceMappingURL=utils.js.map

package/lib/src/core.js

@@ -308,4 +308,3 @@ try {
 catch (e) {
     // Meta fix so we're test262-compliant, not important
 }
-//# sourceMappingURL=core.js.map

package/lib/src/data/all-tz.js

@@ -458,4 +458,3 @@ export default {
         "Pacific/Wallis|,0,372,0|-100f9dh,0,372,0|-100f9dg,99,192,0|NaN,99,192,0"
     ]
 };
-//# sourceMappingURL=all-tz.js.map

package/lib/src/data/links.js

@@ -258,4 +258,3 @@ export default {
     "WET": "Europe/Lisbon",
     "Zulu": "Etc/UTC"
 };
-//# sourceMappingURL=links.js.map

package/lib/src/get_internal_slots.js

@@ -9,4 +9,3 @@ export default function getInternalSlots(x) {
     }
     return internalSlots;
 }
-//# sourceMappingURL=get_internal_slots.js.map

package/lib/src/packer.js

@@ -37,4 +37,3 @@ export function unpack(data) {
     }
     return zones;
 }
-//# sourceMappingURL=packer.js.map

package/lib/src/to_locale_string.js

@@ -17,4 +17,3 @@ export function toLocaleTimeString(x, locales, options) {
     var dtf = new DateTimeFormat(locales, ToDateTimeOptions(options, 'time', 'time'));
     return dtf.format(x);
 }
-//# sourceMappingURL=to_locale_string.js.map

package/lib/src/types.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=types.js.map

package/lib/supported-locales.generated.js

@@ -1,2 +1 @@
 export var supportedLocales = ["af", "af-NA", "agq", "ak", "am", "ar", "ar-AE", "ar-BH", "ar-DJ", "ar-DZ", "ar-EG", "ar-EH", "ar-ER", "ar-IL", "ar-IQ", "ar-JO", "ar-KM", "ar-KW", "ar-LB", "ar-LY", "ar-MA", "ar-MR", "ar-OM", "ar-PS", "ar-QA", "ar-SA", "ar-SD", "ar-SO", "ar-SS", "ar-SY", "ar-TD", "ar-TN", "ar-YE", "as", "asa", "ast", "az", "az-Cyrl", "az-Latn", "bas", "be", "be-tarask", "bem", "bez", "bg", "bm", "bn", "bn-IN", "bo", "bo-IN", "br", "brx", "bs", "bs-Cyrl", "bs-Latn", "ca", "ca-AD", "ca-ES-valencia", "ca-FR", "ca-IT", "ccp", "ccp-IN", "ce", "ceb", "cgg", "chr", "ckb", "ckb-IR", "cs", "cy", "da", "da-GL", "dav", "de", "de-AT", "de-BE", "de-CH", "de-IT", "de-LI", "de-LU", "dje", "doi", "dsb", "dua", "dyo", "dz", "ebu", "ee", "ee-TG", "el", "el-CY", "en", "en-001", "en-150", "en-AE", "en-AG", "en-AI", "en-AS", "en-AT", "en-AU", "en-BB", "en-BE", "en-BI", "en-BM", "en-BS", "en-BW", "en-BZ", "en-CA", "en-CC", "en-CH", "en-CK", "en-CM", "en-CX", "en-CY", "en-DE", "en-DG", "en-DK", "en-DM", "en-ER", "en-FI", "en-FJ", "en-FK", "en-FM", "en-GB", "en-GD", "en-GG", "en-GH", "en-GI", "en-GM", "en-GU", "en-GY", "en-HK", "en-IE", "en-IL", "en-IM", "en-IN", "en-IO", "en-JE", "en-JM", "en-KE", "en-KI", "en-KN", "en-KY", "en-LC", "en-LR", "en-LS", "en-MG", "en-MH", "en-MO", "en-MP", "en-MS", "en-MT", "en-MU", "en-MW", "en-MY", "en-NA", "en-NF", "en-NG", "en-NL", "en-NR", "en-NU", "en-NZ", "en-PG", "en-PH", "en-PK", "en-PN", "en-PR", "en-PW", "en-RW", "en-SB", "en-SC", "en-SD", "en-SE", "en-SG", "en-SH", "en-SI", "en-SL", "en-SS", "en-SX", "en-SZ", "en-TC", "en-TK", "en-TO", "en-TT", "en-TV", "en-TZ", "en-UG", "en-UM", "en-VC", "en-VG", "en-VI", "en-VU", "en-WS", "en-ZA", "en-ZM", "en-ZW", "eo", "es", "es-419", "es-AR", "es-BO", "es-BR", "es-BZ", "es-CL", "es-CO", "es-CR", "es-CU", "es-DO", "es-EA", "es-EC", "es-GQ", "es-GT", "es-HN", "es-IC", "es-MX", "es-NI", "es-PA", "es-PE", "es-PH", "es-PR", "es-PY", "es-SV", "es-US", "es-UY", "es-VE", "et", "eu", "ewo", "fa", "fa-AF", "ff", "ff-Adlm", "ff-Adlm-BF", "ff-Adlm-CM", "ff-Adlm-GH", "ff-Adlm-GM", "ff-Adlm-GW", "ff-Adlm-LR", "ff-Adlm-MR", "ff-Adlm-NE", "ff-Adlm-NG", "ff-Adlm-SL", "ff-Adlm-SN", "ff-Latn", "ff-Latn-BF", "ff-Latn-CM", "ff-Latn-GH", "ff-Latn-GM", "ff-Latn-GN", "ff-Latn-GW", "ff-Latn-LR", "ff-Latn-MR", "ff-Latn-NE", "ff-Latn-NG", "ff-Latn-SL", "fi", "fil", "fo", "fo-DK", "fr", "fr-BE", "fr-BF", "fr-BI", "fr-BJ", "fr-BL", "fr-CA", "fr-CD", "fr-CF", "fr-CG", "fr-CH", "fr-CI", "fr-CM", "fr-DJ", "fr-DZ", "fr-GA", "fr-GF", "fr-GN", "fr-GP", "fr-GQ", "fr-HT", "fr-KM", "fr-LU", "fr-MA", "fr-MC", "fr-MF", "fr-MG", "fr-ML", "fr-MQ", "fr-MR", "fr-MU", "fr-NC", "fr-NE", "fr-PF", "fr-PM", "fr-RE", "fr-RW", "fr-SC", "fr-SN", "fr-SY", "fr-TD", "fr-TG", "fr-TN", "fr-VU", "fr-WF", "fr-YT", "fur", "fy", "ga", "ga-GB", "gd", "gl", "gsw", "gsw-FR", "gsw-LI", "gu", "guz", "gv", "ha", "ha-GH", "ha-NE", "haw", "he", "hi", "hr", "hr-BA", "hsb", "hu", "hy", "ia", "id", "ig", "ii", "is", "it", "it-CH", "it-SM", "it-VA", "ja", "jgo", "jmc", "jv", "ka", "kab", "kam", "kde", "kea", "kgp", "khq", "ki", "kk", "kkj", "kl", "kln", "km", "kn", "ko", "ko-KP", "kok", "ks", "ks-Arab", "ksb", "ksf", "ksh", "ku", "kw", "ky", "lag", "lb", "lg", "lkt", "ln", "ln-AO", "ln-CF", "ln-CG", "lo", "lrc", "lrc-IQ", "lt", "lu", "luo", "luy", "lv", "mai", "mas", "mas-TZ", "mer", "mfe", "mg", "mgh", "mgo", "mi", "mk", "ml", "mn", "mni", "mni-Beng", "mr", "ms", "ms-BN", "ms-ID", "ms-SG", "mt", "mua", "my", "mzn", "naq", "nb", "nb-SJ", "nd", "nds", "nds-NL", "ne", "ne-IN", "nl", "nl-AW", "nl-BE", "nl-BQ", "nl-CW", "nl-SR", "nl-SX", "nmg", "nn", "nnh", "no", "nus", "nyn", "om", "om-KE", "or", "os", "os-RU", "pa", "pa-Arab", "pa-Guru", "pcm", "pl", "ps", "ps-PK", "pt", "pt-AO", "pt-CH", "pt-CV", "pt-GQ", "pt-GW", "pt-LU", "pt-MO", "pt-MZ", "pt-PT", "pt-ST", "pt-TL", "qu", "qu-BO", "qu-EC", "rm", "rn", "ro", "ro-MD", "rof", "ru", "ru-BY", "ru-KG", "ru-KZ", "ru-MD", "ru-UA", "rw", "rwk", "sa", "sah", "saq", "sat", "sat-Olck", "sbp", "sc", "sd", "sd-Arab", "sd-Deva", "se", "se-FI", "se-SE", "seh", "ses", "sg", "shi", "shi-Latn", "shi-Tfng", "si", "sk", "sl", "smn", "sn", "so", "so-DJ", "so-ET", "so-KE", "sq", "sq-MK", "sq-XK", "sr", "sr-Cyrl", "sr-Cyrl-BA", "sr-Cyrl-ME", "sr-Cyrl-XK", "sr-Latn", "sr-Latn-BA", "sr-Latn-ME", "sr-Latn-XK", "su", "su-Latn", "sv", "sv-AX", "sv-FI", "sw", "sw-CD", "sw-KE", "sw-UG", "ta", "ta-LK", "ta-MY", "ta-SG", "te", "teo", "teo-KE", "tg", "th", "ti", "ti-ER", "tk", "to", "tr", "tr-CY", "tt", "twq", "tzm", "ug", "uk", "und", "ur", "ur-IN", "uz", "uz-Arab", "uz-Cyrl", "uz-Latn", "vai", "vai-Latn", "vai-Vaii", "vi", "vun", "wae", "wo", "xh", "xog", "yav", "yi", "yo", "yo-BJ", "yrl", "yrl-CO", "yrl-VE", "yue", "yue-Hans", "yue-Hant", "zgh", "zh", "zh-Hans", "zh-Hans-HK", "zh-Hans-MO", "zh-Hans-SG", "zh-Hant", "zh-Hant-HK", "zh-Hant-MO", "zu"];
-//# sourceMappingURL=supported-locales.generated.js.map

package/lib/test262-main.js

@@ -23784,4 +23784,3 @@ Intl.DateTimeFormat.__addLocaleData({
     "locale": "zh"
 });
 Intl.DateTimeFormat.__addTZData(allData);
-//# sourceMappingURL=test262-main.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-datetimeformat",
-  "version": "6.16.4",
+  "version": "6.16.6",
   "description": "Intl.DateTimeFormat polyfill",
   "main": "index.js",
   "types": "index.d.ts",
@@ -23,11 +23,11 @@
   "homepage": "https://github.com/formatjs/formatjs#readme",
   "dependencies": {
     "tslib": "2",
-    "@formatjs/intl-localematcher": "0.5.7",
-    "@formatjs/ecma402-abstract": "2.2.3"
+    "@formatjs/intl-localematcher": "0.5.8",
+    "@formatjs/ecma402-abstract": "2.2.5"
   },
   "devDependencies": {
-    "@formatjs/intl-locale": "4.2.4",
-    "@formatjs/intl-getcanonicallocales": "2.5.2"
+    "@formatjs/intl-getcanonicallocales": "2.5.3",
+    "@formatjs/intl-locale": "4.2.6"
   }
 }

package/polyfill-force.js

@@ -44,4 +44,3 @@ var to_locale_string_1 = require("./src/to_locale_string");
         }
     },
 });
-//# sourceMappingURL=polyfill-force.js.map

package/polyfill.iife.js

@@ -496,15 +496,21 @@
   var serializerDefault = function() {
     return JSON.stringify(arguments);
   };
-  function ObjectWithoutPrototypeCache() {
-    this.cache = /* @__PURE__ */ Object.create(null);
-  }
-  ObjectWithoutPrototypeCache.prototype.get = function(key) {
-    return this.cache[key];
-  };
-  ObjectWithoutPrototypeCache.prototype.set = function(key, value) {
-    this.cache[key] = value;
-  };
+  var ObjectWithoutPrototypeCache = (
+    /** @class */
+    function() {
+      function ObjectWithoutPrototypeCache2() {
+        this.cache = /* @__PURE__ */ Object.create(null);
+      }
+      ObjectWithoutPrototypeCache2.prototype.get = function(key) {
+        return this.cache[key];
+      };
+      ObjectWithoutPrototypeCache2.prototype.set = function(key, value) {
+        this.cache[key] = value;
+      };
+      return ObjectWithoutPrototypeCache2;
+    }()
+  );
   var cacheDefault = {
     create: function create() {
       return new ObjectWithoutPrototypeCache();
@@ -4732,6 +4738,50 @@
     };
   }
 
+  // node_modules/.aspect_rules_js/@formatjs+intl-localematcher@0.0.0/node_modules/@formatjs/intl-localematcher/lib/abstract/CanonicalizeUValue.js
+  function CanonicalizeUValue(ukey, uvalue) {
+    var lowerValue = uvalue.toLowerCase();
+    invariant2(ukey !== void 0, "ukey must be defined");
+    var canonicalized = lowerValue;
+    return canonicalized;
+  }
+
+  // node_modules/.aspect_rules_js/@formatjs+intl-localematcher@0.0.0/node_modules/@formatjs/intl-localematcher/lib/abstract/CanonicalizeUnicodeLocaleId.js
+  function CanonicalizeUnicodeLocaleId(locale) {
+    return Intl.getCanonicalLocales(locale)[0];
+  }
+
+  // node_modules/.aspect_rules_js/@formatjs+intl-localematcher@0.0.0/node_modules/@formatjs/intl-localematcher/lib/abstract/InsertUnicodeExtensionAndCanonicalize.js
+  function InsertUnicodeExtensionAndCanonicalize(locale, attributes, keywords) {
+    invariant2(locale.indexOf("-u-") === -1, "Expected locale to not have a Unicode locale extension");
+    var extension = "-u";
+    for (var _i = 0, attributes_1 = attributes; _i < attributes_1.length; _i++) {
+      var attr = attributes_1[_i];
+      extension += "-".concat(attr);
+    }
+    for (var _a = 0, keywords_1 = keywords; _a < keywords_1.length; _a++) {
+      var kw = keywords_1[_a];
+      var key = kw.key, value = kw.value;
+      extension += "-".concat(key);
+      if (value !== "") {
+        extension += "-".concat(value);
+      }
+    }
+    if (extension === "-u") {
+      return CanonicalizeUnicodeLocaleId(locale);
+    }
+    var privateIndex = locale.indexOf("-x-");
+    var newLocale;
+    if (privateIndex === -1) {
+      newLocale = locale + extension;
+    } else {
+      var preExtension = locale.slice(0, privateIndex);
+      var postExtension = locale.slice(privateIndex);
+      newLocale = preExtension + extension + postExtension;
+    }
+    return CanonicalizeUnicodeLocaleId(newLocale);
+  }
+
   // node_modules/.aspect_rules_js/@formatjs+intl-localematcher@0.0.0/node_modules/@formatjs/intl-localematcher/lib/abstract/BestAvailableLocale.js
   function BestAvailableLocale(availableLocales, locale) {
     var candidate = locale;
@@ -4769,47 +4819,50 @@
     return result;
   }
 
-  // node_modules/.aspect_rules_js/@formatjs+intl-localematcher@0.0.0/node_modules/@formatjs/intl-localematcher/lib/abstract/UnicodeExtensionValue.js
-  function UnicodeExtensionValue(extension, key) {
-    invariant2(key.length === 2, "key must have 2 elements");
+  // node_modules/.aspect_rules_js/@formatjs+intl-localematcher@0.0.0/node_modules/@formatjs/intl-localematcher/lib/abstract/UnicodeExtensionComponents.js
+  function UnicodeExtensionComponents(extension) {
+    invariant2(extension === extension.toLowerCase(), "Expected extension to be lowercase");
+    invariant2(extension.slice(0, 3) === "-u-", "Expected extension to be a Unicode locale extension");
+    var attributes = [];
+    var keywords = [];
+    var keyword;
     var size = extension.length;
-    var searchValue = "-".concat(key, "-");
-    var pos = extension.indexOf(searchValue);
-    if (pos !== -1) {
-      var start = pos + 4;
-      var end = start;
-      var k = start;
-      var done = false;
-      while (!done) {
-        var e = extension.indexOf("-", k);
-        var len = void 0;
-        if (e === -1) {
-          len = size - k;
-        } else {
-          len = e - k;
+    var k = 3;
+    while (k < size) {
+      var e = extension.indexOf("-", k);
+      var len = void 0;
+      if (e === -1) {
+        len = size - k;
+      } else {
+        len = e - k;
+      }
+      var subtag = extension.slice(k, k + len);
+      invariant2(len >= 2, "Expected a subtag to have at least 2 characters");
+      if (keyword === void 0 && len != 2) {
+        if (attributes.indexOf(subtag) === -1) {
+          attributes.push(subtag);
         }
-        if (len === 2) {
-          done = true;
-        } else if (e === -1) {
-          end = size;
-          done = true;
-        } else {
-          end = e;
-          k = e + 1;
+      } else if (len === 2) {
+        keyword = { key: subtag, value: "" };
+        if (keywords.find(function(k2) {
+          return k2.key === (keyword === null || keyword === void 0 ? void 0 : keyword.key);
+        }) === void 0) {
+          keywords.push(keyword);
         }
+      } else if ((keyword === null || keyword === void 0 ? void 0 : keyword.value) === "") {
+        keyword.value = subtag;
+      } else {
+        invariant2(keyword !== void 0, "Expected keyword to be defined");
+        keyword.value += "-" + subtag;
       }
-      return extension.slice(start, end);
+      k += len + 1;
     }
-    searchValue = "-".concat(key);
-    pos = extension.indexOf(searchValue);
-    if (pos !== -1 && pos + 3 === size) {
-      return "";
-    }
-    return void 0;
+    return { attributes, keywords };
   }
 
   // node_modules/.aspect_rules_js/@formatjs+intl-localematcher@0.0.0/node_modules/@formatjs/intl-localematcher/lib/abstract/ResolveLocale.js
   function ResolveLocale(availableLocales, requestedLocales, options, relevantExtensionKeys, localeData, getDefaultLocale) {
+    var _a;
     var matcher = options.localeMatcher;
     var r;
     if (matcher === "lookup") {
@@ -4817,56 +4870,77 @@
     } else {
       r = BestFitMatcher(Array.from(availableLocales), requestedLocales, getDefaultLocale);
     }
+    if (r == null) {
+      r = {
+        locale: getDefaultLocale(),
+        extension: ""
+      };
+    }
     var foundLocale = r.locale;
-    var result = { locale: "", dataLocale: foundLocale };
-    var supportedExtension = "-u";
-    for (var _i = 0, relevantExtensionKeys_1 = relevantExtensionKeys; _i < relevantExtensionKeys_1.length; _i++) {
-      var key = relevantExtensionKeys_1[_i];
-      invariant2(foundLocale in localeData, "Missing locale data for ".concat(foundLocale));
-      var foundLocaleData = localeData[foundLocale];
-      invariant2(typeof foundLocaleData === "object" && foundLocaleData !== null, "locale data ".concat(key, " must be an object"));
-      var keyLocaleData = foundLocaleData[key];
-      invariant2(Array.isArray(keyLocaleData), "keyLocaleData for ".concat(key, " must be an array"));
+    var foundLocaleData = localeData[foundLocale];
+    var result = { locale: "en", dataLocale: foundLocale };
+    var components;
+    var keywords;
+    if (r.extension) {
+      components = UnicodeExtensionComponents(r.extension);
+      keywords = components.keywords;
+    } else {
+      keywords = [];
+    }
+    var supportedKeywords = [];
+    var _loop_1 = function(key2) {
+      var keyLocaleData = (_a = foundLocaleData === null || foundLocaleData === void 0 ? void 0 : foundLocaleData[key2]) !== null && _a !== void 0 ? _a : [];
+      invariant2(Array.isArray(keyLocaleData), "keyLocaleData for ".concat(key2, " must be an array"));
       var value = keyLocaleData[0];
-      invariant2(typeof value === "string" || value === null, "value must be string or null but got ".concat(typeof value, " in key ").concat(key));
-      var supportedExtensionAddition = "";
-      if (r.extension) {
-        var requestedValue = UnicodeExtensionValue(r.extension, key);
-        if (requestedValue !== void 0) {
-          if (requestedValue !== "") {
-            if (~keyLocaleData.indexOf(requestedValue)) {
-              value = requestedValue;
-              supportedExtensionAddition = "-".concat(key, "-").concat(value);
-            }
-          } else if (~requestedValue.indexOf("true")) {
-            value = "true";
-            supportedExtensionAddition = "-".concat(key);
+      invariant2(value === void 0 || typeof value === "string", "value must be a string or undefined");
+      var supportedKeyword = void 0;
+      var entry = keywords.find(function(k) {
+        return k.key === key2;
+      });
+      if (entry) {
+        var requestedValue = entry.value;
+        if (requestedValue !== "") {
+          if (keyLocaleData.indexOf(requestedValue) > -1) {
+            value = requestedValue;
+            supportedKeyword = {
+              key: key2,
+              value
+            };
           }
+        } else if (keyLocaleData.indexOf("true") > -1) {
+          value = "true";
+          supportedKeyword = {
+            key: key2,
+            value
+          };
         }
       }
-      if (key in options) {
-        var optionsValue = options[key];
-        invariant2(typeof optionsValue === "string" || typeof optionsValue === "undefined" || optionsValue === null, "optionsValue must be String, Undefined or Null");
-        if (~keyLocaleData.indexOf(optionsValue)) {
-          if (optionsValue !== value) {
-            value = optionsValue;
-            supportedExtensionAddition = "";
-          }
+      var optionsValue = options[key2];
+      invariant2(optionsValue == null || typeof optionsValue === "string", "optionsValue must be a string or undefined");
+      if (typeof optionsValue === "string") {
+        var ukey = key2.toLowerCase();
+        optionsValue = CanonicalizeUValue(ukey, optionsValue);
+        if (optionsValue === "") {
+          optionsValue = "true";
         }
       }
-      result[key] = value;
-      supportedExtension += supportedExtensionAddition;
-    }
-    if (supportedExtension.length > 2) {
-      var privateIndex = foundLocale.indexOf("-x-");
-      if (privateIndex === -1) {
-        foundLocale = foundLocale + supportedExtension;
-      } else {
-        var preExtension = foundLocale.slice(0, privateIndex);
-        var postExtension = foundLocale.slice(privateIndex, foundLocale.length);
-        foundLocale = preExtension + supportedExtension + postExtension;
+      if (optionsValue !== value && keyLocaleData.indexOf(optionsValue) > -1) {
+        value = optionsValue;
+        supportedKeyword = void 0;
       }
-      foundLocale = Intl.getCanonicalLocales(foundLocale)[0];
+      if (supportedKeyword) {
+        supportedKeywords.push(supportedKeyword);
+      }
+      result[key2] = value;
+    };
+    for (var _i = 0, relevantExtensionKeys_1 = relevantExtensionKeys; _i < relevantExtensionKeys_1.length; _i++) {
+      var key = relevantExtensionKeys_1[_i];
+      _loop_1(key);
+    }
+    var supportedAttributes = [];
+    if (supportedKeywords.length > 0) {
+      supportedAttributes = [];
+      foundLocale = InsertUnicodeExtensionAndCanonicalize(foundLocale, supportedAttributes, supportedKeywords);
     }
     result.locale = foundLocale;
     return result;

package/polyfill.js

@@ -37,4 +37,3 @@ if ((0, should_polyfill_1.shouldPolyfill)()) {
         },
     });
 }
-//# sourceMappingURL=polyfill.js.map

package/should-polyfill.js

@@ -62,4 +62,3 @@ function shouldPolyfill(locale) {
         return locale ? (0, intl_localematcher_1.match)([locale], supported_locales_generated_1.supportedLocales, 'en') : undefined;
     }
 }
-//# sourceMappingURL=should-polyfill.js.map

package/src/abstract/BasicFormatMatcher.js

@@ -107,4 +107,3 @@ function BasicFormatMatcher(options, formats) {
     }
     return tslib_1.__assign({}, bestFormat);
 }
-//# sourceMappingURL=BasicFormatMatcher.js.map

package/src/abstract/BestFitFormatMatcher.js

@@ -118,4 +118,3 @@ function BestFitFormatMatcher(options, formats) {
     patternFormat.rangePatterns12 = skeletonFormat.rangePatterns12;
     return patternFormat;
 }
-//# sourceMappingURL=BestFitFormatMatcher.js.map

package/src/abstract/DateTimeStyleFormat.js

@@ -51,4 +51,3 @@ function DateTimeStyleFormat(dateStyle, timeStyle, dataLocaleData) {
     (0, ecma402_abstract_1.invariant)(dateStyle !== undefined, 'dateStyle should not be undefined');
     return dateFormat;
 }
-//# sourceMappingURL=DateTimeStyleFormat.js.map

package/src/abstract/FormatDateTime.js

@@ -16,4 +16,3 @@ function FormatDateTime(dtf, x, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTime.js.map

package/src/abstract/FormatDateTimePattern.js

@@ -187,4 +187,3 @@ function FormatDateTimePattern(dtf, patternParts, x, _a) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTimePattern.js.map

package/src/abstract/FormatDateTimeRange.js

@@ -11,4 +11,3 @@ function FormatDateTimeRange(dtf, x, y, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTimeRange.js.map

package/src/abstract/FormatDateTimeRangeToParts.js

@@ -15,4 +15,3 @@ function FormatDateTimeRangeToParts(dtf, x, y, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTimeRangeToParts.js.map

package/src/abstract/FormatDateTimeToParts.js

@@ -22,4 +22,3 @@ function FormatDateTimeToParts(dtf, x, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=FormatDateTimeToParts.js.map

package/src/abstract/InitializeDateTimeFormat.js

@@ -191,4 +191,3 @@ function InitializeDateTimeFormat(dtf, locales, opts, _a) {
     internalSlots.rangePatterns = rangePatterns;
     return dtf; // TODO: remove this when https://github.com/microsoft/TypeScript/pull/50402 is merged
 }
-//# sourceMappingURL=InitializeDateTimeFormat.js.map

package/src/abstract/PartitionDateTimePattern.js

@@ -20,4 +20,3 @@ function PartitionDateTimePattern(dtf, x, implDetails) {
     var pattern = internalSlots.pattern;
     return (0, FormatDateTimePattern_1.FormatDateTimePattern)(dtf, (0, ecma402_abstract_1.PartitionPattern)(pattern), x, implDetails);
 }
-//# sourceMappingURL=PartitionDateTimePattern.js.map

package/src/abstract/PartitionDateTimeRangePattern.js

@@ -120,4 +120,3 @@ function PartitionDateTimeRangePattern(dtf, x, y, implDetails) {
     }
     return result;
 }
-//# sourceMappingURL=PartitionDateTimeRangePattern.js.map

package/src/abstract/ToDateTimeOptions.js

@@ -64,4 +64,3 @@ function ToDateTimeOptions(options, required, defaults) {
     }
     return options;
 }
-//# sourceMappingURL=ToDateTimeOptions.js.map

package/src/abstract/ToLocalTime.js

@@ -51,4 +51,3 @@ function ToLocalTime(t, calendar, timeZone, _a) {
         timeZoneOffset: timeZoneOffset,
     };
 }
-//# sourceMappingURL=ToLocalTime.js.map

package/src/abstract/skeleton.js

@@ -298,4 +298,3 @@ function splitRangePattern(pattern) {
         },
     ];
 }
-//# sourceMappingURL=skeleton.js.map

package/src/abstract/utils.js

@@ -22,4 +22,3 @@ exports.longMorePenalty = 6;
 exports.shortLessPenalty = 6;
 exports.shortMorePenalty = 3;
 exports.offsetPenalty = 1;
-//# sourceMappingURL=utils.js.map