@formatjs/icu-messageformat-parser 2.0.12 → 2.0.16

package/index.js

@@ -8,27 +8,27 @@ var types_1 = require("./types");
 function pruneLocation(els) {
     els.forEach(function (el) {
         delete el.location;
-        if (types_1.isSelectElement(el) || types_1.isPluralElement(el)) {
+        if ((0, types_1.isSelectElement)(el) || (0, types_1.isPluralElement)(el)) {
             for (var k in el.options) {
                 delete el.options[k].location;
                 pruneLocation(el.options[k].value);
             }
         }
-        else if (types_1.isNumberElement(el) && types_1.isNumberSkeleton(el.style)) {
+        else if ((0, types_1.isNumberElement)(el) && (0, types_1.isNumberSkeleton)(el.style)) {
             delete el.style.location;
         }
-        else if ((types_1.isDateElement(el) || types_1.isTimeElement(el)) &&
-            types_1.isDateTimeSkeleton(el.style)) {
+        else if (((0, types_1.isDateElement)(el) || (0, types_1.isTimeElement)(el)) &&
+            (0, types_1.isDateTimeSkeleton)(el.style)) {
             delete el.style.location;
         }
-        else if (types_1.isTagElement(el)) {
+        else if ((0, types_1.isTagElement)(el)) {
             pruneLocation(el.children);
         }
     });
 }
 function parse(message, opts) {
     if (opts === void 0) { opts = {}; }
-    opts = tslib_1.__assign({ shouldParseSkeletons: true, requiresOtherClause: true }, opts);
+    opts = (0, tslib_1.__assign)({ shouldParseSkeletons: true, requiresOtherClause: true }, opts);
     var result = new parser_1.Parser(message, opts).parse();
     if (result.err) {
         var error = SyntaxError(error_1.ErrorKind[result.err.kind]);
@@ -44,4 +44,4 @@ function parse(message, opts) {
     return result.val;
 }
 exports.parse = parse;
-tslib_1.__exportStar(require("./types"), exports);
+(0, tslib_1.__exportStar)(require("./types"), exports);

package/lib/manipulator.js

@@ -3,7 +3,7 @@ import { isPluralElement, isSelectElement, } from './types';
 function cloneDeep(obj) {
     if (Array.isArray(obj)) {
         // @ts-expect-error meh
-        return __spreadArray([], obj.map(cloneDeep));
+        return __spreadArray([], obj.map(cloneDeep), true);
     }
     if (typeof obj === 'object') {
         // @ts-expect-error meh
@@ -34,7 +34,7 @@ export function hoistSelectors(ast) {
             var cloned = cloneDeep(el);
             var options_1 = cloned.options;
             cloned.options = Object.keys(options_1).reduce(function (all, k) {
-                var newValue = hoistSelectors(__spreadArray(__spreadArray(__spreadArray([], ast.slice(0, i)), options_1[k].value), ast.slice(i + 1)));
+                var newValue = hoistSelectors(__spreadArray(__spreadArray(__spreadArray([], ast.slice(0, i), true), options_1[k].value, true), ast.slice(i + 1), true));
                 all[k] = {
                     value: newValue,
                 };

package/lib/parser.js

@@ -4,8 +4,8 @@ import { ErrorKind } from './error';
 import { SKELETON_TYPE, TYPE, } from './types';
 import { SPACE_SEPARATOR_REGEX } from './regex.generated';
 import { parseNumberSkeleton, parseNumberSkeletonFromString, parseDateTimeSkeleton, } from '@formatjs/icu-skeleton-parser';
-var SPACE_SEPARATOR_START_REGEX = new RegExp("^" + SPACE_SEPARATOR_REGEX.source + "*");
-var SPACE_SEPARATOR_END_REGEX = new RegExp(SPACE_SEPARATOR_REGEX.source + "*$");
+var SPACE_SEPARATOR_START_REGEX = new RegExp("^".concat(SPACE_SEPARATOR_REGEX.source, "*"));
+var SPACE_SEPARATOR_END_REGEX = new RegExp("".concat(SPACE_SEPARATOR_REGEX.source, "*$"));
 function createLocation(start, end) {
     return { start: start, end: end };
 }
@@ -252,7 +252,7 @@ var Parser = /** @class */ (function () {
             return {
                 val: {
                     type: TYPE.literal,
-                    value: "<" + tagName + "/>",
+                    value: "<".concat(tagName, "/>"),
                     location: createLocation(startPosition, this.clonePosition()),
                 },
                 err: null,
@@ -858,7 +858,7 @@ var Parser = /** @class */ (function () {
         }
         var code = codePointAt(this.message, offset);
         if (code === undefined) {
-            throw Error("Offset " + offset + " is at invalid UTF-16 code unit boundary");
+            throw Error("Offset ".concat(offset, " is at invalid UTF-16 code unit boundary"));
         }
         return code;
     };
@@ -926,7 +926,7 @@ var Parser = /** @class */ (function () {
      */
     Parser.prototype.bumpTo = function (targetOffset) {
         if (this.offset() > targetOffset) {
-            throw Error("targetOffset " + targetOffset + " must be greater than or equal to the current offset " + this.offset());
+            throw Error("targetOffset ".concat(targetOffset, " must be greater than or equal to the current offset ").concat(this.offset()));
         }
         targetOffset = Math.min(targetOffset, this.message.length);
         while (true) {
@@ -935,7 +935,7 @@ var Parser = /** @class */ (function () {
                 break;
             }
             if (offset > targetOffset) {
-                throw Error("targetOffset " + targetOffset + " is at invalid UTF-16 code unit boundary");
+                throw Error("targetOffset ".concat(targetOffset, " is at invalid UTF-16 code unit boundary"));
             }
             this.bump();
             if (this.isEOF()) {

package/lib/printer.js

@@ -30,7 +30,7 @@ export function doPrintAST(ast, isInPlural) {
     return printedNodes.join('');
 }
 function printTagElement(el) {
-    return "<" + el.value + ">" + printAST(el.children) + "</" + el.value + ">";
+    return "<".concat(el.value, ">").concat(printAST(el.children), "</").concat(el.value, ">");
 }
 function printEscapedMessage(message) {
     return message.replace(/([{}](?:.*[{}])?)/su, "'$1'");
@@ -42,26 +42,26 @@ function printLiteralElement(_a, isInPlural) {
 }
 function printArgumentElement(_a) {
     var value = _a.value;
-    return "{" + value + "}";
+    return "{".concat(value, "}");
 }
 function printSimpleFormatElement(el) {
-    return "{" + el.value + ", " + TYPE[el.type] + (el.style ? ", " + printArgumentStyle(el.style) : '') + "}";
+    return "{".concat(el.value, ", ").concat(TYPE[el.type]).concat(el.style ? ", ".concat(printArgumentStyle(el.style)) : '', "}");
 }
 function printNumberSkeletonToken(token) {
     var stem = token.stem, options = token.options;
     return options.length === 0
         ? stem
-        : "" + stem + options.map(function (o) { return "/" + o; }).join('');
+        : "".concat(stem).concat(options.map(function (o) { return "/".concat(o); }).join(''));
 }
 function printArgumentStyle(style) {
     if (typeof style === 'string') {
         return printEscapedMessage(style);
     }
     else if (style.type === SKELETON_TYPE.dateTime) {
-        return "::" + printDateTimeSkeleton(style);
+        return "::".concat(printDateTimeSkeleton(style));
     }
     else {
-        return "::" + style.tokens.map(printNumberSkeletonToken).join(' ');
+        return "::".concat(style.tokens.map(printNumberSkeletonToken).join(' '));
     }
 }
 export function printDateTimeSkeleton(style) {
@@ -72,10 +72,10 @@ function printSelectElement(el) {
         el.value,
         'select',
         Object.keys(el.options)
-            .map(function (id) { return id + "{" + doPrintAST(el.options[id].value, false) + "}"; })
+            .map(function (id) { return "".concat(id, "{").concat(doPrintAST(el.options[id].value, false), "}"); })
             .join(' '),
     ].join(',');
-    return "{" + msg + "}";
+    return "{".concat(msg, "}");
 }
 function printPluralElement(el) {
     var type = el.pluralType === 'cardinal' ? 'plural' : 'selectordinal';
@@ -83,9 +83,9 @@ function printPluralElement(el) {
         el.value,
         type,
         __spreadArray([
-            el.offset ? "offset:" + el.offset : ''
-        ], Object.keys(el.options).map(function (id) { return id + "{" + doPrintAST(el.options[id].value, true) + "}"; })).filter(Boolean)
+            el.offset ? "offset:".concat(el.offset) : ''
+        ], Object.keys(el.options).map(function (id) { return "".concat(id, "{").concat(doPrintAST(el.options[id].value, true), "}"); }), true).filter(Boolean)
             .join(' '),
     ].join(',');
-    return "{" + msg + "}";
+    return "{".concat(msg, "}");
 }

package/manipulator.js

@@ -6,7 +6,7 @@ var types_1 = require("./types");
 function cloneDeep(obj) {
     if (Array.isArray(obj)) {
         // @ts-expect-error meh
-        return tslib_1.__spreadArray([], obj.map(cloneDeep));
+        return (0, tslib_1.__spreadArray)([], obj.map(cloneDeep), true);
     }
     if (typeof obj === 'object') {
         // @ts-expect-error meh
@@ -32,12 +32,12 @@ function cloneDeep(obj) {
 function hoistSelectors(ast) {
     var _loop_1 = function (i) {
         var el = ast[i];
-        if (types_1.isPluralElement(el) || types_1.isSelectElement(el)) {
+        if ((0, types_1.isPluralElement)(el) || (0, types_1.isSelectElement)(el)) {
             // pull this out of the ast and move it to the top
             var cloned = cloneDeep(el);
             var options_1 = cloned.options;
             cloned.options = Object.keys(options_1).reduce(function (all, k) {
-                var newValue = hoistSelectors(tslib_1.__spreadArray(tslib_1.__spreadArray(tslib_1.__spreadArray([], ast.slice(0, i)), options_1[k].value), ast.slice(i + 1)));
+                var newValue = hoistSelectors((0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], ast.slice(0, i), true), options_1[k].value, true), ast.slice(i + 1), true));
                 all[k] = {
                     value: newValue,
                 };

package/no-parser.js

@@ -6,4 +6,4 @@ function parse() {
     throw new Error("You're trying to format an uncompiled message with react-intl without parser, please import from 'react-int' instead");
 }
 exports.parse = parse;
-tslib_1.__exportStar(require("./types"), exports);
+(0, tslib_1.__exportStar)(require("./types"), exports);

package/package.json

@@ -1,13 +1,18 @@
 {
   "name": "@formatjs/icu-messageformat-parser",
-  "version": "2.0.12",
+  "version": "2.0.16",
   "main": "index.js",
   "module": "lib/index.js",
   "types": "index.d.ts",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/formatjs/formatjs.git",
+    "directory": "packages/icu-messageformat-parser"
+  },
   "dependencies": {
-    "@formatjs/ecma402-abstract": "1.9.9",
-    "@formatjs/icu-skeleton-parser": "1.2.13",
+    "@formatjs/ecma402-abstract": "1.11.1",
+    "@formatjs/icu-skeleton-parser": "1.3.3",
     "tslib": "^2.1.0"
   }
 }

package/parser.js

@@ -7,8 +7,8 @@ var error_1 = require("./error");
 var types_1 = require("./types");
 var regex_generated_1 = require("./regex.generated");
 var icu_skeleton_parser_1 = require("@formatjs/icu-skeleton-parser");
-var SPACE_SEPARATOR_START_REGEX = new RegExp("^" + regex_generated_1.SPACE_SEPARATOR_REGEX.source + "*");
-var SPACE_SEPARATOR_END_REGEX = new RegExp(regex_generated_1.SPACE_SEPARATOR_REGEX.source + "*$");
+var SPACE_SEPARATOR_START_REGEX = new RegExp("^".concat(regex_generated_1.SPACE_SEPARATOR_REGEX.source, "*"));
+var SPACE_SEPARATOR_END_REGEX = new RegExp("".concat(regex_generated_1.SPACE_SEPARATOR_REGEX.source, "*$"));
 function createLocation(start, end) {
     return { start: start, end: end };
 }
@@ -255,7 +255,7 @@ var Parser = /** @class */ (function () {
             return {
                 val: {
                     type: types_1.TYPE.literal,
-                    value: "<" + tagName + "/>",
+                    value: "<".concat(tagName, "/>"),
                     location: createLocation(startPosition, this.clonePosition()),
                 },
                 err: null,
@@ -545,7 +545,7 @@ var Parser = /** @class */ (function () {
                             pattern: skeleton,
                             location: styleAndLocation.styleLocation,
                             parsedOptions: this.shouldParseSkeletons
-                                ? icu_skeleton_parser_1.parseDateTimeSkeleton(skeleton)
+                                ? (0, icu_skeleton_parser_1.parseDateTimeSkeleton)(skeleton)
                                 : {},
                         };
                         var type = argType === 'date' ? types_1.TYPE.date : types_1.TYPE.time;
@@ -579,7 +579,7 @@ var Parser = /** @class */ (function () {
                 var typeEndPosition_1 = this.clonePosition();
                 this.bumpSpace();
                 if (!this.bumpIf(',')) {
-                    return this.error(error_1.ErrorKind.EXPECT_SELECT_ARGUMENT_OPTIONS, createLocation(typeEndPosition_1, tslib_1.__assign({}, typeEndPosition_1)));
+                    return this.error(error_1.ErrorKind.EXPECT_SELECT_ARGUMENT_OPTIONS, createLocation(typeEndPosition_1, (0, tslib_1.__assign)({}, typeEndPosition_1)));
                 }
                 this.bumpSpace();
                 // Parse offset:
@@ -703,7 +703,7 @@ var Parser = /** @class */ (function () {
     Parser.prototype.parseNumberSkeletonFromString = function (skeleton, location) {
         var tokens = [];
         try {
-            tokens = icu_skeleton_parser_1.parseNumberSkeletonFromString(skeleton);
+            tokens = (0, icu_skeleton_parser_1.parseNumberSkeletonFromString)(skeleton);
         }
         catch (e) {
             return this.error(error_1.ErrorKind.INVALID_NUMBER_SKELETON, location);
@@ -714,7 +714,7 @@ var Parser = /** @class */ (function () {
                 tokens: tokens,
                 location: location,
                 parsedOptions: this.shouldParseSkeletons
-                    ? icu_skeleton_parser_1.parseNumberSkeleton(tokens)
+                    ? (0, icu_skeleton_parser_1.parseNumberSkeleton)(tokens)
                     : {},
             },
             err: null,
@@ -861,7 +861,7 @@ var Parser = /** @class */ (function () {
         }
         var code = codePointAt(this.message, offset);
         if (code === undefined) {
-            throw Error("Offset " + offset + " is at invalid UTF-16 code unit boundary");
+            throw Error("Offset ".concat(offset, " is at invalid UTF-16 code unit boundary"));
         }
         return code;
     };
@@ -929,7 +929,7 @@ var Parser = /** @class */ (function () {
      */
     Parser.prototype.bumpTo = function (targetOffset) {
         if (this.offset() > targetOffset) {
-            throw Error("targetOffset " + targetOffset + " must be greater than or equal to the current offset " + this.offset());
+            throw Error("targetOffset ".concat(targetOffset, " must be greater than or equal to the current offset ").concat(this.offset()));
         }
         targetOffset = Math.min(targetOffset, this.message.length);
         while (true) {
@@ -938,7 +938,7 @@ var Parser = /** @class */ (function () {
                 break;
             }
             if (offset > targetOffset) {
-                throw Error("targetOffset " + targetOffset + " is at invalid UTF-16 code unit boundary");
+                throw Error("targetOffset ".concat(targetOffset, " is at invalid UTF-16 code unit boundary"));
             }
             this.bump();
             if (this.isEOF()) {

package/printer.js

@@ -9,25 +9,25 @@ function printAST(ast) {
 exports.printAST = printAST;
 function doPrintAST(ast, isInPlural) {
     var printedNodes = ast.map(function (el) {
-        if (types_1.isLiteralElement(el)) {
+        if ((0, types_1.isLiteralElement)(el)) {
             return printLiteralElement(el, isInPlural);
         }
-        if (types_1.isArgumentElement(el)) {
+        if ((0, types_1.isArgumentElement)(el)) {
             return printArgumentElement(el);
         }
-        if (types_1.isDateElement(el) || types_1.isTimeElement(el) || types_1.isNumberElement(el)) {
+        if ((0, types_1.isDateElement)(el) || (0, types_1.isTimeElement)(el) || (0, types_1.isNumberElement)(el)) {
             return printSimpleFormatElement(el);
         }
-        if (types_1.isPluralElement(el)) {
+        if ((0, types_1.isPluralElement)(el)) {
             return printPluralElement(el);
         }
-        if (types_1.isSelectElement(el)) {
+        if ((0, types_1.isSelectElement)(el)) {
             return printSelectElement(el);
         }
-        if (types_1.isPoundElement(el)) {
+        if ((0, types_1.isPoundElement)(el)) {
             return '#';
         }
-        if (types_1.isTagElement(el)) {
+        if ((0, types_1.isTagElement)(el)) {
             return printTagElement(el);
         }
     });
@@ -35,7 +35,7 @@ function doPrintAST(ast, isInPlural) {
 }
 exports.doPrintAST = doPrintAST;
 function printTagElement(el) {
-    return "<" + el.value + ">" + printAST(el.children) + "</" + el.value + ">";
+    return "<".concat(el.value, ">").concat(printAST(el.children), "</").concat(el.value, ">");
 }
 function printEscapedMessage(message) {
     return message.replace(/([{}](?:.*[{}])?)/su, "'$1'");
@@ -47,26 +47,26 @@ function printLiteralElement(_a, isInPlural) {
 }
 function printArgumentElement(_a) {
     var value = _a.value;
-    return "{" + value + "}";
+    return "{".concat(value, "}");
 }
 function printSimpleFormatElement(el) {
-    return "{" + el.value + ", " + types_1.TYPE[el.type] + (el.style ? ", " + printArgumentStyle(el.style) : '') + "}";
+    return "{".concat(el.value, ", ").concat(types_1.TYPE[el.type]).concat(el.style ? ", ".concat(printArgumentStyle(el.style)) : '', "}");
 }
 function printNumberSkeletonToken(token) {
     var stem = token.stem, options = token.options;
     return options.length === 0
         ? stem
-        : "" + stem + options.map(function (o) { return "/" + o; }).join('');
+        : "".concat(stem).concat(options.map(function (o) { return "/".concat(o); }).join(''));
 }
 function printArgumentStyle(style) {
     if (typeof style === 'string') {
         return printEscapedMessage(style);
     }
     else if (style.type === types_1.SKELETON_TYPE.dateTime) {
-        return "::" + printDateTimeSkeleton(style);
+        return "::".concat(printDateTimeSkeleton(style));
     }
     else {
-        return "::" + style.tokens.map(printNumberSkeletonToken).join(' ');
+        return "::".concat(style.tokens.map(printNumberSkeletonToken).join(' '));
     }
 }
 function printDateTimeSkeleton(style) {
@@ -78,20 +78,20 @@ function printSelectElement(el) {
         el.value,
         'select',
         Object.keys(el.options)
-            .map(function (id) { return id + "{" + doPrintAST(el.options[id].value, false) + "}"; })
+            .map(function (id) { return "".concat(id, "{").concat(doPrintAST(el.options[id].value, false), "}"); })
             .join(' '),
     ].join(',');
-    return "{" + msg + "}";
+    return "{".concat(msg, "}");
 }
 function printPluralElement(el) {
     var type = el.pluralType === 'cardinal' ? 'plural' : 'selectordinal';
     var msg = [
         el.value,
         type,
-        tslib_1.__spreadArray([
-            el.offset ? "offset:" + el.offset : ''
-        ], Object.keys(el.options).map(function (id) { return id + "{" + doPrintAST(el.options[id].value, true) + "}"; })).filter(Boolean)
+        (0, tslib_1.__spreadArray)([
+            el.offset ? "offset:".concat(el.offset) : ''
+        ], Object.keys(el.options).map(function (id) { return "".concat(id, "{").concat(doPrintAST(el.options[id].value, true), "}"); }), true).filter(Boolean)
             .join(' '),
     ].join(',');
-    return "{" + msg + "}";
+    return "{".concat(msg, "}");
 }