@formatjs/intl-segmenter 11.7.2 → 11.7.4

package/lib/polyfill-force.js

@@ -5,4 +5,3 @@ Object.defineProperty(Intl, 'Segmenter', {
     writable: true,
     configurable: true,
 });
-//# sourceMappingURL=polyfill-force.js.map

package/lib/polyfill.js

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

package/lib/should-polyfill.js

@@ -1,4 +1,3 @@
 export function shouldPolyfill() {
     return !Intl.Segmenter;
 }
-//# sourceMappingURL=should-polyfill.js.map

package/lib/src/cldr-segmentation-rules.generated.js

@@ -1264,4 +1264,3 @@ export var SegmentationRules = {
     },
     "zh": {}
 };
-//# sourceMappingURL=cldr-segmentation-rules.generated.js.map

package/lib/src/segmentation-utils.js

@@ -30,4 +30,3 @@ export var isSurrogate = function (str, pos) {
 //     return false
 //   }
 // }
-//# sourceMappingURL=segmentation-utils.js.map

package/lib/src/segmenter.js

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

package/lib/test262-main.js

@@ -1,4 +1,3 @@
 // @generated
 // @ts-nocheck
 import './polyfill-force';
-//# sourceMappingURL=test262-main.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-segmenter",
-  "version": "11.7.2",
+  "version": "11.7.4",
   "description": "Polyfill for Intl.Segmenter",
   "keywords": [
     "intl",
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "tslib": "2",
-    "@formatjs/intl-localematcher": "0.5.7",
-    "@formatjs/ecma402-abstract": "2.2.2"
+    "@formatjs/intl-localematcher": "0.5.8",
+    "@formatjs/ecma402-abstract": "2.2.4"
   },
   "main": "index.js",
   "types": "index.d.ts",

package/polyfill-force.js

@@ -7,4 +7,3 @@ Object.defineProperty(Intl, 'Segmenter', {
     writable: true,
     configurable: true,
 });
-//# sourceMappingURL=polyfill-force.js.map

package/polyfill.iife.js

@@ -4450,6 +4450,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();
+    invariant(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) {
+    invariant(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;
@@ -4487,47 +4531,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) {
-    invariant(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) {
+    invariant(extension === extension.toLowerCase(), "Expected extension to be lowercase");
+    invariant(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);
+      invariant(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 {
+        invariant(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") {
@@ -4535,56 +4582,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];
-      invariant(foundLocale in localeData, "Missing locale data for ".concat(foundLocale));
-      var foundLocaleData = localeData[foundLocale];
-      invariant(typeof foundLocaleData === "object" && foundLocaleData !== null, "locale data ".concat(key, " must be an object"));
-      var keyLocaleData = foundLocaleData[key];
-      invariant(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 : [];
+      invariant(Array.isArray(keyLocaleData), "keyLocaleData for ".concat(key2, " must be an array"));
       var value = keyLocaleData[0];
-      invariant(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);
+      invariant(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];
-        invariant(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];
+      invariant(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;
+      }
+      if (supportedKeyword) {
+        supportedKeywords.push(supportedKeyword);
       }
-      foundLocale = Intl.getCanonicalLocales(foundLocale)[0];
+      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

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

package/should-polyfill.js

@@ -4,4 +4,3 @@ exports.shouldPolyfill = shouldPolyfill;
 function shouldPolyfill() {
     return !Intl.Segmenter;
 }
-//# sourceMappingURL=should-polyfill.js.map

package/src/cldr-segmentation-rules.generated.js

@@ -1267,4 +1267,3 @@ exports.SegmentationRules = {
     },
     "zh": {}
 };
-//# sourceMappingURL=cldr-segmentation-rules.generated.js.map

package/src/segmentation-utils.js

@@ -35,4 +35,3 @@ exports.isSurrogate = isSurrogate;
 //     return false
 //   }
 // }
-//# sourceMappingURL=segmentation-utils.js.map

package/src/segmenter.js

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

package/test262-main.js

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @generated
 // @ts-nocheck
 require("./polyfill-force");
-//# sourceMappingURL=test262-main.js.map