intl-messageformat 7.8.4 → 8.2.1

package/dist/umd/intl-messageformat.js

@@ -39,6 +39,10 @@
          * This is the `#` symbol that will be substituted with the count.
          */
         TYPE[TYPE["pound"] = 7] = "pound";
+        /**
+         * XML-like tag
+         */
+        TYPE[TYPE["tag"] = 8] = "tag";
     })(TYPE || (TYPE = {}));
     /**
      * Type Guards
@@ -67,6 +71,9 @@
     function isPoundElement(el) {
         return el.type === TYPE.pound;
     }
+    function isTagElement(el) {
+        return el.type === TYPE.tag;
+    }
     function isNumberSkeleton(el) {
         return !!(el && typeof el === 'object' && el.type === 0 /* number */);
     }
@@ -215,67 +222,91 @@
         var peg$c4 = function () {
             return __assign({ type: TYPE.pound }, insertLocation());
         };
-        var peg$c5 = peg$otherExpectation("argumentElement");
-        var peg$c6 = "{";
-        var peg$c7 = peg$literalExpectation("{", false);
-        var peg$c8 = "}";
-        var peg$c9 = peg$literalExpectation("}", false);
+        var peg$c5 = peg$otherExpectation("tagElement");
+        var peg$c6 = "<";
+        var peg$c7 = peg$literalExpectation("<", false);
+        var peg$c8 = "/>";
+        var peg$c9 = peg$literalExpectation("/>", false);
         var peg$c10 = function (value) {
+            return __assign({ type: TYPE.literal, value: value.join('') }, insertLocation());
+        };
+        var peg$c11 = function (open, children, close) {
+            if (open !== close) {
+                error("Mismatch tag \"" + open + "\" !== \"" + close + "\"", location());
+            }
+            return __assign({ type: TYPE.tag, value: open, children: children }, insertLocation());
+        };
+        var peg$c12 = function () { messageCtx.push('openingTag'); return true; };
+        var peg$c13 = ">";
+        var peg$c14 = peg$literalExpectation(">", false);
+        var peg$c15 = function (tag) { messageCtx.pop(); return true; };
+        var peg$c16 = function (tag) {
+            return tag;
+        };
+        var peg$c17 = "</";
+        var peg$c18 = peg$literalExpectation("</", false);
+        var peg$c19 = function () { messageCtx.push('closingTag'); return true; };
+        var peg$c20 = peg$otherExpectation("argumentElement");
+        var peg$c21 = "{";
+        var peg$c22 = peg$literalExpectation("{", false);
+        var peg$c23 = "}";
+        var peg$c24 = peg$literalExpectation("}", false);
+        var peg$c25 = function (value) {
             return __assign({ type: TYPE.argument, value: value }, insertLocation());
         };
