@formatjs/icu-messageformat-parser 3.1.1 → 3.2.1

package/manipulator.js

@@ -1,5 +1,5 @@
-import { __spreadArray } from "tslib";
-import { isArgumentElement, isDateElement, isNumberElement, isPluralElement, isSelectElement, isTagElement, isTimeElement, TYPE, } from './types.js';
+import { __assign, __spreadArray } from "tslib";
+import { isArgumentElement, isDateElement, isNumberElement, isPluralElement, isPoundElement, isSelectElement, isTagElement, isTimeElement, TYPE, } from './types.js';
 function cloneDeep(obj) {
     if (Array.isArray(obj)) {
         // @ts-expect-error meh
@@ -15,12 +15,55 @@ function cloneDeep(obj) {
     }
     return obj;
 }
+/**
+ * Replace pound elements with number elements referencing the given variable.
+ * This is needed when nesting plurals - the # in the outer plural should become
+ * an explicit variable reference when nested inside another plural.
+ * GH #4202
+ */
+function replacePoundWithArgument(ast, variableName) {
+    return ast.map(function (el) {
+        if (isPoundElement(el)) {
+            // Replace # with {variableName, number}
+            return {
+                type: TYPE.number,
+                value: variableName,
+                style: null,
+                location: el.location,
+            };
+        }
+        if (isPluralElement(el) || isSelectElement(el)) {
+            // Recursively process options
+            var newOptions = {};
+            for (var _i = 0, _a = Object.keys(el.options); _i < _a.length; _i++) {
+                var key = _a[_i];
+                newOptions[key] = {
+                    value: replacePoundWithArgument(el.options[key].value, variableName),
+                };
+            }
+            return __assign(__assign({}, el), { options: newOptions });
+        }
+        if (isTagElement(el)) {
+            return __assign(__assign({}, el), { children: replacePoundWithArgument(el.children, variableName) });
+        }
+        return el;
+    });
+}
 function hoistPluralOrSelectElement(ast, el, positionToInject) {
     // pull this out of the ast and move it to the top
     var cloned = cloneDeep(el);
     var options = cloned.options;
+    // GH #4202: Check if there are other plural/select elements after this one
+    var afterElements = ast.slice(positionToInject + 1);
+    var hasSubsequentPluralOrSelect = afterElements.some(isPluralOrSelectElement);
     cloned.options = Object.keys(options).reduce(function (all, k) {
-        var newValue = hoistSelectors(__spreadArray(__spreadArray(__spreadArray([], ast.slice(0, positionToInject), true), options[k].value, true), ast.slice(positionToInject + 1), true));
+        var optionValue = options[k].value;
+        // GH #4202: If there are subsequent plurals/selects and this is a plural,
+        // replace # with explicit variable reference to avoid ambiguity
+        if (hasSubsequentPluralOrSelect && isPluralElement(el)) {
+            optionValue = replacePoundWithArgument(optionValue, el.value);
+        }
+        var newValue = hoistSelectors(__spreadArray(__spreadArray(__spreadArray([], ast.slice(0, positionToInject), true), optionValue, true), afterElements, true));
         all[k] = {
             value: newValue,
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/icu-messageformat-parser",
-  "version": "3.1.1",
+  "version": "3.2.1",
   "license": "MIT",
   "type": "module",
   "types": "index.d.ts",
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "tslib": "^2.8.0",
-    "@formatjs/ecma402-abstract": "3.0.5",
-    "@formatjs/icu-skeleton-parser": "2.0.5"
+    "@formatjs/ecma402-abstract": "3.0.7",
+    "@formatjs/icu-skeleton-parser": "2.0.7"
   },
   "repository": {
     "type": "git",

package/time-data.generated.js

@@ -468,6 +468,12 @@ export var timeData = {
         "hb",
         "hB"
     ],
+    "GS": [
+        "H",
+        "h",
+        "hb",
+        "hB"
+    ],
     "GT": [
         "h",
         "H",
@@ -1380,6 +1386,10 @@ export var timeData = {
         "h",
         "H"
     ],
+    "ku-SY": [
+        "H",
+        "hB"
+    ],
     "ml-IN": [
         "hB",
         "h",