intl-messageformat 10.5.6 → 10.5.7

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 import { IntlMessageFormat } from './src/core';
-export * from './src/formatters';
 export * from './src/core';
 export * from './src/error';
+export * from './src/formatters';
+export { IntlMessageFormat };
 export default IntlMessageFormat;

package/lib/index.js

@@ -1,13 +1,11 @@
-"use strict";
 /*
 Copyright (c) 2014, Yahoo! Inc. All rights reserved.
 Copyrights licensed under the New BSD License.
 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);
-exports.default = core_1.IntlMessageFormat;
+import { IntlMessageFormat } from './src/core';
+export * from './src/core';
+export * from './src/error';
+export * from './src/formatters';
+export { IntlMessageFormat };
+export default IntlMessageFormat;

package/lib/src/core.js

@@ -1,22 +1,19 @@
-"use strict";
 /*
 Copyright (c) 2014, Yahoo! Inc. All rights reserved.
 Copyrights licensed under the New BSD License.
 See the accompanying LICENSE file for terms.
 */
-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 = require("@formatjs/fast-memoize");
-var formatters_1 = require("./formatters");
+import { __assign, __rest, __spreadArray } from "tslib";
+import { parse, } from '@formatjs/icu-messageformat-parser';
+import { memoize, strategies } from '@formatjs/fast-memoize';
+import { formatToParts, PART_TYPE, } from './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 __assign(__assign(__assign({}, (c1 || {})), (c2 || {})), Object.keys(c1).reduce(function (all, k) {
+        all[k] = __assign(__assign({}, c1[k]), (c2[k] || {}));
         return all;
     }, {}));
 }
@@ -27,7 +24,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));
+    }, __assign({}, defaultConfig));
 }
 function createFastMemoizeCache(store) {
     return {
@@ -50,38 +47,38 @@ function createDefaultFormatters(cache) {
         pluralRules: {},
     }; }
     return {
-        getNumberFormat: (0, fast_memoize_1.memoize)(function () {
+        getNumberFormat: memoize(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, false)))();
+            return new ((_a = Intl.NumberFormat).bind.apply(_a, __spreadArray([void 0], args, false)))();
         }, {
             cache: createFastMemoizeCache(cache.number),
-            strategy: fast_memoize_1.strategies.variadic,
+            strategy: strategies.variadic,
         }),
-        getDateTimeFormat: (0, fast_memoize_1.memoize)(function () {
+        getDateTimeFormat: memoize(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, false)))();
+            return new ((_a = Intl.DateTimeFormat).bind.apply(_a, __spreadArray([void 0], args, false)))();
         }, {
             cache: createFastMemoizeCache(cache.dateTime),
-            strategy: fast_memoize_1.strategies.variadic,
+            strategy: strategies.variadic,
         }),
-        getPluralRules: (0, fast_memoize_1.memoize)(function () {
+        getPluralRules: memoize(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, false)))();
+            return new ((_a = Intl.PluralRules).bind.apply(_a, __spreadArray([void 0], args, false)))();
         }, {
             cache: createFastMemoizeCache(cache.pluralRules),
-            strategy: fast_memoize_1.strategies.variadic,
+            strategy: strategies.variadic,
         }),
     };
 }