-        var peg$c11 = peg$otherExpectation("numberSkeletonId");
-        var peg$c12 = /^['\/{}]/;
-        var peg$c13 = peg$classExpectation(["'", "/", "{", "}"], false, false);
-        var peg$c14 = peg$anyExpectation();
-        var peg$c15 = peg$otherExpectation("numberSkeletonTokenOption");
-        var peg$c16 = "/";
-        var peg$c17 = peg$literalExpectation("/", false);
-        var peg$c18 = function (option) { return option; };
-        var peg$c19 = peg$otherExpectation("numberSkeletonToken");
-        var peg$c20 = function (stem, options) {
+        var peg$c26 = peg$otherExpectation("numberSkeletonId");
+        var peg$c27 = /^['\/{}]/;
+        var peg$c28 = peg$classExpectation(["'", "/", "{", "}"], false, false);
+        var peg$c29 = peg$anyExpectation();
+        var peg$c30 = peg$otherExpectation("numberSkeletonTokenOption");
+        var peg$c31 = "/";
+        var peg$c32 = peg$literalExpectation("/", false);
+        var peg$c33 = function (option) { return option; };
+        var peg$c34 = peg$otherExpectation("numberSkeletonToken");
+        var peg$c35 = function (stem, options) {
             return { stem: stem, options: options };
         };
-        var peg$c21 = function (tokens) {
+        var peg$c36 = function (tokens) {
             return __assign({ type: 0 /* number */, tokens: tokens }, insertLocation());
         };
-        var peg$c22 = "::";
-        var peg$c23 = peg$literalExpectation("::", false);
-        var peg$c24 = function (skeleton) { return skeleton; };
-        var peg$c25 = function () { messageCtx.push('numberArgStyle'); return true; };
-        var peg$c26 = function (style) {
+        var peg$c37 = "::";
+        var peg$c38 = peg$literalExpectation("::", false);
+        var peg$c39 = function (skeleton) { return skeleton; };
+        var peg$c40 = function () { messageCtx.push('numberArgStyle'); return true; };
+        var peg$c41 = function (style) {
             messageCtx.pop();
             return style.replace(/\s*$/, '');
         };
-        var peg$c27 = ",";
-        var peg$c28 = peg$literalExpectation(",", false);
-        var peg$c29 = "number";
-        var peg$c30 = peg$literalExpectation("number", false);
-        var peg$c31 = function (value, type, style) {
+        var peg$c42 = ",";
+        var peg$c43 = peg$literalExpectation(",", false);
+        var peg$c44 = "number";
+        var peg$c45 = peg$literalExpectation("number", false);
+        var peg$c46 = function (value, type, style) {
             return __assign({ type: type === 'number' ? TYPE.number : type === 'date' ? TYPE.date : TYPE.time, style: style && style[2], value: value }, insertLocation());
         };
-        var peg$c32 = "'";
-        var peg$c33 = peg$literalExpectation("'", false);
-        var peg$c34 = /^[^']/;
-        var peg$c35 = peg$classExpectation(["'"], true, false);
-        var peg$c36 = /^[^a-zA-Z'{}]/;
-        var peg$c37 = peg$classExpectation([["a", "z"], ["A", "Z"], "'", "{", "}"], true, false);
-        var peg$c38 = /^[a-zA-Z]/;
-        var peg$c39 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
-        var peg$c40 = function (pattern) {
+        var peg$c47 = "'";
+        var peg$c48 = peg$literalExpectation("'", false);
+        var peg$c49 = /^[^']/;
+        var peg$c50 = peg$classExpectation(["'"], true, false);
+        var peg$c51 = /^[^a-zA-Z'{}]/;
+        var peg$c52 = peg$classExpectation([["a", "z"], ["A", "Z"], "'", "{", "}"], true, false);
+        var peg$c53 = /^[a-zA-Z]/;
+        var peg$c54 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
+        var peg$c55 = function (pattern) {
             return __assign({ type: 1 /* dateTime */, pattern: pattern }, insertLocation());
         };
-        var peg$c41 = function () { messageCtx.push('dateOrTimeArgStyle'); return true; };
-        var peg$c42 = "date";
-        var peg$c43 = peg$literalExpectation("date", false);
-        var peg$c44 = "time";
-        var peg$c45 = peg$literalExpectation("time", false);
-        var peg$c46 = "plural";
-        var peg$c47 = peg$literalExpectation("plural", false);
-        var peg$c48 = "selectordinal";
-        var peg$c49 = peg$literalExpectation("selectordinal", false);
-        var peg$c50 = "offset:";
-        var peg$c51 = peg$literalExpectation("offset:", false);
-        var peg$c52 = function (value, pluralType, offset, options) {
+        var peg$c56 = function () { messageCtx.push('dateOrTimeArgStyle'); return true; };
+        var peg$c57 = "date";
+        var peg$c58 = peg$literalExpectation("date", false);
+        var peg$c59 = "time";
+        var peg$c60 = peg$literalExpectation("time", false);
+        var peg$c61 = "plural";
+        var peg$c62 = peg$literalExpectation("plural", false);
+        var peg$c63 = "selectordinal";
+        var peg$c64 = peg$literalExpectation("selectordinal", false);
+        var peg$c65 = "offset:";
+        var peg$c66 = peg$literalExpectation("offset:", false);
+        var peg$c67 = function (value, pluralType, offset, options) {
             return __assign({ type: TYPE.plural, pluralType: pluralType === 'plural' ? 'cardinal' : 'ordinal', value: value, offset: offset ? offset[2] : 0, options: options.reduce(function (all, _a) {
                     var id = _a.id, value = _a.value, optionLocation = _a.location;
                     if (id in all) {
@@ -288,9 +319,9 @@
                     return all;
                 }, {}) }, insertLocation());
         };
-        var peg$c53 = "select";
-        var peg$c54 = peg$literalExpectation("select", false);
-        var peg$c55 = function (value, options) {
+        var peg$c68 = "select";
+        var peg$c69 = peg$literalExpectation("select", false);
+        var peg$c70 = function (value, options) {
             return __assign({ type: TYPE.select, value: value, options: options.reduce(function (all, _a) {
                     var id = _a.id, value = _a.value, optionLocation = _a.location;
                     if (id in all) {
@@ -303,67 +334,71 @@
                     return all;
                 }, {}) }, insertLocation());
         };
-        var peg$c56 = "=";
-        var peg$c57 = peg$literalExpectation("=", false);
-        var peg$c58 = function (id) { messageCtx.push('select'); return true; };
-        var peg$c59 = function (id, value) {
+        var peg$c71 = "=";
+        var peg$c72 = peg$literalExpectation("=", false);
+        var peg$c73 = function (id) { messageCtx.push('select'); return true; };
+        var peg$c74 = function (id, value) {
             messageCtx.pop();
             return __assign({ id: id,
                 value: value }, insertLocation());
         };
-        var peg$c60 = function (id) { messageCtx.push('plural'); return true; };
-        var peg$c61 = function (id, value) {
+        var peg$c75 = function (id) { messageCtx.push('plural'); return true; };
+        var peg$c76 = function (id, value) {
             messageCtx.pop();
             return __assign({ id: id,
                 value: value }, insertLocation());
         };
-        var peg$c62 = peg$otherExpectation("whitespace");
-        var peg$c63 = /^[\t-\r \x85\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]/;
-        var peg$c64 = peg$classExpectation([["\t", "\r"], " ", "\x85", "\xA0", "\u1680", ["\u2000", "\u200A"], "\u2028", "\u2029", "\u202F", "\u205F", "\u3000"], false, false);
-        var peg$c65 = peg$otherExpectation("syntax pattern");
-        var peg$c66 = /^[!-\/:-@[-\^`{-~\xA1-\xA7\xA9\xAB\xAC\xAE\xB0\xB1\xB6\xBB\xBF\xD7\xF7\u2010-\u2027\u2030-\u203E\u2041-\u2053\u2055-\u205E\u2190-\u245F\u2500-\u2775\u2794-\u2BFF\u2E00-\u2E7F\u3001-\u3003\u3008-\u3020\u3030\uFD3E\uFD3F\uFE45\uFE46]/;
-        var peg$c67 = peg$classExpectation([["!", "/"], [":", "@"], ["[", "^"], "`", ["{", "~"], ["\xA1", "\xA7"], "\xA9", "\xAB", "\xAC", "\xAE", "\xB0", "\xB1", "\xB6", "\xBB", "\xBF", "\xD7", "\xF7", ["\u2010", "\u2027"], ["\u2030", "\u203E"], ["\u2041", "\u2053"], ["\u2055", "\u205E"], ["\u2190", "\u245F"], ["\u2500", "\u2775"], ["\u2794", "\u2BFF"], ["\u2E00", "\u2E7F"], ["\u3001", "\u3003"], ["\u3008", "\u3020"], "\u3030", "\uFD3E", "\uFD3F", "\uFE45", "\uFE46"], false, false);
-        var peg$c68 = peg$otherExpectation("optional whitespace");
-        var peg$c69 = peg$otherExpectation("number");
-        var peg$c70 = "-";
-        var peg$c71 = peg$literalExpectation("-", false);
-        var peg$c72 = function (negative, num) {
+        var peg$c77 = peg$otherExpectation("whitespace");
+        var peg$c78 = /^[\t-\r \x85\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]/;
+        var peg$c79 = peg$classExpectation([["\t", "\r"], " ", "\x85", "\xA0", "\u1680", ["\u2000", "\u200A"], "\u2028", "\u2029", "\u202F", "\u205F", "\u3000"], false, false);
+        var peg$c80 = peg$otherExpectation("syntax pattern");
+        var peg$c81 = /^[!-\/:-@[-\^`{-~\xA1-\xA7\xA9\xAB\xAC\xAE\xB0\xB1\xB6\xBB\xBF\xD7\xF7\u2010-\u2027\u2030-\u203E\u2041-\u2053\u2055-\u205E\u2190-\u245F\u2500-\u2775\u2794-\u2BFF\u2E00-\u2E7F\u3001-\u3003\u3008-\u3020\u3030\uFD3E\uFD3F\uFE45\uFE46]/;
+        var peg$c82 = peg$classExpectation([["!", "/"], [":", "@"], ["[", "^"], "`", ["{", "~"], ["\xA1", "\xA7"], "\xA9", "\xAB", "\xAC", "\xAE", "\xB0", "\xB1", "\xB6", "\xBB", "\xBF", "\xD7", "\xF7", ["\u2010", "\u2027"], ["\u2030", "\u203E"], ["\u2041", "\u2053"], ["\u2055", "\u205E"], ["\u2190", "\u245F"], ["\u2500", "\u2775"], ["\u2794", "\u2BFF"], ["\u2E00", "\u2E7F"], ["\u3001", "\u3003"], ["\u3008", "\u3020"], "\u3030", "\uFD3E", "\uFD3F", "\uFE45", "\uFE46"], false, false);
+        var peg$c83 = peg$otherExpectation("optional whitespace");
+        var peg$c84 = peg$otherExpectation("number");
+        var peg$c85 = "-";
+        var peg$c86 = peg$literalExpectation("-", false);
+        var peg$c87 = function (negative, num) {
             return num
                 ? negative
                     ? -num
                     : num
                 : 0;
         };
-        var peg$c74 = peg$otherExpectation("double apostrophes");
-        var peg$c75 = "''";
-        var peg$c76 = peg$literalExpectation("''", false);
-        var peg$c77 = function () { return "'"; };
-        var peg$c78 = function (escapedChar, quotedChars) {
+        var peg$c89 = peg$otherExpectation("double apostrophes");
+        var peg$c90 = "''";
+        var peg$c91 = peg$literalExpectation("''", false);
+        var peg$c92 = function () { return "'"; };
+        var peg$c93 = function (escapedChar, quotedChars) {
             return escapedChar + quotedChars.replace("''", "'");
         };
-        var peg$c79 = function (x) {
-            return (x !== '{' &&
+        var peg$c94 = function (x) {
+            return (x !== '<' &&
+                x !== '{' &&
                 !(isInPluralOption() && x === '#') &&
-                !(isNestedMessageText() && x === '}'));
+                !(isNestedMessageText() && x === '}') &&
+                !(isNestedMessageText() && x === '>'));
         };
-        var peg$c80 = "\n";
-        var peg$c81 = peg$literalExpectation("\n", false);
-        var peg$c82 = function (x) {
-            return x === '{' || x === '}' || (isInPluralOption() && x === '#');
+        var peg$c95 = "\n";
+        var peg$c96 = peg$literalExpectation("\n", false);
+        var peg$c97 = function (x) {
+            return x === '<' || x === '>' || x === '{' || x === '}' || (isInPluralOption() && x === '#');
         };
-        var peg$c83 = peg$otherExpectation("argNameOrNumber");
-        var peg$c84 = peg$otherExpectation("argNumber");
-        var peg$c85 = "0";
-        var peg$c86 = peg$literalExpectation("0", false);
-        var peg$c87 = function () { return 0; };
-        var peg$c88 = /^[1-9]/;
-        var peg$c89 = peg$classExpectation([["1", "9"]], false, false);
-        var peg$c90 = /^[0-9]/;
-        var peg$c91 = peg$classExpectation([["0", "9"]], false, false);
-        var peg$c92 = function (digits) {
+        var peg$c98 = peg$otherExpectation("argNameOrNumber");
+        var peg$c99 = peg$otherExpectation("validTag");
+        var peg$c100 = peg$otherExpectation("argNumber");
+        var peg$c101 = "0";
+        var peg$c102 = peg$literalExpectation("0", false);
+        var peg$c103 = function () { return 0; };
+        var peg$c104 = /^[1-9]/;
+        var peg$c105 = peg$classExpectation([["1", "9"]], false, false);
+        var peg$c106 = /^[0-9]/;
+        var peg$c107 = peg$classExpectation([["0", "9"]], false, false);
+        var peg$c108 = function (digits) {
             return parseInt(digits.join(''), 10);
         };
-        var peg$c93 = peg$otherExpectation("argName");
+        var peg$c109 = peg$otherExpectation("argName");
+        var peg$c110 = peg$otherExpectation("tagName");
         var peg$currPos = 0;
         var peg$savedPos = 0;
         var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -493,7 +528,10 @@
                         if (s0 === peg$FAILED) {
                             s0 = peg$parseselectElement();
                             if (s0 === peg$FAILED) {
-                                s0 = peg$parsepoundElement();
+                                s0 = peg$parsetagElement();
+                                if (s0 === peg$FAILED) {
+                                    s0 = peg$parsepoundElement();
+                                }
                             }
                         }
                     }
@@ -565,11 +603,104 @@
             s0 = s1;
             return s0;
         }
-        function peg$parseargumentElement() {
+        function peg$parsetagElement() {
             var s0, s1, s2, s3, s4, s5;
             peg$silentFails++;
             s0 = peg$currPos;
-            if (input.charCodeAt(peg$currPos) === 123) {
+            s1 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 60) {
+                s2 = peg$c6;
+                peg$currPos++;
+            }
+            else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c7);
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parsevalidTag();
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parse_();
+                    if (s4 !== peg$FAILED) {
+                        if (input.substr(peg$currPos, 2) === peg$c8) {
+                            s5 = peg$c8;
+                            peg$currPos += 2;
+                        }
+                        else {
+                            s5 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$c9);
+                            }
+                        }
+                        if (s5 !== peg$FAILED) {
+                            s2 = [s2, s3, s4, s5];
+                            s1 = s2;
+                        }
+                        else {
+                            peg$currPos = s1;
+                            s1 = peg$FAILED;
+                        }
+                    }
+                    else {
+                        peg$currPos = s1;
+                        s1 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s1;
+                    s1 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s1;
+                s1 = peg$FAILED;
+            }
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c10(s1);
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                s1 = peg$parseopeningTag();
+                if (s1 !== peg$FAILED) {
+                    s2 = peg$parsemessage();
+                    if (s2 !== peg$FAILED) {
+                        s3 = peg$parseclosingTag();
+                        if (s3 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c11(s1, s2, s3);
+                            s0 = s1;
+                        }
+                        else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    }
+                    else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            peg$silentFails--;
+            if (s0 === peg$FAILED) {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c5);
+                }
+            }
+            return s0;
+        }
+        function peg$parseopeningTag() {
+            var s0, s1, s2, s3, s4, s5;
+            s0 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 60) {
                 s1 = peg$c6;
                 peg$currPos++;
             }
@@ -579,6 +710,157 @@
                     peg$fail(peg$c7);
                 }
             }
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = peg$currPos;
+                s2 = peg$c12();
+                if (s2) {
+                    s2 = undefined;
+                }
+                else {
+                    s2 = peg$FAILED;
+                }
+                if (s2 !== peg$FAILED) {
+                    s3 = peg$parsevalidTag();
+                    if (s3 !== peg$FAILED) {
+                        if (input.charCodeAt(peg$currPos) === 62) {
+                            s4 = peg$c13;
+                            peg$currPos++;
+                        }
+                        else {
+                            s4 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$c14);
+                            }
+                        }
+                        if (s4 !== peg$FAILED) {
+                            peg$savedPos = peg$currPos;
+                            s5 = peg$c15();
+                            if (s5) {
+                                s5 = undefined;
+                            }
+                            else {
+                                s5 = peg$FAILED;
+                            }
+                            if (s5 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$c16(s3);
+                                s0 = s1;
+                            }
+                            else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                            }
+                        }
+                        else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    }
+                    else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+            return s0;
+        }
+        function peg$parseclosingTag() {
+            var s0, s1, s2, s3, s4, s5;
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 2) === peg$c17) {
+                s1 = peg$c17;
+                peg$currPos += 2;
+            }
+            else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c18);
+                }
+            }
+            if (s1 !== peg$FAILED) {
+                peg$savedPos = peg$currPos;
+                s2 = peg$c19();
+                if (s2) {
+                    s2 = undefined;
+                }
+                else {
+                    s2 = peg$FAILED;
+                }
+                if (s2 !== peg$FAILED) {
+                    s3 = peg$parsevalidTag();
+                    if (s3 !== peg$FAILED) {
+                        if (input.charCodeAt(peg$currPos) === 62) {
+                            s4 = peg$c13;
+                            peg$currPos++;
+                        }
+                        else {
+                            s4 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$c14);
+                            }
+                        }
+                        if (s4 !== peg$FAILED) {
+                            peg$savedPos = peg$currPos;
+                            s5 = peg$c15();
+                            if (s5) {
+                                s5 = undefined;
+                            }
+                            else {
+                                s5 = peg$FAILED;
+                            }
+                            if (s5 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$c16(s3);
+                                s0 = s1;
+                            }
+                            else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                            }
+                        }
+                        else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    }
+                    else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+            return s0;
+        }
+        function peg$parseargumentElement() {
+            var s0, s1, s2, s3, s4, s5;
+            peg$silentFails++;
+            s0 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 123) {
+                s1 = peg$c21;
+                peg$currPos++;
+            }
+            else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c22);
+                }
+            }
             if (s1 !== peg$FAILED) {
                 s2 = peg$parse_();
                 if (s2 !== peg$FAILED) {
@@ -587,18 +869,18 @@
                         s4 = peg$parse_();
                         if (s4 !== peg$FAILED) {
                             if (input.charCodeAt(peg$currPos) === 125) {
-                                s5 = peg$c8;
+                                s5 = peg$c23;
                                 peg$currPos++;
                             }
                             else {
                                 s5 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$c9);
+                                    peg$fail(peg$c24);
                                 }
                             }
                             if (s5 !== peg$FAILED) {
                                 peg$savedPos = s0;
-                                s1 = peg$c10(s3);
+                                s1 = peg$c25(s3);
                                 s0 = s1;
                             }
                             else {
@@ -629,7 +911,7 @@
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c5);
+                    peg$fail(peg$c20);
                 }
             }
             return s0;
@@ -644,14 +926,14 @@
             peg$silentFails++;
             s4 = peg$parsewhiteSpace();
             if (s4 === peg$FAILED) {
-                if (peg$c12.test(input.charAt(peg$currPos))) {
+                if (peg$c27.test(input.charAt(peg$currPos))) {
                     s4 = input.charAt(peg$currPos);
                     peg$currPos++;
                 }
                 else {
                     s4 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$c13);
+                        peg$fail(peg$c28);
                     }
                 }
             }
@@ -671,7 +953,7 @@
                 else {
                     s4 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$c14);
+                        peg$fail(peg$c29);
                     }
                 }
                 if (s4 !== peg$FAILED) {
@@ -695,14 +977,14 @@
                     peg$silentFails++;
                     s4 = peg$parsewhiteSpace();
                     if (s4 === peg$FAILED) {
-                        if (peg$c12.test(input.charAt(peg$currPos))) {
+                        if (peg$c27.test(input.charAt(peg$currPos))) {
                             s4 = input.charAt(peg$currPos);
                             peg$currPos++;
                         }
                         else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$c13);
+                                peg$fail(peg$c28);
                             }
                         }
                     }
@@ -722,7 +1004,7 @@
                         else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$c14);
+                                peg$fail(peg$c29);
                             }
                         }
                         if (s4 !== peg$FAILED) {
@@ -753,7 +1035,7 @@
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c11);
+                    peg$fail(peg$c26);
                 }
             }
             return s0;
