intl-messageformat 11.1.2 → 11.2.0

package/intl-messageformat.iife.js

@@ -1,37 +1,9 @@
 var IntlMessageFormat = (() => {
   var __defProp = Object.defineProperty;
-  var __defProps = Object.defineProperties;
   var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-  var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
   var __getOwnPropNames = Object.getOwnPropertyNames;
-  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __propIsEnum = Object.prototype.propertyIsEnumerable;
   var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    if (__getOwnPropSymbols)
-      for (var prop of __getOwnPropSymbols(b)) {
-        if (__propIsEnum.call(b, prop))
-          __defNormalProp(a, prop, b[prop]);
-      }
-    return a;
-  };
-  var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-  var __objRest = (source, exclude) => {
-    var target = {};
-    for (var prop in source)
-      if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-        target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols)
-      for (var prop of __getOwnPropSymbols(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-          target[prop] = source[prop];
-      }
-    return target;
-  };
   var __export = (target, all) => {
     for (var name in all)
       __defProp(target, name, { get: all[name], enumerable: true });
@@ -411,14 +383,24 @@ var IntlMessageFormat = (() => {
           result.compactDisplay = "long";
           continue;
         case "scientific":
-          result = __spreadValues(__spreadProps(__spreadValues({}, result), {
-            notation: "scientific"
-          }), token.options.reduce((all, opt) => __spreadValues(__spreadValues({}, all), parseNotationOptions(opt)), {}));
+          result = {
+            ...result,
+            notation: "scientific",
+            ...token.options.reduce((all, opt) => ({
+              ...all,
+              ...parseNotationOptions(opt)
+            }), {})
+          };
           continue;
         case "engineering":
-          result = __spreadValues(__spreadProps(__spreadValues({}, result), {
-            notation: "engineering"
-          }), token.options.reduce((all, opt) => __spreadValues(__spreadValues({}, all), parseNotationOptions(opt)), {}));
+          result = {
+            ...result,
+            notation: "engineering",
+            ...token.options.reduce((all, opt) => ({
+              ...all,
+              ...parseNotationOptions(opt)
+            }), {})
+          };
           continue;
         case "notation-simple":
           result.notation = "standard";
@@ -502,25 +484,38 @@ var IntlMessageFormat = (() => {
         });
         const opt = token.options[0];
         if (opt === "w") {
-          result = __spreadProps(__spreadValues({}, result), {
+          result = {
+            ...result,
             trailingZeroDisplay: "stripIfInteger"
-          });
+          };
         } else if (opt) {
-          result = __spreadValues(__spreadValues({}, result), parseSignificantPrecision(opt));
+          result = {
+            ...result,
+            ...parseSignificantPrecision(opt)
+          };
         }
         continue;
       }
       if (SIGNIFICANT_PRECISION_REGEX.test(token.stem)) {
-        result = __spreadValues(__spreadValues({}, result), parseSignificantPrecision(token.stem));
+        result = {
+          ...result,
+          ...parseSignificantPrecision(token.stem)
+        };
         continue;
       }
       const signOpts = parseSign(token.stem);
       if (signOpts) {
-        result = __spreadValues(__spreadValues({}, result), signOpts);
+        result = {
+          ...result,
+          ...signOpts
+        };
       }
       const conciseScientificAndEngineeringOpts = parseConciseScientificAndEngineeringStem(token.stem);
       if (conciseScientificAndEngineeringOpts) {
-        result = __spreadValues(__spreadValues({}, result), conciseScientificAndEngineeringOpts);
+        result = {
+          ...result,
+          ...conciseScientificAndEngineeringOpts
+        };
       }
     }
     return result;
@@ -1868,10 +1863,9 @@ var IntlMessageFormat = (() => {
   };
   var IDENTIFIER_PREFIX_RE = new RegExp("([^\\p{White_Space}\\p{Pattern_Syntax}]*)", "yu");
   function matchIdentifierAtIndex(s, index) {
-    var _a;
     IDENTIFIER_PREFIX_RE.lastIndex = index;
     const match = IDENTIFIER_PREFIX_RE.exec(s);
-    return (_a = match[1]) != null ? _a : "";
+    return match[1] ?? "";
   }
   var Parser = class {
     constructor(message, options = {}) {
@@ -2179,7 +2173,6 @@ var IntlMessageFormat = (() => {
       };
     }
     parseArgumentOptions(nestingLevel, expectingCloseTag, value, openingBracePosition) {
-      var _a;
       let typeStartPosition = this.clonePosition();
       let argType = this.parseIdentifierIfPossible().value;
       let typeEndPosition = this.clonePosition();
@@ -2260,7 +2253,7 @@ var IntlMessageFormat = (() => {
               type: argType === "number" ? TYPE.number : argType === "date" ? TYPE.date : TYPE.time,
               value,
               location,
-              style: (_a = styleAndLocation == null ? void 0 : styleAndLocation.style) != null ? _a : null
+              style: styleAndLocation?.style ?? null
             },
             err: null
           };
@@ -2271,7 +2264,7 @@ var IntlMessageFormat = (() => {
           const typeEndPosition2 = this.clonePosition();
           this.bumpSpace();
           if (!this.bumpIf(",")) {
-            return this.error(ErrorKind.EXPECT_SELECT_ARGUMENT_OPTIONS, createLocation(typeEndPosition2, __spreadValues({}, typeEndPosition2)));
+            return this.error(ErrorKind.EXPECT_SELECT_ARGUMENT_OPTIONS, createLocation(typeEndPosition2, { ...typeEndPosition2 }));
           }
           this.bumpSpace();
           let identifierAndLocation = this.parseIdentifierIfPossible();
@@ -2384,7 +2377,7 @@ var IntlMessageFormat = (() => {
       let tokens = [];
       try {
         tokens = parseNumberSkeletonFromString(skeleton);
-      } catch (e) {
+      } catch {
         return this.error(ErrorKind.INVALID_NUMBER_SKELETON, location);
       }
       return {
@@ -2619,7 +2612,7 @@ var IntlMessageFormat = (() => {
       const code = this.char();
       const offset = this.offset();
       const nextCode = this.message.charCodeAt(offset + (code >= 65536 ? 2 : 1));
-      return nextCode != null ? nextCode : null;
+      return nextCode ?? null;
     }
   };
   function _isAlpha(codepoint) {
@@ -2654,10 +2647,11 @@ var IntlMessageFormat = (() => {
     });
   }
   function parse(message, opts = {}) {
-    opts = __spreadValues({
+    opts = {
       shouldParseSkeletons: true,
-      requiresOtherClause: true
-    }, opts);
+      requiresOtherClause: true,
+      ...opts
+    };
     const result = new Parser(message, opts).parse();
     if (result.err) {
       const error = SyntaxError(ErrorKind[result.err.kind]);
@@ -2665,7 +2659,7 @@ var IntlMessageFormat = (() => {
       error.originalMessage = result.err.message;
       throw error;
     }
-    if (!(opts == null ? void 0 : opts.captureLocation)) {
+    if (!opts?.captureLocation) {
       pruneLocation(result.val);
     }
     return result.val;
@@ -2919,10 +2913,17 @@ Try polyfilling it using "@formatjs/intl-pluralrules"
     if (!c2) {
       return c1;
     }
-    return __spreadValues(__spreadValues(__spreadValues({}, c1), c2), Object.keys(c1).reduce((all, k) => {
-      all[k] = __spreadValues(__spreadValues({}, c1[k]), c2[k]);
-      return all;
-    }, {}));
+    return {
+      ...c1,
+      ...c2,
+      ...Object.keys(c1).reduce((all, k) => {
+        all[k] = {
+          ...c1[k],
+          ...c2[k]
+        };
+        return all;
+      }, {})
+    };
   }
   function mergeConfigs(defaultConfig, configs) {
     if (!configs) {
@@ -2933,7 +2934,7 @@ Try polyfilling it using "@formatjs/intl-pluralrules"
         all[k] = mergeConfig(defaultConfig[k], configs[k]);
         return all;
       },
-      __spreadValues({}, defaultConfig)
+      { ...defaultConfig }
     );
   }
   function createFastMemoizeCache(store) {
@@ -3013,12 +3014,9 @@ Try polyfilling it using "@formatjs/intl-pluralrules"
         void 0,
         this.message
       ));
-      __publicField(this, "resolvedOptions", () => {
-        var _a;
-        return {
-          locale: ((_a = this.resolvedLocale) == null ? void 0 : _a.toString()) || Intl.NumberFormat.supportedLocalesOf(this.locales)[0]
-        };
-      });
+      __publicField(this, "resolvedOptions", () => ({
+        locale: this.resolvedLocale?.toString() || Intl.NumberFormat.supportedLocalesOf(this.locales)[0]
+      }));
       __publicField(this, "getAst", () => this.ast);
       this.locales = locales;
       this.resolvedLocale = _IntlMessageFormat.resolveLocale(locales);
@@ -3029,10 +3027,11 @@ Try polyfilling it using "@formatjs/intl-pluralrules"
             "IntlMessageFormat.__parse must be set to process `message` of type `string`"
           );
         }
-        const parseOpts = __objRest(opts || {}, []);
-        this.ast = _IntlMessageFormat.__parse(message, __spreadProps(__spreadValues({}, parseOpts), {
+        const { ...parseOpts } = opts || {};
+        this.ast = _IntlMessageFormat.__parse(message, {
+          ...parseOpts,
           locale: this.resolvedLocale
-        }));
+        });
       } else {
         this.ast = message;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "intl-messageformat",
   "description": "Formats ICU Message strings with number, date, plural, and select placeholders to create localized messages.",
-  "version": "11.1.2",
+  "version": "11.2.0",
   "license": "BSD-3-Clause",
   "author": "Eric Ferraiuolo <eferraiuolo@gmail.com>",
   "type": "module",
@@ -11,10 +11,9 @@
     ".": "./index.js"
   },
   "dependencies": {
-    "tslib": "^2.8.1",
-    "@formatjs/ecma402-abstract": "3.1.1",
-    "@formatjs/icu-messageformat-parser": "3.5.1",
-    "@formatjs/fast-memoize": "3.1.0"
+    "@formatjs/ecma402-abstract": "3.2.0",
+    "@formatjs/icu-messageformat-parser": "3.5.3",
+    "@formatjs/fast-memoize": "3.1.1"
   },
   "bugs": "https://github.com/formatjs/formatjs/issues",
   "contributors": [