@@ -102,7 +99,7 @@ var IntlMessageFormat = /** @class */ (function () {
             }
             var result = parts.reduce(function (all, part) {
                 if (!all.length ||
-                    part.type !== formatters_1.PART_TYPE.literal ||
+                    part.type !== PART_TYPE.literal ||
                     typeof all[all.length - 1] !== 'string') {
                     all.push(part.value);
                 }
@@ -117,7 +114,7 @@ var IntlMessageFormat = /** @class */ (function () {
             return result;
         };
         this.formatToParts = function (values) {
-            return (0, formatters_1.formatToParts)(_this.ast, _this.locales, _this.formatters, _this.formats, values, undefined, _this.message);
+            return formatToParts(_this.ast, _this.locales, _this.formatters, _this.formats, values, undefined, _this.message);
         };
         this.resolvedOptions = function () {
             var _a;
@@ -135,9 +132,9 @@ var IntlMessageFormat = /** @class */ (function () {
             if (!IntlMessageFormat.__parse) {
                 throw new TypeError('IntlMessageFormat.__parse must be set to process `message` of type `string`');
             }
-            var _a = opts || {}, formatters = _a.formatters, parseOpts = tslib_1.__rest(_a, ["formatters"]);
+            var _a = opts || {}, formatters = _a.formatters, parseOpts = __rest(_a, ["formatters"]);
             // Parse string messages into an AST.
-            this.ast = IntlMessageFormat.__parse(message, tslib_1.__assign(tslib_1.__assign({}, parseOpts), { locale: this.resolvedLocale }));
+            this.ast = IntlMessageFormat.__parse(message, __assign(__assign({}, parseOpts), { locale: this.resolvedLocale }));
         }
         else {
             this.ast = message;
@@ -173,7 +170,7 @@ var IntlMessageFormat = /** @class */ (function () {
         }
         return new Intl.Locale(typeof locales === 'string' ? locales : locales[0]);
     };
-    IntlMessageFormat.__parse = icu_messageformat_parser_1.parse;
+    IntlMessageFormat.__parse = parse;
     // Default format options used as the prototype of the `formats` provided to the
     // constructor. These are used when constructing the internal Intl.NumberFormat
     // and Intl.DateTimeFormat instances.
@@ -238,4 +235,4 @@ var IntlMessageFormat = /** @class */ (function () {
     };
     return IntlMessageFormat;
 }());
-exports.IntlMessageFormat = IntlMessageFormat;
+export { IntlMessageFormat };

package/lib/src/error.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MissingValueError = exports.InvalidValueTypeError = exports.InvalidValueError = exports.FormatError = exports.ErrorCode = void 0;
-var tslib_1 = require("tslib");
-var ErrorCode;
+import { __extends } from "tslib";
+export var ErrorCode;
 (function (ErrorCode) {
     // When we have a placeholder but no value to format
     ErrorCode["MISSING_VALUE"] = "MISSING_VALUE";
@@ -10,9 +7,9 @@ var ErrorCode;
     ErrorCode["INVALID_VALUE"] = "INVALID_VALUE";
     // When we need specific Intl API but it's not available
     ErrorCode["MISSING_INTL_API"] = "MISSING_INTL_API";
-})(ErrorCode || (exports.ErrorCode = ErrorCode = {}));
+})(ErrorCode || (ErrorCode = {}));
 var FormatError = /** @class */ (function (_super) {
-    tslib_1.__extends(FormatError, _super);
+    __extends(FormatError, _super);
     function FormatError(msg, code, originalMessage) {
         var _this = _super.call(this, msg) || this;
         _this.code = code;
@@ -24,28 +21,28 @@ var FormatError = /** @class */ (function (_super) {
     };
     return FormatError;
 }(Error));
-exports.FormatError = FormatError;
+export { FormatError };
 var InvalidValueError = /** @class */ (function (_super) {
-    tslib_1.__extends(InvalidValueError, _super);
+    __extends(InvalidValueError, _super);
     function InvalidValueError(variableId, value, options, originalMessage) {
         return _super.call(this, "Invalid values for \"".concat(variableId, "\": \"").concat(value, "\". Options are \"").concat(Object.keys(options).join('", "'), "\""), ErrorCode.INVALID_VALUE, originalMessage) || this;
     }
     return InvalidValueError;
 }(FormatError));
-exports.InvalidValueError = InvalidValueError;
+export { InvalidValueError };
 var InvalidValueTypeError = /** @class */ (function (_super) {
-    tslib_1.__extends(InvalidValueTypeError, _super);
+    __extends(InvalidValueTypeError, _super);
     function InvalidValueTypeError(value, type, originalMessage) {
         return _super.call(this, "Value for \"".concat(value, "\" must be of type ").concat(type), ErrorCode.INVALID_VALUE, originalMessage) || this;
     }
     return InvalidValueTypeError;
 }(FormatError));
-exports.InvalidValueTypeError = InvalidValueTypeError;
+export { InvalidValueTypeError };
 var MissingValueError = /** @class */ (function (_super) {
-    tslib_1.__extends(MissingValueError, _super);
+    __extends(MissingValueError, _super);
     function MissingValueError(variableId, originalMessage) {
         return _super.call(this, "The intl string context variable \"".concat(variableId, "\" was not provided to the string \"").concat(originalMessage, "\""), ErrorCode.MISSING_VALUE, originalMessage) || this;
     }
     return MissingValueError;
 }(FormatError));
-exports.MissingValueError = MissingValueError;
+export { MissingValueError };

package/lib/src/formatters.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatToParts = exports.isFormatXMLElementFn = exports.PART_TYPE = void 0;
-var icu_messageformat_parser_1 = require("@formatjs/icu-messageformat-parser");
-var error_1 = require("./error");
-var PART_TYPE;
+import { isArgumentElement, isDateElement, isDateTimeSkeleton, isLiteralElement, isNumberElement, isNumberSkeleton, isPluralElement, isPoundElement, isSelectElement, isTimeElement, isTagElement, } from '@formatjs/icu-messageformat-parser';
+import { MissingValueError, InvalidValueError, ErrorCode, FormatError, InvalidValueTypeError, } from './error';
+export var PART_TYPE;
 (function (PART_TYPE) {
     PART_TYPE[PART_TYPE["literal"] = 0] = "literal";
     PART_TYPE[PART_TYPE["object"] = 1] = "object";
-})(PART_TYPE || (exports.PART_TYPE = PART_TYPE = {}));
+})(PART_TYPE || (PART_TYPE = {}));
 function mergeLiteral(parts) {
     if (parts.length < 2) {
         return parts;
@@ -25,16 +22,15 @@ function mergeLiteral(parts) {
         return all;
     }, []);
 }
-function isFormatXMLElementFn(el) {
+export function isFormatXMLElementFn(el) {
     return typeof el === 'function';
 }
-exports.isFormatXMLElementFn = isFormatXMLElementFn;
 // TODO(skeleton): add skeleton support
-function formatToParts(els, locales, formatters, formats, values, currentPluralValue, 
+export function formatToParts(els, locales, formatters, formats, values, currentPluralValue, 
 // For debugging
 originalMessage) {
     // Hot path for straight simple msg translations
-    if (els.length === 1 && (0, icu_messageformat_parser_1.isLiteralElement)(els[0])) {
+    if (els.length === 1 && isLiteralElement(els[0])) {
         return [
             {
                 type: PART_TYPE.literal,
@@ -46,7 +42,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 ((0, icu_messageformat_parser_1.isLiteralElement)(el)) {
+        if (isLiteralElement(el)) {
             result.push({
                 type: PART_TYPE.literal,
                 value: el.value,
@@ -55,7 +51,7 @@ originalMessage) {
         }
         // TODO: should this part be literal type?
         // Replace `#` in plural rules with the actual numeric value.
-        if ((0, icu_messageformat_parser_1.isPoundElement)(el)) {
+        if (isPoundElement(el)) {
             if (typeof currentPluralValue === 'number') {
                 result.push({
                     type: PART_TYPE.literal,
@@ -67,10 +63,10 @@ originalMessage) {
         var varName = el.value;
         // Enforce that all required values are provided by the caller.
         if (!(values && varName in values)) {
-            throw new error_1.MissingValueError(varName, originalMessage);
+            throw new MissingValueError(varName, originalMessage);
         }
         var value = values[varName];
-        if ((0, icu_messageformat_parser_1.isArgumentElement)(el)) {
+        if (isArgumentElement(el)) {
             if (!value || typeof value === 'string' || typeof value === 'number') {
                 value =
                     typeof value === 'string' || typeof value === 'number'
@@ -86,10 +82,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 ((0, icu_messageformat_parser_1.isDateElement)(el)) {
+        if (isDateElement(el)) {
             var style = typeof el.style === 'string'
                 ? formats.date[el.style]
-                : (0, icu_messageformat_parser_1.isDateTimeSkeleton)(el.style)
+                : isDateTimeSkeleton(el.style)
                     ? el.style.parsedOptions
                     : undefined;
             result.push({
@@ -100,10 +96,10 @@ originalMessage) {
             });
             continue;
         }
-        if ((0, icu_messageformat_parser_1.isTimeElement)(el)) {
+        if (isTimeElement(el)) {
             var style = typeof el.style === 'string'
                 ? formats.time[el.style]
-                : (0, icu_messageformat_parser_1.isDateTimeSkeleton)(el.style)
+                : isDateTimeSkeleton(el.style)
                     ? el.style.parsedOptions
                     : formats.time.medium;
             result.push({
@@ -114,10 +110,10 @@ originalMessage) {
             });
             continue;
         }
-        if ((0, icu_messageformat_parser_1.isNumberElement)(el)) {
+        if (isNumberElement(el)) {
             var style = typeof el.style === 'string'
                 ? formats.number[el.style]
-                : (0, icu_messageformat_parser_1.isNumberSkeleton)(el.style)
+                : isNumberSkeleton(el.style)
                     ? el.style.parsedOptions
                     : undefined;
             if (style && style.scale) {
@@ -133,11 +129,11 @@ originalMessage) {
             });
             continue;
         }
-        if ((0, icu_messageformat_parser_1.isTagElement)(el)) {
+        if (isTagElement(el)) {
             var children = el.children, value_1 = el.value;
             var formatFn = values[value_1];
             if (!isFormatXMLElementFn(formatFn)) {
-                throw new error_1.InvalidValueTypeError(value_1, 'function', originalMessage);
+                throw new InvalidValueTypeError(value_1, 'function', originalMessage);
             }
             var parts = formatToParts(children, locales, formatters, formats, values, currentPluralValue);
             var chunks = formatFn(parts.map(function (p) { return p.value; }));
@@ -151,19 +147,19 @@ originalMessage) {
                 };
             }));
         }
-        if ((0, icu_messageformat_parser_1.isSelectElement)(el)) {
+        if (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);
+                throw new InvalidValueError(el.value, value, Object.keys(el.options), originalMessage);
             }
             result.push.apply(result, formatToParts(opt.value, locales, formatters, formats, values));
             continue;
         }
-        if ((0, icu_messageformat_parser_1.isPluralElement)(el)) {
+        if (isPluralElement(el)) {
             var opt = el.options["=".concat(value)];
             if (!opt) {
                 if (!Intl.PluralRules) {
-                    throw new error_1.FormatError("Intl.PluralRules is not available in this environment.\nTry polyfilling it using \"@formatjs/intl-pluralrules\"\n", error_1.ErrorCode.MISSING_INTL_API, originalMessage);
+                    throw new FormatError("Intl.PluralRules is not available in this environment.\nTry polyfilling it using \"@formatjs/intl-pluralrules\"\n", ErrorCode.MISSING_INTL_API, originalMessage);
                 }
                 var rule = formatters
                     .getPluralRules(locales, { type: el.pluralType })
@@ -171,7 +167,7 @@ originalMessage) {
                 opt = el.options[rule] || el.options.other;
             }
             if (!opt) {
-                throw new error_1.InvalidValueError(el.value, value, Object.keys(el.options), originalMessage);
+                throw new InvalidValueError(el.value, value, Object.keys(el.options), originalMessage);
             }
             result.push.apply(result, formatToParts(opt.value, locales, formatters, formats, values, value - (el.offset || 0)));
             continue;
@@ -179,4 +175,3 @@ originalMessage) {
     }
     return mergeLiteral(result);
 }
-exports.formatToParts = formatToParts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intl-messageformat",
-  "version": "10.5.6",
+  "version": "10.5.7",
   "description": "Formats ICU Message strings with number, date, plural, and select placeholders to create localized messages.",
   "keywords": [
     "i18n",