@@ -763,20 +1045,20 @@
             peg$silentFails++;
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 47) {
-                s1 = peg$c16;
+                s1 = peg$c31;
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c17);
+                    peg$fail(peg$c32);
                 }
             }
             if (s1 !== peg$FAILED) {
                 s2 = peg$parsenumberSkeletonId();
                 if (s2 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$c18(s2);
+                    s1 = peg$c33(s2);
                     s0 = s1;
                 }
                 else {
@@ -792,7 +1074,7 @@
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c15);
+                    peg$fail(peg$c30);
                 }
             }
             return s0;
@@ -813,7 +1095,7 @@
                     }
                     if (s3 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s1 = peg$c20(s2, s3);
+                        s1 = peg$c35(s2, s3);
                         s0 = s1;
                     }
                     else {
@@ -834,7 +1116,7 @@
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c19);
+                    peg$fail(peg$c34);
                 }
             }
             return s0;
@@ -855,7 +1137,7 @@
             }
             if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c21(s1);
+                s1 = peg$c36(s1);
             }
             s0 = s1;
             return s0;
@@ -863,21 +1145,21 @@
         function peg$parsenumberArgStyle() {
             var s0, s1, s2;
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c22) {
-                s1 = peg$c22;
+            if (input.substr(peg$currPos, 2) === peg$c37) {
+                s1 = peg$c37;
                 peg$currPos += 2;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c23);
+                    peg$fail(peg$c38);
                 }
             }
             if (s1 !== peg$FAILED) {
                 s2 = peg$parsenumberSkeleton();
                 if (s2 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$c24(s2);
+                    s1 = peg$c39(s2);
                     s0 = s1;
                 }
                 else {
@@ -892,7 +1174,7 @@
             if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
                 peg$savedPos = peg$currPos;
-                s1 = peg$c25();
+                s1 = peg$c40();
                 if (s1) {
                     s1 = undefined;
                 }
@@ -903,7 +1185,7 @@
                     s2 = peg$parsemessageText();
                     if (s2 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s1 = peg$c26(s2);
+                        s1 = peg$c41(s2);
                         s0 = s1;
                     }
                     else {
@@ -922,13 +1204,13 @@
             var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12;
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 123) {
-                s1 = peg$c6;
+                s1 = peg$c21;
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c7);
+                    peg$fail(peg$c22);
                 }
             }
             if (s1 !== peg$FAILED) {
@@ -939,26 +1221,26 @@
                         s4 = peg$parse_();
                         if (s4 !== peg$FAILED) {
                             if (input.charCodeAt(peg$currPos) === 44) {
-                                s5 = peg$c27;
+                                s5 = peg$c42;
                                 peg$currPos++;
                             }
                             else {
                                 s5 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$c28);
+                                    peg$fail(peg$c43);
                                 }
                             }
                             if (s5 !== peg$FAILED) {
                                 s6 = peg$parse_();
                                 if (s6 !== peg$FAILED) {
-                                    if (input.substr(peg$currPos, 6) === peg$c29) {
-                                        s7 = peg$c29;
+                                    if (input.substr(peg$currPos, 6) === peg$c44) {
+                                        s7 = peg$c44;
                                         peg$currPos += 6;
                                     }
                                     else {
                                         s7 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                            peg$fail(peg$c30);
+                                            peg$fail(peg$c45);
                                         }
                                     }
                                     if (s7 !== peg$FAILED) {
@@ -966,13 +1248,13 @@
                                         if (s8 !== peg$FAILED) {
                                             s9 = peg$currPos;
                                             if (input.charCodeAt(peg$currPos) === 44) {
-                                                s10 = peg$c27;
+                                                s10 = peg$c42;
                                                 peg$currPos++;
                                             }
                                             else {
                                                 s10 = peg$FAILED;
                                                 if (peg$silentFails === 0) {
-                                                    peg$fail(peg$c28);
+                                                    peg$fail(peg$c43);
                                                 }
                                             }
                                             if (s10 !== peg$FAILED) {
@@ -1004,18 +1286,18 @@
                                                 s10 = peg$parse_();
                                                 if (s10 !== peg$FAILED) {
                                                     if (input.charCodeAt(peg$currPos) === 125) {
-                                                        s11 = peg$c8;
+                                                        s11 = peg$c23;
                                                         peg$currPos++;
                                                     }
                                                     else {
                                                         s11 = peg$FAILED;
                                                         if (peg$silentFails === 0) {
-                                                            peg$fail(peg$c9);
+                                                            peg$fail(peg$c24);
                                                         }
                                                     }
                                                     if (s11 !== peg$FAILED) {
                                                         peg$savedPos = s0;
-                                                        s1 = peg$c31(s3, s7, s9);
+                                                        s1 = peg$c46(s3, s7, s9);
                                                         s0 = s1;
                                                     }
                                                     else {
@@ -1078,27 +1360,27 @@
             var s0, s1, s2, s3;
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 39) {
-                s1 = peg$c32;
+                s1 = peg$c47;
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c33);
+                    peg$fail(peg$c48);
                 }
             }
             if (s1 !== peg$FAILED) {
                 s2 = [];
                 s3 = peg$parsedoubleApostrophes();
                 if (s3 === peg$FAILED) {
-                    if (peg$c34.test(input.charAt(peg$currPos))) {
+                    if (peg$c49.test(input.charAt(peg$currPos))) {
                         s3 = input.charAt(peg$currPos);
                         peg$currPos++;
                     }
                     else {
                         s3 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$c35);
+                            peg$fail(peg$c50);
                         }
                     }
                 }
@@ -1107,14 +1389,14 @@
                         s2.push(s3);
                         s3 = peg$parsedoubleApostrophes();
                         if (s3 === peg$FAILED) {
-                            if (peg$c34.test(input.charAt(peg$currPos))) {
+                            if (peg$c49.test(input.charAt(peg$currPos))) {
                                 s3 = input.charAt(peg$currPos);
                                 peg$currPos++;
                             }
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$c35);
+                                    peg$fail(peg$c50);
                                 }
                             }
                         }
@@ -1125,13 +1407,13 @@
                 }
                 if (s2 !== peg$FAILED) {
                     if (input.charCodeAt(peg$currPos) === 39) {
-                        s3 = peg$c32;
+                        s3 = peg$c47;
                         peg$currPos++;
                     }
                     else {
                         s3 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$c33);
+                            peg$fail(peg$c48);
                         }
                     }
                     if (s3 !== peg$FAILED) {
@@ -1156,14 +1438,14 @@
                 s0 = [];
                 s1 = peg$parsedoubleApostrophes();
                 if (s1 === peg$FAILED) {
-                    if (peg$c36.test(input.charAt(peg$currPos))) {
+                    if (peg$c51.test(input.charAt(peg$currPos))) {
                         s1 = input.charAt(peg$currPos);
                         peg$currPos++;
                     }
                     else {
                         s1 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$c37);
+                            peg$fail(peg$c52);
                         }
                     }
                 }
