fix: align numeric placeholder generation with babel implementation (#239)

Author: mogelbrod

crates/lingui_macro/src/builder.rs

@@ -92,6 +92,8 @@ pub struct MessageBuilder<'a> {
     options: &'a LinguiOptions,
     elements_tracking: Vec<(String, JSXOpeningElement)>,
     element_index: usize,
+    // Counter for auto-generated numeric placeholders
+    numeric_index: usize,
 }
 
 impl<'a> MessageBuilder<'a> {
@@ -105,6 +107,7 @@ impl<'a> MessageBuilder<'a> {
             options,
             elements_tracking: Vec::new(),
             element_index: 0,
+            numeric_index: 0,
         };
 
         builder.process_tokens(tokens);
@@ -292,6 +295,12 @@ impl<'a> MessageBuilder<'a> {
         }
     }
 
+    fn next_numeric_index(&mut self) -> String {
+        let index = self.numeric_index.to_string();
+        self.numeric_index += 1;
+        index
+    }
+
     fn push_exp(&mut self, mut exp: Box<Expr>) -> String {
         exp = expand_ts_as_expr(exp);
 
@@ -334,7 +343,7 @@ impl<'a> MessageBuilder<'a> {
                 }
 
                 // fallback for {...spread} or {}
-                let index = self.values_indexed.len().to_string();
+                let index = self.next_numeric_index();
 
                 self.values_indexed.push(ValueWithPlaceholder {
                     placeholder: index.clone(),
@@ -344,7 +353,7 @@ impl<'a> MessageBuilder<'a> {
                 index
             }
             _ => {
-                let index = self.values_indexed.len().to_string();
+                let index = self.next_numeric_index();
 
                 self.values_indexed.push(ValueWithPlaceholder {
                     placeholder: index.clone(),

crates/lingui_macro/tests/jsx.rs

@@ -144,6 +144,18 @@ to!(
      "#
 );
 
+to!(
+    jsx_ph_label_with_nested_plural,
+    r##"
+       import { Trans, Plural, ph } from "@lingui/react/macro";
+
+       const zones = [1, 2]
+       const x = <Trans id="key">
+         {ph({ available: 1 })} of <Plural value={zones.length} one="# zone" other="# zones" /> available
+       </Trans>
+     "##
+);
+
 to!(
     jsx_nested_labels,
     r#"

crates/lingui_macro/tests/snapshots/jsx__jsx_ph_label_with_nested_plural.snap

@@ -0,0 +1,25 @@
+---
+source: crates/lingui_macro/tests/jsx.rs
+---
+import { Trans, Plural, ph } from "@lingui/react/macro";
+
+const zones = [1, 2]
+const x = <Trans id="key">
+  {ph({ available: 1 })} of <Plural value={zones.length} one="# zone" other="# zones" /> available
+</Trans>
+
+↓ ↓ ↓ ↓ ↓ ↓
+
+import { Trans as Trans_ } from "@lingui/react";
+const zones = [
+    1,
+    2
+];
+const x = <Trans_ {.../*i18n*/ {
+    id: "key",
+    values: {
+        available: 1,
+        0: zones.length
+    },
+    message: "{available} of {0, plural, one {# zone} other {# zones}} available"
+}}/>;