@formatjs/intl-locale 4.2.2 → 4.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-locale",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "Intl.Locale polyfill",
   "keywords": [
     "intl",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "tslib": "2",
-    "@formatjs/ecma402-abstract": "2.2.2",
-    "@formatjs/intl-enumerator": "1.8.2",
+    "@formatjs/intl-enumerator": "1.8.3",
+    "@formatjs/ecma402-abstract": "2.2.3",
     "@formatjs/intl-getcanonicallocales": "2.5.2"
   }
 }

package/polyfill.iife.js

@@ -1309,7 +1309,54 @@
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.CollapseNumberRange = CollapseNumberRange2;
-      function CollapseNumberRange2(result) {
+      var PART_TYPES_TO_COLLAPSE = /* @__PURE__ */ new Set([
+        "unit",
+        "exponentMinusSign",
+        "minusSign",
+        "plusSign",
+        "percentSign",
+        "exponentSeparator",
+        "percent",
+        "percentSign",
+        "currency",
+        "literal"
+      ]);
+      function CollapseNumberRange2(numberFormat, result, _a) {
+        var getInternalSlots2 = _a.getInternalSlots;
+        var internalSlots = getInternalSlots2(numberFormat);
+        var symbols = internalSlots.dataLocaleData.numbers.symbols[internalSlots.numberingSystem];
+        var rangeSignRegex = new RegExp("s?[".concat(symbols.rangeSign, "]s?"));
+        var rangeSignIndex = result.findIndex(function(r) {
+          return r.type === "literal" && rangeSignRegex.test(r.value);
+        });
+        var prefixSignParts = [];
+        for (var i = rangeSignIndex - 1; i >= 0; i--) {
+          if (!PART_TYPES_TO_COLLAPSE.has(result[i].type)) {
+            break;
+          }
+          prefixSignParts.unshift(result[i]);
+        }
+        if (Array.from(prefixSignParts.map(function(p) {
+          return p.value;
+        }).join("")).length > 1) {
+          var newResult = Array.from(result);
+          newResult.splice(rangeSignIndex - prefixSignParts.length, prefixSignParts.length);
+          return newResult;
+        }
+        var suffixSignParts = [];
+        for (var i = rangeSignIndex + 1; i < result.length; i++) {
+          if (!PART_TYPES_TO_COLLAPSE.has(result[i].type)) {
+            break;
+          }
+          suffixSignParts.push(result[i]);
+        }
+        if (Array.from(suffixSignParts.map(function(p) {
+          return p.value;
+        }).join("")).length > 1) {
+          var newResult = Array.from(result);
+          newResult.splice(rangeSignIndex + 1, suffixSignParts.length);
+          return newResult;
+        }
         return result;
       }
     }
@@ -3014,9 +3061,9 @@
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.PartitionNumberRangePattern = PartitionNumberRangePattern2;
-      var PartitionNumberPattern_1 = require_PartitionNumberPattern();
       var CollapseNumberRange_1 = require_CollapseNumberRange();
       var FormatApproximately_1 = require_FormatApproximately();
+      var PartitionNumberPattern_1 = require_PartitionNumberPattern();
       function PartitionNumberRangePattern2(numberFormat, x, y, _a) {
         var getInternalSlots2 = _a.getInternalSlots;
         if (isNaN(x) || isNaN(y)) {
@@ -3041,7 +3088,7 @@
           r.source = "endRange";
         }
         result = result.concat(yResult);
-        return (0, CollapseNumberRange_1.CollapseNumberRange)(result);
+        return (0, CollapseNumberRange_1.CollapseNumberRange)(numberFormat, result, { getInternalSlots: getInternalSlots2 });
       }
     }
   });