@@ -1172,14 +1454,14 @@
                         s0.push(s1);
                         s1 = peg$parsedoubleApostrophes();
                         if (s1 === peg$FAILED) {
-                            if (peg$c36.test(input.charAt(peg$currPos))) {
+                            if (peg$c51.test(input.charAt(peg$currPos))) {
                                 s1 = input.charAt(peg$currPos);
                                 peg$currPos++;
                             }
                             else {
                                 s1 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$c37);
+                                    peg$fail(peg$c52);
                                 }
                             }
                         }
@@ -1194,27 +1476,27 @@
         function peg$parsedateTimeSkeletonPattern() {
             var s0, s1;
             s0 = [];
-            if (peg$c38.test(input.charAt(peg$currPos))) {
+            if (peg$c53.test(input.charAt(peg$currPos))) {
                 s1 = input.charAt(peg$currPos);
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c39);
+                    peg$fail(peg$c54);
                 }
             }
             if (s1 !== peg$FAILED) {
                 while (s1 !== peg$FAILED) {
                     s0.push(s1);
-                    if (peg$c38.test(input.charAt(peg$currPos))) {
+                    if (peg$c53.test(input.charAt(peg$currPos))) {
                         s1 = input.charAt(peg$currPos);
                         peg$currPos++;
                     }
                     else {
                         s1 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$c39);
+                            peg$fail(peg$c54);
                         }
                     }
                 }
@@ -1253,7 +1535,7 @@
             }
             if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c40(s1);
+                s1 = peg$c55(s1);
             }
             s0 = s1;
             return s0;
