intl-messageformat 9.9.2 → 9.9.6

package/index.js

@@ -7,7 +7,7 @@ See the accompanying LICENSE file for terms.
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var core_1 = require("./src/core");
-tslib_1.__exportStar(require("./src/formatters"), exports);
-tslib_1.__exportStar(require("./src/core"), exports);
-tslib_1.__exportStar(require("./src/error"), exports);
+(0, tslib_1.__exportStar)(require("./src/formatters"), exports);
+(0, tslib_1.__exportStar)(require("./src/core"), exports);
+(0, tslib_1.__exportStar)(require("./src/error"), exports);
 exports.default = core_1.IntlMessageFormat;

package/intl-messageformat.esm.js

@@ -1,8 +1,5 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
@@ -242,11 +239,16 @@ function icuUnitToEcma(unit) {
   return unit.replace(/^(.*?)-/, "");
 }
 var FRACTION_PRECISION_REGEX = /^\.(?:(0+)(\*)?|(#+)|(0+)(#+))$/g;
-var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?$/g;
+var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?[rs]?$/g;
 var INTEGER_WIDTH_REGEX = /(\*)(0+)|(#+)(0+)|(0+)/g;
 var CONCISE_INTEGER_WIDTH_REGEX = /^(0+)$/;
 function parseSignificantPrecision(str) {
   var result = {};
+  if (str[str.length - 1] === "r") {
+    result.roundingPriority = "morePrecision";
+  } else if (str[str.length - 1] === "s") {
+    result.roundingPriority = "lessPrecision";
+  }
   str.replace(SIGNIFICANT_PRECISION_REGEX, function(_, g1, g2) {
     if (typeof g2 !== "string") {
       result.minimumSignificantDigits = g1.length;
@@ -381,13 +383,13 @@ function parseNumberSkeleton(tokens) {
         result.compactDisplay = "long";
         continue;
       case "scientific":
-        result = __assign(__assign(__assign({}, result), { notation: "scientific" }), token.options.reduce(function(all, opt) {
-          return __assign(__assign({}, all), parseNotationOptions(opt));
+        result = __assign(__assign(__assign({}, result), { notation: "scientific" }), token.options.reduce(function(all, opt2) {
+          return __assign(__assign({}, all), parseNotationOptions(opt2));
         }, {}));
         continue;
       case "engineering":
-        result = __assign(__assign(__assign({}, result), { notation: "engineering" }), token.options.reduce(function(all, opt) {
-          return __assign(__assign({}, all), parseNotationOptions(opt));
+        result = __assign(__assign(__assign({}, result), { notation: "engineering" }), token.options.reduce(function(all, opt2) {
+          return __assign(__assign({}, all), parseNotationOptions(opt2));
         }, {}));
         continue;
       case "notation-simple":
@@ -449,8 +451,11 @@ function parseNumberSkeleton(tokens) {
         }
         return "";
       });
-      if (token.options.length) {
-        result = __assign(__assign({}, result), parseSignificantPrecision(token.options[0]));
+      var opt = token.options[0];
+      if (opt === "w") {
+        result = __assign(__assign({}, result), { trailingZeroDisplay: "stripIfInteger" });
+      } else if (opt) {
+        result = __assign(__assign({}, result), parseSignificantPrecision(opt));
       }
       continue;
     }

package/intl-messageformat.iife.js

@@ -3,9 +3,6 @@ var IntlMessageFormat = (function() {
   var __markAsModule = function(target) {
     return __defProp(target, "__esModule", { value: true });
   };
-  var __require = typeof require !== "undefined" ? require : function(x) {
-    throw new Error('Dynamic require of "' + x + '" is not supported');
-  };
   var __export = function(target, all) {
     __markAsModule(target);
     for (var name in all)
@@ -311,11 +308,16 @@ var IntlMessageFormat = (function() {
     return unit.replace(/^(.*?)-/, "");
   }
   var FRACTION_PRECISION_REGEX = /^\.(?:(0+)(\*)?|(#+)|(0+)(#+))$/g;
-  var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?$/g;
+  var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?[rs]?$/g;
   var INTEGER_WIDTH_REGEX = /(\*)(0+)|(#+)(0+)|(0+)/g;
   var CONCISE_INTEGER_WIDTH_REGEX = /^(0+)$/;
   function parseSignificantPrecision(str) {
     var result = {};
+    if (str[str.length - 1] === "r") {
+      result.roundingPriority = "morePrecision";
+    } else if (str[str.length - 1] === "s") {
+      result.roundingPriority = "lessPrecision";
+    }
     str.replace(SIGNIFICANT_PRECISION_REGEX, function(_, g1, g2) {
       if (typeof g2 !== "string") {
         result.minimumSignificantDigits = g1.length;
@@ -450,13 +452,13 @@ var IntlMessageFormat = (function() {
           result.compactDisplay = "long";
           continue;
         case "scientific":
-          result = __assign(__assign(__assign({}, result), { notation: "scientific" }), token.options.reduce(function(all, opt) {
-            return __assign(__assign({}, all), parseNotationOptions(opt));
+          result = __assign(__assign(__assign({}, result), { notation: "scientific" }), token.options.reduce(function(all, opt2) {
+            return __assign(__assign({}, all), parseNotationOptions(opt2));
           }, {}));
           continue;
         case "engineering":
-          result = __assign(__assign(__assign({}, result), { notation: "engineering" }), token.options.reduce(function(all, opt) {
-            return __assign(__assign({}, all), parseNotationOptions(opt));
+          result = __assign(__assign(__assign({}, result), { notation: "engineering" }), token.options.reduce(function(all, opt2) {
+            return __assign(__assign({}, all), parseNotationOptions(opt2));
           }, {}));
           continue;
         case "notation-simple":
@@ -518,8 +520,11 @@ var IntlMessageFormat = (function() {
           }
           return "";
         });
-        if (token.options.length) {
-          result = __assign(__assign({}, result), parseSignificantPrecision(token.options[0]));
+        var opt = token.options[0];
+        if (opt === "w") {
+          result = __assign(__assign({}, result), { trailingZeroDisplay: "stripIfInteger" });
+        } else if (opt) {
+          result = __assign(__assign({}, result), parseSignificantPrecision(opt));
         }
         continue;
       }
@@ -1634,7 +1639,7 @@ var IntlMessageFormat = (function() {
         for (var _i = 0; _i < arguments.length; _i++) {
           args[_i] = arguments[_i];
         }
-        return new ((_a2 = Intl.NumberFormat).bind.apply(_a2, __spreadArray([void 0], args)))();
+        return new ((_a2 = Intl.NumberFormat).bind.apply(_a2, __spreadArray([void 0], args, false)))();
       }, {
         cache: createFastMemoizeCache(cache.number),
         strategy: strategies.variadic
@@ -1645,7 +1650,7 @@ var IntlMessageFormat = (function() {
         for (var _i = 0; _i < arguments.length; _i++) {
           args[_i] = arguments[_i];
         }
-        return new ((_a2 = Intl.DateTimeFormat).bind.apply(_a2, __spreadArray([void 0], args)))();
+        return new ((_a2 = Intl.DateTimeFormat).bind.apply(_a2, __spreadArray([void 0], args, false)))();
       }, {
         cache: createFastMemoizeCache(cache.dateTime),
         strategy: strategies.variadic
@@ -1656,7 +1661,7 @@ var IntlMessageFormat = (function() {
         for (var _i = 0; _i < arguments.length; _i++) {
           args[_i] = arguments[_i];
         }
-        return new ((_a2 = Intl.PluralRules).bind.apply(_a2, __spreadArray([void 0], args)))();
+        return new ((_a2 = Intl.PluralRules).bind.apply(_a2, __spreadArray([void 0], args, false)))();
       }, {
         cache: createFastMemoizeCache(cache.pluralRules),
         strategy: strategies.variadic

package/lib/src/core.js

@@ -53,7 +53,7 @@ function createDefaultFormatters(cache) {
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            return new ((_a = Intl.NumberFormat).bind.apply(_a, __spreadArray([void 0], args)))();
+            return new ((_a = Intl.NumberFormat).bind.apply(_a, __spreadArray([void 0], args, false)))();
         }, {
             cache: createFastMemoizeCache(cache.number),
             strategy: strategies.variadic,
@@ -64,7 +64,7 @@ function createDefaultFormatters(cache) {
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            return new ((_a = Intl.DateTimeFormat).bind.apply(_a, __spreadArray([void 0], args)))();
+            return new ((_a = Intl.DateTimeFormat).bind.apply(_a, __spreadArray([void 0], args, false)))();
         }, {
             cache: createFastMemoizeCache(cache.dateTime),
             strategy: strategies.variadic,
@@ -75,7 +75,7 @@ function createDefaultFormatters(cache) {
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            return new ((_a = Intl.PluralRules).bind.apply(_a, __spreadArray([void 0], args)))();
+            return new ((_a = Intl.PluralRules).bind.apply(_a, __spreadArray([void 0], args, false)))();
         }, {
             cache: createFastMemoizeCache(cache.pluralRules),
             strategy: strategies.variadic,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intl-messageformat",
-  "version": "9.9.2",
+  "version": "9.9.6",
   "description": "Formats ICU Message strings with number, date, plural, and select placeholders to create localized messages.",
   "keywords": [
     "i18n",
@@ -32,7 +32,7 @@
   "types": "index.d.ts",
   "dependencies": {
     "@formatjs/fast-memoize": "1.2.0",
-    "@formatjs/icu-messageformat-parser": "2.0.12",
+    "@formatjs/icu-messageformat-parser": "2.0.14",
     "tslib": "^2.1.0"
   },
   "sideEffects": false,

package/src/core.js

@@ -8,15 +8,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IntlMessageFormat = void 0;
 var tslib_1 = require("tslib");
 var icu_messageformat_parser_1 = require("@formatjs/icu-messageformat-parser");
-var fast_memoize_1 = tslib_1.__importStar(require("@formatjs/fast-memoize"));
+var fast_memoize_1 = (0, tslib_1.__importStar)(require("@formatjs/fast-memoize"));
 var formatters_1 = require("./formatters");
 // -- MessageFormat --------------------------------------------------------
 function mergeConfig(c1, c2) {
     if (!c2) {
         return c1;
     }
-    return tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, (c1 || {})), (c2 || {})), Object.keys(c1).reduce(function (all, k) {
-        all[k] = tslib_1.__assign(tslib_1.__assign({}, c1[k]), (c2[k] || {}));
+    return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, (c1 || {})), (c2 || {})), Object.keys(c1).reduce(function (all, k) {
+        all[k] = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, c1[k]), (c2[k] || {}));
         return all;
     }, {}));
 }
@@ -27,7 +27,7 @@ function mergeConfigs(defaultConfig, configs) {
     return Object.keys(defaultConfig).reduce(function (all, k) {
         all[k] = mergeConfig(defaultConfig[k], configs[k]);
         return all;
-    }, tslib_1.__assign({}, defaultConfig));
+    }, (0, tslib_1.__assign)({}, defaultConfig));
 }
 function createFastMemoizeCache(store) {
     return {
@@ -50,35 +50,35 @@ function createDefaultFormatters(cache) {
         pluralRules: {},
     }; }
     return {
-        getNumberFormat: fast_memoize_1.default(function () {
+        getNumberFormat: (0, fast_memoize_1.default)(function () {
             var _a;
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            return new ((_a = Intl.NumberFormat).bind.apply(_a, tslib_1.__spreadArray([void 0], args)))();
+            return new ((_a = Intl.NumberFormat).bind.apply(_a, (0, tslib_1.__spreadArray)([void 0], args, false)))();
         }, {
             cache: createFastMemoizeCache(cache.number),
             strategy: fast_memoize_1.strategies.variadic,
         }),
-        getDateTimeFormat: fast_memoize_1.default(function () {
+        getDateTimeFormat: (0, fast_memoize_1.default)(function () {
             var _a;
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            return new ((_a = Intl.DateTimeFormat).bind.apply(_a, tslib_1.__spreadArray([void 0], args)))();
+            return new ((_a = Intl.DateTimeFormat).bind.apply(_a, (0, tslib_1.__spreadArray)([void 0], args, false)))();
         }, {
             cache: createFastMemoizeCache(cache.dateTime),
             strategy: fast_memoize_1.strategies.variadic,
         }),
-        getPluralRules: fast_memoize_1.default(function () {
+        getPluralRules: (0, fast_memoize_1.default)(function () {
             var _a;
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            return new ((_a = Intl.PluralRules).bind.apply(_a, tslib_1.__spreadArray([void 0], args)))();
+            return new ((_a = Intl.PluralRules).bind.apply(_a, (0, tslib_1.__spreadArray)([void 0], args, false)))();
         }, {
             cache: createFastMemoizeCache(cache.pluralRules),
             strategy: fast_memoize_1.strategies.variadic,
@@ -117,7 +117,7 @@ var IntlMessageFormat = /** @class */ (function () {
             return result;
         };
         this.formatToParts = function (values) {
-            return formatters_1.formatToParts(_this.ast, _this.locales, _this.formatters, _this.formats, values, undefined, _this.message);
+            return (0, formatters_1.formatToParts)(_this.ast, _this.locales, _this.formatters, _this.formats, values, undefined, _this.message);
         };
         this.resolvedOptions = function () { return ({
             locale: Intl.NumberFormat.supportedLocalesOf(_this.locales)[0],

package/src/error.js

@@ -12,7 +12,7 @@ var ErrorCode;
     ErrorCode["MISSING_INTL_API"] = "MISSING_INTL_API";
 })(ErrorCode = exports.ErrorCode || (exports.ErrorCode = {}));
 var FormatError = /** @class */ (function (_super) {
-    tslib_1.__extends(FormatError, _super);
+    (0, tslib_1.__extends)(FormatError, _super);
     function FormatError(msg, code, originalMessage) {
         var _this = _super.call(this, msg) || this;
         _this.code = code;
@@ -26,7 +26,7 @@ var FormatError = /** @class */ (function (_super) {
 }(Error));
 exports.FormatError = FormatError;
 var InvalidValueError = /** @class */ (function (_super) {
-    tslib_1.__extends(InvalidValueError, _super);
+    (0, tslib_1.__extends)(InvalidValueError, _super);
     function InvalidValueError(variableId, value, options, originalMessage) {
         return _super.call(this, "Invalid values for \"" + variableId + "\": \"" + value + "\". Options are \"" + Object.keys(options).join('", "') + "\"", ErrorCode.INVALID_VALUE, originalMessage) || this;
     }
@@ -34,7 +34,7 @@ var InvalidValueError = /** @class */ (function (_super) {
 }(FormatError));
 exports.InvalidValueError = InvalidValueError;
 var InvalidValueTypeError = /** @class */ (function (_super) {
-    tslib_1.__extends(InvalidValueTypeError, _super);
+    (0, tslib_1.__extends)(InvalidValueTypeError, _super);
     function InvalidValueTypeError(value, type, originalMessage) {
         return _super.call(this, "Value for \"" + value + "\" must be of type " + type, ErrorCode.INVALID_VALUE, originalMessage) || this;
     }
@@ -42,7 +42,7 @@ var InvalidValueTypeError = /** @class */ (function (_super) {
 }(FormatError));
 exports.InvalidValueTypeError = InvalidValueTypeError;
 var MissingValueError = /** @class */ (function (_super) {
-    tslib_1.__extends(MissingValueError, _super);
+    (0, tslib_1.__extends)(MissingValueError, _super);
     function MissingValueError(variableId, originalMessage) {
         return _super.call(this, "The intl string context variable \"" + variableId + "\" was not provided to the string \"" + originalMessage + "\"", ErrorCode.MISSING_VALUE, originalMessage) || this;
     }

package/src/formatters.js

@@ -34,7 +34,7 @@ function formatToParts(els, locales, formatters, formats, values, currentPluralV
 // For debugging
 originalMessage) {
     // Hot path for straight simple msg translations
-    if (els.length === 1 && icu_messageformat_parser_1.isLiteralElement(els[0])) {
+    if (els.length === 1 && (0, icu_messageformat_parser_1.isLiteralElement)(els[0])) {
         return [
             {
                 type: PART_TYPE.literal,
@@ -46,7 +46,7 @@ originalMessage) {
     for (var _i = 0, els_1 = els; _i < els_1.length; _i++) {
         var el = els_1[_i];
         // Exit early for string parts.
-        if (icu_messageformat_parser_1.isLiteralElement(el)) {
+        if ((0, icu_messageformat_parser_1.isLiteralElement)(el)) {
             result.push({
                 type: PART_TYPE.literal,
                 value: el.value,
@@ -55,7 +55,7 @@ originalMessage) {
         }
         // TODO: should this part be literal type?
         // Replace `#` in plural rules with the actual numeric value.
-        if (icu_messageformat_parser_1.isPoundElement(el)) {
+        if ((0, icu_messageformat_parser_1.isPoundElement)(el)) {
             if (typeof currentPluralValue === 'number') {
                 result.push({
                     type: PART_TYPE.literal,
@@ -70,7 +70,7 @@ originalMessage) {
             throw new error_1.MissingValueError(varName, originalMessage);
         }
         var value = values[varName];
-        if (icu_messageformat_parser_1.isArgumentElement(el)) {
+        if ((0, icu_messageformat_parser_1.isArgumentElement)(el)) {
             if (!value || typeof value === 'string' || typeof value === 'number') {
                 value =
                     typeof value === 'string' || typeof value === 'number'
@@ -86,10 +86,10 @@ originalMessage) {
         // Recursively format plural and select parts' option — which can be a
         // nested pattern structure. The choosing of the option to use is
         // abstracted-by and delegated-to the part helper object.
-        if (icu_messageformat_parser_1.isDateElement(el)) {
+        if ((0, icu_messageformat_parser_1.isDateElement)(el)) {
             var style = typeof el.style === 'string'
                 ? formats.date[el.style]
-                : icu_messageformat_parser_1.isDateTimeSkeleton(el.style)
+                : (0, icu_messageformat_parser_1.isDateTimeSkeleton)(el.style)
                     ? el.style.parsedOptions
                     : undefined;
             result.push({
@@ -100,10 +100,10 @@ originalMessage) {
             });
             continue;
         }
-        if (icu_messageformat_parser_1.isTimeElement(el)) {
+        if ((0, icu_messageformat_parser_1.isTimeElement)(el)) {
             var style = typeof el.style === 'string'
                 ? formats.time[el.style]
-                : icu_messageformat_parser_1.isDateTimeSkeleton(el.style)
+                : (0, icu_messageformat_parser_1.isDateTimeSkeleton)(el.style)
                     ? el.style.parsedOptions
                     : undefined;
             result.push({
@@ -114,10 +114,10 @@ originalMessage) {
             });
             continue;
         }
-        if (icu_messageformat_parser_1.isNumberElement(el)) {
+        if ((0, icu_messageformat_parser_1.isNumberElement)(el)) {
             var style = typeof el.style === 'string'
                 ? formats.number[el.style]
-                : icu_messageformat_parser_1.isNumberSkeleton(el.style)
+                : (0, icu_messageformat_parser_1.isNumberSkeleton)(el.style)
                     ? el.style.parsedOptions
                     : undefined;
             if (style && style.scale) {
@@ -133,7 +133,7 @@ originalMessage) {
             });
             continue;
         }
-        if (icu_messageformat_parser_1.isTagElement(el)) {
+        if ((0, icu_messageformat_parser_1.isTagElement)(el)) {
             var children = el.children, value_1 = el.value;
             var formatFn = values[value_1];
             if (!isFormatXMLElementFn(formatFn)) {
@@ -151,7 +151,7 @@ originalMessage) {
                 };
             }));
         }
-        if (icu_messageformat_parser_1.isSelectElement(el)) {
+        if ((0, icu_messageformat_parser_1.isSelectElement)(el)) {
             var opt = el.options[value] || el.options.other;
             if (!opt) {
                 throw new error_1.InvalidValueError(el.value, value, Object.keys(el.options), originalMessage);
@@ -159,7 +159,7 @@ originalMessage) {
             result.push.apply(result, formatToParts(opt.value, locales, formatters, formats, values));
             continue;
         }
-        if (icu_messageformat_parser_1.isPluralElement(el)) {
+        if ((0, icu_messageformat_parser_1.isPluralElement)(el)) {
             var opt = el.options["=" + value];
             if (!opt) {
                 if (!Intl.PluralRules) {