@@ -1261,21 +1543,21 @@
         function peg$parsedateOrTimeArgStyle() {
             var s0, s1, s2;
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c22) {
-                s1 = peg$c22;
+            if (input.substr(peg$currPos, 2) === peg$c37) {
+                s1 = peg$c37;
                 peg$currPos += 2;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c23);
+                    peg$fail(peg$c38);
                 }
             }
             if (s1 !== peg$FAILED) {
                 s2 = peg$parsedateTimeSkeleton();
                 if (s2 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$c24(s2);
+                    s1 = peg$c39(s2);
                     s0 = s1;
                 }
                 else {
@@ -1290,7 +1572,7 @@
             if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
                 peg$savedPos = peg$currPos;
-                s1 = peg$c41();
+                s1 = peg$c56();
                 if (s1) {
                     s1 = undefined;
                 }
@@ -1301,7 +1583,7 @@
                     s2 = peg$parsemessageText();
                     if (s2 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s1 = peg$c26(s2);
+                        s1 = peg$c41(s2);
                         s0 = s1;
                     }
                     else {
@@ -1320,13 +1602,13 @@
             var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12;
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 123) {
-                s1 = peg$c6;
+                s1 = peg$c21;
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c7);
+                    peg$fail(peg$c22);
                 }
             }
             if (s1 !== peg$FAILED) {
@@ -1337,37 +1619,37 @@
                         s4 = peg$parse_();
                         if (s4 !== peg$FAILED) {
                             if (input.charCodeAt(peg$currPos) === 44) {
-                                s5 = peg$c27;
+                                s5 = peg$c42;
                                 peg$currPos++;
                             }
                             else {
                                 s5 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$c28);
+                                    peg$fail(peg$c43);
                                 }
                             }
                             if (s5 !== peg$FAILED) {
                                 s6 = peg$parse_();
                                 if (s6 !== peg$FAILED) {
-                                    if (input.substr(peg$currPos, 4) === peg$c42) {
-                                        s7 = peg$c42;
+                                    if (input.substr(peg$currPos, 4) === peg$c57) {
+                                        s7 = peg$c57;
                                         peg$currPos += 4;
                                     }
                                     else {
                                         s7 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                            peg$fail(peg$c43);
+                                            peg$fail(peg$c58);
                                         }
                                     }
                                     if (s7 === peg$FAILED) {
-                                        if (input.substr(peg$currPos, 4) === peg$c44) {
-                                            s7 = peg$c44;
+                                        if (input.substr(peg$currPos, 4) === peg$c59) {
+                                            s7 = peg$c59;
                                             peg$currPos += 4;
                                         }
                                         else {
                                             s7 = peg$FAILED;
                                             if (peg$silentFails === 0) {
-                                                peg$fail(peg$c45);
+                                                peg$fail(peg$c60);
                                             }
                                         }
                                     }
@@ -1376,13 +1658,13 @@
                                         if (s8 !== peg$FAILED) {
                                             s9 = peg$currPos;
                                             if (input.charCodeAt(peg$currPos) === 44) {
-                                                s10 = peg$c27;
+                                                s10 = peg$c42;
                                                 peg$currPos++;
                                             }
                                             else {
                                                 s10 = peg$FAILED;
                                                 if (peg$silentFails === 0) {
-                                                    peg$fail(peg$c28);
+                                                    peg$fail(peg$c43);
                                                 }
                                             }
                                             if (s10 !== peg$FAILED) {
@@ -1414,18 +1696,18 @@
                                                 s10 = peg$parse_();
                                                 if (s10 !== peg$FAILED) {
                                                     if (input.charCodeAt(peg$currPos) === 125) {
-                                                        s11 = peg$c8;
+                                                        s11 = peg$c23;
                                                         peg$currPos++;
                                                     }
                                                     else {
                                                         s11 = peg$FAILED;
                                                         if (peg$silentFails === 0) {
-                                                            peg$fail(peg$c9);
+                                                            peg$fail(peg$c24);
                                                         }
                                                     }
                                                     if (s11 !== peg$FAILED) {
                                                         peg$savedPos = s0;
-                                                        s1 = peg$c31(s3, s7, s9);
+                                                        s1 = peg$c46(s3, s7, s9);
                                                         s0 = s1;
                                                     }
                                                     else {
@@ -1496,13 +1778,13 @@
             var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 123) {
-                s1 = peg$c6;
+                s1 = peg$c21;
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c7);
+                    peg$fail(peg$c22);
                 }
             }
             if (s1 !== peg$FAILED) {
@@ -1513,37 +1795,37 @@
                         s4 = peg$parse_();
                         if (s4 !== peg$FAILED) {
                             if (input.charCodeAt(peg$currPos) === 44) {
-                                s5 = peg$c27;
+                                s5 = peg$c42;
                                 peg$currPos++;
                             }
                             else {
                                 s5 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$c28);
+                                    peg$fail(peg$c43);
                                 }
                             }
                             if (s5 !== peg$FAILED) {
                                 s6 = peg$parse_();
                                 if (s6 !== peg$FAILED) {
-                                    if (input.substr(peg$currPos, 6) === peg$c46) {
-                                        s7 = peg$c46;
+                                    if (input.substr(peg$currPos, 6) === peg$c61) {
+                                        s7 = peg$c61;
                                         peg$currPos += 6;
                                     }
                                     else {
                                         s7 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                            peg$fail(peg$c47);
+                                            peg$fail(peg$c62);
                                         }
                                     }
                                     if (s7 === peg$FAILED) {
-                                        if (input.substr(peg$currPos, 13) === peg$c48) {
-                                            s7 = peg$c48;
+                                        if (input.substr(peg$currPos, 13) === peg$c63) {
+                                            s7 = peg$c63;
                                             peg$currPos += 13;
                                         }
                                         else {
                                             s7 = peg$FAILED;
                                             if (peg$silentFails === 0) {
-                                                peg$fail(peg$c49);
+                                                peg$fail(peg$c64);
                                             }
                                         }
                                     }
@@ -1551,27 +1833,27 @@
                                         s8 = peg$parse_();
                                         if (s8 !== peg$FAILED) {
                                             if (input.charCodeAt(peg$currPos) === 44) {
-                                                s9 = peg$c27;
+                                                s9 = peg$c42;
                                                 peg$currPos++;
                                             }
                                             else {
                                                 s9 = peg$FAILED;
                                                 if (peg$silentFails === 0) {
-                                                    peg$fail(peg$c28);
+                                                    peg$fail(peg$c43);
                                                 }
                                             }
                                             if (s9 !== peg$FAILED) {
                                                 s10 = peg$parse_();
                                                 if (s10 !== peg$FAILED) {
                                                     s11 = peg$currPos;
-                                                    if (input.substr(peg$currPos, 7) === peg$c50) {
-                                                        s12 = peg$c50;
+                                                    if (input.substr(peg$currPos, 7) === peg$c65) {
+                                                        s12 = peg$c65;
                                                         peg$currPos += 7;
                                                     }
                                                     else {
                                                         s12 = peg$FAILED;
                                                         if (peg$silentFails === 0) {
-                                                            peg$fail(peg$c51);
+                                                            peg$fail(peg$c66);
                                                         }
                                                     }
                                                     if (s12 !== peg$FAILED) {
@@ -1617,18 +1899,18 @@
                                                                 s14 = peg$parse_();
                                                                 if (s14 !== peg$FAILED) {
                                                                     if (input.charCodeAt(peg$currPos) === 125) {
-                                                                        s15 = peg$c8;
+                                                                        s15 = peg$c23;
                                                                         peg$currPos++;
                                                                     }
                                                                     else {
                                                                         s15 = peg$FAILED;
                                                                         if (peg$silentFails === 0) {
-                                                                            peg$fail(peg$c9);
+                                                                            peg$fail(peg$c24);
                                                                         }
                                                                     }
                                                                     if (s15 !== peg$FAILED) {
                                                                         peg$savedPos = s0;
-                                                                        s1 = peg$c52(s3, s7, s11, s13);
+                                                                        s1 = peg$c67(s3, s7, s11, s13);
                                                                         s0 = s1;
                                                                     }
                                                                     else {
@@ -1711,13 +1993,13 @@
             var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 123) {
-                s1 = peg$c6;
+                s1 = peg$c21;
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c7);
+                    peg$fail(peg$c22);
                 }
             }
             if (s1 !== peg$FAILED) {
@@ -1728,39 +2010,39 @@
                         s4 = peg$parse_();
                         if (s4 !== peg$FAILED) {
                             if (input.charCodeAt(peg$currPos) === 44) {
-                                s5 = peg$c27;
+                                s5 = peg$c42;
                                 peg$currPos++;
                             }
                             else {
                                 s5 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$c28);
+                                    peg$fail(peg$c43);
                                 }
                             }
                             if (s5 !== peg$FAILED) {
                                 s6 = peg$parse_();
                                 if (s6 !== peg$FAILED) {
-                                    if (input.substr(peg$currPos, 6) === peg$c53) {
-                                        s7 = peg$c53;
+                                    if (input.substr(peg$currPos, 6) === peg$c68) {
+                                        s7 = peg$c68;
                                         peg$currPos += 6;
                                     }
                                     else {
                                         s7 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                            peg$fail(peg$c54);
+                                            peg$fail(peg$c69);
                                         }
                                     }
                                     if (s7 !== peg$FAILED) {
                                         s8 = peg$parse_();
                                         if (s8 !== peg$FAILED) {
                                             if (input.charCodeAt(peg$currPos) === 44) {
-                                                s9 = peg$c27;
+                                                s9 = peg$c42;
                                                 peg$currPos++;
                                             }
                                             else {
                                                 s9 = peg$FAILED;
                                                 if (peg$silentFails === 0) {
-                                                    peg$fail(peg$c28);
+                                                    peg$fail(peg$c43);
                                                 }
                                             }
                                             if (s9 !== peg$FAILED) {
@@ -1781,18 +2063,18 @@
                                                         s12 = peg$parse_();
                                                         if (s12 !== peg$FAILED) {
                                                             if (input.charCodeAt(peg$currPos) === 125) {
-                                                                s13 = peg$c8;
+                                                                s13 = peg$c23;
                                                                 peg$currPos++;
                                                             }
                                                             else {
                                                                 s13 = peg$FAILED;
                                                                 if (peg$silentFails === 0) {
-                                                                    peg$fail(peg$c9);
+                                                                    peg$fail(peg$c24);
                                                                 }
                                                             }
                                                             if (s13 !== peg$FAILED) {
                                                                 peg$savedPos = s0;
-                                                                s1 = peg$c55(s3, s11);
+                                                                s1 = peg$c70(s3, s11);
                                                                 s0 = s1;
                                                             }
                                                             else {
@@ -1866,13 +2148,13 @@
             s0 = peg$currPos;
             s1 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 61) {
-                s2 = peg$c56;
+                s2 = peg$c71;
                 peg$currPos++;
             }
             else {
                 s2 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c57);
+                    peg$fail(peg$c72);
                 }
             }
             if (s2 !== peg$FAILED) {
@@ -1911,18 +2193,18 @@
                     s3 = peg$parse_();
                     if (s3 !== peg$FAILED) {
                         if (input.charCodeAt(peg$currPos) === 123) {
-                            s4 = peg$c6;
+                            s4 = peg$c21;
                             peg$currPos++;
                         }
                         else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$c7);
+                                peg$fail(peg$c22);
                             }
                         }
                         if (s4 !== peg$FAILED) {
                             peg$savedPos = peg$currPos;
-                            s5 = peg$c58();
+                            s5 = peg$c73();
                             if (s5) {
                                 s5 = undefined;
                             }
@@ -1933,18 +2215,18 @@
                                 s6 = peg$parsemessage();
                                 if (s6 !== peg$FAILED) {
                                     if (input.charCodeAt(peg$currPos) === 125) {
-                                        s7 = peg$c8;
+                                        s7 = peg$c23;
                                         peg$currPos++;
                                     }
                                     else {
                                         s7 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                            peg$fail(peg$c9);
+                                            peg$fail(peg$c24);
                                         }
                                     }
                                     if (s7 !== peg$FAILED) {
                                         peg$savedPos = s0;
-                                        s1 = peg$c59(s2, s6);
+                                        s1 = peg$c74(s2, s6);
                                         s0 = s1;
                                     }
                                     else {
@@ -1993,18 +2275,18 @@
                     s3 = peg$parse_();
                     if (s3 !== peg$FAILED) {
                         if (input.charCodeAt(peg$currPos) === 123) {
-                            s4 = peg$c6;
+                            s4 = peg$c21;
                             peg$currPos++;
                         }
                         else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$c7);
+                                peg$fail(peg$c22);
                             }
                         }
                         if (s4 !== peg$FAILED) {
                             peg$savedPos = peg$currPos;
-                            s5 = peg$c60();
+                            s5 = peg$c75();
                             if (s5) {
                                 s5 = undefined;
                             }
@@ -2015,18 +2297,18 @@
                                 s6 = peg$parsemessage();
                                 if (s6 !== peg$FAILED) {
                                     if (input.charCodeAt(peg$currPos) === 125) {
-                                        s7 = peg$c8;
+                                        s7 = peg$c23;
                                         peg$currPos++;
                                     }
                                     else {
                                         s7 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                            peg$fail(peg$c9);
+                                            peg$fail(peg$c24);
                                         }
                                     }
                                     if (s7 !== peg$FAILED) {
                                         peg$savedPos = s0;
-                                        s1 = peg$c61(s2, s6);
+                                        s1 = peg$c76(s2, s6);
                                         s0 = s1;
                                     }
                                     else {
@@ -2068,20 +2350,20 @@
         function peg$parsewhiteSpace() {
             var s0;
             peg$silentFails++;
-            if (peg$c63.test(input.charAt(peg$currPos))) {
+            if (peg$c78.test(input.charAt(peg$currPos))) {
                 s0 = input.charAt(peg$currPos);
                 peg$currPos++;
             }
             else {
                 s0 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c64);
+                    peg$fail(peg$c79);
                 }
             }
             peg$silentFails--;
             if (s0 === peg$FAILED) {
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c62);
+                    peg$fail(peg$c77);
                 }
             }
             return s0;
@@ -2089,20 +2371,20 @@
         function peg$parsepatternSyntax() {
             var s0;
             peg$silentFails++;
-            if (peg$c66.test(input.charAt(peg$currPos))) {
+            if (peg$c81.test(input.charAt(peg$currPos))) {
                 s0 = input.charAt(peg$currPos);
                 peg$currPos++;
             }
             else {
                 s0 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c67);
+                    peg$fail(peg$c82);
                 }
             }
             peg$silentFails--;
             if (s0 === peg$FAILED) {
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c65);
+                    peg$fail(peg$c80);
                 }
             }
             return s0;
@@ -2127,7 +2409,7 @@
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c68);
+                    peg$fail(peg$c83);
                 }
             }
             return s0;
@@ -2137,13 +2419,13 @@
             peg$silentFails++;
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 45) {
-                s1 = peg$c70;
+                s1 = peg$c85;
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c71);
+                    peg$fail(peg$c86);
                 }
             }
             if (s1 === peg$FAILED) {
@@ -2153,7 +2435,7 @@
                 s2 = peg$parseargNumber();
                 if (s2 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$c72(s1, s2);
+                    s1 = peg$c87(s1, s2);
                     s0 = s1;
                 }
                 else {
@@ -2169,7 +2451,7 @@
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c69);
+                    peg$fail(peg$c84);
                 }
             }
             return s0;
@@ -2178,26 +2460,26 @@
             var s0, s1;
             peg$silentFails++;
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c75) {
-                s1 = peg$c75;
+            if (input.substr(peg$currPos, 2) === peg$c90) {
+                s1 = peg$c90;
                 peg$currPos += 2;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c76);
+                    peg$fail(peg$c91);
                 }
             }
             if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c77();
+                s1 = peg$c92();
             }
             s0 = s1;
             peg$silentFails--;
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c74);
+                    peg$fail(peg$c89);
                 }
             }
             return s0;
@@ -2206,13 +2488,13 @@
             var s0, s1, s2, s3, s4, s5;
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 39) {
-                s1 = peg$c32;
+                s1 = peg$c47;
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c33);
+                    peg$fail(peg$c48);
                 }
             }
             if (s1 !== peg$FAILED) {
@@ -2220,49 +2502,49 @@
                 if (s2 !== peg$FAILED) {
                     s3 = peg$currPos;
                     s4 = [];
-                    if (input.substr(peg$currPos, 2) === peg$c75) {
-                        s5 = peg$c75;
+                    if (input.substr(peg$currPos, 2) === peg$c90) {
+                        s5 = peg$c90;
                         peg$currPos += 2;
                     }
                     else {
                         s5 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$c76);
+                            peg$fail(peg$c91);
                         }
                     }
                     if (s5 === peg$FAILED) {
-                        if (peg$c34.test(input.charAt(peg$currPos))) {
+                        if (peg$c49.test(input.charAt(peg$currPos))) {
                             s5 = input.charAt(peg$currPos);
                             peg$currPos++;
                         }
                         else {
                             s5 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$c35);
+                                peg$fail(peg$c50);
                             }
                         }
                     }
                     while (s5 !== peg$FAILED) {
                         s4.push(s5);
-                        if (input.substr(peg$currPos, 2) === peg$c75) {
-                            s5 = peg$c75;
+                        if (input.substr(peg$currPos, 2) === peg$c90) {
+                            s5 = peg$c90;
                             peg$currPos += 2;
                         }
                         else {
                             s5 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$c76);
+                                peg$fail(peg$c91);
                             }
                         }
                         if (s5 === peg$FAILED) {
-                            if (peg$c34.test(input.charAt(peg$currPos))) {
+                            if (peg$c49.test(input.charAt(peg$currPos))) {
                                 s5 = input.charAt(peg$currPos);
                                 peg$currPos++;
                             }
                             else {
                                 s5 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$c35);
+                                    peg$fail(peg$c50);
                                 }
                             }
                         }
@@ -2275,13 +2557,13 @@
                     }
                     if (s3 !== peg$FAILED) {
                         if (input.charCodeAt(peg$currPos) === 39) {
-                            s4 = peg$c32;
+                            s4 = peg$c47;
                             peg$currPos++;
                         }
                         else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$c33);
+                                peg$fail(peg$c48);
                             }
                         }
                         if (s4 === peg$FAILED) {
@@ -2289,7 +2571,7 @@
                         }
                         if (s4 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s1 = peg$c78(s2, s3);
+                            s1 = peg$c93(s2, s3);
                             s0 = s1;
                         }
                         else {
@@ -2324,12 +2606,12 @@
             else {
                 s2 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c14);
+                    peg$fail(peg$c29);
                 }
             }
             if (s2 !== peg$FAILED) {
                 peg$savedPos = peg$currPos;
-                s3 = peg$c79(s2);
+                s3 = peg$c94(s2);
                 if (s3) {
                     s3 = undefined;
                 }
@@ -2351,13 +2633,13 @@
             }
             if (s1 === peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 10) {
-                    s1 = peg$c80;
+                    s1 = peg$c95;
                     peg$currPos++;
                 }
                 else {
                     s1 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$c81);
+                        peg$fail(peg$c96);
                     }
                 }
             }
@@ -2380,12 +2662,12 @@
             else {
                 s2 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c14);
+                    peg$fail(peg$c29);
                 }
             }
             if (s2 !== peg$FAILED) {
                 peg$savedPos = peg$currPos;
-                s3 = peg$c82(s2);
+                s3 = peg$c97(s2);
                 if (s3) {
                     s3 = undefined;
                 }
@@ -2431,7 +2713,30 @@
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c83);
+                    peg$fail(peg$c98);
+                }
+            }
+            return s0;
+        }
+        function peg$parsevalidTag() {
+            var s0, s1;
+            peg$silentFails++;
+            s0 = peg$currPos;
+            s1 = peg$parseargNumber();
+            if (s1 === peg$FAILED) {
+                s1 = peg$parsetagName();
+            }
+            if (s1 !== peg$FAILED) {
+                s0 = input.substring(s0, peg$currPos);
+            }
+            else {
+                s0 = s1;
+            }
+            peg$silentFails--;
+            if (s0 === peg$FAILED) {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c99);
                 }
             }
             return s0;
@@ -2441,55 +2746,55 @@
             peg$silentFails++;
             s0 = peg$currPos;
             if (input.charCodeAt(peg$currPos) === 48) {
-                s1 = peg$c85;
+                s1 = peg$c101;
                 peg$currPos++;
             }
             else {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c86);
+                    peg$fail(peg$c102);
                 }
             }
             if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$c87();
+                s1 = peg$c103();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
                 s1 = peg$currPos;
-                if (peg$c88.test(input.charAt(peg$currPos))) {
+                if (peg$c104.test(input.charAt(peg$currPos))) {
                     s2 = input.charAt(peg$currPos);
                     peg$currPos++;
                 }
                 else {
                     s2 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$c89);
+                        peg$fail(peg$c105);
                     }
                 }
                 if (s2 !== peg$FAILED) {
                     s3 = [];
-                    if (peg$c90.test(input.charAt(peg$currPos))) {
+                    if (peg$c106.test(input.charAt(peg$currPos))) {
                         s4 = input.charAt(peg$currPos);
                         peg$currPos++;
                     }
                     else {
                         s4 = peg$FAILED;
                         if (peg$silentFails === 0) {
-                            peg$fail(peg$c91);
+                            peg$fail(peg$c107);
                         }
                     }
                     while (s4 !== peg$FAILED) {
                         s3.push(s4);
-                        if (peg$c90.test(input.charAt(peg$currPos))) {
+                        if (peg$c106.test(input.charAt(peg$currPos))) {
                             s4 = input.charAt(peg$currPos);
                             peg$currPos++;
                         }
                         else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$c91);
+                                peg$fail(peg$c107);
                             }
                         }
                     }
@@ -2508,7 +2813,7 @@
                 }
                 if (s1 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$c92(s1);
+                    s1 = peg$c108(s1);
                 }
                 s0 = s1;
             }
@@ -2516,7 +2821,7 @@
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c84);
+                    peg$fail(peg$c100);
                 }
             }
             return s0;
@@ -2549,7 +2854,7 @@
                 else {
                     s4 = peg$FAILED;
                     if (peg$silentFails === 0) {
-                        peg$fail(peg$c14);
+                        peg$fail(peg$c29);
                     }
                 }
                 if (s4 !== peg$FAILED) {
@@ -2591,7 +2896,7 @@
                         else {
                             s4 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$c14);
+                                peg$fail(peg$c29);
                             }
                         }
                         if (s4 !== peg$FAILED) {
@@ -2622,7 +2927,137 @@
             if (s0 === peg$FAILED) {
                 s1 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                    peg$fail(peg$c93);
+                    peg$fail(peg$c109);
+                }
+            }
+            return s0;
+        }
+        function peg$parsetagName() {
+            var s0, s1, s2, s3, s4;
+            peg$silentFails++;
+            s0 = peg$currPos;
+            s1 = [];
+            if (input.charCodeAt(peg$currPos) === 45) {
+                s2 = peg$c85;
+                peg$currPos++;
+            }
+            else {
+                s2 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c86);
+                }
+            }
+            if (s2 === peg$FAILED) {
+                s2 = peg$currPos;
+                s3 = peg$currPos;
+                peg$silentFails++;
+                s4 = peg$parsewhiteSpace();
+                if (s4 === peg$FAILED) {
+                    s4 = peg$parsepatternSyntax();
+                }
+                peg$silentFails--;
+                if (s4 === peg$FAILED) {
+                    s3 = undefined;
+                }
+                else {
+                    peg$currPos = s3;
+                    s3 = peg$FAILED;
+                }
+                if (s3 !== peg$FAILED) {
+                    if (input.length > peg$currPos) {
+                        s4 = input.charAt(peg$currPos);
+                        peg$currPos++;
+                    }
+                    else {
+                        s4 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$c29);
+                        }
+                    }
+                    if (s4 !== peg$FAILED) {
+                        s3 = [s3, s4];
+                        s2 = s3;
+                    }
+                    else {
+                        peg$currPos = s2;
+                        s2 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s2;
+                    s2 = peg$FAILED;
+                }
+            }
+            if (s2 !== peg$FAILED) {
+                while (s2 !== peg$FAILED) {
+                    s1.push(s2);
+                    if (input.charCodeAt(peg$currPos) === 45) {
+                        s2 = peg$c85;
+                        peg$currPos++;
+                    }
+                    else {
+                        s2 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$c86);
+                        }
+                    }
+                    if (s2 === peg$FAILED) {
+                        s2 = peg$currPos;
+                        s3 = peg$currPos;
+                        peg$silentFails++;
+                        s4 = peg$parsewhiteSpace();
+                        if (s4 === peg$FAILED) {
+                            s4 = peg$parsepatternSyntax();
+                        }
+                        peg$silentFails--;
+                        if (s4 === peg$FAILED) {
+                            s3 = undefined;
+                        }
+                        else {
+                            peg$currPos = s3;
+                            s3 = peg$FAILED;
+                        }
+                        if (s3 !== peg$FAILED) {
+                            if (input.length > peg$currPos) {
+                                s4 = input.charAt(peg$currPos);
+                                peg$currPos++;
+                            }
+                            else {
+                                s4 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$c29);
+                                }
+                            }
+                            if (s4 !== peg$FAILED) {
+                                s3 = [s3, s4];
+                                s2 = s3;
+                            }
+                            else {
+                                peg$currPos = s2;
+                                s2 = peg$FAILED;
+                            }
+                        }
+                        else {
+                            peg$currPos = s2;
+                            s2 = peg$FAILED;
+                        }
+                    }
+                }
+            }
+            else {
+                s1 = peg$FAILED;
+            }
+            if (s1 !== peg$FAILED) {
+                s0 = input.substring(s0, peg$currPos);
+            }
+            else {
+                s0 = s1;
+            }
+            peg$silentFails--;
+            if (s0 === peg$FAILED) {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                    peg$fail(peg$c110);
                 }
             }
             return s0;
@@ -3075,22 +3510,33 @@
             d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
         };
     })();
-    var __spreadArrays$2 = (undefined && undefined.__spreadArrays) || function () {
-        for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-        for (var r = Array(s), k = 0, i = 0; i < il; i++)
-            for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-                r[k] = a[j];
-        return r;
-    };
     var FormatError = /** @class */ (function (_super) {
         __extends$1(FormatError, _super);
-        function FormatError(msg, variableId) {
+        function FormatError(msg, code) {
             var _this = _super.call(this, msg) || this;
-            _this.variableId = variableId;
+            _this.code = code;
             return _this;
         }
+        FormatError.prototype.toString = function () {
+            return "[formatjs Error: " + this.code + "] " + this.message;
+        };
         return FormatError;
     }(Error));
+    var InvalidValueError = /** @class */ (function (_super) {
+        __extends$1(InvalidValueError, _super);
+        function InvalidValueError(variableId, value, options) {
+            return _super.call(this, "Invalid values for \"" + variableId + "\": \"" + value + "\". Options are \"" + Object.keys(options).join('", "') + "\"", 1 /* INVALID_VALUE */) || this;
+        }
+        return InvalidValueError;
+    }(FormatError));
+    var MissingValueError = /** @class */ (function (_super) {
+        __extends$1(MissingValueError, _super);
+        function MissingValueError(variableId, originalMessage) {
+            return _super.call(this, "The intl string context variable \"" + variableId + "\" was not provided to the string \"" + originalMessage + "\"", 0 /* MISSING_VALUE */) || this;
+        }
+        return MissingValueError;
+    }(FormatError));
+
     function mergeLiteral(parts) {
         if (parts.length < 2) {
             return parts;
@@ -3108,6 +3554,9 @@
             return all;
         }, []);
     }
+    function isFormatXMLElementFn(el) {
+        return typeof el === 'function';
+    }
     // TODO(skeleton): add skeleton support
     function formatToParts(els, locales, formatters, formats, values, currentPluralValue, 
     // For debugging
@@ -3146,7 +3595,7 @@
             var varName = el.value;
             // Enforce that all required values are provided by the caller.
             if (!(values && varName in values)) {
-                throw new FormatError("The intl string context variable \"" + varName + "\" was not provided to the string \"" + originalMessage + "\"");
+                throw new MissingValueError(varName, originalMessage);
             }
             var value = values[varName];
             if (isArgumentElement(el)) {
@@ -3157,7 +3606,7 @@
                             : '';
                 }
                 result.push({
-                    type: 1 /* argument */,
+                    type: typeof value === 'string' ? 0 /* literal */ : 1 /* object */,
                     value: value,
                 });
                 continue;
@@ -3203,10 +3652,28 @@
                 });
                 continue;
             }
+            if (isTagElement(el)) {
+                var children = el.children, value_1 = el.value;
+                var formatFn = values[value_1];
+                if (!isFormatXMLElementFn(formatFn)) {
+                    throw new TypeError("Value for \"" + value_1 + "\" must be a function");
+                }
+                var parts = formatToParts(children, locales, formatters, formats, values);
+                var chunks = formatFn.apply(void 0, parts.map(function (p) { return p.value; }));
+                if (!Array.isArray(chunks)) {
+                    chunks = [chunks];
+                }
+                result.push.apply(result, chunks.map(function (c) {
+                    return {
+                        type: typeof c === 'string' ? 0 /* literal */ : 1 /* object */,
+                        value: c,
+                    };
+                }));
+            }
             if (isSelectElement(el)) {
                 var opt = el.options[value] || el.options.other;
                 if (!opt) {
-                    throw new RangeError("Invalid values for \"" + el.value + "\": \"" + value + "\". Options are \"" + Object.keys(el.options).join('", "') + "\"");
+                    throw new InvalidValueError(el.value, value, Object.keys(el.options));
                 }
                 result.push.apply(result, formatToParts(opt.value, locales, formatters, formats, values));
                 continue;
@@ -3215,7 +3682,7 @@
                 var opt = el.options["=" + value];
                 if (!opt) {
                     if (!Intl.PluralRules) {
-                        throw new FormatError("Intl.PluralRules is not available in this environment.\nTry polyfilling it using \"@formatjs/intl-pluralrules\"\n");
+                        throw new FormatError("Intl.PluralRules is not available in this environment.\nTry polyfilling it using \"@formatjs/intl-pluralrules\"\n", 2 /* MISSING_INTL_API */);
                     }
                     var rule = formatters
                         .getPluralRules(locales, { type: el.pluralType })
@@ -3223,7 +3690,7 @@
                     opt = el.options[rule] || el.options.other;
                 }
                 if (!opt) {
-                    throw new RangeError("Invalid values for \"" + el.value + "\": \"" + value + "\". Options are \"" + Object.keys(el.options).join('", "') + "\"");
+                    throw new InvalidValueError(el.value, value, Object.keys(el.options));
                 }
                 result.push.apply(result, formatToParts(opt.value, locales, formatters, formats, values, value - (el.offset || 0)));
                 continue;
@@ -3231,139 +3698,6 @@
         }
         return mergeLiteral(result);
     }
-    function formatToString(els, locales, formatters, formats, values, 
-    // For debugging
-    originalMessage) {
-        var parts = formatToParts(els, locales, formatters, formats, values, undefined, originalMessage);
-        // Hot path for straight simple msg translations
-        if (parts.length === 1) {
-            return parts[0].value;
-        }
-        return parts.reduce(function (all, part) { return (all += part.value); }, '');
-    }
-    // Singleton
-    var domParser;
-    var TOKEN_DELIMITER = '@@';
-    var TOKEN_REGEX = /@@(\d+_\d+)@@/g;
-    var counter = 0;
-    function generateId() {
-        return Date.now() + "_" + ++counter;
-    }
-    function restoreRichPlaceholderMessage(text, objectParts) {
-        return text
-            .split(TOKEN_REGEX)
-            .filter(Boolean)
-            .map(function (c) { return (objectParts[c] != null ? objectParts[c] : c); })
-            .reduce(function (all, c) {
-            if (!all.length) {
-                all.push(c);
-            }
-            else if (typeof c === 'string' &&
-                typeof all[all.length - 1] === 'string') {
-                all[all.length - 1] += c;
-            }
-            else {
-                all.push(c);
-            }
-            return all;
-        }, []);
-    }
-    /**
-     * Not exhaustive, just for sanity check
-     */
-    var SIMPLE_XML_REGEX = /(<([0-9a-zA-Z-_]*?)>(.*?)<\/([0-9a-zA-Z-_]*?)>)|(<[0-9a-zA-Z-_]*?\/>)/;
-    var TEMPLATE_ID = Date.now() + '@@';
-    var VOID_ELEMENTS = [
-        'area',
-        'base',
-        'br',
-        'col',
-        'embed',
-        'hr',
-        'img',
-        'input',
-        'link',
-        'meta',
-        'param',
-        'source',
-        'track',
-        'wbr',
-    ];
-    function formatHTMLElement(el, objectParts, values) {
-        var tagName = el.tagName;
-        var outerHTML = el.outerHTML, textContent = el.textContent, childNodes = el.childNodes;
-        // Regular text
-        if (!tagName) {
-            return restoreRichPlaceholderMessage(textContent || '', objectParts);
-        }
-        tagName = tagName.toLowerCase();
-        var isVoidElement = ~VOID_ELEMENTS.indexOf(tagName);
-        var formatFnOrValue = values[tagName];
-        if (formatFnOrValue && isVoidElement) {
-            throw new FormatError(tagName + " is a self-closing tag and can not be used, please use another tag name.");
-        }
-        if (!childNodes.length) {
-            return [outerHTML];
-        }
-        var chunks = Array.prototype.slice.call(childNodes).reduce(function (all, child) {
-            return all.concat(formatHTMLElement(child, objectParts, values));
-        }, []);
-        // Legacy HTML
-        if (!formatFnOrValue) {
-            return __spreadArrays$2(["<" + tagName + ">"], chunks, ["</" + tagName + ">"]);
-        }
-        // HTML Tag replacement
-        if (typeof formatFnOrValue === 'function') {
-            return [formatFnOrValue.apply(void 0, chunks)];
-        }
-        return [formatFnOrValue];
-    }
-    function formatHTMLMessage(els, locales, formatters, formats, values, 
-    // For debugging
-    originalMessage) {
-        var parts = formatToParts(els, locales, formatters, formats, values, undefined, originalMessage);
-        var objectParts = {};
-        var formattedMessage = parts.reduce(function (all, part) {
-            if (part.type === 0 /* literal */) {
-                return (all += part.value);
-            }
-            var id = generateId();
-            objectParts[id] = part.value;
-            return (all += "" + TOKEN_DELIMITER + id + TOKEN_DELIMITER);
-        }, '');
-        // Not designed to filter out aggressively
-        if (!SIMPLE_XML_REGEX.test(formattedMessage)) {
-            return restoreRichPlaceholderMessage(formattedMessage, objectParts);
-        }
-        if (!values) {
-            throw new FormatError('Message has placeholders but no values was given');
-        }
-        if (typeof DOMParser === 'undefined') {
-            throw new FormatError('Cannot format XML message without DOMParser');
-        }
-        if (!domParser) {
-            domParser = new DOMParser();
-        }
-        var content = domParser
-            .parseFromString("<formatted-message id=\"" + TEMPLATE_ID + "\">" + formattedMessage + "</formatted-message>", 'text/html')
-            .getElementById(TEMPLATE_ID);
-        if (!content) {
-            throw new FormatError("Malformed HTML message " + formattedMessage);
-        }
-        var tagsToFormat = Object.keys(values).filter(function (varName) { return !!content.getElementsByTagName(varName).length; });
-        // No tags to format
-        if (!tagsToFormat.length) {
-            return restoreRichPlaceholderMessage(formattedMessage, objectParts);
-        }
-        var caseSensitiveTags = tagsToFormat.filter(function (tagName) { return tagName !== tagName.toLowerCase(); });
-        if (caseSensitiveTags.length) {
-            throw new FormatError("HTML tag must be lowercased but the following tags are not: " + caseSensitiveTags.join(', '));
-        }
-        // We're doing this since top node is `<formatted-message/>` which does not have a formatter
-        return Array.prototype.slice
-            .call(content.childNodes)
-            .reduce(function (all, child) { return all.concat(formatHTMLElement(child, objectParts, values)); }, []);
-    }
 
     /*
     Copyright (c) 2014, Yahoo! Inc. All rights reserved.
@@ -3422,14 +3756,30 @@
                 pluralRules: {},
             };
             this.format = function (values) {
-                return formatToString(_this.ast, _this.locales, _this.formatters, _this.formats, values, _this.message);
+                var parts = _this.formatToParts(values);
+                // Hot path for straight simple msg translations
+                if (parts.length === 1) {
+                    return parts[0].value;
+                }
+                var result = parts.reduce(function (all, part) {
+                    if (!all.length ||
+                        part.type !== 0 /* literal */ ||
+                        typeof all[all.length - 1] !== 'string') {
+                        all.push(part.value);
+                    }
+                    else {
+                        all[all.length - 1] += part.value;
+                    }
+                    return all;
+                }, []);
+                if (result.length <= 1) {
+                    return result[0] || '';
+                }
+                return result;
             };
             this.formatToParts = function (values) {
                 return formatToParts(_this.ast, _this.locales, _this.formatters, _this.formats, values, undefined, _this.message);
             };
-            this.formatHTMLMessage = function (values) {
-                return formatHTMLMessage(_this.ast, _this.locales, _this.formatters, _this.formats, values, _this.message);
-            };
             this.resolvedOptions = function () { return ({
                 locale: Intl.NumberFormat.supportedLocalesOf(_this.locales)[0],
             }); };
@@ -3528,12 +3878,13 @@
     See the accompanying LICENSE file for terms.
     */
 
+    exports.FormatError = FormatError;
     exports.IntlMessageFormat = IntlMessageFormat;
+    exports.InvalidValueError = InvalidValueError;
+    exports.MissingValueError = MissingValueError;
     exports.createDefaultFormatters = createDefaultFormatters;
     exports.default = IntlMessageFormat;
-    exports.formatHTMLMessage = formatHTMLMessage;
     exports.formatToParts = formatToParts;
-    exports.formatToString = formatToString;
 
     Object.defineProperty(exports, '__esModule', { value: true });